diff --git a/build/config_headers/kernel_debug_config.h b/build/config_headers/kernel_debug_config.h
index 4f44d89f1d..ffa40e220a 100644
--- a/build/config_headers/kernel_debug_config.h
+++ b/build/config_headers/kernel_debug_config.h
@@ -19,4 +19,24 @@
 #define BLOCK_CACHE_DEBUG_CHANGED
 
 
+// VM
+
+// Enables the vm_page::queue, i.e. it is tracked which queue the page should
+// be in.
+//#define DEBUG_PAGE_QUEUE	1
+
+// Enables extra debug fields in the vm_page used to track page transitions
+// between caches.
+//#define DEBUG_PAGE_CACHE_TRANSITIONS	1
+
+// Enables a global list of all vm_cache structures.
+//#define DEBUG_CACHE_LIST 1
+
+// Enables swap support.
+#define ENABLE_SWAP_SUPPORT 1
+
+// When set limits the amount of available RAM (in MB).
+//#define LIMIT_AVAILABLE_MEMORY	256
+
+
 #endif	// KERNEL_DEBUG_CONFIG_H
diff --git a/headers/private/kernel/vm_types.h b/headers/private/kernel/vm_types.h
index 8963e21ca3..8e6f963da8 100644
--- a/headers/private/kernel/vm_types.h
+++ b/headers/private/kernel/vm_types.h
@@ -18,20 +18,8 @@
 
 #include <sys/uio.h>
 
+#include "kernel_debug_config.h"
 
-// Enables the vm_page::queue, i.e. it is tracked which queue the page should
-// be in.
-//#define DEBUG_PAGE_QUEUE	1
-
-// Enables extra debug fields in the vm_page used to track page transitions
-// between caches.
-//#define DEBUG_PAGE_CACHE_TRANSITIONS	1
-
-// Enables a global list of all vm_cache structures.
-//#define DEBUG_CACHE_LIST 1
-
-// uncomment to build in swap support
-#define ENABLE_SWAP_SUPPORT 1
 
 #ifdef __cplusplus
 
diff --git a/src/system/kernel/vm/vm_page.cpp b/src/system/kernel/vm/vm_page.cpp
index 228898dfc9..96f616df97 100644
--- a/src/system/kernel/vm/vm_page.cpp
+++ b/src/system/kernel/vm/vm_page.cpp
@@ -46,9 +46,6 @@
 #define SCRUB_SIZE 16
 	// this many pages will be cleared at once in the page scrubber thread
 
-// for debugging: limit the amount of available RAM (in MB)
-//#define LIMIT_AVAILABLE_MEMORY	256
-
 
 typedef struct page_queue {
 	vm_page *head;