11 files changed, 16 insertions, 16 deletions
diff --git a/dev/crt/alloca.hxx b/dev/crt/alloca.h
index ca4d2a99..857a0ade 100644
--- a/dev/crt/alloca.hxx
+++ b/dev/crt/alloca.h
@@ -2,14 +2,14 @@
 
 	Copyright ZKA Web Services Co.
 
-	File: alloca.hxx
+	File: alloca.h
 	Purpose: Stack allocation functions.
 
 ------------------------------------------- */
 
 #pragma once
 
-#include <crt/defines.hxx>
+#include <crt/defines.h>
 
 inline ptr_type __ndk_alloca(size_type sz)
 {
diff --git a/dev/crt/base_alloc.hxx b/dev/crt/base_alloc.h
index 94f2b25c..97826d80 100644
--- a/dev/crt/base_alloc.hxx
+++ b/dev/crt/base_alloc.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <crt/defines.hxx>
+#include <crt/defines.h>
 
 namespace std::base_alloc
 {
diff --git a/dev/crt/base_exception.hxx b/dev/crt/base_exception.h
index 4d815374..3b95f400 100644
--- a/dev/crt/base_exception.hxx
+++ b/dev/crt/base_exception.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <crt/defines.hxx>
-#include <crt/exit.hxx>
+#include <crt/defines.h>
+#include <crt/exit.h>
 
 namespace std
 {
diff --git a/dev/crt/crtx64.json b/dev/crt/crtx64.json
index 3e321e5d..b8e99385 100644
--- a/dev/crt/crtx64.json
+++ b/dev/crt/crtx64.json
@@ -2,7 +2,7 @@
   "compiler_path": "x86_64-w64-mingw32-g++",
   "compiler_std": "c++20",
   "headers_path": ["../", "./"],
-  "sources_path": ["src/*.cxx", "src/hal/x86/*.cxx"],
+  "sources_path": ["src/*.cc", "src/hal/x86/*.cc"],
   "output_name": "crtx64.dll",
   "compiler_flags": [
     "-ffreestanding",
diff --git a/dev/crt/defines.hxx b/dev/crt/defines.h
index f23bdaa3..38fe2b6c 100644
--- a/dev/crt/defines.hxx
+++ b/dev/crt/defines.h
@@ -24,7 +24,7 @@ typedef char* caddr_t;
 #endif // !null
 
 #ifdef __GNUC__
-#include <crt/alloca.hxx>
+#include <crt/alloca.h>
 #elif defined(__NDK__)
 #define __alloca(sz) __ndk_alloca(sz)
 #endif
@@ -74,8 +74,8 @@ typedef union double_cast {
 
 #ifdef __STD_CXX__
 
-#include <crt/base_exception.hxx>
-#include <crt/base_alloc.hxx>
+#include <crt/base_exception.h>
+#include <crt/base_alloc.h>
 
 #endif // ifdef __STD_CXX__
 
diff --git a/dev/crt/exit.hxx b/dev/crt/exit.h
index 69b046c4..69b046c4 100644
--- a/dev/crt/exit.hxx
+++ b/dev/crt/exit.h
diff --git a/dev/crt/math.hxx b/dev/crt/math.h
index 57ae16d8..fd948d63 100644
--- a/dev/crt/math.hxx
+++ b/dev/crt/math.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <crt/defines.hxx>
+#include <crt/defines.h>
 
-/// @file Math.hxx
+/// @file Math.h
 /// @brief Math functions.
 
 #ifdef __ZKA_USE_DOUBLE__
diff --git a/dev/crt/src/alloca.cxx b/dev/crt/src/alloca.cc
index 042eb769..ccee07a7 100644
--- a/dev/crt/src/alloca.cxx
+++ b/dev/crt/src/alloca.cc
@@ -4,6 +4,6 @@
 
 ------------------------------------------- */
 
-#include <crt/alloca.hxx>
+#include <crt/alloca.h>
 
 /// @note Just here for building.
diff --git a/dev/crt/src/base_exception.cxx b/dev/crt/src/base_exception.cc
index f82d610a..75699f64 100644
--- a/dev/crt/src/base_exception.cxx
+++ b/dev/crt/src/base_exception.cc
@@ -4,6 +4,6 @@
 
 ------------------------------------------- */
 
-#include <crt/base_exception.hxx>
+#include <crt/base_exception.h>
 
 /// @note Just here for building.
diff --git a/dev/crt/src/hal/x86/base_alloc.cxx b/dev/crt/src/hal/x86/base_alloc.cc
index 55a53c9d..10690d4b 100644
--- a/dev/crt/src/hal/x86/base_alloc.cxx
+++ b/dev/crt/src/hal/x86/base_alloc.cc
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <crt/base_alloc.hxx>
-#include <crt/base_exception.hxx>
+#include <crt/base_alloc.h>
+#include <crt/base_exception.h>
 
 #define kAllocSyscallId "mov $10, %%r9\n\t"
 #define kFreeSyscallId	"mov $11, %%r9\n\t"
diff --git a/dev/crt/src/hal/x86/exit.cxx b/dev/crt/src/hal/x86/exit.cc
index c44c07a4..8ee6744b 100644
--- a/dev/crt/src/hal/x86/exit.cxx
+++ b/dev/crt/src/hal/x86/exit.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <crt/exit.hxx>
+#include <crt/exit.h>
 
 #define kAllocSyscallId "mov $12, %%r9\n\t"