Use slang- prefix on slang compiler and core source (#973)

* Prefixing source files in source/slang with slang-

* Prefix source in source/slang with slang- prefix.

* Rename core source files with slang- prefix.

* Update project files.

* Fix problems from automatic merge.

45 files changed, 193 insertions, 191 deletions

diff --git a/source/core/basic.h b/source/core/basic.h
deleted file mode 100644
index e89d740bf..000000000
--- a/source/core/basic.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef CORE_LIB_BASIC_H
-#define CORE_LIB_BASIC_H
-
-#include "common.h"
-#include "slang-math.h"
-#include "slang-string.h"
-#include "array.h"
-#include "list.h"
-#include "smart-pointer.h"
-#include "exception.h"
-#include "dictionary.h"
-
-#endif
\ No newline at end of file
diff --git a/source/core/core.vcxproj b/source/core/core.vcxproj
index 0416eaed6..a8e92949f 100644
--- a/source/core/core.vcxproj
+++ b/source/core/core.vcxproj
@@ -170,59 +170,59 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="allocator.h" />
-    <ClInclude Include="array-view.h" />
-    <ClInclude Include="array.h" />
-    <ClInclude Include="basic.h" />
-    <ClInclude Include="common.h" />
-    <ClInclude Include="dictionary.h" />
-    <ClInclude Include="exception.h" />
-    <ClInclude Include="hash.h" />
-    <ClInclude Include="list.h" />
-    <ClInclude Include="platform.h" />
-    <ClInclude Include="secure-crt.h" />
+    <ClInclude Include="slang-allocator.h" />
+    <ClInclude Include="slang-array-view.h" />
+    <ClInclude Include="slang-array.h" />
+    <ClInclude Include="slang-basic.h" />
     <ClInclude Include="slang-byte-encode-util.h" />
+    <ClInclude Include="slang-common.h" />
+    <ClInclude Include="slang-dictionary.h" />
+    <ClInclude Include="slang-exception.h" />
     <ClInclude Include="slang-free-list.h" />
+    <ClInclude Include="slang-hash.h" />
     <ClInclude Include="slang-io.h" />
+    <ClInclude Include="slang-list.h" />
     <ClInclude Include="slang-math.h" />
     <ClInclude Include="slang-memory-arena.h" />
     <ClInclude Include="slang-object-scope-manager.h" />
+    <ClInclude Include="slang-platform.h" />
     <ClInclude Include="slang-random-generator.h" />
     <ClInclude Include="slang-render-api-util.h" />
+    <ClInclude Include="slang-secure-crt.h" />
     <ClInclude Include="slang-shared-library.h" />
+    <ClInclude Include="slang-smart-pointer.h" />
     <ClInclude Include="slang-std-writers.h" />
+    <ClInclude Include="slang-stream.h" />
     <ClInclude Include="slang-string-slice-pool.h" />
     <ClInclude Include="slang-string-util.h" />
     <ClInclude Include="slang-string.h" />
     <ClInclude Include="slang-test-tool-util.h" />
+    <ClInclude Include="slang-text-io.h" />
+    <ClInclude Include="slang-token-reader.h" />
+    <ClInclude Include="slang-type-traits.h" />
     <ClInclude Include="slang-uint-set.h" />
     <ClInclude Include="slang-writer.h" />
-    <ClInclude Include="smart-pointer.h" />
-    <ClInclude Include="stream.h" />
-    <ClInclude Include="text-io.h" />
-    <ClInclude Include="token-reader.h" />
-    <ClInclude Include="type-traits.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="platform.cpp" />
     <ClCompile Include="slang-byte-encode-util.cpp" />
     <ClCompile Include="slang-free-list.cpp" />
     <ClCompile Include="slang-io.cpp" />
     <ClCompile Include="slang-memory-arena.cpp" />
     <ClCompile Include="slang-object-scope-manager.cpp" />
+    <ClCompile Include="slang-platform.cpp" />
     <ClCompile Include="slang-random-generator.cpp" />
     <ClCompile Include="slang-render-api-util.cpp" />
     <ClCompile Include="slang-shared-library.cpp" />
     <ClCompile Include="slang-std-writers.cpp" />
+    <ClCompile Include="slang-stream.cpp" />
     <ClCompile Include="slang-string-slice-pool.cpp" />
     <ClCompile Include="slang-string-util.cpp" />
     <ClCompile Include="slang-string.cpp" />
     <ClCompile Include="slang-test-tool-util.cpp" />
+    <ClCompile Include="slang-text-io.cpp" />
+    <ClCompile Include="slang-token-reader.cpp" />
     <ClCompile Include="slang-uint-set.cpp" />
     <ClCompile Include="slang-writer.cpp" />
-    <ClCompile Include="stream.cpp" />
-    <ClCompile Include="text-io.cpp" />
-    <ClCompile Include="token-reader.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="core.natvis" />
diff --git a/source/core/core.vcxproj.filters b/source/core/core.vcxproj.filters
index 0a0ea93fa..8656ab49b 100644
--- a/source/core/core.vcxproj.filters
+++ b/source/core/core.vcxproj.filters
@@ -9,46 +9,40 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="allocator.h">
+    <ClInclude Include="slang-allocator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="array-view.h">
+    <ClInclude Include="slang-array-view.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="array.h">
+    <ClInclude Include="slang-array.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="basic.h">
+    <ClInclude Include="slang-basic.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="dictionary.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="exception.h">
+    <ClInclude Include="slang-byte-encode-util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="hash.h">
+    <ClInclude Include="slang-common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="list.h">
+    <ClInclude Include="slang-dictionary.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="platform.h">
+    <ClInclude Include="slang-exception.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="secure-crt.h">
+    <ClInclude Include="slang-free-list.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="slang-byte-encode-util.h">
+    <ClInclude Include="slang-hash.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="slang-free-list.h">
+    <ClInclude Include="slang-io.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="slang-io.h">
+    <ClInclude Include="slang-list.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="slang-math.h">
@@ -60,18 +54,30 @@
     <ClInclude Include="slang-object-scope-manager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="slang-platform.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="slang-random-generator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="slang-render-api-util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="slang-secure-crt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="slang-shared-library.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="slang-smart-pointer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="slang-std-writers.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="slang-stream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="slang-string-slice-pool.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -84,32 +90,23 @@
     <ClInclude Include="slang-test-tool-util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="slang-uint-set.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-writer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="smart-pointer.h">
+    <ClInclude Include="slang-text-io.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="stream.h">
+    <ClInclude Include="slang-token-reader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="text-io.h">
+    <ClInclude Include="slang-type-traits.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="token-reader.h">
+    <ClInclude Include="slang-uint-set.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="type-traits.h">
+    <ClInclude Include="slang-writer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="platform.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="slang-byte-encode-util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -125,6 +122,9 @@
     <ClCompile Include="slang-object-scope-manager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="slang-platform.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="slang-random-generator.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -137,6 +137,9 @@
     <ClCompile Include="slang-std-writers.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="slang-stream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="slang-string-slice-pool.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -149,19 +152,16 @@
     <ClCompile Include="slang-test-tool-util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="slang-uint-set.cpp">
+    <ClCompile Include="slang-text-io.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="slang-writer.cpp">
+    <ClCompile Include="slang-token-reader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="text-io.cpp">
+    <ClCompile Include="slang-uint-set.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="token-reader.cpp">
+    <ClCompile Include="slang-writer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/source/core/allocator.h b/source/core/slang-allocator.h
index 5832d0b84..481f8810f 100644
--- a/source/core/allocator.h
+++ b/source/core/slang-allocator.h
@@ -1,5 +1,5 @@
-#ifndef CORE_LIB_ALLOCATOR_H
-#define CORE_LIB_ALLOCATOR_H
+#ifndef SLANG_CORE_ALLOCATOR_H
+#define SLANG_CORE_ALLOCATOR_H
 
 #include <stdlib.h>
 #ifdef _MSC_VER
diff --git a/source/core/array-view.h b/source/core/slang-array-view.h
index ad9673e2e..8b653f4c7 100644
--- a/source/core/array-view.h
+++ b/source/core/slang-array-view.h
@@ -1,7 +1,7 @@
-#ifndef CORE_LIB_ARRAY_VIEW_H
-#define CORE_LIB_ARRAY_VIEW_H
+#ifndef SLANG_CORE_ARRAY_VIEW_H
+#define SLANG_CORE_ARRAY_VIEW_H
 
-#include "common.h"
+#include "slang-common.h"
 
 namespace Slang
 {
diff --git a/source/core/array.h b/source/core/slang-array.h
index 2a5fa0aa7..d4bb7386f 100644
--- a/source/core/array.h
+++ b/source/core/slang-array.h
@@ -1,8 +1,8 @@
-#ifndef CORE_LIB_ARRAY_H
-#define CORE_LIB_ARRAY_H
+#ifndef SLANG_CORE_ARRAY_H
+#define SLANG_CORE_ARRAY_H
 
-#include "exception.h"
-#include "array-view.h"
+#include "slang-exception.h"
+#include "slang-array-view.h"
 
 namespace Slang
 {
diff --git a/source/core/slang-basic.h b/source/core/slang-basic.h
new file mode 100644
index 000000000..7931749f4
--- /dev/null
+++ b/source/core/slang-basic.h
@@ -0,0 +1,13 @@
+#ifndef SLANG_CORE_BASIC_H
+#define SLANG_CORE_BASIC_H
+
+#include "slang-common.h"
+#include "slang-math.h"
+#include "slang-string.h"
+#include "slang-array.h"
+#include "slang-list.h"
+#include "slang-smart-pointer.h"
+#include "slang-exception.h"
+#include "slang-dictionary.h"
+
+#endif
diff --git a/source/core/slang-byte-encode-util.cpp b/source/core/slang-byte-encode-util.cpp
index 47ab824a4..32eb96a29 100644
--- a/source/core/slang-byte-encode-util.cpp
+++ b/source/core/slang-byte-encode-util.cpp
@@ -1,7 +1,5 @@
 #include "slang-byte-encode-util.h"
 
-
-
 namespace Slang {
 
 // Descriptions of algorithms here...
diff --git a/source/core/slang-byte-encode-util.h b/source/core/slang-byte-encode-util.h
index 5936cae60..cb601d522 100644
--- a/source/core/slang-byte-encode-util.h
+++ b/source/core/slang-byte-encode-util.h
@@ -1,7 +1,7 @@
-#ifndef SLANG_BYTE_ENCODE_UTIL_H
-#define SLANG_BYTE_ENCODE_UTIL_H
+#ifndef SLANG_CORE_BYTE_ENCODE_UTIL_H
+#define SLANG_CORE_BYTE_ENCODE_UTIL_H
 
-#include "list.h"
+#include "slang-list.h"
 
 namespace Slang {
 
diff --git a/source/core/common.h b/source/core/slang-common.h
index 0e5396caf..7d8568642 100644
--- a/source/core/common.h
+++ b/source/core/slang-common.h
@@ -1,5 +1,5 @@
-#ifndef CORE_LIB_COMMON_H
-#define CORE_LIB_COMMON_H
+#ifndef SLANG_CORE_COMMON_H
+#define SLANG_CORE_COMMON_H
 
 #include "../../slang.h"
 
diff --git a/source/core/dictionary.h b/source/core/slang-dictionary.h
index 1b3525756..69e8022dd 100644
--- a/source/core/dictionary.h
+++ b/source/core/slang-dictionary.h
@@ -1,11 +1,12 @@
-#ifndef CORE_LIB_DICTIONARY_H
-#define CORE_LIB_DICTIONARY_H
-#include "list.h"
-#include "common.h"
+#ifndef SLANG_CORE_DICTIONARY_H
+#define SLANG_CORE_DICTIONARY_H
+
+#include "slang-list.h"
+#include "slang-common.h"
 #include "slang-uint-set.h"
-#include "exception.h"
+#include "slang-exception.h"
 #include "slang-math.h"
-#include "hash.h"
+#include "slang-hash.h"
 
 namespace Slang
 {
diff --git a/source/core/exception.h b/source/core/slang-exception.h
index fc7aa48e2..91139e298 100644
--- a/source/core/exception.h
+++ b/source/core/slang-exception.h
@@ -1,7 +1,7 @@
-#ifndef CORE_LIB_EXCEPTION_H
-#define CORE_LIB_EXCEPTION_H
+#ifndef SLANG_CORE_EXCEPTION_H
+#define SLANG_CORE_EXCEPTION_H
 
-#include "common.h"
+#include "slang-common.h"
 #include "slang-string.h"
 
 namespace Slang
@@ -134,4 +134,4 @@ namespace Slang
     };
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/source/core/slang-free-list.h b/source/core/slang-free-list.h
index 62c2b9d93..ee0158279 100644
--- a/source/core/slang-free-list.h
+++ b/source/core/slang-free-list.h
@@ -1,9 +1,9 @@
-#ifndef SLANG_FREE_LIST_H
-#define SLANG_FREE_LIST_H
+#ifndef SLANG_CORE_FREE_LIST_H
+#define SLANG_CORE_FREE_LIST_H
 
 #include "../../slang.h"
 
-#include "common.h"
+#include "slang-common.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/source/core/hash.h b/source/core/slang-hash.h
index 83e99179b..08a40491c 100644
--- a/source/core/hash.h
+++ b/source/core/slang-hash.h
@@ -1,5 +1,5 @@
-#ifndef CORELIB_HASH_H
-#define CORELIB_HASH_H
+#ifndef SLANG_CORE_HASH_H
+#define SLANG_CORE_HASH_H
 
 #include "slang-math.h"
 #include <string.h>
diff --git a/source/core/slang-io.cpp b/source/core/slang-io.cpp
index 82a2e5a35..ae2520a78 100644
--- a/source/core/slang-io.cpp
+++ b/source/core/slang-io.cpp
@@ -1,5 +1,5 @@
 #include "slang-io.h"
-#include "exception.h"
+#include "slang-exception.h"
 
 #include "../../slang-com-helper.h"
 
diff --git a/source/core/slang-io.h b/source/core/slang-io.h
index 9df8d8d57..64ec11c5a 100644
--- a/source/core/slang-io.h
+++ b/source/core/slang-io.h
@@ -1,10 +1,10 @@
-#ifndef CORE_LIB_IO_H
-#define CORE_LIB_IO_H
+#ifndef SLANG_CORE_IO_H
+#define SLANG_CORE_IO_H
 
 #include "slang-string.h"
-#include "stream.h"
-#include "text-io.h"
-#include "secure-crt.h"
+#include "slang-stream.h"
+#include "slang-text-io.h"
+#include "slang-secure-crt.h"
 
 namespace Slang
 {
diff --git a/source/core/list.h b/source/core/slang-list.h
index 7ba313305..0affbfd66 100644
--- a/source/core/list.h
+++ b/source/core/slang-list.h
@@ -1,11 +1,11 @@
-#ifndef FUNDAMENTAL_LIB_LIST_H
-#define FUNDAMENTAL_LIB_LIST_H
+#ifndef SLANG_CORE_LIST_H
+#define SLANG_CORE_LIST_H
 
 #include "../../slang.h"
 
-#include "allocator.h"
+#include "slang-allocator.h"
 #include "slang-math.h"
-#include "array-view.h"
+#include "slang-array-view.h"
 
 #include <algorithm>
 #include <new>
diff --git a/source/core/slang-math.h b/source/core/slang-math.h
index a245e2d2c..0daad0d5a 100644
--- a/source/core/slang-math.h
+++ b/source/core/slang-math.h
@@ -1,5 +1,5 @@
-#ifndef CORE_LIB_MATH_H
-#define CORE_LIB_MATH_H
+#ifndef SLANG_CORE_MATH_H
+#define SLANG_CORE_MATH_H
 
 #include <math.h>
 
diff --git a/source/core/slang-memory-arena.h b/source/core/slang-memory-arena.h
index b9066e198..75744710f 100644
--- a/source/core/slang-memory-arena.h
+++ b/source/core/slang-memory-arena.h
@@ -1,5 +1,5 @@
-#ifndef SLANG_MEMORY_ARENA_H
-#define SLANG_MEMORY_ARENA_H
+#ifndef SLANG_CORE_MEMORY_ARENA_H
+#define SLANG_CORE_MEMORY_ARENA_H
 
 #include "../../slang.h"
 
diff --git a/source/core/slang-object-scope-manager.h b/source/core/slang-object-scope-manager.h
index 660a7cace..9930e46ea 100644
--- a/source/core/slang-object-scope-manager.h
+++ b/source/core/slang-object-scope-manager.h
@@ -1,8 +1,8 @@
-#ifndef SLANG_OBJECT_SCOPE_MANAGER_H
-#define SLANG_OBJECT_SCOPE_MANAGER_H
+#ifndef SLANG_CORE_OBJECT_SCOPE_MANAGER_H
+#define SLANG_CORE_OBJECT_SCOPE_MANAGER_H
 
-#include "smart-pointer.h"
-#include "list.h"
+#include "slang-smart-pointer.h"
+#include "slang-list.h"
 
 namespace Slang {
 
diff --git a/source/core/platform.cpp b/source/core/slang-platform.cpp
index 0deec8ed6..1cb2bc56e 100644
--- a/source/core/platform.cpp
+++ b/source/core/slang-platform.cpp
@@ -1,7 +1,7 @@
-// platform.cpp
-#include "platform.h"
+// slang-platform.cpp
+#include "slang-platform.h"
 
-#include "common.h"
+#include "slang-common.h"
 
 #ifdef _WIN32
 	#define WIN32_LEAN_AND_MEAN
diff --git a/source/core/platform.h b/source/core/slang-platform.h
index 544ae8c16..e33c5599d 100644
--- a/source/core/platform.h
+++ b/source/core/slang-platform.h
@@ -1,6 +1,6 @@
-// platform.h
-#ifndef SLANG_CORE_PLATFORM_H_INCLUDED
-#define SLANG_CORE_PLATFORM_H_INCLUDED
+// slang-platform.h
+#ifndef SLANG_CORE_PLATFORM_H
+#define SLANG_CORE_PLATFORM_H
 
 #include "../../slang.h"
 #include "../core/slang-string.h"
diff --git a/source/core/slang-random-generator.h b/source/core/slang-random-generator.h
index cc25aadf3..8b4d1759b 100644
--- a/source/core/slang-random-generator.h
+++ b/source/core/slang-random-generator.h
@@ -1,12 +1,12 @@
-#ifndef SLANG_RANDOM_GENERATOR_H
-#define SLANG_RANDOM_GENERATOR_H
+#ifndef SLANG_CORE_RANDOM_GENERATOR_H
+#define SLANG_CORE_RANDOM_GENERATOR_H
 
 #include "../../slang.h"
 
 #include <stdlib.h>
 #include <string.h>
 
-#include "smart-pointer.h"
+#include "slang-smart-pointer.h"
 
 namespace Slang { 
 
diff --git a/source/core/slang-render-api-util.cpp b/source/core/slang-render-api-util.cpp
index 05def0fe3..3df971219 100644
--- a/source/core/slang-render-api-util.cpp
+++ b/source/core/slang-render-api-util.cpp
@@ -3,10 +3,10 @@
 
 #include "../../slang.h"
 
-#include "../../source/core/list.h"
-#include "../../source/core/slang-string-util.h"
+#include "slang-list.h"
+#include "slang-string-util.h"
 
-#include "platform.h"
+#include "slang-platform.h"
 
 namespace Slang {
 
diff --git a/source/core/slang-render-api-util.h b/source/core/slang-render-api-util.h
index 42e88a6ac..fbdd3930c 100644
--- a/source/core/slang-render-api-util.h
+++ b/source/core/slang-render-api-util.h
@@ -1,5 +1,5 @@
-#ifndef SLANG_RENDER_API_UTIL_H
-#define SLANG_RENDER_API_UTIL_H
+#ifndef SLANG_CORE_RENDER_API_UTIL_H
+#define SLANG_CORE_RENDER_API_UTIL_H
 
 #include "../../source/core/slang-string.h"
 
diff --git a/source/core/secure-crt.h b/source/core/slang-secure-crt.h
index 52a0d4870..991fe939e 100644
--- a/source/core/secure-crt.h
+++ b/source/core/slang-secure-crt.h
@@ -1,6 +1,6 @@
 #ifndef _MSC_VER
-#ifndef CORE_LIB_SECURE_CRT_H
-#define CORE_LIB_SECURE_CRT_H
+#ifndef SLANG_CORE_SECURE_CRT_H
+#define SLANG_CORE_SECURE_CRT_H
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/source/core/slang-shared-library.cpp b/source/core/slang-shared-library.cpp
index 20d457840..009abf921 100644
--- a/source/core/slang-shared-library.cpp
+++ b/source/core/slang-shared-library.cpp
@@ -1,8 +1,9 @@
 #include "slang-shared-library.h"
 
 #include "../../slang-com-ptr.h"
-#include "../core/slang-io.h"
-#include "../core/slang-string-util.h"
+
+#include "slang-io.h"
+#include "slang-string-util.h"
 
 namespace Slang
 {
diff --git a/source/core/slang-shared-library.h b/source/core/slang-shared-library.h
index 62d15b6b4..5a4eb7229 100644
--- a/source/core/slang-shared-library.h
+++ b/source/core/slang-shared-library.h
@@ -1,13 +1,13 @@
-#ifndef SLANG_SHARED_LIBRARY_H_INCLUDED
-#define SLANG_SHARED_LIBRARY_H_INCLUDED
+#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 "../core/platform.h"
-#include "../core/common.h"
-#include "../core/dictionary.h"
+#include "../core/slang-platform.h"
+#include "../core/slang-common.h"
+#include "../core/slang-dictionary.h"
 
 namespace Slang
 {
@@ -119,4 +119,4 @@ public:
 
 }
 
-#endif // SLANG_SHARED_LIBRARY_H_INCLUDED
\ No newline at end of file
+#endif // SLANG_SHARED_LIBRARY_H_INCLUDED
diff --git a/source/core/smart-pointer.h b/source/core/slang-smart-pointer.h
index aa5c06e02..bae30de37 100644
--- a/source/core/smart-pointer.h
+++ b/source/core/slang-smart-pointer.h
@@ -1,9 +1,9 @@
-#ifndef FUNDAMENTAL_LIB_SMART_POINTER_H
-#define FUNDAMENTAL_LIB_SMART_POINTER_H
+#ifndef SLANG_CORE_SMART_POINTER_H
+#define SLANG_CORE_SMART_POINTER_H
 
-#include "common.h"
-#include "hash.h"
-#include "type-traits.h"
+#include "slang-common.h"
+#include "slang-hash.h"
+#include "slang-type-traits.h"
 
 #include "../../slang.h"
 
diff --git a/source/core/slang-std-writers.h b/source/core/slang-std-writers.h
index b35d3d037..8ecb89227 100644
--- a/source/core/slang-std-writers.h
+++ b/source/core/slang-std-writers.h
@@ -1,5 +1,5 @@
-#ifndef SLANG_STD_WRITERS_H
-#define SLANG_STD_WRITERS_H
+#ifndef SLANG_CORE_STD_WRITERS_H
+#define SLANG_CORE_STD_WRITERS_H
 
 #include "slang-writer.h"
 #include "../../slang-com-ptr.h"
diff --git a/source/core/stream.cpp b/source/core/slang-stream.cpp
index de0a8b8f3..ee194c451 100644
--- a/source/core/stream.cpp
+++ b/source/core/slang-stream.cpp
@@ -1,4 +1,4 @@
-#include "stream.h"
+#include "slang-stream.h"
 #ifdef _WIN32
 #include <share.h>
 #endif
diff --git a/source/core/stream.h b/source/core/slang-stream.h
index 618aadbd4..67e04fa6a 100644
--- a/source/core/stream.h
+++ b/source/core/slang-stream.h
@@ -1,7 +1,7 @@
-#ifndef CORE_LIB_STREAM_H
-#define CORE_LIB_STREAM_H
+#ifndef SLANG_CORE_STREAM_H
+#define SLANG_CORE_STREAM_H
 
-#include "basic.h"
+#include "slang-basic.h"
 
 namespace Slang
 {
diff --git a/source/core/slang-string-slice-pool.h b/source/core/slang-string-slice-pool.h
index cf8f63c81..4d5f91e37 100644
--- a/source/core/slang-string-slice-pool.h
+++ b/source/core/slang-string-slice-pool.h
@@ -1,11 +1,11 @@
-#ifndef SLANG_STRING_SLICE_POOL_H
-#define SLANG_STRING_SLICE_POOL_H
+#ifndef SLANG_CORE_STRING_SLICE_POOL_H
+#define SLANG_CORE_STRING_SLICE_POOL_H
 
 #include "slang-string.h"
 
-#include "list.h"
+#include "slang-list.h"
 #include "slang-memory-arena.h"
-#include "dictionary.h"
+#include "slang-dictionary.h"
 
 namespace Slang {
 
diff --git a/source/core/slang-string-util.h b/source/core/slang-string-util.h
index 40fda31c4..fcae23bb3 100644
--- a/source/core/slang-string-util.h
+++ b/source/core/slang-string-util.h
@@ -1,8 +1,8 @@
-#ifndef SLANG_STRING_UTIL_H
-#define SLANG_STRING_UTIL_H
+#ifndef SLANG_CORE_STRING_UTIL_H
+#define SLANG_CORE_STRING_UTIL_H
 
 #include "slang-string.h"
-#include "list.h"
+#include "slang-list.h"
 
 #include <stdarg.h>
 
diff --git a/source/core/slang-string.cpp b/source/core/slang-string.cpp
index 9a908c93e..64b8e4dc1 100644
--- a/source/core/slang-string.cpp
+++ b/source/core/slang-string.cpp
@@ -1,5 +1,5 @@
 #include "slang-string.h"
-#include "text-io.h"
+#include "slang-text-io.h"
 
 namespace Slang
 {
diff --git a/source/core/slang-string.h b/source/core/slang-string.h
index 82eda74ac..1cd9e5413 100644
--- a/source/core/slang-string.h
+++ b/source/core/slang-string.h
@@ -1,14 +1,14 @@
-#ifndef FUNDAMENTAL_LIB_STRING_H
-#define FUNDAMENTAL_LIB_STRING_H
+#ifndef SLANG_CORE_STRING_H
+#define SLANG_CORE_STRING_H
 
 #include <string.h>
 #include <cstdlib>
 #include <stdio.h>
 
-#include "smart-pointer.h"
-#include "common.h"
-#include "hash.h"
-#include "secure-crt.h"
+#include "slang-smart-pointer.h"
+#include "slang-common.h"
+#include "slang-hash.h"
+#include "slang-secure-crt.h"
 
 #include <new>
 
diff --git a/source/core/slang-test-tool-util.h b/source/core/slang-test-tool-util.h
index 3ec655cad..a5d7541ec 100644
--- a/source/core/slang-test-tool-util.h
+++ b/source/core/slang-test-tool-util.h
@@ -1,5 +1,5 @@
-#ifndef SLANG_TEST_TOOL_UTIL_H
-#define SLANG_TEST_TOOL_UTIL_H
+#ifndef SLANG_CORE_TEST_TOOL_UTIL_H
+#define SLANG_CORE_TEST_TOOL_UTIL_H
 
 #include "slang-std-writers.h"
 
diff --git a/source/core/text-io.cpp b/source/core/slang-text-io.cpp
index 1f6b44c92..18039e41b 100644
--- a/source/core/text-io.cpp
+++ b/source/core/slang-text-io.cpp
@@ -1,4 +1,4 @@
-#include "text-io.h"
+#include "slang-text-io.h"
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
diff --git a/source/core/text-io.h b/source/core/slang-text-io.h
index 949150777..ac9a4f5dc 100644
--- a/source/core/text-io.h
+++ b/source/core/slang-text-io.h
@@ -1,8 +1,8 @@
-#ifndef CORE_LIB_TEXT_IO_H
-#define CORE_LIB_TEXT_IO_H
+#ifndef SLANG_CORE_TEXT_IO_H
+#define SLANG_CORE_TEXT_IO_H
 
-#include "secure-crt.h"
-#include "stream.h"
+#include "slang-secure-crt.h"
+#include "slang-stream.h"
 
 namespace Slang
 {
diff --git a/source/core/token-reader.cpp b/source/core/slang-token-reader.cpp
index ea40c9ed9..a15dcda9c 100644
--- a/source/core/token-reader.cpp
+++ b/source/core/slang-token-reader.cpp
@@ -1,4 +1,4 @@
-#include "token-reader.h"
+#include "slang-token-reader.h"
 
 namespace Slang
 {
diff --git a/source/core/token-reader.h b/source/core/slang-token-reader.h
index a5b9b3694..f8a455452 100644
--- a/source/core/token-reader.h
+++ b/source/core/slang-token-reader.h
@@ -1,10 +1,12 @@
-#ifndef CORE_TOKEN_READER_H
-#define CORE_TOKEN_READER_H
+#ifndef SLANG_CORE_TOKEN_READER_H
+#define SLANG_CORE_TOKEN_READER_H
 
-#include "basic.h"
+#include "slang-basic.h"
 
 namespace Slang
 {
+    /* NOTE! This TokenReader is NOT used by the main slang compiler !*/
+
     enum class TokenType
     {
         EndOfFile = -1,
diff --git a/source/core/type-traits.h b/source/core/slang-type-traits.h
index 804b4d3fe..ccd1fb29c 100644
--- a/source/core/type-traits.h
+++ b/source/core/slang-type-traits.h
@@ -1,5 +1,5 @@
-#ifndef CORELIB_TYPETRAITS_H
-#define CORELIB_TYPETRAITS_H
+#ifndef SLANG_CORE_TYPE_TRAITS_H
+#define SLANG_CORE_TYPE_TRAITS_H
 
 namespace Slang
 {
diff --git a/source/core/slang-uint-set.h b/source/core/slang-uint-set.h
index 25f0c9269..77930ba0d 100644
--- a/source/core/slang-uint-set.h
+++ b/source/core/slang-uint-set.h
@@ -1,9 +1,9 @@
-#ifndef SLANG_UINT_SET_H
-#define SLANG_UINT_SET_H
+#ifndef SLANG_CORE_UINT_SET_H
+#define SLANG_CORE_UINT_SET_H
 
-#include "list.h"
+#include "slang-list.h"
 #include "slang-math.h"
-#include "common.h"
+#include "slang-common.h"
 
 #include <memory.h>
 
diff --git a/source/core/slang-writer.cpp b/source/core/slang-writer.cpp
index 2c6f99bf9..5b643fff8 100644
--- a/source/core/slang-writer.cpp
+++ b/source/core/slang-writer.cpp
@@ -1,6 +1,6 @@
 #include "slang-writer.h"
 
-#include "platform.h"
+#include "slang-platform.h"
 #include "slang-string-util.h"
 
 // Includes to allow us to control console
diff --git a/source/core/slang-writer.h b/source/core/slang-writer.h
index 463450ac9..6e26d6750 100644
--- a/source/core/slang-writer.h
+++ b/source/core/slang-writer.h
@@ -1,10 +1,10 @@
-#ifndef SLANG_WRITER_H
-#define SLANG_WRITER_H
+#ifndef SLANG_CORE_WRITER_H
+#define SLANG_CORE_WRITER_H
 
 #include "slang-string.h"
 
 #include "../../slang-com-helper.h"
-#include "../../source/core/list.h"
+#include "slang-list.h"
 
 namespace Slang
 {