Correct include dir for libslang (#5539)

This stops adding the repo root to the include path for anything linking
with slang. This enabled a bunch of convenient includes, but might lead
to confusing behavior for anyone including slang. Not to mention
differences including it from an install vs source.

Co-authored-by: Yong He <yonghe@outlook.com>

108 files changed, 240 insertions, 229 deletions

diff --git a/cmake/LLVM.cmake b/cmake/LLVM.cmake
index e0b7d6241..3c7c1b543 100644
--- a/cmake/LLVM.cmake
+++ b/cmake/LLVM.cmake
@@ -79,6 +79,10 @@ function(fetch_or_build_slang_llvm)
             LINK_WITH_PRIVATE core compiler-core llvm-dep clang-dep
             # We include slang.h, but don't need to link with it
             INCLUDE_FROM_PRIVATE slang
+            # We include tools/slang-test/filecheck.h, but don't need to link
+            # with it and it might not be a target if SLANG_ENABLE_TESTS is
+            # false, so just include the directory manually here
+            INCLUDE_DIRECTORIES_PRIVATE ${slang_SOURCE_DIR}/tools
             # This uses the SLANG_DLL_EXPORT macro from slang.h, so make sure to set
             # SLANG_DYNAMIC and SLANG_DYNAMIC_EXPORT
             EXPORT_MACRO_PREFIX SLANG
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index ad2d6f319..960db6b39 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -64,6 +64,7 @@ if(SLANG_ENABLE_EXAMPLES)
             slang
             gfx
             platform
+            stb
             $<$<BOOL:${SLANG_ENABLE_CUDA}>:CUDA::cuda_driver>
         FOLDER examples
     )
diff --git a/examples/autodiff-texture/main.cpp b/examples/autodiff-texture/main.cpp
index d09b7dbac..647929e70 100644
--- a/examples/autodiff-texture/main.cpp
+++ b/examples/autodiff-texture/main.cpp
@@ -1,11 +1,11 @@
+#include "core/slang-basic.h"
 #include "examples/example-base/example-base.h"
 #include "gfx-util/shader-cursor.h"
+#include "platform/vector-math.h"
+#include "platform/window.h"
 #include "slang-com-ptr.h"
 #include "slang-gfx.h"
 #include "slang.h"
-#include "source/core/slang-basic.h"
-#include "tools/platform/vector-math.h"
-#include "tools/platform/window.h"
 
 using namespace gfx;
 using namespace Slang;
diff --git a/examples/example-base/example-base.cpp b/examples/example-base/example-base.cpp
index 9fee95dfe..9d5f1bcae 100644
--- a/examples/example-base/example-base.cpp
+++ b/examples/example-base/example-base.cpp
@@ -7,7 +7,7 @@
 #endif
 
 #define STB_IMAGE_IMPLEMENTATION
-#include "external/stb/stb_image.h"
+#include "stb_image.h"
 
 using namespace Slang;
 using namespace gfx;
diff --git a/examples/example-base/example-base.h b/examples/example-base/example-base.h
index c10231c14..0cb3de7e9 100644
--- a/examples/example-base/example-base.h
+++ b/examples/example-base/example-base.h
@@ -1,10 +1,10 @@
 #pragma once
 
+#include "core/slang-basic.h"
+#include "core/slang-io.h"
+#include "platform/window.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "source/core/slang-io.h"
 #include "test-base.h"
-#include "tools/platform/window.h"
 
 #ifdef _WIN32
 void _Win32OutputDebugString(const char* str);
diff --git a/examples/example-base/test-base.h b/examples/example-base/test-base.h
index 3f600eae7..293c9f0d8 100644
--- a/examples/example-base/test-base.h
+++ b/examples/example-base/test-base.h
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "core/slang-string-util.h"
 #include "slang-com-ptr.h"
 #include "slang.h"
-#include "source/core/slang-string-util.h"
 
 using Slang::ComPtr;
 
diff --git a/examples/gpu-printing/main.cpp b/examples/gpu-printing/main.cpp
index fa9f919dc..bbc300dba 100644
--- a/examples/gpu-printing/main.cpp
+++ b/examples/gpu-printing/main.cpp
@@ -5,12 +5,12 @@
 #include <string>
 using Slang::ComPtr;
 
+#include "core/slang-basic.h"
 #include "examples/example-base/example-base.h"
 #include "gfx-util/shader-cursor.h"
 #include "gpu-printing.h"
+#include "platform/window.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/platform/window.h"
 
 using namespace gfx;
 
diff --git a/examples/hello-world/main.cpp b/examples/hello-world/main.cpp
index c6774b64f..7e84d83e5 100644
--- a/examples/hello-world/main.cpp
+++ b/examples/hello-world/main.cpp
@@ -7,11 +7,11 @@
 // The goal is to demonstrate how to use the Slang API to cross compile
 // shader code.
 //
+#include "core/slang-string-util.h"
 #include "examples/example-base/example-base.h"
 #include "examples/example-base/test-base.h"
 #include "slang-com-ptr.h"
 #include "slang.h"
-#include "source/core/slang-string-util.h"
 #include "vulkan-api.h"
 
 using Slang::ComPtr;
diff --git a/examples/model-viewer/main.cpp b/examples/model-viewer/main.cpp
index 0b1167a11..8b75381be 100644
--- a/examples/model-viewer/main.cpp
+++ b/examples/model-viewer/main.cpp
@@ -25,12 +25,12 @@
 // and parameter binding.
 //
 #include "examples/example-base/example-base.h"
+#include "gfx-util/shader-cursor.h"
+#include "platform/gui.h"
+#include "platform/model.h"
+#include "platform/vector-math.h"
+#include "platform/window.h"
 #include "slang-gfx.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/platform/gui.h"
-#include "tools/platform/model.h"
-#include "tools/platform/vector-math.h"
-#include "tools/platform/window.h"
 
 #include <map>
 #include <sstream>
diff --git a/examples/nv-aftermath-example/main.cpp b/examples/nv-aftermath-example/main.cpp
index 67754a911..9d85f1ff4 100644
--- a/examples/nv-aftermath-example/main.cpp
+++ b/examples/nv-aftermath-example/main.cpp
@@ -3,13 +3,13 @@
 #include "../../source/core/slang-io.h"
 #include "GFSDK_Aftermath.h"
 #include "GFSDK_Aftermath_GpuCrashDump.h"
+#include "core/slang-basic.h"
 #include "examples/example-base/example-base.h"
 #include "gfx-util/shader-cursor.h"
+#include "platform/window.h"
 #include "slang-com-ptr.h"
 #include "slang-gfx.h"
 #include "slang.h"
-#include "source/core/slang-basic.h"
-#include "tools/platform/window.h"
 
 using namespace gfx;
 using namespace Slang;
diff --git a/examples/platform-test/main.cpp b/examples/platform-test/main.cpp
index daa9bbc4b..373c15e09 100644
--- a/examples/platform-test/main.cpp
+++ b/examples/platform-test/main.cpp
@@ -1,6 +1,6 @@
 #include "examples/example-base/example-base.h"
+#include "platform/window.h"
 #include "slang.h"
-#include "tools/platform/window.h"
 
 using namespace gfx;
 using namespace Slang;
diff --git a/examples/ray-tracing-pipeline/main.cpp b/examples/ray-tracing-pipeline/main.cpp
index d32130c6a..1e55c7eb1 100644
--- a/examples/ray-tracing-pipeline/main.cpp
+++ b/examples/ray-tracing-pipeline/main.cpp
@@ -3,14 +3,14 @@
 // This file implements an example of hardware ray-tracing using
 // Slang shaders and the `gfx` graphics API.
 
