diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index 5529116824..d171610da4 100644
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -765,7 +765,7 @@
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>DXE_CORE</FfsFormatKey>
         <Options>
-          <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="CC">"/WX-", "/Ob0"</Option>
+          <Option ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="CC">/WX- /Ob0</Option>
         </Options>
       </ModuleSaBuildOptions>
     </ModuleSA>
@@ -5928,7 +5928,7 @@
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>DXE_CORE</FfsFormatKey>
         <Options>
-          <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="CC">"/WX-", "/Ob0"</Option>
+          <Option ToolChainFamily="MSFT" SupArchList="X64" ToolCode="CC">/WX- /Ob0</Option>
         </Options>
       </ModuleSaBuildOptions>
     </ModuleSA>
@@ -9950,7 +9950,7 @@
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>DXE_CORE</FfsFormatKey>
         <Options>
-          <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="CC">"/WX-", "/Ob0"</Option>
+          <Option ToolChainFamily="MSFT" SupArchList="IPF" ToolCode="CC">/WX- /Ob0</Option>
         </Options>
       </ModuleSaBuildOptions>
     </ModuleSA>
@@ -13976,7 +13976,7 @@
         <FvBinding>NULL</FvBinding>
         <FfsFormatKey>DXE_CORE</FfsFormatKey>
         <Options>
-          <Option ToolChainFamily="INTEL" SupArchList="EBC" ToolCode="CC">"/WX-", "/Ob0"</Option>
+          <Option ToolChainFamily="INTEL" SupArchList="EBC" ToolCode="CC">/WX- /Ob0</Option>
         </Options>
       </ModuleSaBuildOptions>
     </ModuleSA>
diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index 063e5ac32e..6347998e49 100644
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -592,8 +592,8 @@
         <FvBinding>FV_RECOVERY</FvBinding>
         <FfsFormatKey>PE32_PEIM</FfsFormatKey>
         <Options>
-          <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">"Kernel32.lib", "MSVCRTD.lib", "Gdi32.lib", "User32.lib", "Winmm.lib"</Option>
-          <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">"Kernel32.lib", "MSVCRTD.lib", "Gdi32.lib", "User32.lib", "Winmm.lib"</Option>
+          <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib</Option>
+          <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib</Option>
         </Options>
       </ModuleSaBuildOptions>
     </ModuleSA>
@@ -2542,8 +2542,8 @@
         <FvBinding>FV_RECOVERY</FvBinding>
         <FfsFormatKey>BS_DRIVER</FfsFormatKey>
         <Options>
-          <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">"Kernel32.lib", "MSVCRTD.lib", "Gdi32.lib", "User32.lib", "Winmm.lib"</Option>
-          <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">"Kernel32.lib", "MSVCRTD.lib", "Gdi32.lib", "User32.lib", "Winmm.lib"</Option>
+          <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib</Option>
+          <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="DLINK">Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib</Option>
         </Options>
       </ModuleSaBuildOptions>
     </ModuleSA>