diff --git a/gtk2/style/CMakeLists.txt b/gtk2/style/CMakeLists.txt
index a0c7249a..19e0bade 100644
--- a/gtk2/style/CMakeLists.txt
+++ b/gtk2/style/CMakeLists.txt
@@ -1,90 +1,89 @@
 set(qtcurve_SRCS
   animation.cpp
   combobox.cpp
   dbus.cpp
   drawing.cpp
   entry.cpp
   helpers.cpp
   menu.cpp
   pixcache.cpp
   qtcurve.cpp
   qt_settings.cpp
   scrollbar.cpp
   scrolledwindow.cpp
   shadowhelper.cpp
   tab.cpp
   treeview.cpp
   widgetmap.cpp
   window.cpp
   wmmove.cpp)
 set(qtcurve_HDRS
   animation.h
   combobox.h
   compatability.h
   dbus.h
   drawing.h
   entry.h
   helpers.h
   menu.h
   pixcache.h
   qt_settings.h
   scrollbar.h
   scrolledwindow.h
   shadowhelper.h
   tab.h
   treeview.h
   widgetmap.h
   window.h
   wmmove.h)
 
 translate_add_sources(${qtcurve_SRCS} ${qtcurve_HDRS})
 
 if(NOT ENABLE_GTK2)
   return()
 endif()
 
 set(qtcurve_style_common_SRCS
   ../common/common.cpp
   ../common/config_file.cpp)
 
