diff --git a/UnixPkg/Library/UnixBdsLib/BdsPlatform.h b/UnixPkg/Library/UnixBdsLib/BdsPlatform.h
index 32587b6a26..4935e64bd6 100644
--- a/UnixPkg/Library/UnixBdsLib/BdsPlatform.h
+++ b/UnixPkg/Library/UnixBdsLib/BdsPlatform.h
@@ -32,7 +32,8 @@ Abstract:
 #include <Library/PcdLib.h>
 #include <Library/GenericBdsLib.h>
 #include <Library/PlatformBdsLib.h>
-#include <Library/GraphicsLib.h>
+#include <Library/GraphicsLib.h>
+#include <Library/DevicePathLib.h>
 
 #include <Protocol/UnixThunk.h>
 #include <Protocol/UnixIo.h>
diff --git a/UnixPkg/Library/UnixBdsLib/PlatformBds.inf b/UnixPkg/Library/UnixBdsLib/PlatformBds.inf
index 3ce8ff605b..37ea09aedd 100644
--- a/UnixPkg/Library/UnixBdsLib/PlatformBds.inf
+++ b/UnixPkg/Library/UnixBdsLib/PlatformBds.inf
@@ -73,8 +73,9 @@
   DebugLib
   PcdLib
   GraphicsLib
-  GenericBdsLib
+  GenericBdsLib
+  DevicePathLib
 
 
 [Guids]
-  gEfiDefaultBmpLogoGuid                        # ALWAYS_CONSUMED
\ No newline at end of file
+  gEfiDefaultBmpLogoGuid                        # ALWAYS_CONSUMED
diff --git a/UnixPkg/Library/UnixBdsLib/PlatformData.c b/UnixPkg/Library/UnixBdsLib/PlatformData.c
index cf1b55ce30..9051dbf33f 100644
--- a/UnixPkg/Library/UnixBdsLib/PlatformData.c
+++ b/UnixPkg/Library/UnixBdsLib/PlatformData.c
@@ -32,18 +32,22 @@ UINT16                      gPlatformBootTimeOutDefault = 10;
 //
 UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath0 = 
 {
-  {
+  {
       HARDWARE_DEVICE_PATH,
       HW_VENDOR_DP,
-      (UINT8) (sizeof (VENDOR_DEVICE_PATH)),
-      (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),
+      {
+        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),
+        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),
+      },
       EFI_UNIX_THUNK_PROTOCOL_GUID
   },
   {
       HARDWARE_DEVICE_PATH,
       HW_VENDOR_DP,
-      (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),
-      (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8),
+      {
+        (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),
+        (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8),
+      },
       EFI_UNIX_UGA_GUID,
       0
   },
@@ -54,15 +58,19 @@ UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath1 = {
   {
       HARDWARE_DEVICE_PATH,
       HW_VENDOR_DP,
-      (UINT8) (sizeof (VENDOR_DEVICE_PATH)),
-      (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),
+      {
+        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),
+        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),
+      },
       EFI_UNIX_THUNK_PROTOCOL_GUID
   },
   {
       HARDWARE_DEVICE_PATH,
       HW_VENDOR_DP,
-      (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),
-      (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8),
+      {
+        (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),
+        (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8),
+      },
       EFI_UNIX_UGA_GUID,
       1
   },
@@ -72,16 +80,20 @@ UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath1 = {
 UNIX_CONSOLE_DEVICE_PATH   gUnixConsoleDevicePath = {
   {
       HARDWARE_DEVICE_PATH,
-      HW_VENDOR_DP,
-      (UINT8) (sizeof (VENDOR_DEVICE_PATH)),
-      (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),
+      HW_VENDOR_DP,
+      {
+        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),
+        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),
+      },
       EFI_UNIX_THUNK_PROTOCOL_GUID
   },
   {
       HARDWARE_DEVICE_PATH,
-      HW_VENDOR_DP,
-      (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),
-      (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8),
+      HW_VENDOR_DP,
+      {
+        (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),
+        (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8),
+      },
       EFI_UNIX_CONSOLE_GUID,
       0  
   },