diff --git a/src/atsam/main.c b/src/atsam/main.c
index 0bb9ff83..33ee2d88 100644
--- a/src/atsam/main.c
+++ b/src/atsam/main.c
@@ -6,12 +6,10 @@
 
 #include "board/irq.h" // irq_disable
 #include "board/usb_cdc.h" // usb_request_bootloader
-#include "command.h" // DECL_CONSTANT
+#include "command.h" // DECL_COMMAND_FLAGS
 #include "internal.h" // WDT
 #include "sched.h" // sched_main
 
-DECL_CONSTANT_STR("MCU", CONFIG_MCU);
-
 
 /****************************************************************
  * watchdog handler
diff --git a/src/atsamd/main.c b/src/atsamd/main.c
index bc0a1c4c..a5b7196b 100644
--- a/src/atsamd/main.c
+++ b/src/atsamd/main.c
@@ -4,12 +4,8 @@
 //
 // This file may be distributed under the terms of the GNU GPLv3 license.
 
-#include "command.h" // DECL_CONSTANT_STR
-#include "internal.h" // NVIC_SystemReset
 #include "sched.h" // sched_main
 
-DECL_CONSTANT_STR("MCU", CONFIG_MCU);
-
 // Main entry point
 int
 main(void)
diff --git a/src/generic/armcm_boot.c b/src/generic/armcm_boot.c
index e11e2412..ad7461ca 100644
--- a/src/generic/armcm_boot.c
+++ b/src/generic/armcm_boot.c
@@ -5,7 +5,12 @@
 // This file may be distributed under the terms of the GNU GPLv3 license.
 
 #include "armcm_boot.h" // DECL_ARMCM_IRQ
+#include "autoconf.h" // CONFIG_MCU
 #include "board/internal.h" // SystemInit
+#include "command.h" // DECL_CONSTANT_STR
+
+// Export MCU type
+DECL_CONSTANT_STR("MCU", CONFIG_MCU);
 
 // Symbols created by armcm_link.lds.S linker script
 extern uint32_t _data_start, _data_end, _data_flash;
diff --git a/src/lpc176x/Kconfig b/src/lpc176x/Kconfig
index 9c09d46e..2df9419f 100644
--- a/src/lpc176x/Kconfig
+++ b/src/lpc176x/Kconfig
@@ -23,6 +23,11 @@ choice
         bool "lpc1769 (120 Mhz)"
 endchoice
 
+config MCU
+    string
+    default "lpc1768" if MACH_LPC1768
+    default "lpc1769" if MACH_LPC1769
+
 config CLOCK_FREQ
     int
     default 100000000 if MACH_LPC1768
diff --git a/src/lpc176x/main.c b/src/lpc176x/main.c
index 7fddde5a..79001e72 100644
--- a/src/lpc176x/main.c
+++ b/src/lpc176x/main.c
@@ -4,13 +4,9 @@
 //
 // This file may be distributed under the terms of the GNU GPLv3 license.
 
-#include "board/misc.h" // timer_read_time
-#include "command.h" // DECL_CONSTANT
-#include "internal.h" // NVIC_SystemReset
+#include "internal.h" // enable_pclock
 #include "sched.h" // sched_main
 
-DECL_CONSTANT_STR("MCU", "lpc176x");
-
 
 /****************************************************************
  * watchdog handler
diff --git a/src/stm32/main.c b/src/stm32/main.c
index 56da9718..7c46d4b5 100644
--- a/src/stm32/main.c
+++ b/src/stm32/main.c
@@ -4,13 +4,9 @@
 //
 // This file may be distributed under the terms of the GNU GPLv3 license.
 
-#include "autoconf.h" // CONFIG_MCU
-#include "command.h" // DECL_CONSTANT_STR
 #include "internal.h" // clock_setup
 #include "sched.h" // sched_main
 
-DECL_CONSTANT_STR("MCU", CONFIG_MCU);
-
 // Main entry point
 int
 main(void)