58 files changed, 170 insertions, 170 deletions
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/Defines.cxx b/dev/zka/src/ArrayList.cc
index fc7d41b5..6de794be 100644
--- a/dev/zka/src/Defines.cxx
+++ b/dev/zka/src/ArrayList.cc
@@ -4,4 +4,4 @@
 
 ------------------------------------------- */
 
-#include <NewKit/Defines.hxx>
+#include <NewKit/ArrayList.h>
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/src/ArrayList.cxx b/dev/zka/src/DeviceMgr.cc
index 27fae68c..78058a17 100644
--- a/dev/zka/src/ArrayList.cxx
+++ b/dev/zka/src/DeviceMgr.cc
@@ -4,4 +4,4 @@
 
 ------------------------------------------- */
 
-#include <NewKit/ArrayList.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/src/MutableArray.cc b/dev/zka/src/MutableArray.cc
new file mode 100644
index 00000000..de0523e1
--- /dev/null
+++ b/dev/zka/src/MutableArray.cc
@@ -0,0 +1,7 @@
+/* -------------------------------------------
+
+	Copyright ZKA Web Services Co.
+
+------------------------------------------- */
+
+#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
 {