diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3dcb3731c3..dbe853dfcc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,6 +117,8 @@ else ()
   set(EXTERNALS_BINARY_DIR "${EXTERNALS_BINARY_ROOT_DIR}/${CMAKE_GENERATOR}")
 endif ()
 
+set_property(DIRECTORY PROPERTY EP_PREFIX "project")
+
 file(GLOB HIFI_CUSTOM_MACROS "cmake/macros/*.cmake")
 foreach(CUSTOM_MACRO ${HIFI_CUSTOM_MACROS})
   include(${CUSTOM_MACRO})
diff --git a/libraries/networking/CMakeLists.txt b/libraries/networking/CMakeLists.txt
index 2236b93d32..f7dea6c10f 100644
--- a/libraries/networking/CMakeLists.txt
+++ b/libraries/networking/CMakeLists.txt
@@ -28,7 +28,7 @@ include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
 target_link_libraries(${TARGET_NAME} ${OPENSSL_LIBRARIES} ${TBB_LIBRARIES})
 
 # append tbb includes to our list of includes to bubble
-target_include_directories(${TARGET_NAME} PUBLIC ${TBB_INCLUDE_DIRS})
+target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${TBB_INCLUDE_DIRS})
 
 # call macro to include our dependency includes and bubble them up via a property on our target
 include_dependency_includes()
\ No newline at end of file