diff --git a/projects/cxbx/CMakeLists.txt b/projects/cxbx/CMakeLists.txt
index 819cb93e7..eaae62ff9 100644
--- a/projects/cxbx/CMakeLists.txt
+++ b/projects/cxbx/CMakeLists.txt
@@ -14,14 +14,9 @@ include_directories(
  "${CXBXR_ROOT_DIR}/import/OpenXDK/include"
  "${CXBXR_ROOT_DIR}/import/distorm/include"
  "${CXBXR_ROOT_DIR}/import/glew-2.0.0/include"
- "${CXBXR_ROOT_DIR}/import/subhook"
  "${CXBXR_ROOT_DIR}/import/DirectX9/include"
- "${CXBXR_ROOT_DIR}/import/XbSymbolDatabase"
  "${CXBXR_ROOT_DIR}/import/simpleini"
- "${CXBXR_ROOT_DIR}/import/libtommath"
- "${CXBXR_ROOT_DIR}/import/libtomcrypt/src/headers"
  "${CXBXR_ROOT_DIR}/import/winpcap/Include"
- "${CXBXR_ROOT_DIR}/import/SDL2/include"
  "${CXBXR_ROOT_DIR}/import/xxHash"
 )
 
diff --git a/projects/cxbxr-emu/CMakeLists.txt b/projects/cxbxr-emu/CMakeLists.txt
index 7f2467c43..bb68f6c6e 100644
--- a/projects/cxbxr-emu/CMakeLists.txt
+++ b/projects/cxbxr-emu/CMakeLists.txt
@@ -17,12 +17,8 @@ include_directories(
  "${CXBXR_ROOT_DIR}/import/OpenXDK/include"
  "${CXBXR_ROOT_DIR}/import/distorm/include"
  "${CXBXR_ROOT_DIR}/import/glew-2.0.0/include"
- "${CXBXR_ROOT_DIR}/import/subhook"
  "${CXBXR_ROOT_DIR}/import/DirectX9/include"
- "${CXBXR_ROOT_DIR}/import/XbSymbolDatabase"
  "${CXBXR_ROOT_DIR}/import/simpleini"
- "${CXBXR_ROOT_DIR}/import/libtommath"
- "${CXBXR_ROOT_DIR}/import/libtomcrypt/src/headers"
  "${CXBXR_ROOT_DIR}/import/winpcap/Include"
  "${CXBXR_ROOT_DIR}/import/xxHash"
 )
diff --git a/projects/libtom/crypt/CMakeLists.txt b/projects/libtom/crypt/CMakeLists.txt
index 086f1ca1e..d922f60ca 100644
--- a/projects/libtom/crypt/CMakeLists.txt
+++ b/projects/libtom/crypt/CMakeLists.txt
@@ -17,11 +17,6 @@ add_compile_definitions(
  LTC_NO_PROTOTYPES
 )
 
-include_directories(
- "${CXBXR_ROOT_DIR}/import/libtommath"
- "${CXBXR_ROOT_DIR}/import/libtomcrypt/src/headers"
-)
-
 file (GLOB HEADERS
  "${CXBXR_ROOT_DIR}/import/libtomcrypt/src/headers/tomcrypt.h"
  "${CXBXR_ROOT_DIR}/import/libtomcrypt/src/headers/tomcrypt_argchk.h"
@@ -462,6 +457,10 @@ add_library(libtomcrypt ${HEADERS} ${SOURCES})
 
 target_compile_definitions(libtomcrypt PUBLIC LTM_DESC=1)
 
+target_include_directories(libtomcrypt
+ PUBLIC "${CXBXR_ROOT_DIR}/import/libtomcrypt/src/headers"
+)
+
 target_link_libraries(libtomcrypt
  PUBLIC libtommath
 
diff --git a/projects/libtom/math/CMakeLists.txt b/projects/libtom/math/CMakeLists.txt
index a212fc9bb..623cc7012 100644
--- a/projects/libtom/math/CMakeLists.txt
+++ b/projects/libtom/math/CMakeLists.txt
@@ -11,11 +11,6 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
  )
 endif()
 
-
-include_directories(
- "${CXBXR_ROOT_DIR}/import/libtommath"
-)
-
 file (GLOB HEADERS
  "${CXBXR_ROOT_DIR}/import/libtommath/tommath.h"
  "${CXBXR_ROOT_DIR}/import/libtommath/tommath_class.h"
@@ -170,3 +165,7 @@ source_group(TREE ${CXBXR_ROOT_DIR}/import/libtommath PREFIX header FILES ${HEAD
 source_group(TREE ${CXBXR_ROOT_DIR}/import/libtommath PREFIX source FILES ${SOURCES})
 
 add_library(libtommath ${HEADERS} ${SOURCES})
+
+target_include_directories(libtommath
+ PUBLIC "${CXBXR_ROOT_DIR}/import/libtommath"
+)