diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -448,7 +448,7 @@
 
 add_definitions(-DBOOST_ALL_NO_LIB)
 find_package(Boost 1.55 REQUIRED COMPONENTS system) # for pigment and stage
-include_directories(${Boost_INCLUDE_DIRS})
+include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 ##
 ## Test for GNU Scientific Library
 ##
diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt
--- a/benchmarks/CMakeLists.txt
+++ b/benchmarks/CMakeLists.txt
@@ -6,7 +6,6 @@
 )
 include_directories(SYSTEM
     ${EIGEN3_INCLUDE_DIR}
-    ${Boost_INCLUDE_DIRS}
 )
 
 
diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
--- a/libs/image/CMakeLists.txt
+++ b/libs/image/CMakeLists.txt
@@ -21,7 +21,6 @@
 
 include_directories(SYSTEM
     ${EIGEN3_INCLUDE_DIR}
-    ${Boost_INCLUDE_DIRS}
 )
 
 if(FFTW3_FOUND)
diff --git a/libs/image/tests/CMakeLists.txt b/libs/image/tests/CMakeLists.txt
--- a/libs/image/tests/CMakeLists.txt
+++ b/libs/image/tests/CMakeLists.txt
@@ -23,7 +23,6 @@
 
 include_Directories(SYSTEM
     ${EIGEN3_INCLUDE_DIR}
-    ${Boost_INCLUDE_DIRS}
 )
 
 if(HAVE_VC)
diff --git a/libs/image/tiles3/CMakeLists.txt b/libs/image/tiles3/CMakeLists.txt
--- a/libs/image/tiles3/CMakeLists.txt
+++ b/libs/image/tiles3/CMakeLists.txt
@@ -1,2 +1 @@
-include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 add_subdirectory(tests)
diff --git a/libs/libqml/CMakeLists.txt b/libs/libqml/CMakeLists.txt
--- a/libs/libqml/CMakeLists.txt
+++ b/libs/libqml/CMakeLists.txt
@@ -4,7 +4,6 @@
 )
 
 include_directories(SYSTEM
-    ${Boost_INCLUDE_DIRS}
     ${EIGEN3_INCLUDE_DIR}
 )
 
diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
--- a/libs/pigment/CMakeLists.txt
+++ b/libs/pigment/CMakeLists.txt
@@ -11,9 +11,6 @@
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/resources
     ${CMAKE_CURRENT_SOURCE_DIR}/compositeops)
-include_directories(SYSTEM
-    ${Boost_INCLUDE_DIRS}
-)
 
 set(FILE_OPENEXR_SOURCES)
 set(LINK_OPENEXR_LIB)
