diff --git a/include/image.h b/include/image.h
index 02d7ae27..c2f44839 100644
--- a/include/image.h
+++ b/include/image.h
@@ -89,7 +89,9 @@ int wolfBot_get_dts_size(void *dts_addr);
     #else
         #define XALIGNED(x) /* null expansion */
     #endif
+#endif
 
+#ifndef XALIGNED_STACK
     /* Don't enforce stack alignment on IAR */
     #if defined (__IAR_SYSTEMS_ICC__)
         #define XALIGNED_STACK(x)
diff --git a/tools/unit-tests/unit-extflash.c b/tools/unit-tests/unit-extflash.c
index d698b344..1dfbd51a 100644
--- a/tools/unit-tests/unit-extflash.c
+++ b/tools/unit-tests/unit-extflash.c
@@ -47,6 +47,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "user_settings.h"
+#include "image.h"
 
 #include "libwolfboot.c"