diff --git a/UnitTests/UnitTests.vcxproj b/UnitTests/UnitTests.vcxproj
index 0b8b298a2..69ca2a22e 100644
--- a/UnitTests/UnitTests.vcxproj
+++ b/UnitTests/UnitTests.vcxproj
@@ -110,6 +110,7 @@
   <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
     <ClCompile>
       <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
diff --git a/UnitTests/compat.hpp b/UnitTests/compat.hpp
index 51e83ff9c..c9c642a0a 100644
--- a/UnitTests/compat.hpp
+++ b/UnitTests/compat.hpp
@@ -1,4 +1,4 @@
-/*
+/*
 	SPDX-License-Identifier: MIT
 	Copyright © 2023 Amebis
 */
diff --git a/UnitTests/main.cpp b/UnitTests/main.cpp
index 55501b865..65b481d29 100644
--- a/UnitTests/main.cpp
+++ b/UnitTests/main.cpp
@@ -1,4 +1,4 @@
-/*
+/*
 	SPDX-License-Identifier: MIT
 	Copyright © 2023 Amebis
 */
diff --git a/UnitTests/math.cpp b/UnitTests/math.cpp
index d8b8f4cca..b0e92c766 100644
--- a/UnitTests/math.cpp
+++ b/UnitTests/math.cpp
@@ -1,4 +1,4 @@
-/*
+/*
 	SPDX-License-Identifier: MIT
 	Copyright © 2023 Amebis
 */
diff --git a/UnitTests/parser.cpp b/UnitTests/parser.cpp
index 072ed3481..1a1105040 100644
--- a/UnitTests/parser.cpp
+++ b/UnitTests/parser.cpp
@@ -1,4 +1,4 @@
-/*
+/*
 	SPDX-License-Identifier: MIT
 	Copyright © 2023 Amebis
 */
diff --git a/UnitTests/ring.cpp b/UnitTests/ring.cpp
index d7d4e323b..b663910b7 100644
--- a/UnitTests/ring.cpp
+++ b/UnitTests/ring.cpp
@@ -1,4 +1,4 @@
-/*
+/*
 	SPDX-License-Identifier: MIT
 	Copyright © 2023 Amebis
 */
diff --git a/UnitTests/sgml.cpp b/UnitTests/sgml.cpp
index 7e47e6d11..26ce71951 100644
--- a/UnitTests/sgml.cpp
+++ b/UnitTests/sgml.cpp
@@ -1,4 +1,4 @@
-/*
+/*
 	SPDX-License-Identifier: MIT
 	Copyright © 2023 Amebis
 */
diff --git a/UnitTests/stream.cpp b/UnitTests/stream.cpp
index 2fcd6599f..dca2882a1 100644
--- a/UnitTests/stream.cpp
+++ b/UnitTests/stream.cpp
@@ -1,4 +1,4 @@
-/*
+/*
 	SPDX-License-Identifier: MIT
 	Copyright © 2023 Amebis
 */
diff --git a/UnitTests/unicode.cpp b/UnitTests/unicode.cpp
index f255cf9ce..5976cd601 100644
--- a/UnitTests/unicode.cpp
+++ b/UnitTests/unicode.cpp
@@ -1,4 +1,4 @@
-/*
+/*
 	SPDX-License-Identifier: MIT
 	Copyright © 2023 Amebis
 */
diff --git a/include/stdex/chrono.hpp b/include/stdex/chrono.hpp
index 617bcc1a3..095241e9a 100644
--- a/include/stdex/chrono.hpp
+++ b/include/stdex/chrono.hpp
@@ -1,4 +1,4 @@
-/*
+/*
 	SPDX-License-Identifier: MIT
 	Copyright © 2023 Amebis
 */
diff --git a/include/stdex/compat.hpp b/include/stdex/compat.hpp
index cf4cb659c..c73266921 100644
--- a/include/stdex/compat.hpp
+++ b/include/stdex/compat.hpp
@@ -1,4 +1,4 @@
-/*
+/*
 	SPDX-License-Identifier: MIT
 	Copyright © 2022-2023 Amebis
 */
