8 files changed, 2 insertions, 11 deletions
diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
index 837a3ae18e..66a007c803 100644
--- a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
@@ -48,9 +48,9 @@
   MemoryAllocationLib
   BaseMemoryLib
   UefiDriverEntryPoint
-  HiiLib
   DebugLib
-
+  HiiLib
+  
 [Guids]
   gEfiProcessorSubClassGuid                     # SOMETIMES_CONSUMED
   gEfiProcessorProducerGuid                     # SOMETIMES_CONSUMED
diff --git a/Nt32Pkg/MetronomeDxe/Metronome.h b/Nt32Pkg/MetronomeDxe/Metronome.h
index 22fa9abb5b..81dfe1bff8 100644
--- a/Nt32Pkg/MetronomeDxe/Metronome.h
+++ b/Nt32Pkg/MetronomeDxe/Metronome.h
@@ -26,7 +26,6 @@ Abstract:
 #include <WinNtDxe.h>
 #include <Protocol/Metronome.h>
 #include <Library/BaseLib.h>
-#include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/WinNtLib.h>
 #include <Library/UefiBootServicesTableLib.h>
diff --git a/Nt32Pkg/MetronomeDxe/MetronomeDxe.inf b/Nt32Pkg/MetronomeDxe/MetronomeDxe.inf
index da9dd0bf47..9d9f4713f3 100644
--- a/Nt32Pkg/MetronomeDxe/MetronomeDxe.inf
+++ b/Nt32Pkg/MetronomeDxe/MetronomeDxe.inf
@@ -43,7 +43,6 @@
   UefiBootServicesTableLib
   WinNtLib
   UefiDriverEntryPoint
-  DebugLib
   BaseLib
 
 [Protocols]
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
index fc543f0e95..d20c0f4b58 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
@@ -65,7 +65,6 @@
 [LibraryClasses]
   DevicePathLib
   UefiBootServicesTableLib
-  MemoryAllocationLib
   BaseMemoryLib
   UefiDriverEntryPoint
   UefiLib
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
index aa8066ff3c..5d942ecb9e 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
@@ -34,7 +34,6 @@ Abstract:
 #include <Library/UefiLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/BaseMemoryLib.h>
-#include <Library/MemoryAllocationLib.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/DevicePathLib.h>
 #include <Library/PcdLib.h>
diff --git a/Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf b/Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf
index d6acbdeb5d..852087530a 100644
--- a/Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf
+++ b/Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf
@@ -41,9 +41,7 @@
 
 [LibraryClasses]
   PcdLib
-  BaseMemoryLib
   PeiServicesLib
-  HobLib
   PeimEntryPoint
   DebugLib
 
diff --git a/Nt32Pkg/WinNtThunkDxe/WinNtThunk.c b/Nt32Pkg/WinNtThunkDxe/WinNtThunk.c
index 1aa491a83a..d0b1407f4f 100644
--- a/Nt32Pkg/WinNtThunkDxe/WinNtThunk.c
+++ b/Nt32Pkg/WinNtThunkDxe/WinNtThunk.c
@@ -39,7 +39,6 @@ Abstract:
 //
 // The Library classes this module consumes
 //
-#include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/WinNtLib.h>
 #include <Library/UefiBootServicesTableLib.h>
diff --git a/Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf b/Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf
index 6a8e1431ff..6458735a4b 100644
--- a/Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf
+++ b/Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf
@@ -44,8 +44,6 @@
   UefiBootServicesTableLib
   WinNtLib
   UefiDriverEntryPoint
-  DebugLib
-
 
 [Protocols]
   gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_PRODUCED