diff --git a/CMakeLists.txt b/CMakeLists.txt
index 566ecaf8..546365cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -392,6 +392,7 @@ add_definitions(${QT_DEFINITIONS})
 add_definitions(-DQT_USE_QSTRINGBUILDER)
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 add_definitions(-DQT_NO_CAST_TO_ASCII -DQT_STRICT_ITERATORS)
+add_definitions(-DTAGLIB_STATIC)
 
 include_directories(${GLIB_INCLUDE_DIRS})
 include_directories(${GLIBCONFIG_INCLUDE_DIRS})
diff --git a/ext/libstrawberry-tagreader/tagreader.cpp b/ext/libstrawberry-tagreader/tagreader.cpp
index 7ac06193..6d10521f 100644
--- a/ext/libstrawberry-tagreader/tagreader.cpp
+++ b/ext/libstrawberry-tagreader/tagreader.cpp
@@ -91,10 +91,6 @@
 #include "fmpsparser.h"
 #include "core/timeconstants.h"
 
-#ifndef USE_SYSTEM_TAGLIB
-using namespace Strawberry_TagLib;
-#endif
-
 class FileRefFactory {
  public:
   virtual ~FileRefFactory() {}