diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93e7e3b2..0ec829ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,9 +110,8 @@ if (NOT TARGET boost)
     if (NOT Boost_INCLUDE_DIRS)
         find_package(Boost 1.57.0 REQUIRED)
     endif()
-    add_library(boost INTERFACE IMPORTED)
-    set_property(TARGET boost PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
-    set_property(TARGET boost PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
+    add_library(boost INTERFACE)
+    target_include_directories(boost SYSTEM INTERFACE ${Boost_INCLUDE_DIRS})
 endif()
 
 # Enable unit-testing.
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index d3d7b4d6..db846225 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -10,7 +10,7 @@ endif()
 if (NOT TARGET xbyak)
     if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
         add_library(xbyak INTERFACE)
-        target_include_directories(xbyak INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/xbyak/xbyak)
+        target_include_directories(xbyak SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/xbyak/xbyak)
         target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES)
     endif()
 endif()