diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9cd19b2b..c1eb497ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,9 +66,6 @@ project(chipStar
   DESCRIPTION "HIP implementation for runtimes that support SPIR-V"
   LANGUAGES NONE)
 
-# Include our own headers in case someone installs chipStar to the same dir as LLVM
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
-
 include(FindLLVM) # Enables C, CXX
 include(LLVMCheck)
 include(chip_spv_cmake_macros)
@@ -111,6 +108,8 @@ if(NOT DEFINED LevelZero_LIBRARY)
   find_library(LevelZero_LIBRARY NAMES ze_loader PATHS ENV LD_LIBRARY_PATH NO_CACHE)
 endif()
 
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+
 if(LevelZero_LIBRARY)
   get_filename_component(LevelZeroLib_DIR ${LevelZero_LIBRARY} DIRECTORY CACHE)
   # Check if the library is in the system path
@@ -418,7 +417,8 @@ file(CREATE_LINK hipconfig.bin ${HIPCC_BUILD_PATH}/hipconfig SYMBOLIC)
 
 add_subdirectory(bin)
 
-add_subdirectory(spirv-extractor)
+add_subdirectory(tools/spirv-extractor)
+add_subdirectory(tools/opencl-spirv-compiler)
 if (CHIP_SKIP_TESTS_WITH_DOUBLES)
   set(SKIP_DOUBLE_TESTS "${CMAKE_BINARY_DIR}/bin/spirv-extractor" "--check-for-doubles")
   else()
@@ -863,4 +863,4 @@ endif()
 include(cmake/docker.cmake)
 
 add_subdirectory(host_math_funcs)
-target_link_libraries(CHIP PUBLIC ocml_host_math_funcs)
\ No newline at end of file
+target_link_libraries(CHIP PUBLIC ocml_host_math_funcs)