diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202408.bb b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202408.bb
index fa44e28f..6b0f1961 100644
--- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202408.bb
+++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202408.bb
@@ -1,3 +1,5 @@
+require recipes-bsp/uefi/edk2-firmware.inc
+
 SRCREV_edk2           ?= "b158dad150bf02879668f72ce306445250838201"
 SRCREV_edk2-platforms ?= "a3c898956a4d48dc5980336fa6ce6eeb23c4f72b"
 
@@ -8,5 +10,3 @@ SRC_URI += "file://0001-Platform-StMmRpmb-Fix-build.patch;patchdir=edk2-platform
 # ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c:146:37:
 # error: variable 'ContainedElements' is uninitialized when passed as a const pointer argument here [-Werror,-Wuninitialized-const-pointer]
 TOOLCHAIN:aarch64 = "gcc"
-
-require recipes-bsp/uefi/edk2-firmware.inc
diff --git a/meta-arm-bsp/recipes-bsp/uefi/files/0001-BaseTools-Pccts-set-C-standard.patch b/meta-arm-bsp/recipes-bsp/uefi/files/0001-BaseTools-Pccts-set-C-standard.patch
index 058073c9..913bd4a9 100644
--- a/meta-arm-bsp/recipes-bsp/uefi/files/0001-BaseTools-Pccts-set-C-standard.patch
+++ b/meta-arm-bsp/recipes-bsp/uefi/files/0001-BaseTools-Pccts-set-C-standard.patch
@@ -21,27 +21,27 @@ index 746d58b5e2..b47c8a37af 100644
 --- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
 +++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
 @@ -169,7 +169,7 @@ ANTLR=${BIN_DIR}/antlr
- DLG=${BIN_DIR}/dlg
- OBJ_EXT=o
- OUT_OBJ = -o
--CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536
-+CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536 -std=gnu11
- CPPFLAGS=
- #
- # SGI Users, use this CFLAGS
+ DLG=${BIN_DIR}/dlg
+ OBJ_EXT=o
+ OUT_OBJ = -o
+-CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536
++CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536 -std=gnu11
+ CPPFLAGS=
+ #
+ # SGI Users, use this CFLAGS
 diff --git a/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile b/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
 index e45ac98e04..d72bee3d70 100644
 --- a/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
 +++ b/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
 @@ -123,7 +123,7 @@ endif
- COPT=-O
- ANTLR=${BIN_DIR}/antlr
- DLG=${BIN_DIR}/dlg
--CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536
-+CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536 -std=gnu11
- CPPFLAGS=
- OBJ_EXT=o
- OUT_OBJ = -o
+ COPT=-O
+ ANTLR=${BIN_DIR}/antlr
+ DLG=${BIN_DIR}/dlg
+-CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536
++CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536 -std=gnu11
+ CPPFLAGS=
+ OBJ_EXT=o
+ OUT_OBJ = -o
 -- 
 2.43.0