diff --git a/src/drivers/boards/px4fmu-v5/board_config.h b/src/drivers/boards/px4fmu-v5/board_config.h
index be0f54dedc..2bb80625fb 100644
--- a/src/drivers/boards/px4fmu-v5/board_config.h
+++ b/src/drivers/boards/px4fmu-v5/board_config.h
@@ -47,12 +47,7 @@
 #include <nuttx/compiler.h>
 #include <stdint.h>
 
-__BEGIN_DECLS
-
-/* these headers are not C++ safe */
-#include <chip.h>
 #include <stm32_gpio.h>
-#include <arch/board/board.h>
 
 /****************************************************************************************************
  * Definitions
@@ -609,6 +604,8 @@ __BEGIN_DECLS
 		GPIO_SAFETY_SWITCH_IN             \
 	}
 
+__BEGIN_DECLS
+
 /****************************************************************************************************
  * Public Types
  ****************************************************************************************************/