+#include "core/slang-basic.h"
 #include "examples/example-base/example-base.h"
 #include "gfx-util/shader-cursor.h"
+#include "platform/vector-math.h"
+#include "platform/window.h"
 #include "slang-com-ptr.h"
 #include "slang-gfx.h"
 #include "slang.h"
-#include "source/core/slang-basic.h"
-#include "tools/platform/vector-math.h"
-#include "tools/platform/window.h"
 
 using namespace gfx;
 using namespace Slang;
diff --git a/examples/ray-tracing/main.cpp b/examples/ray-tracing/main.cpp
index aa1e42654..7878550f8 100644
--- a/examples/ray-tracing/main.cpp
+++ b/examples/ray-tracing/main.cpp
@@ -3,14 +3,14 @@
 // This file implements an example of hardware ray-tracing using
 // Slang shaders and the `gfx` graphics API.
 
+#include "core/slang-basic.h"
 #include "examples/example-base/example-base.h"
 #include "gfx-util/shader-cursor.h"
+#include "platform/vector-math.h"
+#include "platform/window.h"
 #include "slang-com-ptr.h"
 #include "slang-gfx.h"
 #include "slang.h"
-#include "source/core/slang-basic.h"
-#include "tools/platform/vector-math.h"
-#include "tools/platform/window.h"
 
 using namespace gfx;
 using namespace Slang;
diff --git a/examples/shader-object/main.cpp b/examples/shader-object/main.cpp
index 74d81604b..f5c02141f 100644
--- a/examples/shader-object/main.cpp
+++ b/examples/shader-object/main.cpp
@@ -12,10 +12,10 @@
 #include "slang.h"
 using Slang::ComPtr;
 
+#include "core/slang-basic.h"
 #include "examples/example-base/example-base.h"
 #include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
 
 using namespace gfx;
 
diff --git a/examples/shader-toy/main.cpp b/examples/shader-toy/main.cpp
index 38212099e..1ab85c0b2 100644
--- a/examples/shader-toy/main.cpp
+++ b/examples/shader-toy/main.cpp
@@ -19,12 +19,12 @@ using Slang::ComPtr;
 // this layer is *not* required or assumed when using the Slang language,
 // compiler, and API.
 //
+#include "core/slang-basic.h"
 #include "examples/example-base/example-base.h"
+#include "gfx-util/shader-cursor.h"
+#include "platform/performance-counter.h"
+#include "platform/window.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/platform/performance-counter.h"
-#include "tools/platform/window.h"
 
 #include <chrono>
 
diff --git a/examples/triangle/main.cpp b/examples/triangle/main.cpp
index d5f929bf2..e77f488cc 100644
--- a/examples/triangle/main.cpp
+++ b/examples/triangle/main.cpp
@@ -32,12 +32,12 @@
 // with Slang may depend on an application/engine making certain
 // design choices in their abstraction layer.
 //
+#include "core/slang-basic.h"
 #include "examples/example-base/example-base.h"
 #include "gfx-util/shader-cursor.h"
+#include "platform/window.h"
 #include "slang-com-ptr.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/platform/window.h"
 
 using namespace gfx;
 using namespace Slang;
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 091070e5d..43105a5f0 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -91,8 +91,12 @@ endif()
 add_library(imgui INTERFACE)
 target_include_directories(imgui INTERFACE "${CMAKE_CURRENT_LIST_DIR}/imgui")
 
+# stb
+add_library(stb INTERFACE)
+target_include_directories(stb INTERFACE "${CMAKE_CURRENT_LIST_DIR}/stb")
+
+# slang-rhi
 if(SLANG_ENABLE_SLANG_RHI)
-    # slang-rhi
     set(SLANG_RHI_BINARY_DIR ${CMAKE_BINARY_DIR}/$<CONFIG>/bin)
     set(SLANG_RHI_SLANG_INCLUDE_DIR ${slang_SOURCE_DIR}/include)
     set(SLANG_RHI_SLANG_BINARY_DIR ${CMAKE_BINARY_DIR})
diff --git a/source/slang-llvm/slang-llvm-filecheck.cpp b/source/slang-llvm/slang-llvm-filecheck.cpp
index c319a61c9..492b0e0d4 100644
--- a/source/slang-llvm/slang-llvm-filecheck.cpp
+++ b/source/slang-llvm/slang-llvm-filecheck.cpp
@@ -9,7 +9,7 @@
 #include <llvm/ADT/SmallString.h>
 #include <llvm/FileCheck/FileCheck.h>
 #include <llvm/Support/raw_ostream.h>
