288 files changed, 787 insertions, 786 deletions
diff --git a/dev/base/EncryptFS/build.json b/dev/base/EncryptFS/build.json
index 1f9b018e..4dcefa38 100644
--- a/dev/base/EncryptFS/build.json
+++ b/dev/base/EncryptFS/build.json
@@ -2,7 +2,7 @@
   "compiler_path": "x86_64-w64-mingw32-g++",
   "compiler_std": "c++20",
   "headers_path": ["../", "./"],
-  "sources_path": ["src/*.cxx"],
+  "sources_path": ["src/*.cc"],
   "output_name": "efs.zsc",
   "compiler_flags": [
     "-ffreestanding",
diff --git a/dev/base/EncryptFS/disk_crypt.hxx b/dev/base/EncryptFS/disk_crypt.h
index 3ec4799d..981ebc78 100644
--- a/dev/base/EncryptFS/disk_crypt.hxx
+++ b/dev/base/EncryptFS/disk_crypt.h
@@ -2,7 +2,7 @@
 
 	Copyright ZKA Web Services Co.
 
-	File: disk_encrypt.hxx
+	File: disk_encrypt.h
 	Purpose: Disk Encryption File System
 
 	Revision History:
@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include <FSKit/NeFS.hxx>
+#include <FSKit/NeFS.h>
 
 namespace Kernel
 {
diff --git a/dev/base/EncryptFS/src/disk_crypt.cxx b/dev/base/EncryptFS/src/disk_crypt.cc
index 031a2528..334e2d4d 100644
--- a/dev/base/EncryptFS/src/disk_crypt.cxx
+++ b/dev/base/EncryptFS/src/disk_crypt.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <EncryptFS/disk_crypt.hxx>
+#include <EncryptFS/disk_crypt.h>
 
 enum
 {
diff --git a/dev/base/FireWall/fwapi.hxx b/dev/base/FireWall/fwapi.h
index dfa9d30c..cd916657 100644
--- a/dev/base/FireWall/fwapi.hxx
+++ b/dev/base/FireWall/fwapi.h
@@ -4,4 +4,4 @@
 
 #pragma once
 
-#include <sci/sci_base.hxx>
+#include <sci/sci_base.h>
diff --git a/dev/base/FireWall/src/fwentry.cc b/dev/base/FireWall/src/fwentry.cc
index 37e5f304..3fb739f7 100644
--- a/dev/base/FireWall/src/fwentry.cc
+++ b/dev/base/FireWall/src/fwentry.cc
@@ -2,4 +2,4 @@
  * Copyright (c) 2024 ZKA Web Services Co
  */
 
-#include <FireWall/fwapi.hxx>
+#include <FireWall/fwapi.h>
diff --git a/dev/base/RunDLL64/build.json b/dev/base/RunDLL64/build.json
index c53373a9..b129f8e4 100644
--- a/dev/base/RunDLL64/build.json
+++ b/dev/base/RunDLL64/build.json
@@ -2,7 +2,7 @@
   "compiler_path": "x86_64-w64-mingw32-g++",
   "compiler_std": "c++20",
   "headers_path": ["../", "./", "../../"],
-  "sources_path": ["src/*.cxx"],
+  "sources_path": ["src/*.cc"],
   "output_name": "rundll64.exe",
   "compiler_flags": [
     "-ffreestanding",
diff --git a/dev/base/RunDLL64/src/dll.cxx b/dev/base/RunDLL64/src/dll.cc
index 49e69fc4..ee3cdfa6 100644
--- a/dev/base/RunDLL64/src/dll.cxx
+++ b/dev/base/RunDLL64/src/dll.cc
@@ -2,7 +2,7 @@
  * Copyright (c) 2024 ZKA Web Services Co
  */
 
-#include <sci/sci_base.hxx>
+#include <sci/sci_base.h>
 
 typedef int (*MainKind)(int, char**);
 
diff --git a/dev/base/RunXPCOM/build.json b/dev/base/RunXPCOM/build.json
index 45d249b8..ec91d543 100644
--- a/dev/base/RunXPCOM/build.json
+++ b/dev/base/RunXPCOM/build.json
@@ -2,7 +2,7 @@
   "compiler_path": "x86_64-w64-mingw32-g++",
   "compiler_std": "c++20",
   "headers_path": ["../", "./", "../../"],
-  "sources_path": ["src/*.cxx"],
+  "sources_path": ["src/*.cc"],
   "output_name": "runxpcom.exe",
   "compiler_flags": [
     "-ffreestanding",
diff --git a/dev/base/RunXPCOM/src/xpcom.cxx b/dev/base/RunXPCOM/src/xpcom.cc
index 1b94ba07..3fcfc708 100644
--- a/dev/base/RunXPCOM/src/xpcom.cxx
+++ b/dev/base/RunXPCOM/src/xpcom.cc
@@ -2,7 +2,7 @@
  * Copyright (c) 2024 ZKA Web Services Co
  */
 
-#include <sci/sci_base.hxx>
+#include <sci/sci_base.h>
 
 typedef SInt32 (*RPCProcKind)(IUnknown*);
 
diff --git a/dev/base/View/pdf.hxx b/dev/base/View/pdf.h
index aac8c5a7..b28806d7 100644
--- a/dev/base/View/pdf.hxx
+++ b/dev/base/View/pdf.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <sci/sci_base.hxx>
+#include <sci/sci_base.h>
 
 namespace View::PDF
 {
diff --git a/dev/base/View/src/app.cxx b/dev/base/View/src/app.cc
index e69de29b..e69de29b 100644
--- a/dev/base/View/src/app.cxx
+++ b/dev/base/View/src/app.cc
diff --git a/dev/base/View/src/pdf.cxx b/dev/base/View/src/pdf.cc
index c226e306..2f5e628e 100644
--- a/dev/base/View/src/pdf.cxx
+++ b/dev/base/View/src/pdf.cc
@@ -4,4 +4,4 @@
 
 ------------------------------------------- */
 
-#include <View/pdf.hxx>
+#include <View/pdf.h>
diff --git a/dev/base/View/src/viewer_box.cxx b/dev/base/View/src/viewer_box.cc
index e69de29b..e69de29b 100644
--- a/dev/base/View/src/viewer_box.cxx
+++ b/dev/base/View/src/viewer_box.cc
diff --git a/dev/base/View/view.json b/dev/base/View/view.json
index 9033eaec..ba9f979f 100644
--- a/dev/base/View/view.json
+++ b/dev/base/View/view.json
@@ -2,7 +2,7 @@
   "compiler_path": "x86_64-w64-mingw32-g++",
   "compiler_std": "c++20",
   "headers_path": ["../../", "....//zka"],
-  "sources_path": ["src/*.cxx"],
+  "sources_path": ["src/*.cc"],
   "output_name": "View.exe",
   "compiler_flags": [
     "-fPIC",
diff --git a/dev/base/View/viewer_box.hxx b/dev/base/View/viewer_box.h
index e69de29b..e69de29b 100644
--- a/dev/base/View/viewer_box.hxx
+++ b/dev/base/View/viewer_box.h
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"
 
diff --git a/dev/ddk/ddk.json b/dev/ddk/ddk.json
index 32c32bd1..3a19eef8 100644
--- a/dev/ddk/ddk.json
+++ b/dev/ddk/ddk.json
@@ -2,7 +2,7 @@
   "compiler_path": "x86_64-w64-mingw32-gcc",
   "compiler_std": "c++20",
   "headers_path": ["../", "./"],
-  "sources_path": ["src/*.c", "src/*.cxx", "src/*.S"],
+  "sources_path": ["src/*.c", "src/*.cc", "src/*.S"],
   "output_name": "ddk.dll",
   "compiler_flags": [
     "-ffreestanding",
diff --git a/dev/ddk/src/ddk_rt_cxx.cxx b/dev/ddk/src/ddk_rt_cxx.cc
index 8ca2464c..8ca2464c 100644
--- a/dev/ddk/src/ddk_rt_cxx.cxx
+++ b/dev/ddk/src/ddk_rt_cxx.cc
diff --git a/dev/ddk/x86_64.make b/dev/ddk/x86_64.make
index 7eeb452f..b976427a 100644
--- a/dev/ddk/x86_64.make
+++ b/dev/ddk/x86_64.make
@@ -11,4 +11,4 @@ OUTPUT=ddk.dll
 
 .PHONY: x86_64-build
 x86_64-build:
-	$(CC) $(INC) $(FLAGS) $(VERSION) $(wildcard *.c) $(wildcard *.S) $(wildcard *.cxx) -o $(OUTPUT)
+	$(CC) $(INC) $(FLAGS) $(VERSION) $(wildcard *.c) $(wildcard *.S) $(wildcard .cc) -o $(OUTPUT)
diff --git a/dev/hpfs/hpfs.json b/dev/hpfs/hpfs.json
index 5f01ab74..a6f20f66 100644
--- a/dev/hpfs/hpfs.json
+++ b/dev/hpfs/hpfs.json
@@ -2,7 +2,7 @@
   "compiler_path": "x86_64-w64-mingw32-g++",
   "compiler_std": "c++20",
   "headers_path": ["../"],
-  "sources_path": ["src/*.cxx"],
+  "sources_path": ["src/*.cc"],
   "output_name": "hpfs.sys",
   "compiler_flags": [
     "-fPIC",
diff --git a/dev/hpfs/hpfs_specs.hxx b/dev/hpfs/hpfs_specs.h
index 5b22ce31..aad694fa 100644
--- a/dev/hpfs/hpfs_specs.hxx
+++ b/dev/hpfs/hpfs_specs.h
@@ -2,7 +2,7 @@
 
 	Copyright ZKA Web Services Co.
 
-	FILE: Defines.hxx
+	FILE: Defines.h
 	PURPOSE: HPFS IFS defines.
 
 ------------------------------------------- */
diff --git a/dev/hpfs/src/hpfs_main.cxx b/dev/hpfs/src/hpfs_main.cc
index ce712f2c..e65b03dc 100644
--- a/dev/hpfs/src/hpfs_main.cxx
+++ b/dev/hpfs/src/hpfs_main.cc
@@ -7,7 +7,7 @@
 
 ------------------------------------------- */
 
-#include <hpfs/hpfs_specs.hxx>
+#include <hpfs/hpfs_specs.h>
 
 static DDK_OBJECT_MANIFEST* kIfsObject = nullptr;
 
diff --git a/dev/modules/ACPI/ACPI.hxx b/dev/modules/ACPI/ACPI.h
index 6ddb00a8..3049d3c1 100644
--- a/dev/modules/ACPI/ACPI.hxx
+++ b/dev/modules/ACPI/ACPI.h
@@ -11,7 +11,7 @@
 	https://uefi.org/specs/ACPI/6.5/05_ACPI_Software_Programming_Model.html
 */
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 namespace Kernel
 {
diff --git a/dev/modules/ACPI/ACPIFactoryInterface.hxx b/dev/modules/ACPI/ACPIFactoryInterface.h
index ba715e76..f3f041fc 100644
--- a/dev/modules/ACPI/ACPIFactoryInterface.hxx
+++ b/dev/modules/ACPI/ACPIFactoryInterface.h
@@ -7,11 +7,11 @@
 #ifndef __MOD_ACPI_HXX__
 #define __MOD_ACPI_HXX__
 
-#include <KernelKit/DebugOutput.hxx>
-#include <modules/ACPI/ACPI.hxx>
-#include <NewKit/ErrorOr.hxx>
-#include <NewKit/Defines.hxx>
-#include <NewKit/Ref.hxx>
+#include <KernelKit/DebugOutput.h>
+#include <modules/ACPI/ACPI.h>
+#include <NewKit/ErrorOr.h>
+#include <NewKit/Defines.h>
+#include <NewKit/Ref.h>
 
 namespace Kernel
 {
diff --git a/dev/modules/AHCI/AHCI.hxx b/dev/modules/AHCI/AHCI.h
index a48a8c38..17351231 100644
--- a/dev/modules/AHCI/AHCI.hxx
+++ b/dev/modules/AHCI/AHCI.h
@@ -2,7 +2,7 @@
 
 	Copyright ZKA Web Services Co.
 
-	File: Defines.hxx
+	File: Defines.h
 	Purpose: AHCI header.
 
 	Revision History:
@@ -13,8 +13,8 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
-#include <modules/ACPI/ACPI.hxx>
+#include <NewKit/Defines.h>
+#include <modules/ACPI/ACPI.h>
 
 /// @note Forward declarations of structs.
 
diff --git a/dev/modules/APM/APM.hxx b/dev/modules/APM/APM.h
index d98198a8..3c941e7f 100644
--- a/dev/modules/APM/APM.hxx
+++ b/dev/modules/APM/APM.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 namespace Kernel
 {
diff --git a/dev/modules/ATA/ATA.hxx b/dev/modules/ATA/ATA.h
index e175aec6..0ee0c158 100644
--- a/dev/modules/ATA/ATA.hxx
+++ b/dev/modules/ATA/ATA.h
@@ -2,7 +2,7 @@
 
 	Copyright ZKA Web Services Co.
 
-	File: Defines.hxx
+	File: Defines.h
 	Purpose: ATA header.
 
 	Revision History:
@@ -15,8 +15,8 @@
 
 #ifndef __AHCI__
 
-#include <CompilerKit/CompilerKit.hxx>
-#include <NewKit/Defines.hxx>
+#include <CompilerKit/CompilerKit.h>
+#include <NewKit/Defines.h>
 
 ///! Status register
 #define ATA_SR_BSY	0x80
diff --git a/dev/modules/FB/FB.hxx b/dev/modules/FB/FB.h
index 0f3dbfd6..bfe85a8b 100644
--- a/dev/modules/FB/FB.hxx
+++ b/dev/modules/FB/FB.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 #define CGInit() Kernel::SizeT kCGCursor = 0
 
diff --git a/dev/modules/FB/Text.hxx b/dev/modules/FB/Text.h
index dda6487d..bea3d13c 100644
--- a/dev/modules/FB/Text.hxx
+++ b/dev/modules/FB/Text.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
-#include <modules/FB/FB.hxx>
+#include <NewKit/Defines.h>
+#include <modules/FB/FB.h>
 
 #define FONT_SIZE_X	   8
 #define FONT_SIZE_Y	   8
diff --git a/dev/modules/Flash/Flash.hxx b/dev/modules/Flash/Flash.h
index 2d3de0b0..2e741996 100644
--- a/dev/modules/Flash/Flash.hxx
+++ b/dev/modules/Flash/Flash.h
@@ -8,7 +8,7 @@
 
 #ifdef __USE_MBCI_FLASH__
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 /// @brief get sector count.
 /// @return drive sector count.
diff --git a/dev/modules/GLCG/GLCG.hxx b/dev/modules/GLCG/GLCG.h
index fe879711..8f189e44 100644
--- a/dev/modules/GLCG/GLCG.hxx
+++ b/dev/modules/GLCG/GLCG.h
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
diff --git a/dev/modules/HPET/Defines.hxx b/dev/modules/HPET/Defines.h
index 558385bd..f52c77b8 100644
--- a/dev/modules/HPET/Defines.hxx
+++ b/dev/modules/HPET/Defines.h
@@ -2,7 +2,7 @@
 
 	Copyright ZKA Web Services Co.
 
-	File: HPET.hxx
+	File: HPET.h
 	Purpose: HPET builtin.
 
 	Revision History:
@@ -11,8 +11,8 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
-#include <modules/ACPI/ACPI.hxx>
+#include <NewKit/Defines.h>
+#include <modules/ACPI/ACPI.h>
 
 namespace Kernel
 {
diff --git a/dev/modules/LTE/LTE.hxx b/dev/modules/LTE/LTE.h
index b04a48c1..c478892e 100644
--- a/dev/modules/LTE/LTE.hxx
+++ b/dev/modules/LTE/LTE.h
@@ -2,7 +2,7 @@
 
 Copyright ZKA Web Services Co..
 
-File: LTE\LTE.hxx.
+File: LTE\LTE.h.
 Purpose: LTE Standard Library.
 
 ------------------------------------------- */
@@ -10,8 +10,8 @@ Purpose: LTE Standard Library.
 #ifndef _INC_NETWORK_LTE_HXX_
 #define _INC_NETWORK_LTE_HXX_
 
-#include <NewKit/Defines.hxx>
-#include <NewKit/String.hxx>
+#include <NewKit/Defines.h>
+#include <NewKit/String.h>
 
 /// @brief Long Term Evolution I/O routines.
 
diff --git a/dev/modules/MBCI/Interface.hxx b/dev/modules/MBCI/Interface.h
index 9ab8844f..ec51fa3a 100644
--- a/dev/modules/MBCI/Interface.hxx
+++ b/dev/modules/MBCI/Interface.h
@@ -6,5 +6,5 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
-#include <modules/MBCI/MBCI.hxx>
+#include <NewKit/Defines.h>
+#include <modules/MBCI/MBCI.h>
diff --git a/dev/modules/MBCI/MBCI.hxx b/dev/modules/MBCI/MBCI.h
index 9d14d02f..24c6b180 100644
--- a/dev/modules/MBCI/MBCI.hxx
+++ b/dev/modules/MBCI/MBCI.h
@@ -7,8 +7,8 @@
 #ifndef _INC_MODULE_MBCI_HXX_
 #define _INC_MODULE_MBCI_HXX_
 
-#include <NewKit/Defines.hxx>
-#include <modules/ACPI/ACPI.hxx>
+#include <NewKit/Defines.h>
+#include <modules/ACPI/ACPI.h>
 
 /**
 - VCC (IN) (OUT for MCU)
diff --git a/dev/modules/NVME/NVME.hxx b/dev/modules/NVME/NVME.h
index 2d5e1c13..dd9bbb74 100644
--- a/dev/modules/NVME/NVME.hxx
+++ b/dev/modules/NVME/NVME.h
@@ -5,14 +5,14 @@
 	Revision History:
 
 	??/??/24: Added file (amlel)
-	23 Jul 24: Update filename to Defines.hxx and using ALIGN_NVME for NVME structs. (amlel)
+	23 Jul 24: Update filename to Defines.h and using ALIGN_NVME for NVME structs. (amlel)
 
 ------------------------------------------- */
 
 #ifndef __MODULE_NVME_HXX__
 #define __MODULE_NVME_HXX__
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 /// TODO: checklist in: https://wiki.osdev.org/NVMe
 
diff --git a/dev/modules/SCSI/SCSI.hxx b/dev/modules/SCSI/SCSI.h
index 5e903923..5aca328b 100644
--- a/dev/modules/SCSI/SCSI.hxx
+++ b/dev/modules/SCSI/SCSI.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
-/// @file SCSI.hxx
+/// @file SCSI.h
 /// @brief Serial SCSI driver.
 
 template <int PacketBitLen>
diff --git a/dev/modules/XHCI/Defines.hxx b/dev/modules/XHCI/Defines.h
index 73c4e3a2..3bb68204 100644
--- a/dev/modules/XHCI/Defines.hxx
+++ b/dev/modules/XHCI/Defines.h
@@ -2,19 +2,19 @@
 
 	Copyright ZKA Web Services Co.
 
-	File: Defines.hxx
+	File: Defines.h
 	Purpose: XHCI (and backwards) header.
 
 	Revision History:
 
 	01/02/24: Added file (amlel)
-	03/02/24: Update filename to Defines.hxx (amlel)
+	03/02/24: Update filename to Defines.h (amlel)
 
 ------------------------------------------- */
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 using namespace Kernel;
 
diff --git a/dev/sci/makefile b/dev/sci/makefile
index 05593216..f18fbeff 100644
--- a/dev/sci/makefile
+++ b/dev/sci/makefile
@@ -9,4 +9,4 @@ OUTPUT=sci.dll
 
 .PHONY: build-sci
 build-sci:
-	$(CC) $(wildcard *.cxx) $(FLAGS) -o $(OUTPUT)
+	$(CC) $(wildcard .cc) $(FLAGS) -o $(OUTPUT)
diff --git a/dev/sci/sci.json b/dev/sci/sci.json
index 32a9238b..104be044 100644
--- a/dev/sci/sci.json
+++ b/dev/sci/sci.json
@@ -2,7 +2,7 @@
   "compiler_path": "x86_64-w64-mingw32-g++",
   "compiler_std": "c++20",
   "headers_path": ["../"],
-  "sources_path": ["src/*.cxx"],
+  "sources_path": ["src/*.cc"],
   "output_name": "sci.dll",
   "compiler_flags": [
     "-fPIC",
diff --git a/dev/sci/sci_base.hxx b/dev/sci/sci_base.h
index de87318b..f9babe13 100644
--- a/dev/sci/sci_base.hxx
+++ b/dev/sci/sci_base.h
@@ -2,7 +2,7 @@
 
 Copyright ZKA Web Services Co.
 
-File: sci_base.hxx
+File: sci_base.h
 Purpose: SCI core header file (C++ only).
 
 ------------------------------------------- */
@@ -10,7 +10,7 @@ Purpose: SCI core header file (C++ only).
 #ifndef __SCI_BASE_HXX__
 #define __SCI_BASE_HXX__
 
-#include <sci/sci_hint.hxx>
+#include <sci/sci_hint.h>
 
 #define ATTRIBUTE(X) __attribute__((X))
 
@@ -37,10 +37,10 @@ typedef void*			 VoidPtr;
 typedef __UINTPTR_TYPE__ UIntPtr;
 typedef char			 Char;
 
-#include <sci/sci_lpc.hxx>
+#include <sci/sci_lpc.h>
 
 #ifdef __XPCOM_IMPL__
-#include <sci/xpcom_core.hxx>
+#include <sci/xpcom_core.h>
 #else
 class IUnknown; // Refrenced from an IDB entry.
 class ICLSID;	// From the IDB, the constructor of the object, e.g: IAppCLSID.
diff --git a/dev/sci/sci_hint.hxx b/dev/sci/sci_hint.h
index 967d0ad0..967d0ad0 100644
--- a/dev/sci/sci_hint.hxx
+++ b/dev/sci/sci_hint.h
diff --git a/dev/sci/sci_lpc.hxx b/dev/sci/sci_lpc.h
index c634b790..c634b790 100644
--- a/dev/sci/sci_lpc.hxx
+++ b/dev/sci/sci_lpc.h
diff --git a/dev/sci/source_deploy.xml b/dev/sci/source_deploy.xml
index fda225db..30c64973 100644
--- a/dev/sci/source_deploy.xml
+++ b/dev/sci/source_deploy.xml
@@ -1,6 +1,6 @@
 <SourceDeploy>
 <HiddenFiles>
-    <SourceFile>*.hxx</SourceFile>
+    <SourceFile>*.h</SourceFile>
     <SourceFile>*.idl</SourceFile>
 </HiddenFiles>
 </SourceDeploy>
diff --git a/dev/sci/src/sci_mm.cxx b/dev/sci/src/sci_mm.cc
index 9d000d91..a776fe4a 100644
--- a/dev/sci/src/sci_mm.cxx
+++ b/dev/sci/src/sci_mm.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <sci/sci_base.hxx>
+#include <sci/sci_base.h>
 
 /// @file sci_base.cxx
 /// @brief Base Memory Manager functions for SCI.dll
diff --git a/dev/sci/xpcom_core.hxx b/dev/sci/xpcom_core.h
index c86210b5..c86210b5 100644
--- a/dev/sci/xpcom_core.hxx
+++ b/dev/sci/xpcom_core.h
diff --git a/dev/zba/BootKit/BitManip.hxx b/dev/zba/BootKit/BitManip.h
index ad893b02..ad893b02 100644
--- a/dev/zba/BootKit/BitManip.hxx
+++ b/dev/zba/BootKit/BitManip.h
diff --git a/dev/zba/BootKit/BootKit.hxx b/dev/zba/BootKit/BootKit.h
index f9a94c6e..dfba9728 100644
--- a/dev/zba/BootKit/BootKit.hxx
+++ b/dev/zba/BootKit/BootKit.h
@@ -5,29 +5,29 @@
 ------------------------------------------- */
 
 /***********************************************************************************/
-/// @file Boot.hxx
+/// @file Boot.h
 /// @brief Bootloader Programming Interface.
 /***********************************************************************************/
 
 #pragma once
 
-#include <BootKit/HW/ATA.hxx>
-#include <FirmwareKit/EPM.hxx>
-#include <CompilerKit/Version.hxx>
+#include <BootKit/HW/ATA.h>
+#include <FirmwareKit/EPM.h>
+#include <CompilerKit/Version.h>
 
 /// include NeFS header and Support header as well.
 
-#include <FSKit/NeFS.hxx>
-#include <BootKit/Support.hxx>
+#include <FSKit/NeFS.h>
+#include <BootKit/Support.h>
 
 /***********************************************************************************/
 /// Include other APIs.
 /***********************************************************************************/
 
-#include <NewKit/Defines.hxx>
-#include <modules/ATA/ATA.hxx>
+#include <NewKit/Defines.h>
+#include <modules/ATA/ATA.h>
 
-#include <FirmwareKit/EFI.hxx>
+#include <FirmwareKit/EFI.h>
 
 /***********************************************************************************/
 /// Framebuffer helpers.
diff --git a/dev/zba/BootKit/Device.hxx b/dev/zba/BootKit/Device.h
index 7c6d9c4e..f6352b7b 100644
--- a/dev/zba/BootKit/Device.hxx
+++ b/dev/zba/BootKit/Device.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <modules/ATA/ATA.hxx>
+#include <modules/ATA/ATA.h>
 
 using namespace Kernel;
 
diff --git a/dev/zba/BootKit/EPM.hxx b/dev/zba/BootKit/EPM.h
index 0dacba8b..df9754f1 100644
--- a/dev/zba/BootKit/EPM.hxx
+++ b/dev/zba/BootKit/EPM.h
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#include <FirmwareKit/EPM.hxx>
+#include <FirmwareKit/EPM.h>
diff --git a/dev/zba/BootKit/HW/ATA.hxx b/dev/zba/BootKit/HW/ATA.h
index 84d03835..0bed397f 100644
--- a/dev/zba/BootKit/HW/ATA.hxx
+++ b/dev/zba/BootKit/HW/ATA.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <modules/ATA/ATA.hxx>
-#include <BootKit/Device.hxx>
+#include <modules/ATA/ATA.h>
+#include <BootKit/Device.h>
 
 using namespace Kernel;
 
diff --git a/dev/zba/BootKit/HW/SATA.hxx b/dev/zba/BootKit/HW/SATA.h
index d0f7a3b5..3154e99b 100644
--- a/dev/zba/BootKit/HW/SATA.hxx
+++ b/dev/zba/BootKit/HW/SATA.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <CompilerKit/CompilerKit.hxx>
-#include <modules/AHCI/AHCI.hxx>
+#include <CompilerKit/CompilerKit.h>
+#include <modules/AHCI/AHCI.h>
 
 class BootDeviceSATA final
 {
diff --git a/dev/zba/BootKit/Platform.hxx b/dev/zba/BootKit/Platform.h
index 0ed6d047..e778223b 100644
--- a/dev/zba/BootKit/Platform.hxx
+++ b/dev/zba/BootKit/Platform.h
@@ -7,7 +7,7 @@
 #pragma once
 
 /**
-	@file Platform.hxx
+	@file Platform.h
 	@brief Platform specific code.
 */
 
diff --git a/dev/zba/BootKit/Protocol.h b/dev/zba/BootKit/Protocol.h
new file mode 100644
index 00000000..82ef1140
--- /dev/null
+++ b/dev/zba/BootKit/Protocol.h
@@ -0,0 +1,10 @@
+/* -------------------------------------------
+
+	Copyright ZKA Web Services Co.
+
+------------------------------------------- */
+
+#pragma once
+
+#include <FirmwareKit/EFI.h>
+#include <FirmwareKit/Handover.h>
diff --git a/dev/zba/BootKit/Protocol.hxx b/dev/zba/BootKit/Protocol.hxx
deleted file mode 100644
index 537fea94..00000000
--- a/dev/zba/BootKit/Protocol.hxx
+++ /dev/null
@@ -1,10 +0,0 @@
-/* -------------------------------------------
-
-	Copyright ZKA Web Services Co.
-
-------------------------------------------- */
-
-#pragma once
-
-#include <FirmwareKit/EFI.hxx>
-#include <FirmwareKit/Handover.hxx>
diff --git a/dev/zba/BootKit/STB.hxx b/dev/zba/BootKit/STB.h
index 1f47fdfb..7b8d6f3d 100644
--- a/dev/zba/BootKit/STB.hxx
+++ b/dev/zba/BootKit/STB.h
@@ -22,6 +22,6 @@
 #define STBI_FREE(x)			 Kernel::mm_delete_heap(x)
 #define STB_IMAGE_IMPLEMENTATION 1
 
-#include <KernelKit/Heap.hxx>
+#include <KernelKit/Heap.h>
 
-#include <BootKit/Vendor/stb_image.hxx>
+#include <BootKit/Vendor/stb_image.h>
diff --git a/dev/zba/BootKit/Support.hxx b/dev/zba/BootKit/Support.h
index 44ba5299..99fe0cb0 100644
--- a/dev/zba/BootKit/Support.hxx
+++ b/dev/zba/BootKit/Support.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-/// @file Support.hxx
+/// @file Support.h
 /// @brief Purpose of this file is to help port libs into the bootloader.
 
 #define cLongMax ((long)(~0UL >> 1))
diff --git a/dev/zba/BootKit/Thread.hxx b/dev/zba/BootKit/Thread.h
index 25a3b544..6923854b 100644
--- a/dev/zba/BootKit/Thread.hxx
+++ b/dev/zba/BootKit/Thread.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <KernelKit/PE.hxx>
-#include <KernelKit/MSDOS.hxx>
-#include <FirmwareKit/Handover.hxx>
+#include <KernelKit/PE.h>
+#include <KernelKit/MSDOS.h>
+#include <FirmwareKit/Handover.h>
 
 namespace Boot
 {
diff --git a/dev/zba/Modules/NetBoot/Module.cxx b/dev/zba/Modules/NetBoot/Module.cc
index 3b75b3b2..15e63f83 100644
--- a/dev/zba/Modules/NetBoot/Module.cxx
+++ b/dev/zba/Modules/NetBoot/Module.cc
@@ -7,8 +7,8 @@
  * 	========================================================
  */
 
-#include <NetBoot.hxx>
-#include <BootKit/BootKit.hxx>
+#include <NetBoot.h>
+#include <BootKit/BootKit.h>
 
 EXTERN_C Int32 main(Kernel::HEL::HANDOVER_INFO_HEADER* Handover)
 {
diff --git a/dev/zba/Modules/NetBoot/NetBoot.hxx b/dev/zba/Modules/NetBoot/NetBoot.h
index bb0127a2..8645a822 100644
--- a/dev/zba/Modules/NetBoot/NetBoot.hxx
+++ b/dev/zba/Modules/NetBoot/NetBoot.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 /// @brief the internet header is used to download updates OTA.
 typedef struct NetBootInternetHeader
diff --git a/dev/zba/Modules/NetBoot/build.json b/dev/zba/Modules/NetBoot/build.json
index f03fc06c..dfa39ac5 100644
--- a/dev/zba/Modules/NetBoot/build.json
+++ b/dev/zba/Modules/NetBoot/build.json
@@ -2,7 +2,7 @@
   "compiler_path": "x86_64-w64-mingw32-g++",
   "compiler_std": "c++20",
   "headers_path": ["../", "../../", "../../../zka", "../../../", "./"],
-  "sources_path": ["*.cxx", "*.S"],
+  "sources_path": [".cc", "*.S"],
   "output_name": "netboot.sys",
   "compiler_flags": [
     "-ffreestanding",
diff --git a/dev/zba/Modules/SysChk/Module.cxx b/dev/zba/Modules/SysChk/Module.cc
index f8770686..74f7c661 100644
--- a/dev/zba/Modules/SysChk/Module.cxx
+++ b/dev/zba/Modules/SysChk/Module.cc
@@ -7,7 +7,7 @@
  * 	========================================================
  */
 
-#include <BootKit/BootKit.hxx>
+#include <BootKit/BootKit.h>
 
 EXTERN_C Int32 ModuleMain(Kernel::HEL::HANDOVER_INFO_HEADER* Handover)
 {
diff --git a/dev/zba/Modules/SysChk/build.json b/dev/zba/Modules/SysChk/build.json
index 477a3ae5..7587d0a2 100644
--- a/dev/zba/Modules/SysChk/build.json
+++ b/dev/zba/Modules/SysChk/build.json
@@ -2,7 +2,7 @@
   "compiler_path": "x86_64-w64-mingw32-g++",
   "compiler_std": "c++20",
   "headers_path": ["../", "../../", "../../../zka", "../../../", "./"],
-  "sources_path": ["*.cxx", "*.S"],
+  "sources_path": [".cc", "*.S"],
   "output_name": "syschk.sys",
   "compiler_flags": [
     "-ffreestanding",
diff --git a/dev/zba/amd64-efi.make b/dev/zba/amd64-efi.make
index 9ebc8972..4d028b8e 100644
--- a/dev/zba/amd64-efi.make
+++ b/dev/zba/amd64-efi.make
@@ -83,9 +83,9 @@ endif
 compile-amd64:
 	$(RESCMD)
 	$(CC_GNU) $(ZKA_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) \
-	$(wildcard src/HEL/AMD64/*.cxx) \
+	$(wildcard src/HEL/AMD64/*.cc) \
 	$(wildcard src/HEL/AMD64/*.S) \
-	$(wildcard src/*.cxx)
+	$(wildcard src/*.cc)
 
 .PHONY: run-efi-amd64
 run-efi-amd64:
diff --git a/dev/zba/arm64-efi.make b/dev/zba/arm64-efi.make
index 638efb12..2735d757 100644
--- a/dev/zba/arm64-efi.make
+++ b/dev/zba/arm64-efi.make
@@ -77,9 +77,9 @@ endif
 compile-amd64:
 	$(RESCMD)
 	$(CC_GNU) $(ZKA_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) \
-	$(wildcard src/HEL/ARM64/*.cxx) \
+	$(wildcard src/HEL/ARM64/*.cc) \
 	$(wildcard src/HEL/ARM64/*.S) \
-	$(wildcard src/*.cxx)
+	$(wildcard src/*.cc)
 
 .PHONY: run-efi-amd64
 run-efi-amd64:
diff --git a/dev/zba/src/BootFileReader.cxx b/dev/zba/src/BootFileReader.cc
index b1969761..ef1f3492 100644
--- a/dev/zba/src/BootFileReader.cxx
+++ b/dev/zba/src/BootFileReader.cc
@@ -8,12 +8,12 @@
 
 ------------------------------------------- */
 
-#include <BootKit/Platform.hxx>
-#include <BootKit/Protocol.hxx>
-#include <BootKit/BootKit.hxx>
-#include <FirmwareKit/Handover.hxx>
-#include <FirmwareKit/EFI/API.hxx>
-#include <modules/FB/Text.hxx>
+#include <BootKit/Platform.h>
+#include <BootKit/Protocol.h>
+#include <BootKit/BootKit.h>
+#include <FirmwareKit/Handover.h>
+#include <FirmwareKit/EFI/API.h>
+#include <modules/FB/Text.h>
 
 /// @file BootFileReader
 /// @brief Bootloader File reader.
diff --git a/dev/zba/src/BootString.cxx b/dev/zba/src/BootString.cc
index 695f9d52..97ccbc43 100644
--- a/dev/zba/src/BootString.cxx
+++ b/dev/zba/src/BootString.cc
@@ -11,9 +11,9 @@
 
 ------------------------------------------- */
 
-#include <BootKit/Platform.hxx>
-#include <BootKit/Protocol.hxx>
-#include <BootKit/BootKit.hxx>
+#include <BootKit/Platform.h>
+#include <BootKit/Protocol.h>
+#include <BootKit/BootKit.h>
 
 /// BUGS: 0
 
diff --git a/dev/zba/src/BootSupport.cxx b/dev/zba/src/BootSupport.cc
index bda7ee38..0953398b 100644
--- a/dev/zba/src/BootSupport.cxx
+++ b/dev/zba/src/BootSupport.cc
@@ -4,13 +4,13 @@
 
 ------------------------------------------- */
 
-#include <BootKit/BootKit.hxx>
-#include <FirmwareKit/EFI/API.hxx>
-#include <FirmwareKit/EFI/EFI.hxx>
-#include <FirmwareKit/Handover.hxx>
-#include <BootKit/Support.hxx>
-#include <KernelKit/MSDOS.hxx>
-#include <KernelKit/PE.hxx>
+#include <BootKit/BootKit.h>
+#include <FirmwareKit/EFI/API.h>
+#include <FirmwareKit/EFI/EFI.h>
+#include <FirmwareKit/Handover.h>
+#include <BootKit/Support.h>
+#include <KernelKit/MSDOS.h>
+#include <KernelKit/PE.h>
 
 #ifdef __STANDALONE__
 
diff --git a/dev/zba/src/BootTextWriter.cxx b/dev/zba/src/BootTextWriter.cc
index e904f2f9..1446250c 100644
--- a/dev/zba/src/BootTextWriter.cxx
+++ b/dev/zba/src/BootTextWriter.cc
@@ -11,10 +11,10 @@
 
 ------------------------------------------- */
 
-#include <FirmwareKit/EFI/API.hxx>
-#include <BootKit/Platform.hxx>
-#include <BootKit/Protocol.hxx>
-#include <BootKit/BootKit.hxx>
+#include <FirmwareKit/EFI/API.h>
+#include <BootKit/Platform.h>
+#include <BootKit/Protocol.h>
+#include <BootKit/BootKit.h>
 
 /// BUGS: 0
 
diff --git a/dev/zba/src/BootloaderRsrc.rsrc b/dev/zba/src/BootloaderRsrc.rsrc
index 25c343e1..23a0bf09 100644
--- a/dev/zba/src/BootloaderRsrc.rsrc
+++ b/dev/zba/src/BootloaderRsrc.rsrc
@@ -1,4 +1,4 @@
-#include "../../Kernel/CompilerKit/Version.hxx"
+#include "../../Kernel/CompilerKit/Version.h"
 
 1 VERSIONINFO
 FILEVERSION     1,0,0,0
diff --git a/dev/zba/src/HEL/AMD64/BootAHCI.cxx b/dev/zba/src/HEL/AMD64/BootAHCI.cc
index 0c4eb953..5899f177 100644
--- a/dev/zba/src/HEL/AMD64/BootAHCI.cxx
+++ b/dev/zba/src/HEL/AMD64/BootAHCI.cc
@@ -15,6 +15,6 @@
  *
  */
 
-#include <BootKit/Platform.hxx>
-#include <BootKit/Protocol.hxx>
-#include <BootKit/HW/SATA.hxx>
+#include <BootKit/Platform.h>
+#include <BootKit/Protocol.h>
+#include <BootKit/HW/SATA.h>
diff --git a/dev/zba/src/HEL/AMD64/BootATA.cxx b/dev/zba/src/HEL/AMD64/BootATA.cc
index 6561c150..78792175 100644
--- a/dev/zba/src/HEL/AMD64/BootATA.cxx
+++ b/dev/zba/src/HEL/AMD64/BootATA.cc
@@ -15,9 +15,9 @@
  *
  */
 
-#include <FirmwareKit/EFI.hxx>
-#include <BootKit/BootKit.hxx>
-#include <BootKit/HW/ATA.hxx>
+#include <FirmwareKit/EFI.h>
+#include <BootKit/BootKit.h>
+#include <BootKit/HW/ATA.h>
 
 /// bugs: 0
 
diff --git a/dev/zba/src/HEL/AMD64/BootMain.cxx b/dev/zba/src/HEL/AMD64/BootMain.cc
index 6010d21b..1520dd1d 100644
--- a/dev/zba/src/HEL/AMD64/BootMain.cxx
+++ b/dev/zba/src/HEL/AMD64/BootMain.cc
@@ -4,18 +4,18 @@
 
 ------------------------------------------- */
 
-#include <BootKit/BootKit.hxx>
-#include <modules/FB/FB.hxx>
-#include <modules/FB/Text.hxx>
-#include <FirmwareKit/EFI.hxx>
-#include <FirmwareKit/EFI/API.hxx>
-#include <FirmwareKit/Handover.hxx>
-#include <KernelKit/MSDOS.hxx>
-#include <KernelKit/PE.hxx>
-#include <KernelKit/PEF.hxx>
-#include <NewKit/Macros.hxx>
-#include <NewKit/Ref.hxx>
-#include <BootKit/Thread.hxx>
+#include <BootKit/BootKit.h>
+#include <modules/FB/FB.h>
+#include <modules/FB/Text.h>
+#include <FirmwareKit/EFI.h>
+#include <FirmwareKit/EFI/API.h>
+#include <FirmwareKit/Handover.h>
+#include <KernelKit/MSDOS.h>
+#include <KernelKit/PE.h>
+#include <KernelKit/PEF.h>
+#include <NewKit/Macros.h>
+#include <NewKit/Ref.h>
+#include <BootKit/Thread.h>
 
 // make the compiler shut up.
 #ifndef kMachineModel
diff --git a/dev/zba/src/HEL/AMD64/BootPlatform.cxx b/dev/zba/src/HEL/AMD64/BootPlatform.cc
index 8aad43ca..70b95734 100644
--- a/dev/zba/src/HEL/AMD64/BootPlatform.cxx
+++ b/dev/zba/src/HEL/AMD64/BootPlatform.cc
@@ -5,9 +5,9 @@
 
 ------------------------------------------- */
 
-#include <BootKit/Platform.hxx>
-#include <BootKit/Protocol.hxx>
-#include <BootKit/BootKit.hxx>
+#include <BootKit/Platform.h>
+#include <BootKit/Protocol.h>
+#include <BootKit/BootKit.h>
 
 #ifdef __STANDALONE__
 
@@ -96,7 +96,7 @@ EXTERN_C UInt32 In32(UInt16 port)
 
 #else
 
-#include <HALKit/AMD64/Processor.hxx>
+#include <HALKit/AMD64/Processor.h>
 
 void rt_hlt()
 {
diff --git a/dev/zba/src/HEL/ARM64/BootMain.cxx b/dev/zba/src/HEL/ARM64/BootMain.cc
index 2dc940cd..dbdb7d0d 100644
--- a/dev/zba/src/HEL/ARM64/BootMain.cxx
+++ b/dev/zba/src/HEL/ARM64/BootMain.cc
@@ -4,10 +4,10 @@
 
 ------------------------------------------- */
 
-#include <FirmwareKit/EFI/API.hxx>
-#include <FirmwareKit/EFI.hxx>
-#include <BootKit/Thread.hxx>
-#include <BootKit/BootKit.hxx>
+#include <FirmwareKit/EFI/API.h>
+#include <FirmwareKit/EFI.h>
+#include <BootKit/Thread.h>
+#include <BootKit/BootKit.h>
 
 #ifndef cExpectedWidth
 #define cExpectedWidth 844
diff --git a/dev/zba/src/HEL/ARM64/BootPlatform.cxx b/dev/zba/src/HEL/ARM64/BootPlatform.cc
index b8c96a10..d63893a7 100644
--- a/dev/zba/src/HEL/ARM64/BootPlatform.cxx
+++ b/dev/zba/src/HEL/ARM64/BootPlatform.cc
@@ -4,9 +4,9 @@
 
 ------------------------------------------- */
 
-#include <BootKit/Platform.hxx>
-#include <BootKit/Protocol.hxx>
-#include <BootKit/BootKit.hxx>
+#include <BootKit/Platform.h>
+#include <BootKit/Protocol.h>
+#include <BootKit/BootKit.h>
 
 #ifdef __STANDALONE__
 
diff --git a/dev/zba/src/New+Delete.cxx b/dev/zba/src/New+Delete.cc
index 932bae69..075accfa 100644
--- a/dev/zba/src/New+Delete.cxx
+++ b/dev/zba/src/New+Delete.cc
@@ -4,9 +4,9 @@
 
 ------------------------------------------- */
 
-#include <BootKit/Platform.hxx>
-#include <BootKit/Protocol.hxx>
-#include <BootKit/BootKit.hxx>
+#include <BootKit/Platform.h>
+#include <BootKit/Protocol.h>
+#include <BootKit/BootKit.h>
 
 #ifdef __STANDALONE__
 EXTERN EfiBootServices* BS;
diff --git a/dev/zba/src/Thread.cxx b/dev/zba/src/Thread.cc
index 6d527fce..6efe3242 100644
--- a/dev/zba/src/Thread.cxx
+++ b/dev/zba/src/Thread.cc
@@ -4,16 +4,16 @@
 
 ------------------------------------------- */
 
-#include <BootKit/Thread.hxx>
-#include <BootKit/Support.hxx>
-#include <BootKit/BootKit.hxx>
-#include <FirmwareKit/EFI/API.hxx>
-
-#include <KernelKit/PEF.hxx>
-#include <KernelKit/PE.hxx>
-#include <KernelKit/MSDOS.hxx>
-#include <CFKit/LoaderUtils.hxx>
-#include <modules/FB/Text.hxx>
+#include <BootKit/Thread.h>
+#include <BootKit/Support.h>
+#include <BootKit/BootKit.h>
+#include <FirmwareKit/EFI/API.h>
+
+#include <KernelKit/PEF.h>
+#include <KernelKit/PE.h>
+#include <KernelKit/MSDOS.h>
+#include <CFKit/LoaderUtils.h>
+#include <modules/FB/Text.h>
 
 // External boot services symbol.
 EXTERN EfiBootServices* BS;
diff --git a/dev/zka/ArchKit/ArchKit.hxx b/dev/zka/ArchKit/ArchKit.h
index 0ac0edd6..681dbab1 100644
--- a/dev/zka/ArchKit/ArchKit.hxx
+++ b/dev/zka/ArchKit/ArchKit.h
@@ -6,20 +6,20 @@
 
 #pragma once
 
-#include <NewKit/Array.hxx>
-#include <NewKit/Defines.hxx>
-#include <NewKit/Function.hxx>
+#include <NewKit/Array.h>
+#include <NewKit/Defines.h>
+#include <NewKit/Function.h>
 
-#include <FirmwareKit/Handover.hxx>
+#include <FirmwareKit/Handover.h>
 
 #ifdef __ZKA_AMD64__
-#include <HALKit/AMD64/Paging.hxx>
-#include <HALKit/AMD64/Hypervisor.hxx>
-#include <HALKit/AMD64/Processor.hxx>
+#include <HALKit/AMD64/Paging.h>
+#include <HALKit/AMD64/Hypervisor.h>
+#include <HALKit/AMD64/Processor.h>
 #elif defined(__ZKA_POWER64__)
-#include <HALKit/POWER/Processor.hxx>
+#include <HALKit/POWER/Processor.h>
 #elif defined(__ZKA_ARM64__)
-#include <HALKit/ARM64/Processor.hxx>
+#include <HALKit/ARM64/Processor.h>
 #else
 #error !!! unknown architecture !!!
 #endif
diff --git a/dev/zka/CFKit/GUIDWizard.hxx b/dev/zka/CFKit/GUIDWizard.h
index bd390bd4..74dab72b 100644
--- a/dev/zka/CFKit/GUIDWizard.hxx
+++ b/dev/zka/CFKit/GUIDWizard.h
@@ -6,14 +6,14 @@
 
 #pragma once
 
-#include <CFKit/GUIDWrapper.hxx>
-#include <NewKit/Array.hxx>
-#include <NewKit/ArrayList.hxx>
-#include <NewKit/Defines.hxx>
-#include <NewKit/ErrorOr.hxx>
-#include <NewKit/Ref.hxx>
-#include <NewKit/Stream.hxx>
-#include <NewKit/String.hxx>
+#include <CFKit/GUIDWrapper.h>
+#include <NewKit/Array.h>
+#include <NewKit/ArrayList.h>
+#include <NewKit/Defines.h>
+#include <NewKit/ErrorOr.h>
+#include <NewKit/Ref.h>
+#include <NewKit/Stream.h>
+#include <NewKit/String.h>
 
 namespace Kernel::XRN::Version1
 {
diff --git a/dev/zka/CFKit/GUIDWrapper.hxx b/dev/zka/CFKit/GUIDWrapper.h
index 48977a7c..ee51e065 100644
--- a/dev/zka/CFKit/GUIDWrapper.hxx
+++ b/dev/zka/CFKit/GUIDWrapper.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
-#include <NewKit/Ref.hxx>
-#include <NewKit/Stream.hxx>
+#include <NewKit/Defines.h>
+#include <NewKit/Ref.h>
+#include <NewKit/Stream.h>
 
 /* GUID for C++ Components */
 
diff --git a/dev/zka/CFKit/LoaderUtils.hxx b/dev/zka/CFKit/LoaderUtils.h
index 7385fc2e..4a30ec84 100644
--- a/dev/zka/CFKit/LoaderUtils.hxx
+++ b/dev/zka/CFKit/LoaderUtils.h
@@ -1,8 +1,8 @@
 #ifndef __CFKIT_LOADER_UTILS_HXX__
 #define __CFKIT_LOADER_UTILS_HXX__
 
-#include <KernelKit/PE.hxx>
-#include <KernelKit/MSDOS.hxx>
+#include <KernelKit/PE.h>
+#include <KernelKit/MSDOS.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/CFKit/Property.hxx b/dev/zka/CFKit/Property.h
index 7f1aed64..56829165 100644
--- a/dev/zka/CFKit/Property.hxx
+++ b/dev/zka/CFKit/Property.h
@@ -7,10 +7,10 @@
 #ifndef __INC_PROPS_HPP__
 #define __INC_PROPS_HPP__
 
-#include <NewKit/Array.hxx>
-#include <NewKit/Defines.hxx>
-#include <NewKit/Function.hxx>
-#include <NewKit/String.hxx>
+#include <NewKit/Array.h>
+#include <NewKit/Defines.h>
+#include <NewKit/Function.h>
+#include <NewKit/String.h>
 
 #define cMaxPropLen 4096
 
diff --git a/dev/zka/CompilerKit/CompilerKit.hxx b/dev/zka/CompilerKit/CompilerKit.h
index 01661827..6aa7d04f 100644
--- a/dev/zka/CompilerKit/CompilerKit.hxx
+++ b/dev/zka/CompilerKit/CompilerKit.h
@@ -7,7 +7,7 @@
 #ifndef _INC_CL_HPP
 #define _INC_CL_HPP
 
-#include <CompilerKit/Detail.hxx>
-#include <CompilerKit/Version.hxx>
+#include <CompilerKit/Detail.h>
+#include <CompilerKit/Version.h>
 
 #endif /* ifndef _INC_CL_HPP */
diff --git a/dev/zka/CompilerKit/Detail.hxx b/dev/zka/CompilerKit/Detail.h
index 827cebe6..203175ce 100644
--- a/dev/zka/CompilerKit/Detail.hxx
+++ b/dev/zka/CompilerKit/Detail.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #ifdef __NEWOSKRNL__
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 #endif // ifdef __NEWOSKRNL__
 
 #define ZKA_COPY_DELETE(KLASS)               \
diff --git a/dev/zka/CompilerKit/Version.hxx b/dev/zka/CompilerKit/Version.h
index 460fe2ee..460fe2ee 100644
--- a/dev/zka/CompilerKit/Version.hxx
+++ b/dev/zka/CompilerKit/Version.h
diff --git a/dev/zka/CompressKit/GZip.hxx b/dev/zka/CompressKit/GZip.h
index 9f3e23b6..cd1b9744 100644
--- a/dev/zka/CompressKit/GZip.hxx
+++ b/dev/zka/CompressKit/GZip.h
@@ -7,7 +7,7 @@
 #ifndef __KERNELKIT_GZIP_HXX__
 #define __KERNELKIT_GZIP_HXX__
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 namespace Kernel::GZip
 {
diff --git a/dev/zka/CompressKit/RLE.hxx b/dev/zka/CompressKit/RLE.h
index 6bc19292..64cd53ca 100644
--- a/dev/zka/CompressKit/RLE.hxx
+++ b/dev/zka/CompressKit/RLE.h
@@ -7,7 +7,7 @@
 #ifndef __KERNELKIT_RLE_HXX__
 #define __KERNELKIT_RLE_HXX__
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/FSKit/Defines.hxx b/dev/zka/FSKit/Defines.h
index b0107c13..e7eac935 100644
--- a/dev/zka/FSKit/Defines.hxx
+++ b/dev/zka/FSKit/Defines.h
@@ -6,6 +6,6 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 #define FSKIT_VERSION "1.00"
diff --git a/dev/zka/FSKit/HPFS.hxx b/dev/zka/FSKit/HPFS.h
index 12a9d81f..0c778f30 100644
--- a/dev/zka/FSKit/HPFS.hxx
+++ b/dev/zka/FSKit/HPFS.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
-/// @file HPFS.hxx
+/// @file HPFS.h
 /// @brief HPFS filesystem support.
 
 #define kHPFSVersion  0x01000
diff --git a/dev/zka/FSKit/IndexableProperty.hxx b/dev/zka/FSKit/IndexableProperty.h
index ca0fa0d1..fd7082f8 100644
--- a/dev/zka/FSKit/IndexableProperty.hxx
+++ b/dev/zka/FSKit/IndexableProperty.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <CFKit/Property.hxx>
-#include <CompilerKit/CompilerKit.hxx>
-#include <KernelKit/DriveMgr.hxx>
+#include <CFKit/Property.h>
+#include <CompilerKit/CompilerKit.h>
+#include <KernelKit/DriveMgr.h>
 
 #define kIndexerNodeNameLength 255
 #define kIndexerClaimed		   0xCF
diff --git a/dev/zka/FSKit/NeFS.hxx b/dev/zka/FSKit/NeFS.h
index 4696df57..08771032 100644
--- a/dev/zka/FSKit/NeFS.hxx
+++ b/dev/zka/FSKit/NeFS.h
@@ -2,7 +2,7 @@
 
 	Copyright ZKA Web Services Co.
 
-	FILE: NeFS.hxx
+	FILE: NeFS.h
 	PURPOSE: NeFS (New FileSystem) support, can be used with kernel, HPFS is preferred.
 
 	Revision History:
@@ -16,10 +16,10 @@ default.
 
 #pragma once
 
-#include <CompilerKit/CompilerKit.hxx>
-#include <HintKit/CompilerHint.hxx>
-#include <KernelKit/DriveMgr.hxx>
-#include <NewKit/Defines.hxx>
+#include <CompilerKit/CompilerKit.h>
+#include <HintKit/CompilerHint.h>
+#include <KernelKit/DriveMgr.h>
+#include <NewKit/Defines.h>
 
 /**
 	@brief New File System specification.
diff --git a/dev/zka/FirmwareKit/EFI.h b/dev/zka/FirmwareKit/EFI.h
new file mode 100644
index 00000000..3097c7b6
--- /dev/null
+++ b/dev/zka/FirmwareKit/EFI.h
@@ -0,0 +1,11 @@
+/* -------------------------------------------
+
+	Copyright ZKA Web Services Co.
+
+------------------------------------------- */
+
+#pragma once
+
+#include <FirmwareKit/EFI/EFI.h>
+
+/// @note this header is used to reference the EFI/EFI.h
diff --git a/dev/zka/FirmwareKit/EFI.hxx b/dev/zka/FirmwareKit/EFI.hxx
deleted file mode 100644
index f099958e..00000000
--- a/dev/zka/FirmwareKit/EFI.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
-/* -------------------------------------------
-
-	Copyright ZKA Web Services Co.
-
-------------------------------------------- */
-
-#pragma once
-
-#include <FirmwareKit/EFI/EFI.hxx>
-
-/// @note this header is used to reference the EFI/EFI.hxx
diff --git a/dev/zka/FirmwareKit/EFI/API.hxx b/dev/zka/FirmwareKit/EFI/API.h
index 42df38d6..12f69033 100644
--- a/dev/zka/FirmwareKit/EFI/API.hxx
+++ b/dev/zka/FirmwareKit/EFI/API.h
@@ -7,10 +7,10 @@
 #ifndef __EFI_API__
 #define __EFI_API__
 
-#include <FirmwareKit/EFI/EFI.hxx>
-#include <FirmwareKit/Handover.hxx>
-#include <KernelKit/MSDOS.hxx>
-#include <KernelKit/PE.hxx>
+#include <FirmwareKit/EFI/EFI.h>
+#include <FirmwareKit/Handover.h>
+#include <KernelKit/MSDOS.h>
+#include <KernelKit/PE.h>
 
 #define kZKASubsystem 17
 
@@ -20,8 +20,8 @@ class BTextWriter;
 
 #define __BOOTKIT_NO_INCLUDE__ 1
 
-#include <BootKit/BootKit.hxx>
-#include <modules/FB/FB.hxx>
+#include <BootKit/BootKit.h>
+#include <modules/FB/FB.h>
 #endif // ifdef __NEWOSLDR__
 
 inline EfiSystemTable*	ST = nullptr;
@@ -107,7 +107,7 @@ inline void InitEFI(EfiSystemTable* SystemTable) noexcept
 
 #ifdef __NEWOSLDR__
 
-#include <BootKit/Platform.hxx>
+#include <BootKit/Platform.h>
 
 #endif // ifdef __NEWOSLDR__
 
diff --git a/dev/zka/FirmwareKit/EFI/EFI.hxx b/dev/zka/FirmwareKit/EFI/EFI.h
index 75438014..46d3083e 100644
--- a/dev/zka/FirmwareKit/EFI/EFI.hxx
+++ b/dev/zka/FirmwareKit/EFI/EFI.h
@@ -14,7 +14,7 @@ improving that later.
 @author Amlal El Mahrouss
 */
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 using namespace Kernel;
 
diff --git a/dev/zka/FirmwareKit/EPM.hxx b/dev/zka/FirmwareKit/EPM.h
index 29392a8f..7ff976a0 100644
--- a/dev/zka/FirmwareKit/EPM.hxx
+++ b/dev/zka/FirmwareKit/EPM.h
@@ -11,7 +11,7 @@
 #ifndef __FIRMWARE_EPM_HXX__
 #define __FIRMWARE_EPM_HXX__
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 #define kEPMNameLength		 (32)
 #define kEPMFilesystemLength (16)
diff --git a/dev/zka/FirmwareKit/Handover.hxx b/dev/zka/FirmwareKit/Handover.h
index 4d7130cf..d753cb10 100644
--- a/dev/zka/FirmwareKit/Handover.hxx
+++ b/dev/zka/FirmwareKit/Handover.h
@@ -5,7 +5,7 @@
 ------------------------------------------- */
 
 /**
- * @file Handover.hxx
+ * @file Handover.h
  * @author Amlal El Mahrouss (amlalelmahrouss@icloud.com)
  * @brief The handover boot protocol.
  * @version 1.15
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 #define kHandoverMagic	 0xBADCC
 #define kHandoverVersion 0x0117
diff --git a/dev/zka/HALKit/64x0/HalVirtualMemory.cxx b/dev/zka/HALKit/64x0/HalVirtualMemory.cc
index 30ab87af..ae7faa0b 100644
--- a/dev/zka/HALKit/64x0/HalVirtualMemory.cxx
+++ b/dev/zka/HALKit/64x0/HalVirtualMemory.cc
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <HALKit/POWER/Processor.hxx>
-#include <KernelKit/DebugOutput.hxx>
+#include <HALKit/POWER/Processor.h>
+#include <KernelKit/DebugOutput.h>
 
 using namespace Kernel;
 
diff --git a/dev/zka/HALKit/AMD64/CPUID.hxx b/dev/zka/HALKit/AMD64/CPUID.h
index 49421586..6eda5736 100644
--- a/dev/zka/HALKit/AMD64/CPUID.hxx
+++ b/dev/zka/HALKit/AMD64/CPUID.h
@@ -2,7 +2,7 @@
 
 	Copyright ZKA Web Services Co.
 
-	File: CPUID.hxx
+	File: CPUID.h
 	Purpose: CPUID flags.
 
 	Revision History:
@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 enum
 {
diff --git a/dev/zka/HALKit/AMD64/HalACPIFactoryInterface.cxx b/dev/zka/HALKit/AMD64/HalACPIFactoryInterface.cc
index 443d6a5d..2ed013ef 100644
--- a/dev/zka/HALKit/AMD64/HalACPIFactoryInterface.cxx
+++ b/dev/zka/HALKit/AMD64/HalACPIFactoryInterface.cc
@@ -4,11 +4,11 @@
 
 ------------------------------------------- */
 
-#include <modules/ACPI/ACPIFactoryInterface.hxx>
-#include <HALKit/AMD64/Processor.hxx>
-#include <NewKit/String.hxx>
-#include <ArchKit/ArchKit.hxx>
-#include <KernelKit/Heap.hxx>
+#include <modules/ACPI/ACPIFactoryInterface.h>
+#include <HALKit/AMD64/Processor.h>
+#include <NewKit/String.h>
+#include <ArchKit/ArchKit.h>
+#include <KernelKit/Heap.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/HALKit/AMD64/HalAPICController.cxx b/dev/zka/HALKit/AMD64/HalAPICController.cc
index 47c55657..3a8bc23d 100644
--- a/dev/zka/HALKit/AMD64/HalAPICController.cxx
+++ b/dev/zka/HALKit/AMD64/HalAPICController.cc
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <modules/ACPI/ACPIFactoryInterface.hxx>
-#include <HALKit/AMD64/Processor.hxx>
+#include <modules/ACPI/ACPIFactoryInterface.h>
+#include <HALKit/AMD64/Processor.h>
 
 #define cIOAPICRegVal (4)
 #define cIOAPICRegReg (0)
diff --git a/dev/zka/HALKit/AMD64/HalCPU.cxx b/dev/zka/HALKit/AMD64/HalCPU.cc
index a96ceb34..80729346 100644
--- a/dev/zka/HALKit/AMD64/HalCPU.cxx
+++ b/dev/zka/HALKit/AMD64/HalCPU.cc
@@ -7,8 +7,8 @@
 
 ------------------------------------------- */
 
-#include <HALKit/AMD64/Paging.hxx>
-#include <HALKit/AMD64/Processor.hxx>
+#include <HALKit/AMD64/Paging.h>
+#include <HALKit/AMD64/Processor.h>
 
 /**
  * @file HalCPU.cxx
diff --git a/dev/zka/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cxx b/dev/zka/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc
index 4ff168cd..7dd0b68e 100644
--- a/dev/zka/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cxx
+++ b/dev/zka/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc
@@ -4,9 +4,9 @@
 
 ------------------------------------------- */
 
-#include <ArchKit/ArchKit.hxx>
-#include <KernelKit/UserProcessScheduler.hxx>
-#include <NewKit/String.hxx>
+#include <ArchKit/ArchKit.h>
+#include <KernelKit/UserProcessScheduler.h>
+#include <NewKit/String.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/HALKit/AMD64/HalCoreMPScheduler.cxx b/dev/zka/HALKit/AMD64/HalCoreMPScheduler.cc
index e763475a..9feddbfb 100644
--- a/dev/zka/HALKit/AMD64/HalCoreMPScheduler.cxx
+++ b/dev/zka/HALKit/AMD64/HalCoreMPScheduler.cc
@@ -4,19 +4,19 @@
 
 ------------------------------------------- */
 
-#include <modules/ACPI/ACPIFactoryInterface.hxx>
-#include <KernelKit/UserProcessScheduler.hxx>
-#include <HALKit/AMD64/Processor.hxx>
-#include <NewKit/Stop.hxx>
-#include <ArchKit/ArchKit.hxx>
-#include <KernelKit/Semaphore.hxx>
-#include <KernelKit/UserProcessScheduler.hxx>
-#include <KernelKit/Timer.hxx>
-#include <modules/FB/Text.hxx>
+#include <modules/ACPI/ACPIFactoryInterface.h>
+#include <KernelKit/UserProcessScheduler.h>
+#include <HALKit/AMD64/Processor.h>
+#include <NewKit/Stop.h>
+#include <ArchKit/ArchKit.h>
+#include <KernelKit/Semaphore.h>
+#include <KernelKit/UserProcessScheduler.h>
+#include <KernelKit/Timer.h>
+#include <modules/FB/Text.h>
 
 // Needed for SMP. //
-#include <FirmwareKit/EFI.hxx>
-#include <KernelKit/HardwareThreadScheduler.hxx>
+#include <FirmwareKit/EFI.h>
+#include <KernelKit/HardwareThreadScheduler.h>
 
 #define kApicSignature "APIC"
 
diff --git a/dev/zka/HALKit/AMD64/HalDebugOutput.cxx b/dev/zka/HALKit/AMD64/HalDebugOutput.cc
index e6f4148b..49cdc964 100644
--- a/dev/zka/HALKit/AMD64/HalDebugOutput.cxx
+++ b/dev/zka/HALKit/AMD64/HalDebugOutput.cc
@@ -4,10 +4,10 @@
 
 ------------------------------------------- */
 
-#include <ArchKit/ArchKit.hxx>
-#include <KernelKit/DebugOutput.hxx>
-#include <NewKit/Utils.hxx>
-#include <NewKit/New.hxx>
+#include <ArchKit/ArchKit.h>
+#include <KernelKit/DebugOutput.h>
+#include <NewKit/Utils.h>
+#include <NewKit/New.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/HALKit/AMD64/HalDebugPort.cxx b/dev/zka/HALKit/AMD64/HalDebugPort.cc
index 4e28f637..6c8ebf2b 100644
--- a/dev/zka/HALKit/AMD64/HalDebugPort.cxx
+++ b/dev/zka/HALKit/AMD64/HalDebugPort.cc
@@ -7,8 +7,8 @@
 //! @file DebuggerPort.cxx
 //! @brief UART debug via packets.
 
-#include <ArchKit/ArchKit.hxx>
-#include <KernelKit/DebugOutput.hxx>
+#include <ArchKit/ArchKit.h>
+#include <KernelKit/DebugOutput.h>
 
 // after that we have start of additional data.
 
diff --git a/dev/zka/HALKit/AMD64/HalDescriptorLoader.cxx b/dev/zka/HALKit/AMD64/HalDescriptorLoader.cc
index 822d7dac..f0eff4e1 100644
--- a/dev/zka/HALKit/AMD64/HalDescriptorLoader.cxx
+++ b/dev/zka/HALKit/AMD64/HalDescriptorLoader.cc
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <ArchKit/ArchKit.hxx>
-#include <HALKit/AMD64/Processor.hxx>
+#include <ArchKit/ArchKit.h>
+#include <HALKit/AMD64/Processor.h>
 
 namespace Kernel::HAL
 {
diff --git a/dev/zka/HALKit/AMD64/HalKernelMain.cxx b/dev/zka/HALKit/AMD64/HalKernelMain.cc
index 1a4fc830..08d91062 100644
--- a/dev/zka/HALKit/AMD64/HalKernelMain.cxx
+++ b/dev/zka/HALKit/AMD64/HalKernelMain.cc
@@ -4,14 +4,14 @@
 
 ------------------------------------------- */
 
-#include <ArchKit/ArchKit.hxx>
-#include <KernelKit/UserProcessScheduler.hxx>
-#include <KernelKit/HardwareThreadScheduler.hxx>
-#include <KernelKit/CodeMgr.hxx>
-#include <modules/ACPI/ACPIFactoryInterface.hxx>
-#include <NetworkKit/IPC.hxx>
-#include <CFKit/Property.hxx>
-#include <modules/FB/Text.hxx>
+#include <ArchKit/ArchKit.h>
+#include <KernelKit/UserProcessScheduler.h>
+#include <KernelKit/HardwareThreadScheduler.h>
+#include <KernelKit/CodeMgr.h>
+#include <modules/ACPI/ACPIFactoryInterface.h>
+#include <NetworkKit/IPC.h>
+#include <CFKit/Property.h>
+#include <modules/FB/Text.h>
 
 namespace Kernel::HAL
 {
diff --git a/dev/zka/HALKit/AMD64/HalPagingMgr.cxx b/dev/zka/HALKit/AMD64/HalPagingMgr.cc
index fe6aea0f..afc86eeb 100644
--- a/dev/zka/HALKit/AMD64/HalPagingMgr.cxx
+++ b/dev/zka/HALKit/AMD64/HalPagingMgr.cc
@@ -7,8 +7,8 @@
 
 ------------------------------------------- */
 
-#include <HALKit/AMD64/Paging.hxx>
-#include <HALKit/AMD64/Processor.hxx>
+#include <HALKit/AMD64/Paging.h>
+#include <HALKit/AMD64/Processor.h>
 
 namespace Kernel::HAL
 {
diff --git a/dev/zka/HALKit/AMD64/HalSchedulerCore.cxx b/dev/zka/HALKit/AMD64/HalSchedulerCore.cc
index e5396c92..214b889b 100644
--- a/dev/zka/HALKit/AMD64/HalSchedulerCore.cxx
+++ b/dev/zka/HALKit/AMD64/HalSchedulerCore.cc
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <HALKit/AMD64/Processor.hxx>
-#include <KernelKit/UserProcessScheduler.hxx>
+#include <HALKit/AMD64/Processor.h>
+#include <KernelKit/UserProcessScheduler.h>
 
 using namespace Kernel;
 
diff --git a/dev/zka/HALKit/AMD64/HalTimer.cxx b/dev/zka/HALKit/AMD64/HalTimer.cc
index 75102c15..6d552a09 100644
--- a/dev/zka/HALKit/AMD64/HalTimer.cxx
+++ b/dev/zka/HALKit/AMD64/HalTimer.cc
@@ -11,9 +11,9 @@
 
 ------------------------------------------- */
 
-#include <modules/ACPI/ACPIFactoryInterface.hxx>
-#include <ArchKit/ArchKit.hxx>
-#include <KernelKit/Timer.hxx>
+#include <modules/ACPI/ACPIFactoryInterface.h>
+#include <ArchKit/ArchKit.h>
+#include <KernelKit/Timer.h>
 
 // timer slot 0
 
diff --git a/dev/zka/HALKit/AMD64/Hypervisor.hxx b/dev/zka/HALKit/AMD64/Hypervisor.h
index f4c0c5ac..5a0a9aeb 100644
--- a/dev/zka/HALKit/AMD64/Hypervisor.hxx
+++ b/dev/zka/HALKit/AMD64/Hypervisor.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/HALKit/AMD64/PCI/DMA.cxx b/dev/zka/HALKit/AMD64/PCI/DMA.cc
index 3670b7e4..056cdf19 100644
--- a/dev/zka/HALKit/AMD64/PCI/DMA.cxx
+++ b/dev/zka/HALKit/AMD64/PCI/DMA.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/PCI/DMA.hxx>
+#include <KernelKit/PCI/DMA.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/HALKit/AMD64/PCI/Express.cxx b/dev/zka/HALKit/AMD64/PCI/Database.cc
index b1f69a6e..897c51f4 100644
--- a/dev/zka/HALKit/AMD64/PCI/Express.cxx
+++ b/dev/zka/HALKit/AMD64/PCI/Database.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/PCI/Express.hxx>
+#include <KernelKit/PCI/Database.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/HALKit/AMD64/PCI/Device.cxx b/dev/zka/HALKit/AMD64/PCI/Device.cc
index d55683d5..19b0886c 100644
--- a/dev/zka/HALKit/AMD64/PCI/Device.cxx
+++ b/dev/zka/HALKit/AMD64/PCI/Device.cc
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <ArchKit/ArchKit.hxx>
-#include <KernelKit/PCI/Device.hxx>
+#include <ArchKit/ArchKit.h>
+#include <KernelKit/PCI/Device.h>
 
 Kernel::UInt ZKA_PCIReadRaw(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun)
 {
diff --git a/dev/zka/HALKit/AMD64/PCI/Database.cxx b/dev/zka/HALKit/AMD64/PCI/Express.cc
index 5441397c..c1481616 100644
--- a/dev/zka/HALKit/AMD64/PCI/Database.cxx
+++ b/dev/zka/HALKit/AMD64/PCI/Express.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/PCI/Database.hxx>
+#include <KernelKit/PCI/Express.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/src/Defines.cxx b/dev/zka/HALKit/AMD64/PCI/IO.cc
index fc7d41b5..c8535c54 100644
--- a/dev/zka/src/Defines.cxx
+++ b/dev/zka/HALKit/AMD64/PCI/IO.cc
@@ -4,4 +4,4 @@
 
 ------------------------------------------- */
 
-#include <NewKit/Defines.hxx>
+#include <KernelKit/PCI/IO.h>
diff --git a/dev/zka/HALKit/AMD64/PCI/Iterator.cxx b/dev/zka/HALKit/AMD64/PCI/Iterator.cc
index f0d52c5d..edafe07b 100644
--- a/dev/zka/HALKit/AMD64/PCI/Iterator.cxx
+++ b/dev/zka/HALKit/AMD64/PCI/Iterator.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/PCI/Iterator.hxx>
+#include <KernelKit/PCI/Iterator.h>
 
 namespace Kernel::PCI
 {
diff --git a/dev/zka/HALKit/AMD64/PCI/PCI.cc b/dev/zka/HALKit/AMD64/PCI/PCI.cc
new file mode 100644
index 00000000..7e056bf9
--- /dev/null
+++ b/dev/zka/HALKit/AMD64/PCI/PCI.cc
@@ -0,0 +1,7 @@
+/* -------------------------------------------
+
+	Copyright ZKA Web Services Co.
+
+------------------------------------------- */
+
+#include <KernelKit/PCI/PCI.h>
diff --git a/dev/zka/HALKit/AMD64/Paging.hxx b/dev/zka/HALKit/AMD64/Paging.h
index 2720bbf9..0d109bb0 100644
--- a/dev/zka/HALKit/AMD64/Paging.hxx
+++ b/dev/zka/HALKit/AMD64/Paging.h
@@ -12,7 +12,7 @@
 
 ------------------------------------------------------- */
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 #ifndef kPageMax
 #define kPageMax (0x200)
diff --git a/dev/zka/HALKit/AMD64/Processor.hxx b/dev/zka/HALKit/AMD64/Processor.h
index 2fd62820..8dbac715 100644
--- a/dev/zka/HALKit/AMD64/Processor.hxx
+++ b/dev/zka/HALKit/AMD64/Processor.h
@@ -2,7 +2,7 @@
 
 	Copyright ZKA Web Services Co.
 
-	File: Prcoessor.hxx
+	File: Prcoessor.h
 	Purpose: AMD64 processor abstraction.
 
 	Revision History:
@@ -13,11 +13,11 @@
 
 #pragma once
 
-#include <NewKit/Array.hxx>
-#include <NewKit/Defines.hxx>
-#include <NewKit/Utils.hxx>
-#include <FirmwareKit/Handover.hxx>
-#include <HALKit/AMD64/Paging.hxx>
+#include <NewKit/Array.h>
+#include <NewKit/Defines.h>
+#include <NewKit/Utils.h>
+#include <FirmwareKit/Handover.h>
+#include <HALKit/AMD64/Paging.h>
 
 #define kPITControlPort	 0x43
 #define kPITChannel0Port 0x40
@@ -33,7 +33,7 @@ EXTERN_C
 #include <cpuid.h>
 }
 
-#include <HALKit/AMD64/CPUID.hxx>
+#include <HALKit/AMD64/CPUID.h>
 
 /// @brief Maximum entries of the interrupt descriptor table.
 #define kKernelIdtSize (0x100)
diff --git a/dev/zka/HALKit/AMD64/Storage/AHCI.cxx b/dev/zka/HALKit/AMD64/Storage/AHCI.cc
index 0a318d6d..abc4603c 100644
--- a/dev/zka/HALKit/AMD64/Storage/AHCI.cxx
+++ b/dev/zka/HALKit/AMD64/Storage/AHCI.cc
@@ -15,15 +15,16 @@
  *
  */
 
-#include <modules/AHCI/AHCI.hxx>
-#include <KernelKit/PCI/Iterator.hxx>
-#include <NewKit/Utils.hxx>
+#include <modules/AHCI/AHCI.h>
+#include <KernelKit/PCI/Iterator.h>
+#include <NewKit/Utils.h>
 
 #ifdef __AHCI__
 enum
 {
 	kSATAProgIfAHCI = 0x01,
-	kSATASubClass	= 0x06
+	kSATASubClass	= 0x06,
+	kSATABar5		= 0x24,
 };
 
 STATIC Kernel::PCI::Device kAhciDevice;
@@ -51,7 +52,7 @@ Kernel::Boolean drv_std_init(Kernel::UInt16& PortsImplemented)
 			HbaMem* mem_ahci = (HbaMem*)kAhciDevice.Bar(0x24);
 
 			Kernel::UInt32 ports_implemented = mem_ahci->Pi;
-			Int32  ahci_index		 = 0;
+			Int32		   ahci_index		 = 0;
 
 			const auto cMaxAhciDevices = 32;
 			const auto cAhciSig		   = 0x00000101;
@@ -126,31 +127,31 @@ Kernel::Void drv_std_read(Kernel::UInt64 Lba, Kernel::Char* Buf, Kernel::SizeT S
 	HbaCmdTbl* cmd_tbl = (HbaCmdTbl*)cmd_header->Ctba;
 	Kernel::rt_set_memory(cmd_tbl, 0, sizeof(HbaCmdTbl));
 
-	Kernel::UInt64 size = Size * kAHCISectorSize;
+	Kernel::UInt64 size		  = Size * kAHCISectorSize;
 	Kernel::Int64  index_byte = 0L;
 
 	for (index_byte = 0; index_byte < cmd_header->Prdtl - 1; index_byte++)
 	{
-		cmd_tbl->prdtEntries[index_byte].Dba = (Kernel::UInt32)(Kernel::UIntPtr)Buf;
-		cmd_tbl->prdtEntries[index_byte].Dbc = (8 * 1024) - 1; // 8KB Buf size
-		cmd_tbl->prdtEntries[index_byte].InterruptBit   = 1;				 // Interrupt on completion
+		cmd_tbl->prdtEntries[index_byte].Dba		  = (Kernel::UInt32)(Kernel::UIntPtr)Buf;
+		cmd_tbl->prdtEntries[index_byte].Dbc		  = (8 * 1024) - 1; // 8KB Buf size
+		cmd_tbl->prdtEntries[index_byte].InterruptBit = 1;				// Interrupt on completion
 
 		Size -= 8 * 1024;
 		Buf += 4 * 1024; // Move the Buf pointer forward
 	}
 
 	// Last PRDT entry
-	cmd_tbl->prdtEntries[index_byte].Dba = (Kernel::UInt32)(Kernel::UIntPtr)Buf;
-	cmd_tbl->prdtEntries[index_byte].Dbc = Size - 1; // Byte count left
-	cmd_tbl->prdtEntries[index_byte].InterruptBit   = 1;
+	cmd_tbl->prdtEntries[index_byte].Dba		  = (Kernel::UInt32)(Kernel::UIntPtr)Buf;
+	cmd_tbl->prdtEntries[index_byte].Dbc		  = Size - 1; // Byte count left
+	cmd_tbl->prdtEntries[index_byte].InterruptBit = 1;
 
 	// 5. Prepare the command FIS (Frame Information Structure)
 	FisRegH2D* cmd_fis = (FisRegH2D*)(&cmd_tbl->Cfis);
 	Kernel::rt_set_memory(cmd_fis, 0, sizeof(FisRegH2D));
 
-	cmd_fis->FisType = kFISTypeRegH2D;
-	cmd_fis->CmdOrCtrl		  = 1; // Command
-	cmd_fis->Command  = kAHCICmdReadDmaEx;
+	cmd_fis->FisType   = kFISTypeRegH2D;
+	cmd_fis->CmdOrCtrl = 1; // Command
+	cmd_fis->Command   = kAHCICmdReadDmaEx;
 
 	cmd_fis->Lba0	= (Kernel::UInt8)Lba;
 	cmd_fis->Lba1	= (Kernel::UInt8)(Lba >> 8);
@@ -161,7 +162,7 @@ Kernel::Void drv_std_read(Kernel::UInt64 Lba, Kernel::Char* Buf, Kernel::SizeT S
 	cmd_fis->Lba4 = (Kernel::UInt8)(Lba >> 32);
 	cmd_fis->Lba5 = (Kernel::UInt8)(Lba >> 40);
 
-	cmd_fis->CountLow = Size & 0xFF;
+	cmd_fis->CountLow  = Size & 0xFF;
 	cmd_fis->CountHigh = (Size >> 8) & 0xFF;
 
 	// 6. Issue the command by writing to the kAhciPort's command issue register (CI)
diff --git a/dev/zka/HALKit/AMD64/Storage/ATA-DMA.cxx b/dev/zka/HALKit/AMD64/Storage/ATA-DMA.cc
index cc74d1ac..ddf08501 100644
--- a/dev/zka/HALKit/AMD64/Storage/ATA-DMA.cxx
+++ b/dev/zka/HALKit/AMD64/Storage/ATA-DMA.cc
@@ -15,10 +15,10 @@
  *
  */
 
-#include <StorageKit/PRDT.hxx>
+#include <StorageKit/PRDT.h>
 
-#include <modules/ATA/ATA.hxx>
-#include <ArchKit/ArchKit.hxx>
+#include <modules/ATA/ATA.h>
+#include <ArchKit/ArchKit.h>
 
 using namespace Kernel;
 
diff --git a/dev/zka/HALKit/AMD64/Storage/ATA-PIO.cxx b/dev/zka/HALKit/AMD64/Storage/ATA-PIO.cc
index d0a1cf45..96e7eb35 100644
--- a/dev/zka/HALKit/AMD64/Storage/ATA-PIO.cxx
+++ b/dev/zka/HALKit/AMD64/Storage/ATA-PIO.cc
@@ -15,8 +15,8 @@
  *
  */
 
-#include <modules/ATA/ATA.hxx>
-#include <ArchKit/ArchKit.hxx>
+#include <modules/ATA/ATA.h>
+#include <ArchKit/ArchKit.h>
 
 #ifdef __ATA_PIO__
 
diff --git a/dev/zka/HALKit/ARM64/APM/APM.cxx b/dev/zka/HALKit/ARM64/APM/APM.cc
index 164f3aab..ff193765 100644
--- a/dev/zka/HALKit/ARM64/APM/APM.cxx
+++ b/dev/zka/HALKit/ARM64/APM/APM.cc
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <modules/APM/APM.hxx>
-#include <KernelKit/LPC.hxx>
+#include <modules/APM/APM.h>
+#include <KernelKit/LPC.h>
 
 using namespace Kernel;
 
diff --git a/dev/zka/HALKit/ARM64/HalACPIFactoryInterface.cxx b/dev/zka/HALKit/ARM64/HalACPIFactoryInterface.cc
index 8221b734..c093e83e 100644
--- a/dev/zka/HALKit/ARM64/HalACPIFactoryInterface.cxx
+++ b/dev/zka/HALKit/ARM64/HalACPIFactoryInterface.cc
@@ -4,11 +4,11 @@
 
 ------------------------------------------- */
 
-#include <modules/ACPI/ACPIFactoryInterface.hxx>
-#include <NewKit/String.hxx>
-#include <ArchKit/ArchKit.hxx>
-#include <KernelKit/Heap.hxx>
-#include <modules/APM/APM.hxx>
+#include <modules/ACPI/ACPIFactoryInterface.h>
+#include <NewKit/String.h>
+#include <ArchKit/ArchKit.h>
+#include <KernelKit/Heap.h>
+#include <modules/APM/APM.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/HALKit/ARM64/HalCoreMPScheduler.cxx b/dev/zka/HALKit/ARM64/HalCoreMPScheduler.cc
index 76456318..d808ebeb 100644
--- a/dev/zka/HALKit/ARM64/HalCoreMPScheduler.cxx
+++ b/dev/zka/HALKit/ARM64/HalCoreMPScheduler.cc
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <modules/ACPI/ACPIFactoryInterface.hxx>
-#include <KernelKit/UserProcessScheduler.hxx>
+#include <modules/ACPI/ACPIFactoryInterface.h>
+#include <KernelKit/UserProcessScheduler.h>
 
 using namespace Kernel;
 
diff --git a/dev/zka/HALKit/ARM64/HalDebugOutput.cxx b/dev/zka/HALKit/ARM64/HalDebugOutput.cc
index 2710b099..c98d87a5 100644
--- a/dev/zka/HALKit/ARM64/HalDebugOutput.cxx
+++ b/dev/zka/HALKit/ARM64/HalDebugOutput.cc
@@ -4,10 +4,10 @@
 
 ------------------------------------------- */
 
-#include <ArchKit/ArchKit.hxx>
-#include <KernelKit/DebugOutput.hxx>
-#include <NewKit/Utils.hxx>
-#include <NewKit/New.hxx>
+#include <ArchKit/ArchKit.h>
+#include <KernelKit/DebugOutput.h>
+#include <NewKit/Utils.h>
+#include <NewKit/New.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/HALKit/ARM64/HalKernelMain.cxx b/dev/zka/HALKit/ARM64/HalKernelMain.cc
index 52096158..16460bb5 100644
--- a/dev/zka/HALKit/ARM64/HalKernelMain.cxx
+++ b/dev/zka/HALKit/ARM64/HalKernelMain.cc
@@ -4,18 +4,18 @@
 
 ------------------------------------------- */
 
-#include <ArchKit/ArchKit.hxx>
-#include <modules/FB/FB.hxx>
-#include <FirmwareKit/Handover.hxx>
-#include <KernelKit/FileMgr.hxx>
-#include <KernelKit/Heap.hxx>
-#include <KernelKit/PEFCodeMgr.hxx>
-#include <KernelKit/UserProcessScheduler.hxx>
-#include <NewKit/Json.hxx>
-#include <KernelKit/CodeMgr.hxx>
-#include <modules/ACPI/ACPIFactoryInterface.hxx>
-#include <NetworkKit/IPC.hxx>
-#include <CFKit/Property.hxx>
+#include <ArchKit/ArchKit.h>
+#include <modules/FB/FB.h>
+#include <FirmwareKit/Handover.h>
+#include <KernelKit/FileMgr.h>
+#include <KernelKit/Heap.h>
+#include <KernelKit/PEFCodeMgr.h>
+#include <KernelKit/UserProcessScheduler.h>
+#include <NewKit/Json.h>
+#include <KernelKit/CodeMgr.h>
+#include <modules/ACPI/ACPIFactoryInterface.h>
+#include <NetworkKit/IPC.h>
+#include <CFKit/Property.h>
 
 Kernel::Void hal_real_init(Kernel::Void) noexcept;
 EXTERN_C Kernel::Void ke_dll_entrypoint(Kernel::Void);
diff --git a/dev/zka/HALKit/ARM64/HalPagingMgr.cxx b/dev/zka/HALKit/ARM64/HalPagingMgr.cc
index ae060af9..0182c315 100644
--- a/dev/zka/HALKit/ARM64/HalPagingMgr.cxx
+++ b/dev/zka/HALKit/ARM64/HalPagingMgr.cc
@@ -7,8 +7,8 @@
 
 ------------------------------------------- */
 
-#include <HALKit/ARM64/Paging.hxx>
-#include <HALKit/ARM64/Processor.hxx>
+#include <HALKit/ARM64/Paging.h>
+#include <HALKit/ARM64/Processor.h>
 
 namespace Kernel::HAL
 {
diff --git a/dev/zka/HALKit/ARM64/HalSchedulerCore.cxx b/dev/zka/HALKit/ARM64/HalSchedulerCore.cc
index e231e0fc..a384db22 100644
--- a/dev/zka/HALKit/ARM64/HalSchedulerCore.cxx
+++ b/dev/zka/HALKit/ARM64/HalSchedulerCore.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/UserProcessScheduler.hxx>
+#include <KernelKit/UserProcessScheduler.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/HALKit/ARM64/HalTimer.cxx b/dev/zka/HALKit/ARM64/HalTimer.cc
index 7183fd10..d3f8c457 100644
--- a/dev/zka/HALKit/ARM64/HalTimer.cxx
+++ b/dev/zka/HALKit/ARM64/HalTimer.cc
@@ -11,4 +11,4 @@
 
 ------------------------------------------- */
 
-#include <ArchKit/ArchKit.hxx>
+#include <ArchKit/ArchKit.h>
diff --git a/dev/zka/HALKit/ARM64/Paging.hxx b/dev/zka/HALKit/ARM64/Paging.h
index 276433c7..74b4bab0 100644
--- a/dev/zka/HALKit/ARM64/Paging.hxx
+++ b/dev/zka/HALKit/ARM64/Paging.h
@@ -12,7 +12,7 @@
 
 ------------------------------------------------------- */
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 #ifndef kPageMax
 #define kPageMax (0x200)
diff --git a/dev/zka/HALKit/ARM64/Processor.hxx b/dev/zka/HALKit/ARM64/Processor.h
index 93a9141a..5f00e345 100644
--- a/dev/zka/HALKit/ARM64/Processor.hxx
+++ b/dev/zka/HALKit/ARM64/Processor.h
@@ -6,10 +6,10 @@
 
 #pragma once
 
-#include <NewKit/Array.hxx>
-#include <NewKit/Defines.hxx>
-#include <NewKit/Utils.hxx>
-#include <FirmwareKit/Handover.hxx>
+#include <NewKit/Array.h>
+#include <NewKit/Defines.h>
+#include <NewKit/Utils.h>
+#include <FirmwareKit/Handover.h>
 
 #define kCPUBackendName "ARMv8"
 
@@ -72,4 +72,4 @@ inline Kernel::UIntPtr kKernelBitMpSize	 = 0UL;
 
 inline Kernel::VoidPtr kKernelPhysicalStart = nullptr;
 
-#include <HALKit/ARM64/Paging.hxx>
+#include <HALKit/ARM64/Paging.h>
diff --git a/dev/zka/HALKit/ARM64/Storage/HalFlash.cxx b/dev/zka/HALKit/ARM64/Storage/HalFlash.cc
index 70e025f7..d64d9d82 100644
--- a/dev/zka/HALKit/ARM64/Storage/HalFlash.cxx
+++ b/dev/zka/HALKit/ARM64/Storage/HalFlash.cc
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <NewKit/Defines.hxx>
-#include <ArchKit/ArchKit.hxx>
+#include <NewKit/Defines.h>
+#include <ArchKit/ArchKit.h>
 
 /// @file Flash.cxx
 /// @brief Flash memory builtin.
diff --git a/dev/zka/HALKit/AXP/CoreSyscallHandlerDEC.cpp b/dev/zka/HALKit/AXP/CoreSyscallHandlerDEC.cpp
index 7fe901a5..c164dce0 100644
--- a/dev/zka/HALKit/AXP/CoreSyscallHandlerDEC.cpp
+++ b/dev/zka/HALKit/AXP/CoreSyscallHandlerDEC.cpp
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <ArchKit/ArchKit.hxx>
-#include <HALKit/AXP/Processor.hxx>
+#include <ArchKit/ArchKit.h>
+#include <HALKit/AXP/Processor.h>
 
 /// @brief Internal call for syscall, to work with C++.
 /// @param stack
diff --git a/dev/zka/HALKit/AXP/Processor.hxx b/dev/zka/HALKit/AXP/Processor.h
index cdb39054..cdb39054 100644
--- a/dev/zka/HALKit/AXP/Processor.hxx
+++ b/dev/zka/HALKit/AXP/Processor.h
diff --git a/dev/zka/HALKit/POWER/HalHart.cxx b/dev/zka/HALKit/POWER/HalHart.cc
index 185d835a..ff5025d5 100644
--- a/dev/zka/HALKit/POWER/HalHart.cxx
+++ b/dev/zka/HALKit/POWER/HalHart.cc
@@ -4,9 +4,9 @@
 
 ------------------------------------------- */
 
-#include <HALKit/POWER/Processor.hxx>
-#include <KernelKit/DebugOutput.hxx>
-#include <HALKit/POWER/Hart.hxx>
+#include <HALKit/POWER/Processor.h>
+#include <KernelKit/DebugOutput.h>
+#include <HALKit/POWER/Hart.h>
 
 using namespace Kernel;
 
diff --git a/dev/zka/HALKit/POWER/HalSerialPort.cxx b/dev/zka/HALKit/POWER/HalSerialPort.cc
index 0c4eb230..29bc8fa5 100644
--- a/dev/zka/HALKit/POWER/HalSerialPort.cxx
+++ b/dev/zka/HALKit/POWER/HalSerialPort.cc
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <HALKit/POWER/Processor.hxx>
-#include <KernelKit/DebugOutput.hxx>
+#include <HALKit/POWER/Processor.h>
+#include <KernelKit/DebugOutput.h>
 
 using namespace Kernel;
 
diff --git a/dev/zka/HALKit/POWER/HalThread.cc b/dev/zka/HALKit/POWER/HalThread.cc
new file mode 100644
index 00000000..7a0d5ccb
--- /dev/null
+++ b/dev/zka/HALKit/POWER/HalThread.cc
@@ -0,0 +1,8 @@
+/* -------------------------------------------
+
+	Copyright ZKA Web Services Co.
+
+------------------------------------------- */
+
+#include <HALKit/POWER/Processor.h>
+#include <KernelKit/DebugOutput.h>
diff --git a/dev/zka/HALKit/POWER/HalThread.cxx b/dev/zka/HALKit/POWER/HalThread.cxx
deleted file mode 100644
index da8f4e2d..00000000
--- a/dev/zka/HALKit/POWER/HalThread.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-/* -------------------------------------------
-
-	Copyright ZKA Web Services Co.
-
-------------------------------------------- */
-
-#include <HALKit/POWER/Processor.hxx>
-#include <KernelKit/DebugOutput.hxx>
diff --git a/dev/zka/HALKit/POWER/HalVirtualMemory.cxx b/dev/zka/HALKit/POWER/HalVirtualMemory.cc
index 9e4529a2..8d8db849 100644
--- a/dev/zka/HALKit/POWER/HalVirtualMemory.cxx
+++ b/dev/zka/HALKit/POWER/HalVirtualMemory.cc
@@ -7,8 +7,8 @@
 #include <HALKit/POWER/ppc-cpu.h>
 #include <HALKit/POWER/ppc-mmu.h>
 
-#include <HALKit/POWER/Processor.hxx>
-#include <KernelKit/DebugOutput.hxx>
+#include <HALKit/POWER/Processor.h>
+#include <KernelKit/DebugOutput.h>
 
 /// @note refer to the SoC documentation.
 
diff --git a/dev/zka/HALKit/POWER/Hart.hxx b/dev/zka/HALKit/POWER/Hart.h
index aceed5db..eaf00493 100644
--- a/dev/zka/HALKit/POWER/Hart.hxx
+++ b/dev/zka/HALKit/POWER/Hart.h
@@ -2,7 +2,7 @@
 
 	Copyright ZKA Web Services Co.
 
-	File: Hart.hxx
+	File: Hart.h
 	Purpose: POWER hardware threads.
 
 	Revision History:
@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 struct HAL_HARDWARE_THREAD;
 
diff --git a/dev/zka/HALKit/POWER/MBCI/HalMBCIHost.cc b/dev/zka/HALKit/POWER/MBCI/HalMBCIHost.cc
new file mode 100644
index 00000000..7a0d5ccb
--- /dev/null
+++ b/dev/zka/HALKit/POWER/MBCI/HalMBCIHost.cc
@@ -0,0 +1,8 @@
+/* -------------------------------------------
+
+	Copyright ZKA Web Services Co.
+
+------------------------------------------- */
+
+#include <HALKit/POWER/Processor.h>
+#include <KernelKit/DebugOutput.h>
diff --git a/dev/zka/HALKit/POWER/MBCI/HalMBCIHost.cxx b/dev/zka/HALKit/POWER/MBCI/HalMBCIHost.cxx
deleted file mode 100644
index da8f4e2d..00000000
--- a/dev/zka/HALKit/POWER/MBCI/HalMBCIHost.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-/* -------------------------------------------
-
-	Copyright ZKA Web Services Co.
-
-------------------------------------------- */
-
-#include <HALKit/POWER/Processor.hxx>
-#include <KernelKit/DebugOutput.hxx>
diff --git a/dev/zka/HALKit/POWER/Processor.hxx b/dev/zka/HALKit/POWER/Processor.h
index de34e1d2..95c1f1c6 100644
--- a/dev/zka/HALKit/POWER/Processor.hxx
+++ b/dev/zka/HALKit/POWER/Processor.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
-#include <NewKit/Utils.hxx>
+#include <NewKit/Defines.h>
+#include <NewKit/Utils.h>
 
 #define NoOp()			 asm volatile("mr 0, 0")
 #define kHalPPCAlignment __attribute__((aligned(4)))
diff --git a/dev/zka/HALKit/RISCV/Hart.hxx b/dev/zka/HALKit/RISCV/Hart.h
index c25816be..b5e842c0 100644
--- a/dev/zka/HALKit/RISCV/Hart.hxx
+++ b/dev/zka/HALKit/RISCV/Hart.h
@@ -2,7 +2,7 @@
 
 	Copyright ZKA Web Services Co.
 
-	File: Hart.hxx
+	File: Hart.h
 	Purpose: RISC-V hardware threads.
 
 	Revision History:
@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 typedef Kernel::Int32 Rv64HartType;
 
diff --git a/dev/zka/HintKit/CompilerHint.hxx b/dev/zka/HintKit/CompilerHint.h
index da670509..da670509 100644
--- a/dev/zka/HintKit/CompilerHint.hxx
+++ b/dev/zka/HintKit/CompilerHint.h
diff --git a/dev/zka/KernelKit/CodeMgr.hxx b/dev/zka/KernelKit/CodeMgr.h
index 127f3b7b..41a90ec5 100644
--- a/dev/zka/KernelKit/CodeMgr.hxx
+++ b/dev/zka/KernelKit/CodeMgr.h
@@ -14,9 +14,9 @@
 
 #pragma once
 
-#include <KernelKit/PECodeMgr.hxx>
-#include <KernelKit/PEFCodeMgr.hxx>
-#include <KernelKit/IPEFDLLObject.hxx>
+#include <KernelKit/PECodeMgr.h>
+#include <KernelKit/PEFCodeMgr.h>
+#include <KernelKit/IPEFDLLObject.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/KernelKit/DebugOutput.hxx b/dev/zka/KernelKit/DebugOutput.h
index 142debc7..e7e466e3 100644
--- a/dev/zka/KernelKit/DebugOutput.hxx
+++ b/dev/zka/KernelKit/DebugOutput.h
@@ -6,10 +6,10 @@
 
 #pragma once
 
-#include <KernelKit/DeviceMgr.hxx>
-#include <CompilerKit/CompilerKit.hxx>
-#include <NewKit/OwnPtr.hxx>
-#include <NewKit/Stream.hxx>
+#include <KernelKit/DeviceMgr.h>
+#include <CompilerKit/CompilerKit.h>
+#include <NewKit/OwnPtr.h>
+#include <NewKit/Stream.h>
 
 #define kDebugMaxPorts 16
 
diff --git a/dev/zka/KernelKit/Defines.hxx b/dev/zka/KernelKit/Defines.h
index 3e59716f..48befc8e 100644
--- a/dev/zka/KernelKit/Defines.hxx
+++ b/dev/zka/KernelKit/Defines.h
@@ -6,6 +6,6 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 #define KERNELKIT_VERSION "1.02"
diff --git a/dev/zka/KernelKit/DeviceMgr.hxx b/dev/zka/KernelKit/DeviceMgr.h
index 5788d1b0..1f767aa6 100644
--- a/dev/zka/KernelKit/DeviceMgr.hxx
+++ b/dev/zka/KernelKit/DeviceMgr.h
@@ -18,8 +18,8 @@
 /* @file KernelKit/DeviceMgr.hpp */
 /* @brief Device abstraction and I/O buffer. */
 
-#include <NewKit/ErrorOr.hxx>
-#include <NewKit/Ref.hxx>
+#include <NewKit/ErrorOr.h>
+#include <NewKit/Ref.h>
 
 #define cDevicePath "\\Mount\\"
 
diff --git a/dev/zka/KernelKit/DriveMgr.hxx b/dev/zka/KernelKit/DriveMgr.h
index ddff013b..850217cb 100644
--- a/dev/zka/KernelKit/DriveMgr.hxx
+++ b/dev/zka/KernelKit/DriveMgr.h
@@ -7,14 +7,14 @@
 #ifndef __INC_DRIVE_MANAGER_HXX__
 #define __INC_DRIVE_MANAGER_HXX__
 
-#include <KernelKit/UserProcessScheduler.hxx>
-#include <CompilerKit/CompilerKit.hxx>
-#include <KernelKit/DebugOutput.hxx>
-#include <KernelKit/DeviceMgr.hxx>
-#include <KernelKit/LPC.hxx>
-#include <NewKit/Defines.hxx>
-#include <NewKit/String.hxx>
-#include <NewKit/Ref.hxx>
+#include <KernelKit/UserProcessScheduler.h>
+#include <CompilerKit/CompilerKit.h>
+#include <KernelKit/DebugOutput.h>
+#include <KernelKit/DeviceMgr.h>
+#include <KernelKit/LPC.h>
+#include <NewKit/Defines.h>
+#include <NewKit/String.h>
+#include <NewKit/Ref.h>
 
 #define kMaxDriveCountPerMountpoint (4U)
 
diff --git a/dev/zka/KernelKit/FileMgr.hxx b/dev/zka/KernelKit/FileMgr.h
index fc6e6fc1..cdda89e7 100644
--- a/dev/zka/KernelKit/FileMgr.hxx
+++ b/dev/zka/KernelKit/FileMgr.h
@@ -2,7 +2,7 @@
 
 	Copyright ZKA Web Services Co.
 
-	File: FileMgr.hxx
+	File: FileMgr.h
 	Purpose: Kernel file manager.
 
 ------------------------------------------- */
@@ -20,17 +20,17 @@
 #pragma once
 
 #ifdef __FSKIT_USE_NEFS__
-#include <FSKit/NeFS.hxx>
+#include <FSKit/NeFS.h>
 #endif // __FSKIT_USE_NEFS__
 
-#include <CompilerKit/CompilerKit.hxx>
-#include <HintKit/CompilerHint.hxx>
-#include <KernelKit/LPC.hxx>
-#include <KernelKit/DebugOutput.hxx>
-#include <NewKit/Stream.hxx>
-#include <NewKit/ErrorOr.hxx>
-#include <KernelKit/Heap.hxx>
-#include <NewKit/Ref.hxx>
+#include <CompilerKit/CompilerKit.h>
+#include <HintKit/CompilerHint.h>
+#include <KernelKit/LPC.h>
+#include <KernelKit/DebugOutput.h>
+#include <NewKit/Stream.h>
+#include <NewKit/ErrorOr.h>
+#include <KernelKit/Heap.h>
+#include <NewKit/Ref.h>
 
 /// @brief Filesystem manager, abstraction over mounted filesystem.
 /// Works like the VFS or IFS.
diff --git a/dev/zka/KernelKit/HardwareThreadScheduler.hxx b/dev/zka/KernelKit/HardwareThreadScheduler.h
index c026f6ac..15848d97 100644
--- a/dev/zka/KernelKit/HardwareThreadScheduler.hxx
+++ b/dev/zka/KernelKit/HardwareThreadScheduler.h
@@ -7,9 +7,9 @@
 #ifndef __INC_MP_MANAGER_HPP__
 #define __INC_MP_MANAGER_HPP__
 
-#include <ArchKit/ArchKit.hxx>
-#include <CompilerKit/CompilerKit.hxx>
-#include <NewKit/Ref.hxx>
+#include <ArchKit/ArchKit.h>
+#include <CompilerKit/CompilerKit.h>
+#include <NewKit/Ref.h>
 
 /// @note Last Rev Sun 28 Jul CET 2024
 /// @note Last Rev Thu, Aug  1, 2024  9:07:38 AM
diff --git a/dev/zka/KernelKit/Heap.hxx b/dev/zka/KernelKit/Heap.h
index cfa3fc94..a136b42f 100644
--- a/dev/zka/KernelKit/Heap.hxx
+++ b/dev/zka/KernelKit/Heap.h
@@ -8,11 +8,11 @@
 #define INC_KERNEL_HEAP_HXX
 
 // last-rev 30/01/24
-// file: Heap.hxx
+// file: Heap.h
 // description: heap allocation for the Kernel.
 
-#include <NewKit/Defines.hxx>
-#include <NewKit/Stop.hxx>
+#include <NewKit/Defines.h>
+#include <NewKit/Stop.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/KernelKit/IDLLObject.hxx b/dev/zka/KernelKit/IDLLObject.h
index 1755b403..e3b09ccc 100644
--- a/dev/zka/KernelKit/IDLLObject.hxx
+++ b/dev/zka/KernelKit/IDLLObject.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
-#include <CompilerKit/CompilerKit.hxx>
+#include <NewKit/Defines.h>
+#include <CompilerKit/CompilerKit.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/KernelKit/IPEFDLLObject.hxx b/dev/zka/KernelKit/IPEFDLLObject.h
index 7852381d..8c0703ed 100644
--- a/dev/zka/KernelKit/IPEFDLLObject.hxx
+++ b/dev/zka/KernelKit/IPEFDLLObject.h
@@ -10,11 +10,11 @@
 #ifndef __KERNELKIT_SHARED_OBJECT_HXX__
 #define __KERNELKIT_SHARED_OBJECT_HXX__
 
-#include <KernelKit/PEF.hxx>
-#include <NewKit/Defines.hxx>
-#include <KernelKit/PEFCodeMgr.hxx>
-#include <KernelKit/UserProcessScheduler.hxx>
-#include <KernelKit/IDLLObject.hxx>
+#include <KernelKit/PEF.h>
+#include <NewKit/Defines.h>
+#include <KernelKit/PEFCodeMgr.h>
+#include <KernelKit/UserProcessScheduler.h>
+#include <KernelKit/IDLLObject.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/KernelKit/LPC.hxx b/dev/zka/KernelKit/LPC.h
index 57c38390..b0b0fae8 100644
--- a/dev/zka/KernelKit/LPC.hxx
+++ b/dev/zka/KernelKit/LPC.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
-/// @file LPC.hxx
+/// @file LPC.h
 /// @brief Local Process Codes.
 
 #define ErrLocalIsOk()	 (Kernel::UserProcessScheduler::The().CurrentProcess().Leak().GetLocalCode() == Kernel::kErrorSuccess)
diff --git a/dev/zka/KernelKit/LoaderInterface.hxx b/dev/zka/KernelKit/LoaderInterface.h
index 246978dd..843b42d8 100644
--- a/dev/zka/KernelKit/LoaderInterface.hxx
+++ b/dev/zka/KernelKit/LoaderInterface.h
@@ -6,10 +6,10 @@
 
 #pragma once
 
-#include <CompilerKit/CompilerKit.hxx>
-#include <HintKit/CompilerHint.hxx>
-#include <NewKit/Defines.hxx>
-#include <NewKit/ErrorOr.hxx>
+#include <CompilerKit/CompilerKit.h>
+#include <HintKit/CompilerHint.h>
+#include <NewKit/Defines.h>
+#include <NewKit/ErrorOr.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/KernelKit/LockDelegate.hxx b/dev/zka/KernelKit/LockDelegate.h
index 0181fc9b..8f7e9a42 100644
--- a/dev/zka/KernelKit/LockDelegate.hxx
+++ b/dev/zka/KernelKit/LockDelegate.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <NewKit/Atom.hxx>
-#include <NewKit/Defines.hxx>
+#include <NewKit/Atom.h>
+#include <NewKit/Defines.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/KernelKit/MSDOS.hxx b/dev/zka/KernelKit/MSDOS.h
index 1a0698b3..b9f8f13c 100644
--- a/dev/zka/KernelKit/MSDOS.hxx
+++ b/dev/zka/KernelKit/MSDOS.h
@@ -14,8 +14,8 @@
 #ifndef __MSDOS_EXEC__
 #define __MSDOS_EXEC__
 
-#include <KernelKit/PE.hxx>
-#include <NewKit/Defines.hxx>
+#include <KernelKit/PE.h>
+#include <NewKit/Defines.h>
 
 // Last Rev
 // Sat Feb 24 CET 2024
diff --git a/dev/zka/KernelKit/PCI/DMA.hxx b/dev/zka/KernelKit/PCI/DMA.h
index 94dd5ad5..d13f2c05 100644
--- a/dev/zka/KernelKit/PCI/DMA.hxx
+++ b/dev/zka/KernelKit/PCI/DMA.h
@@ -6,11 +6,11 @@
 
 #pragma once
 
-#include <KernelKit/DeviceMgr.hxx>
-#include <KernelKit/PCI/Device.hxx>
-#include <NewKit/Array.hxx>
-#include <NewKit/OwnPtr.hxx>
-#include <NewKit/Ref.hxx>
+#include <KernelKit/DeviceMgr.h>
+#include <KernelKit/PCI/Device.h>
+#include <NewKit/Array.h>
+#include <NewKit/OwnPtr.h>
+#include <NewKit/Ref.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/KernelKit/PCI/Database.hxx b/dev/zka/KernelKit/PCI/Database.h
index 16b5c787..4985049a 100644
--- a/dev/zka/KernelKit/PCI/Database.hxx
+++ b/dev/zka/KernelKit/PCI/Database.h
@@ -5,8 +5,8 @@
 ------------------------------------------- */
 #pragma once
 
-#include <KernelKit/PCI/Device.hxx>
-#include <NewKit/Defines.hxx>
+#include <KernelKit/PCI/Device.h>
+#include <NewKit/Defines.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/KernelKit/PCI/Device.hxx b/dev/zka/KernelKit/PCI/Device.h
index bc1b4eb7..cdedb92b 100644
--- a/dev/zka/KernelKit/PCI/Device.hxx
+++ b/dev/zka/KernelKit/PCI/Device.h
@@ -5,7 +5,7 @@
 ------------------------------------------- */
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 namespace Kernel::PCI
 {
diff --git a/dev/zka/KernelKit/PCI/Express.hxx b/dev/zka/KernelKit/PCI/Express.h
index 1e7ce5bc..57962631 100644
--- a/dev/zka/KernelKit/PCI/Express.hxx
+++ b/dev/zka/KernelKit/PCI/Express.h
@@ -6,6 +6,6 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 #define PCI_EXPRESS_BUS_COUNT (4096)
diff --git a/dev/zka/KernelKit/PCI/IO.hxx b/dev/zka/KernelKit/PCI/IO.h
index 58287a9b..d42119f2 100644
--- a/dev/zka/KernelKit/PCI/IO.hxx
+++ b/dev/zka/KernelKit/PCI/IO.h
@@ -6,10 +6,10 @@
 
 #pragma once
 
-#include <ArchKit/ArchKit.hxx>
-#include <NewKit/Array.hxx>
-#include <NewKit/Defines.hxx>
-#include <NewKit/Ref.hxx>
+#include <ArchKit/ArchKit.h>
+#include <NewKit/Array.h>
+#include <NewKit/Defines.h>
+#include <NewKit/Ref.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/KernelKit/PCI/Iterator.hxx b/dev/zka/KernelKit/PCI/Iterator.h
index a065f9de..232a4671 100644
--- a/dev/zka/KernelKit/PCI/Iterator.hxx
+++ b/dev/zka/KernelKit/PCI/Iterator.h
@@ -7,11 +7,11 @@
 #ifndef __PCI_ITERATOR_HPP__
 #define __PCI_ITERATOR_HPP__
 
-#include <KernelKit/PCI/Database.hxx>
-#include <KernelKit/PCI/Device.hxx>
-#include <NewKit/Array.hxx>
-#include <NewKit/Defines.hxx>
-#include <NewKit/Ref.hxx>
+#include <KernelKit/PCI/Database.h>
+#include <KernelKit/PCI/Device.h>
+#include <NewKit/Array.h>
+#include <NewKit/Defines.h>
+#include <NewKit/Ref.h>
 
 #define ZKA_BUS_COUNT	   (256)
 #define ZKA_DEVICE_COUNT   (33)
diff --git a/dev/zka/KernelKit/PCI/PCI.hxx b/dev/zka/KernelKit/PCI/PCI.h
index 2433be43..b445074f 100644
--- a/dev/zka/KernelKit/PCI/PCI.hxx
+++ b/dev/zka/KernelKit/PCI/PCI.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 #define cPCIConfigAddressPort (0xCF8)
 #define cPCIConfigDataPort	  (0xCFC)
diff --git a/dev/zka/KernelKit/PE.hxx b/dev/zka/KernelKit/PE.h
index 54b1b12e..b077f251 100644
--- a/dev/zka/KernelKit/PE.hxx
+++ b/dev/zka/KernelKit/PE.h
@@ -2,7 +2,7 @@
 
 	Copyright ZKA Web Services Co.
 
-	File: PE.hxx
+	File: PE.h
 	Purpose: Portable Executable for Kernel.
 
 	Revision History:
@@ -14,7 +14,7 @@
 #ifndef __KERNELKIT_INC_PE_HXX__
 #define __KERNELKIT_INC_PE_HXX__
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 #define kPeSignature 0x00004550
 
diff --git a/dev/zka/KernelKit/PECodeMgr.hxx b/dev/zka/KernelKit/PECodeMgr.h
index 39551909..14dd8c1a 100644
--- a/dev/zka/KernelKit/PECodeMgr.hxx
+++ b/dev/zka/KernelKit/PECodeMgr.h
@@ -2,7 +2,7 @@
 
 	Copyright ZKA Web Services Co.
 
-	File: PECodeMgr.hxx
+	File: PECodeMgr.h
 	Purpose: PE32+ Code Mgr and DLL mgr.
 
 	Revision History:
@@ -19,6 +19,6 @@
 
 ////////////////////////////////////////////////////
 
-#include <KernelKit/PE.hxx>
-#include <NewKit/ErrorOr.hxx>
-#include <NewKit/String.hxx>
+#include <KernelKit/PE.h>
+#include <NewKit/ErrorOr.h>
+#include <NewKit/String.h>
diff --git a/dev/zka/KernelKit/PEF.hxx b/dev/zka/KernelKit/PEF.h
index 98287693..15f9c5e2 100644
--- a/dev/zka/KernelKit/PEF.hxx
+++ b/dev/zka/KernelKit/PEF.h
@@ -2,7 +2,7 @@
 
 	Copyright ZKA Web Services Co.
 
-	File: PEF.hxx
+	File: PEF.h
 	Purpose: Preferred Executable Format for Kernel.
 
 	Revision History:
@@ -14,9 +14,9 @@
 #ifndef __KERNELKIT_INC_PEF_HXX__
 #define __KERNELKIT_INC_PEF_HXX__
 
-#include <CompilerKit/CompilerKit.hxx>
-#include <KernelKit/LoaderInterface.hxx>
-#include <NewKit/Defines.hxx>
+#include <CompilerKit/CompilerKit.h>
+#include <KernelKit/LoaderInterface.h>
+#include <NewKit/Defines.h>
 
 #define kPefMagic	 "Joy!"
 #define kPefMagicFat "yoJ!"
diff --git a/dev/zka/KernelKit/PEFCodeMgr.hxx b/dev/zka/KernelKit/PEFCodeMgr.h
index 006fa6e6..8ad9eb01 100644
--- a/dev/zka/KernelKit/PEFCodeMgr.hxx
+++ b/dev/zka/KernelKit/PEFCodeMgr.h
@@ -7,10 +7,10 @@
 #ifndef _INC_CODE_MANAGER_PEF_HXX_
 #define _INC_CODE_MANAGER_PEF_HXX_
 
-#include <KernelKit/PEF.hxx>
-#include <NewKit/ErrorOr.hxx>
-#include <NewKit/String.hxx>
-#include <KernelKit/FileMgr.hxx>
+#include <KernelKit/PEF.h>
+#include <NewKit/ErrorOr.h>
+#include <NewKit/String.h>
+#include <KernelKit/FileMgr.h>
 
 #define kPefApplicationMime "application/vnd-zka-executable"
 
diff --git a/dev/zka/KernelKit/Semaphore.hxx b/dev/zka/KernelKit/Semaphore.h
index 535a683b..0ce17e9d 100644
--- a/dev/zka/KernelKit/Semaphore.hxx
+++ b/dev/zka/KernelKit/Semaphore.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
-#include <KernelKit/Timer.hxx>
-#include <CompilerKit/CompilerKit.hxx>
+#include <NewKit/Defines.h>
+#include <KernelKit/Timer.h>
+#include <CompilerKit/CompilerKit.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/KernelKit/ThreadLocalStorage.hxx b/dev/zka/KernelKit/ThreadLocalStorage.h
index 55bb2b5f..1e6df991 100644
--- a/dev/zka/KernelKit/ThreadLocalStorage.hxx
+++ b/dev/zka/KernelKit/ThreadLocalStorage.h
@@ -7,7 +7,7 @@
 #ifndef _KERNELKIT_TLS_HPP
 #define _KERNELKIT_TLS_HPP
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 ///! @brief Thread Local Storage for minoskrnl.
 
diff --git a/dev/zka/KernelKit/ThreadLocalStorage.inl b/dev/zka/KernelKit/ThreadLocalStorage.inl
index 2f0fe553..305d3966 100644
--- a/dev/zka/KernelKit/ThreadLocalStorage.inl
+++ b/dev/zka/KernelKit/ThreadLocalStorage.inl
@@ -8,7 +8,7 @@
 //! @brief Allocate resources from the process's heap storage.
 
 #ifndef INC_PROCESS_SCHEDULER_HXX
-#include <KernelKit/UserProcessScheduler.hxx>
+#include <KernelKit/UserProcessScheduler.h>
 #endif
 
 template <typename T>
diff --git a/dev/zka/KernelKit/Timer.hxx b/dev/zka/KernelKit/Timer.h
index 345f59ca..cd0b6c4c 100644
--- a/dev/zka/KernelKit/Timer.hxx
+++ b/dev/zka/KernelKit/Timer.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <ArchKit/ArchKit.hxx>
-#include <CompilerKit/CompilerKit.hxx>
-#include <KernelKit/LPC.hxx>
+#include <ArchKit/ArchKit.h>
+#include <CompilerKit/CompilerKit.h>
+#include <KernelKit/LPC.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/KernelKit/User.hxx b/dev/zka/KernelKit/User.h
index d082bf93..10697f28 100644
--- a/dev/zka/KernelKit/User.hxx
+++ b/dev/zka/KernelKit/User.h
@@ -7,10 +7,10 @@
 #ifndef INC_USER_HXX
 #define INC_USER_HXX
 
-#include <CompilerKit/CompilerKit.hxx>
-#include <KernelKit/LPC.hxx>
-#include <NewKit/String.hxx>
-#include <NewKit/Defines.hxx>
+#include <CompilerKit/CompilerKit.h>
+#include <KernelKit/LPC.h>
+#include <NewKit/String.h>
+#include <NewKit/Defines.h>
 
 // user mode users.
 #define kSuperUser "ZKA AUTHORITY\\SUPER"
diff --git a/dev/zka/KernelKit/UserProcessScheduler.hxx b/dev/zka/KernelKit/UserProcessScheduler.h
index bc246683..637f41b4 100644
--- a/dev/zka/KernelKit/UserProcessScheduler.hxx
+++ b/dev/zka/KernelKit/UserProcessScheduler.h
@@ -7,10 +7,10 @@
 #ifndef INC_PROCESS_SCHEDULER_HXX
 #define INC_PROCESS_SCHEDULER_HXX
 
-#include <ArchKit/ArchKit.hxx>
-#include <KernelKit/LockDelegate.hxx>
-#include <KernelKit/User.hxx>
-#include <NewKit/MutableArray.hxx>
+#include <ArchKit/ArchKit.h>
+#include <KernelKit/LockDelegate.h>
+#include <KernelKit/User.h>
+#include <NewKit/MutableArray.h>
 
 #define kSchedMinMicroTime		  (AffinityKind::kStandard)
 #define kSchedInvalidPID		  (-1)
@@ -311,7 +311,7 @@ namespace Kernel
 	const UInt32& sched_get_exit_code(void) noexcept;
 } // namespace Kernel
 
-#include <KernelKit/ThreadLocalStorage.hxx>
+#include <KernelKit/ThreadLocalStorage.h>
 
 ////////////////////////////////////////////////////
 
diff --git a/dev/zka/KernelKit/XCOFF.hxx b/dev/zka/KernelKit/XCOFF.h
index 9a09a617..a7cf3aff 100644
--- a/dev/zka/KernelKit/XCOFF.hxx
+++ b/dev/zka/KernelKit/XCOFF.h
@@ -14,7 +14,7 @@
 #ifndef __INC_XCOFF_HXX__
 #define __INC_XCOFF_HXX__
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 #define cXCOFF64Magic (0x01F7)
 
diff --git a/dev/zka/KernelRsrc.rsrc b/dev/zka/KernelRsrc.rsrc
index 8c424ebf..3429a3a2 100644
--- a/dev/zka/KernelRsrc.rsrc
+++ b/dev/zka/KernelRsrc.rsrc
@@ -1,4 +1,4 @@
-#include "CompilerKit/Version.hxx"
+#include "CompilerKit/Version.h"
 
 1 VERSIONINFO
 FILEVERSION     1,0,0,0
diff --git a/dev/zka/NetworkKit/IP.hxx b/dev/zka/NetworkKit/IP.h
index 77848d76..6853ad6a 100644
--- a/dev/zka/NetworkKit/IP.hxx
+++ b/dev/zka/NetworkKit/IP.h
@@ -6,10 +6,10 @@
 
 #pragma once
 
-#include <KernelKit/DebugOutput.hxx>
-#include <NewKit/Defines.hxx>
-#include <NewKit/Ref.hxx>
-#include <NewKit/String.hxx>
+#include <KernelKit/DebugOutput.h>
+#include <NewKit/Defines.h>
+#include <NewKit/Ref.h>
+#include <NewKit/String.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/NetworkKit/IPC.hxx b/dev/zka/NetworkKit/IPC.h
index 11b04990..25ececea 100644
--- a/dev/zka/NetworkKit/IPC.hxx
+++ b/dev/zka/NetworkKit/IPC.h
@@ -2,7 +2,7 @@
 
 	Copyright ZKA Web Services Co..
 
-	File: IPC.hxx.
+	File: IPC.h.
 	Purpose: IPC protocol.
 
 ------------------------------------------- */
@@ -10,12 +10,12 @@
 #ifndef _INC_IPC_ENDPOINT_HXX_
 #define _INC_IPC_ENDPOINT_HXX_
 
-#include <NewKit/Defines.hxx>
-#include <NewKit/String.hxx>
-#include <HintKit/CompilerHint.hxx>
-#include <CompressKit/RLE.hxx>
+#include <NewKit/Defines.h>
+#include <NewKit/String.h>
+#include <HintKit/CompilerHint.h>
+#include <CompressKit/RLE.h>
 
-/// @file IPC.hxx
+/// @file IPC.h
 /// @brief IPC EP protocol.
 
 /// IA separator.
diff --git a/dev/zka/NetworkKit/LTE.hxx b/dev/zka/NetworkKit/LTE.h
index 36f76324..1d356acc 100644
--- a/dev/zka/NetworkKit/LTE.hxx
+++ b/dev/zka/NetworkKit/LTE.h
@@ -2,7 +2,7 @@
 
 	Copyright ZKA Web Services Co..
 
-	File: LTE.hxx.
+	File: LTE.h.
 	Purpose: LTE protocol classes.
 
 ------------------------------------------- */
@@ -10,7 +10,7 @@
 #ifndef _INC_NETWORK_LTE_HXX_
 #define _INC_NETWORK_LTE_HXX_
 
-#include <NewKit/Defines.hxx>
-#include <NewKit/String.hxx>
+#include <NewKit/Defines.h>
+#include <NewKit/String.h>
 
 #endif // ifndef _INC_NETWORK_LTE_HXX_
diff --git a/dev/zka/NetworkKit/MAC.hxx b/dev/zka/NetworkKit/MAC.h
index bd4c0014..8794c068 100644
--- a/dev/zka/NetworkKit/MAC.hxx
+++ b/dev/zka/NetworkKit/MAC.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <NewKit/Array.hxx>
-#include <NewKit/Defines.hxx>
-#include <NewKit/String.hxx>
+#include <NewKit/Array.h>
+#include <NewKit/Defines.h>
+#include <NewKit/String.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/NetworkKit/NetworkDevice.hxx b/dev/zka/NetworkKit/NetworkDevice.h
index 4f05d4b2..2692b14e 100644
--- a/dev/zka/NetworkKit/NetworkDevice.hxx
+++ b/dev/zka/NetworkKit/NetworkDevice.h
@@ -7,8 +7,8 @@
 #ifndef __INC_NETWORK_DEVICE_HPP__
 #define __INC_NETWORK_DEVICE_HPP__
 
-#include <KernelKit/DeviceMgr.hxx>
-#include <NetworkKit/IP.hxx>
+#include <KernelKit/DeviceMgr.h>
+#include <NetworkKit/IP.h>
 
 /// @note Can either work with: Ethernet, GPRS, WiFi
 
diff --git a/dev/zka/NewKit/Array.hxx b/dev/zka/NewKit/Array.h
index 31778e1b..31a6a6d0 100644
--- a/dev/zka/NewKit/Array.hxx
+++ b/dev/zka/NewKit/Array.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <KernelKit/DebugOutput.hxx>
-#include <NewKit/ErrorOr.hxx>
-#include <NewKit/Defines.hxx>
+#include <KernelKit/DebugOutput.h>
+#include <NewKit/ErrorOr.h>
+#include <NewKit/Defines.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/NewKit/ArrayList.hxx b/dev/zka/NewKit/ArrayList.h
index f4402cf3..12949b64 100644
--- a/dev/zka/NewKit/ArrayList.hxx
+++ b/dev/zka/NewKit/ArrayList.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/NewKit/Atom.hxx b/dev/zka/NewKit/Atom.h
index 43948765..955d40fb 100644
--- a/dev/zka/NewKit/Atom.hxx
+++ b/dev/zka/NewKit/Atom.h
@@ -5,7 +5,7 @@
 ------------------------------------------- */
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/NewKit/Crc32.hxx b/dev/zka/NewKit/Crc32.h
index 0b828479..cacb4105 100644
--- a/dev/zka/NewKit/Crc32.hxx
+++ b/dev/zka/NewKit/Crc32.h
@@ -11,7 +11,7 @@
 #ifndef __CRC32_H__
 #define __CRC32_H__
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 #define kCrcCnt (256)
 
diff --git a/dev/zka/NewKit/CxxAbi.hxx b/dev/zka/NewKit/CxxAbi.h
index 3f14d357..36dcf0b3 100644
--- a/dev/zka/NewKit/CxxAbi.hxx
+++ b/dev/zka/NewKit/CxxAbi.h
@@ -5,7 +5,7 @@
 ------------------------------------------- */
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 #ifndef __NDK__
 
diff --git a/dev/zka/NewKit/Defines.hxx b/dev/zka/NewKit/Defines.h
index b9064280..f1a82e99 100644
--- a/dev/zka/NewKit/Defines.hxx
+++ b/dev/zka/NewKit/Defines.h
@@ -6,13 +6,13 @@
 
 #pragma once
 
-#include <NewKit/Macros.hxx>
+#include <NewKit/Macros.h>
 
 #define NEWKIT_VERSION	  "1.01"
 #define NEWKIT_VERSION_CB 0x0101
 
 #if !defined(_INC_NO_STDC_HEADERS) && defined(__GNUC__)
-#include <crt/defines.hxx>
+#include <crt/defines.h>
 #endif
 
 #ifdef __has_feature
diff --git a/dev/zka/NewKit/ErrorOr.hxx b/dev/zka/NewKit/ErrorOr.h
index c1346a08..eae5bcd1 100644
--- a/dev/zka/NewKit/ErrorOr.hxx
+++ b/dev/zka/NewKit/ErrorOr.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
-#include <NewKit/Ref.hxx>
+#include <NewKit/Defines.h>
+#include <NewKit/Ref.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/NewKit/Function.hxx b/dev/zka/NewKit/Function.h
index e54ff456..ae298db5 100644
--- a/dev/zka/NewKit/Function.hxx
+++ b/dev/zka/NewKit/Function.h
@@ -1,7 +1,7 @@
 #ifndef _INC_FUNCTION_HPP__
 #define _INC_FUNCTION_HPP__
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/NewKit/Json.hxx b/dev/zka/NewKit/Json.h
index bdba9391..68210e00 100644
--- a/dev/zka/NewKit/Json.hxx
+++ b/dev/zka/NewKit/Json.h
@@ -9,11 +9,11 @@
 
 // last-rev: 30/01/24
 
-#include <CompilerKit/CompilerKit.hxx>
-#include <NewKit/Defines.hxx>
-#include <NewKit/Stream.hxx>
-#include <NewKit/String.hxx>
-#include <NewKit/Utils.hxx>
+#include <CompilerKit/CompilerKit.h>
+#include <NewKit/Defines.h>
+#include <NewKit/Stream.h>
+#include <NewKit/String.h>
+#include <NewKit/Utils.h>
 
 #define cMaxJsonPath 4096
 #define cJSONLen	 32
diff --git a/dev/zka/NewKit/Macros.hxx b/dev/zka/NewKit/Macros.h
index 2ab04efe..2ab04efe 100644
--- a/dev/zka/NewKit/Macros.hxx
+++ b/dev/zka/NewKit/Macros.h
diff --git a/dev/zka/NewKit/MutableArray.hxx b/dev/zka/NewKit/MutableArray.h
index 1fb8dc55..61b547e2 100644
--- a/dev/zka/NewKit/MutableArray.hxx
+++ b/dev/zka/NewKit/MutableArray.h
@@ -5,9 +5,9 @@
 ------------------------------------------- */
 #pragma once
 
-#include <CompilerKit/CompilerKit.hxx>
-#include <NewKit/Array.hxx>
-#include <NewKit/Defines.hxx>
+#include <CompilerKit/CompilerKit.h>
+#include <NewKit/Array.h>
+#include <NewKit/Defines.h>
 
 #define TRY_FIND_NODE(NAME, NODE)  \
 	auto* NAME = NODE;             \
diff --git a/dev/zka/NewKit/New.hxx b/dev/zka/NewKit/New.h
index e479e85f..33bf3b24 100644
--- a/dev/zka/NewKit/New.hxx
+++ b/dev/zka/NewKit/New.h
@@ -6,7 +6,7 @@
 ------------------------------------------- */
 #pragma once
 
-#include <KernelKit/Heap.hxx>
+#include <KernelKit/Heap.h>
 
 typedef __SIZE_TYPE__ size_t; // gcc will complain about that
 
diff --git a/dev/zka/NewKit/NewKit.h b/dev/zka/NewKit/NewKit.h
new file mode 100644
index 00000000..f5bab516
--- /dev/null
+++ b/dev/zka/NewKit/NewKit.h
@@ -0,0 +1,20 @@
+
+/* -------------------------------------------
+
+	Copyright ZKA Web Services Co.
+
+------------------------------------------- */
+
+#pragma once
+
+#include <NewKit/Array.h>
+#include <NewKit/ArrayList.h>
+#include <NewKit/ErrorOr.h>
+#include <NewKit/Json.h>
+#include <NewKit/Stop.h>
+#include <NewKit/MutableArray.h>
+#include <NewKit/New.h>
+#include <NewKit/OwnPtr.h>
+#include <NewKit/Ref.h>
+#include <NewKit/Stream.h>
+#include <NewKit/Utils.h>
diff --git a/dev/zka/NewKit/NewKit.hxx b/dev/zka/NewKit/NewKit.hxx
deleted file mode 100644
index 6609a9a2..00000000
--- a/dev/zka/NewKit/NewKit.hxx
+++ /dev/null
@@ -1,20 +0,0 @@
-
-/* -------------------------------------------
-
-	Copyright ZKA Web Services Co.
-
-------------------------------------------- */
-
-#pragma once
-
-#include <NewKit/Array.hxx>
-#include <NewKit/ArrayList.hxx>
-#include <NewKit/ErrorOr.hxx>
-#include <NewKit/Json.hxx>
-#include <NewKit/Stop.hxx>
-#include <NewKit/MutableArray.hxx>
-#include <NewKit/New.hxx>
-#include <NewKit/OwnPtr.hxx>
-#include <NewKit/Ref.hxx>
-#include <NewKit/Stream.hxx>
-#include <NewKit/Utils.hxx>
diff --git a/dev/zka/NewKit/OwnPtr.hxx b/dev/zka/NewKit/OwnPtr.h
index b16c3cf5..b8f78ac1 100644
--- a/dev/zka/NewKit/OwnPtr.hxx
+++ b/dev/zka/NewKit/OwnPtr.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
-#include <NewKit/Stop.hxx>
-#include <NewKit/Ref.hxx>
+#include <NewKit/Defines.h>
+#include <NewKit/Stop.h>
+#include <NewKit/Ref.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/NewKit/PageMgr.hxx b/dev/zka/NewKit/PageMgr.h
index fcbd1955..702139f6 100644
--- a/dev/zka/NewKit/PageMgr.hxx
+++ b/dev/zka/NewKit/PageMgr.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
-#include <NewKit/Ref.hxx>
+#include <NewKit/Defines.h>
+#include <NewKit/Ref.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/NewKit/Pair.hxx b/dev/zka/NewKit/Pair.h
index cb0bfbaa..aabc66ff 100644
--- a/dev/zka/NewKit/Pair.hxx
+++ b/dev/zka/NewKit/Pair.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/NewKit/Pmm.hxx b/dev/zka/NewKit/Pmm.h
index f7c4c885..da347b53 100644
--- a/dev/zka/NewKit/Pmm.hxx
+++ b/dev/zka/NewKit/Pmm.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <NewKit/PageMgr.hxx>
-#include <NewKit/Ref.hxx>
+#include <NewKit/PageMgr.h>
+#include <NewKit/Ref.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/NewKit/Ref.hxx b/dev/zka/NewKit/Ref.h
index cf672886..cc6821c0 100644
--- a/dev/zka/NewKit/Ref.hxx
+++ b/dev/zka/NewKit/Ref.h
@@ -8,9 +8,9 @@
 #ifndef _NEWKIT_REF_HPP_
 #define _NEWKIT_REF_HPP_
 
-#include <NewKit/Defines.hxx>
-#include <NewKit/Stop.hxx>
-#include <KernelKit/Heap.hxx>
+#include <NewKit/Defines.h>
+#include <NewKit/Stop.h>
+#include <KernelKit/Heap.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/NewKit/Stop.hxx b/dev/zka/NewKit/Stop.h
index e3188743..4f9e5795 100644
--- a/dev/zka/NewKit/Stop.hxx
+++ b/dev/zka/NewKit/Stop.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/NewKit/Stream.hxx b/dev/zka/NewKit/Stream.h
index eb2f07f5..ad0edf28 100644
--- a/dev/zka/NewKit/Stream.hxx
+++ b/dev/zka/NewKit/Stream.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
-#include <NewKit/Ref.hxx>
+#include <NewKit/Defines.h>
+#include <NewKit/Ref.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/NewKit/String.hxx b/dev/zka/NewKit/String.h
index dc963e9f..8e77b61b 100644
--- a/dev/zka/NewKit/String.hxx
+++ b/dev/zka/NewKit/String.h
@@ -6,11 +6,11 @@
 
 #pragma once
 
-#include <CompilerKit/CompilerKit.hxx>
-#include <NewKit/Defines.hxx>
-#include <NewKit/ErrorOr.hxx>
-#include <NewKit/Utils.hxx>
-#include <NewKit/Stop.hxx>
+#include <CompilerKit/CompilerKit.h>
+#include <NewKit/Defines.h>
+#include <NewKit/ErrorOr.h>
+#include <NewKit/Utils.h>
+#include <NewKit/Stop.h>
 
 #define cMinimumStringSize 8196
 
diff --git a/dev/zka/NewKit/Utils.hxx b/dev/zka/NewKit/Utils.h
index 9f2f93a6..a689cf51 100644
--- a/dev/zka/NewKit/Utils.hxx
+++ b/dev/zka/NewKit/Utils.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/Defines.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/NewKit/Variant.hxx b/dev/zka/NewKit/Variant.h
index 7d178b4c..92eee500 100644
--- a/dev/zka/NewKit/Variant.hxx
+++ b/dev/zka/NewKit/Variant.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <NewKit/Defines.hxx>
-#include <NewKit/String.hxx>
-#include <NewKit/Json.hxx>
+#include <NewKit/Defines.h>
+#include <NewKit/String.h>
+#include <NewKit/Json.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/StorageKit/AHCI.hxx b/dev/zka/StorageKit/AHCI.h
index 67948033..e89f5654 100644
--- a/dev/zka/StorageKit/AHCI.hxx
+++ b/dev/zka/StorageKit/AHCI.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <KernelKit/DeviceMgr.hxx>
-#include <KernelKit/DriveMgr.hxx>
-#include <NewKit/OwnPtr.hxx>
+#include <KernelKit/DeviceMgr.h>
+#include <KernelKit/DriveMgr.h>
+#include <NewKit/OwnPtr.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/StorageKit/ATA.hxx b/dev/zka/StorageKit/ATA.h
index 11a0d546..d4efd15c 100644
--- a/dev/zka/StorageKit/ATA.hxx
+++ b/dev/zka/StorageKit/ATA.h
@@ -6,10 +6,10 @@
 
 #pragma once
 
-#include <KernelKit/DeviceMgr.hxx>
-#include <KernelKit/DriveMgr.hxx>
-#include <NewKit/OwnPtr.hxx>
-#include <NewKit/Utils.hxx>
+#include <KernelKit/DeviceMgr.h>
+#include <KernelKit/DriveMgr.h>
+#include <NewKit/OwnPtr.h>
+#include <NewKit/Utils.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/StorageKit/NVME.hxx b/dev/zka/StorageKit/NVME.h
index e909b783..04b3df7f 100644
--- a/dev/zka/StorageKit/NVME.hxx
+++ b/dev/zka/StorageKit/NVME.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <KernelKit/DeviceMgr.hxx>
-#include <KernelKit/DriveMgr.hxx>
-#include <NewKit/OwnPtr.hxx>
+#include <KernelKit/DeviceMgr.h>
+#include <KernelKit/DriveMgr.h>
+#include <NewKit/OwnPtr.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/StorageKit/PRDT.hxx b/dev/zka/StorageKit/PRDT.h
index df9f3cc1..993782bf 100644
--- a/dev/zka/StorageKit/PRDT.hxx
+++ b/dev/zka/StorageKit/PRDT.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <KernelKit/PCI/DMA.hxx>
-#include <KernelKit/PCI/Iterator.hxx>
-#include <NewKit/Ref.hxx>
+#include <KernelKit/PCI/DMA.h>
+#include <KernelKit/PCI/Iterator.h>
+#include <NewKit/Ref.h>
 
 #define kPrdtTransferSize (sizeof(Kernel::UShort))
 
diff --git a/dev/zka/StorageKit/SCSI.hxx b/dev/zka/StorageKit/SCSI.h
index 1d8470ec..7c2f7c48 100644
--- a/dev/zka/StorageKit/SCSI.hxx
+++ b/dev/zka/StorageKit/SCSI.h
@@ -6,6 +6,6 @@
 
 #pragma once
 
-#include <modules/SCSI/SCSI.hxx>
+#include <modules/SCSI/SCSI.h>
 
 extern const scsi_packet_type<12> kCDRomPacketTemplate;
diff --git a/dev/zka/StorageKit/Storage.hxx b/dev/zka/StorageKit/Storage.h
index 5d388c7e..5d388c7e 100644
--- a/dev/zka/StorageKit/Storage.hxx
+++ b/dev/zka/StorageKit/Storage.h
diff --git a/dev/zka/amd64-efi.make b/dev/zka/amd64-efi.make
index 18c493fc..8d9d1311 100644
--- a/dev/zka/amd64-efi.make
+++ b/dev/zka/amd64-efi.make
@@ -52,10 +52,10 @@ WINDRES=x86_64-w64-mingw32-windres
 .PHONY: newos-amd64-epm
 newos-amd64-epm: clean
 	$(WINDRES) KernelRsrc.rsrc -O coff -o KernelRsrc.obj
-	$(CC) $(CCFLAGS) $(DISK_DRV) $(DEBUG_MACRO) $(wildcard src/*.cxx) \
-	       $(wildcard src/FS/*.cxx) $(wildcard HALKit/AMD64/Storage/*.cxx) \
-			$(wildcard HALKit/AMD64/PCI/*.cxx) $(wildcard src/Network/*.cxx) $(wildcard src/Storage/*.cxx) \
-			$(wildcard HALKit/AMD64/*.cxx) $(wildcard HALKit/AMD64/*.cpp) \
+	$(CC) $(CCFLAGS) $(DISK_DRV) $(DEBUG_MACRO) $(wildcard src/*.cc) \
+	       $(wildcard src/FS/*.cc) $(wildcard HALKit/AMD64/Storage/*.cc) \
+			$(wildcard HALKit/AMD64/PCI/*.cc) $(wildcard src/Network/*.cc) $(wildcard src/Storage/*.cc) \
+			$(wildcard HALKit/AMD64/*.cc) $(wildcard HALKit/AMD64/*.cpp) \
 			$(wildcard HALKit/AMD64/*.s)
 	$(ASM) $(ASMFLAGS) HALKit/AMD64/HalInterruptAPI.asm
 	$(ASM) $(ASMFLAGS) HALKit/AMD64/HalMPContextSwitch.asm
diff --git a/dev/zka/arm64-efi.make b/dev/zka/arm64-efi.make
index b164341d..1ddd2f8b 100644
--- a/dev/zka/arm64-efi.make
+++ b/dev/zka/arm64-efi.make
@@ -34,11 +34,11 @@ MOVEALL=./MoveAll.ARM64.sh
 
 .PHONY: newos-arm64-epm
 newos-arm64-epm: clean
-	$(CC) $(CCFLAGS) $(DISKDRIVER) $(DEBUG) $(wildcard src/*.cxx) \
-	       $(wildcard src/FS/*.cxx) $(wildcard HALKit/ARM64/Storage/*.cxx) \
-			$(wildcard HALKit/ARM64/PCI/*.cxx) $(wildcard src/Network/*.cxx) $(wildcard src/Storage/*.cxx) \
-			$(wildcard HALKit/ARM64/*.cxx) $(wildcard HALKit/ARM64/*.cpp) \
-			$(wildcard HALKit/ARM64/*.s) $(wildcard HALKit/ARM64/APM/*.cxx)
+	$(CC) $(CCFLAGS) $(DISKDRIVER) $(DEBUG) $(wildcard src/*.cc) \
+	       $(wildcard src/FS/*.cc) $(wildcard HALKit/ARM64/Storage/*.cc) \
+			$(wildcard HALKit/ARM64/PCI/*.cc) $(wildcard src/Network/*.cc) $(wildcard src/Storage/*.cc) \
+			$(wildcard HALKit/ARM64/*.cc) $(wildcard HALKit/ARM64/*.cpp) \
+			$(wildcard HALKit/ARM64/*.s) $(wildcard HALKit/ARM64/APM/*.cc)
 
 	$(MOVEALL)
 
diff --git a/dev/zka/src/ACPIFactoryInterface.cxx b/dev/zka/src/ACPIFactoryInterface.cc
index 4a04d7b9..c7d2914f 100644
--- a/dev/zka/src/ACPIFactoryInterface.cxx
+++ b/dev/zka/src/ACPIFactoryInterface.cc
@@ -4,10 +4,10 @@
 
 ------------------------------------------- */
 
-#include <modules/ACPI/ACPIFactoryInterface.hxx>
-#include <NewKit/String.hxx>
-#include <ArchKit/ArchKit.hxx>
-#include <KernelKit/Heap.hxx>
+#include <modules/ACPI/ACPIFactoryInterface.h>
+#include <NewKit/String.h>
+#include <ArchKit/ArchKit.h>
+#include <KernelKit/Heap.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/src/Ref.cxx b/dev/zka/src/Array.cc
index bdb60236..0bf62d59 100644
--- a/dev/zka/src/Ref.cxx
+++ b/dev/zka/src/Array.cc
@@ -4,4 +4,4 @@
 
 ------------------------------------------- */
 
-#include <NewKit/Ref.hxx>
+#include <NewKit/Array.h>
diff --git a/dev/zka/src/ArrayList.cc b/dev/zka/src/ArrayList.cc
new file mode 100644
index 00000000..6de794be
--- /dev/null
+++ b/dev/zka/src/ArrayList.cc
@@ -0,0 +1,7 @@
+/* -------------------------------------------
+
+	Copyright ZKA Web Services Co.
+
+------------------------------------------- */
+
+#include <NewKit/ArrayList.h>
diff --git a/dev/zka/src/ArrayList.cxx b/dev/zka/src/ArrayList.cxx
deleted file mode 100644
index 27fae68c..00000000
--- a/dev/zka/src/ArrayList.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-/* -------------------------------------------
-
-	Copyright ZKA Web Services Co.
-
-------------------------------------------- */
-
-#include <NewKit/ArrayList.hxx>
diff --git a/dev/zka/src/Atom.cxx b/dev/zka/src/Atom.cc
index bfacfe83..20114b7c 100644
--- a/dev/zka/src/Atom.cxx
+++ b/dev/zka/src/Atom.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <NewKit/Atom.hxx>
+#include <NewKit/Atom.h>
 
 // @file Atom.cpp
 // @brief Atomic primitives
diff --git a/dev/zka/src/BitMapMgr.cxx b/dev/zka/src/BitMapMgr.cc
index 1f4b4860..e97c9bfa 100644
--- a/dev/zka/src/BitMapMgr.cxx
+++ b/dev/zka/src/BitMapMgr.cc
@@ -4,18 +4,18 @@
 
 ------------------------------------------- */
 
-#include <ArchKit/ArchKit.hxx>
+#include <ArchKit/ArchKit.h>
 
 #define kBitMapMagic (0x10210)
 
 #ifdef __ZKA_AMD64__
-#include <HALKit/AMD64/Paging.hxx>
+#include <HALKit/AMD64/Paging.h>
 #elif defined(__ZKA_ARM64__)
-#include <HALKit/ARM64/Paging.hxx>
+#include <HALKit/ARM64/Paging.h>
 #endif
 
-#include <NewKit/Defines.hxx>
-#include <NewKit/Stop.hxx>
+#include <NewKit/Defines.h>
+#include <NewKit/Stop.h>
 
 #define cBitMapMagIdx  (0)
 #define cBitMapSizeIdx (1)
diff --git a/dev/zka/src/CRuntime.cxx b/dev/zka/src/CRuntime.cc
index 75646bbe..4a1de1d7 100644
--- a/dev/zka/src/CRuntime.cxx
+++ b/dev/zka/src/CRuntime.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/DebugOutput.hxx>
+#include <KernelKit/DebugOutput.h>
 
 using namespace Kernel;
 
diff --git a/dev/zka/src/CodeMgr.cxx b/dev/zka/src/CodeMgr.cc
index 2e0308f3..130f8cfe 100644
--- a/dev/zka/src/CodeMgr.cxx
+++ b/dev/zka/src/CodeMgr.cc
@@ -4,9 +4,9 @@
 
 ------------------------------------------- */
 
-#include <NewKit/Utils.hxx>
-#include <KernelKit/CodeMgr.hxx>
-#include <KernelKit/UserProcessScheduler.hxx>
+#include <NewKit/Utils.h>
+#include <KernelKit/CodeMgr.h>
+#include <KernelKit/UserProcessScheduler.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/src/Crc32.cxx b/dev/zka/src/Crc32.cc
index 4faa78f9..bcf04c03 100644
--- a/dev/zka/src/Crc32.cxx
+++ b/dev/zka/src/Crc32.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <NewKit/Crc32.hxx>
+#include <NewKit/Crc32.h>
 
 // @file CRC32.cpp
 // @brief Check sequence implementation.
diff --git a/dev/zka/src/CxxAbi-AMD64.cxx b/dev/zka/src/CxxAbi-AMD64.cc
index 32e3ff37..9d439d6b 100644
--- a/dev/zka/src/CxxAbi-AMD64.cxx
+++ b/dev/zka/src/CxxAbi-AMD64.cc
@@ -6,9 +6,9 @@
 
 #ifdef __ZKA_AMD64__
 
-#include <KernelKit/DebugOutput.hxx>
-#include <NewKit/CxxAbi.hxx>
-#include <KernelKit/LPC.hxx>
+#include <KernelKit/DebugOutput.h>
+#include <NewKit/CxxAbi.h>
+#include <KernelKit/LPC.h>
 
 atexit_func_entry_t __atexit_funcs[kDSOMaxObjects];
 
diff --git a/dev/zka/src/CxxAbi-ARM64.cxx b/dev/zka/src/CxxAbi-ARM64.cc
index 759c2a7f..f603f863 100644
--- a/dev/zka/src/CxxAbi-ARM64.cxx
+++ b/dev/zka/src/CxxAbi-ARM64.cc
@@ -6,9 +6,9 @@
 
 #ifdef __ZKA_ARM64__
 
-#include <KernelKit/DebugOutput.hxx>
-#include <NewKit/CxxAbi.hxx>
-#include <KernelKit/LPC.hxx>
+#include <KernelKit/DebugOutput.h>
+#include <NewKit/CxxAbi.h>
+#include <KernelKit/LPC.h>
 
 atexit_func_entry_t __atexit_funcs[kDSOMaxObjects];
 
diff --git a/dev/zka/src/Array.cxx b/dev/zka/src/Defines.cc
index 437cb11b..d5ce58ce 100644
--- a/dev/zka/src/Array.cxx
+++ b/dev/zka/src/Defines.cc
@@ -4,4 +4,4 @@
 
 ------------------------------------------- */
 
-#include <NewKit/Array.hxx>
+#include <NewKit/Defines.h>
diff --git a/dev/zka/HALKit/AMD64/PCI/PCI.cxx b/dev/zka/src/DeviceMgr.cc
index 02ba1e73..78058a17 100644
--- a/dev/zka/HALKit/AMD64/PCI/PCI.cxx
+++ b/dev/zka/src/DeviceMgr.cc
@@ -4,4 +4,4 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/PCI/PCI.hxx>
+#include <KernelKit/DeviceMgr.h>
diff --git a/dev/zka/src/DeviceMgr.cxx b/dev/zka/src/DeviceMgr.cxx
deleted file mode 100644
index 1bd775ab..00000000
--- a/dev/zka/src/DeviceMgr.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-/* -------------------------------------------
-
-	Copyright ZKA Web Services Co.
-
-------------------------------------------- */
-
-#include <KernelKit/DeviceMgr.hxx>
diff --git a/dev/zka/src/DriveMgr.cxx b/dev/zka/src/DriveMgr.cc
index 4164674b..9f5201d9 100644
--- a/dev/zka/src/DriveMgr.cxx
+++ b/dev/zka/src/DriveMgr.cc
@@ -4,13 +4,13 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/DebugOutput.hxx>
-#include <KernelKit/DriveMgr.hxx>
-#include <NewKit/Utils.hxx>
+#include <KernelKit/DebugOutput.h>
+#include <KernelKit/DriveMgr.h>
+#include <NewKit/Utils.h>
 
-#include <modules/ATA/ATA.hxx>
-#include <modules/AHCI/AHCI.hxx>
-#include <modules/NVME/NVME.hxx>
+#include <modules/ATA/ATA.h>
+#include <modules/AHCI/AHCI.h>
+#include <modules/NVME/NVME.h>
 
 /***********************************************************************************/
 /// @file DriveMgr.cxx
diff --git a/dev/zka/src/ErrorOr.cxx b/dev/zka/src/ErrorOr.cc
index 53d60a3d..9c10745e 100644
--- a/dev/zka/src/ErrorOr.cxx
+++ b/dev/zka/src/ErrorOr.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <NewKit/ErrorOr.hxx>
+#include <NewKit/ErrorOr.h>
 
 /***********************************************************************************/
 /// @file ErrorOr.cxx                                                            ///
diff --git a/dev/zka/src/FS/HPFS.cxx b/dev/zka/src/FS/HPFS.cc
index 56760972..0fb80079 100644
--- a/dev/zka/src/FS/HPFS.cxx
+++ b/dev/zka/src/FS/HPFS.cc
@@ -6,7 +6,7 @@
 
 #ifdef __FSKIT_INCLUDES_HPFS__
 
-#include <FirmwareKit/GPT.hxx>
-#include <FirmwareKit/EPM.hxx>
+#include <FirmwareKit/GPT.h>
+#include <FirmwareKit/EPM.h>
 
 #endif // ifdef __FSKIT_INCLUDES_HPFS__
diff --git a/dev/zka/src/FS/NeFS.cxx b/dev/zka/src/FS/NeFS.cc
index 48bd441f..6fcbb786 100644
--- a/dev/zka/src/FS/NeFS.cxx
+++ b/dev/zka/src/FS/NeFS.cc
@@ -6,18 +6,18 @@
 
 #ifdef __FSKIT_USE_NEFS__
 
-#include <modules/AHCI/AHCI.hxx>
-#include <modules/ATA/ATA.hxx>
-#include <modules/Flash/Flash.hxx>
-#include <FSKit/NeFS.hxx>
-#include <KernelKit/LPC.hxx>
-#include <NewKit/Crc32.hxx>
-#include <NewKit/Stop.hxx>
-#include <NewKit/String.hxx>
-#include <NewKit/Utils.hxx>
-#include <FirmwareKit/EPM.hxx>
-#include <KernelKit/UserProcessScheduler.hxx>
-#include <KernelKit/User.hxx>
+#include <modules/AHCI/AHCI.h>
+#include <modules/ATA/ATA.h>
+#include <modules/Flash/Flash.h>
+#include <FSKit/NeFS.h>
+#include <KernelKit/LPC.h>
+#include <NewKit/Crc32.h>
+#include <NewKit/Stop.h>
+#include <NewKit/String.h>
+#include <NewKit/Utils.h>
+#include <FirmwareKit/EPM.h>
+#include <KernelKit/UserProcessScheduler.h>
+#include <KernelKit/User.h>
 
 #ifndef __ZKA_MINIMAL_OS__
 using namespace Kernel;
diff --git a/dev/zka/src/FileMgr.cxx b/dev/zka/src/FileMgr.cc
index fc51683f..c9591bf0 100644
--- a/dev/zka/src/FileMgr.cxx
+++ b/dev/zka/src/FileMgr.cc
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/FileMgr.hxx>
-#include <NewKit/Utils.hxx>
+#include <KernelKit/FileMgr.h>
+#include <NewKit/Utils.h>
 
 /// BUGS: 0
 //! @brief File System Manager API.
diff --git a/dev/zka/src/GUIDWizard.cxx b/dev/zka/src/GUIDWizard.cc
index a9094215..77635979 100644
--- a/dev/zka/src/GUIDWizard.cxx
+++ b/dev/zka/src/GUIDWizard.cc
@@ -9,8 +9,8 @@
 
 ------------------------------------------- */
 
-#include <CFKit/GUIDWizard.hxx>
-#include <NewKit/Ref.hxx>
+#include <CFKit/GUIDWizard.h>
+#include <NewKit/Ref.h>
 
 // begin of ascii 'readable' characters. (A, C, C, 1, 2)
 #define kAsciiBegin 47
diff --git a/dev/zka/src/GUIDWrapper.cxx b/dev/zka/src/GUIDWrapper.cc
index 1c0eb5ef..53d983a1 100644
--- a/dev/zka/src/GUIDWrapper.cxx
+++ b/dev/zka/src/GUIDWrapper.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <CFKit/GUIDWrapper.hxx>
+#include <CFKit/GUIDWrapper.h>
 
 namespace Kernel::XRN
 {
diff --git a/dev/zka/src/HardwareThreadScheduler.cxx b/dev/zka/src/HardwareThreadScheduler.cc
index 50a153f1..37d81f04 100644
--- a/dev/zka/src/HardwareThreadScheduler.cxx
+++ b/dev/zka/src/HardwareThreadScheduler.cc
@@ -4,10 +4,10 @@
 
 ------------------------------------------- */
 
-#include <ArchKit/ArchKit.hxx>
-#include <KernelKit/UserProcessScheduler.hxx>
-#include <KernelKit/HardwareThreadScheduler.hxx>
-#include <CFKit/Property.hxx>
+#include <ArchKit/ArchKit.h>
+#include <KernelKit/UserProcessScheduler.h>
+#include <KernelKit/HardwareThreadScheduler.h>
+#include <CFKit/Property.h>
 
 ///! BUGS: 0
 
diff --git a/dev/zka/src/Heap.cxx b/dev/zka/src/Heap.cc
index 63e9286a..45b7aa73 100644
--- a/dev/zka/src/Heap.cxx
+++ b/dev/zka/src/Heap.cc
@@ -4,18 +4,18 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/DebugOutput.hxx>
-#include <KernelKit/LPC.hxx>
-#include <KernelKit/Heap.hxx>
-#include <NewKit/Crc32.hxx>
-#include <NewKit/PageMgr.hxx>
-#include <NewKit/Utils.hxx>
+#include <KernelKit/DebugOutput.h>
+#include <KernelKit/LPC.h>
+#include <KernelKit/Heap.h>
+#include <NewKit/Crc32.h>
+#include <NewKit/PageMgr.h>
+#include <NewKit/Utils.h>
 
 /* -------------------------------------------
 
  Revision History:
 	10/8/24: FIX: Fix useless long name, alongside a new WR (WriteRead) field.
-	20/10/24: Fix mm_new_ and mm_delete_ APIs inside Heap.hxx header. (amlal)
+	20/10/24: Fix mm_new_ and mm_delete_ APIs inside Heap.h header. (amlal)
 
  ------------------------------------------- */
 
diff --git a/dev/zka/src/IDLLObject.cxx b/dev/zka/src/IDLLObject.cc
index a9ab9542..4e5f7aa2 100644
--- a/dev/zka/src/IDLLObject.cxx
+++ b/dev/zka/src/IDLLObject.cc
@@ -7,9 +7,9 @@
  *  ========================================================
  */
 
-#include <KernelKit/IDLLObject.hxx>
-#include <KernelKit/DebugOutput.hxx>
+#include <KernelKit/IDLLObject.h>
+#include <KernelKit/DebugOutput.h>
 
-#include <KernelKit/UserProcessScheduler.hxx>
+#include <KernelKit/UserProcessScheduler.h>
 
 using namespace Kernel;
diff --git a/dev/zka/src/IPEFDLLObject.cxx b/dev/zka/src/IPEFDLLObject.cc
index e2e85dcc..d7fe2948 100644
--- a/dev/zka/src/IPEFDLLObject.cxx
+++ b/dev/zka/src/IPEFDLLObject.cc
@@ -7,12 +7,12 @@
  *  ========================================================
  */
 
-#include <KernelKit/DebugOutput.hxx>
-#include <KernelKit/PEF.hxx>
-#include <KernelKit/IPEFDLLObject.hxx>
-#include <KernelKit/UserProcessScheduler.hxx>
-#include <KernelKit/ThreadLocalStorage.hxx>
-#include <NewKit/Defines.hxx>
+#include <KernelKit/DebugOutput.h>
+#include <KernelKit/PEF.h>
+#include <KernelKit/IPEFDLLObject.h>
+#include <KernelKit/UserProcessScheduler.h>
+#include <KernelKit/ThreadLocalStorage.h>
+#include <NewKit/Defines.h>
 
 /* -------------------------------------------
 
diff --git a/dev/zka/src/IndexableProperty.cxx b/dev/zka/src/IndexableProperty.cc
index 7595291c..05438467 100644
--- a/dev/zka/src/IndexableProperty.cxx
+++ b/dev/zka/src/IndexableProperty.cc
@@ -4,10 +4,10 @@
 
 ------------------------------------------- */
 
-#include <CompilerKit/CompilerKit.hxx>
-#include <FSKit/IndexableProperty.hxx>
-#include <NewKit/MutableArray.hxx>
-#include <NewKit/Utils.hxx>
+#include <CompilerKit/CompilerKit.h>
+#include <FSKit/IndexableProperty.h>
+#include <NewKit/MutableArray.h>
+#include <NewKit/Utils.h>
 
 /// @brief File indexer API for fast path access.
 /// BUGS: 0
diff --git a/dev/zka/src/Json.cxx b/dev/zka/src/Json.cc
index acf46f8a..4c3f07dc 100644
--- a/dev/zka/src/Json.cxx
+++ b/dev/zka/src/Json.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <NewKit/Json.hxx>
+#include <NewKit/Json.h>
 
 using namespace Kernel;
 
diff --git a/dev/zka/src/LPC.cxx b/dev/zka/src/LPC.cc
index 5cf64e26..a39b0857 100644
--- a/dev/zka/src/LPC.cxx
+++ b/dev/zka/src/LPC.cc
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/LPC.hxx>
-#include <NewKit/Stop.hxx>
+#include <KernelKit/LPC.h>
+#include <NewKit/Stop.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/src/LockDelegate.cxx b/dev/zka/src/LockDelegate.cc
index d101615c..cc2a36b8 100644
--- a/dev/zka/src/LockDelegate.cxx
+++ b/dev/zka/src/LockDelegate.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/LockDelegate.hxx>
+#include <KernelKit/LockDelegate.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/HALKit/AMD64/PCI/IO.cxx b/dev/zka/src/MutableArray.cc
index 43970e2a..de0523e1 100644
--- a/dev/zka/HALKit/AMD64/PCI/IO.cxx
+++ b/dev/zka/src/MutableArray.cc
@@ -4,4 +4,4 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/PCI/IO.hxx>
+#include <NewKit/MutableArray.h>
diff --git a/dev/zka/src/MutableArray.cxx b/dev/zka/src/MutableArray.cxx
deleted file mode 100644
index 48b9c787..00000000
--- a/dev/zka/src/MutableArray.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-/* -------------------------------------------
-
-	Copyright ZKA Web Services Co.
-
-------------------------------------------- */
-
-#include <NewKit/MutableArray.hxx>
diff --git a/dev/zka/src/NeFS+FileMgr.cxx b/dev/zka/src/NeFS+FileMgr.cc
index da5a1285..3cc5400b 100644
--- a/dev/zka/src/NeFS+FileMgr.cxx
+++ b/dev/zka/src/NeFS+FileMgr.cc
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/FileMgr.hxx>
-#include <KernelKit/Heap.hxx>
+#include <KernelKit/FileMgr.h>
+#include <KernelKit/Heap.h>
 
 #ifndef __ZKA_MINIMAL_OS__
 #ifdef __FSKIT_USE_NEFS__
diff --git a/dev/zka/src/NeFS+IO.cxx b/dev/zka/src/NeFS+IO.cc
index c95d48ce..010ec3f2 100644
--- a/dev/zka/src/NeFS+IO.cxx
+++ b/dev/zka/src/NeFS+IO.cc
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/DriveMgr.hxx>
-#include <KernelKit/FileMgr.hxx>
+#include <KernelKit/DriveMgr.h>
+#include <KernelKit/FileMgr.h>
 
 /*************************************************************
  *
@@ -19,7 +19,7 @@
 
 #ifdef __FSKIT_USE_NEFS__
 
-#include <FirmwareKit/EPM.hxx>
+#include <FirmwareKit/EPM.h>
 
 /// Useful macros.
 
diff --git a/dev/zka/src/Network/IP.cxx b/dev/zka/src/Network/IP.cc
index d7676592..b78009dc 100644
--- a/dev/zka/src/Network/IP.cxx
+++ b/dev/zka/src/Network/IP.cc
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <NetworkKit/IP.hxx>
-#include <NewKit/Utils.hxx>
+#include <NetworkKit/IP.h>
+#include <NewKit/Utils.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/src/Network/IPC.cxx b/dev/zka/src/Network/IPC.cc
index feb7822f..3f69bc3c 100644
--- a/dev/zka/src/Network/IPC.cxx
+++ b/dev/zka/src/Network/IPC.cc
@@ -4,9 +4,9 @@
 
 ------------------------------------------- */
 
-#include <NetworkKit/IPC.hxx>
-#include <KernelKit/LPC.hxx>
-#include <KernelKit/UserProcessScheduler.hxx>
+#include <NetworkKit/IPC.h>
+#include <KernelKit/LPC.h>
+#include <KernelKit/UserProcessScheduler.h>
 
 using namespace Kernel;
 
diff --git a/dev/zka/src/Network/NetworkDevice.cxx b/dev/zka/src/Network/NetworkDevice.cc
index 8f968612..b2fba74d 100644
--- a/dev/zka/src/Network/NetworkDevice.cxx
+++ b/dev/zka/src/Network/NetworkDevice.cc
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <NetworkKit/NetworkDevice.hxx>
-#include <NewKit/Utils.hxx>
+#include <NetworkKit/NetworkDevice.h>
+#include <NewKit/Utils.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/src/New+Delete.cxx b/dev/zka/src/New+Delete.cc
index f63b79ed..89696ed8 100644
--- a/dev/zka/src/New+Delete.cxx
+++ b/dev/zka/src/New+Delete.cc
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/Heap.hxx>
-#include <NewKit/New.hxx>
+#include <KernelKit/Heap.h>
+#include <NewKit/New.h>
 
 void* operator new[](size_t sz)
 {
diff --git a/dev/zka/src/OwnPtr.cxx b/dev/zka/src/OwnPtr.cc
index 128f1b45..67a4235b 100644
--- a/dev/zka/src/OwnPtr.cxx
+++ b/dev/zka/src/OwnPtr.cc
@@ -4,4 +4,4 @@
 
 ------------------------------------------- */
 
-#include <NewKit/OwnPtr.hxx>
+#include <NewKit/OwnPtr.h>
diff --git a/dev/zka/src/PEFCodeMgr.cxx b/dev/zka/src/PEFCodeMgr.cc
index edea684e..593910be 100644
--- a/dev/zka/src/PEFCodeMgr.cxx
+++ b/dev/zka/src/PEFCodeMgr.cc
@@ -4,14 +4,14 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/DebugOutput.hxx>
-#include <KernelKit/Heap.hxx>
-#include <KernelKit/PEFCodeMgr.hxx>
-#include <KernelKit/UserProcessScheduler.hxx>
-#include <NewKit/Defines.hxx>
-#include <NewKit/Stop.hxx>
-#include <NewKit/OwnPtr.hxx>
-#include <NewKit/String.hxx>
+#include <KernelKit/DebugOutput.h>
+#include <KernelKit/Heap.h>
+#include <KernelKit/PEFCodeMgr.h>
+#include <KernelKit/UserProcessScheduler.h>
+#include <NewKit/Defines.h>
+#include <NewKit/Stop.h>
+#include <NewKit/OwnPtr.h>
+#include <NewKit/String.h>
 
 /// @brief PEF stack size symbol.
 #define cPefStackSizeSymbol "SizeOfReserveStack"
diff --git a/dev/zka/src/PRDT.cxx b/dev/zka/src/PRDT.cc
index c12a4159..741e932b 100644
--- a/dev/zka/src/PRDT.cxx
+++ b/dev/zka/src/PRDT.cc
@@ -4,9 +4,9 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/DebugOutput.hxx>
-#include <NewKit/String.hxx>
-#include <StorageKit/PRDT.hxx>
+#include <KernelKit/DebugOutput.h>
+#include <NewKit/String.h>
+#include <StorageKit/PRDT.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/src/PageMgr.cxx b/dev/zka/src/PageMgr.cc
index 6d9f4cc6..18b65dc6 100644
--- a/dev/zka/src/PageMgr.cxx
+++ b/dev/zka/src/PageMgr.cc
@@ -4,13 +4,13 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/DebugOutput.hxx>
-#include <NewKit/PageMgr.hxx>
+#include <KernelKit/DebugOutput.h>
+#include <NewKit/PageMgr.h>
 
 #ifdef __ZKA_AMD64__
-#include <HALKit/AMD64/Paging.hxx>
+#include <HALKit/AMD64/Paging.h>
 #elif defined(__ZKA_ARM64__)
-#include <HALKit/ARM64/Paging.hxx>
+#include <HALKit/ARM64/Paging.h>
 #endif // ifdef __ZKA_AMD64__ || defined(__ZKA_ARM64__)
 
 namespace Kernel
diff --git a/dev/zka/src/Pmm.cxx b/dev/zka/src/Pmm.cc
index cf39714f..4af7d909 100644
--- a/dev/zka/src/Pmm.cxx
+++ b/dev/zka/src/Pmm.cc
@@ -4,15 +4,15 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/DebugOutput.hxx>
-#include <NewKit/Pmm.hxx>
+#include <KernelKit/DebugOutput.h>
+#include <NewKit/Pmm.h>
 
 #if defined(__ZKA_ARM64__)
-#include <HALKit/ARM64/Processor.hxx>
+#include <HALKit/ARM64/Processor.h>
 #endif // defined(__ZKA_ARM64__)
 
 #if defined(__ZKA_AMD64__)
-#include <HALKit/AMD64/Processor.hxx>
+#include <HALKit/AMD64/Processor.h>
 #endif // defined(__ZKA_AMD64__)
 
 namespace Kernel
diff --git a/dev/zka/src/Property.cxx b/dev/zka/src/Property.cc
index 7cc78966..084616a4 100644
--- a/dev/zka/src/Property.cxx
+++ b/dev/zka/src/Property.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <CFKit/Property.hxx>
+#include <CFKit/Property.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/src/Ref.cc b/dev/zka/src/Ref.cc
new file mode 100644
index 00000000..2ac42395
--- /dev/null
+++ b/dev/zka/src/Ref.cc
@@ -0,0 +1,7 @@
+/* -------------------------------------------
+
+	Copyright ZKA Web Services Co.
+
+------------------------------------------- */
+
+#include <NewKit/Ref.h>
diff --git a/dev/zka/src/Semaphore.cxx b/dev/zka/src/Semaphore.cc
index 5a598001..08f33cf1 100644
--- a/dev/zka/src/Semaphore.cxx
+++ b/dev/zka/src/Semaphore.cc
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/UserProcessScheduler.hxx>
-#include <KernelKit/Semaphore.hxx>
+#include <KernelKit/UserProcessScheduler.h>
+#include <KernelKit/Semaphore.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/src/Stop.cxx b/dev/zka/src/Stop.cc
index 39e57070..3ec67249 100644
--- a/dev/zka/src/Stop.cxx
+++ b/dev/zka/src/Stop.cc
@@ -4,16 +4,16 @@
 
 ------------------------------------------- */
 
-#include <NewKit/Stop.hxx>
-
-#include <ArchKit/ArchKit.hxx>
-#include <KernelKit/Timer.hxx>
-#include <KernelKit/DebugOutput.hxx>
-#include <NewKit/String.hxx>
-#include <FirmwareKit/Handover.hxx>
-#include <KernelKit/FileMgr.hxx>
-#include <modules/FB/FB.hxx>
-#include <modules/FB/Text.hxx>
+#include <NewKit/Stop.h>
+
+#include <ArchKit/ArchKit.h>
+#include <KernelKit/Timer.h>
+#include <KernelKit/DebugOutput.h>
+#include <NewKit/String.h>
+#include <FirmwareKit/Handover.h>
+#include <KernelKit/FileMgr.h>
+#include <modules/FB/FB.h>
+#include <modules/FB/Text.h>
 
 #define cWebsiteMacro "https://help.zws.com/"
 
diff --git a/dev/zka/src/Storage/AHCIDeviceInterface.cxx b/dev/zka/src/Storage/AHCIDeviceInterface.cc
index 9165ea32..a790236d 100644
--- a/dev/zka/src/Storage/AHCIDeviceInterface.cxx
+++ b/dev/zka/src/Storage/AHCIDeviceInterface.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <StorageKit/AHCI.hxx>
+#include <StorageKit/AHCI.h>
 
 using namespace Kernel;
 
diff --git a/dev/zka/src/Storage/ATADeviceInterface.cxx b/dev/zka/src/Storage/ATADeviceInterface.cc
index 8eae0262..2c027351 100644
--- a/dev/zka/src/Storage/ATADeviceInterface.cxx
+++ b/dev/zka/src/Storage/ATADeviceInterface.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <StorageKit/ATA.hxx>
+#include <StorageKit/ATA.h>
 
 using namespace Kernel;
 
diff --git a/dev/zka/src/Storage/NVMEDeviceInterface.cxx b/dev/zka/src/Storage/NVMEDeviceInterface.cc
index c762affe..c2bd701f 100644
--- a/dev/zka/src/Storage/NVMEDeviceInterface.cxx
+++ b/dev/zka/src/Storage/NVMEDeviceInterface.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <StorageKit/NVME.hxx>
+#include <StorageKit/NVME.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/src/Storage/SCSIDeviceInterface.cxx b/dev/zka/src/Storage/SCSIDeviceInterface.cc
index bda16961..2cb397e7 100644
--- a/dev/zka/src/Storage/SCSIDeviceInterface.cxx
+++ b/dev/zka/src/Storage/SCSIDeviceInterface.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <StorageKit/SCSI.hxx>
+#include <StorageKit/SCSI.h>
 
 ///! @brief ATAPI SCSI packet.
 const scsi_packet_type<12> kCDRomPacketTemplate = {0x43, 0, 1, 0, 0, 0,
diff --git a/dev/zka/src/Stream.cxx b/dev/zka/src/Stream.cc
index 6d975ca2..cf5cb4a4 100644
--- a/dev/zka/src/Stream.cxx
+++ b/dev/zka/src/Stream.cc
@@ -9,4 +9,4 @@
 
 ------------------------------------------- */
 
-#include <NewKit/Stream.hxx>
+#include <NewKit/Stream.h>
diff --git a/dev/zka/src/String.cxx b/dev/zka/src/String.cc
index c596db77..824e7b91 100644
--- a/dev/zka/src/String.cxx
+++ b/dev/zka/src/String.cc
@@ -4,9 +4,9 @@
 
 ------------------------------------------- */
 
-#include <NewKit/String.hxx>
-#include <NewKit/Utils.hxx>
-#include <KernelKit/DebugOutput.hxx>
+#include <NewKit/String.h>
+#include <NewKit/Utils.h>
+#include <KernelKit/DebugOutput.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/src/ThreadLocalStorage.cxx b/dev/zka/src/ThreadLocalStorage.cc
index 0468d628..ef8aba6c 100644
--- a/dev/zka/src/ThreadLocalStorage.cxx
+++ b/dev/zka/src/ThreadLocalStorage.cc
@@ -7,10 +7,10 @@
  *  ========================================================
  */
 
-#include <NewKit/String.hxx>
-#include <CFKit/Property.hxx>
-#include <KernelKit/UserProcessScheduler.hxx>
-#include <KernelKit/ThreadLocalStorage.hxx>
+#include <NewKit/String.h>
+#include <CFKit/Property.h>
+#include <KernelKit/UserProcessScheduler.h>
+#include <KernelKit/ThreadLocalStorage.h>
 
 /***********************************************************************************/
 /// @bugs: 0
diff --git a/dev/zka/src/Timer.cxx b/dev/zka/src/Timer.cc
index f1d8c469..e7ad488a 100644
--- a/dev/zka/src/Timer.cxx
+++ b/dev/zka/src/Timer.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <KernelKit/Timer.hxx>
+#include <KernelKit/Timer.h>
 
 ///! BUGS: 0
 ///! @file Timer.cxx
diff --git a/dev/zka/src/User.cxx b/dev/zka/src/User.cc
index f8800e9b..9037d729 100644
--- a/dev/zka/src/User.cxx
+++ b/dev/zka/src/User.cc
@@ -10,13 +10,13 @@
  * 	========================================================
  */
 
-#include <KernelKit/User.hxx>
+#include <KernelKit/User.h>
 
-#include <KernelKit/LPC.hxx>
-#include <NewKit/Stop.hxx>
-#include <KernelKit/FileMgr.hxx>
-#include <KernelKit/UserProcessScheduler.hxx>
-#include <KernelKit/Heap.hxx>
+#include <KernelKit/LPC.h>
+#include <NewKit/Stop.h>
+#include <KernelKit/FileMgr.h>
+#include <KernelKit/UserProcessScheduler.h>
+#include <KernelKit/Heap.h>
 
 #define cStdUser   (0xCEEF)
 #define cSuperUser (0xECCF)
diff --git a/dev/zka/src/UserProcessScheduler.cxx b/dev/zka/src/UserProcessScheduler.cc
index 6802f59d..7dd213b5 100644
--- a/dev/zka/src/UserProcessScheduler.cxx
+++ b/dev/zka/src/UserProcessScheduler.cc
@@ -12,13 +12,13 @@
 /// @brief User process scheduler.
 /***********************************************************************************/
 
-#include <ArchKit/ArchKit.hxx>
-#include <KernelKit/UserProcessScheduler.hxx>
-#include <KernelKit/IPEFDLLObject.hxx>
-#include <KernelKit/HardwareThreadScheduler.hxx>
-#include <KernelKit/Heap.hxx>
-#include <NewKit/String.hxx>
-#include <KernelKit/LPC.hxx>
+#include <ArchKit/ArchKit.h>
+#include <KernelKit/UserProcessScheduler.h>
+#include <KernelKit/IPEFDLLObject.h>
+#include <KernelKit/HardwareThreadScheduler.h>
+#include <KernelKit/Heap.h>
+#include <NewKit/String.h>
+#include <KernelKit/LPC.h>
 
 ///! BUGS: 0
 
diff --git a/dev/zka/src/UserProcessTeam.cxx b/dev/zka/src/UserProcessTeam.cc
index 6d3fa2db..22b158b9 100644
--- a/dev/zka/src/UserProcessTeam.cxx
+++ b/dev/zka/src/UserProcessTeam.cc
@@ -9,7 +9,7 @@
 /// @brief UserProcess teams implementation.
 /***********************************************************************************/
 
-#include <KernelKit/UserProcessScheduler.hxx>
+#include <KernelKit/UserProcessScheduler.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/src/Utils.cxx b/dev/zka/src/Utils.cc
index fe0d7ed4..7427fe34 100644
--- a/dev/zka/src/Utils.cxx
+++ b/dev/zka/src/Utils.cc
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <NewKit/Utils.hxx>
-#include <KernelKit/DebugOutput.hxx>
+#include <NewKit/Utils.h>
+#include <KernelKit/DebugOutput.h>
 
 namespace Kernel
 {
diff --git a/dev/zka/src/Variant.cxx b/dev/zka/src/Variant.cc
index 6314ed9e..76ff2f04 100644
--- a/dev/zka/src/Variant.cxx
+++ b/dev/zka/src/Variant.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <NewKit/Variant.hxx>
+#include <NewKit/Variant.h>
 
 namespace Kernel
 {