diff --git a/test-app/app_imx_rt.c b/test-app/app_imx_rt.c
index 317826d43..120aa16cc 100644
--- a/test-app/app_imx_rt.c
+++ b/test-app/app_imx_rt.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
+#include "target.h"
 #include "wolfboot/wolfboot.h"
 #include <stdint.h>
 #include "fsl_common.h"
@@ -24,7 +25,6 @@
 #include "fsl_debug_console.h"
 #include "fsl_gpio.h"
 #include "fsl_iomuxc.h"
-#include "target.h"
 
 static int g_pinSet = false;
 extern void imx_rt_init_boot_clock(void);
diff --git a/test-app/app_nrf52.c b/test-app/app_nrf52.c
index 593a7e9ee..d910cf3f7 100644
--- a/test-app/app_nrf52.c
+++ b/test-app/app_nrf52.c
@@ -22,10 +22,10 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
+#include "target.h"
 #include "wolfboot/wolfboot.h"
 #include "hal/nrf52.h"
 #include "printf.h"
-#include "target.h"
 
 static const char extradata[1024 * 16] = "hi!";
 
diff --git a/test-app/app_stm32f7.c b/test-app/app_stm32f7.c
index 842629738..44ae204b9 100644
--- a/test-app/app_stm32f7.c
+++ b/test-app/app_stm32f7.c
@@ -25,9 +25,9 @@
 #include <stdint.h>
 #include <string.h>
 #include "system.h"
+#include "target.h"
 #include "wolfboot/wolfboot.h"
 #include "hal.h"
-#include "target.h"
 
 
 /* UART module */
diff --git a/test-app/app_stm32l0.c b/test-app/app_stm32l0.c
index b4cfe8d71..1697eb614 100644
--- a/test-app/app_stm32l0.c
+++ b/test-app/app_stm32l0.c
@@ -25,11 +25,11 @@
 #include <stdint.h>
 #include <string.h>
 #include "led.h"
+#include "target.h"
 #include "wolfboot/wolfboot.h"
 #ifdef SPI_FLASH
 #include "spi_flash.h"
 #endif
-#include "target.h"
 
 #ifdef TARGET_stm32l0