5 files changed, 18 insertions, 15 deletions
diff --git a/src/libDDK/DriverKit/c++/checksum.h b/src/libDDK/DriverKit/ObjectKit/checksum.h
index 55d3d58f..5f9859e2 100644
--- a/src/libDDK/DriverKit/c++/checksum.h
+++ b/src/libDDK/DriverKit/ObjectKit/checksum.h
@@ -5,33 +5,34 @@
 #ifndef DRIVERKIT_CHECKSUM_H
 #define DRIVERKIT_CHECKSUM_H
 
-#include <DriverKit/c++/driver_base.h>
+#include <DriverKit/ObjectKit/driver_base.h>
 
 namespace Kernel::DDK {
 
-using IndexableBlob = Char*;
+using IndexableBlob = char*;
+using Indexable = char;
 
 /// @note This uses the FNV 64-bit variant.
 /// @brief Performs a checksum computation for a memory region.
-inline UInt64 rtl_checksum(const IndexableBlob path) {
+inline uintptr_t rtl_checksum(const IndexableBlob path) {
   if (!path || *path == 0) return 0;
 
-  const UInt64 kFNVSeed  = 0xcbf29ce484222325ULL;
-  const UInt64 kFNVPrime = 0x100000001b3ULL;
+  const uintptr_t kFNVSeed  = 0xcbf29ce484222325ULL;
+  const uintptr_t kFNVPrime = 0x100000001b3ULL;
 
-  UInt64 hash = kFNVSeed;
+  uintptr_t hash = kFNVSeed;
 
   IndexableBlob path_ = path;
 
   while (*path_) {
-    hash ^= (Char) (*path_++);
+    hash ^= (Indexable) (*path_++);
     hash *= kFNVPrime;
   }
 
   return hash;
 }
 
-using Blob = VoidPtr;
+using Blob = void*;
 
 }  // namespace Kernel::DDK
 
diff --git a/src/libDDK/DriverKit/c++/ddk.h b/src/libDDK/DriverKit/ObjectKit/ddk.h
index f05b86bc..2d6dec75 100644
--- a/src/libDDK/DriverKit/c++/ddk.h
+++ b/src/libDDK/DriverKit/ObjectKit/ddk.h
@@ -5,7 +5,7 @@
 #ifndef DRIVERKIT_DDK_H
 #define DRIVERKIT_DDK_H
 
-#include <DriverKit/c++/checksum.h>
-#include <DriverKit/c++/driver_base.h>
+#include <DriverKit/ObjectKit/checksum.h>
+#include <DriverKit/ObjectKit/driver_base.h>
 
 #endif
diff --git a/src/libDDK/DriverKit/c++/driver_base.h b/src/libDDK/DriverKit/ObjectKit/driver_base.h
index 1d6057b3..909bfe7b 100644
--- a/src/libDDK/DriverKit/c++/driver_base.h
+++ b/src/libDDK/DriverKit/ObjectKit/driver_base.h
@@ -9,13 +9,14 @@
 
 #define DDK_DRIVER_IMPL \
   final:                \
- public                 \
+  public                \
   ::Kernel::DDK::IDriverBase
 
 /// @author Amlal El Mahrouss
 /// @brief The DDK C++ API.
 
 namespace Kernel::DDK {
+
 inline constexpr auto kInvalidType = 0;
 
 /// @brief Driver interface type.
@@ -39,8 +40,9 @@ class IDriverBase {
 /// @author @amlel-el-mahrouss
 template <typename Driver>
 concept IsValidDriver = requires(Driver drv) {
-  {drv.IsActive() && drv.Type() > kInvalidType};
+  { drv.IsActive() && drv.Type() > kInvalidType };
 };
+
 }  // namespace Kernel::DDK
 
 #endif
diff --git a/src/libDDK/src/ddk_kernel_call.c b/src/libDDK/src/ddk_kernel_call.c
index 53eb7f35..32ae3a42 100644
--- a/src/libDDK/src/ddk_kernel_call.c
+++ b/src/libDDK/src/ddk_kernel_call.c
@@ -13,7 +13,7 @@
 
 /// @brief this is an internal call, do not use it.
 DDK_EXTERN ATTRIBUTE(naked) /*  */
-    ptr_t __ke_call_dispatch(const int32_t name, int32_t cnt, void* data, size_t sz);
+ptr_t      __ke_call_dispatch(const int32_t name, int32_t cnt, void* data, size_t sz);
 
 /// @brief This function hashes the path into a FNV symbol.
 /// @param path the path to hash.
diff --git a/src/libDDK/src/ddk_c++.cc b/src/libDDK/src/ddk_objectkit.cc
index 65aa181c..5aad76d2 100644
--- a/src/libDDK/src/ddk_c++.cc
+++ b/src/libDDK/src/ddk_objectkit.cc
@@ -1,5 +1,5 @@
-// Copyright 2024-2025, Amlal El Mahrouss (amlal@nekernel.org)
+// Copyright 2024-2026, Amlal El Mahrouss (amlal@nekernel.org)
 // Licensed under the Apache License, Version 2.0 (see LICENSE file)
 // Official repository: https://github.com/nekernel-org/nekernel
 
-#include <libDDK/DriverKit/c++/driver_base.h>
+#include <DriverKit/ObjectKit/driver_base.h>