diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2e5b08..6bd8578 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,10 +27,10 @@ add_compile_definitions(__kernel__)
 
 # Run IDE in DMA mode if available (NYI)
 #add_compile_definitions(IDE_ENABLE_INTERRUPT)
-# Run the kernel shell as the main task
-add_compile_definitions(ENABLE_SELF_TEST)  # Support for pretty printing pci class/subclass/interface
+# Kernel Command Line features
+add_compile_definitions(ENABLE_K_SHELL) # Run the kernel shell as the main task
+add_compile_definitions(ENABLE_SELF_TEST)  # Compile in self test kernel CLI command
 add_compile_definitions(ENABLE_PCIPP)  # Support for pretty printing pci class/subclass/interface
-add_compile_definitions(K_SHELL)
 
 # find libgcc.a
 add_library(libgcc STATIC IMPORTED)
diff --git a/kernel/command.c b/kernel/command.c
index ca68db6..4fe5831 100644
--- a/kernel/command.c
+++ b/kernel/command.c
@@ -1,6 +1,7 @@
 //
 // Created by rick on 23-02-21.
 //
+#ifdef ENABLE_K_SHELL
 #include <attributes.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -292,7 +293,6 @@ void att_noreturn main_loop(void *data) {
     }
 }
 
-#ifdef K_SHELL
 
 void main_loop_start() {
     task_spawn(main_loop, NULL, "main");