diff --git a/libs/psd/CMakeLists.txt b/libs/psd/CMakeLists.txt
--- a/libs/psd/CMakeLists.txt
+++ b/libs/psd/CMakeLists.txt
@@ -1,5 +1,4 @@
 include_directories( ${CMAKE_BINARY_DIR}/libs/psd  #For kispsd_include.h
-                     ${Boost_INCLUDE_DIRS}
 )
 
 set(kritapsd_LIB_SRCS
diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt
--- a/libs/ui/CMakeLists.txt
+++ b/libs/ui/CMakeLists.txt
@@ -6,7 +6,6 @@
 include_directories(SYSTEM
     ${EIGEN3_INCLUDE_DIR}
     ${OCIO_INCLUDE_DIR}
-    ${Boost_INCLUDE_DIRS}
 )
 
 add_subdirectory( tests )
diff --git a/plugins/color/lcms2engine/CMakeLists.txt b/plugins/color/lcms2engine/CMakeLists.txt
--- a/plugins/color/lcms2engine/CMakeLists.txt
+++ b/plugins/color/lcms2engine/CMakeLists.txt
@@ -3,9 +3,7 @@
 add_subdirectory(tests)
 
 include_directories(SYSTEM
-    ${LCMS2_INCLUDE_DIR} 
-    ${Boost_INCLUDE_DIRS} 
-    
+    ${LCMS2_INCLUDE_DIR}
 )
 
 include_directories( 
diff --git a/plugins/dockers/animation/CMakeLists.txt b/plugins/dockers/animation/CMakeLists.txt
--- a/plugins/dockers/animation/CMakeLists.txt
+++ b/plugins/dockers/animation/CMakeLists.txt
@@ -1,8 +1,6 @@
 if (NOT WIN32 AND NOT APPLE)
     add_subdirectory(tests)
-endif()    
-
-include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
+endif()
 
 set(KRITA_ANIMATIONDOCKER_SOURCES
     animation_dockers.cpp
diff --git a/plugins/dockers/griddocker/CMakeLists.txt b/plugins/dockers/griddocker/CMakeLists.txt
--- a/plugins/dockers/griddocker/CMakeLists.txt
+++ b/plugins/dockers/griddocker/CMakeLists.txt
@@ -1,8 +1,3 @@
-include_directories(SYSTEM
-	${Boost_INCLUDE_DIRS}
-)
-
-
 set(KRITA_GRIDDOCKER_SOURCES griddocker.cpp griddocker_dock.cpp grid_config_widget.cpp)
 ki18n_wrap_ui(KRITA_GRIDDOCKER_SOURCES
     grid_config_widget.ui
diff --git a/plugins/dockers/lut/CMakeLists.txt b/plugins/dockers/lut/CMakeLists.txt
--- a/plugins/dockers/lut/CMakeLists.txt
+++ b/plugins/dockers/lut/CMakeLists.txt
@@ -4,7 +4,6 @@
 
 include_directories(SYSTEM
     ${OCIO_INCLUDE_DIR}
-    ${Boost_INCLUDE_DIRS}
 )
 
 set(KRITA_LUTDOCKER_SOURCES
diff --git a/plugins/dockers/lut/tests/CMakeLists.txt b/plugins/dockers/lut/tests/CMakeLists.txt
--- a/plugins/dockers/lut/tests/CMakeLists.txt
+++ b/plugins/dockers/lut/tests/CMakeLists.txt
@@ -2,7 +2,6 @@
 include_directories(${CMAKE_SOURCE_DIR}/sdk/tests)
 include_directories(SYSTEM
     ${OCIO_INCLUDE_DIR}
-    ${Boost_INCLUDE_DIRS}
     )
 
 ########### next target ###############
diff --git a/plugins/impex/csv/CMakeLists.txt b/plugins/impex/csv/CMakeLists.txt
--- a/plugins/impex/csv/CMakeLists.txt
+++ b/plugins/impex/csv/CMakeLists.txt
@@ -1,9 +1,5 @@
 add_subdirectory(tests)
 
-include_directories(SYSTEM
-    ${Boost_INCLUDE_DIRS}
-)
-
 # import
 
 set(kritacsvimport_SOURCES
diff --git a/plugins/impex/psd/CMakeLists.txt b/plugins/impex/psd/CMakeLists.txt
--- a/plugins/impex/psd/CMakeLists.txt
+++ b/plugins/impex/psd/CMakeLists.txt
@@ -11,7 +11,6 @@
 
 include_directories(SYSTEM
     ${ZLIB_INCLUDE_DIR}
-    ${Boost_INCLUDE_DIRS}
 )
 
 set(LIB_PSD_SRCS 
diff --git a/plugins/impex/spriter/CMakeLists.txt b/plugins/impex/spriter/CMakeLists.txt
--- a/plugins/impex/spriter/CMakeLists.txt
+++ b/plugins/impex/spriter/CMakeLists.txt
@@ -1,7 +1,3 @@
-include_directories(SYSTEM
-    ${Boost_INCLUDE_DIRS}
-)
-
 # export
 
 set(kritaspriterexport_SOURCES
diff --git a/plugins/impex/video/CMakeLists.txt b/plugins/impex/video/CMakeLists.txt
--- a/plugins/impex/video/CMakeLists.txt
+++ b/plugins/impex/video/CMakeLists.txt
@@ -1,9 +1,5 @@
-include_directories(${Boost_INCLUDE_DIRS})
-
 # export
 
-include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
-
 set(kritavideoexport_SOURCES
     kis_video_export.cpp
     video_saver.cpp
diff --git a/plugins/tools/basictools/CMakeLists.txt b/plugins/tools/basictools/CMakeLists.txt
--- a/plugins/tools/basictools/CMakeLists.txt
+++ b/plugins/tools/basictools/CMakeLists.txt
@@ -2,8 +2,6 @@
     add_subdirectory(tests)
 endif ()
 
-include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
-
 set(kritadefaulttools_SOURCES
     default_tools.cc
     kis_tool_colorpicker.cc
diff --git a/plugins/tools/tool_transform2/CMakeLists.txt b/plugins/tools/tool_transform2/CMakeLists.txt
--- a/plugins/tools/tool_transform2/CMakeLists.txt
+++ b/plugins/tools/tool_transform2/CMakeLists.txt
@@ -2,8 +2,6 @@
     add_subdirectory(tests)
 endif()
 
-include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
-
 set(kritatooltransform_SOURCES
     tool_transform.cc
     tool_transform_args.cc
diff --git a/plugins/tools/tool_transform2/tests/CMakeLists.txt b/plugins/tools/tool_transform2/tests/CMakeLists.txt
--- a/plugins/tools/tool_transform2/tests/CMakeLists.txt
+++ b/plugins/tools/tool_transform2/tests/CMakeLists.txt
@@ -3,7 +3,6 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/..
     ${CMAKE_CURRENT_BINARY_DIR}/..
     ${CMAKE_SOURCE_DIR}/sdk/tests
-    ${Boost_INCLUDE_DIRS}
 )
 
 macro_add_unittest_definitions()