diff --git a/configs/sama5d2-xult/include/board.h b/configs/sama5d2-xult/include/board.h
index d270e1bc120..a54a28782c7 100644
--- a/configs/sama5d2-xult/include/board.h
+++ b/configs/sama5d2-xult/include/board.h
@@ -41,8 +41,11 @@
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include <stdbool.h>
-#include <nuttx/irq.h>
+
+#ifndef __ASSEMBLY__
+#  include <stdbool.h>
+#  include <nuttx/irq.h>
+#endif
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -207,7 +210,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif