diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -101,17 +101,17 @@
 # TagLib
 #
 if(TAGLIB_FOUND)
-    include_directories(${TAGLIB_INCLUDES})
-
     kde_enable_exceptions()
     ecm_add_test(taglibextractortest.cpp ../src/extractors/taglibextractor.cpp
         TEST_NAME "taglibextractortest"
         LINK_LIBRARIES Qt5::Test KF5::FileMetaData ${TAGLIB_LIBRARIES}
     )
+    target_include_directories(taglibextractortest SYSTEM PRIVATE ${TAGLIB_INCLUDES})
     ecm_add_test(embeddedimagedatatest.cpp
         TEST_NAME "embeddedimagedatatest"
         LINK_LIBRARIES Qt5::Test KF5::FileMetaData ${TAGLIB_LIBRARIES}
     )
+    target_include_directories(embeddedimagedatatest SYSTEM PRIVATE ${TAGLIB_INCLUDES})
 endif()
 
 
@@ -156,13 +156,12 @@
 # TagLib
 #
 if(TAGLIB_FOUND)
-    include_directories(${TAGLIB_INCLUDES})
-
     kde_enable_exceptions()
     ecm_add_test(taglibwritertest.cpp ../src/writers/taglibwriter.cpp
         TEST_NAME "taglibwritertest"
         LINK_LIBRARIES Qt5::Test KF5::FileMetaData ${TAGLIB_LIBRARIES}
     )
+    target_include_directories(taglibwritertest SYSTEM PRIVATE ${TAGLIB_INCLUDES})
 endif()
 
 if(PYTHONINTERP_FOUND)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,7 +37,7 @@
 )
 
 if(TAGLIB_FOUND)
-    include_directories(${TAGLIB_INCLUDES})
+    target_include_directories(KF5FileMetaData SYSTEM PRIVATE ${TAGLIB_INCLUDES})
 
     target_link_libraries(KF5FileMetaData
         PRIVATE
diff --git a/src/writers/CMakeLists.txt b/src/writers/CMakeLists.txt
--- a/src/writers/CMakeLists.txt
+++ b/src/writers/CMakeLists.txt
@@ -1,7 +1,6 @@
 if(TAGLIB_FOUND)
-    include_directories( ${TAGLIB_INCLUDES} )
-
     add_library(kfilemetadata_taglibwriter MODULE taglibwriter.cpp)
+    target_include_directories(kfilemetadata_taglibwriter SYSTEM PRIVATE ${TAGLIB_INCLUDES})
 
     target_link_libraries( kfilemetadata_taglibwriter
         KF5::FileMetaData