diff --git a/Makefile b/Makefile
index f622c812..11e16344 100644
--- a/Makefile
+++ b/Makefile
@@ -96,6 +96,7 @@ GENFLAGS	+=	-DOPENSBI_MINOR=$(MINOR)
 GENFLAGS	+=	-I$(platform_dir)/include
 GENFLAGS	+=	-I$(platform_common_dir)/include
 GENFLAGS	+=	-I$(include_dir)
+GENFLAGS	+=	$(platform-common-genflags-y)
 GENFLAGS	+=	$(platform-genflags-y)
 GENFLAGS	+=	$(firmware-genflags-y)
 
diff --git a/platform/common/libfdt/objects.mk b/platform/common/libfdt/objects.mk
index 1ae1cacd..bd58e30d 100644
--- a/platform/common/libfdt/objects.mk
+++ b/platform/common/libfdt/objects.mk
@@ -13,3 +13,4 @@ $(foreach file, $(libfdt_files), \
         $(eval CFLAGS_$(file) = -I$(src)/../../common/libfdt))
 
 platform-common-objs-$(PLATFORM_INCLUDE_LIBFDT) += $(addprefix libfdt/,$(libfdt_files))
+platform-common-genflags-$(PLATFORM_INCLUDE_LIBFDT) += -I$(platform_common_dir)/libfdt/
diff --git a/platform/sifive/fu540/config.mk b/platform/sifive/fu540/config.mk
index 07419b64..ffcbff81 100644
--- a/platform/sifive/fu540/config.mk
+++ b/platform/sifive/fu540/config.mk
@@ -26,3 +26,7 @@ FW_JUMP_FDT_ADDR=0x82200000
 FW_PAYLOAD=y
 FW_PAYLOAD_OFFSET=0x200000
 FW_PAYLOAD_FDT_ADDR=0x82200000
+
+# External Libraries to include
+PLATFORM_INCLUDE_LIBFDT=y
+PLATFORM_INCLUDE_LIBC=y