6 files changed, 46 insertions, 20 deletions
diff --git a/include/Drivers/Config.h b/include/Drivers/Config.h
new file mode 100644
index 0000000..cb788d6
--- /dev/null
+++ b/include/Drivers/Config.h
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org)
+// Licensed under the Apache License, Version 2.0 (see LICENSE file)
+// Official repository: https://github.com/ne-foss-org/src
+
+#ifndef _NE_DDK_CONFIG_H_
+#define _NE_DDK_CONFIG_H_
+
+#define _ARCH __ne_arch
+
+#define _SUBSYSTEM_NET 0x1000
+#define _SUBSYSTEM_DDK 0x1000
+#define _SUBSYSTEM_SYS 0x1000
+
+#define _NEKERNEL 202603L
+
+#include <libDDK/DriverKit/DriverKit.h>
+
+#endif
diff --git a/include/Drivers/NeSystem.h b/include/Drivers/DDK.h
index fe042fa..f8a96ac 100644
--- a/include/Drivers/NeSystem.h
+++ b/include/Drivers/DDK.h
@@ -3,9 +3,9 @@
 // Licensed under the Apache License, Version 2.0 (see LICENSE file)
 // Official repository: https://github.com/ne-foss-org/src
 
-#ifndef _NE_DDK_H_
-#define _NE_DDK_H_
+#ifndef _NE_DDK_DDK_H_
+#define _NE_DDK_DDK_H_
 
-#include <libDDK/DriverKit/DriverKit.h>
+#include <Drivers/Config.h>
 
-#endif
+#endif // _NE_DDK_DDK_H_
diff --git a/include/System/Config.h b/include/System/Config.h
index 9a7bfb3..474a107 100644
--- a/include/System/Config.h
+++ b/include/System/Config.h
@@ -10,7 +10,8 @@
 #define _SUBSYSTEM_NET 0x1000
 #define _SUBSYSTEM_DDK 0x1000
 #define _SUBSYSTEM_SYS 0x1000
-#define _NEKERNEL 202603
+
+#define _NEKERNEL 202603L
 
 #include <CoreFoundation.fwrk/headers/Foundation.h>
 #include <DiskImage.fwrk/headers/DiskImage.h>
diff --git a/include/System/NeSystem.h b/include/System/NeSystem.h
index b494db4..832db9e 100644
--- a/include/System/NeSystem.h
+++ b/include/System/NeSystem.h
@@ -3,24 +3,31 @@
 // Licensed under the Apache License, Version 2.0 (see LICENSE file)
 // Official repository: https://github.com/ne-foss-org/ne_system
 
-#ifndef _NE_SYSTEM_H_
-#define _NE_SYSTEM_H_
+#ifndef _SYSTEM_NE_SYSTEM_H_
+#define _SYSTEM_NE_SYSTEM_H_
 
 #define _NE_SYSTEM 202603L
 
 #include <System/Config.h>
 
-// POSIX wrapper API
+/// @brief POSIX wrapper API
 #include <libPOSIXWrapper/POSIXKit/unistd.h>
-// IPC API
+
+/// @brief IPC API
 #include <libMsg/MsgKit/Server.h>
-// System calls API
+
+/// @brief System calls API
 #include <libSystem/SystemKit/System.h>
-// Sound mixer API
+
+/// @brief Sound mixer API
 #include <libSoundSystem/SoundSystemKit/VirtualMixer.h>
 
 #ifdef _NE_NEED_X11
-#include <System/X11+Fwd.h>
+#include <System/X11.h>
+#endif
+
+#ifdef _NE_NEED_WAYLAND
+#include <System/Wayland.h>
 #endif
 
-#endif // !_NE_SYSTEM_H_
+#endif // _SYSTEM_NE_SYSTEM_H_
diff --git a/include/System/Wayland.h b/include/System/Wayland.h
index 3c7cfb0..2b4afe5 100644
--- a/include/System/Wayland.h
+++ b/include/System/Wayland.h
@@ -3,12 +3,11 @@
 // Licensed under the Apache License, Version 2.0 (see LICENSE file)
 // Official repository: https://github.com/ne-foss-org/src
 
-#ifndef _NE_WAYLAND_H_
-#define _NE_WAYLAND_H_
+#ifndef _SYSTEM_NE_WAYLAND_H_
+#define _SYSTEM_NE_WAYLAND_H_
 
 #define _NE_WAYLAND_SYSTEM 202603L
 
 #include <System/X11+Fwd.h>
 
-
-#endif
-\ No newline at end of file
+#endif // _SYSTEM_NE_WAYLAND_H_
+\ No newline at end of file
diff --git a/include/System/X11+Fwd.h b/include/System/X11.h
index f06a3f4..3f4d318 100644
--- a/include/System/X11+Fwd.h
+++ b/include/System/X11.h
@@ -3,8 +3,8 @@
 // Licensed under the Apache License, Version 2.0 (see LICENSE file)
 // Official repository: https://github.com/ne-foss-org/src
 
-#ifndef _NE_X11_H_
-#define _NE_X11_H_
+#ifndef _SYSTEM_NE_X11_H_
+#define _SYSTEM_NE_X11_H_
 
 #define _NE_X11_SYSTEM 202603L
 
@@ -17,5 +17,5 @@
 // XDG' extensions of the X11 protocol.
 #include <System/X11/Ext/Imports.h>
 
-#endif
+#endif // _SYSTEM_NE_X11_H_