diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
index ed94d8b692..1e99de46c2 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
@@ -36,9 +36,8 @@
   ComponentName.c
   IsaIo.c
   IsaBus.c
-  IsaIo.h
-  IsaBus.h
-  IsaAcpi.h
+  InternalIsaIo.h
+  InternalIsaBus.h
   ComponentName.h
 
 [Packages]
diff --git a/IntelFrameworkModulePkg/Universal/VariablePei/VariablePei.inf b/IntelFrameworkModulePkg/Universal/VariablePei/VariablePei.inf
index d54b271b68..99fd73ae7a 100644
--- a/IntelFrameworkModulePkg/Universal/VariablePei/VariablePei.inf
+++ b/IntelFrameworkModulePkg/Universal/VariablePei/VariablePei.inf
@@ -44,7 +44,6 @@
 ################################################################################
 
 [Sources.common]
-  Variable.dxs
   Variable.c
   Variable.h
 
diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
index d784696826..601ec4b6d1 100644
--- a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
@@ -41,7 +41,7 @@
   BdsConnect.c
   BdsConsole.c
   BdsBoot.c
-  EdkGenericBdsLib.h
+  EdkGenericBdsLibInternal.h
 
 [Packages]
   MdePkg/MdePkg.dec
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
index bc8bc6d5f4..a90cd33837 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
@@ -54,7 +54,6 @@
   MiscSubclassDriver.h
   MiscDevicePath.h
   MiscSubclassDriver.uni
-  CommonHeader.h
 
 [Packages]
   MdePkg/MdePkg.dec
diff --git a/Nt32Pkg/Sec/SecMain.inf b/Nt32Pkg/Sec/SecMain.inf
index 656b2591eb..4e6a6a5eb6 100644
--- a/Nt32Pkg/Sec/SecMain.inf
+++ b/Nt32Pkg/Sec/SecMain.inf
@@ -29,7 +29,6 @@
 #
 
 [Sources.common]
-  OldDefinition.h
   SecMain.h
   WinNtThunk.c
   FwVol.c