diff --git a/src/accounts/xmpp/CMakeLists.txt b/src/accounts/xmpp/CMakeLists.txt
index 737495004..e52f354bc 100644
--- a/src/accounts/xmpp/CMakeLists.txt
+++ b/src/accounts/xmpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${JREEN_INCLUDE_DIR})
+include_directories(${JREEN_INCLUDE_DIR} ${LIBATTICA_INCLUDE_DIR})
 
 tomahawk_add_plugin(xmpp
     TYPE account
diff --git a/src/accounts/zeroconf/CMakeLists.txt b/src/accounts/zeroconf/CMakeLists.txt
index 34dcc5583..0b5ec3037 100644
--- a/src/accounts/zeroconf/CMakeLists.txt
+++ b/src/accounts/zeroconf/CMakeLists.txt
@@ -1,3 +1,4 @@
+include_directories(${LIBATTICA_INCLUDE_DIR})
 
 tomahawk_add_plugin(zeroconf
     TYPE account
diff --git a/src/infoplugins/mac/CMakeLists.txt b/src/infoplugins/mac/CMakeLists.txt
index 764afb700..3009c285a 100644
--- a/src/infoplugins/mac/CMakeLists.txt
+++ b/src/infoplugins/mac/CMakeLists.txt
@@ -1,3 +1,5 @@
+include_directories(${LIBATTICA_INCLUDE_DIR})
+
 set(adium_srcs
     adium/AdiumPlugin.cpp
     adium/Adium.mm
diff --git a/src/libtomahawk-playdarapi/CMakeLists.txt b/src/libtomahawk-playdarapi/CMakeLists.txt
index 2b9295764..3a8a01945 100644
--- a/src/libtomahawk-playdarapi/CMakeLists.txt
+++ b/src/libtomahawk-playdarapi/CMakeLists.txt
@@ -13,6 +13,7 @@ list(APPEND ${TOMAHAWK_PLAYDARAPI_LIBRARY_TARGET}_UI
 
 include_directories(
     ${QXTWEB_INCLUDE_DIRS}
+    ${LIBATTICA_INCLUDE_DIR}
     ${THIRDPARTY_DIR}/qt-certificate-addon/src/
     )
 
diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index 7f6300067..b37c5073a 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -419,6 +419,8 @@ include_directories(
     ${LIBPORTFWD_INCLUDE_DIR}
     ${QUAZIP_INCLUDE_DIR}
     ${QTKEYCHAIN_INCLUDE_DIRS}
+    ${TAGLIB_INCLUDE_DIR}
+    ${TAGLIB_INCLUDE_DIR}/..
 )
 
 IF(LIBATTICA_FOUND)
diff --git a/src/tools/tomahawk-test-musicscan/CMakeLists.txt b/src/tools/tomahawk-test-musicscan/CMakeLists.txt
index d12d380da..47f306d7a 100644
--- a/src/tools/tomahawk-test-musicscan/CMakeLists.txt
+++ b/src/tools/tomahawk-test-musicscan/CMakeLists.txt
@@ -1,3 +1,5 @@
+include_directories(${LIBATTICA_INCLUDE_DIR} ${TAGLIB_INCLUDE_DIR} ${TAGLIB_INCLUDE_DIR}/..)
+
 set( tomahawk_test_musicscan_src
     main.cpp
 )
diff --git a/src/viewpages/charts/CMakeLists.txt b/src/viewpages/charts/CMakeLists.txt
index e6653fde4..fd4565714 100644
--- a/src/viewpages/charts/CMakeLists.txt
+++ b/src/viewpages/charts/CMakeLists.txt
@@ -1,3 +1,5 @@
+include_directories(${LIBATTICA_INCLUDE_DIR})
+
 tomahawk_add_plugin(charts
     TYPE viewpage
     EXPORT_MACRO TOMAHAWK_VIEWPAGE_EXPORT_PRO
diff --git a/src/viewpages/dashboard/CMakeLists.txt b/src/viewpages/dashboard/CMakeLists.txt
index f3cadb023..a139435f4 100644
--- a/src/viewpages/dashboard/CMakeLists.txt
+++ b/src/viewpages/dashboard/CMakeLists.txt
@@ -1,3 +1,5 @@
+include_directories(${LIBATTICA_INCLUDE_DIR})
+
 tomahawk_add_plugin(dashboard
     TYPE viewpage
     EXPORT_MACRO TOMAHAWK_VIEWPAGE_EXPORT_PRO
diff --git a/src/viewpages/whatsnew_0_8/CMakeLists.txt b/src/viewpages/whatsnew_0_8/CMakeLists.txt
index dc3ae1ab5..a53cbc831 100644
--- a/src/viewpages/whatsnew_0_8/CMakeLists.txt
+++ b/src/viewpages/whatsnew_0_8/CMakeLists.txt
@@ -1,3 +1,5 @@
+include_directories(${LIBATTICA_INCLUDE_DIR})
+
 tomahawk_add_plugin(whatsnew_0_8
     TYPE viewpage
     EXPORT_MACRO TOMAHAWK_VIEWPAGE_EXPORT_PRO