diff --git a/BaseTools/Source/C/Makefiles/ms.common b/BaseTools/Source/C/Makefiles/ms.common
index 66f0f5ba4c..2aafe58c11 100644
--- a/BaseTools/Source/C/Makefiles/ms.common
+++ b/BaseTools/Source/C/Makefiles/ms.common
@@ -44,6 +44,8 @@ BIN_PATH     = $(BASE_TOOLS_PATH)\Bin\Win32
 LIB_PATH     = $(BASE_TOOLS_PATH)\Lib\Win32
 SYS_BIN_PATH = $(EDK_TOOLS_PATH)\Bin\Win32
 SYS_LIB_PATH = $(EDK_TOOLS_PATH)\Lib\Win32
+# Note: Disable flexible array member warnings
+CFLAGS = $(CFLAGS) /wd4200
 
 !ELSEIF "$(HOST_ARCH)"=="X64"
 ARCH_INCLUDE = $(EDK2_PATH)\MdePkg\Include\X64
@@ -52,6 +54,8 @@ LIB_PATH     = $(BASE_TOOLS_PATH)\Lib\Win64
 SYS_BIN_PATH = $(EDK_TOOLS_PATH)\Bin\Win64
 SYS_LIB_PATH = $(EDK_TOOLS_PATH)\Lib\Win64
 CFLAGS = $(CFLAGS) /wd4267 /wd4244 /wd4334
+# Note: Disable flexible array member warnings
+CFLAGS = $(CFLAGS) /wd4200
 
 !ELSEIF "$(HOST_ARCH)"=="ARM"
 ARCH_INCLUDE = $(EDK2_PATH)\MdePkg\Include\Arm
@@ -59,6 +63,8 @@ BIN_PATH     = $(BASE_TOOLS_PATH)\Bin\Win32
 LIB_PATH     = $(BASE_TOOLS_PATH)\Lib\Win32
 SYS_BIN_PATH = $(EDK_TOOLS_PATH)\Bin\Win32
 SYS_LIB_PATH = $(EDK_TOOLS_PATH)\Lib\Win32
+# Note: Disable flexible array member warnings
+CFLAGS = $(CFLAGS) /wd4200
 
 !ELSEIF "$(HOST_ARCH)"=="AARCH64"
 ARCH_INCLUDE = $(EDK2_PATH)\MdePkg\Include\AArch64
@@ -68,7 +74,8 @@ SYS_BIN_PATH = $(EDK_TOOLS_PATH)\Bin\Win64
 SYS_LIB_PATH = $(EDK_TOOLS_PATH)\Lib\Win64
 # Note: These are bit-width conversion related warning suppressions.
 CFLAGS = $(CFLAGS) /wd4267 /wd4244 /wd4334
-
+# Note: Disable flexible array member warnings
+CFLAGS = $(CFLAGS) /wd4200
 !ELSE
 !ERROR "Bad HOST_ARCH"
 !ENDIF