29 files changed, 51 insertions, 51 deletions
diff --git a/include/cru/common/Base.hpp b/include/cru/common/Base.h
index bab4f733..4d4d1f5f 100644
--- a/include/cru/common/Base.hpp
+++ b/include/cru/common/Base.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "PreConfig.hpp"
+#include "PreConfig.h"
 
 #ifdef CRU_PLATFORM_WINDOWS
 #ifdef CRU_BASE_EXPORT_API
diff --git a/include/cru/common/Bitmask.hpp b/include/cru/common/Bitmask.h
index c1b6443a..bd6a8309 100644
--- a/include/cru/common/Bitmask.hpp
+++ b/include/cru/common/Bitmask.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
 namespace cru {
 template <typename Tag, typename TUnderlying = unsigned>
diff --git a/include/cru/common/ClonablePtr.hpp b/include/cru/common/ClonablePtr.h
index 39b5b454..39b5b454 100644
--- a/include/cru/common/ClonablePtr.hpp
+++ b/include/cru/common/ClonablePtr.h
diff --git a/include/cru/common/Event.hpp b/include/cru/common/Event.h
index 5d60c5b3..564afc40 100644
--- a/include/cru/common/Event.hpp
+++ b/include/cru/common/Event.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "SelfResolvable.hpp"
+#include "SelfResolvable.h"
 
 #include <algorithm>
 #include <functional>
diff --git a/include/cru/common/Exception.hpp b/include/cru/common/Exception.h
index cb35469c..365d2064 100644
--- a/include/cru/common/Exception.hpp
+++ b/include/cru/common/Exception.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "String.hpp"
+#include "String.h"
 
 namespace cru {
 #ifdef _MSC_VER
diff --git a/include/cru/common/Format.hpp b/include/cru/common/Format.h
index 1ad71262..ede2998b 100644
--- a/include/cru/common/Format.hpp
+++ b/include/cru/common/Format.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Exception.hpp"
-#include "String.hpp"
+#include "Exception.h"
+#include "String.h"
 
 #include <charconv>
 
diff --git a/include/cru/common/HandlerRegistry.hpp b/include/cru/common/HandlerRegistry.h
index 8049e74b..e405d1fd 100644
--- a/include/cru/common/HandlerRegistry.hpp
+++ b/include/cru/common/HandlerRegistry.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
 #include <algorithm>
 #include <functional>
diff --git a/include/cru/common/Logger.hpp b/include/cru/common/Logger.h
index c4a3e54a..25875651 100644
--- a/include/cru/common/Logger.hpp
+++ b/include/cru/common/Logger.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "String.hpp"
-#include "Format.hpp"
+#include "String.h"
+#include "Format.h"
 
 #include <list>
 #include <memory>
diff --git a/include/cru/common/PreConfig.hpp b/include/cru/common/PreConfig.h
index ba0f5bd8..ba0f5bd8 100644
--- a/include/cru/common/PreConfig.hpp
+++ b/include/cru/common/PreConfig.h
diff --git a/include/cru/common/PropertyTree.hpp b/include/cru/common/PropertyTree.h
index 613bcc47..54e185b9 100644
--- a/include/cru/common/PropertyTree.hpp
+++ b/include/cru/common/PropertyTree.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Base.hpp"
-#include "String.hpp"
+#include "Base.h"
+#include "String.h"
 
 #include <unordered_map>
 
diff --git a/include/cru/common/Range.hpp b/include/cru/common/Range.h
index ecc61243..e61d90ca 100644
--- a/include/cru/common/Range.hpp
+++ b/include/cru/common/Range.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
 namespace cru {
 struct Range final {
diff --git a/include/cru/common/SelfResolvable.hpp b/include/cru/common/SelfResolvable.h
index eaa4ce34..c8acd4b9 100644
--- a/include/cru/common/SelfResolvable.hpp
+++ b/include/cru/common/SelfResolvable.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "PreConfig.hpp"
+#include "PreConfig.h"
 
 #include <memory>
 #include <type_traits>
diff --git a/include/cru/common/String.hpp b/include/cru/common/String.h
index c1f957c0..0b1b031b 100644
--- a/include/cru/common/String.hpp
+++ b/include/cru/common/String.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "Range.hpp"
-#include "StringUtil.hpp"
+#include "Range.h"
+#include "StringUtil.h"
 
 #include <double-conversion/double-conversion.h>
 #include <filesystem>
diff --git a/include/cru/common/StringUtil.hpp b/include/cru/common/StringUtil.h
index c840960d..19948250 100644
--- a/include/cru/common/StringUtil.hpp
+++ b/include/cru/common/StringUtil.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
 #include <functional>
 
diff --git a/include/cru/common/io/FileStream.hpp b/include/cru/common/io/FileStream.h
index 86c4c037..4f1499be 100644
--- a/include/cru/common/io/FileStream.hpp
+++ b/include/cru/common/io/FileStream.h
@@ -1,12 +1,12 @@
 #pragma once
 
 #ifdef CRU_PLATFORM_UNIX
-#include "../platform/unix/UnixFileStream.hpp"
+#include "../platform/unix/UnixFileStream.h"
 namespace cru::io {
 using FileStream = platform::unix::UnixFileStream;
 }
 #elif CRU_PLATFORM_WINDOWS
-#include "../platform/win/Win32FileStream.hpp"
+#include "../platform/win/Win32FileStream.h"
 namespace cru::io {
 using FileStream = platform::win::Win32FileStream;
 }
diff --git a/include/cru/common/io/MemoryStream.hpp b/include/cru/common/io/MemoryStream.h
index 29da7b9f..a6243d67 100644
--- a/include/cru/common/io/MemoryStream.hpp
+++ b/include/cru/common/io/MemoryStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Stream.hpp"
+#include "Stream.h"
 
 #include <functional>
 
diff --git a/include/cru/common/io/OpenFileFlag.hpp b/include/cru/common/io/OpenFileFlag.h
index 3319bb4f..b0bceddc 100644
--- a/include/cru/common/io/OpenFileFlag.hpp
+++ b/include/cru/common/io/OpenFileFlag.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Bitmask.hpp"
+#include "../Bitmask.h"
 
 namespace cru::io {
 namespace details {
diff --git a/include/cru/common/io/Resource.hpp b/include/cru/common/io/Resource.h
index 4fd00bdd..1d5313a6 100644
--- a/include/cru/common/io/Resource.hpp
+++ b/include/cru/common/io/Resource.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../Base.hpp"
+#include "../Base.h"
 
 #include <filesystem>
 
diff --git a/include/cru/common/io/Stream.hpp b/include/cru/common/io/Stream.h
index 131e82e9..66be4468 100644
--- a/include/cru/common/io/Stream.hpp
+++ b/include/cru/common/io/Stream.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../Base.hpp"
+#include "../Base.h"
 
-#include "../String.hpp"
+#include "../String.h"
 
 #include <cstddef>
 #include <vector>
diff --git a/include/cru/common/platform/Exception.hpp b/include/cru/common/platform/Exception.h
index 0241947b..c1b649f3 100644
--- a/include/cru/common/platform/Exception.hpp
+++ b/include/cru/common/platform/Exception.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "../Base.hpp"
-#include "../Exception.hpp"
+#include "../Base.h"
+#include "../Exception.h"
 
 namespace cru::platform {
 class CRU_BASE_API PlatformException : public Exception {
diff --git a/include/cru/common/platform/osx/Convert.hpp b/include/cru/common/platform/osx/Convert.h
index a2d8beae..503576be 100644
--- a/include/cru/common/platform/osx/Convert.hpp
+++ b/include/cru/common/platform/osx/Convert.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "../../PreConfig.hpp"
+#include "../../PreConfig.h"
 #ifdef CRU_PLATFORM_OSX
 
-#include "../../String.hpp"
+#include "../../String.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 
diff --git a/include/cru/common/platform/osx/Exception.hpp b/include/cru/common/platform/osx/Exception.h
index 49527c69..53e874e9 100644
--- a/include/cru/common/platform/osx/Exception.hpp
+++ b/include/cru/common/platform/osx/Exception.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "../../PreConfig.hpp"
+#include "../../PreConfig.h"
 #ifdef CRU_PLATFORM_OSX
 
-#include "../Exception.hpp"
+#include "../Exception.h"
 
 namespace cru::platform::osx {
 class OsxException : public PlatformException {
diff --git a/include/cru/common/platform/unix/ErrnoException.hpp b/include/cru/common/platform/unix/ErrnoException.h
index 2982e26a..00e1864b 100644
--- a/include/cru/common/platform/unix/ErrnoException.hpp
+++ b/include/cru/common/platform/unix/ErrnoException.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "../../PreConfig.hpp"
+#include "../../PreConfig.h"
 
 #ifdef CRU_PLATFORM_UNIX
 
-#include "../Exception.hpp"
+#include "../Exception.h"
 
 namespace cru::platform::unix {
 class ErrnoException : public PlatformException {
diff --git a/include/cru/common/platform/unix/UnixFileStream.hpp b/include/cru/common/platform/unix/UnixFileStream.h
index 76355f2f..0c8ef340 100644
--- a/include/cru/common/platform/unix/UnixFileStream.hpp
+++ b/include/cru/common/platform/unix/UnixFileStream.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "../../PreConfig.hpp"
+#include "../../PreConfig.h"
 
 #ifdef CRU_PLATFORM_UNIX
 
-#include "../../String.hpp"
-#include "../../io/OpenFileFlag.hpp"
-#include "../../io/Stream.hpp"
+#include "../../String.h"
+#include "../../io/OpenFileFlag.h"
+#include "../../io/Stream.h"
 
 namespace cru::platform::unix {
 class UnixFileStream : public io::Stream {
diff --git a/include/cru/common/platform/win/ComAutoInit.hpp b/include/cru/common/platform/win/ComAutoInit.h
index 131f3f30..cc968e4b 100644
--- a/include/cru/common/platform/win/ComAutoInit.hpp
+++ b/include/cru/common/platform/win/ComAutoInit.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "../../PreConfig.hpp"
+#include "../../PreConfig.h"
 #ifdef CRU_PLATFORM_WINDOWS
 
-#include "WinPreConfig.hpp"
-#include "cru/common/Base.hpp"
+#include "WinPreConfig.h"
+#include "cru/common/Base.h"
 
 namespace cru::platform::win {
 class CRU_BASE_API ComAutoInit {
diff --git a/include/cru/common/platform/win/Exception.hpp b/include/cru/common/platform/win/Exception.h
index 4e332b4f..3e63b191 100644
--- a/include/cru/common/platform/win/Exception.hpp
+++ b/include/cru/common/platform/win/Exception.h
@@ -1,10 +1,10 @@
 #pragma once
-#include "../../PreConfig.hpp"
+#include "../../PreConfig.h"
 #ifdef CRU_PLATFORM_WINDOWS
 
-#include "WinPreConfig.hpp"
+#include "WinPreConfig.h"
 
-#include "../Exception.hpp"
+#include "../Exception.h"
 
 #include <stdexcept>
 #include <string_view>
diff --git a/include/cru/common/platform/win/StreamConvert.hpp b/include/cru/common/platform/win/StreamConvert.h
index 80800115..3499604a 100644
--- a/include/cru/common/platform/win/StreamConvert.hpp
+++ b/include/cru/common/platform/win/StreamConvert.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "../../PreConfig.hpp"
+#include "../../PreConfig.h"
 
 #ifdef CRU_PLATFORM_WINDOWS
 
-#include "../../io/Stream.hpp"
+#include "../../io/Stream.h"
 
 #include <objidlbase.h>
 
diff --git a/include/cru/common/platform/win/Win32FileStream.hpp b/include/cru/common/platform/win/Win32FileStream.h
index b5511ba3..521fd58d 100644
--- a/include/cru/common/platform/win/Win32FileStream.hpp
+++ b/include/cru/common/platform/win/Win32FileStream.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "../../PreConfig.hpp"
+#include "../../PreConfig.h"
 
 #ifdef CRU_PLATFORM_WINDOWS
 
-#include "../../String.hpp"
-#include "../../io/OpenFileFlag.hpp"
-#include "../../io/Stream.hpp"
+#include "../../String.h"
+#include "../../io/OpenFileFlag.h"
+#include "../../io/Stream.h"
 
 namespace cru::platform::win {
 namespace details {
diff --git a/include/cru/common/platform/win/WinPreConfig.hpp b/include/cru/common/platform/win/WinPreConfig.h
index ac397820..c2284df3 100644
--- a/include/cru/common/platform/win/WinPreConfig.hpp
+++ b/include/cru/common/platform/win/WinPreConfig.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../../PreConfig.hpp"
+#include "../../PreConfig.h"
 #ifdef CRU_PLATFORM_WINDOWS
 
 #define NOMINMAX