diff --git a/EmulatorPkg/Library/EmuBdsLib/BdsPlatform.h b/EmulatorPkg/Library/EmuBdsLib/BdsPlatform.h
index cf2bb3e81c..a099fecda0 100644
--- a/EmulatorPkg/Library/EmuBdsLib/BdsPlatform.h
+++ b/EmulatorPkg/Library/EmuBdsLib/BdsPlatform.h
@@ -42,8 +42,10 @@ extern EFI_DEVICE_PATH_PROTOCOL   *gPlatformDriverOption[];
   { \
     END_DEVICE_PATH_TYPE,\
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\
-    END_DEVICE_PATH_LENGTH,\
-    0\
+    { \
+      END_DEVICE_PATH_LENGTH,\
+      0\
+    }\
   }
 
 
diff --git a/EmulatorPkg/Library/EmuBdsLib/PlatformData.c b/EmulatorPkg/Library/EmuBdsLib/PlatformData.c
index 37e35f5e06..977da6a28d 100644
--- a/EmulatorPkg/Library/EmuBdsLib/PlatformData.c
+++ b/EmulatorPkg/Library/EmuBdsLib/PlatformData.c
@@ -32,6 +32,7 @@ EMU_PLATFORM_UGA_DEVICE_PATH gGopDevicePath = {
     0
   },
   {
+    {
       HARDWARE_DEVICE_PATH,
       HW_VENDOR_DP,
       {
@@ -39,7 +40,8 @@ EMU_PLATFORM_UGA_DEVICE_PATH gGopDevicePath = {
         (UINT8) ((sizeof (EMU_VENDOR_DEVICE_PATH_NODE)) >> 8)
       },
       EMU_GRAPHICS_WINDOW_PROTOCOL_GUID,
-      0
+    },
+    0
   },
   gEndEntire
 };