-include_directories(
-  ${GTK2_INCLUDE_DIRS}
-  ${CMAKE_CURRENT_BINARY_DIR})
+include_directories(SYSTEM ${GTK2_INCLUDE_DIRS})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 add_definitions(${GTK2_CFLAGS})
 
 set(GDK_PIXBUF_CSRC)
 find_program(GDK_PIXBUF_CSRC gdk-pixbuf-csource)
 if(NOT GDK_PIXBUF_CSRC)
   message(FATAL_ERROR "Cannot find gdk-pixbuf-csource.")
 endif()
 
 foreach(pngname check_on check_x_on blank16x16)
   add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${pngname}-png.h"
     COMMAND "${GDK_PIXBUF_CSRC}" --static --raw "--name=${pngname}"
     "${PROJECT_SOURCE_DIR}/data/${pngname}.png"
     > "${CMAKE_CURRENT_BINARY_DIR}/${pngname}-png.h"
     DEPENDS "${GDK_PIXBUF_CSRC}" "${PROJECT_SOURCE_DIR}/data/${pngname}.png")
   add_custom_target(qtc_gtk2_${pngname}_hdr
     DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${pngname}-png.h")
 endforeach()
 
 set(qtcurve_SRCS ${qtcurve_SRCS} ${qtcurve_style_common_SRCS})
 add_library(qtcurve-gtk2 MODULE ${qtcurve_SRCS})
 
 set_target_properties(qtcurve-gtk2 PROPERTIES
   LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
   OUTPUT_NAME "qtcurve")
 add_dependencies(qtcurve-gtk2 qtc_gtk2_check_on_hdr qtc_gtk2_check_x_on_hdr
   qtc_gtk2_blank16x16_hdr)
 
 target_link_libraries(qtcurve-gtk2
   ${GTK2_LDFLAGS}
   ${GTK2_LIBRARIES}
   qtcurve-utils qtcurve-cairo m)
 
 install(TARGETS qtcurve-gtk2 LIBRARY DESTINATION
   ${GTK2_LIBDIR}/gtk-2.0/${GTK2_BIN_VERSION}/engines)
 install(PROGRAMS map_kde_icons.pl DESTINATION ${GTK2_THEME_DIR}/gtk-2.0)
 install(FILES gtkrc icons3 icons4 kdeglobals
   DESTINATION ${GTK2_THEME_DIR}/gtk-2.0)
diff --git a/qt4/CMakeLists.txt b/qt4/CMakeLists.txt
index 088a529d..f6fb65db 100644
--- a/qt4/CMakeLists.txt
+++ b/qt4/CMakeLists.txt
@@ -1,67 +1,67 @@
 if(ENABLE_QT4 AND NOT ENABLE_QT4_DEFINED)
   # ENABLE_QT4 is not defined on the command line
   find_package(Qt4 4.6.0)
   if(NOT Qt4_FOUND AND NOT QT4_FOUND)
     ## NB: this gets activated on OS X 10.9/MacPorts even when Qt is found,
     ## making it obligatory to define ENABLE_QT4 on the command line
     message(WARNING "Qt4 not found.")
     set(ENABLE_QT4 Off)
     set(ENABLE_QT4 Off PARENT_SCOPE)
   endif()
 endif()
 
 if (QTC_QT4_ENABLE_KDE AND NOT QTC_QT4_ENABLE_KDE_DEFINED)
     find_package(KDE4)
     if(NOT KDE4_FOUND)
         set(QTC_QT4_ENABLE_KDE OFF)
     endif()
 endif()
 
 add_definitions(-DQTC_UTILS_QT4 -DQTC_UTILS_QT)
 
 if(ENABLE_QT4)
   find_package(Qt4 4.6.0 REQUIRED)
   # search packages used by KDE
   if(QTC_QT4_ENABLE_KDE)
     find_package(KDE4 REQUIRED)
     include(KDE4Defaults)
     set(QTCURVE_STYLE_DIR "${PLUGIN_INSTALL_DIR}/plugins/styles/")
     if(NOT Q_WS_X11 OR NOT QTC_X11_FOUND)
       # Kwin headers uses a lot of xcb types and functions and we cannot
       # provide declarations for all of them even if they are not used.
       if(QTC_QT4_ENABLE_KWIN)
         message(WARNING "KWin4 support require Q_WS_X11 and libxcb headers.")
       endif()
       set(QTC_QT4_ENABLE_KWIN Off)
     elseif(NOT DEFINED QTC_QT4_ENABLE_KWIN)
       find_package(KDE4Workspace)
       set(QTC_QT4_ENABLE_KWIN "${KDE4Workspace_FOUND}")
     elseif(QTC_QT4_ENABLE_KWIN)
       find_package(KDE4Workspace REQUIRED)
     endif()
   else()
     set(QTC_QT4_ENABLE_KWIN Off)
     set(QTCURVE_STYLE_DIR "${QT_PLUGINS_DIR}/styles/")
   endif()
   add_definitions(${QT_DEFINITIONS})
   include_directories(
     "${CMAKE_CURRENT_BINARY_DIR}"
-    "${CMAKE_CURRENT_SOURCE_DIR}"
-    "${QT_INCLUDE_DIR}")
+    "${CMAKE_CURRENT_SOURCE_DIR}")
+  include_directories(SYSTEM "${QT_INCLUDE_DIR}")
 
   if(QTC_QT4_ENABLE_KDE)
     add_definitions(${KDE4_DEFINITIONS} -DQTC_QT4_ENABLE_KDE)
-    include_directories(${KDE4_INCLUDES})
+    include_directories(SYSTEM ${KDE4_INCLUDES})
   endif()
 else()
   set(QTC_QT4_ENABLE_KDE Off)
   set(QTC_QT4_ENABLE_KWIN Off)
 endif()
 
 add_subdirectory(colors)
 add_subdirectory(common)
 add_subdirectory(config)
 add_subdirectory(themes)
 add_subdirectory(kwin)
 add_subdirectory(kwinconfig)
 add_subdirectory(style)
diff --git a/qt4/kwin/CMakeLists.txt b/qt4/kwin/CMakeLists.txt
index 9ca6e73b..32c68aa8 100644
--- a/qt4/kwin/CMakeLists.txt
+++ b/qt4/kwin/CMakeLists.txt
@@ -1,43 +1,43 @@
 set(kwin3_qtcurve_PART_SRCS
   qtcurvehandler.cpp
   qtcurveclient.cpp
   qtcurvebutton.cpp
   qtcurvesizegrip.cpp
   qtcurveshadowcache.cpp
   qtcurveconfig.cpp
   qtcurveshadowconfiguration.cpp
   tileset.cpp
   qtcurvetogglebutton.cpp)
 set(kwin3_qtcurve_PART_HDRS
   qtcurvehandler.h
   qtcurveclient.h
   qtcurvebutton.h
   qtcurvedbus.h
   qtcurvesizegrip.h
   qtcurveshadowcache.h
   qtcurveconfig.h
   qtcurveshadowconfiguration.h
   tileset.h
   qtcurvetogglebutton.h)
 
 translate_add_sources(${kwin3_qtcurve_PART_SRCS}
   ${kwin3_qtcurve_PART_HDRS} qtcurve.desktop)
 
 if(NOT QTC_QT4_ENABLE_KWIN)
   return()
 endif()
 
