diff --git a/xtoskrnl/ar/amd64/cpufunc.c b/xtoskrnl/ar/amd64/cpufunc.c
index 74fbf9e..81a45aa 100644
--- a/xtoskrnl/ar/amd64/cpufunc.c
+++ b/xtoskrnl/ar/amd64/cpufunc.c
@@ -6,7 +6,7 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include "xtos.h"
+#include <xtos.h>
 
 
 /**
diff --git a/xtoskrnl/ar/amd64/globals.c b/xtoskrnl/ar/amd64/globals.c
index 4804cfb..2221171 100644
--- a/xtoskrnl/ar/amd64/globals.c
+++ b/xtoskrnl/ar/amd64/globals.c
@@ -6,7 +6,7 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include "xtos.h"
+#include <xtos.h>
 
 
 /* Initial GDT */
diff --git a/xtoskrnl/ar/amd64/procsup.c b/xtoskrnl/ar/amd64/procsup.c
index 90a3bb7..9e8fb20 100644
--- a/xtoskrnl/ar/amd64/procsup.c
+++ b/xtoskrnl/ar/amd64/procsup.c
@@ -6,7 +6,7 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include "xtos.h"
+#include <xtos.h>
 
 
 /**
diff --git a/xtoskrnl/ar/i686/cpufunc.c b/xtoskrnl/ar/i686/cpufunc.c
index 9afc616..76b83ac 100644
--- a/xtoskrnl/ar/i686/cpufunc.c
+++ b/xtoskrnl/ar/i686/cpufunc.c
@@ -6,7 +6,7 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include "xtos.h"
+#include <xtos.h>
 
 
 /**
diff --git a/xtoskrnl/ar/i686/globals.c b/xtoskrnl/ar/i686/globals.c
index 0630834..af4f87d 100644
--- a/xtoskrnl/ar/i686/globals.c
+++ b/xtoskrnl/ar/i686/globals.c
@@ -6,7 +6,7 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include "xtos.h"
+#include <xtos.h>
 
 
 /* Initial GDT */
diff --git a/xtoskrnl/ar/i686/procsup.c b/xtoskrnl/ar/i686/procsup.c
index b034127..5bd037e 100644
--- a/xtoskrnl/ar/i686/procsup.c
+++ b/xtoskrnl/ar/i686/procsup.c
@@ -6,7 +6,7 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include "xtos.h"
+#include <xtos.h>
 
 
 /**
diff --git a/xtoskrnl/hl/amd64/ioport.c b/xtoskrnl/hl/amd64/ioport.c
index 91d4a17..049bc3c 100644
--- a/xtoskrnl/hl/amd64/ioport.c
+++ b/xtoskrnl/hl/amd64/ioport.c
@@ -6,7 +6,7 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include "xtkmapi.h"
+#include <xtos.h>
 
 
 /**
diff --git a/xtoskrnl/hl/cport.c b/xtoskrnl/hl/cport.c
index 685413f..592e2cd 100644
--- a/xtoskrnl/hl/cport.c
+++ b/xtoskrnl/hl/cport.c
@@ -6,7 +6,7 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include "xtkmapi.h"
+#include <xtos.h>
 
 
 /* COM port I/O addresses */
diff --git a/xtoskrnl/hl/i686/ioport.c b/xtoskrnl/hl/i686/ioport.c
index c46c068..ecf4f40 100644
--- a/xtoskrnl/hl/i686/ioport.c
+++ b/xtoskrnl/hl/i686/ioport.c
@@ -6,7 +6,7 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include "xtkmapi.h"
+#include <xtos.h>>
 
 
 /**
diff --git a/xtoskrnl/rtl/memory.c b/xtoskrnl/rtl/memory.c
index 286168f..dbeeed1 100644
--- a/xtoskrnl/rtl/memory.c
+++ b/xtoskrnl/rtl/memory.c
@@ -6,7 +6,7 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include <xtkmapi.h>
+#include <xtos.h>
 
 
 /**
diff --git a/xtoskrnl/rtl/plist.c b/xtoskrnl/rtl/plist.c
index f28a563..09f9f03 100644
--- a/xtoskrnl/rtl/plist.c
+++ b/xtoskrnl/rtl/plist.c
@@ -6,7 +6,7 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include <xtkmapi.h>
+#include <xtos.h>
 
 
 /**
diff --git a/xtoskrnl/rtl/string.c b/xtoskrnl/rtl/string.c
index 628c1bc..aef02b2 100644
--- a/xtoskrnl/rtl/string.c
+++ b/xtoskrnl/rtl/string.c
@@ -6,7 +6,7 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include "xtkmapi.h"
+#include <xtos.h>
 
 
 /**
diff --git a/xtoskrnl/rtl/widestr.c b/xtoskrnl/rtl/widestr.c
index c5a16f9..57e1fe2 100644
--- a/xtoskrnl/rtl/widestr.c
+++ b/xtoskrnl/rtl/widestr.c
@@ -6,7 +6,7 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include "xtkmapi.h"
+#include <xtos.h>
 
 
 /**