9 files changed, 23 insertions, 27 deletions
diff --git a/src/libDDK/DriverKit/macros.h b/src/libDDK/DriverKit/Defines.h
index 12f9d634..2817d809 100644
--- a/src/libDDK/DriverKit/macros.h
+++ b/src/libDDK/DriverKit/Defines.h
@@ -1,4 +1,4 @@
-// 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
 
diff --git a/src/libDDK/DriverKit/dev.h b/src/libDDK/DriverKit/Device.h
index c3c12ca4..6511b452 100644
--- a/src/libDDK/DriverKit/dev.h
+++ b/src/libDDK/DriverKit/Device.h
@@ -1,19 +1,29 @@
-// 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
 
 #ifndef DRIVERKIT_DEV_H
 #define DRIVERKIT_DEV_H
 
-#include <DriverKit/ddk.h>
+#include <DriverKit/DriverKit.h>
 
 struct _DDK_DEVICE;
 
 #define DDK_DEVICE_NAME_LEN (255)
 
+#define DDK_TYPE_SOCKET (1)
+#define DDK_TYPE_FILE (2)
+#define DDK_TYPE_DEVICE (3)
+
+#define DDK_SUB_TYPE_TCP (1)
+#define DDK_SUB_TYPE_UDP (2)
+#define DDK_SUB_TYPE_BT  (3)
+
 /// @brief Kernel Device driver.
 typedef struct _DDK_DEVICE DDK_FINAL {
   char d_name[DDK_DEVICE_NAME_LEN];     // the device name. Could be /./DEVICE_NAME/
+  int  d_type;
+  int  d_subtype;
   void* (*d_read)(void* arg, int len);  // read from device.
   void (*d_write)(void* arg, int len);
   void (*d_wait)(void);                             // write to device.
diff --git a/src/libDDK/DriverKit/ddk.h b/src/libDDK/DriverKit/DriverKit.h
index 2ff2db9e..29bde0a6 100644
--- a/src/libDDK/DriverKit/ddk.h
+++ b/src/libDDK/DriverKit/DriverKit.h
@@ -1,11 +1,11 @@
-// 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
 
 #ifndef DRIVERKIT_DDK_H
 #define DRIVERKIT_DDK_H
 
-#include <DriverKit/macros.h>
+#include <DriverKit/Defines.h>
 
 struct DDK_STATUS_STRUCT;
 struct DDK_OBJECT_MANIFEST;
diff --git a/src/libDDK/DriverKit/io.h b/src/libDDK/DriverKit/IO.h
index 28cf3038..060f7f9b 100644
--- a/src/libDDK/DriverKit/io.h
+++ b/src/libDDK/DriverKit/IO.h
@@ -1,11 +1,11 @@
-// 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
 
 #ifndef DRIVERKIT_IO_H
 #define DRIVERKIT_IO_H
 
-#include <DriverKit/str.h>
+#include <DriverKit/String.h>
 
 /// @brief print character into UART.
 DDK_EXTERN void kputc(const char ch);
diff --git a/src/libDDK/DriverKit/ObjectKit/driver_base.h b/src/libDDK/DriverKit/ObjectKit/Base.h
index f5811fb2..4d2f6072 100644
--- a/src/libDDK/DriverKit/ObjectKit/driver_base.h
+++ b/src/libDDK/DriverKit/ObjectKit/Base.h
@@ -5,7 +5,7 @@
 #ifndef DRIVERKIT_OBJECTKIT_DRIVER_BASE_H
 #define DRIVERKIT_OBJECTKIT_DRIVER_BASE_H
 
-#include <libDDK/DriverKit/macros.h>
+#include <libDDK/DriverKit/Defines.h>
 
 #define DDK_DRIVER_IMPL \
   final:                \
diff --git a/src/libDDK/DriverKit/ObjectKit/checksum.h b/src/libDDK/DriverKit/ObjectKit/Checksum.h
index 92c63603..e925f9ca 100644
--- a/src/libDDK/DriverKit/ObjectKit/checksum.h
+++ b/src/libDDK/DriverKit/ObjectKit/Checksum.h
@@ -5,7 +5,7 @@
 #ifndef DRIVERKIT_CHECKSUM_H
 #define DRIVERKIT_CHECKSUM_H
 
-#include <DriverKit/ObjectKit/driver_base.h>
+#include <DriverKit/ObjectKit/Base.h>
 
 namespace Kernel::DDK {
 
diff --git a/src/libDDK/DriverKit/ObjectKit/ddk.h b/src/libDDK/DriverKit/ObjectKit/DriverKit.h
index 2d6dec75..490e7d03 100644
--- a/src/libDDK/DriverKit/ObjectKit/ddk.h
+++ b/src/libDDK/DriverKit/ObjectKit/DriverKit.h
@@ -5,7 +5,7 @@
 #ifndef DRIVERKIT_DDK_H
 #define DRIVERKIT_DDK_H
 
-#include <DriverKit/ObjectKit/checksum.h>
-#include <DriverKit/ObjectKit/driver_base.h>
+#include <DriverKit/ObjectKit/Checksum.h>
+#include <DriverKit/ObjectKit/Base.h>
 
 #endif
diff --git a/src/libDDK/DriverKit/str.h b/src/libDDK/DriverKit/String.h
index 9c1386ab..5f56f95b 100644
--- a/src/libDDK/DriverKit/str.h
+++ b/src/libDDK/DriverKit/String.h
@@ -1,11 +1,11 @@
-// 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
 
 #ifndef DRIVERKIT_STR_H
 #define DRIVERKIT_STR_H
 
-#include <DriverKit/ddk.h>
+#include <DriverKit/DriverKit.h>
 
 /// @brief DDK equivalent of POSIX's string.h
 /// @file str.h
diff --git a/src/libDDK/DriverKit/net.h b/src/libDDK/DriverKit/net.h
deleted file mode 100644
index ecffb983..00000000
--- a/src/libDDK/DriverKit/net.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2024-2025, 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
-
-#ifndef DRIVERKIT_NET_H
-#define DRIVERKIT_NET_H
-
-#include <DriverKit/macros.h>
-
-struct DDK_NET_MANIFEST;
-
-/// @brief IFS hooks to plug into the FileMgr.
-
-#endif