diff --git a/UnitTests/UnitTests.vcxproj b/UnitTests/UnitTests.vcxproj
index 2fc27f531..95931c154 100644
--- a/UnitTests/UnitTests.vcxproj
+++ b/UnitTests/UnitTests.vcxproj
@@ -82,7 +82,7 @@
       <AdditionalIncludeDirectories>..\include;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UseFullPaths>true</UseFullPaths>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>pch.hpp</PrecompiledHeaderFile>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
@@ -131,7 +131,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="compat.hpp" />
-    <ClInclude Include="pch.h" />
+    <ClInclude Include="pch.hpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/UnitTests/UnitTests.vcxproj.filters b/UnitTests/UnitTests.vcxproj.filters
index 5c9741b7d..d5a92f7e8 100644
--- a/UnitTests/UnitTests.vcxproj.filters
+++ b/UnitTests/UnitTests.vcxproj.filters
@@ -41,7 +41,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="pch.h">
+    <ClInclude Include="pch.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="compat.hpp">
diff --git a/UnitTests/UnitTests.xcodeproj/project.pbxproj b/UnitTests/UnitTests.xcodeproj/project.pbxproj
index c07dec75d..3476eb9c1 100644
--- a/UnitTests/UnitTests.xcodeproj/project.pbxproj
+++ b/UnitTests/UnitTests.xcodeproj/project.pbxproj
@@ -49,7 +49,7 @@
 		F437AA902AC1BB64001E2230 /* hash.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = hash.cpp; sourceTree = "<group>"; };
 		F4B7FBDC2AAF49BC00C6BE9F /* UnitTests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = UnitTests; sourceTree = BUILT_PRODUCTS_DIR; };
 		F4C07F4E2AB059300044EDC0 /* math.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = math.cpp; sourceTree = "<group>"; };
-		F4C07F502AB059580044EDC0 /* pch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pch.h; sourceTree = "<group>"; };
+		F4C07F502AB059580044EDC0 /* pch.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pch.hpp; sourceTree = "<group>"; };
 		F4C07F512AB059580044EDC0 /* pch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pch.cpp; sourceTree = "<group>"; };
 		F4C07F532AB05A240044EDC0 /* compat.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = compat.hpp; sourceTree = "<group>"; };
 		F4C07F542AB05B5B0044EDC0 /* main.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
@@ -109,7 +109,7 @@
 				F4C07F4E2AB059300044EDC0 /* math.cpp */,
 				F4C07F562AB08E690044EDC0 /* parser.cpp */,
 				F4C07F512AB059580044EDC0 /* pch.cpp */,
-				F4C07F502AB059580044EDC0 /* pch.h */,
+				F4C07F502AB059580044EDC0 /* pch.hpp */,
 				F4B7FBDD2AAF49BC00C6BE9F /* Products */,
 				F4C07F592AB08E690044EDC0 /* ring.cpp */,
 				F4C07F582AB08E690044EDC0 /* sgml.cpp */,
diff --git a/UnitTests/hash.cpp b/UnitTests/hash.cpp
index 0494b9e79..53d2e8898 100644
--- a/UnitTests/hash.cpp
+++ b/UnitTests/hash.cpp
@@ -3,7 +3,7 @@
 	Copyright © 2023 Amebis
 */
 
-#include "pch.h"
+#include "pch.hpp"
 
 using namespace std;
 #ifdef _WIN32
diff --git a/UnitTests/main.cpp b/UnitTests/main.cpp
index 681ab2ff5..8ee1385dd 100644
--- a/UnitTests/main.cpp
+++ b/UnitTests/main.cpp
@@ -3,7 +3,7 @@
 	Copyright © 2023 Amebis
 */
 
-#include "pch.h"
+#include "pch.hpp"
 #include "hash.cpp"
 #include "math.cpp"
 #include "parser.cpp"
diff --git a/UnitTests/math.cpp b/UnitTests/math.cpp
index b0e92c766..6066690bf 100644
--- a/UnitTests/math.cpp
+++ b/UnitTests/math.cpp
@@ -3,7 +3,7 @@
 	Copyright © 2023 Amebis
 */
 
-#include "pch.h"
+#include "pch.hpp"
 
 using namespace std;
 #ifdef _WIN32
diff --git a/UnitTests/parser.cpp b/UnitTests/parser.cpp
index 162ae09ce..49e8bb80b 100644
--- a/UnitTests/parser.cpp
+++ b/UnitTests/parser.cpp
@@ -3,7 +3,7 @@
 	Copyright © 2023 Amebis
 */
 
-#include "pch.h"
+#include "pch.hpp"
 
 using namespace std;
 using namespace stdex;
diff --git a/UnitTests/pch.cpp b/UnitTests/pch.cpp
index 944a2840f..17c4b13da 100644
--- a/UnitTests/pch.cpp
+++ b/UnitTests/pch.cpp
@@ -3,4 +3,4 @@
 	Copyright © 2023 Amebis
 */
 
-#include "pch.h"
+#include "pch.hpp"
diff --git a/UnitTests/pch.h b/UnitTests/pch.hpp
similarity index 100%
rename from UnitTests/pch.h
rename to UnitTests/pch.hpp
diff --git a/UnitTests/ring.cpp b/UnitTests/ring.cpp
index b663910b7..6188c44f3 100644
--- a/UnitTests/ring.cpp
+++ b/UnitTests/ring.cpp
@@ -3,7 +3,7 @@
 	Copyright © 2023 Amebis
 */
 
-#include "pch.h"
+#include "pch.hpp"
 
 using namespace std;
 #ifdef _WIN32
diff --git a/UnitTests/sgml.cpp b/UnitTests/sgml.cpp
index 26ce71951..3efb3e2eb 100644
--- a/UnitTests/sgml.cpp
+++ b/UnitTests/sgml.cpp
@@ -3,7 +3,7 @@
 	Copyright © 2023 Amebis
 */
 
-#include "pch.h"
+#include "pch.hpp"
 
 using namespace std;
 #ifdef _WIN32
diff --git a/UnitTests/stream.cpp b/UnitTests/stream.cpp
index 49fec2218..5789dea89 100644
--- a/UnitTests/stream.cpp
+++ b/UnitTests/stream.cpp
@@ -3,7 +3,7 @@
 	Copyright © 2023 Amebis
 */
 
-#include "pch.h"
+#include "pch.hpp"
 
 using namespace std;
 using namespace stdex;
diff --git a/UnitTests/unicode.cpp b/UnitTests/unicode.cpp
index 1f4b6312e..140c650a5 100644
--- a/UnitTests/unicode.cpp
+++ b/UnitTests/unicode.cpp
@@ -3,7 +3,7 @@
 	Copyright © 2023 Amebis
 */
 
-#include "pch.h"
+#include "pch.hpp"
 
 using namespace std;
 #ifdef _WIN32