5 files changed, 8 insertions, 4 deletions
diff --git a/include/lib/el3_runtime/context_el1.h b/include/lib/el3_runtime/context_el1.h
index f320d2c5f..3011f0c10 100644
--- a/include/lib/el3_runtime/context_el1.h
+++ b/include/lib/el3_runtime/context_el1.h
@@ -11,6 +11,8 @@
 
 #ifndef __ASSEMBLER__
 
+#include <stdint.h>
+
 /*******************************************************************************
  * EL1 Registers:
  * AArch64 EL1 system register context structure for preserving the
diff --git a/include/lib/extensions/sysreg128.h b/include/lib/extensions/sysreg128.h
index 8854856b6..433633323 100644
--- a/include/lib/extensions/sysreg128.h
+++ b/include/lib/extensions/sysreg128.h
@@ -9,9 +9,9 @@
 
 #ifndef __ASSEMBLER__
 
-#if ENABLE_FEAT_D128
 #include <stdint.h>
 
+#if ENABLE_FEAT_D128
 typedef uint128_t sysreg_t;
 
 #define PAR_EL1_D128	(((sysreg_t)(1ULL)) << (64))
diff --git a/include/lib/libc/cdefs.h b/include/lib/libc/cdefs.h
index ecedb264c..1c708b3cf 100644
--- a/include/lib/libc/cdefs.h
+++ b/include/lib/libc/cdefs.h
@@ -55,4 +55,6 @@
 #define __predict_true(exp)     (exp)
 #define __predict_false(exp)    (exp)
 
+#define __BSD_VISIBLE		0
+
 #endif /* CDEFS_H */
diff --git a/include/lib/xlat_tables/xlat_tables_v2.h b/include/lib/xlat_tables/xlat_tables_v2.h
index 88c23e15b..d2c3a8c95 100644
--- a/include/lib/xlat_tables/xlat_tables_v2.h
+++ b/include/lib/xlat_tables/xlat_tables_v2.h
@@ -298,7 +298,7 @@ void mmap_add_region_alloc_va_ctx(xlat_ctx_t *ctx, mmap_region_t *mm);
  */
 void mmap_add_alloc_va(mmap_region_t *mm);
 
-#if PLAT_XLAT_TABLES_DYNAMIC
+#if defined(PLAT_XLAT_TABLES_DYNAMIC) && PLAT_XLAT_TABLES_DYNAMIC
 /*
  * Add a dynamic region with defined base PA and base VA. This type of region
  * can be added and removed even after the translation tables are initialized.
diff --git a/include/lib/xlat_tables/xlat_tables_v2_helpers.h b/include/lib/xlat_tables/xlat_tables_v2_helpers.h
index 77277615f..8af1f9f70 100644
--- a/include/lib/xlat_tables/xlat_tables_v2_helpers.h
+++ b/include/lib/xlat_tables/xlat_tables_v2_helpers.h
@@ -78,7 +78,7 @@ struct xlat_ctx {
 	 * Keep track of how many regions are mapped in each table. The base
 	 * table can't be unmapped so it isn't needed to keep track of it.
 	 */
-#if PLAT_XLAT_TABLES_DYNAMIC
+#if defined(PLAT_XLAT_TABLES_DYNAMIC) && PLAT_XLAT_TABLES_DYNAMIC
 	int *tables_mapped_regions;
 #endif /* PLAT_XLAT_TABLES_DYNAMIC */
 
@@ -112,7 +112,7 @@ struct xlat_ctx {
 	int xlat_regime;
 };
 
-#if PLAT_XLAT_TABLES_DYNAMIC
+#if defined(PLAT_XLAT_TABLES_DYNAMIC) && PLAT_XLAT_TABLES_DYNAMIC
 #define XLAT_ALLOC_DYNMAP_STRUCT(_ctx_name, _xlat_tables_count)		\
 	static int _ctx_name##_mapped_regions[_xlat_tables_count];