diff --git a/cmake/macros/IncludeHifiLibraryHeaders.cmake b/cmake/macros/IncludeHifiLibraryHeaders.cmake
index 913d1e1181..008d76a8dc 100644
--- a/cmake/macros/IncludeHifiLibraryHeaders.cmake
+++ b/cmake/macros/IncludeHifiLibraryHeaders.cmake
@@ -10,5 +10,5 @@
 # 
 
 macro(include_hifi_library_headers LIBRARY)
-  include_directories("${HIFI_LIBRARY_DIR}/${LIBRARY}/src")
+  target_include_directories(${TARGET_NAME} PRIVATE "${HIFI_LIBRARY_DIR}/${LIBRARY}/src")
 endmacro(include_hifi_library_headers _library _root_dir)
\ No newline at end of file
diff --git a/cmake/macros/LinkHifiLibraries.cmake b/cmake/macros/LinkHifiLibraries.cmake
index 7a6a136799..6a430f5b13 100644
--- a/cmake/macros/LinkHifiLibraries.cmake
+++ b/cmake/macros/LinkHifiLibraries.cmake
@@ -19,8 +19,8 @@ function(LINK_HIFI_LIBRARIES)
   endforeach()
 
   foreach(HIFI_LIBRARY ${LIBRARIES_TO_LINK})
-    include_directories("${HIFI_LIBRARY_DIR}/${HIFI_LIBRARY}/src")
-    include_directories("${CMAKE_BINARY_DIR}/libraries/${HIFI_LIBRARY}")
+    target_include_directories(${TARGET_NAME} PRIVATE "${HIFI_LIBRARY_DIR}/${HIFI_LIBRARY}/src")
+    target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_BINARY_DIR}/libraries/${HIFI_LIBRARY}")
     # link the actual library - it is static so don't bubble it up
     target_link_libraries(${TARGET_NAME} ${HIFI_LIBRARY})
   endforeach()
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index c013cfacd3..81b9935aa5 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -265,7 +265,7 @@ foreach(EXTERNAL ${OPTIONAL_EXTERNALS})
 endforeach()
 
 # include headers for interface and InterfaceConfig.
-include_directories("${PROJECT_SOURCE_DIR}/src")
+target_include_directories(${TARGET_NAME} PRIVATE "${PROJECT_SOURCE_DIR}/src")
 
 if (ANDROID)
   find_library(ANDROID_LOG_LIB log)
diff --git a/libraries/entities/CMakeLists.txt b/libraries/entities/CMakeLists.txt
index fcbe563f88..e359c7132f 100644
--- a/libraries/entities/CMakeLists.txt
+++ b/libraries/entities/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(TARGET_NAME entities)
 setup_hifi_library(Network Script)
-include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
+target_include_directories(${TARGET_NAME} PRIVATE "${OPENSSL_INCLUDE_DIR}")	
 include_hifi_library_headers(hfm)
 include_hifi_library_headers(fbx)
 include_hifi_library_headers(gpu)
diff --git a/libraries/gl/CMakeLists.txt b/libraries/gl/CMakeLists.txt
index 925cf9b288..855452e8f0 100644
--- a/libraries/gl/CMakeLists.txt
+++ b/libraries/gl/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(TARGET_NAME gl)
-setup_hifi_library(Gui Widgets Qml Quick)
+setup_hifi_library(Gui Widgets)
 link_hifi_libraries(shared)
 target_opengl()