diff --git a/lib/bsp/standalone/src/common/xil_assert.h b/lib/bsp/standalone/src/common/xil_assert.h
index 644f13a6..355c2d66 100644
--- a/lib/bsp/standalone/src/common/xil_assert.h
+++ b/lib/bsp/standalone/src/common/xil_assert.h
@@ -60,6 +60,8 @@
 #ifndef XIL_ASSERT_H	/* prevent circular inclusions */
 #define XIL_ASSERT_H	/* by using protection macros */
 
+#include "xil_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lib/bsp/standalone/src/common/xil_testcache.c b/lib/bsp/standalone/src/common/xil_testcache.c
index 93659045..c52c3857 100644
--- a/lib/bsp/standalone/src/common/xil_testcache.c
+++ b/lib/bsp/standalone/src/common/xil_testcache.c
@@ -73,6 +73,8 @@
 #include "xreg_cortexr5.h"
 #endif
 
+#include "xil_types.h"
+
 extern void xil_printf(const char8 *ctrl1, ...);
 
 #define DATA_LENGTH 128
diff --git a/lib/bsp/standalone/src/common/xil_testcache.h b/lib/bsp/standalone/src/common/xil_testcache.h
index 659d7a03..dcf4e931 100644
--- a/lib/bsp/standalone/src/common/xil_testcache.h
+++ b/lib/bsp/standalone/src/common/xil_testcache.h
@@ -56,6 +56,8 @@
 #ifndef XIL_TESTCACHE_H	/* prevent circular inclusions */
 #define XIL_TESTCACHE_H	/* by using protection macros */
 
+#include "xil_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lib/bsp/standalone/src/cortexa53/gcc/xpseudo_asm_gcc.h b/lib/bsp/standalone/src/cortexa53/gcc/xpseudo_asm_gcc.h
index 439bd767..4346e0e4 100644
--- a/lib/bsp/standalone/src/cortexa53/gcc/xpseudo_asm_gcc.h
+++ b/lib/bsp/standalone/src/cortexa53/gcc/xpseudo_asm_gcc.h
@@ -63,6 +63,8 @@
 
 /***************************** Include Files ********************************/
 
+#include "xil_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
diff --git a/lib/bsp/standalone/src/cortexa9/sleep.h b/lib/bsp/standalone/src/cortexa9/sleep.h
index 85bd6c62..88dc6e89 100644
--- a/lib/bsp/standalone/src/cortexa9/sleep.h
+++ b/lib/bsp/standalone/src/cortexa9/sleep.h
@@ -29,11 +29,12 @@
 * this Software without prior written authorization from Xilinx.
 *
 ******************************************************************************/
-#include "xil_types.h"
 
 #ifndef SLEEP_H
 #define SLEEP_H
 
+#include "xil_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif