-/*++\r
+/**@file\r
\r
Copyright (c) 2006, Intel Corporation \r
All rights reserved. This program and the accompanying materials \r
\r
NT Emulation Architectural Protocol Driver as defined in Tiano.\r
\r
---*/\r
+**/\r
\r
#ifndef _CPU_ARCHITECTURAL_PROTOCOL_DRIVER_H_\r
#define _CPU_ARCHITECTURAL_PROTOCOL_DRIVER_H_\r
#include <FrameworkDxe.h>\r
#include <Protocol/Cpu.h>\r
#include <Protocol/DataHub.h>\r
-#include <Protocol/HiiFramework.h>\r
+#include <Protocol/FrameworkHii.h>\r
#include <Guid/DataHubRecords.h>\r
+#include <Guid/DataHubProducer.h>\r
#include <Protocol/CpuIo.h>\r
#include <Protocol/WinNtIo.h>\r
#include <Library/BaseLib.h>\r
#include <Library/DebugLib.h>\r
-#include <Library/HiiLibFramework.h>\r
+#include <Library/HiiLib.h>\r
#include <Library/UefiDriverEntryPoint.h>\r
#include <Library/BaseMemoryLib.h>\r
#include <Library/MemoryAllocationLib.h>\r
//\r
// Internal Data Structures\r
//\r
-#define CPU_ARCH_PROT_PRIVATE_SIGNATURE EFI_SIGNATURE_32 ('c', 'a', 'p', 'd')\r
+#define CPU_ARCH_PROT_PRIVATE_SIGNATURE SIGNATURE_32 ('c', 'a', 'p', 'd')\r
\r
typedef struct {\r
UINTN Signature;\r