diff --git a/Kconfig b/Kconfig
index 0079c3d29..5160d1c8c 100644
--- a/Kconfig
+++ b/Kconfig
@@ -133,12 +133,6 @@ config GDB_DEBUG
 	help
 	  Select for GDB debugging
 
-config DEBUG_HEAP
-	bool "Heap debug"
-	default n
-	help
-	  Select for enable heap alloc debugging
-
 config DEBUG_MEMORY_USAGE_SCAN
 	bool "Memory usage scan"
 	default y
@@ -147,15 +141,6 @@ config DEBUG_MEMORY_USAGE_SCAN
 	  This feature does not affect standard memory operations,
 	  especially allocation and deallocation.
 
-config DEBUG_BLOCK_FREE
-	bool "Blocks freeing debug"
-	default n
-	help
-	  It enables checking if free was called multiple times on
-	  already freed block of memory. Enabling this feature increases
-	  number of memory writes and reads, due to checks for memory patterns
-	  that may be performed on allocation and deallocation.
-
 config DEBUG_LOCKS
 	bool "Spinlock debug"
 	default n
@@ -206,4 +191,8 @@ config DSP_RESIDENCY_COUNTERS
 	  R0, R1, R2 are abstract states which can be used differently
 	  based on platform implementation.
 
+if !ZEPHYR_SOF_MODULE
+	rsource "Kconfig.xtos-dbg"
+endif
+
 endmenu
diff --git a/Kconfig.xtos-dbg b/Kconfig.xtos-dbg
new file mode 100644
index 000000000..3082d7cfa
--- /dev/null
+++ b/Kconfig.xtos-dbg
@@ -0,0 +1,14 @@
+config DEBUG_HEAP
+	bool "Heap debug"
+	default n
+	help
+	  Select for enable heap alloc debugging
+
+config DEBUG_BLOCK_FREE
+	bool "Blocks freeing debug"
+	default n
+	help
+	  It enables checking if free was called multiple times on
+	  already freed block of memory. Enabling this feature increases
+	  number of memory writes and reads, due to checks for memory patterns
+	  that may be performed on allocation and deallocation.