diff --git a/include/stdex/endian.hpp b/include/stdex/endian.hpp
index 61751f7c5..6d39bccf8 100644
--- a/include/stdex/endian.hpp
+++ b/include/stdex/endian.hpp
@@ -1,4 +1,4 @@
-/*
+/*
 	SPDX-License-Identifier: MIT
 	Copyright © 2023 Amebis
 */
diff --git a/include/stdex/exception.hpp b/include/stdex/exception.hpp
index aa90cf2eb..aab40c38b 100644
--- a/include/stdex/exception.hpp
+++ b/include/stdex/exception.hpp
@@ -1,4 +1,4 @@
-/*
+/*
 	SPDX-License-Identifier: MIT
 	Copyright © 2023 Amebis
 */
diff --git a/include/stdex/interval.hpp b/include/stdex/interval.hpp
index 561f00e57..890a59ba2 100644
--- a/include/stdex/interval.hpp
+++ b/include/stdex/interval.hpp
@@ -1,4 +1,4 @@
-/*
+/*
 	SPDX-License-Identifier: MIT
 	Copyright © 2023 Amebis
 */
diff --git a/include/stdex/memory.hpp b/include/stdex/memory.hpp
index 8e228bd24..0a0b1811c 100644
--- a/include/stdex/memory.hpp
+++ b/include/stdex/memory.hpp
@@ -1,4 +1,4 @@
-/*
+/*
 	SPDX-License-Identifier: MIT
 	Copyright © 2023 Amebis
 */
diff --git a/include/stdex/parser.hpp b/include/stdex/parser.hpp
index a67700ff7..380efbd3f 100644
--- a/include/stdex/parser.hpp
+++ b/include/stdex/parser.hpp
@@ -1,4 +1,4 @@
-/*
+/*
 	SPDX-License-Identifier: MIT
 	Copyright © 2023 Amebis
 */
diff --git a/include/stdex/progress.hpp b/include/stdex/progress.hpp
index 0b3b374ee..436cff7c9 100644
--- a/include/stdex/progress.hpp
+++ b/include/stdex/progress.hpp
@@ -1,4 +1,4 @@
-/*
+/*
 	SPDX-License-Identifier: MIT
 	Copyright © 2023 Amebis
 */
diff --git a/include/stdex/sgml.hpp b/include/stdex/sgml.hpp
index d3b78b839..f7e131e84 100644
--- a/include/stdex/sgml.hpp
+++ b/include/stdex/sgml.hpp
@@ -1,4 +1,4 @@
-/*
+/*
 	SPDX-License-Identifier: MIT
 	Copyright © 2023 Amebis
 */
diff --git a/include/stdex/stream.hpp b/include/stdex/stream.hpp
index ccffd4f53..71d0a17ae 100644
--- a/include/stdex/stream.hpp
+++ b/include/stdex/stream.hpp
@@ -1,4 +1,4 @@
-/*
+/*
 	SPDX-License-Identifier: MIT
 	Copyright © 2023 Amebis
 */
diff --git a/include/stdex/string.hpp b/include/stdex/string.hpp
index 43e55c60e..513e3ac4a 100644
--- a/include/stdex/string.hpp
+++ b/include/stdex/string.hpp
@@ -1,4 +1,4 @@
-/*
+/*
 	SPDX-License-Identifier: MIT
 	Copyright © 2016-2023 Amebis
 */
diff --git a/include/stdex/system.hpp b/include/stdex/system.hpp
index 6199ca291..dac29d3aa 100644
--- a/include/stdex/system.hpp
+++ b/include/stdex/system.hpp
@@ -1,4 +1,4 @@
-/*
+/*
 	SPDX-License-Identifier: MIT
 	Copyright © 2023 Amebis
 */
diff --git a/include/stdex/unicode.hpp b/include/stdex/unicode.hpp
index 401a74568..a20584cd8 100644
--- a/include/stdex/unicode.hpp
+++ b/include/stdex/unicode.hpp
@@ -1,4 +1,4 @@
-/*
+/*
 	SPDX-License-Identifier: MIT
 	Copyright © 2023 Amebis
 */