diff --git a/board/falco/board.h b/board/falco/board.h
index 58828c0e7c..42f64f30da 100644
--- a/board/falco/board.h
+++ b/board/falco/board.h
@@ -17,6 +17,7 @@
 /* Optional features */
 #define CONFIG_SMART_BATTERY
 #define CONFIG_BATTERY_FALCO
+#define CONFIG_BOARD_VERSION
 #define CONFIG_CHARGER
 #define CONFIG_CHARGER_BQ24738
 #ifdef HAS_TASK_CHIPSET
diff --git a/board/link/board.h b/board/link/board.h
index 6da09f61e5..c451d1269b 100644
--- a/board/link/board.h
+++ b/board/link/board.h
@@ -17,6 +17,7 @@
 /* Optional features */
 #define CONFIG_SMART_BATTERY
 #define CONFIG_BATTERY_LINK
+#define CONFIG_BOARD_VERSION
 #define CONFIG_CHARGER
 #define CONFIG_CHARGER_BQ24725
 #ifdef HAS_TASK_CHIPSET
diff --git a/board/peppy/board.h b/board/peppy/board.h
index f69effda35..efcc467198 100644
--- a/board/peppy/board.h
+++ b/board/peppy/board.h
@@ -17,6 +17,7 @@
 /* Optional features */
 #define CONFIG_SMART_BATTERY
 #define CONFIG_BATTERY_PEPPY
+#define CONFIG_BOARD_VERSION
 #define CONFIG_CHARGER
 #define CONFIG_CHARGER_BQ24707A
 #ifdef HAS_TASK_CHIPSET
diff --git a/board/slippy/board.h b/board/slippy/board.h
index 89b69ca2e1..7ea26b4139 100644
--- a/board/slippy/board.h
+++ b/board/slippy/board.h
@@ -17,6 +17,7 @@
 /* Optional features */
 #define CONFIG_SMART_BATTERY
 #define CONFIG_BATTERY_SLIPPY
+#define CONFIG_BOARD_VERSION
 #define CONFIG_CHARGER
 #define CONFIG_CHARGER_BQ24707A
 #ifdef HAS_TASK_CHIPSET
diff --git a/common/system_common.c b/common/system_common.c
index f13b368a28..e33cab8316 100644
--- a/common/system_common.c
+++ b/common/system_common.c
@@ -438,7 +438,7 @@ int system_get_board_version(void)
 {
 	int v = 0;
 
-#ifdef BOARD_link				/* HEY: Slippy? */
+#ifdef CONFIG_BOARD_VERSION
 	if (gpio_get_level(GPIO_BOARD_VERSION1))
 		v |= 0x01;
 	if (gpio_get_level(GPIO_BOARD_VERSION2))