diff --git a/runtime/builtin_kernels_simulation/CMakeLists.txt b/runtime/builtin_kernels_simulation/CMakeLists.txt
index 7bff8c258d..4c6e97dac9 100644
--- a/runtime/builtin_kernels_simulation/CMakeLists.txt
+++ b/runtime/builtin_kernels_simulation/CMakeLists.txt
@@ -59,7 +59,6 @@ endforeach()
 
 add_library(${BIKSIM_LIB_NAME} OBJECT ${BUILTIN_KERNELS_SIMULATION_SRCS})
 target_include_directories(${BIKSIM_LIB_NAME} BEFORE PRIVATE
-  ${IGDRCL_SOURCE_DIR}/runtime
   ${UMKM_SHAREDDATA_INCLUDE_PATHS}
   ${KHRONOS_HEADERS_DIR}
   ${IGDRCL__IGC_INCLUDE_DIR}
diff --git a/unit_tests/mock_gdi/CMakeLists.txt b/unit_tests/mock_gdi/CMakeLists.txt
index 37497f640e..9677b6904d 100644
--- a/unit_tests/mock_gdi/CMakeLists.txt
+++ b/unit_tests/mock_gdi/CMakeLists.txt
@@ -31,11 +31,6 @@ if(WIN32)
     ${DEF_FILE}
   )
 
-  # need to find our static lib
-  link_directories(
-    ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-  )
-
   # this is a DLL
   add_library(mock_gdi SHARED ${IGDRCL_SRCS_tests_mock_gdi})
 
@@ -44,8 +39,6 @@ if(WIN32)
   target_include_directories(mock_gdi PRIVATE
     ${WDK_INCLUDE_PATHS}
     ${UMKM_SHAREDDATA_INCLUDE_PATHS}
-    ${GMM_INCLUDE_PATHS}
-    ${KHRONOS_HEADERS_DIR}
   )
 
   set_target_properties(
diff --git a/unit_tests/mocks/CMakeLists.txt b/unit_tests/mocks/CMakeLists.txt
index ce4a2e3b12..7e8570187e 100644
--- a/unit_tests/mocks/CMakeLists.txt
+++ b/unit_tests/mocks/CMakeLists.txt
@@ -19,59 +19,59 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 
 set(IGDRCL_SRCS_tests_mocks
-    "${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_32bitAllocator.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_async_event_handler.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_block_kernel_manager.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_buffer.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_builtins.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_cif.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_cif.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_command_queue.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_compilers.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_compilers.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_context.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_context.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_csr.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_csr.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_deferrable_deletion.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_deferrable_deletion.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_deferred_deleter.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_deferred_deleter.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_device_queue.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_device.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_device.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_event.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_resource_info.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_resource_info.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_graphics_allocation.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}${IGDRCL__INSTRUMENTATION_DIR_SUFFIX}/mock_instrumentation.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_kernel.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_kernel.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_memory_manager.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_memory_manager.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_ostime.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_program.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_program.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_sampler.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/mock_submissions_aggregator.h"
+  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_32bitAllocator.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_async_event_handler.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_block_kernel_manager.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_buffer.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_builtins.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_cif.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_cif.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_command_queue.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_compilers.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_compilers.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_context.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_context.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_csr.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_csr.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_deferrable_deletion.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_deferrable_deletion.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_deferred_deleter.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_deferred_deleter.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_device_queue.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_device.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_device.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_event.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_resource_info.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_resource_info.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_graphics_allocation.h
+  ${CMAKE_CURRENT_SOURCE_DIR}${IGDRCL__INSTRUMENTATION_DIR_SUFFIX}/mock_instrumentation.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_kernel.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_kernel.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_memory_manager.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_memory_manager.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_ostime.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_program.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_program.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_sampler.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_submissions_aggregator.h
 )
 
 if (WIN32)
- list (APPEND IGDRCL_SRCS_tests_mocks
-   "${CMAKE_CURRENT_SOURCE_DIR}/mock_d3d_objects.h"
-   "${CMAKE_CURRENT_SOURCE_DIR}/mock_ostime_win.h"
-   "${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mock_gmm_memory.h"
-   "${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mock_gmm_memory.cpp"
-   "${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_page_table_mngr.h"
-   "${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_page_table_mngr.cpp"
+  list (APPEND IGDRCL_SRCS_tests_mocks
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_d3d_objects.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_ostime_win.h
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mock_gmm_memory.h
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mock_gmm_memory.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_page_table_mngr.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_page_table_mngr.cpp
   )
 endif()
 
-add_library(igdrcl_mocks STATIC ${IGDRCL_SRCS_tests_mocks})
+add_subdirectories()
 
-create_project_source_tree(igdrcl_mocks)
+add_library(igdrcl_mocks STATIC ${IGDRCL_SRCS_tests_mocks})
 
 add_dependencies(igdrcl_mocks gtest gmock)
 
@@ -80,8 +80,9 @@ target_include_directories(igdrcl_mocks PRIVATE
     ${GMOCK_INCLUDE_DIR}
     $<TARGET_PROPERTY:${NEO_STATIC_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>
 )
-target_compile_definitions(igdrcl_mocks PRIVATE MOCKABLE_VIRTUAL=virtual CIF_HEADERS_ONLY_BUILD)
+target_compile_definitions(igdrcl_mocks PRIVATE MOCKABLE_VIRTUAL=virtual $<TARGET_PROPERTY:${NEO_STATIC_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>)
 
 set_target_properties(igdrcl_mocks PROPERTIES POSITION_INDEPENDENT_CODE ON)
 set_target_properties(igdrcl_mocks PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
 set_target_properties(igdrcl_mocks PROPERTIES FOLDER "test mocks")
+create_project_source_tree(igdrcl_mocks)