-/*++\r
+/**@file\r
\r
Copyright (c) 2006, Intel Corporation \r
All rights reserved. This program and the accompanying materials \r
protocol on this handle. This driver can only support one one WinNtThunk protocol\r
in the system, since the device path is hard coded.\r
\r
---*/\r
+**/\r
\r
//\r
-// Include common header file for this module.\r
+// The package level header files this module uses\r
+//\r
+#include <Uefi.h>\r
+#include <WinNtDxe.h>\r
+//\r
+// The protocols, PPI and GUID defintions for this module\r
+//\r
+#include <Protocol/WinNtThunk.h>\r
+#include <Protocol/DevicePath.h>\r
+//\r
+// The Library classes this module consumes\r
//\r
-#include "CommonHeader.h"\r
+#include <Library/UefiDriverEntryPoint.h>\r
+#include <Library/WinNtLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/DevicePathLib.h>\r
\r
#include "WinNtThunk.h"\r
\r
//\r
// WinNtThunk Device Path Protocol Instance\r
//\r
-static WIN_NT_THUNK_DEVICE_PATH mWinNtThunkDevicePath = {\r
+WIN_NT_THUNK_DEVICE_PATH mWinNtThunkDevicePath = {\r
{\r
HARDWARE_DEVICE_PATH,\r
HW_VENDOR_DP,\r