diff --git a/xtoskrnl/includes/kd.hh b/xtoskrnl/includes/kd.hh
index e7deaf1..859cfc7 100644
--- a/xtoskrnl/includes/kd.hh
+++ b/xtoskrnl/includes/kd.hh
@@ -11,6 +11,7 @@
 
 #include <xtos.hh>
 
+#include <kd/dbg.hh>
 #include <kd/dbgio.hh>
 
 #endif /* __XTOSKRNL_KD_HH */
diff --git a/xtoskrnl/includes/dbg.hh b/xtoskrnl/includes/kd/dbg.hh
similarity index 78%
rename from xtoskrnl/includes/dbg.hh
rename to xtoskrnl/includes/kd/dbg.hh
index 1448d65..cbe5500 100644
--- a/xtoskrnl/includes/dbg.hh
+++ b/xtoskrnl/includes/kd/dbg.hh
@@ -1,13 +1,13 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/includes/dbg.hh
+ * FILE:            xtoskrnl/includes/kd/dbg.hh
  * DESCRIPTION:     Kernel debugging support
  * DEVELOPERS:      Aiken Harris <harraiken91@gmail.com>
  */
 
-#ifndef __XTOSKRNL_DBG_HH
-#define __XTOSKRNL_DBG_HH
+#ifndef __XTOSKRNL_KD_DBG_HH
+#define __XTOSKRNL_KD_DBG_HH
 
 #include <xtos.hh>
 
@@ -20,4 +20,4 @@
     #define DebugPrint(Format, ...)     ((VOID)NULL)
 #endif
 
-#endif /* __XTOSKRNL_DBG_HH */
+#endif /* __XTOSKRNL_KD_DBG_HH */
diff --git a/xtoskrnl/includes/xtos.hh b/xtoskrnl/includes/xtos.hh
index ca7497f..3a28f57 100644
--- a/xtoskrnl/includes/xtos.hh
+++ b/xtoskrnl/includes/xtos.hh
@@ -27,7 +27,6 @@ extern "C" {
 
 
 #include <ar.hh>
-#include <dbg.hh>
 #include <ex.hh>
 #include <hl.hh>
 #include <kd.hh>