4 files changed, 5 insertions, 15 deletions
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h
index 8a12d0fa3f..2066c38e7e 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h
@@ -24,6 +24,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/DevicePath.h>
 
 #include <Guid/HiiKeyBoardLayout.h>
+#include <Guid/UsbKeyBoardLayout.h>
 
 #include <Library/DebugLib.h>
 #include <Library/ReportStatusCodeLib.h>
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
index 859a4dece3..000430ae78 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
@@ -14,9 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include "KeyBoard.h"
 
-EFI_GUID  mUsbKeyboardLayoutPackageGuid = USB_KEYBOARD_LAYOUT_PACKAGE_GUID;
-EFI_GUID  mUsbKeyboardLayoutKeyGuid = USB_KEYBOARD_LAYOUT_KEY_GUID;
-
 USB_KEYBOARD_LAYOUT_PACK_BIN  mUsbKeyboardLayoutBin = {
   sizeof (USB_KEYBOARD_LAYOUT_PACK_BIN),   // Binary size
 
@@ -338,7 +335,7 @@ InstallDefaultKeyboardLayout (
   // Install Keyboard Layout package to HII database
   //
   HiiHandle = HiiAddPackages (
-                &mUsbKeyboardLayoutPackageGuid,
+                &gUsbKeyboardLayoutPackageGuid,
                 UsbKeyboardDevice->ControllerHandle,
                 &mUsbKeyboardLayoutBin,
                 NULL
@@ -350,7 +347,7 @@ InstallDefaultKeyboardLayout (
   //
   // Set current keyboard layout
   //
-  Status = HiiDatabase->SetKeyboardLayout (HiiDatabase, &mUsbKeyboardLayoutKeyGuid);
+  Status = HiiDatabase->SetKeyboardLayout (HiiDatabase, &gUsbKeyboardLayoutKeyGuid);
 
   return Status;
 }
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.h b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.h
index 73efef8f62..c41a0727f1 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.h
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.h
@@ -18,16 +18,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include "EfiKey.h"
 
-#define USB_KEYBOARD_LAYOUT_PACKAGE_GUID \
-  { \
-    0xc0f3b43, 0x44de, 0x4907, { 0xb4, 0x78, 0x22, 0x5f, 0x6f, 0x62, 0x89, 0xdc } \
-  }
-
-#define USB_KEYBOARD_LAYOUT_KEY_GUID \
-  { \
-    0x3a4d7a7c, 0x18a, 0x4b42, { 0x81, 0xb3, 0xdc, 0x10, 0xe3, 0xb5, 0x91, 0xbd } \
-  }
-
 #define USB_KEYBOARD_KEY_COUNT            104
 
 #define USB_KEYBOARD_LANGUAGE_STR_LEN     5         // RFC4646 Language Code: "en-US"
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
index 6c2c7f4315..b1da4b7786 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
@@ -74,6 +74,8 @@
   # which will be triggered by EFI_HII_DATABASE_PROTOCOL.SetKeyboardLayout().
   #
   gEfiHiiKeyBoardLayoutGuid                     ## SOMETIME_CONSUMES  ## Event
+  gUsbKeyboardLayoutPackageGuid
+  gUsbKeyboardLayoutKeyGuid
 
 [Protocols]
   gEfiUsbIoProtocolGuid                         ## TO_START