diff --git a/src/system/kernel/vm/vm.cpp b/src/system/kernel/vm/vm.cpp
index f8839d8295..95bc6ec9ec 100644
--- a/src/system/kernel/vm/vm.cpp
+++ b/src/system/kernel/vm/vm.cpp
@@ -7,6 +7,10 @@
  */
 
 
+#include "vm_store_anonymous_noswap.h"
+#include "vm_store_device.h"
+#include "vm_store_null.h"
+
 #include <OS.h>
 #include <KernelExport.h>
 
@@ -15,9 +19,6 @@
 #include <vm_priv.h>
 #include <vm_page.h>
 #include <vm_cache.h>
-#include <vm_store_anonymous_noswap.h>
-#include <vm_store_device.h>
-#include <vm_store_null.h>
 #include <vm_low_memory.h>
 #include <file_cache.h>
 #include <memheap.h>
diff --git a/src/system/kernel/vm/vm_store_anonymous_noswap.c b/src/system/kernel/vm/vm_store_anonymous_noswap.c
index c00ce8db25..b290a99934 100644
--- a/src/system/kernel/vm/vm_store_anonymous_noswap.c
+++ b/src/system/kernel/vm/vm_store_anonymous_noswap.c
@@ -7,8 +7,9 @@
  */
 
 
+#include "vm_store_anonymous_noswap.h"
+
 #include <KernelExport.h>
-#include <vm_store_anonymous_noswap.h>
 #include <vm_priv.h>
 #include <arch_config.h>
 
diff --git a/headers/private/kernel/vm_store_anonymous_noswap.h b/src/system/kernel/vm/vm_store_anonymous_noswap.h
similarity index 100%
rename from headers/private/kernel/vm_store_anonymous_noswap.h
rename to src/system/kernel/vm/vm_store_anonymous_noswap.h
diff --git a/src/system/kernel/vm/vm_store_device.c b/src/system/kernel/vm/vm_store_device.c
index 8978a9761f..1e381c3406 100644
--- a/src/system/kernel/vm/vm_store_device.c
+++ b/src/system/kernel/vm/vm_store_device.c
@@ -7,8 +7,9 @@
  */
 
 
+#include "vm_store_device.h"
+
 #include <KernelExport.h>
-#include <vm_store_device.h>
 #include <vm_priv.h>
 
 #include <stdlib.h>
diff --git a/headers/private/kernel/vm_store_device.h b/src/system/kernel/vm/vm_store_device.h
similarity index 100%
rename from headers/private/kernel/vm_store_device.h
rename to src/system/kernel/vm/vm_store_device.h
diff --git a/src/system/kernel/vm/vm_store_null.c b/src/system/kernel/vm/vm_store_null.c
index 75c8e3c987..11fb7246f7 100644
--- a/src/system/kernel/vm/vm_store_null.c
+++ b/src/system/kernel/vm/vm_store_null.c
@@ -4,7 +4,8 @@
 */
 
 
-#include <vm_store_null.h>
+#include "vm_store_null.h"
+
 #include <stdlib.h>
 
 
diff --git a/headers/private/kernel/vm_store_null.h b/src/system/kernel/vm/vm_store_null.h
similarity index 100%
rename from headers/private/kernel/vm_store_null.h
rename to src/system/kernel/vm/vm_store_null.h