diff --git a/EmulatorPkg/Library/DxeEmuLib/DxeEmuLib.inf b/EmulatorPkg/Library/DxeEmuLib/DxeEmuLib.inf
index 0031011d85..819ea3db54 100644
--- a/EmulatorPkg/Library/DxeEmuLib/DxeEmuLib.inf
+++ b/EmulatorPkg/Library/DxeEmuLib/DxeEmuLib.inf
@@ -17,8 +17,8 @@
   FILE_GUID                      = 31479AFD-B06F-4E4A-863B-A8F7E7710778
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = EmuThunkLib
-
+  LIBRARY_CLASS                  = DxeEmuLib|DXE_CORE DXE_RUNTIME_DRIVER DXE_DRIVER UEFI_DRIVER
+  LIBRARY_CLASS                  = EmuThunkLib|DXE_CORE DXE_RUNTIME_DRIVER DXE_DRIVER UEFI_DRIVER
   CONSTRUCTOR                    = DxeEmuLibConstructor
 
 
diff --git a/EmulatorPkg/Library/ThunkPpiList/ThunkPpiList.inf b/EmulatorPkg/Library/ThunkPpiList/ThunkPpiList.inf
index 327aab6292..ce2041e819 100644
--- a/EmulatorPkg/Library/ThunkPpiList/ThunkPpiList.inf
+++ b/EmulatorPkg/Library/ThunkPpiList/ThunkPpiList.inf
@@ -15,8 +15,7 @@
   FILE_GUID                      = 465FDE84-E8B0-B04B-A843-A03F68F617A9
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = MemoryAllocationLib|SEC BASE USER_DEFINED
-
+  LIBRARY_CLASS                  = ThunkPpiList
 [Sources]
   ThunkPpiList.c
 
diff --git a/EmulatorPkg/Library/ThunkProtocolList/ThunkProtocolList.inf b/EmulatorPkg/Library/ThunkProtocolList/ThunkProtocolList.inf
index 795ee04638..6ac9d2a221 100644
--- a/EmulatorPkg/Library/ThunkProtocolList/ThunkProtocolList.inf
+++ b/EmulatorPkg/Library/ThunkProtocolList/ThunkProtocolList.inf
@@ -14,8 +14,7 @@
   FILE_GUID                      = 7833616E-AE0D-594F-870C-80E68682D587
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = MemoryAllocationLib|BASE SEC USER_DEFINED
-
+  LIBRARY_CLASS                  = ThunkProtocolList
 [Sources]
   ThunkProtocolList.c