3 files changed, 26 insertions, 8 deletions
diff --git a/MdePkg/Library/UefiUsbLib/UefiUsbLibInternal.h b/MdePkg/Library/UefiUsbLib/UefiUsbLibInternal.h
new file mode 100644
index 0000000000..9d7be04d21
--- /dev/null
+++ b/MdePkg/Library/UefiUsbLib/UefiUsbLibInternal.h
@@ -0,0 +1,22 @@
+/**@file
+  Common header file shared by all source files.
+
+  This file includes package header files, library classes and protocol, PPI & GUID definitions.
+
+  Copyright (c) 2006, Intel Corporation.
+  All rights reserved. This program and the accompanying materials
+   are licensed and made available under the terms and conditions of the BSD License
+   which accompanies this distribution. The full text of the license may be found at
+   http://opensource.org/licenses/bsd-license.php
+   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+
+#ifndef __UEFI_USB_LIB_INTERNAL_H_
+#define __UEFI_USB_LIB_INTERNAL_H_
+
+#include <PiDxe.h>
+#include <Library/UsbLib.h>
+#include <Library/BaseMemoryLib.h>
+
+#endif
diff --git a/MdePkg/Library/UefiUsbLib/UsbDxeLib.c b/MdePkg/Library/UefiUsbLib/UsbDxeLib.c
index 9da8005fc2..c8c89acc12 100644
--- a/MdePkg/Library/UefiUsbLib/UsbDxeLib.c
+++ b/MdePkg/Library/UefiUsbLib/UsbDxeLib.c
@@ -13,9 +13,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
-#include <PiDxe.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/UsbLib.h>
+#include <UefiUsbLibInternal.h>
+
 
 /**
   Usb Get Descriptor
diff --git a/MdePkg/Library/UefiUsbLib/hid.c b/MdePkg/Library/UefiUsbLib/hid.c
index 185fc7b7f5..7c0ee14284 100644
--- a/MdePkg/Library/UefiUsbLib/hid.c
+++ b/MdePkg/Library/UefiUsbLib/hid.c
@@ -11,12 +11,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 
 **/
-#include <PiDxe.h>
-#include <Library/UsbLib.h>
 
-//
-// Function to get HID descriptor
-//
+#include <UefiUsbLibInternal.h>
+
 
 /**
   Get Hid Descriptor