diff --git a/configs/lpc4330-xplorer/include/board.h b/configs/lpc4330-xplorer/include/board.h
index 8e4e531b256..0a7c7d5f8c5 100644
--- a/configs/lpc4330-xplorer/include/board.h
+++ b/configs/lpc4330-xplorer/include/board.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 #include <stdbool.h>
 
-#if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_GPIO_IRQ)
+#if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_LPC43_GPIO_IRQ)
 #  include <nuttx/irq.h>
 #endif
 
diff --git a/configs/lpc4330-xplorer/src/lpc43_buttons.c b/configs/lpc4330-xplorer/src/lpc43_buttons.c
index 03d27d84899..a277bfc8689 100644
--- a/configs/lpc4330-xplorer/src/lpc43_buttons.c
+++ b/configs/lpc4330-xplorer/src/lpc43_buttons.c
@@ -72,7 +72,7 @@ static const uint16_t g_buttoncfg[BOARD_NUM_BUTTONS] =
  * button events.
  */
 
-#if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_GPIO_IRQ)
+#if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_LPC43_GPIO_IRQ)
 static xcpt_t g_buttonisr[BOARD_NUM_BUTTONS];
 
 /* This array provides the mapping from button ID numbers to button IRQ
@@ -177,7 +177,7 @@ uint8_t board_buttons(void)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_GPIO_IRQ)
+#if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_LPC43_GPIO_IRQ)
 xcpt_t board_button_irq(int id, xcpt_t irqhandler)
 {
   xcpt_t oldhandler = NULL;
diff --git a/configs/lpc4337-ws/include/board.h b/configs/lpc4337-ws/include/board.h
index 76da5ef7477..0fe485ad71e 100644
--- a/configs/lpc4337-ws/include/board.h
+++ b/configs/lpc4337-ws/include/board.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 #include <stdbool.h>
 
-#if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_GPIO_IRQ)
+#if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_LPC43_GPIO_IRQ)
 #  include <nuttx/irq.h>
 #endif
 
diff --git a/configs/lpc4357-evb/include/board.h b/configs/lpc4357-evb/include/board.h
index a1667e66dae..91f0e458b4b 100644
--- a/configs/lpc4357-evb/include/board.h
+++ b/configs/lpc4357-evb/include/board.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 #include <stdbool.h>
 
-#if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_GPIO_IRQ)
+#if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_LPC43_GPIO_IRQ)
 #  include <nuttx/irq.h>
 #endif
 
diff --git a/configs/lpc4357-evb/src/lpc43_buttons.c b/configs/lpc4357-evb/src/lpc43_buttons.c
index df7f32aef66..37ac652cdfc 100644
--- a/configs/lpc4357-evb/src/lpc43_buttons.c
+++ b/configs/lpc4357-evb/src/lpc43_buttons.c
@@ -72,7 +72,7 @@ static const uint16_t g_buttoncfg[BOARD_NUM_BUTTONS] =
  * button events.
  */
 
-#if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_GPIO_IRQ)
+#if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_LPC43_GPIO_IRQ)
 static xcpt_t g_buttonisr[BOARD_NUM_BUTTONS];
 
 /* This array provides the mapping from button ID numbers to button IRQ
@@ -183,7 +183,7 @@ uint8_t board_buttons(void)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_GPIO_IRQ)
+#if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_LPC43_GPIO_IRQ)
 xcpt_t board_button_irq(int id, xcpt_t irqhandler)
 {
 #if 0 /* Not yet implemented */
diff --git a/configs/lpc4370-link2/include/board.h b/configs/lpc4370-link2/include/board.h
index 7bbbd861053..c177c6d4616 100644
--- a/configs/lpc4370-link2/include/board.h
+++ b/configs/lpc4370-link2/include/board.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 #include <stdbool.h>
 
-#if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_GPIO_IRQ)
+#if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_LPC43_GPIO_IRQ)
 #  include <nuttx/irq.h>
 #endif