12 files changed, 11 insertions, 11 deletions
diff --git a/dev/ddk/KernelStd.h b/dev/ddk/ddk.h
index 89fe786d..89fe786d 100644
--- a/dev/ddk/KernelStd.h
+++ b/dev/ddk/ddk.h
diff --git a/dev/ddk/KernelDev.h b/dev/ddk/dev.h
index b7dce834..2a3aeb18 100644
--- a/dev/ddk/KernelDev.h
+++ b/dev/ddk/dev.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <ddk/KernelStd.h>
+#include <ddk/ddk.h>
 
 struct _KERNEL_DEVICE;
 
diff --git a/dev/ddk/KernelPrint.h b/dev/ddk/io.h
index 6ab6118e..ece8d059 100644
--- a/dev/ddk/KernelPrint.h
+++ b/dev/ddk/io.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <ddk/KernelString.h>
+#include <ddk/str.h>
 
 /// @brief print character into UART.
 DK_EXTERN void KernelPrintChar(const char ch);
diff --git a/dev/ddk/src/KernelAlloc.c b/dev/ddk/src/ddk_alloc.c
index af99f23b..3c379bf7 100644
--- a/dev/ddk/src/KernelAlloc.c
+++ b/dev/ddk/src/ddk_alloc.c
@@ -6,7 +6,7 @@
 
 ------------------------------------------- */
 
-#include <ddk/KernelStd.h>
+#include <ddk/ddk.h>
 
 /**
 	\brief Allocates a new heap on the Kernel's side.
diff --git a/dev/ddk/src/KernelDev.c b/dev/ddk/src/ddk_dev.c
index 3cf7ed48..19dd3f55 100644
--- a/dev/ddk/src/KernelDev.c
+++ b/dev/ddk/src/ddk_dev.c
@@ -6,8 +6,8 @@
 
 ------------------------------------------- */
 
-#include <ddk/KernelDev.h>
-#include <ddk/KernelString.h>
+#include <ddk/dev.h>
+#include <ddk/str.h>
 
 /// @brief Open a new binary device from path.
 DK_EXTERN KERNEL_DEVICE_PTR KernelOpenDevice(const char* devicePath)
diff --git a/dev/ddk/src/KernelPrint.c b/dev/ddk/src/ddk_io.c
index 7f8c8604..de39ea48 100644
--- a/dev/ddk/src/KernelPrint.c
+++ b/dev/ddk/src/ddk_io.c
@@ -6,7 +6,7 @@
 
 ------------------------------------------- */
 
-#include <ddk/KernelPrint.h>
+#include <ddk/io.h>
 
 DK_EXTERN void KernelPrintChar(const char ch)
 {
diff --git a/dev/ddk/src/KernelCall.c b/dev/ddk/src/ddk_kernel_call.c
index ccb401af..d768cb09 100644
--- a/dev/ddk/src/KernelCall.c
+++ b/dev/ddk/src/ddk_kernel_call.c
@@ -6,7 +6,7 @@
 
 ------------------------------------------- */
 
-#include <ddk/KernelStd.h>
+#include <ddk/ddk.h>
 #include <stdarg.h>
 
 /// @brief this is an internal call, do not use it.
diff --git a/dev/ddk/src/KernelCallDispatch.S b/dev/ddk/src/ddk_kernel_call_dispatch.S
index 3a9a57b5..3a9a57b5 100644
--- a/dev/ddk/src/KernelCallDispatch.S
+++ b/dev/ddk/src/ddk_kernel_call_dispatch.S
diff --git a/dev/ddk/src/KernelCxxRt.cxx b/dev/ddk/src/ddk_rt_cxx.cxx
index 947e2de7..4d5f2563 100644
--- a/dev/ddk/src/KernelCxxRt.cxx
+++ b/dev/ddk/src/ddk_rt_cxx.cxx
@@ -6,7 +6,7 @@
 
 ------------------------------------------- */
 
-#include <ddk/KernelStd.h>
+#include <ddk/ddk.h>
 
 void* operator new(size_t sz)
 {
diff --git a/dev/ddk/src/KernelString.c b/dev/ddk/src/ddk_str.c
index 0030aa02..2969a9e2 100644
--- a/dev/ddk/src/KernelString.c
+++ b/dev/ddk/src/ddk_str.c
@@ -6,7 +6,7 @@
 
 ------------------------------------------- */
 
-#include <ddk/KernelString.h>
+#include <ddk/str.h>
 
 DK_EXTERN size_t KernelStringLength(const char* in)
 {
diff --git a/dev/ddk/src/KernelVersion.c b/dev/ddk/src/ddk_ver.c
index c40e8ff9..ff27634d 100644
--- a/dev/ddk/src/KernelVersion.c
+++ b/dev/ddk/src/ddk_ver.c
@@ -6,7 +6,7 @@
 
 ------------------------------------------- */
 
-#include <KernelStd.h>
+#include <ddk/ddk.h>
 
 #ifndef cDDKVersionHighest
 #define cDDKVersionHighest 1
diff --git a/dev/ddk/KernelString.h b/dev/ddk/str.h
index 01d7d919..0b9bde21 100644
--- a/dev/ddk/KernelString.h
+++ b/dev/ddk/str.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <ddk/KernelStd.h>
+#include <ddk/ddk.h>
 
 /// @brief DDK equivalent of POSIX's string.h
 /// @file KernelString.h