diff --git a/configs/sam4s-xplained/include/board.h b/configs/sam4s-xplained/include/board.h
index 7fc97d5ccc..e3fdda9890 100644
--- a/configs/sam4s-xplained/include/board.h
+++ b/configs/sam4s-xplained/include/board.h
@@ -44,24 +44,7 @@
 
 #ifndef __ASSEMBLY__
 #  include <stdint.h>
-#  ifdef CONFIG_SAM34_GPIO_IRQ
-#    include <arch/irq.h>
-#  endif
-#endif
-
-/************************************************************************************
- * Pre-processor Definitions
- ************************************************************************************/
-
-/************************************************************************************
- * Included Files
- ************************************************************************************/
-
-#include <nuttx/config.h>
-
-#ifndef __ASSEMBLY__
-#  include <stdint.h>
-#  ifdef CONFIG_SAM34_GPIO_IRQ
+#  ifdef CONFIG_SAM34_SAM34_GPIO_IRQ
 #    include <arch/irq.h>
 #  endif
 #endif