-include_directories(
-  "${CMAKE_CURRENT_BINARY_DIR}"
+include_directories("${CMAKE_CURRENT_BINARY_DIR}")
+include_directories(SYSTEM
   ${QT_QTGUI_INCLUDE_DIR}
   ${QT_QTCORE_INCLUDE_DIR}
   ${KDE4WORKSPACE_INCLUDE_DIR})
 kde4_add_plugin(kwin3_qtcurve_kde4 ${kwin3_qtcurve_PART_SRCS})
 set_target_properties(kwin3_qtcurve_kde4 PROPERTIES
   LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
   OUTPUT_NAME "kwin3_qtcurve")
 target_link_libraries(kwin3_qtcurve_kde4
   ${KDE4WORKSPACE_KDECORATIONS_LIBS}
   ${KDE4_KDEUI_LIBS} qtcurve-utils)
 install(TARGETS kwin3_qtcurve_kde4 DESTINATION "${PLUGIN_INSTALL_DIR}")
 install(FILES qtcurve.desktop DESTINATION "${DATA_INSTALL_DIR}/kwin/")
diff --git a/qt4/kwinconfig/CMakeLists.txt b/qt4/kwinconfig/CMakeLists.txt
index eb4b412e..27923132 100644
--- a/qt4/kwinconfig/CMakeLists.txt
+++ b/qt4/kwinconfig/CMakeLists.txt
@@ -1,30 +1,30 @@
 set(kwin_qtcurve_config_PART_SRCS
   qtcurvekwinconfig.cpp)
 set(kwin_qtcurve_config_PART_HDRS
   qtcurvekwinconfig.h)
 set(kwin_qtcurve_config_PART_UIS
   qtcurvekwinconfigwidget.ui)
 
 translate_add_sources(${kwin_qtcurve_config_PART_SRCS}
   ${kwin_qtcurve_config_PART_HDRS}
   ${kwin_qtcurve_config_PART_UIS})
 
 if(NOT QTC_QT4_ENABLE_KWIN)
   return()
 endif()
 
-include_directories("${CMAKE_CURRENT_BINARY_DIR}"
-  ${KDE4WORKSPACE_INCLUDE_DIR})
+include_directories("${CMAKE_CURRENT_BINARY_DIR}")
+include_directories(SYSTEM ${KDE4WORKSPACE_INCLUDE_DIR})
 set(kwin_qtcurve_config_PART_SRCS
   ${kwin_qtcurve_config_PART_SRCS}
   ../kwin/qtcurveconfig.cpp
   ../kwin/qtcurveshadowconfiguration.cpp)
 kde4_add_ui_files(kwin_qtcurve_config_PART_SRCS
   ${kwin_qtcurve_config_PART_UIS})
 kde4_add_plugin(kwin_qtcurve_config_kde4 ${kwin_qtcurve_config_PART_SRCS})
 set_target_properties(kwin_qtcurve_config_kde4 PROPERTIES
   LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
   OUTPUT_NAME "kwin_qtcurve_config")
 target_link_libraries(kwin_qtcurve_config_kde4
   ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} qtcurve-utils)
 install(TARGETS kwin_qtcurve_config_kde4 DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/qt4/style/CMakeLists.txt b/qt4/style/CMakeLists.txt
index 4ac461fa..0a0961c8 100644
--- a/qt4/style/CMakeLists.txt
+++ b/qt4/style/CMakeLists.txt
@@ -1,88 +1,89 @@
 set(qtcurve_SRCS
   qtcurve.cpp
   qtcurve_plugin.cpp
   windowmanager.cpp
   blurhelper.cpp
   prepolish.cpp
   utils.cpp
   shortcuthandler.cpp
   argbhelper.cpp
   macmenu.cpp
   shadowhelper.cpp)
 set(qtcurve_MOC_HDRS
   qtcurve.h
   qtcurve_p.h
   qtcurve_plugin.h
   windowmanager.h
   blurhelper.h
   shortcuthandler.h
   argbhelper.h
   macmenu.h
   macmenu-dbus.h
   shadowhelper.h)
 
 translate_add_sources(${qtcurve_SRCS} ${qtcurve_MOC_HDRS})
 
 if(NOT ENABLE_QT4)
   return()
 endif()
 
 set(qtcurve_style_common_SRCS
   ../common/common.cpp
   ../common/config_file.cpp)
 
 foreach(pngname check_on check_x_on dialog_error dialog_information
     dialog_warning)
   add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${pngname}-png.h"
     COMMAND "${PROJECT_BINARY_DIR}/tools/qt-dump-png"
     "${PROJECT_SOURCE_DIR}/data/${pngname}.png" "qtc_${pngname}"
     "${CMAKE_CURRENT_BINARY_DIR}/${pngname}-png.h"
     DEPENDS qt-dump-png "${PROJECT_SOURCE_DIR}/data/${pngname}.png")
   add_custom_target(qtc_qt4_${pngname}_hdr
     DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${pngname}-png.h")
 endforeach()
 
 set(qtcurve_SRCS
   ${qtcurve_SRCS}
   ${qtcurve_style_common_SRCS})
 
 add_definitions(-DQT_PLUGIN)
-include_directories("${CMAKE_CURRENT_BINARY_DIR}"
+include_directories("${CMAKE_CURRENT_BINARY_DIR}")
+include_directories(SYSTEM
   "${QT_QTGUI_INCLUDE_DIR}"
   "${QT_QTCORE_INCLUDE_DIR}"
   "${QT_QTDBUS_INCLUDE_DIR}"
   "${QT_QTSVG_INCLUDE_DIR}")
 qt4_wrap_cpp(qtcurve_MOC_SRCS ${qtcurve_MOC_HDRS})
 add_library(qtcurve-qt4 MODULE ${qtcurve_SRCS} ${qtcurve_MOC_SRCS})
 add_dependencies(qtcurve-qt4 qtc_qt4_check_on_hdr qtc_qt4_check_x_on_hdr)
 set_target_properties(qtcurve-qt4 PROPERTIES
   LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
   OUTPUT_NAME "qtcurve"
   PREFIX "")
 
 if(QTC_QT4_ENABLE_KDE)
   install(FILES qtcurve.themerc DESTINATION ${DATA_INSTALL_DIR}/kstyle/themes)
   set(QTC_KDE_LIBS ${KDE4_KDEUI_LIBS})
   if(NOT QTC_DISABLE_KDEFILEDIALOG_CALLS)
     set(QTC_KFILEDIALOG_LIBS ${KDE4_KIO_LIBS} ${KDE4_KDECORE_LIBS})
   endif()
 else()
   add_dependencies(qtcurve-qt4 qtc_qt4_dialog_error_hdr
     qtc_qt4_dialog_information_hdr
     qtc_qt4_dialog_warning_hdr)
 endif()
 
 target_link_libraries(qtcurve-qt4
   ${QTC_KDE_LIBS}
   ${QTC_KFILEDIALOG_LIBS}
   ${QT_QTGUI_LIBRARY}
   ${QT_QTCORE_LIBRARY}
   ${QT_QTSVG_LIBRARY}
   ${QT_QTDBUS_LIBRARY}
   qtcurve-utils)
 
 if(QTC_QT4_ENABLE_KDE)
   install(TARGETS qtcurve-qt4 DESTINATION ${QTCURVE_STYLE_DIR})
 else()
   install(TARGETS qtcurve-qt4 LIBRARY DESTINATION ${QTCURVE_STYLE_DIR})
 endif()