diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -133,7 +133,7 @@
 #
 if(TAGLIB_FOUND)
     kde_enable_exceptions()
-    ecm_add_test(taglibextractortest.cpp ../src/extractors/taglibextractor.cpp
+    ecm_add_test(taglibextractortest.cpp ../src/extractors/taglibextractor.cpp ${KfileMetaDataAutotest_SRCS}
         TEST_NAME "taglibextractortest"
         LINK_LIBRARIES Qt5::Test KF5::FileMetaData ${TAGLIB_LIBRARIES}
     )
@@ -233,7 +233,7 @@
 #
 if(TAGLIB_FOUND)
     kde_enable_exceptions()
-    ecm_add_test(taglibwritertest.cpp ../src/writers/taglibwriter.cpp
+    ecm_add_test(taglibwritertest.cpp ../src/writers/taglibwriter.cpp ${KfileMetaDataAutotest_SRCS}
         TEST_NAME "taglibwritertest"
         LINK_LIBRARIES Qt5::Test KF5::FileMetaData ${TAGLIB_LIBRARIES}
     )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1,5 @@
+ecm_qt_declare_logging_category(debug_SRCS HEADER kfilemetadata_debug.h IDENTIFIER KFILEMETADATA_LOG CATEGORY_NAME kf5.kfilemetadata)
+
 set(KF5FileMetaData_SRCS
     extractionresult.cpp
     simpleextractionresult.cpp
@@ -15,8 +17,9 @@
     externalwriter.cpp
     formatstrings.cpp
     mimeutils.cpp
+    ${debug_SRCS}
     )
-ecm_qt_declare_logging_category(KF5FileMetaData_SRCS HEADER kfilemetadata_debug.h IDENTIFIER KFILEMETADATA_LOG CATEGORY_NAME kf5.kfilemetadata)
+
 
 if(TAGLIB_FOUND)
     set(KF5FileMetaData_SRCS
diff --git a/src/embeddedimagedata.cpp b/src/embeddedimagedata.cpp
--- a/src/embeddedimagedata.cpp
+++ b/src/embeddedimagedata.cpp
@@ -18,6 +18,7 @@
  */
 
 #include "embeddedimagedata.h"
+#include "kfilemetadata_debug.h"
 // Taglib includes
 #include <taglib.h>
 #include <tag.h>
@@ -44,7 +45,6 @@
 #include <asfpicture.h>
 
 #include <QMimeDatabase>
-#include <QDebug>
 
 using namespace KFileMetaData;
 
@@ -118,7 +118,7 @@
 {
     TagLib::FileStream stream(fileUrl.toUtf8().constData(), true);
     if (!stream.isOpen()) {
-        qWarning() << "Unable to open file readonly: " << fileUrl;
+        qCWarning(KFILEMETADATA_LOG) << "Unable to open file readonly: " << fileUrl;
         return QByteArray();
     }
     if ((mimeType == QLatin1String("audio/mpeg"))
diff --git a/src/extractors/CMakeLists.txt b/src/extractors/CMakeLists.txt
--- a/src/extractors/CMakeLists.txt
+++ b/src/extractors/CMakeLists.txt
@@ -16,7 +16,7 @@
 endif()
 
 if(TAGLIB_FOUND)
-    add_library(kfilemetadata_taglibextractor MODULE taglibextractor.cpp )
+    add_library(kfilemetadata_taglibextractor MODULE taglibextractor.cpp ${debug_SRCS})
     target_include_directories(kfilemetadata_taglibextractor SYSTEM PRIVATE ${TAGLIB_INCLUDES})
     target_link_libraries( kfilemetadata_taglibextractor
         KF5::FileMetaData
diff --git a/src/extractors/taglibextractor.cpp b/src/extractors/taglibextractor.cpp
--- a/src/extractors/taglibextractor.cpp
+++ b/src/extractors/taglibextractor.cpp
@@ -19,6 +19,7 @@
 
 
 #include "taglibextractor.h"
+#include "kfilemetadata_debug.h"
 
 // Taglib includes
 #include <taglib.h>
@@ -44,9 +45,6 @@
 #include <mp4tag.h>
 #include <popularimeterframe.h>
 
-#include <QDateTime>
-#include <QDebug>
-
 using namespace KFileMetaData;
 
 TagLibExtractor::TagLibExtractor(QObject* parent)
@@ -399,7 +397,7 @@
     // Open the file readonly. Important if we're sandboxed.
     TagLib::FileStream stream(fileUrl.toUtf8().constData(), true);
     if (!stream.isOpen()) {
-        qWarning() << "Unable to open file readonly: " << fileUrl;
+        qCWarning(KFILEMETADATA_LOG) << "Unable to open file readonly: " << fileUrl;
         return;
     }
 
diff --git a/src/writers/CMakeLists.txt b/src/writers/CMakeLists.txt
--- a/src/writers/CMakeLists.txt
+++ b/src/writers/CMakeLists.txt
@@ -1,5 +1,5 @@
 if(TAGLIB_FOUND)
-    add_library(kfilemetadata_taglibwriter MODULE taglibwriter.cpp)
+    add_library(kfilemetadata_taglibwriter MODULE taglibwriter.cpp ../kfilemetadata_debug.cpp)
     target_include_directories(kfilemetadata_taglibwriter SYSTEM PRIVATE ${TAGLIB_INCLUDES})
 
     target_link_libraries( kfilemetadata_taglibwriter
diff --git a/src/writers/taglibwriter.cpp b/src/writers/taglibwriter.cpp
--- a/src/writers/taglibwriter.cpp
+++ b/src/writers/taglibwriter.cpp
@@ -19,6 +19,7 @@
  */
 
 #include "taglibwriter.h"
+#include "kfilemetadata_debug.h"
 
 #include <taglib.h>
 #include <tfilestream.h>
@@ -42,8 +43,6 @@
 #include <wavfile.h>
 #include <popularimeterframe.h>
 
-#include <QDebug>
-
 namespace {
 
 const QStringList supportedMimeTypes = {
@@ -224,7 +223,7 @@
 
     TagLib::FileStream stream(fileUrl.toUtf8().constData(), false);
     if (!stream.isOpen()) {
-        qWarning() << "Unable to open file in write mode: " << fileUrl;
+        qCWarning(KFILEMETADATA_LOG) << "Unable to open file in write mode: " << fileUrl;
         return;
     }