Move the file public header files to `include` dir (#4636)

* Move the file public header files to `include` dir

Close the issue (#4635).

Move the following headers files to a `include` dir
located at root dir of slang repo:

 slang-com-helper.h -> include/slang-com-helper.h
 slang-com-ptr.h -> include/slang-com-ptr.h
 slang-gfx.h -> include/slang-gfx.h
 slang.h -> include/slang.h

Change cmake/SlangTarget.cmake to add include path to
every target, and change the source file to use
"#include <slang.h>" to include the public headers.

The source code update is by the script like follow:

```
fileNames_slang=$(grep -r "\".*slang\.h\"" source/ -l)

for fileName in "${fileNames_slang[@]}"
do
    echo "$fileName"
    sed -i "s/\".*slang\.h\"/\"slang\.h\"/" $fileName
done
```

* Fix the test issues

* Fix cpu test issues by adding include seach path

* Update cmake to not add include path for every target

Also change "#include <slang.h>" to "include "slang.h" " to
make the coding style consistent with other slang code.

* Change public include to private include for unit-test and slang-glslang

49 files changed, 65 insertions, 65 deletions

diff --git a/source/core/slang-archive-file-system.cpp b/source/core/slang-archive-file-system.cpp
index 03237105d..e219fcbb5 100644
--- a/source/core/slang-archive-file-system.cpp
+++ b/source/core/slang-archive-file-system.cpp
@@ -1,7 +1,7 @@
 #include "slang-archive-file-system.h"
 
-#include "../../slang-com-helper.h"
-#include "../../slang-com-ptr.h"
+#include "slang-com-helper.h"
+#include "slang-com-ptr.h"
 
 #include "../core/slang-castable.h"
 
diff --git a/source/core/slang-archive-file-system.h b/source/core/slang-archive-file-system.h
index cee119c13..13b226019 100644
--- a/source/core/slang-archive-file-system.h
+++ b/source/core/slang-archive-file-system.h
@@ -3,7 +3,7 @@
 
 #include "slang-basic.h"
 
-#include "../../slang-com-ptr.h"
+#include "slang-com-ptr.h"
 
 #include "slang-compression-system.h"
 
diff --git a/source/core/slang-blob.h b/source/core/slang-blob.h
index e678680aa..4df8f0db6 100644
--- a/source/core/slang-blob.h
+++ b/source/core/slang-blob.h
@@ -1,15 +1,15 @@
 #ifndef SLANG_CORE_BLOB_H
 #define SLANG_CORE_BLOB_H
 
-#include "../../slang.h"
+#include "slang.h"
 
 #include "slang-string.h"
 #include "slang-list.h"
 
 #include <stdarg.h>
 
-#include "../../slang-com-helper.h"
-#include "../../slang-com-ptr.h"
+#include "slang-com-helper.h"
+#include "slang-com-ptr.h"
 
 #include "../core/slang-com-object.h"
 
diff --git a/source/core/slang-castable.h b/source/core/slang-castable.h
index dc6c49a89..e2b9c4a8e 100644
--- a/source/core/slang-castable.h
+++ b/source/core/slang-castable.h
@@ -3,8 +3,8 @@
 #define SLANG_CASTABLE_H
 
 
-#include "../../slang-com-helper.h"
-#include "../../slang-com-ptr.h"
+#include "slang-com-helper.h"
+#include "slang-com-ptr.h"
 
 #include "../core/slang-com-object.h"
 
diff --git a/source/core/slang-chunked-list.h b/source/core/slang-chunked-list.h
index 0ac26c945..d414eaefb 100644
--- a/source/core/slang-chunked-list.h
+++ b/source/core/slang-chunked-list.h
@@ -1,7 +1,7 @@
 #ifndef SLANG_CORE_CHUNKED_LIST_H
 #define SLANG_CORE_CHUNKED_LIST_H
 
-#include "../../slang.h"
+#include "slang.h"
 
 #include "slang-allocator.h"
 #include "slang-array-view.h"
diff --git a/source/core/slang-command-line.cpp b/source/core/slang-command-line.cpp
index 475270d69..bfd9ed11a 100644
--- a/source/core/slang-command-line.cpp
+++ b/source/core/slang-command-line.cpp
@@ -7,7 +7,7 @@
 #include "slang-string-escape-util.h"
 #include "slang-string-util.h"
 
-#include "../../slang-com-helper.h"
+#include "slang-com-helper.h"
 
 namespace Slang {
 
diff --git a/source/core/slang-common.h b/source/core/slang-common.h
index 7d455546a..362a509a7 100644
--- a/source/core/slang-common.h
+++ b/source/core/slang-common.h
@@ -1,7 +1,7 @@
 #ifndef SLANG_CORE_COMMON_H
 #define SLANG_CORE_COMMON_H
 
-#include "../../slang.h"
+#include "slang.h"
 
 #include <assert.h>
 
diff --git a/source/core/slang-crypto.h b/source/core/slang-crypto.h
index 01d6004d0..feab88aa4 100644
--- a/source/core/slang-crypto.h
+++ b/source/core/slang-crypto.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../../slang.h"
+#include "slang.h"
 #include "../core/slang-string.h"
 #include "../core/slang-blob.h"
 #include "../core/slang-list.h"
diff --git a/source/core/slang-deflate-compression-system.cpp b/source/core/slang-deflate-compression-system.cpp
index a8e6302cf..4f1390240 100644
--- a/source/core/slang-deflate-compression-system.cpp
+++ b/source/core/slang-deflate-compression-system.cpp
@@ -1,7 +1,7 @@
 #include "slang-deflate-compression-system.h"
 
-#include "../../slang-com-helper.h"
-#include "../../slang-com-ptr.h"
+#include "slang-com-helper.h"
+#include "slang-com-ptr.h"
 
 // We don't want compress #define to clash 
 #define MINIZ_NO_ZLIB_COMPATIBLE_NAMES 1
diff --git a/source/core/slang-deflate-compression-system.h b/source/core/slang-deflate-compression-system.h
index 6dc96af5d..efed59e61 100644
--- a/source/core/slang-deflate-compression-system.h
+++ b/source/core/slang-deflate-compression-system.h
@@ -5,7 +5,7 @@
 
 #include "slang-compression-system.h"
 
-#include "../../slang-com-ptr.h"
+#include "slang-com-ptr.h"
 
 namespace Slang
 {
diff --git a/source/core/slang-file-system.cpp b/source/core/slang-file-system.cpp
index 7c3cd83bb..d578e63d5 100644
--- a/source/core/slang-file-system.cpp
+++ b/source/core/slang-file-system.cpp
@@ -1,6 +1,6 @@
 #include "slang-file-system.h"
 
-#include "../../slang-com-ptr.h"
+#include "slang-com-ptr.h"
 #include "../core/slang-io.h"
 #include "../core/slang-string-util.h"
 
diff --git a/source/core/slang-file-system.h b/source/core/slang-file-system.h
index 6e29e277c..dad2731d9 100644
--- a/source/core/slang-file-system.h
+++ b/source/core/slang-file-system.h
@@ -1,9 +1,9 @@
 #ifndef SLANG_FILE_SYSTEM_H_INCLUDED
 #define SLANG_FILE_SYSTEM_H_INCLUDED
 
-#include "../../slang.h"
-#include "../../slang-com-helper.h"
-#include "../../slang-com-ptr.h"
+#include "slang.h"
+#include "slang-com-helper.h"
+#include "slang-com-ptr.h"
 
 #include "../core/slang-blob.h"
 
diff --git a/source/core/slang-free-list.h b/source/core/slang-free-list.h
index 090c13613..5c4e55607 100644
--- a/source/core/slang-free-list.h
+++ b/source/core/slang-free-list.h
@@ -1,7 +1,7 @@
 #ifndef SLANG_CORE_FREE_LIST_H
 #define SLANG_CORE_FREE_LIST_H
 
-#include "../../slang.h"
+#include "slang.h"
 
 #include "slang-common.h"
 
diff --git a/source/core/slang-hash.h b/source/core/slang-hash.h
index 9a173c4f8..7992e91fa 100644
--- a/source/core/slang-hash.h
+++ b/source/core/slang-hash.h
@@ -1,7 +1,7 @@
 #ifndef SLANG_CORE_HASH_H
 #define SLANG_CORE_HASH_H
 
-#include "../../slang.h"
+#include "slang.h"
 #include "slang-math.h"
 #include "../../external/unordered_dense/include/ankerl/unordered_dense.h"
 #include <cstring>
diff --git a/source/core/slang-hex-dump-util.cpp b/source/core/slang-hex-dump-util.cpp
index 3a78c256a..46fe825ac 100644
--- a/source/core/slang-hex-dump-util.cpp
+++ b/source/core/slang-hex-dump-util.cpp
@@ -7,7 +7,7 @@
 
 #include "slang-char-util.h"
 
-#include "../../slang-com-helper.h"
+#include "slang-com-helper.h"
 #include "slang-hash.h"
 
 namespace Slang
diff --git a/source/core/slang-hex-dump-util.h b/source/core/slang-hex-dump-util.h
index f02728522..037355f2d 100644
--- a/source/core/slang-hex-dump-util.h
+++ b/source/core/slang-hex-dump-util.h
@@ -5,7 +5,7 @@
 #include "slang-string.h"
 
 #include "slang-list.h"
-#include "../../slang.h"
+#include "slang.h"
 
 namespace Slang
 {
diff --git a/source/core/slang-http.h b/source/core/slang-http.h
index 784357273..11d834bd8 100644
--- a/source/core/slang-http.h
+++ b/source/core/slang-http.h
@@ -1,7 +1,7 @@
 #ifndef SLANG_CORE_HTTP_H
 #define SLANG_CORE_HTTP_H
 
-#include "../../slang.h"
+#include "slang.h"
 
 #include "slang-string.h"
 #include "slang-list.h"
@@ -10,8 +10,8 @@
 
 #include "slang-stream.h"
 
-#include "../../slang-com-helper.h"
-#include "../../slang-com-ptr.h"
+#include "slang-com-helper.h"
+#include "slang-com-ptr.h"
 
 namespace Slang {
 
diff --git a/source/core/slang-io.cpp b/source/core/slang-io.cpp
index c08f499b9..f5850a5b6 100644
--- a/source/core/slang-io.cpp
+++ b/source/core/slang-io.cpp
@@ -3,7 +3,7 @@
 #include "slang-io.h"
 #include "slang-exception.h"
 
-#include "../../slang-com-helper.h"
+#include "slang-com-helper.h"
 
 #include "slang-string-util.h"
 #include "slang-char-util.h"
diff --git a/source/core/slang-linked-list.h b/source/core/slang-linked-list.h
index 840ef8cd6..d442b4d12 100644
--- a/source/core/slang-linked-list.h
+++ b/source/core/slang-linked-list.h
@@ -1,7 +1,7 @@
 #ifndef SLANG_CORE_LINKED_LIST_H
 #define SLANG_CORE_LINKED_LIST_H
 
-#include "../../slang.h"
+#include "slang.h"
 
 #include "slang-allocator.h"
 #include <type_traits>
diff --git a/source/core/slang-list.h b/source/core/slang-list.h
index c0fe28937..b1c67e438 100644
--- a/source/core/slang-list.h
+++ b/source/core/slang-list.h
@@ -1,7 +1,7 @@
 #ifndef SLANG_CORE_LIST_H
 #define SLANG_CORE_LIST_H
 
-#include "../../slang.h"
+#include "slang.h"
 
 #include "slang-allocator.h"
 #include "slang-math.h"
diff --git a/source/core/slang-lz4-compression-system.cpp b/source/core/slang-lz4-compression-system.cpp
index 4b8661534..c20b457df 100644
--- a/source/core/slang-lz4-compression-system.cpp
+++ b/source/core/slang-lz4-compression-system.cpp
@@ -1,7 +1,7 @@
 #include "slang-lz4-compression-system.h"
 
-#include "../../slang-com-helper.h"
-#include "../../slang-com-ptr.h"
+#include "slang-com-helper.h"
+#include "slang-com-ptr.h"
 
 #include "slang-blob.h"
 
diff --git a/source/core/slang-lz4-compression-system.h b/source/core/slang-lz4-compression-system.h
index 1bd7cefcf..d74fbd61a 100644
--- a/source/core/slang-lz4-compression-system.h
+++ b/source/core/slang-lz4-compression-system.h
@@ -5,7 +5,7 @@
 
 #include "slang-compression-system.h"
 
-#include "../../slang-com-ptr.h"
+#include "slang-com-ptr.h"
 
 namespace Slang
 {
diff --git a/source/core/slang-memory-arena.h b/source/core/slang-memory-arena.h
index 4d2372e44..cbd0fdc56 100644
--- a/source/core/slang-memory-arena.h
+++ b/source/core/slang-memory-arena.h
@@ -1,7 +1,7 @@
 #ifndef SLANG_CORE_MEMORY_ARENA_H
 #define SLANG_CORE_MEMORY_ARENA_H
 
-#include "../../slang.h"
+#include "slang.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/source/core/slang-memory-file-system.h b/source/core/slang-memory-file-system.h
index 785335986..321f7fe74 100644
--- a/source/core/slang-memory-file-system.h
+++ b/source/core/slang-memory-file-system.h
@@ -3,7 +3,7 @@
 
 #include "slang-basic.h"
 
-#include "../../slang-com-ptr.h"
+#include "slang-com-ptr.h"
 #include "slang-com-object.h"
 
 namespace Slang
diff --git a/source/core/slang-performance-profiler.h b/source/core/slang-performance-profiler.h
index f7c62bb45..372a7b273 100644
--- a/source/core/slang-performance-profiler.h
+++ b/source/core/slang-performance-profiler.h
@@ -4,7 +4,7 @@
 #include "slang-string.h"
 #include <chrono>
 #include <vector>
-#include "../../slang-com-helper.h"
+#include "slang-com-helper.h"
 #include "../core/slang-list.h"
 
 namespace Slang
diff --git a/source/core/slang-persistent-cache.h b/source/core/slang-persistent-cache.h
index db5ef0a2e..02c74be79 100644
--- a/source/core/slang-persistent-cache.h
+++ b/source/core/slang-persistent-cache.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../../slang.h"
+#include "slang.h"
 #include "../core/slang-crypto.h"
 #include "../core/slang-io.h"
 #include "../core/slang-string.h"
diff --git a/source/core/slang-platform.h b/source/core/slang-platform.h
index 2aa9184b0..f8701e305 100644
--- a/source/core/slang-platform.h
+++ b/source/core/slang-platform.h
@@ -2,7 +2,7 @@
 #ifndef SLANG_CORE_PLATFORM_H
 #define SLANG_CORE_PLATFORM_H
 
-#include "../../slang.h"
+#include "slang.h"
 #include "../core/slang-string.h"
 
 namespace Slang
diff --git a/source/core/slang-process-util.cpp b/source/core/slang-process-util.cpp
index 99c81ee5c..47484156d 100644
--- a/source/core/slang-process-util.cpp
+++ b/source/core/slang-process-util.cpp
@@ -6,7 +6,7 @@
 #include "slang-string-escape-util.h"
 #include "slang-string-util.h"
 
-#include "../../slang-com-helper.h"
+#include "slang-com-helper.h"
 
 namespace Slang {
 
diff --git a/source/core/slang-random-generator.h b/source/core/slang-random-generator.h
index 392b4cb4c..fa83fec3b 100644
--- a/source/core/slang-random-generator.h
+++ b/source/core/slang-random-generator.h
@@ -1,7 +1,7 @@
 #ifndef SLANG_CORE_RANDOM_GENERATOR_H
 #define SLANG_CORE_RANDOM_GENERATOR_H
 
-#include "../../slang.h"
+#include "slang.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/source/core/slang-render-api-util.cpp b/source/core/slang-render-api-util.cpp
index fce66be90..4fd345840 100644
--- a/source/core/slang-render-api-util.cpp
+++ b/source/core/slang-render-api-util.cpp
@@ -1,7 +1,7 @@
 
 #include "slang-render-api-util.h"
 
-#include "../../slang.h"
+#include "slang.h"
 
 #include "slang-list.h"
 #include "slang-string-util.h"
diff --git a/source/core/slang-render-api-util.h b/source/core/slang-render-api-util.h
index 7a2848038..41728e5f2 100644
--- a/source/core/slang-render-api-util.h
+++ b/source/core/slang-render-api-util.h
@@ -3,7 +3,7 @@
 
 #include "../../source/core/slang-string.h"
 
-#include "../../slang-com-helper.h"
+#include "slang-com-helper.h"
 
 namespace Slang
 {
diff --git a/source/core/slang-riff-file-system.cpp b/source/core/slang-riff-file-system.cpp
index 1fb867500..1072db186 100644
--- a/source/core/slang-riff-file-system.cpp
+++ b/source/core/slang-riff-file-system.cpp
@@ -1,7 +1,7 @@
 #include "slang-riff-file-system.h"
 
-#include "../../slang-com-helper.h"
-#include "../../slang-com-ptr.h"
+#include "slang-com-helper.h"
+#include "slang-com-ptr.h"
 
 #include "slang-blob.h"
 
diff --git a/source/core/slang-riff.cpp b/source/core/slang-riff.cpp
index a90c65db9..83693433e 100644
--- a/source/core/slang-riff.cpp
+++ b/source/core/slang-riff.cpp
@@ -1,6 +1,6 @@
 #include "slang-riff.h"
 
-#include "../../slang-com-helper.h"
+#include "slang-com-helper.h"
 
 #include "slang-hex-dump-util.h"
 
diff --git a/source/core/slang-rtti-info.cpp b/source/core/slang-rtti-info.cpp
index 9e0a3796a..de0460082 100644
--- a/source/core/slang-rtti-info.cpp
+++ b/source/core/slang-rtti-info.cpp
@@ -1,6 +1,6 @@
 #include "slang-rtti-info.h"
 
-#include "../../slang-com-helper.h"
+#include "slang-com-helper.h"
 
 #include "slang-rtti-util.h"
 
diff --git a/source/core/slang-semantic-version.cpp b/source/core/slang-semantic-version.cpp
index 550ea993b..9e68de746 100644
--- a/source/core/slang-semantic-version.cpp
+++ b/source/core/slang-semantic-version.cpp
@@ -1,7 +1,7 @@
 // slang-semantic-version.cpp
 #include "slang-semantic-version.h"
 
-#include "../../slang-com-helper.h"
+#include "slang-com-helper.h"
 
 #include "../core/slang-string-util.h"
 
diff --git a/source/core/slang-shared-library.cpp b/source/core/slang-shared-library.cpp
index c3991ad06..34464597c 100644
--- a/source/core/slang-shared-library.cpp
+++ b/source/core/slang-shared-library.cpp
@@ -1,6 +1,6 @@
 #include "slang-shared-library.h"
 
-#include "../../slang-com-ptr.h"
+#include "slang-com-ptr.h"
 
 #include "slang-io.h"
 #include "slang-string-util.h"
diff --git a/source/core/slang-shared-library.h b/source/core/slang-shared-library.h
index ab91a6501..d6c1618ec 100644
--- a/source/core/slang-shared-library.h
+++ b/source/core/slang-shared-library.h
@@ -1,9 +1,9 @@
 #ifndef SLANG_CORE_SHARED_LIBRARY_H
 #define SLANG_CORE_SHARED_LIBRARY_H
 
-#include "../../slang.h"
-#include "../../slang-com-helper.h"
-#include "../../slang-com-ptr.h"
+#include "slang.h"
+#include "slang-com-helper.h"
+#include "slang-com-ptr.h"
 
 #include "../core/slang-com-object.h"
 #include "../core/slang-io.h"
diff --git a/source/core/slang-short-list.h b/source/core/slang-short-list.h
index adbb935e6..66165fc72 100644
--- a/source/core/slang-short-list.h
+++ b/source/core/slang-short-list.h
@@ -1,7 +1,7 @@
 #ifndef SLANG_CORE_SHORT_LIST_H
 #define SLANG_CORE_SHORT_LIST_H
 
-#include "../../slang.h"
+#include "slang.h"
 
 #include "slang-allocator.h"
 #include "slang-math.h"
diff --git a/source/core/slang-smart-pointer.h b/source/core/slang-smart-pointer.h
index a161f1b83..5cf8e4323 100644
--- a/source/core/slang-smart-pointer.h
+++ b/source/core/slang-smart-pointer.h
@@ -5,7 +5,7 @@
 #include "slang-hash.h"
 #include "slang-type-traits.h"
 
-#include "../../slang.h"
+#include "slang.h"
 
 namespace Slang
 {
diff --git a/source/core/slang-std-writers.h b/source/core/slang-std-writers.h
index 84447186a..e99b386e3 100644
--- a/source/core/slang-std-writers.h
+++ b/source/core/slang-std-writers.h
@@ -2,7 +2,7 @@
 #define SLANG_CORE_STD_WRITERS_H
 
 #include "slang-writer.h"
-#include "../../slang-com-ptr.h"
+#include "slang-com-ptr.h"
 
 namespace Slang
 {
diff --git a/source/core/slang-string-escape-util.cpp b/source/core/slang-string-escape-util.cpp
index 334c1aae5..77399552e 100644
--- a/source/core/slang-string-escape-util.cpp
+++ b/source/core/slang-string-escape-util.cpp
@@ -4,7 +4,7 @@
 #include "slang-text-io.h"
 #include "slang-memory-arena.h"
 
-#include "../../slang-com-helper.h"
+#include "slang-com-helper.h"
 
 namespace Slang {
 
diff --git a/source/core/slang-string-util.h b/source/core/slang-string-util.h
index 7e5733cbb..c0a8f6973 100644
--- a/source/core/slang-string-util.h
+++ b/source/core/slang-string-util.h
@@ -6,8 +6,8 @@
 
 #include <stdarg.h>
 
-#include "../../slang-com-helper.h"
-#include "../../slang-com-ptr.h"
+#include "slang-com-helper.h"
+#include "slang-com-ptr.h"
 
 namespace Slang {
 
diff --git a/source/core/slang-test-tool-util.cpp b/source/core/slang-test-tool-util.cpp
index 74802e233..dad06effe 100644
--- a/source/core/slang-test-tool-util.cpp
+++ b/source/core/slang-test-tool-util.cpp
@@ -1,7 +1,7 @@
 
 #include "slang-test-tool-util.h"
 
-#include "../../slang-com-helper.h"
+#include "slang-com-helper.h"
 
 #include "slang-io.h"
 #include "slang-string-util.h"
diff --git a/source/core/slang-text-io.cpp b/source/core/slang-text-io.cpp
index 327ef55de..f7257c1ee 100644
--- a/source/core/slang-text-io.cpp
+++ b/source/core/slang-text-io.cpp
@@ -1,6 +1,6 @@
 #include "slang-text-io.h"
 
-#include "../../slang-com-helper.h"
+#include "slang-com-helper.h"
 
 namespace Slang
 {
diff --git a/source/core/slang-type-convert-util.h b/source/core/slang-type-convert-util.h
index 00b47a154..70565b896 100644
--- a/source/core/slang-type-convert-util.h
+++ b/source/core/slang-type-convert-util.h
@@ -1,7 +1,7 @@
 #ifndef SLANG_CORE_TYPE_CONVERT_UTIL_H
 #define SLANG_CORE_TYPE_CONVERT_UTIL_H
 
-#include "../../slang.h"
+#include "slang.h"
 
 namespace Slang
 {
diff --git a/source/core/slang-type-text-util.h b/source/core/slang-type-text-util.h
index 219dcd5f2..6d07e7d58 100644
--- a/source/core/slang-type-text-util.h
+++ b/source/core/slang-type-text-util.h
@@ -1,7 +1,7 @@
 #ifndef SLANG_CORE_TYPE_TEXT_UTIL_H
 #define SLANG_CORE_TYPE_TEXT_UTIL_H
 
-#include "../../slang.h"
+#include "slang.h"
 
 #include "slang-string.h"
 #include "slang-array-view.h"
diff --git a/source/core/slang-writer.h b/source/core/slang-writer.h
index 2a86af629..e29939161 100644
--- a/source/core/slang-writer.h
+++ b/source/core/slang-writer.h
@@ -3,8 +3,8 @@
 
 #include "slang-string.h"
 
-#include "../../slang-com-helper.h"
-#include "../../slang-com-ptr.h"
+#include "slang-com-helper.h"
+#include "slang-com-ptr.h"
 
 #include "slang-list.h"
 
diff --git a/source/core/slang-zip-file-system.cpp b/source/core/slang-zip-file-system.cpp
index 9944bd9cf..02d4c9a2b 100644
--- a/source/core/slang-zip-file-system.cpp
+++ b/source/core/slang-zip-file-system.cpp
@@ -1,7 +1,7 @@
 #include "slang-zip-file-system.h"
 
-#include "../../slang-com-helper.h"
-#include "../../slang-com-ptr.h"
+#include "slang-com-helper.h"
+#include "slang-com-ptr.h"
 
 #include "slang-io.h"
 #include "slang-string-util.h"
diff --git a/source/core/windows/slang-win-process.cpp b/source/core/windows/slang-win-process.cpp
index 8b41393ae..3aa21deb5 100644
--- a/source/core/windows/slang-win-process.cpp
+++ b/source/core/windows/slang-win-process.cpp
@@ -6,7 +6,7 @@
 #include "../slang-string-util.h"
 #include "../slang-process-util.h"
 
-#include "../../../slang-com-helper.h"
+#include "slang-com-helper.h"
 
 #ifdef _WIN32
 // TODO: We could try to avoid including this at all, but it would