-#include <tools/slang-test/filecheck.h>
+#include <slang-test/filecheck.h>
 
 namespace slang_llvm
 {
diff --git a/source/slang/CMakeLists.txt b/source/slang/CMakeLists.txt
index 278456dbb..0adaa04a7 100644
--- a/source/slang/CMakeLists.txt
+++ b/source/slang/CMakeLists.txt
@@ -224,12 +224,7 @@ set(slang_link_args
     slang-lookup-tables
     SPIRV-Headers
 )
-set(slang_interface_args
-    # slang.h is in the project root, so include that directory in the interface
-    # for slang
-    INCLUDE_DIRECTORIES_PUBLIC
-    ${slang_SOURCE_DIR}
-)
+set(slang_interface_args INCLUDE_DIRECTORIES_PUBLIC ${slang_SOURCE_DIR}/include)
 set(slang_public_lib_args
     PUBLIC_HEADERS
     ${slang_SOURCE_DIR}/include/slang*.h
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 2593a60fd..8438fe6b8 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -98,6 +98,7 @@ if(SLANG_ENABLE_GFX)
         LINK_WITH_PRIVATE
             core
             imgui
+            stb
             $<$<BOOL:${SLANG_ENABLE_XLIB}>:X11::X11>
             "$<$<PLATFORM_ID:Darwin>:-framework Cocoa>"
             "$<$<PLATFORM_ID:Darwin>:-framework QuartzCore>"
@@ -106,7 +107,7 @@ if(SLANG_ENABLE_GFX)
         EXTRA_COMPILE_DEFINITIONS_PRIVATE
             $<$<BOOL:${SLANG_ENABLE_XLIB}>:SLANG_ENABLE_XLIB=1>
         INCLUDE_FROM_PRIVATE gfx
-        INCLUDE_DIRECTORIES_PUBLIC platform
+        INCLUDE_DIRECTORIES_PUBLIC . platform
         EXPORT_MACRO_PREFIX SLANG_PLATFORM
     )
 
@@ -122,6 +123,7 @@ if(SLANG_ENABLE_GFX)
             slang
             Vulkan-Headers
             metal-cpp
+            stb
             $<$<BOOL:${SLANG_ENABLE_XLIB}>:X11::X11>
             $<$<BOOL:${SLANG_ENABLE_CUDA}>:CUDA::cuda_driver>
         LINK_WITH_FRAMEWORK Foundation Cocoa QuartzCore Metal
@@ -182,6 +184,7 @@ if(SLANG_ENABLE_TESTS)
         EXECUTABLE
         EXCLUDE_FROM_ALL
         LINK_WITH_PRIVATE core compiler-core slang
+        INCLUDE_FROM_PRIVATE unit-test
         FOLDER test
     )
     slang_add_target(
@@ -196,10 +199,12 @@ if(SLANG_ENABLE_TESTS)
         slang-test
         EXECUTABLE
         USE_FEWER_WARNINGS
+        INCLUDE_DIRECTORIES_PUBLIC .
         LINK_WITH_PRIVATE
             core
             compiler-core
             slang
+            stb
             ${CMAKE_DL_LIBS}
             Threads::Threads
         REQUIRES
@@ -241,6 +246,7 @@ if(SLANG_ENABLE_TESTS)
         unit-test
         OBJECT
         EXCLUDE_FROM_ALL
+        INCLUDE_DIRECTORIES_PUBLIC .
         INCLUDE_FROM_PRIVATE slang core
         INCLUDE_DIRECTORIES_PRIVATE ${slang_SOURCE_DIR}/include
         FOLDER test
@@ -254,7 +260,7 @@ if(SLANG_ENABLE_TESTS)
             EXCLUDE_FROM_ALL
             EXTRA_COMPILE_DEFINITIONS_PRIVATE SLANG_SHARED_LIBRARY_TOOL
             USE_FEWER_WARNINGS
-            LINK_WITH_PRIVATE core slang unit-test gfx gfx-util platform
+            LINK_WITH_PRIVATE core slang unit-test gfx gfx-util platform stb
             OUTPUT_NAME gfx-unit-test-tool
             REQUIRED_BY slang-test
             FOLDER test/tools
@@ -272,6 +278,7 @@ if(SLANG_ENABLE_TESTS)
                     slang
                     slang-rhi
                     platform
+                    stb
                     $<$<BOOL:${SLANG_ENABLE_CUDA}>:CUDA::cuda_driver>
                 EXTRA_COMPILE_DEFINITIONS_PRIVATE
                     $<$<BOOL:${SLANG_ENABLE_CUDA}>:RENDER_TEST_CUDA>
diff --git a/tools/gfx-unit-test/buffer-barrier-test.cpp b/tools/gfx-unit-test/buffer-barrier-test.cpp
index 2ee78fdb1..2d53ac13f 100644
--- a/tools/gfx-unit-test/buffer-barrier-test.cpp
+++ b/tools/gfx-unit-test/buffer-barrier-test.cpp
@@ -1,8 +1,8 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 
diff --git a/tools/gfx-unit-test/clear-texture-test.cpp b/tools/gfx-unit-test/clear-texture-test.cpp
index ed9d12f0d..3e1efae0a 100644
--- a/tools/gfx-unit-test/clear-texture-test.cpp
+++ b/tools/gfx-unit-test/clear-texture-test.cpp
@@ -1,8 +1,8 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace Slang;
 using namespace gfx;
diff --git a/tools/gfx-unit-test/compute-smoke.cpp b/tools/gfx-unit-test/compute-smoke.cpp
index da8357591..ba1da2283 100644
--- a/tools/gfx-unit-test/compute-smoke.cpp
+++ b/tools/gfx-unit-test/compute-smoke.cpp
@@ -1,8 +1,8 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 
diff --git a/tools/gfx-unit-test/compute-trivial.cpp b/tools/gfx-unit-test/compute-trivial.cpp
index 341593d04..c89748229 100644
--- a/tools/gfx-unit-test/compute-trivial.cpp
+++ b/tools/gfx-unit-test/compute-trivial.cpp
@@ -1,8 +1,8 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 
diff --git a/tools/gfx-unit-test/copy-texture-tests.cpp b/tools/gfx-unit-test/copy-texture-tests.cpp
index babe0bcf1..f6f85f9f4 100644
--- a/tools/gfx-unit-test/copy-texture-tests.cpp
+++ b/tools/gfx-unit-test/copy-texture-tests.cpp
@@ -1,9 +1,9 @@
+#include "core/slang-basic.h"
 #include "gfx-test-texture-util.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #if SLANG_WINDOWS_FAMILY
 #include <d3d12.h>
diff --git a/tools/gfx-unit-test/create-buffer-from-handle.cpp b/tools/gfx-unit-test/create-buffer-from-handle.cpp
index a4e743196..f25aa5d5f 100644
--- a/tools/gfx-unit-test/create-buffer-from-handle.cpp
+++ b/tools/gfx-unit-test/create-buffer-from-handle.cpp
@@ -1,8 +1,8 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 
diff --git a/tools/gfx-unit-test/existing-device-handle-test.cpp b/tools/gfx-unit-test/existing-device-handle-test.cpp
index e971100b9..8b7a84ec2 100644
--- a/tools/gfx-unit-test/existing-device-handle-test.cpp
+++ b/tools/gfx-unit-test/existing-device-handle-test.cpp
@@ -1,8 +1,8 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 
diff --git a/tools/gfx-unit-test/format-unit-tests.cpp b/tools/gfx-unit-test/format-unit-tests.cpp
index 3b7695ccc..56741854e 100644
--- a/tools/gfx-unit-test/format-unit-tests.cpp
+++ b/tools/gfx-unit-test/format-unit-tests.cpp
@@ -1,8 +1,8 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 
diff --git a/tools/gfx-unit-test/get-buffer-resource-handle-test.cpp b/tools/gfx-unit-test/get-buffer-resource-handle-test.cpp
index 83c3f400d..97bb413fd 100644
--- a/tools/gfx-unit-test/get-buffer-resource-handle-test.cpp
+++ b/tools/gfx-unit-test/get-buffer-resource-handle-test.cpp
@@ -1,8 +1,8 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #if SLANG_WINDOWS_FAMILY
 #include <d3d12.h>
diff --git a/tools/gfx-unit-test/get-cmd-buffer-handle-test.cpp b/tools/gfx-unit-test/get-cmd-buffer-handle-test.cpp
index c916c0d6d..b1e7ebc04 100644
--- a/tools/gfx-unit-test/get-cmd-buffer-handle-test.cpp
+++ b/tools/gfx-unit-test/get-cmd-buffer-handle-test.cpp
@@ -1,8 +1,8 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #if SLANG_WINDOWS_FAMILY
 #include <d3d12.h>
diff --git a/tools/gfx-unit-test/get-cmd-queue-handle-test.cpp b/tools/gfx-unit-test/get-cmd-queue-handle-test.cpp
index f8b3850a1..5e72c41d9 100644
--- a/tools/gfx-unit-test/get-cmd-queue-handle-test.cpp
+++ b/tools/gfx-unit-test/get-cmd-queue-handle-test.cpp
@@ -1,8 +1,8 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #if SLANG_WINDOWS_FAMILY
 #include <d3d12.h>
diff --git a/tools/gfx-unit-test/get-supported-resource-states-test.cpp b/tools/gfx-unit-test/get-supported-resource-states-test.cpp
index 9870dfa1f..844372eaa 100644
--- a/tools/gfx-unit-test/get-supported-resource-states-test.cpp
+++ b/tools/gfx-unit-test/get-supported-resource-states-test.cpp
@@ -1,8 +1,8 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #if SLANG_WINDOWS_FAMILY
 #include <d3d12.h>
diff --git a/tools/gfx-unit-test/get-texture-resource-handle-test.cpp b/tools/gfx-unit-test/get-texture-resource-handle-test.cpp
index 2cd2ba658..4a7412ddc 100644
--- a/tools/gfx-unit-test/get-texture-resource-handle-test.cpp
+++ b/tools/gfx-unit-test/get-texture-resource-handle-test.cpp
@@ -1,8 +1,8 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #if SLANG_WINDOWS_FAMILY
 #include <d3d12.h>
diff --git a/tools/gfx-unit-test/gfx-test-texture-util.cpp b/tools/gfx-unit-test/gfx-test-texture-util.cpp
index bb2c9c5eb..7e6d738ee 100644
--- a/tools/gfx-unit-test/gfx-test-texture-util.cpp
+++ b/tools/gfx-unit-test/gfx-test-texture-util.cpp
@@ -2,7 +2,7 @@
 
 #include "gfx-test-util.h"
 #include "slang-com-ptr.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -12,7 +12,7 @@
 #pragma warning(disable : 4996)
 #endif
 #define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "external/stb/stb_image_write.h"
+#include "stb_image_write.h"
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
diff --git a/tools/gfx-unit-test/gfx-test-texture-util.h b/tools/gfx-unit-test/gfx-test-texture-util.h
index 2751a2a20..6a98eec43 100644
--- a/tools/gfx-unit-test/gfx-test-texture-util.h
+++ b/tools/gfx-unit-test/gfx-test-texture-util.h
@@ -1,9 +1,9 @@
 #pragma once
 
+#include "core/slang-basic.h"
+#include "core/slang-render-api-util.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "source/core/slang-render-api-util.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace Slang;
 using namespace gfx;
diff --git a/tools/gfx-unit-test/gfx-test-util.cpp b/tools/gfx-unit-test/gfx-test-util.cpp
index 79343680f..2bbe65416 100644
--- a/tools/gfx-unit-test/gfx-test-util.cpp
+++ b/tools/gfx-unit-test/gfx-test-util.cpp
@@ -1,7 +1,7 @@
 #include "gfx-test-util.h"
 
 #include "slang-com-ptr.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #define GFX_ENABLE_RENDERDOC_INTEGRATION 0
 #define GFX_ENABLE_SPIRV_DEBUG 0
diff --git a/tools/gfx-unit-test/gfx-test-util.h b/tools/gfx-unit-test/gfx-test-util.h
index 51b1feb1f..558670162 100644
--- a/tools/gfx-unit-test/gfx-test-util.h
+++ b/tools/gfx-unit-test/gfx-test-util.h
@@ -1,9 +1,9 @@
 #pragma once
 
+#include "core/slang-basic.h"
+#include "core/slang-render-api-util.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "source/core/slang-render-api-util.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 namespace gfx_test
 {
diff --git a/tools/gfx-unit-test/instanced-draw-tests.cpp b/tools/gfx-unit-test/instanced-draw-tests.cpp
index adb1a1df1..636a4e2e4 100644
--- a/tools/gfx-unit-test/instanced-draw-tests.cpp
+++ b/tools/gfx-unit-test/instanced-draw-tests.cpp
@@ -1,8 +1,8 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 
diff --git a/tools/gfx-unit-test/link-time-constant.cpp b/tools/gfx-unit-test/link-time-constant.cpp
index 047ecd3bc..47dbbab2d 100644
--- a/tools/gfx-unit-test/link-time-constant.cpp
+++ b/tools/gfx-unit-test/link-time-constant.cpp
@@ -1,9 +1,9 @@
+#include "core/slang-basic.h"
+#include "core/slang-blob.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "source/core/slang-blob.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 
diff --git a/tools/gfx-unit-test/link-time-default.cpp b/tools/gfx-unit-test/link-time-default.cpp
index d341e5dc0..244991148 100644
--- a/tools/gfx-unit-test/link-time-default.cpp
+++ b/tools/gfx-unit-test/link-time-default.cpp
@@ -1,9 +1,9 @@
+#include "core/slang-basic.h"
+#include "core/slang-blob.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "source/core/slang-blob.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 
diff --git a/tools/gfx-unit-test/link-time-options.cpp b/tools/gfx-unit-test/link-time-options.cpp
index 590db576e..64f189162 100644
--- a/tools/gfx-unit-test/link-time-options.cpp
+++ b/tools/gfx-unit-test/link-time-options.cpp
@@ -1,9 +1,9 @@
+#include "core/slang-basic.h"
+#include "core/slang-blob.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "source/core/slang-blob.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 
diff --git a/tools/gfx-unit-test/link-time-type.cpp b/tools/gfx-unit-test/link-time-type.cpp
index 81c738126..8f4bcca01 100644
--- a/tools/gfx-unit-test/link-time-type.cpp
+++ b/tools/gfx-unit-test/link-time-type.cpp
@@ -1,9 +1,9 @@
+#include "core/slang-basic.h"
+#include "core/slang-blob.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "source/core/slang-blob.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 
diff --git a/tools/gfx-unit-test/mutable-shader-object.cpp b/tools/gfx-unit-test/mutable-shader-object.cpp
index 9c91a7ca3..c7ce40d34 100644
--- a/tools/gfx-unit-test/mutable-shader-object.cpp
+++ b/tools/gfx-unit-test/mutable-shader-object.cpp
@@ -1,8 +1,8 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 
diff --git a/tools/gfx-unit-test/nested-parameter-block.cpp b/tools/gfx-unit-test/nested-parameter-block.cpp
index e904226ae..1201be261 100644
--- a/tools/gfx-unit-test/nested-parameter-block.cpp
+++ b/tools/gfx-unit-test/nested-parameter-block.cpp
@@ -1,8 +1,8 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 using namespace gfx;
 
 namespace gfx_test
diff --git a/tools/gfx-unit-test/precompiled-module-2.cpp b/tools/gfx-unit-test/precompiled-module-2.cpp
index f5c478b4d..f5d576a23 100644
--- a/tools/gfx-unit-test/precompiled-module-2.cpp
+++ b/tools/gfx-unit-test/precompiled-module-2.cpp
@@ -1,11 +1,11 @@
+#include "core/slang-basic.h"
+#include "core/slang-blob.h"
+#include "core/slang-io.h"
+#include "core/slang-memory-file-system.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "source/core/slang-blob.h"
-#include "source/core/slang-io.h"
-#include "source/core/slang-memory-file-system.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 
diff --git a/tools/gfx-unit-test/precompiled-module-cache.cpp b/tools/gfx-unit-test/precompiled-module-cache.cpp
index 1c10f759b..8c22a7c84 100644
--- a/tools/gfx-unit-test/precompiled-module-cache.cpp
+++ b/tools/gfx-unit-test/precompiled-module-cache.cpp
@@ -1,11 +1,11 @@
+#include "core/slang-basic.h"
+#include "core/slang-blob.h"
+#include "core/slang-io.h"
+#include "core/slang-memory-file-system.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "source/core/slang-blob.h"
-#include "source/core/slang-io.h"
-#include "source/core/slang-memory-file-system.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 
diff --git a/tools/gfx-unit-test/precompiled-module.cpp b/tools/gfx-unit-test/precompiled-module.cpp
index 2ecc412c4..3d5e5e565 100644
--- a/tools/gfx-unit-test/precompiled-module.cpp
+++ b/tools/gfx-unit-test/precompiled-module.cpp
@@ -1,10 +1,10 @@
+#include "core/slang-basic.h"
+#include "core/slang-blob.h"
+#include "core/slang-memory-file-system.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "source/core/slang-blob.h"
-#include "source/core/slang-memory-file-system.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 
diff --git a/tools/gfx-unit-test/ray-tracing-tests.cpp b/tools/gfx-unit-test/ray-tracing-tests.cpp
index 0e7fd2765..1506128ad 100644
--- a/tools/gfx-unit-test/ray-tracing-tests.cpp
+++ b/tools/gfx-unit-test/ray-tracing-tests.cpp
@@ -1,10 +1,10 @@
+#include "core/slang-basic.h"
 #include "gfx-test-texture-util.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
+#include "platform/vector-math.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/platform/vector-math.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <chrono>
 
diff --git a/tools/gfx-unit-test/resolve-resource-tests.cpp b/tools/gfx-unit-test/resolve-resource-tests.cpp
index ea25b609f..dd318c7c4 100644
--- a/tools/gfx-unit-test/resolve-resource-tests.cpp
+++ b/tools/gfx-unit-test/resolve-resource-tests.cpp
@@ -1,8 +1,8 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #if SLANG_WINDOWS_FAMILY
 #include <d3d12.h>
diff --git a/tools/gfx-unit-test/root-mutable-shader-object.cpp b/tools/gfx-unit-test/root-mutable-shader-object.cpp
index fce4cc0da..c3bd95382 100644
--- a/tools/gfx-unit-test/root-mutable-shader-object.cpp
+++ b/tools/gfx-unit-test/root-mutable-shader-object.cpp
@@ -1,8 +1,8 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 
diff --git a/tools/gfx-unit-test/root-shader-parameter.cpp b/tools/gfx-unit-test/root-shader-parameter.cpp
index f933ec48a..a06a07ef5 100644
--- a/tools/gfx-unit-test/root-shader-parameter.cpp
+++ b/tools/gfx-unit-test/root-shader-parameter.cpp
@@ -1,8 +1,8 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 
diff --git a/tools/gfx-unit-test/sampler-array.cpp b/tools/gfx-unit-test/sampler-array.cpp
index 720aa0a2c..67efe0c32 100644
--- a/tools/gfx-unit-test/sampler-array.cpp
+++ b/tools/gfx-unit-test/sampler-array.cpp
@@ -1,8 +1,8 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 
diff --git a/tools/gfx-unit-test/shader-cache-tests.cpp b/tools/gfx-unit-test/shader-cache-tests.cpp
index 8ee8d9015..69767b3d2 100644
--- a/tools/gfx-unit-test/shader-cache-tests.cpp
+++ b/tools/gfx-unit-test/shader-cache-tests.cpp
@@ -1,13 +1,13 @@
+#include "core/slang-basic.h"
+#include "core/slang-file-system.h"
+#include "core/slang-io.h"
+#include "core/slang-process.h"
+#include "core/slang-string-util.h"
 #include "gfx-test-texture-util.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "source/core/slang-file-system.h"
-#include "source/core/slang-io.h"
-#include "source/core/slang-process.h"
-#include "source/core/slang-string-util.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 using namespace Slang;
diff --git a/tools/gfx-unit-test/shared-buffers-tests.cpp b/tools/gfx-unit-test/shared-buffers-tests.cpp
index 4355dda99..dbb0be3be 100644
--- a/tools/gfx-unit-test/shared-buffers-tests.cpp
+++ b/tools/gfx-unit-test/shared-buffers-tests.cpp
@@ -1,8 +1,8 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 
diff --git a/tools/gfx-unit-test/shared-textures-tests.cpp b/tools/gfx-unit-test/shared-textures-tests.cpp
index ee8108c39..f017c959e 100644
--- a/tools/gfx-unit-test/shared-textures-tests.cpp
+++ b/tools/gfx-unit-test/shared-textures-tests.cpp
@@ -1,8 +1,8 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 
diff --git a/tools/gfx-unit-test/swap-chain-resize-test.cpp b/tools/gfx-unit-test/swap-chain-resize-test.cpp
index 269f08735..23f39fd8a 100644
--- a/tools/gfx-unit-test/swap-chain-resize-test.cpp
+++ b/tools/gfx-unit-test/swap-chain-resize-test.cpp
@@ -1,9 +1,9 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
+#include "platform/window.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/platform/window.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 using namespace Slang;
diff --git a/tools/gfx-unit-test/texture-types-tests.cpp b/tools/gfx-unit-test/texture-types-tests.cpp
index 89342f9cf..b581fd3d7 100644
--- a/tools/gfx-unit-test/texture-types-tests.cpp
+++ b/tools/gfx-unit-test/texture-types-tests.cpp
@@ -1,9 +1,9 @@
+#include "core/slang-basic.h"
 #include "gfx-test-texture-util.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #if SLANG_WINDOWS_FAMILY
 #include <d3d12.h>
diff --git a/tools/gfx-unit-test/uint16-structured-buffer.cpp b/tools/gfx-unit-test/uint16-structured-buffer.cpp
index 23fd70544..d0d1789ed 100644
--- a/tools/gfx-unit-test/uint16-structured-buffer.cpp
+++ b/tools/gfx-unit-test/uint16-structured-buffer.cpp
@@ -1,8 +1,8 @@
+#include "core/slang-basic.h"
 #include "gfx-test-util.h"
+#include "gfx-util/shader-cursor.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
-#include "tools/gfx-util/shader-cursor.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace gfx;
 
diff --git a/tools/gfx/metal/metal-device.cpp b/tools/gfx/metal/metal-device.cpp
index a536f64ff..623cd8a81 100644
--- a/tools/gfx/metal/metal-device.cpp
+++ b/tools/gfx/metal/metal-device.cpp
@@ -21,7 +21,7 @@
 // #include "metal-pipeline-dump-layer.h"
 // #include "metal-helper-functions.h"
 
-#include "source/core/slang-platform.h"
+#include "core/slang-platform.h"
 namespace gfx
 {
 
diff --git a/tools/gfx/open-gl/render-gl.cpp b/tools/gfx/open-gl/render-gl.cpp
index 9af39f711..5bbee254d 100644
--- a/tools/gfx/open-gl/render-gl.cpp
+++ b/tools/gfx/open-gl/render-gl.cpp
@@ -7,7 +7,7 @@
 #include "core/slang-basic.h"
 #include "core/slang-blob.h"
 #include "core/slang-secure-crt.h"
-#include "external/stb/stb_image_write.h"
+#include "stb_image_write.h"
 
 #if SLANG_WIN64 || SLANG_WIN64
 #define ENABLE_GL_IMPL 1
diff --git a/tools/gfx/transient-resource-heap-base.h b/tools/gfx/transient-resource-heap-base.h
index 9d7cb165a..d99d84697 100644
--- a/tools/gfx/transient-resource-heap-base.h
+++ b/tools/gfx/transient-resource-heap-base.h
@@ -1,5 +1,5 @@
+#include "core/slang-basic.h"
 #include "renderer-shared.h"
-#include "source/core/slang-basic.h"
 
 namespace gfx
 {
diff --git a/tools/gfx/vulkan/vk-device.cpp b/tools/gfx/vulkan/vk-device.cpp
index 689213437..61edf53b9 100644
--- a/tools/gfx/vulkan/vk-device.cpp
+++ b/tools/gfx/vulkan/vk-device.cpp
@@ -1,7 +1,7 @@
 // vk-device.cpp
 #include "vk-device.h"
 
-#include "source/core/slang-platform.h"
+#include "core/slang-platform.h"
 #include "vk-buffer.h"
 #include "vk-command-queue.h"
 #include "vk-fence.h"
diff --git a/tools/platform/gui.h b/tools/platform/gui.h
index 82193cb86..eea9aa4f0 100644
--- a/tools/platform/gui.h
+++ b/tools/platform/gui.h
@@ -1,10 +1,10 @@
 // gui.h
 #pragma once
 
+#include "core/slang-basic.h"
 #include "external/imgui/imgui.h"
 #include "slang-com-ptr.h"
 #include "slang-gfx.h"
-#include "source/core/slang-basic.h"
 #include "vector-math.h"
 #include "window.h"
 
diff --git a/tools/platform/model.cpp b/tools/platform/model.cpp
index 8531f7844..18a7ad641 100644
--- a/tools/platform/model.cpp
+++ b/tools/platform/model.cpp
@@ -7,13 +7,13 @@
 #include "../../external/tinyobjloader/tiny_obj_loader.h"
 
 #define STB_IMAGE_IMPLEMENTATION
-#include "../../external/stb/stb_image.h"
+#include "stb_image.h"
 
 #define STB_IMAGE_RESIZE_IMPLEMENTATION
 #include "../../external/glm/glm/glm.hpp"
 #include "../../external/glm/glm/gtc/constants.hpp"
 #include "../../external/glm/glm/gtc/matrix_transform.hpp"
-#include "../../external/stb/stb_image_resize.h"
+#include "stb_image_resize.h"
 
 #include <memory>
 #include <unordered_map>
diff --git a/tools/platform/window.h b/tools/platform/window.h
index a419f85b9..4ff9e245f 100644
--- a/tools/platform/window.h
+++ b/tools/platform/window.h
@@ -1,10 +1,10 @@
 // window.h
 #pragma once
 
+#include "core/slang-basic.h"
+#include "core/slang-func-ptr.h"
 #include "platform-api.h"
 #include "slang-com-ptr.h"
-#include "source/core/slang-basic.h"
-#include "source/core/slang-func-ptr.h"
 
 namespace platform
 {
diff --git a/tools/render-test/png-serialize-util.cpp b/tools/render-test/png-serialize-util.cpp
index 8a649ee87..15aaba00b 100644
--- a/tools/render-test/png-serialize-util.cpp
+++ b/tools/render-test/png-serialize-util.cpp
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 
 #define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "external/stb/stb_image_write.h"
+#include "stb_image_write.h"
 
 namespace renderer_test
 {
diff --git a/tools/render-test/shader-input-layout.h b/tools/render-test/shader-input-layout.h
index 032e6019d..187cc0b84 100644
--- a/tools/render-test/shader-input-layout.h
+++ b/tools/render-test/shader-input-layout.h
@@ -1,9 +1,9 @@
 #ifndef SLANG_TEST_SHADER_INPUT_LAYOUT_H
 #define SLANG_TEST_SHADER_INPUT_LAYOUT_H
 
-#include "source/core/slang-basic.h"
-#include "source/core/slang-random-generator.h"
-#include "source/core/slang-writer.h"
+#include "core/slang-basic.h"
+#include "core/slang-random-generator.h"
+#include "core/slang-writer.h"
 
 #include <slang-rhi.h>
 
diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp
index bdc7a082b..ae6eb6216 100644
--- a/tools/slang-test/slang-test-main.cpp
+++ b/tools/slang-test/slang-test-main.cpp
@@ -17,7 +17,7 @@
 #include "../../source/core/slang-token-reader.h"
 #include "../../source/core/slang-type-text-util.h"
 #include "slang-com-helper.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 #undef SLANG_UNIT_TEST
 
 #include "../../source/compiler-core/slang-artifact-associated-impl.h"
@@ -32,7 +32,7 @@
 #include "test-reporter.h"
 
 #define STB_IMAGE_IMPLEMENTATION
-#include "external/stb/stb_image.h"
+#include "stb_image.h"
 
 #include <math.h>
 #include <stdarg.h>
diff --git a/tools/slang-test/test-reporter.h b/tools/slang-test/test-reporter.h
index 8e7b73c67..bf95803b5 100644
--- a/tools/slang-test/test-reporter.h
+++ b/tools/slang-test/test-reporter.h
@@ -7,7 +7,7 @@
 #include "../../source/core/slang-platform.h"
 #include "../../source/core/slang-std-writers.h"
 #include "../../source/core/slang-string-util.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <mutex>
 
diff --git a/tools/slang-unit-test/unit-test-byte-encode.cpp b/tools/slang-unit-test/unit-test-byte-encode.cpp
index 633d3918d..08ab3d34f 100644
--- a/tools/slang-unit-test/unit-test-byte-encode.cpp
+++ b/tools/slang-unit-test/unit-test-byte-encode.cpp
@@ -3,7 +3,7 @@
 #include "../../source/core/slang-byte-encode-util.h"
 #include "../../source/core/slang-list.h"
 #include "../../source/core/slang-random-generator.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/slang-unit-test/unit-test-chunked-list.cpp b/tools/slang-unit-test/unit-test-chunked-list.cpp
index af4f597b2..726254fc7 100644
--- a/tools/slang-unit-test/unit-test-chunked-list.cpp
+++ b/tools/slang-unit-test/unit-test-chunked-list.cpp
@@ -1,8 +1,8 @@
 // unit-test-path.cpp
 
-#include "source/core/slang-basic.h"
-#include "source/core/slang-chunked-list.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "core/slang-basic.h"
+#include "core/slang-chunked-list.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace Slang;
 
diff --git a/tools/slang-unit-test/unit-test-com-host-callable.cpp b/tools/slang-unit-test/unit-test-com-host-callable.cpp
index 7fcc033b4..3d37247b7 100644
--- a/tools/slang-unit-test/unit-test-com-host-callable.cpp
+++ b/tools/slang-unit-test/unit-test-com-host-callable.cpp
@@ -5,7 +5,7 @@
 #include "slang-com-helper.h"
 #include "slang-com-ptr.h"
 #include "slang.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/slang-unit-test/unit-test-command-line-args.cpp b/tools/slang-unit-test/unit-test-command-line-args.cpp
index febbeaddb..52e4226eb 100644
--- a/tools/slang-unit-test/unit-test-command-line-args.cpp
+++ b/tools/slang-unit-test/unit-test-command-line-args.cpp
@@ -1,7 +1,7 @@
 // unit-test-command-line-args.cpp
 
 #include "../../source/compiler-core/slang-command-line-args.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace Slang;
 
diff --git a/tools/slang-unit-test/unit-test-compression.cpp b/tools/slang-unit-test/unit-test-compression.cpp
index 3b0ba3361..8274d3410 100644
--- a/tools/slang-unit-test/unit-test-compression.cpp
+++ b/tools/slang-unit-test/unit-test-compression.cpp
@@ -1,7 +1,7 @@
 // unit-compression.cpp
 #include "../../source/core/slang-deflate-compression-system.h"
 #include "../../source/core/slang-lz4-compression-system.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace Slang;
 
diff --git a/tools/slang-unit-test/unit-test-crypto.cpp b/tools/slang-unit-test/unit-test-crypto.cpp
index 244f7135b..5899f22c5 100644
--- a/tools/slang-unit-test/unit-test-crypto.cpp
+++ b/tools/slang-unit-test/unit-test-crypto.cpp
@@ -1,6 +1,6 @@
 // unit-test-sha1.cpp
 #include "../../source/core/slang-crypto.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace Slang;
 
diff --git a/tools/slang-unit-test/unit-test-decl-tree-reflection.cpp b/tools/slang-unit-test/unit-test-decl-tree-reflection.cpp
index cbe0eb80b..c8bd9cd02 100644
--- a/tools/slang-unit-test/unit-test-decl-tree-reflection.cpp
+++ b/tools/slang-unit-test/unit-test-decl-tree-reflection.cpp
@@ -4,7 +4,7 @@
 #include "../../source/core/slang-process.h"
 #include "slang-com-ptr.h"
 #include "slang.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/slang-unit-test/unit-test-default-matrix-layout.cpp b/tools/slang-unit-test/unit-test-default-matrix-layout.cpp
index 406432321..e495c9983 100644
--- a/tools/slang-unit-test/unit-test-default-matrix-layout.cpp
+++ b/tools/slang-unit-test/unit-test-default-matrix-layout.cpp
@@ -4,7 +4,7 @@
 #include "slang-com-helper.h"
 #include "slang-com-ptr.h"
 #include "slang.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/slang-unit-test/unit-test-fcpw-compile.cpp b/tools/slang-unit-test/unit-test-fcpw-compile.cpp
index e36052b65..7ed1c8e1a 100644
--- a/tools/slang-unit-test/unit-test-fcpw-compile.cpp
+++ b/tools/slang-unit-test/unit-test-fcpw-compile.cpp
@@ -4,7 +4,7 @@
 #include "../../source/core/slang-process.h"
 #include "slang-com-ptr.h"
 #include "slang.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/slang-unit-test/unit-test-file-system.cpp b/tools/slang-unit-test/unit-test-file-system.cpp
index 2a724fb3c..676ef5ee1 100644
--- a/tools/slang-unit-test/unit-test-file-system.cpp
+++ b/tools/slang-unit-test/unit-test-file-system.cpp
@@ -8,7 +8,7 @@
 #include "../../source/core/slang-memory-file-system.h"
 #include "../../source/core/slang-riff-file-system.h"
 #include "../../source/core/slang-zip-file-system.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace Slang;
 
diff --git a/tools/slang-unit-test/unit-test-find-check-entrypoint.cpp b/tools/slang-unit-test/unit-test-find-check-entrypoint.cpp
index 717b937d1..8ecab9671 100644
--- a/tools/slang-unit-test/unit-test-find-check-entrypoint.cpp
+++ b/tools/slang-unit-test/unit-test-find-check-entrypoint.cpp
@@ -4,7 +4,7 @@
 #include "../../source/core/slang-process.h"
 #include "slang-com-ptr.h"
 #include "slang.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/slang-unit-test/unit-test-find-entrypoint-nested.cpp b/tools/slang-unit-test/unit-test-find-entrypoint-nested.cpp
index 6cf2ffd17..dfd26e699 100644
--- a/tools/slang-unit-test/unit-test-find-entrypoint-nested.cpp
+++ b/tools/slang-unit-test/unit-test-find-entrypoint-nested.cpp
@@ -4,7 +4,7 @@
 #include "../../source/core/slang-process.h"
 #include "slang-com-ptr.h"
 #include "slang.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/slang-unit-test/unit-test-find-type-by-name.cpp b/tools/slang-unit-test/unit-test-find-type-by-name.cpp
index a42b08ade..2c423fb25 100644
--- a/tools/slang-unit-test/unit-test-find-type-by-name.cpp
+++ b/tools/slang-unit-test/unit-test-find-type-by-name.cpp
@@ -1,7 +1,7 @@
 // unit-test-find-type-by-name.cpp
 
 #include "slang.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/slang-unit-test/unit-test-free-list.cpp b/tools/slang-unit-test/unit-test-free-list.cpp
index 80cd01dc1..7e26bb31e 100644
--- a/tools/slang-unit-test/unit-test-free-list.cpp
+++ b/tools/slang-unit-test/unit-test-free-list.cpp
@@ -3,7 +3,7 @@
 #include "../../source/core/slang-free-list.h"
 #include "../../source/core/slang-list.h"
 #include "../../source/core/slang-random-generator.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/slang-unit-test/unit-test-function-reflection.cpp b/tools/slang-unit-test/unit-test-function-reflection.cpp
index 2d62bd761..52c2e795a 100644
--- a/tools/slang-unit-test/unit-test-function-reflection.cpp
+++ b/tools/slang-unit-test/unit-test-function-reflection.cpp
@@ -4,7 +4,7 @@
 #include "../../source/core/slang-process.h"
 #include "slang-com-ptr.h"
 #include "slang.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/slang-unit-test/unit-test-generic-interface-conformance.cpp b/tools/slang-unit-test/unit-test-generic-interface-conformance.cpp
index df5e6e63a..717e5a069 100644
--- a/tools/slang-unit-test/unit-test-generic-interface-conformance.cpp
+++ b/tools/slang-unit-test/unit-test-generic-interface-conformance.cpp
@@ -4,7 +4,7 @@
 #include "../../source/core/slang-process.h"
 #include "slang-com-ptr.h"
 #include "slang.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/slang-unit-test/unit-test-get-target-code.cpp b/tools/slang-unit-test/unit-test-get-target-code.cpp
index f3df15b64..6a9f6ca27 100644
--- a/tools/slang-unit-test/unit-test-get-target-code.cpp
+++ b/tools/slang-unit-test/unit-test-get-target-code.cpp
@@ -4,7 +4,7 @@
 #include "../../source/core/slang-process.h"
 #include "slang-com-ptr.h"
 #include "slang.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/slang-unit-test/unit-test-image-format-reflection.cpp b/tools/slang-unit-test/unit-test-image-format-reflection.cpp
index 66d18b3e0..2d86dbaa8 100644
--- a/tools/slang-unit-test/unit-test-image-format-reflection.cpp
+++ b/tools/slang-unit-test/unit-test-image-format-reflection.cpp
@@ -4,7 +4,7 @@
 #include "../../source/core/slang-process.h"
 #include "slang-com-ptr.h"
 #include "slang.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/slang-unit-test/unit-test-io.cpp b/tools/slang-unit-test/unit-test-io.cpp
index 0e6cab94d..568a8c58f 100644
--- a/tools/slang-unit-test/unit-test-io.cpp
+++ b/tools/slang-unit-test/unit-test-io.cpp
@@ -1,7 +1,7 @@
 // unit-test-io.cpp
 
 #include "../../source/core/slang-io.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace Slang;
 
diff --git a/tools/slang-unit-test/unit-test-json-native.cpp b/tools/slang-unit-test/unit-test-json-native.cpp
index de5b7cfa4..ba04e8e5c 100644
--- a/tools/slang-unit-test/unit-test-json-native.cpp
+++ b/tools/slang-unit-test/unit-test-json-native.cpp
@@ -3,7 +3,7 @@
 #include "../../source/compiler-core/slang-json-native.h"
 #include "../../source/compiler-core/slang-json-parser.h"
 #include "../../source/core/slang-rtti-info.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace Slang;
 
diff --git a/tools/slang-unit-test/unit-test-json.cpp b/tools/slang-unit-test/unit-test-json.cpp
index 532777030..5f3e7ed56 100644
--- a/tools/slang-unit-test/unit-test-json.cpp
+++ b/tools/slang-unit-test/unit-test-json.cpp
@@ -3,7 +3,7 @@
 #include "../../source/compiler-core/slang-json-parser.h"
 #include "../../source/compiler-core/slang-json-value.h"
 #include "../../source/core/slang-string-escape-util.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace Slang;
 
diff --git a/tools/slang-unit-test/unit-test-lock-file.cpp b/tools/slang-unit-test/unit-test-lock-file.cpp
index 5ef9fa036..6458d4b5f 100644
--- a/tools/slang-unit-test/unit-test-lock-file.cpp
+++ b/tools/slang-unit-test/unit-test-lock-file.cpp
@@ -1,7 +1,7 @@
 // unit-test-lock-file.cpp
 #include "../../source/core/slang-io.h"
 #include "../../source/core/slang-process.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <atomic>
 #include <future>
diff --git a/tools/slang-unit-test/unit-test-memory-arena.cpp b/tools/slang-unit-test/unit-test-memory-arena.cpp
index 3ceca8410..c8ab98827 100644
--- a/tools/slang-unit-test/unit-test-memory-arena.cpp
+++ b/tools/slang-unit-test/unit-test-memory-arena.cpp
@@ -3,7 +3,7 @@
 #include "../../source/core/slang-list.h"
 #include "../../source/core/slang-memory-arena.h"
 #include "../../source/core/slang-random-generator.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/slang-unit-test/unit-test-offset-container.cpp b/tools/slang-unit-test/unit-test-offset-container.cpp
index 90f187282..57de42bc2 100644
--- a/tools/slang-unit-test/unit-test-offset-container.cpp
+++ b/tools/slang-unit-test/unit-test-offset-container.cpp
@@ -1,7 +1,7 @@
 // unit-test-offset-container.cpp
 
 #include "../../source/core/slang-offset-container.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace Slang;
 
diff --git a/tools/slang-unit-test/unit-test-parameter-usage-reflection.cpp b/tools/slang-unit-test/unit-test-parameter-usage-reflection.cpp
index c437ae2a2..ce9df5a42 100644
--- a/tools/slang-unit-test/unit-test-parameter-usage-reflection.cpp
+++ b/tools/slang-unit-test/unit-test-parameter-usage-reflection.cpp
@@ -4,7 +4,7 @@
 #include "../../source/core/slang-process.h"
 #include "slang-com-ptr.h"
 #include "slang.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/slang-unit-test/unit-test-path.cpp b/tools/slang-unit-test/unit-test-path.cpp
index d96acd4f7..c94950bd4 100644
--- a/tools/slang-unit-test/unit-test-path.cpp
+++ b/tools/slang-unit-test/unit-test-path.cpp
@@ -1,7 +1,7 @@
 // unit-test-path.cpp
 
 #include "../../source/core/slang-io.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace Slang;
 
diff --git a/tools/slang-unit-test/unit-test-persistent-cache.cpp b/tools/slang-unit-test/unit-test-persistent-cache.cpp
index fa5d286f2..95c52c596 100644
--- a/tools/slang-unit-test/unit-test-persistent-cache.cpp
+++ b/tools/slang-unit-test/unit-test-persistent-cache.cpp
@@ -4,7 +4,7 @@
 #include "../../source/core/slang-persistent-cache.h"
 #include "../../source/core/slang-process.h"
 #include "../../source/core/slang-random-generator.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <atomic>
 #include <chrono>
diff --git a/tools/slang-unit-test/unit-test-process.cpp b/tools/slang-unit-test/unit-test-process.cpp
index 8866f4a9e..99102fa52 100644
--- a/tools/slang-unit-test/unit-test-process.cpp
+++ b/tools/slang-unit-test/unit-test-process.cpp
@@ -5,7 +5,7 @@
 #include "../../source/core/slang-process-util.h"
 #include "../../source/core/slang-random-generator.h"
 #include "../../source/core/slang-string-util.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace Slang;
 
diff --git a/tools/slang-unit-test/unit-test-record-replay.cpp b/tools/slang-unit-test/unit-test-record-replay.cpp
index b81304937..b6ed99aa5 100644
--- a/tools/slang-unit-test/unit-test-record-replay.cpp
+++ b/tools/slang-unit-test/unit-test-record-replay.cpp
@@ -5,7 +5,7 @@
 #include "../../source/core/slang-process-util.h"
 #include "../../source/core/slang-random-generator.h"
 #include "../../source/core/slang-string-util.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <chrono>
 #include <thread>
diff --git a/tools/slang-unit-test/unit-test-riff.cpp b/tools/slang-unit-test/unit-test-riff.cpp
index a0eb91a47..5f8b448f9 100644
--- a/tools/slang-unit-test/unit-test-riff.cpp
+++ b/tools/slang-unit-test/unit-test-riff.cpp
@@ -2,7 +2,7 @@
 
 #include "../../source/core/slang-random-generator.h"
 #include "../../source/core/slang-riff.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace Slang;
 
diff --git a/tools/slang-unit-test/unit-test-rtti.cpp b/tools/slang-unit-test/unit-test-rtti.cpp
index 485d58aea..d1a628ed3 100644
--- a/tools/slang-unit-test/unit-test-rtti.cpp
+++ b/tools/slang-unit-test/unit-test-rtti.cpp
@@ -1,7 +1,7 @@
 // unit-test-rtti.cpp
 
 #include "../../source/core/slang-rtti-info.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace Slang;
 
diff --git a/tools/slang-unit-test/unit-test-short-list.cpp b/tools/slang-unit-test/unit-test-short-list.cpp
index 9d5de9328..e2dfb4dc0 100644
--- a/tools/slang-unit-test/unit-test-short-list.cpp
+++ b/tools/slang-unit-test/unit-test-short-list.cpp
@@ -1,7 +1,7 @@
 // unit-test-path.cpp
 
-#include "source/core/slang-basic.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "core/slang-basic.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace Slang;
 
diff --git a/tools/slang-unit-test/unit-test-source-map.cpp b/tools/slang-unit-test/unit-test-source-map.cpp
index 797229afe..4435517cf 100644
--- a/tools/slang-unit-test/unit-test-source-map.cpp
+++ b/tools/slang-unit-test/unit-test-source-map.cpp
@@ -7,7 +7,7 @@
 #include "../../source/compiler-core/slang-source-map.h"
 #include "../../source/core/slang-rtti-info.h"
 #include "../../source/core/slang-string-escape-util.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace Slang;
 
diff --git a/tools/slang-unit-test/unit-test-string-escape.cpp b/tools/slang-unit-test/unit-test-string-escape.cpp
index 3a1cb7f06..676847290 100644
--- a/tools/slang-unit-test/unit-test-string-escape.cpp
+++ b/tools/slang-unit-test/unit-test-string-escape.cpp
@@ -1,7 +1,7 @@
 // unit-test-string-escape.cpp
 
 #include "../../source/core/slang-string-escape-util.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 using namespace Slang;
 
diff --git a/tools/slang-unit-test/unit-test-string.cpp b/tools/slang-unit-test/unit-test-string.cpp
index 4a71bca4b..93ef83a77 100644
--- a/tools/slang-unit-test/unit-test-string.cpp
+++ b/tools/slang-unit-test/unit-test-string.cpp
@@ -1,7 +1,7 @@
 // unit-test-path.cpp
 
 #include "../../source/core/slang-string-util.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 // #include <math.h>
 
diff --git a/tools/slang-unit-test/unit-test-translation-unit-import.cpp b/tools/slang-unit-test/unit-test-translation-unit-import.cpp
index 9870cf1e6..10cd33381 100644
--- a/tools/slang-unit-test/unit-test-translation-unit-import.cpp
+++ b/tools/slang-unit-test/unit-test-translation-unit-import.cpp
@@ -4,7 +4,7 @@
 #include "../../source/core/slang-process.h"
 #include "slang-com-ptr.h"
 #include "slang.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/test-server/test-server-main.cpp b/tools/test-server/test-server-main.cpp
index 00a705155..16867f4cb 100644
--- a/tools/test-server/test-server-main.cpp
+++ b/tools/test-server/test-server-main.cpp
@@ -12,7 +12,7 @@
 #include "../../source/core/slang-writer.h"
 #include "slang-com-helper.h"
 #include "test-server-diagnostics.h"
-#include "tools/unit-test/slang-unit-test.h"
+#include "unit-test/slang-unit-test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/unit-test/slang-unit-test.cpp b/tools/unit-test/slang-unit-test.cpp
index 61f778c9a..c5a50613b 100644
--- a/tools/unit-test/slang-unit-test.cpp
+++ b/tools/unit-test/slang-unit-test.cpp
@@ -1,7 +1,7 @@
 #include "slang-unit-test.h"
 
+#include "core/slang-basic.h"
 #include "slang.h"
-#include "source/core/slang-basic.h"
 
 struct SlangUnitTest
 {
diff --git a/tools/unit-test/slang-unit-test.h b/tools/unit-test/slang-unit-test.h
index c63fb8a10..3484b3020 100644
--- a/tools/unit-test/slang-unit-test.h
+++ b/tools/unit-test/slang-unit-test.h
@@ -1,7 +1,7 @@
 #pragma once
 
+#include "core/slang-render-api-util.h"
 #include "slang.h"
-#include "source/core/slang-render-api-util.h"
 
 enum class TestResult
 {