diff --git a/arch/c5471/src/c5471.h b/arch/c5471/src/c5471.h
index b91c9f3d158..9c085d7d72d 100644
--- a/arch/c5471/src/c5471.h
+++ b/arch/c5471/src/c5471.h
@@ -46,7 +46,7 @@
 # include <sys/types.h>
 #endif
 
-#if defined(CONFIG_BOARD_C5471EVM)
+#if defined(CONFIG_ARCH_BOARD_C5471EVM)
 # include <arch/board/c5471evm.h>
 #else
 # warning "Undefined C5471 Board"
diff --git a/arch/c5471/src/up_internal.h b/arch/c5471/src/up_internal.h
index fc5f92f7bdc..c032fa54342 100644
--- a/arch/c5471/src/up_internal.h
+++ b/arch/c5471/src/up_internal.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 
-#if defined(CONFIG_BOARD_C5471EVM)
+#if defined(CONFIG_ARCH_BOARD_C5471EVM)
 # include <arch/board/c5471evm.h>
 #else
 # warning "Undefined C5471 Board"
diff --git a/arch/dm320/src/dm320.h b/arch/dm320/src/dm320.h
index 6f0f89e1652..a147abd41fb 100644
--- a/arch/dm320/src/dm320.h
+++ b/arch/dm320/src/dm320.h
@@ -47,7 +47,7 @@
 
 #include "arm9.h"
 
-#if defined(CONFIG_BOARD_NTOSD_DM320)
+#if defined(CONFIG_ARCH_BOARD_NTOSD_DM320)
 # include <arch/board/ntosd.h>
 #else
 # warning "Unknown DM320 board"
diff --git a/arch/pjrc-8051/src/up_internal.h b/arch/pjrc-8051/src/up_internal.h
index 90ba556e96f..8b2e2018a0d 100644
--- a/arch/pjrc-8051/src/up_internal.h
+++ b/arch/pjrc-8051/src/up_internal.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 #include <arch/irq.h>
 
-#if defined(CONFIG_BOARD_PJRC_87C52)
+#if defined(CONFIG_ARCH_BOARD_PJRC_87C52)
 # include <arch/board/pjrc.h>
 #else
 # warning "805x board not recognized"