diff --git a/board/fruitpie/usb_pd_policy.c b/board/fruitpie/usb_pd_policy.c
index 6ebc04385b..1cc167f5b1 100644
--- a/board/fruitpie/usb_pd_policy.c
+++ b/board/fruitpie/usb_pd_policy.c
@@ -3,7 +3,6 @@
  * found in the LICENSE file.
  */
 
-#include "board.h"
 #include "common.h"
 #include "console.h"
 #include "gpio.h"
diff --git a/board/keyborg/board.c b/board/keyborg/board.c
index 9ddaf63270..6db3d5cd66 100644
--- a/board/keyborg/board.c
+++ b/board/keyborg/board.c
@@ -4,7 +4,6 @@
  */
 /* Keyborg board-specific configuration */
 
-#include "board.h"
 #include "common.h"
 #include "debug.h"
 #include "master_slave.h"
diff --git a/board/keyborg/debug.c b/board/keyborg/debug.c
index e801c1f543..b750683379 100644
--- a/board/keyborg/debug.c
+++ b/board/keyborg/debug.c
@@ -4,7 +4,6 @@
  */
 /* GPIO UART debug printf */
 
-#include "board.h"
 #include "common.h"
 #include "printf.h"
 #include "registers.h"
diff --git a/board/keyborg/master_slave.c b/board/keyborg/master_slave.c
index eab62b1b73..a74ddf554b 100644
--- a/board/keyborg/master_slave.c
+++ b/board/keyborg/master_slave.c
@@ -4,7 +4,7 @@
  */
 /* Master/slave identification */
 
-#include "board.h"
+#include "config.h"
 #include "debug.h"
 #include "master_slave.h"
 #include "registers.h"
diff --git a/board/keyborg/spi_comm.c b/board/keyborg/spi_comm.c
index f795c3a8f6..444661a23c 100644
--- a/board/keyborg/spi_comm.c
+++ b/board/keyborg/spi_comm.c
@@ -4,7 +4,6 @@
  */
 /* Stantum board-specific SPI module */
 
-#include "board.h"
 #include "common.h"
 #include "debug.h"
 #include "dma.h"
diff --git a/board/samus_pd/usb_pd_policy.c b/board/samus_pd/usb_pd_policy.c
index 2e2a42d182..793de20f5a 100644
--- a/board/samus_pd/usb_pd_policy.c
+++ b/board/samus_pd/usb_pd_policy.c
@@ -3,7 +3,6 @@
  * found in the LICENSE file.
  */
 
-#include "board.h"
 #include "common.h"
 #include "console.h"
 #include "gpio.h"
diff --git a/include/config.h b/include/config.h
index 43f7cfdbca..1e9826f0a7 100644
--- a/include/config.h
+++ b/include/config.h
@@ -954,6 +954,13 @@
  * Board is included after chip, so that chip defaults can be overridden on a
  * per-board basis as needed.
  */
+#ifdef __CROS_EC_CONFIG_CHIP_H
+#error Include config.h instead of config_chip.h!
+#endif
+#ifdef __BOARD_H
+#error Include config.h instead of board.h!
+#endif
+
 #include "config_chip.h"
 #include "board.h"