MdeModulePkg: Move to new location

Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Guo Mang <mang.guo@intel.com>
author: Guo Mang <mang.guo@intel.com> 2017-04-27 11:05:07 +0800
committer: Guo Mang <mang.guo@intel.com> 2017-04-27 11:05:07 +0800
commit: c23f114d3cfbb29b8734b87213d1ec0de404197b (patch)
tree: 4f3612573be055139a88213559212a40b7862fee
parent: 001e57a103fce87245bfb7ae9c32ffb499a64135 (diff)
download: edk2-platforms-c23f114d3cfbb29b8734b87213d1ec0de404197b.tar.xz
1753 files changed, 0 insertions, 0 deletions
diff --git a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c b/Core/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c
index 6d493e1250..6d493e1250 100644
--- a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c
+++ b/Core/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c
diff --git a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.h b/Core/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.h
index 26d9a31865..26d9a31865 100644
--- a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.h
+++ b/Core/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.h
diff --git a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf b/Core/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf
index dd60ef4cd8..dd60ef4cd8 100644
--- a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf
+++ b/Core/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf
diff --git a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.uni b/Core/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.uni
index a1470371f6..a1470371f6 100644
--- a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.uni
+++ b/Core/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.uni
diff --git a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuAppExtra.uni b/Core/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuAppExtra.uni
index 3887923d05..3887923d05 100644
--- a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuAppExtra.uni
+++ b/Core/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuAppExtra.uni
diff --git a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuStrings.uni b/Core/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuStrings.uni
index 6f5e44cc47..6f5e44cc47 100644
--- a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuStrings.uni
+++ b/Core/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuStrings.uni
diff --git a/MdeModulePkg/Application/CapsuleApp/AppSupport.c b/Core/MdeModulePkg/Application/CapsuleApp/AppSupport.c
index e39ab20378..e39ab20378 100644
--- a/MdeModulePkg/Application/CapsuleApp/AppSupport.c
+++ b/Core/MdeModulePkg/Application/CapsuleApp/AppSupport.c
diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c b/Core/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
index 6febe846b1..6febe846b1 100644
--- a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
+++ b/Core/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c
diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf b/Core/MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
index c255096aae..c255096aae 100644
--- a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
+++ b/Core/MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.uni b/Core/MdeModulePkg/Application/CapsuleApp/CapsuleApp.uni
index 54d6e12e31..54d6e12e31 100644
--- a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.uni
+++ b/Core/MdeModulePkg/Application/CapsuleApp/CapsuleApp.uni
diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleAppExtra.uni b/Core/MdeModulePkg/Application/CapsuleApp/CapsuleAppExtra.uni
index b5a8840a7a..b5a8840a7a 100644
--- a/MdeModulePkg/Application/CapsuleApp/CapsuleAppExtra.uni
+++ b/Core/MdeModulePkg/Application/CapsuleApp/CapsuleAppExtra.uni
diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c b/Core/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c
index 2bb5f1f02c..2bb5f1f02c 100644
--- a/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c
+++ b/Core/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c
diff --git a/MdeModulePkg/Application/HelloWorld/HelloWorld.c b/Core/MdeModulePkg/Application/HelloWorld/HelloWorld.c
index 164571bfb0..164571bfb0 100644
--- a/MdeModulePkg/Application/HelloWorld/HelloWorld.c
+++ b/Core/MdeModulePkg/Application/HelloWorld/HelloWorld.c
diff --git a/MdeModulePkg/Application/HelloWorld/HelloWorld.inf b/Core/MdeModulePkg/Application/HelloWorld/HelloWorld.inf
index 1cfed2d85c..1cfed2d85c 100644
--- a/MdeModulePkg/Application/HelloWorld/HelloWorld.inf
+++ b/Core/MdeModulePkg/Application/HelloWorld/HelloWorld.inf
diff --git a/MdeModulePkg/Application/HelloWorld/HelloWorld.uni b/Core/MdeModulePkg/Application/HelloWorld/HelloWorld.uni
index f8be3d1463..f8be3d1463 100644
--- a/MdeModulePkg/Application/HelloWorld/HelloWorld.uni
+++ b/Core/MdeModulePkg/Application/HelloWorld/HelloWorld.uni
diff --git a/MdeModulePkg/Application/HelloWorld/HelloWorldExtra.uni b/Core/MdeModulePkg/Application/HelloWorld/HelloWorldExtra.uni
index e20b4a5a3f..e20b4a5a3f 100644
--- a/MdeModulePkg/Application/HelloWorld/HelloWorldExtra.uni
+++ b/Core/MdeModulePkg/Application/HelloWorld/HelloWorldExtra.uni
diff --git a/MdeModulePkg/Application/HelloWorld/HelloWorldStr.uni b/Core/MdeModulePkg/Application/HelloWorld/HelloWorldStr.uni
index 3b8b33a37a..3b8b33a37a 100644
--- a/MdeModulePkg/Application/HelloWorld/HelloWorldStr.uni
+++ b/Core/MdeModulePkg/Application/HelloWorld/HelloWorldStr.uni
diff --git a/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfo.c b/Core/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfo.c
index 338eb8191f..338eb8191f 100644
--- a/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfo.c
+++ b/Core/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfo.c
diff --git a/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfo.inf b/Core/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfo.inf
index 4bb7a9df1d..4bb7a9df1d 100644
--- a/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfo.inf
+++ b/Core/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfo.inf
diff --git a/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfo.uni b/Core/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfo.uni
index 53ffaaf8fd..53ffaaf8fd 100644
--- a/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfo.uni
+++ b/Core/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfo.uni
diff --git a/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfoExtra.uni b/Core/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfoExtra.uni
index c096711843..c096711843 100644
--- a/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfoExtra.uni
+++ b/Core/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfoExtra.uni
diff --git a/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.c b/Core/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.c
index 84a1c8ee53..84a1c8ee53 100644
--- a/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.c
+++ b/Core/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.c
diff --git a/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.inf b/Core/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.inf
index 73cc052cc3..73cc052cc3 100644
--- a/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.inf
+++ b/Core/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.inf
diff --git a/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.uni b/Core/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.uni
index d73a1a0bf0..d73a1a0bf0 100644
--- a/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.uni
+++ b/Core/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.uni
diff --git a/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfoExtra.uni b/Core/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfoExtra.uni
index b10c71a7ab..b10c71a7ab 100644
--- a/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfoExtra.uni
+++ b/Core/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfoExtra.uni
diff --git a/MdeModulePkg/Application/UiApp/FrontPage.c b/Core/MdeModulePkg/Application/UiApp/FrontPage.c
index adee67a8ac..adee67a8ac 100644
--- a/MdeModulePkg/Application/UiApp/FrontPage.c
+++ b/Core/MdeModulePkg/Application/UiApp/FrontPage.c
diff --git a/MdeModulePkg/Application/UiApp/FrontPage.h b/Core/MdeModulePkg/Application/UiApp/FrontPage.h
index 642d9d0c85..642d9d0c85 100644
--- a/MdeModulePkg/Application/UiApp/FrontPage.h
+++ b/Core/MdeModulePkg/Application/UiApp/FrontPage.h
diff --git a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUi.c b/Core/MdeModulePkg/Application/UiApp/FrontPageCustomizedUi.c
index a9d2269660..a9d2269660 100644
--- a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUi.c
+++ b/Core/MdeModulePkg/Application/UiApp/FrontPageCustomizedUi.c
diff --git a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUi.h b/Core/MdeModulePkg/Application/UiApp/FrontPageCustomizedUi.h
index 6df0d139d5..6df0d139d5 100644
--- a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUi.h
+++ b/Core/MdeModulePkg/Application/UiApp/FrontPageCustomizedUi.h
diff --git a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.c b/Core/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.c
index 1505ef9319..1505ef9319 100644
--- a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.c
+++ b/Core/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.c
diff --git a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.h b/Core/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.h
index 9dda98adea..9dda98adea 100644
--- a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.h
+++ b/Core/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.h
diff --git a/MdeModulePkg/Application/UiApp/FrontPageStrings.uni b/Core/MdeModulePkg/Application/UiApp/FrontPageStrings.uni
index 8080a209a3..8080a209a3 100644
--- a/MdeModulePkg/Application/UiApp/FrontPageStrings.uni
+++ b/Core/MdeModulePkg/Application/UiApp/FrontPageStrings.uni
diff --git a/MdeModulePkg/Application/UiApp/FrontPageVfr.Vfr b/Core/MdeModulePkg/Application/UiApp/FrontPageVfr.Vfr
index 6c59f82b97..6c59f82b97 100644
--- a/MdeModulePkg/Application/UiApp/FrontPageVfr.Vfr
+++ b/Core/MdeModulePkg/Application/UiApp/FrontPageVfr.Vfr
diff --git a/MdeModulePkg/Application/UiApp/String.c b/Core/MdeModulePkg/Application/UiApp/String.c
index b6f22889ce..b6f22889ce 100644
--- a/MdeModulePkg/Application/UiApp/String.c
+++ b/Core/MdeModulePkg/Application/UiApp/String.c
diff --git a/MdeModulePkg/Application/UiApp/String.h b/Core/MdeModulePkg/Application/UiApp/String.h
index 31c443875f..31c443875f 100644
--- a/MdeModulePkg/Application/UiApp/String.h
+++ b/Core/MdeModulePkg/Application/UiApp/String.h
diff --git a/MdeModulePkg/Application/UiApp/Ui.h b/Core/MdeModulePkg/Application/UiApp/Ui.h
index a9c30b0c56..a9c30b0c56 100644
--- a/MdeModulePkg/Application/UiApp/Ui.h
+++ b/Core/MdeModulePkg/Application/UiApp/Ui.h
diff --git a/MdeModulePkg/Application/UiApp/UiApp.inf b/Core/MdeModulePkg/Application/UiApp/UiApp.inf
index d144462ce4..d144462ce4 100644
--- a/MdeModulePkg/Application/UiApp/UiApp.inf
+++ b/Core/MdeModulePkg/Application/UiApp/UiApp.inf
diff --git a/MdeModulePkg/Application/UiApp/UiApp.uni b/Core/MdeModulePkg/Application/UiApp/UiApp.uni
index f2c4ffe46b..f2c4ffe46b 100644
--- a/MdeModulePkg/Application/UiApp/UiApp.uni
+++ b/Core/MdeModulePkg/Application/UiApp/UiApp.uni
diff --git a/MdeModulePkg/Application/UiApp/UiAppExtra.uni b/Core/MdeModulePkg/Application/UiApp/UiAppExtra.uni
index 81f3132ba6..81f3132ba6 100644
--- a/MdeModulePkg/Application/UiApp/UiAppExtra.uni
+++ b/Core/MdeModulePkg/Application/UiApp/UiAppExtra.uni
diff --git a/MdeModulePkg/Application/VariableInfo/VariableInfo.c b/Core/MdeModulePkg/Application/VariableInfo/VariableInfo.c
index a88b7f1ec4..a88b7f1ec4 100644
--- a/MdeModulePkg/Application/VariableInfo/VariableInfo.c
+++ b/Core/MdeModulePkg/Application/VariableInfo/VariableInfo.c
diff --git a/MdeModulePkg/Application/VariableInfo/VariableInfo.inf b/Core/MdeModulePkg/Application/VariableInfo/VariableInfo.inf
index 484ad32a4e..484ad32a4e 100644
--- a/MdeModulePkg/Application/VariableInfo/VariableInfo.inf
+++ b/Core/MdeModulePkg/Application/VariableInfo/VariableInfo.inf
diff --git a/MdeModulePkg/Application/VariableInfo/VariableInfo.uni b/Core/MdeModulePkg/Application/VariableInfo/VariableInfo.uni
index fec4593c4a..fec4593c4a 100644
--- a/MdeModulePkg/Application/VariableInfo/VariableInfo.uni
+++ b/Core/MdeModulePkg/Application/VariableInfo/VariableInfo.uni
diff --git a/MdeModulePkg/Application/VariableInfo/VariableInfoExtra.uni b/Core/MdeModulePkg/Application/VariableInfo/VariableInfoExtra.uni
index 16c7461508..16c7461508 100644
--- a/MdeModulePkg/Application/VariableInfo/VariableInfoExtra.uni
+++ b/Core/MdeModulePkg/Application/VariableInfo/VariableInfoExtra.uni
diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c b/Core/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
index 4d01c1dd7f..4d01c1dd7f 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
+++ b/Core/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.h b/Core/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.h
index 6401fb2e9f..6401fb2e9f 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.h
+++ b/Core/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.h
diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c b/Core/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
index 795443ef74..795443ef74 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
+++ b/Core/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h b/Core/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h
index 4f327dc30b..4f327dc30b 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h
+++ b/Core/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h
diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf b/Core/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
index 82d5f7a46c..82d5f7a46c 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
+++ b/Core/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThruDxe.uni b/Core/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThruDxe.uni
index 8530a1f076..8530a1f076 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThruDxe.uni
+++ b/Core/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThruDxe.uni
diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThruDxeExtra.uni b/Core/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThruDxeExtra.uni
index 8af8f56f2f..8af8f56f2f 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThruDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThruDxeExtra.uni
diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/ComponentName.c b/Core/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/ComponentName.c
index c3f7738d45..c3f7738d45 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/ComponentName.c
diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c b/Core/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
index 6478f7be07..6478f7be07 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
+++ b/Core/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.h b/Core/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.h
index 67fff64658..67fff64658 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.h
+++ b/Core/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.h
diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c b/Core/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
index cb7f1f031e..cb7f1f031e 100644
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
+++ b/Core/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.h b/Core/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.h
index 26ec70d30a..26ec70d30a 100644
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.h
+++ b/Core/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.h
diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf b/Core/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
index 4aab75bab7..4aab75bab7 100644
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
+++ b/Core/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.uni b/Core/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.uni
index 1b7dfc3b03..1b7dfc3b03 100644
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.uni
+++ b/Core/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.uni
diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxeExtra.uni b/Core/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxeExtra.uni
index a55c9acb63..a55c9acb63 100644
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxeExtra.uni
diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c b/Core/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
index 35a1b47e8a..35a1b47e8a 100644
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
+++ b/Core/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Ata/AtaBusDxe/ComponentName.c
index ff9d727e6c..ff9d727e6c 100644
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Ata/AtaBusDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c
index cad5ad7d44..cad5ad7d44 100644
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c
+++ b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cBus.c
diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cBusDxe.inf b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cBusDxe.inf
index 4dbe2f5e68..4dbe2f5e68 100644
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cBusDxe.inf
+++ b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cBusDxe.inf
diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cBusDxe.uni b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cBusDxe.uni
index 57e2d16fd8..57e2d16fd8 100644
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cBusDxe.uni
+++ b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cBusDxe.uni
diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cBusDxeExtra.uni b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cBusDxeExtra.uni
index 374debe440..374debe440 100644
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cBusDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cBusDxeExtra.uni
diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.c b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.c
index fb985f96e2..fb985f96e2 100644
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.c
+++ b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.c
diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.h b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.h
index 1490d4283a..1490d4283a 100644
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.h
+++ b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.h
diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.inf b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.inf
index 5cd53b2fc4..5cd53b2fc4 100644
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.inf
+++ b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.inf
diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.uni b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.uni
index c3536748b6..c3536748b6 100644
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.uni
+++ b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.uni
diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxeExtra.uni b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxeExtra.uni
index 1f27927531..1f27927531 100644
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cDxeExtra.uni
diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cHost.c b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cHost.c
index 68dd931887..68dd931887 100644
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cHost.c
+++ b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cHost.c
diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxe.inf b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxe.inf
index 2fb1085c6d..2fb1085c6d 100644
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxe.inf
+++ b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxe.inf
diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxe.uni b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxe.uni
index ae850a4bec..ae850a4bec 100644
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxe.uni
+++ b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxe.uni
diff --git a/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxeExtra.uni b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxeExtra.uni
index 816663884c..816663884c 100644
--- a/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/I2c/I2cDxe/I2cHostDxeExtra.uni
diff --git a/MdeModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c
index ff7bbef278..ff7bbef278 100644
--- a/MdeModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Isa/IsaBusDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h b/Core/MdeModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h
index f533971833..f533971833 100644
--- a/MdeModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h
+++ b/Core/MdeModulePkg/Bus/Isa/IsaBusDxe/ComponentName.h
diff --git a/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.c b/Core/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.c
index 0bd9b24fbd..0bd9b24fbd 100644
--- a/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.c
+++ b/Core/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.c
diff --git a/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.h b/Core/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.h
index 86f6f56a61..86f6f56a61 100644
--- a/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.h
+++ b/Core/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.h
diff --git a/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf b/Core/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
index 1d9e22ec4c..1d9e22ec4c 100644
--- a/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
+++ b/Core/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
diff --git a/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.uni b/Core/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.uni
index 99693c37cb..99693c37cb 100644
--- a/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.uni
+++ b/Core/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.uni
diff --git a/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxeExtra.uni b/Core/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxeExtra.uni
index 414a2b063e..414a2b063e 100644
--- a/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxeExtra.uni
diff --git a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/ComponentName.c
index e64e46bb45..e64e46bb45 100644
--- a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c b/Core/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
index f92521046f..f92521046f 100644
--- a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
+++ b/Core/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
diff --git a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c b/Core/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c
index bc58fe2f8c..bc58fe2f8c 100644
--- a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c
+++ b/Core/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c
diff --git a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c b/Core/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
index 6121d29fb7..6121d29fb7 100644
--- a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
+++ b/Core/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
diff --git a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h b/Core/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
index e41c1980fc..e41c1980fc 100644
--- a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
+++ b/Core/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
diff --git a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf b/Core/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
index a0172eabf8..a0172eabf8 100644
--- a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
+++ b/Core/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
diff --git a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.uni b/Core/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.uni
index 358cc637ac..358cc637ac 100644
--- a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.uni
+++ b/Core/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.uni
diff --git a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxeExtra.uni b/Core/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxeExtra.uni
index 7bca518812..7bca518812 100644
--- a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxeExtra.uni
diff --git a/MdeModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c b/Core/MdeModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c
index 04d536c76c..04d536c76c 100644
--- a/MdeModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c
+++ b/Core/MdeModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c
diff --git a/MdeModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h b/Core/MdeModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h
index c854e68b29..c854e68b29 100644
--- a/MdeModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h
+++ b/Core/MdeModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.h
diff --git a/MdeModulePkg/Bus/Isa/Ps2MouseDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Isa/Ps2MouseDxe/ComponentName.c
index 962480265b..962480265b 100644
--- a/MdeModulePkg/Bus/Isa/Ps2MouseDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Isa/Ps2MouseDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c b/Core/MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c
index 1586935cde..1586935cde 100644
--- a/MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c
+++ b/Core/MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c
diff --git a/MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h b/Core/MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h
index 9e62f740fe..9e62f740fe 100644
--- a/MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h
+++ b/Core/MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h
diff --git a/MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf b/Core/MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
index 2c7688a051..2c7688a051 100644
--- a/MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
+++ b/Core/MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
diff --git a/MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.uni b/Core/MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.uni
index 417474411d..417474411d 100644
--- a/MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.uni
+++ b/Core/MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.uni
diff --git a/MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxeExtra.uni b/Core/MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxeExtra.uni
index fee64d8d18..fee64d8d18 100644
--- a/MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxeExtra.uni
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Pci/EhciDxe/ComponentName.c
index 3181b9da5b..3181b9da5b 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Pci/EhciDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/ComponentName.h b/Core/MdeModulePkg/Bus/Pci/EhciDxe/ComponentName.h
index 1a17d0bb49..1a17d0bb49 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/ComponentName.h
+++ b/Core/MdeModulePkg/Bus/Pci/EhciDxe/ComponentName.h
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c b/Core/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
index 5173a9d599..5173a9d599 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
+++ b/Core/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h b/Core/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
index 3415816c53..3415816c53 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
+++ b/Core/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c b/Core/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c
index 76368b4748..76368b4748 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c
+++ b/Core/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.h b/Core/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.h
index bc84bb7864..bc84bb7864 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.h
+++ b/Core/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.h
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf b/Core/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
index 238923e828..238923e828 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
+++ b/Core/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.uni b/Core/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.uni
index e36ee52663..e36ee52663 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.uni
+++ b/Core/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.uni
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxeExtra.uni b/Core/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxeExtra.uni
index 1d625a9f7b..1d625a9f7b 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxeExtra.uni
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciReg.c b/Core/MdeModulePkg/Bus/Pci/EhciDxe/EhciReg.c
index 34836eccf5..34836eccf5 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciReg.c
+++ b/Core/MdeModulePkg/Bus/Pci/EhciDxe/EhciReg.c
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciReg.h b/Core/MdeModulePkg/Bus/Pci/EhciDxe/EhciReg.h
index 2347ee125f..2347ee125f 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciReg.h
+++ b/Core/MdeModulePkg/Bus/Pci/EhciDxe/EhciReg.h
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c b/Core/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
index 036c00b32b..036c00b32b 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
+++ b/Core/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.h b/Core/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.h
index c03bd619d7..c03bd619d7 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.h
+++ b/Core/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.h
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciUrb.c b/Core/MdeModulePkg/Bus/Pci/EhciDxe/EhciUrb.c
index 6afb327df1..6afb327df1 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciUrb.c
+++ b/Core/MdeModulePkg/Bus/Pci/EhciDxe/EhciUrb.c
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciUrb.h b/Core/MdeModulePkg/Bus/Pci/EhciDxe/EhciUrb.h
index 02e9af81be..02e9af81be 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciUrb.h
+++ b/Core/MdeModulePkg/Bus/Pci/EhciDxe/EhciUrb.h
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c b/Core/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c
index acff7256bd..acff7256bd 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c
+++ b/Core/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.h b/Core/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.h
index 84ced8d580..84ced8d580 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.h
+++ b/Core/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.h
diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.c b/Core/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.c
index 31647ff052..31647ff052 100644
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.c
+++ b/Core/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.c
diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.h b/Core/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.h
index d7a68d9095..d7a68d9095 100644
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.h
+++ b/Core/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.h
diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf b/Core/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf
index 7083f86681..7083f86681 100644
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf
+++ b/Core/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf
diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.uni b/Core/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.uni
index 9bc809c876..9bc809c876 100644
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.uni
+++ b/Core/MdeModulePkg/Bus/Pci/EhciPei/EhciPei.uni
diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciPeiExtra.uni b/Core/MdeModulePkg/Bus/Pci/EhciPei/EhciPeiExtra.uni
index cbf1b7d668..cbf1b7d668 100644
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhciPeiExtra.uni
+++ b/Core/MdeModulePkg/Bus/Pci/EhciPei/EhciPeiExtra.uni
diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciReg.h b/Core/MdeModulePkg/Bus/Pci/EhciPei/EhciReg.h
index 34c61d8a94..34c61d8a94 100644
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhciReg.h
+++ b/Core/MdeModulePkg/Bus/Pci/EhciPei/EhciReg.h
diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c b/Core/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c
index e992d4f287..e992d4f287 100644
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c
+++ b/Core/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c
diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.h b/Core/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.h
index 6cc52f8d0a..6cc52f8d0a 100644
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.h
+++ b/Core/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.h
diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciUrb.c b/Core/MdeModulePkg/Bus/Pci/EhciPei/EhciUrb.c
index 597a4947f5..597a4947f5 100644
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhciUrb.c
+++ b/Core/MdeModulePkg/Bus/Pci/EhciPei/EhciUrb.c
diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciUrb.h b/Core/MdeModulePkg/Bus/Pci/EhciPei/EhciUrb.h
index 3fe93fb294..3fe93fb294 100644
--- a/MdeModulePkg/Bus/Pci/EhciPei/EhciUrb.h
+++ b/Core/MdeModulePkg/Bus/Pci/EhciPei/EhciUrb.h
diff --git a/MdeModulePkg/Bus/Pci/EhciPei/UsbHcMem.c b/Core/MdeModulePkg/Bus/Pci/EhciPei/UsbHcMem.c
index 5f9f5f0718..5f9f5f0718 100644
--- a/MdeModulePkg/Bus/Pci/EhciPei/UsbHcMem.c
+++ b/Core/MdeModulePkg/Bus/Pci/EhciPei/UsbHcMem.c
diff --git a/MdeModulePkg/Bus/Pci/EhciPei/UsbHcMem.h b/Core/MdeModulePkg/Bus/Pci/EhciPei/UsbHcMem.h
index 586d12af96..586d12af96 100644
--- a/MdeModulePkg/Bus/Pci/EhciPei/UsbHcMem.h
+++ b/Core/MdeModulePkg/Bus/Pci/EhciPei/UsbHcMem.h
diff --git a/MdeModulePkg/Bus/Pci/IdeBusPei/AtapiPeim.c b/Core/MdeModulePkg/Bus/Pci/IdeBusPei/AtapiPeim.c
index 58bef161fb..58bef161fb 100644
--- a/MdeModulePkg/Bus/Pci/IdeBusPei/AtapiPeim.c
+++ b/Core/MdeModulePkg/Bus/Pci/IdeBusPei/AtapiPeim.c
diff --git a/MdeModulePkg/Bus/Pci/IdeBusPei/AtapiPeim.h b/Core/MdeModulePkg/Bus/Pci/IdeBusPei/AtapiPeim.h
index 20b35c4afd..20b35c4afd 100644
--- a/MdeModulePkg/Bus/Pci/IdeBusPei/AtapiPeim.h
+++ b/Core/MdeModulePkg/Bus/Pci/IdeBusPei/AtapiPeim.h
diff --git a/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.inf b/Core/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.inf
index 8bcef7bc6a..8bcef7bc6a 100644
--- a/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.inf
+++ b/Core/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.inf
diff --git a/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.uni b/Core/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.uni
index 60d235c75f..60d235c75f 100644
--- a/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.uni
+++ b/Core/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPei.uni
diff --git a/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPeiExtra.uni b/Core/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPeiExtra.uni
index 59ce6b159f..59ce6b159f 100644
--- a/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPeiExtra.uni
+++ b/Core/MdeModulePkg/Bus/Pci/IdeBusPei/IdeBusPeiExtra.uni
diff --git a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c b/Core/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
index 149662d14d..149662d14d 100644
--- a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
+++ b/Core/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
diff --git a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.uni b/Core/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.uni
index 47d52cee6a..47d52cee6a 100644
--- a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.uni
+++ b/Core/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.uni
diff --git a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportDxe.inf b/Core/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportDxe.inf
index a83edaec7b..a83edaec7b 100644
--- a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportDxe.inf
+++ b/Core/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportDxe.inf
diff --git a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportExtra.uni b/Core/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportExtra.uni
index 2600140094..2600140094 100644
--- a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportExtra.uni
+++ b/Core/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportExtra.uni
diff --git a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/ComponentName.c
index 0e6ebecded..0e6ebecded 100644
--- a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.c b/Core/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.c
index 3e9ff6620d..3e9ff6620d 100644
--- a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.c
+++ b/Core/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.c
diff --git a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf b/Core/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf
index ac551a82ab..ac551a82ab 100644
--- a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf
+++ b/Core/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf
diff --git a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c b/Core/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
index c836ad6a91..c836ad6a91 100644
--- a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
+++ b/Core/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
diff --git a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h b/Core/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h
index e641189267..e641189267 100644
--- a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h
+++ b/Core/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h
diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/ComponentName.c
index 855a1b13c6..855a1b13c6 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c
index de5c2a05ea..de5c2a05ea 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c
+++ b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.c
diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.h b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.h
index fa4a34ab53..fa4a34ab53 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.h
+++ b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpress.h
diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c
index 734e1286c6..734e1286c6 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c
+++ b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c
diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.h b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.h
index 9199f284d8..9199f284d8 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.h
+++ b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.h
diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDiskInfo.c b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDiskInfo.c
index ea108a851d..ea108a851d 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDiskInfo.c
+++ b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDiskInfo.c
diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDiskInfo.h b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDiskInfo.h
index f07cfe3474..f07cfe3474 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDiskInfo.h
+++ b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDiskInfo.h
diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
index 3270042e02..3270042e02 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
+++ b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.uni b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.uni
index 235ccf8e3e..235ccf8e3e 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.uni
+++ b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.uni
diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxeExtra.uni b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxeExtra.uni
index 2f0ef9422d..2f0ef9422d 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxeExtra.uni
diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
index ad6cdb15a5..ad6cdb15a5 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
+++ b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.h b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.h
index ddfba148df..ddfba148df 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.h
+++ b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.h
diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c
index ef3d772cc2..ef3d772cc2 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c
+++ b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/ComponentName.c
index 580e8bcc44..580e8bcc44 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/ComponentName.h b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/ComponentName.h
index e74851ed35..e74851ed35 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/ComponentName.h
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/ComponentName.h
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c
index f3be47a496..f3be47a496 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h
index 39ba8b9f33..39ba8b9f33 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
index a3ab11fd8d..a3ab11fd8d 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.uni b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.uni
index 1f1f283ae7..1f1f283ae7 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.uni
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.uni
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxeExtra.uni b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxeExtra.uni
index 8f318d8f55..8f318d8f55 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxeExtra.uni
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciCommand.c b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciCommand.c
index 0bc1fbfeff..0bc1fbfeff 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciCommand.c
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciCommand.c
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciCommand.h b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciCommand.h
index cc942d0d42..cc942d0d42 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciCommand.h
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciCommand.h
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c
index c0227fa2b6..c0227fa2b6 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.h b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.h
index 1a01e72b1e..1a01e72b1e 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.h
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.h
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.c b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.c
index 97f45e42d0..97f45e42d0 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.c
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.c
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.h b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.h
index bf8efff8f1..bf8efff8f1 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.h
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciDriverOverride.h
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c
index d31144739f..d31144739f 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.h b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.h
index 46f56618d4..46f56618d4 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.h
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.h
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
index 81171c82d9..81171c82d9 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.h b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.h
index 42306e9a47..42306e9a47 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.h
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.h
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciHotPlugSupport.c b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciHotPlugSupport.c
index 73bcd32788..73bcd32788 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciHotPlugSupport.c
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciHotPlugSupport.c
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciHotPlugSupport.h b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciHotPlugSupport.h
index a285d94c93..a285d94c93 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciHotPlugSupport.h
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciHotPlugSupport.h
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c
index f72598d3ae..f72598d3ae 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.h b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.h
index ac2def5acf..ac2def5acf 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.h
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.h
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c
index e1d62e8c21..e1d62e8c21 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.h b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.h
index 6c2ade3f36..6c2ade3f36 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.h
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.h
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
index 3713c07844..3713c07844 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.h b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.h
index 25f78a417f..25f78a417f 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.h
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.h
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciPowerManagement.c b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciPowerManagement.c
index ab655e7657..ab655e7657 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciPowerManagement.c
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciPowerManagement.c
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciPowerManagement.h b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciPowerManagement.h
index 45ba59f286..45ba59f286 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciPowerManagement.h
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciPowerManagement.h
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
index e93134613b..e93134613b 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.h b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.h
index 763ddbc4ed..763ddbc4ed 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.h
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.h
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c
index f48c3a0c59..f48c3a0c59 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.c
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.h b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.h
index d443f83336..d443f83336 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.h
+++ b/Core/MdeModulePkg/Bus/Pci/PciBusDxe/PciRomTable.h
diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c b/Core/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c
index 9005deeac2..9005deeac2 100644
--- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c
+++ b/Core/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c
diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.h b/Core/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.h
index 9a8ca21f48..9a8ca21f48 100644
--- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.h
+++ b/Core/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.h
diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf b/Core/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
index d8b0439699..d8b0439699 100644
--- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
+++ b/Core/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostResource.h b/Core/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostResource.h
index 8612c0c325..8612c0c325 100644
--- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostResource.h
+++ b/Core/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostResource.h
diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridge.h b/Core/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridge.h
index 13185b41ac..13185b41ac 100644
--- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridge.h
+++ b/Core/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridge.h
diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c b/Core/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c
index 8af131b0af..8af131b0af 100644
--- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c
+++ b/Core/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c
diff --git a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Pci/PciSioSerialDxe/ComponentName.c
index 4101cb7a90..4101cb7a90 100644
--- a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Pci/PciSioSerialDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf b/Core/MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf
index 03fddfe75e..03fddfe75e 100644
--- a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf
+++ b/Core/MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf
diff --git a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.uni b/Core/MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.uni
index abf85ec411..abf85ec411 100644
--- a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.uni
+++ b/Core/MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.uni
diff --git a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxeExtra.uni b/Core/MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxeExtra.uni
index d6146f01a8..d6146f01a8 100644
--- a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxeExtra.uni
diff --git a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.c b/Core/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.c
index a9dc8274d9..a9dc8274d9 100644
--- a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.c
+++ b/Core/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.c
diff --git a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.h b/Core/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.h
index 3c7eb915f4..3c7eb915f4 100644
--- a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.h
+++ b/Core/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.h
diff --git a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/SerialIo.c b/Core/MdeModulePkg/Bus/Pci/PciSioSerialDxe/SerialIo.c
index c0682e93b6..c0682e93b6 100644
--- a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/SerialIo.c
+++ b/Core/MdeModulePkg/Bus/Pci/PciSioSerialDxe/SerialIo.c
diff --git a/MdeModulePkg/Bus/Pci/SataControllerDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Pci/SataControllerDxe/ComponentName.c
index 467ad11d1a..467ad11d1a 100644
--- a/MdeModulePkg/Bus/Pci/SataControllerDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Pci/SataControllerDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.c b/Core/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.c
index a6d55c1557..a6d55c1557 100644
--- a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.c
+++ b/Core/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.c
diff --git a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.h b/Core/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.h
index f7db3b832a..f7db3b832a 100644
--- a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.h
+++ b/Core/MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.h
diff --git a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf b/Core/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
index 03f9fa0d1d..03f9fa0d1d 100644
--- a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
+++ b/Core/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
diff --git a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.uni b/Core/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.uni
index a9563270c8..a9563270c8 100644
--- a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.uni
+++ b/Core/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.uni
diff --git a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxeExtra.uni b/Core/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxeExtra.uni
index ed25611d2c..ed25611d2c 100644
--- a/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxeExtra.uni
diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/ComponentName.c
index 3329929119..3329929119 100644
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
index c5fd214307..c5fd214307 100755..100644
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
+++ b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
index 9e70de956f..9e70de956f 100644
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
+++ b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c
index 23faec5e2b..23faec5e2b 100644
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c
+++ b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c
diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.h b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.h
index 6a2a279699..6a2a279699 100644
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.h
+++ b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.h
diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
index e26e6a098c..e26e6a098c 100644
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
+++ b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.uni b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.uni
index 57f9fa76a1..57f9fa76a1 100644
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.uni
+++ b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.uni
diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxeExtra.uni b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxeExtra.uni
index c7aedb4cda..c7aedb4cda 100644
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxeExtra.uni
diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
index aa75aa8d24..aa75aa8d24 100644
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
+++ b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
index fb62758602..fb62758602 100644
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
+++ b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.c b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.c
index 3f4ebc40d8..3f4ebc40d8 100644
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.c
+++ b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.c
diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.h b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.h
index 1fbd2ca35b..1fbd2ca35b 100644
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.h
+++ b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.h
diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.inf b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.inf
index bc6ea60d6b..bc6ea60d6b 100644
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.inf
+++ b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.inf
diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.uni b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.uni
index 0520cd2116..0520cd2116 100644
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.uni
+++ b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPei.uni
diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPeiExtra.uni b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPeiExtra.uni
index 71c4faed82..71c4faed82 100644
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPeiExtra.uni
+++ b/Core/MdeModulePkg/Bus/Pci/SdMmcPciHcPei/SdMmcPciHcPeiExtra.uni
diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Pci/UfsPciHcDxe/ComponentName.c
index 1e2db1a876..1e2db1a876 100644
--- a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Pci/UfsPciHcDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.c b/Core/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.c
index 23ebbf108f..23ebbf108f 100644
--- a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.c
+++ b/Core/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.c
diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.h b/Core/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.h
index 89f19feb7a..89f19feb7a 100644
--- a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.h
+++ b/Core/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.h
diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.inf b/Core/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.inf
index c1ce9ea851..c1ce9ea851 100644
--- a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.inf
+++ b/Core/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.inf
diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.uni b/Core/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.uni
index 009180fbe4..009180fbe4 100644
--- a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.uni
+++ b/Core/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.uni
diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxeExtra.uni b/Core/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxeExtra.uni
index ff33ff6a06..ff33ff6a06 100644
--- a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxeExtra.uni
diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.c b/Core/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.c
index 36325641e7..36325641e7 100644
--- a/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.c
+++ b/Core/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.c
diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.h b/Core/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.h
index 2405dd76d8..2405dd76d8 100644
--- a/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.h
+++ b/Core/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.h
diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.inf b/Core/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.inf
index b16935628c..b16935628c 100644
--- a/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.inf
+++ b/Core/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.inf
diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.uni b/Core/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.uni
index 59f5d7071e..59f5d7071e 100644
--- a/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.uni
+++ b/Core/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.uni
diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPeiExtra.uni b/Core/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPeiExtra.uni
index cb579badb7..cb579badb7 100644
--- a/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPeiExtra.uni
+++ b/Core/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPeiExtra.uni
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Pci/UhciDxe/ComponentName.c
index ad2ba42b55..ad2ba42b55 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Pci/UhciDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/ComponentName.h b/Core/MdeModulePkg/Bus/Pci/UhciDxe/ComponentName.h
index fd19a21ec6..fd19a21ec6 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/ComponentName.h
+++ b/Core/MdeModulePkg/Bus/Pci/UhciDxe/ComponentName.h
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c b/Core/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
index 1fcc8b5f32..1fcc8b5f32 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
+++ b/Core/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h b/Core/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
index fc23a75a96..fc23a75a96 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
+++ b/Core/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c
index 9bf53fd411..9bf53fd411 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c
+++ b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.c
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.h b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.h
index abdb64fa36..abdb64fa36 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.h
+++ b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UhciDebug.h
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
index 9c5ff7b6fc..9c5ff7b6fc 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
+++ b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.uni b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.uni
index bedde4502f..bedde4502f 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.uni
+++ b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.uni
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxeExtra.uni b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxeExtra.uni
index af258486c7..af258486c7 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxeExtra.uni
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciQueue.c b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UhciQueue.c
index 1a0aa6e636..1a0aa6e636 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciQueue.c
+++ b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UhciQueue.c
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciQueue.h b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UhciQueue.h
index 9ddca38302..9ddca38302 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciQueue.h
+++ b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UhciQueue.h
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciReg.c b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UhciReg.c
index 0fd16284b3..0fd16284b3 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciReg.c
+++ b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UhciReg.c
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciReg.h b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UhciReg.h
index 7212ad0dfa..7212ad0dfa 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciReg.h
+++ b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UhciReg.h
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
index 90f010c998..90f010c998 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
+++ b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.h b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.h
index f6d4fc40a7..f6d4fc40a7 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.h
+++ b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.h
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.c b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.c
index 301a2eca21..301a2eca21 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.c
+++ b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.c
diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.h b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.h
index c53d0b78f2..c53d0b78f2 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.h
+++ b/Core/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.h
diff --git a/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.c b/Core/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.c
index 37b2124c67..37b2124c67 100644
--- a/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.c
+++ b/Core/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.c
diff --git a/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.h b/Core/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.h
index 460db7eab9..460db7eab9 100644
--- a/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.h
+++ b/Core/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.h
diff --git a/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.inf b/Core/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.inf
index 7baa07612d..7baa07612d 100644
--- a/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.inf
+++ b/Core/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.inf
diff --git a/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.uni b/Core/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.uni
index ef299e441d..ef299e441d 100644
--- a/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.uni
+++ b/Core/MdeModulePkg/Bus/Pci/UhciPei/UhciPei.uni
diff --git a/MdeModulePkg/Bus/Pci/UhciPei/UhciPeiExtra.uni b/Core/MdeModulePkg/Bus/Pci/UhciPei/UhciPeiExtra.uni
index c000912f3c..c000912f3c 100644
--- a/MdeModulePkg/Bus/Pci/UhciPei/UhciPeiExtra.uni
+++ b/Core/MdeModulePkg/Bus/Pci/UhciPei/UhciPeiExtra.uni
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Pci/XhciDxe/ComponentName.c
index 706aa292c8..706aa292c8 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Pci/XhciDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/ComponentName.h b/Core/MdeModulePkg/Bus/Pci/XhciDxe/ComponentName.h
index c3c44ccdfb..c3c44ccdfb 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/ComponentName.h
+++ b/Core/MdeModulePkg/Bus/Pci/XhciDxe/ComponentName.h
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c b/Core/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c
index 7c5261cca2..7c5261cca2 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c
+++ b/Core/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.h b/Core/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.h
index 1907685ddd..1907685ddd 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.h
+++ b/Core/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.h
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c b/Core/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
index 2f6137ef57..2f6137ef57 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
+++ b/Core/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.h b/Core/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.h
index 28e240245b..28e240245b 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.h
+++ b/Core/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.h
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf b/Core/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
index 614938ac89..614938ac89 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
+++ b/Core/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.uni b/Core/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.uni
index 7eca8f85e0..7eca8f85e0 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.uni
+++ b/Core/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.uni
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxeExtra.uni b/Core/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxeExtra.uni
index b2969d1adb..b2969d1adb 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/Pci/XhciDxe/XhciDxeExtra.uni
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c b/Core/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c
index 4d5937de53..4d5937de53 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c
+++ b/Core/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.c
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h b/Core/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h
index b748c8d397..b748c8d397 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h
+++ b/Core/MdeModulePkg/Bus/Pci/XhciDxe/XhciReg.h
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c b/Core/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
index 4bec76a85f..4bec76a85f 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
+++ b/Core/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.h b/Core/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.h
index 931c7efa0c..931c7efa0c 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.h
+++ b/Core/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.h
diff --git a/MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.c b/Core/MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.c
index 6a3f3a5df3..6a3f3a5df3 100644
--- a/MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.c
+++ b/Core/MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.c
diff --git a/MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.h b/Core/MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.h
index c314e92004..c314e92004 100644
--- a/MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.h
+++ b/Core/MdeModulePkg/Bus/Pci/XhciPei/UsbHcMem.h
diff --git a/MdeModulePkg/Bus/Pci/XhciPei/XhcPeim.c b/Core/MdeModulePkg/Bus/Pci/XhciPei/XhcPeim.c
index 57e70701e8..57e70701e8 100644
--- a/MdeModulePkg/Bus/Pci/XhciPei/XhcPeim.c
+++ b/Core/MdeModulePkg/Bus/Pci/XhciPei/XhcPeim.c
diff --git a/MdeModulePkg/Bus/Pci/XhciPei/XhcPeim.h b/Core/MdeModulePkg/Bus/Pci/XhciPei/XhcPeim.h
index 99f0396494..99f0396494 100644
--- a/MdeModulePkg/Bus/Pci/XhciPei/XhcPeim.h
+++ b/Core/MdeModulePkg/Bus/Pci/XhciPei/XhcPeim.h
diff --git a/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.inf b/Core/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.inf
index dc65f283bc..dc65f283bc 100644
--- a/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.inf
+++ b/Core/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.inf
diff --git a/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.uni b/Core/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.uni
index ee23b4b658..ee23b4b658 100644
--- a/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.uni
+++ b/Core/MdeModulePkg/Bus/Pci/XhciPei/XhciPei.uni
diff --git a/MdeModulePkg/Bus/Pci/XhciPei/XhciPeiExtra.uni b/Core/MdeModulePkg/Bus/Pci/XhciPei/XhciPeiExtra.uni
index 0d0fc7a952..0d0fc7a952 100644
--- a/MdeModulePkg/Bus/Pci/XhciPei/XhciPeiExtra.uni
+++ b/Core/MdeModulePkg/Bus/Pci/XhciPei/XhciPeiExtra.uni
diff --git a/MdeModulePkg/Bus/Pci/XhciPei/XhciReg.h b/Core/MdeModulePkg/Bus/Pci/XhciPei/XhciReg.h
index 1a62560665..1a62560665 100644
--- a/MdeModulePkg/Bus/Pci/XhciPei/XhciReg.h
+++ b/Core/MdeModulePkg/Bus/Pci/XhciPei/XhciReg.h
diff --git a/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c b/Core/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c
index 7a63dabd8c..7a63dabd8c 100644
--- a/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c
+++ b/Core/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c
diff --git a/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.h b/Core/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.h
index b3d4c45614..b3d4c45614 100644
--- a/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.h
+++ b/Core/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.h
diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ComponentName.c
index e8ba85a9e7..e8ba85a9e7 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c b/Core/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
index 0802b61726..0802b61726 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
+++ b/Core/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h b/Core/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h
index babf86f2c3..babf86f2c3 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h
+++ b/Core/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h
diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.uni b/Core/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.uni
index d1a338ba4e..d1a338ba4e 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.uni
+++ b/Core/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.uni
diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf b/Core/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
index 18ffd88d89..18ffd88d89 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
+++ b/Core/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusExtra.uni b/Core/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusExtra.uni
index bc09a5e327..bc09a5e327 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusExtra.uni
+++ b/Core/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusExtra.uni
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c
index 08b71d08f3..08b71d08f3 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/Core/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
index 2289f20152..2289f20152 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
+++ b/Core/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h b/Core/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h
index 6e9f032bb8..6e9f032bb8 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h
+++ b/Core/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.uni b/Core/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.uni
index 73f8096cf6..73f8096cf6 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.uni
+++ b/Core/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.uni
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf b/Core/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
index 3fbc589236..3fbc589236 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
+++ b/Core/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskExtra.uni b/Core/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskExtra.uni
index 2c7fdfbd67..2c7fdfbd67 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskExtra.uni
+++ b/Core/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskExtra.uni
diff --git a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcBlockIoPei.c b/Core/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcBlockIoPei.c
index 004670cb28..004670cb28 100644
--- a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcBlockIoPei.c
+++ b/Core/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcBlockIoPei.c
diff --git a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcBlockIoPei.h b/Core/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcBlockIoPei.h
index 5c8b740e4f..5c8b740e4f 100644
--- a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcBlockIoPei.h
+++ b/Core/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcBlockIoPei.h
diff --git a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcBlockIoPei.inf b/Core/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcBlockIoPei.inf
index 4163b528b8..4163b528b8 100644
--- a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcBlockIoPei.inf
+++ b/Core/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcBlockIoPei.inf
diff --git a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcBlockIoPei.uni b/Core/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcBlockIoPei.uni
index f90e831019..f90e831019 100644
--- a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcBlockIoPei.uni
+++ b/Core/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcBlockIoPei.uni
diff --git a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcBlockIoPeiExtra.uni b/Core/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcBlockIoPeiExtra.uni
index 9299c1b5c1..9299c1b5c1 100644
--- a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcBlockIoPeiExtra.uni
+++ b/Core/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcBlockIoPeiExtra.uni
diff --git a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHcMem.c b/Core/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHcMem.c
index 0708fab047..0708fab047 100644
--- a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHcMem.c
+++ b/Core/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHcMem.c
diff --git a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHcMem.h b/Core/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHcMem.h
index af0c93c610..af0c93c610 100644
--- a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHcMem.h
+++ b/Core/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHcMem.h
diff --git a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c b/Core/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c
index 7c40892da0..7c40892da0 100644
--- a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c
+++ b/Core/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.c
diff --git a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.h b/Core/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.h
index a74f1c6b99..a74f1c6b99 100644
--- a/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.h
+++ b/Core/MdeModulePkg/Bus/Sd/EmmcBlockIoPei/EmmcHci.h
diff --git a/MdeModulePkg/Bus/Sd/EmmcDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Sd/EmmcDxe/ComponentName.c
index c6545b658a..c6545b658a 100644
--- a/MdeModulePkg/Bus/Sd/EmmcDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Sd/EmmcDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcBlockIo.c b/Core/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcBlockIo.c
index c432d26801..c432d26801 100644
--- a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcBlockIo.c
+++ b/Core/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcBlockIo.c
diff --git a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcBlockIo.h b/Core/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcBlockIo.h
index c8a6c5cab4..c8a6c5cab4 100644
--- a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcBlockIo.h
+++ b/Core/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcBlockIo.h
diff --git a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c b/Core/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c
index 5040882d62..5040882d62 100644
--- a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c
+++ b/Core/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.c
diff --git a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.h b/Core/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.h
index 0ae4eccac6..0ae4eccac6 100644
--- a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.h
+++ b/Core/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.h
diff --git a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf b/Core/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
index 7b0504937a..7b0504937a 100644
--- a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
+++ b/Core/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
diff --git a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.uni b/Core/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.uni
index a0c9cf2935..a0c9cf2935 100644
--- a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.uni
+++ b/Core/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.uni
diff --git a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxeExtra.uni b/Core/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxeExtra.uni
index 083b4f67ae..083b4f67ae 100644
--- a/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxeExtra.uni
diff --git a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.c b/Core/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.c
index 6dc343edbd..6dc343edbd 100644
--- a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.c
+++ b/Core/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.c
diff --git a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.h b/Core/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.h
index b2491bb3cb..b2491bb3cb 100644
--- a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.h
+++ b/Core/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.h
diff --git a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.inf b/Core/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.inf
index ca4c39b65f..ca4c39b65f 100644
--- a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.inf
+++ b/Core/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.inf
diff --git a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.uni b/Core/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.uni
index 30c9f0e92c..30c9f0e92c 100644
--- a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.uni
+++ b/Core/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPei.uni
diff --git a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPeiExtra.uni b/Core/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPeiExtra.uni
index 141e467233..141e467233 100644
--- a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPeiExtra.uni
+++ b/Core/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdBlockIoPeiExtra.uni
diff --git a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHcMem.c b/Core/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHcMem.c
index f390a636dc..f390a636dc 100644
--- a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHcMem.c
+++ b/Core/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHcMem.c
diff --git a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHcMem.h b/Core/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHcMem.h
index 096b625f98..096b625f98 100644
--- a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHcMem.h
+++ b/Core/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHcMem.h
diff --git a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.c b/Core/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.c
index eebadd79bc..eebadd79bc 100644
--- a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.c
+++ b/Core/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.c
diff --git a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.h b/Core/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.h
index b7c0dbc9f3..b7c0dbc9f3 100644
--- a/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.h
+++ b/Core/MdeModulePkg/Bus/Sd/SdBlockIoPei/SdHci.h
diff --git a/MdeModulePkg/Bus/Sd/SdDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Sd/SdDxe/ComponentName.c
index 246378381f..246378381f 100644
--- a/MdeModulePkg/Bus/Sd/SdDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Sd/SdDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c b/Core/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c
index 516c3e7042..516c3e7042 100644
--- a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c
+++ b/Core/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c
diff --git a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.h b/Core/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.h
index 227b45bebf..227b45bebf 100644
--- a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.h
+++ b/Core/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.h
diff --git a/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c b/Core/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c
index 0cf9067701..0cf9067701 100644
--- a/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c
+++ b/Core/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c
diff --git a/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.h b/Core/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.h
index 0ba72b7f9c..0ba72b7f9c 100644
--- a/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.h
+++ b/Core/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.h
diff --git a/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf b/Core/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
index 6f5e6ca72e..6f5e6ca72e 100644
--- a/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
+++ b/Core/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
diff --git a/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.uni b/Core/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.uni
index dc77ab86f0..dc77ab86f0 100644
--- a/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.uni
+++ b/Core/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.uni
diff --git a/MdeModulePkg/Bus/Sd/SdDxe/SdDxeExtra.uni b/Core/MdeModulePkg/Bus/Sd/SdDxe/SdDxeExtra.uni
index dc77ab86f0..dc77ab86f0 100644
--- a/MdeModulePkg/Bus/Sd/SdDxe/SdDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/Sd/SdDxe/SdDxeExtra.uni
diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.c b/Core/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.c
index ddeee3e1bc..ddeee3e1bc 100644
--- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.c
+++ b/Core/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.c
diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h b/Core/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h
index 46e9bfe03f..46e9bfe03f 100644
--- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h
+++ b/Core/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h
diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.inf b/Core/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.inf
index 80fe0392b9..80fe0392b9 100644
--- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.inf
+++ b/Core/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.inf
diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.uni b/Core/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.uni
index 04b9f3bfc7..04b9f3bfc7 100644
--- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.uni
+++ b/Core/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.uni
diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPeiExtra.uni b/Core/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPeiExtra.uni
index 0ce3004afd..0ce3004afd 100644
--- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPeiExtra.uni
+++ b/Core/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPeiExtra.uni
diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHcMem.c b/Core/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHcMem.c
index bf4079a408..bf4079a408 100644
--- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHcMem.c
+++ b/Core/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHcMem.c
diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHcMem.h b/Core/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHcMem.h
index 3c4b2407c8..3c4b2407c8 100644
--- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHcMem.h
+++ b/Core/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHcMem.h
diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c b/Core/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c
index 1ef6c8878b..1ef6c8878b 100644
--- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c
+++ b/Core/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c
diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.h b/Core/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.h
index 0a0cf71894..0a0cf71894 100644
--- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.h
+++ b/Core/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.h
diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/ComponentName.c
index 7da21110e3..7da21110e3 100644
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c b/Core/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
index 7c831e92d0..7c831e92d0 100644
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
+++ b/Core/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h b/Core/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h
index 7fc82bae7a..7fc82bae7a 100644
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h
+++ b/Core/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h
diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.uni b/Core/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.uni
index 85c16c1074..85c16c1074 100644
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.uni
+++ b/Core/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.uni
diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruDxe.inf b/Core/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruDxe.inf
index c90c72f915..c90c72f915 100644
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruDxe.inf
+++ b/Core/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruDxe.inf
diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruExtra.uni b/Core/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruExtra.uni
index 4f188f0610..4f188f0610 100644
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruExtra.uni
+++ b/Core/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruExtra.uni
diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c b/Core/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
index 3dd8cbfe7a..3dd8cbfe7a 100644
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
+++ b/Core/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.h b/Core/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.h
index 0a0cf71894..0a0cf71894 100644
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.h
+++ b/Core/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.h
diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.c b/Core/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.c
index 55c4a537fa..55c4a537fa 100644
--- a/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.c
diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.h b/Core/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.h
index 07235c397b..07235c397b 100644
--- a/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.h
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBotPei/BotPeim.h
diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiAtapi.c b/Core/MdeModulePkg/Bus/Usb/UsbBotPei/PeiAtapi.c
index 72bde756eb..72bde756eb 100644
--- a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiAtapi.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBotPei/PeiAtapi.c
diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.c b/Core/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.c
index 46c1a06444..46c1a06444 100644
--- a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.c
diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.h b/Core/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.h
index eafccfdbf8..eafccfdbf8 100644
--- a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.h
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.h
diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf b/Core/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf
index 977bef5c8b..977bef5c8b 100644
--- a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf
diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.uni b/Core/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.uni
index 30d49d5c41..30d49d5c41 100644
--- a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.uni
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.uni
diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeiExtra.uni b/Core/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeiExtra.uni
index 3e6eb63e02..3e6eb63e02 100644
--- a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeiExtra.uni
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeiExtra.uni
diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.c b/Core/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.c
index 5e18306652..5e18306652 100644
--- a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.c
diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.h b/Core/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.h
index 3ae8c67b35..3ae8c67b35 100644
--- a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.h
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPeim.h
diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbPeim.h b/Core/MdeModulePkg/Bus/Usb/UsbBotPei/UsbPeim.h
index c62b99d4a1..c62b99d4a1 100644
--- a/MdeModulePkg/Bus/Usb/UsbBotPei/UsbPeim.h
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBotPei/UsbPeim.h
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/ComponentName.c
index dc00208632..dc00208632 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c
index 78220222f6..78220222f6 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h
index 9ede83ab7e..9ede83ab7e 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
index b7b30cc937..b7b30cc937 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.uni b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.uni
index f147a0d37f..f147a0d37f 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.uni
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.uni
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxeExtra.uni b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxeExtra.uni
index 6b92980c83..6b92980c83 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxeExtra.uni
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c
index fba60dae16..fba60dae16 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.h b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.h
index 482a71f338..482a71f338 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.h
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.h
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
index ea54d37c93..ea54d37c93 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.h b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.h
index ef7d440917..ef7d440917 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.h
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.h
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
index fabb441570..fabb441570 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.h b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.h
index 4e5fcd85e0..4e5fcd85e0 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.h
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.h
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
index 399b7a3b60..399b7a3b60 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
index 26709caa36..26709caa36 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.c b/Core/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.c
index 16a7b589c1..16a7b589c1 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.c
diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.h b/Core/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.h
index f50bc63501..f50bc63501 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.h
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.h
diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.c b/Core/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.c
index 42be13ac3b..42be13ac3b 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.c
diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.h b/Core/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.h
index 1ace89fbc3..1ace89fbc3 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.h
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.h
diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf b/Core/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf
index 734619a2fa..734619a2fa 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf
diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.uni b/Core/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.uni
index bd18fdbfec..bd18fdbfec 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.uni
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.uni
diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPeiExtra.uni b/Core/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPeiExtra.uni
index a84da95a47..a84da95a47 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPeiExtra.uni
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPeiExtra.uni
diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbIoPeim.c b/Core/MdeModulePkg/Bus/Usb/UsbBusPei/UsbIoPeim.c
index d13a7ee0a3..d13a7ee0a3 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbIoPeim.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusPei/UsbIoPeim.c
diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.c b/Core/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.c
index a4bb4d7aa7..a4bb4d7aa7 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.c
diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.h b/Core/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.h
index dff8eeb202..dff8eeb202 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.h
+++ b/Core/MdeModulePkg/Bus/Usb/UsbBusPei/UsbPeim.h
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Usb/UsbKbDxe/ComponentName.c
index 186bdbe950..186bdbe950 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbKbDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c b/Core/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
index cdd1684277..cdd1684277 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h b/Core/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h
index 089f113d5f..089f113d5f 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h
+++ b/Core/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c b/Core/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
index 91913d4e54..91913d4e54 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.h b/Core/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.h
index b3eb3e462f..b3eb3e462f 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.h
+++ b/Core/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.h
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf b/Core/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
index 7939a1857d..7939a1857d 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
+++ b/Core/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.uni b/Core/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.uni
index 7dcbf12353..7dcbf12353 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.uni
+++ b/Core/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.uni
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxeExtra.uni b/Core/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxeExtra.uni
index 6a76634878..6a76634878 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxeExtra.uni
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/ComponentName.c
index ad879afe59..ad879afe59 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h
index ebfb254de6..ebfb254de6 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
index 0c46f888eb..0c46f888eb 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h
index c4082558fa..c4082558fa 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
index 4bb7222b89..4bb7222b89 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h
index 502c6703bf..502c6703bf 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.h
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.c b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.c
index 3f6201d053..3f6201d053 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.c
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h
index b414a46fde..b414a46fde 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassCbi.h
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.c b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.c
index 1fa8543e2b..1fa8543e2b 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.c
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.h b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.h
index e0a32ca8ee..e0a32ca8ee 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.h
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassDiskInfo.h
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
index 9d1bb25fb3..9d1bb25fb3 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h
index 0f013c1ad7..0f013c1ad7 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.h
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
index 26d15c7679..26d15c7679 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.uni b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.uni
index 80960be0a5..80960be0a5 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.uni
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.uni
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxeExtra.uni b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxeExtra.uni
index 4e09a8d3e1..4e09a8d3e1 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxeExtra.uni
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/ComponentName.c
index 4b79a0f07e..4b79a0f07e 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/MouseHid.c b/Core/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/MouseHid.c
index 92ce18f425..92ce18f425 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/MouseHid.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/MouseHid.c
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c b/Core/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c
index 9fe92441b8..9fe92441b8 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h b/Core/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h
index 08b8d56dd8..08b8d56dd8 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf b/Core/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf
index af10382d52..af10382d52 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.uni b/Core/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.uni
index f3d1b1d64d..f3d1b1d64d 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.uni
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.uni
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxeExtra.uni b/Core/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxeExtra.uni
index ea9f4d9659..ea9f4d9659 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxeExtra.uni
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Usb/UsbMouseDxe/ComponentName.c
index a7df52221c..a7df52221c 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMouseDxe/ComponentName.c
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c b/Core/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c
index ec6a420c14..ec6a420c14 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMouseDxe/MouseHid.c
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c b/Core/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
index 0ad5616d96..0ad5616d96 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h b/Core/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
index 0dab9de11d..0dab9de11d 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf b/Core/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
index 13d8859f98..13d8859f98 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.uni b/Core/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.uni
index a7313ce7a6..a7313ce7a6 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.uni
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.uni
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxeExtra.uni b/Core/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxeExtra.uni
index 49769a99e7..49769a99e7 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxeExtra.uni
diff --git a/MdeModulePkg/Contributions.txt b/Core/MdeModulePkg/Contributions.txt
index f87cbd73c6..f87cbd73c6 100644
--- a/MdeModulePkg/Contributions.txt
+++ b/Core/MdeModulePkg/Contributions.txt
diff --git a/MdeModulePkg/Core/Dxe/Dispatcher/Dependency.c b/Core/MdeModulePkg/Core/Dxe/Dispatcher/Dependency.c
index 1d8a57b879..1d8a57b879 100644
--- a/MdeModulePkg/Core/Dxe/Dispatcher/Dependency.c
+++ b/Core/MdeModulePkg/Core/Dxe/Dispatcher/Dependency.c
diff --git a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c b/Core/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
index 5686d94e6a..5686d94e6a 100644
--- a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
+++ b/Core/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
diff --git a/MdeModulePkg/Core/Dxe/DxeCore.uni b/Core/MdeModulePkg/Core/Dxe/DxeCore.uni
index 0b4450dbbe..0b4450dbbe 100644
--- a/MdeModulePkg/Core/Dxe/DxeCore.uni
+++ b/Core/MdeModulePkg/Core/Dxe/DxeCore.uni
diff --git a/MdeModulePkg/Core/Dxe/DxeCoreExtra.uni b/Core/MdeModulePkg/Core/Dxe/DxeCoreExtra.uni
index d04eaf4958..d04eaf4958 100644
--- a/MdeModulePkg/Core/Dxe/DxeCoreExtra.uni
+++ b/Core/MdeModulePkg/Core/Dxe/DxeCoreExtra.uni
diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/Core/MdeModulePkg/Core/Dxe/DxeMain.h
index 1a0babba71..1a0babba71 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.h
+++ b/Core/MdeModulePkg/Core/Dxe/DxeMain.h
diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/Core/MdeModulePkg/Core/Dxe/DxeMain.inf
index 30d5984f7c..30d5984f7c 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/Core/MdeModulePkg/Core/Dxe/DxeMain.inf
diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/Core/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index 91e94a78d2..91e94a78d2 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/Core/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c b/Core/MdeModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
index ea7c6107b4..ea7c6107b4 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
+++ b/Core/MdeModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
diff --git a/MdeModulePkg/Core/Dxe/Event/Event.c b/Core/MdeModulePkg/Core/Dxe/Event/Event.c
index 86ca369d56..86ca369d56 100644
--- a/MdeModulePkg/Core/Dxe/Event/Event.c
+++ b/Core/MdeModulePkg/Core/Dxe/Event/Event.c
diff --git a/MdeModulePkg/Core/Dxe/Event/Event.h b/Core/MdeModulePkg/Core/Dxe/Event/Event.h
index 4c02900b93..4c02900b93 100644
--- a/MdeModulePkg/Core/Dxe/Event/Event.h
+++ b/Core/MdeModulePkg/Core/Dxe/Event/Event.h
diff --git a/MdeModulePkg/Core/Dxe/Event/Timer.c b/Core/MdeModulePkg/Core/Dxe/Event/Timer.c
index 6cd4e6c185..6cd4e6c185 100644
--- a/MdeModulePkg/Core/Dxe/Event/Timer.c
+++ b/Core/MdeModulePkg/Core/Dxe/Event/Timer.c
diff --git a/MdeModulePkg/Core/Dxe/Event/Tpl.c b/Core/MdeModulePkg/Core/Dxe/Event/Tpl.c
index 8ad0a33701..8ad0a33701 100644
--- a/MdeModulePkg/Core/Dxe/Event/Tpl.c
+++ b/Core/MdeModulePkg/Core/Dxe/Event/Tpl.c
diff --git a/MdeModulePkg/Core/Dxe/FwVol/Ffs.c b/Core/MdeModulePkg/Core/Dxe/FwVol/Ffs.c
index 20dade18a2..20dade18a2 100644
--- a/MdeModulePkg/Core/Dxe/FwVol/Ffs.c
+++ b/Core/MdeModulePkg/Core/Dxe/FwVol/Ffs.c
diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c b/Core/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
index fe12d6e0ac..fe12d6e0ac 100644
--- a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
+++ b/Core/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVolAttrib.c b/Core/MdeModulePkg/Core/Dxe/FwVol/FwVolAttrib.c
index 0a89e70761..0a89e70761 100644
--- a/MdeModulePkg/Core/Dxe/FwVol/FwVolAttrib.c
+++ b/Core/MdeModulePkg/Core/Dxe/FwVol/FwVolAttrib.c
diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVolDriver.h b/Core/MdeModulePkg/Core/Dxe/FwVol/FwVolDriver.h
index 96cbde37d5..96cbde37d5 100644
--- a/MdeModulePkg/Core/Dxe/FwVol/FwVolDriver.h
+++ b/Core/MdeModulePkg/Core/Dxe/FwVol/FwVolDriver.h
diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVolRead.c b/Core/MdeModulePkg/Core/Dxe/FwVol/FwVolRead.c
index 00e0d7d289..00e0d7d289 100644
--- a/MdeModulePkg/Core/Dxe/FwVol/FwVolRead.c
+++ b/Core/MdeModulePkg/Core/Dxe/FwVol/FwVolRead.c
diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVolWrite.c b/Core/MdeModulePkg/Core/Dxe/FwVol/FwVolWrite.c
index 1ec563c865..1ec563c865 100644
--- a/MdeModulePkg/Core/Dxe/FwVol/FwVolWrite.c
+++ b/Core/MdeModulePkg/Core/Dxe/FwVol/FwVolWrite.c
diff --git a/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c b/Core/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c
index bc7b34140f..bc7b34140f 100644
--- a/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c
+++ b/Core/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c
diff --git a/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.h b/Core/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.h
index 7ad4e35ecb..7ad4e35ecb 100644
--- a/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.h
+++ b/Core/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.h
diff --git a/MdeModulePkg/Core/Dxe/Gcd/Gcd.c b/Core/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
index a06f8bb77c..a06f8bb77c 100644
--- a/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
+++ b/Core/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
diff --git a/MdeModulePkg/Core/Dxe/Gcd/Gcd.h b/Core/MdeModulePkg/Core/Dxe/Gcd/Gcd.h
index 1d5fb61092..1d5fb61092 100644
--- a/MdeModulePkg/Core/Dxe/Gcd/Gcd.h
+++ b/Core/MdeModulePkg/Core/Dxe/Gcd/Gcd.h
diff --git a/MdeModulePkg/Core/Dxe/Hand/DriverSupport.c b/Core/MdeModulePkg/Core/Dxe/Hand/DriverSupport.c
index 33dd0bd0b7..33dd0bd0b7 100644
--- a/MdeModulePkg/Core/Dxe/Hand/DriverSupport.c
+++ b/Core/MdeModulePkg/Core/Dxe/Hand/DriverSupport.c
diff --git a/MdeModulePkg/Core/Dxe/Hand/Handle.c b/Core/MdeModulePkg/Core/Dxe/Hand/Handle.c
index 1c25521672..1c25521672 100644
--- a/MdeModulePkg/Core/Dxe/Hand/Handle.c
+++ b/Core/MdeModulePkg/Core/Dxe/Hand/Handle.c
diff --git a/MdeModulePkg/Core/Dxe/Hand/Handle.h b/Core/MdeModulePkg/Core/Dxe/Hand/Handle.h
index 28f762265a..28f762265a 100644
--- a/MdeModulePkg/Core/Dxe/Hand/Handle.h
+++ b/Core/MdeModulePkg/Core/Dxe/Hand/Handle.h
diff --git a/MdeModulePkg/Core/Dxe/Hand/Locate.c b/Core/MdeModulePkg/Core/Dxe/Hand/Locate.c
index 80df0d4a6c..80df0d4a6c 100644
--- a/MdeModulePkg/Core/Dxe/Hand/Locate.c
+++ b/Core/MdeModulePkg/Core/Dxe/Hand/Locate.c
diff --git a/MdeModulePkg/Core/Dxe/Hand/Notify.c b/Core/MdeModulePkg/Core/Dxe/Hand/Notify.c
index f0837c403f..f0837c403f 100644
--- a/MdeModulePkg/Core/Dxe/Hand/Notify.c
+++ b/Core/MdeModulePkg/Core/Dxe/Hand/Notify.c
diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/Core/MdeModulePkg/Core/Dxe/Image/Image.c
index 03e979a604..03e979a604 100644
--- a/MdeModulePkg/Core/Dxe/Image/Image.c
+++ b/Core/MdeModulePkg/Core/Dxe/Image/Image.c
diff --git a/MdeModulePkg/Core/Dxe/Image/Image.h b/Core/MdeModulePkg/Core/Dxe/Image/Image.h
index 7fb8c9368e..7fb8c9368e 100644
--- a/MdeModulePkg/Core/Dxe/Image/Image.h
+++ b/Core/MdeModulePkg/Core/Dxe/Image/Image.h
diff --git a/MdeModulePkg/Core/Dxe/Library/Library.c b/Core/MdeModulePkg/Core/Dxe/Library/Library.c
index ad46c27fa2..ad46c27fa2 100644
--- a/MdeModulePkg/Core/Dxe/Library/Library.c
+++ b/Core/MdeModulePkg/Core/Dxe/Library/Library.c
diff --git a/MdeModulePkg/Core/Dxe/Mem/Imem.h b/Core/MdeModulePkg/Core/Dxe/Mem/Imem.h
index fb53f95575..fb53f95575 100644
--- a/MdeModulePkg/Core/Dxe/Mem/Imem.h
+++ b/Core/MdeModulePkg/Core/Dxe/Mem/Imem.h
diff --git a/MdeModulePkg/Core/Dxe/Mem/MemData.c b/Core/MdeModulePkg/Core/Dxe/Mem/MemData.c
index e51b894433..e51b894433 100644
--- a/MdeModulePkg/Core/Dxe/Mem/MemData.c
+++ b/Core/MdeModulePkg/Core/Dxe/Mem/MemData.c
diff --git a/MdeModulePkg/Core/Dxe/Mem/MemoryProfileRecord.c b/Core/MdeModulePkg/Core/Dxe/Mem/MemoryProfileRecord.c
index a91a719b4d..a91a719b4d 100644
--- a/MdeModulePkg/Core/Dxe/Mem/MemoryProfileRecord.c
+++ b/Core/MdeModulePkg/Core/Dxe/Mem/MemoryProfileRecord.c
diff --git a/MdeModulePkg/Core/Dxe/Mem/Page.c b/Core/MdeModulePkg/Core/Dxe/Mem/Page.c
index 3b3b9a8131..3b3b9a8131 100644
--- a/MdeModulePkg/Core/Dxe/Mem/Page.c
+++ b/Core/MdeModulePkg/Core/Dxe/Mem/Page.c
diff --git a/MdeModulePkg/Core/Dxe/Mem/Pool.c b/Core/MdeModulePkg/Core/Dxe/Mem/Pool.c
index dd165fea75..dd165fea75 100644
--- a/MdeModulePkg/Core/Dxe/Mem/Pool.c
+++ b/Core/MdeModulePkg/Core/Dxe/Mem/Pool.c
diff --git a/MdeModulePkg/Core/Dxe/Misc/DebugImageInfo.c b/Core/MdeModulePkg/Core/Dxe/Misc/DebugImageInfo.c
index fda6d44043..fda6d44043 100644
--- a/MdeModulePkg/Core/Dxe/Misc/DebugImageInfo.c
+++ b/Core/MdeModulePkg/Core/Dxe/Misc/DebugImageInfo.c
diff --git a/MdeModulePkg/Core/Dxe/Misc/InstallConfigurationTable.c b/Core/MdeModulePkg/Core/Dxe/Misc/InstallConfigurationTable.c
index e4735db7ba..e4735db7ba 100644
--- a/MdeModulePkg/Core/Dxe/Misc/InstallConfigurationTable.c
+++ b/Core/MdeModulePkg/Core/Dxe/Misc/InstallConfigurationTable.c
diff --git a/MdeModulePkg/Core/Dxe/Misc/MemoryAttributesTable.c b/Core/MdeModulePkg/Core/Dxe/Misc/MemoryAttributesTable.c
index 35156aea14..35156aea14 100644
--- a/MdeModulePkg/Core/Dxe/Misc/MemoryAttributesTable.c
+++ b/Core/MdeModulePkg/Core/Dxe/Misc/MemoryAttributesTable.c
diff --git a/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c b/Core/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c
index a73c4ccd64..a73c4ccd64 100644
--- a/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c
+++ b/Core/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c
diff --git a/MdeModulePkg/Core/Dxe/Misc/PropertiesTable.c b/Core/MdeModulePkg/Core/Dxe/Misc/PropertiesTable.c
index e7c4a95712..e7c4a95712 100644
--- a/MdeModulePkg/Core/Dxe/Misc/PropertiesTable.c
+++ b/Core/MdeModulePkg/Core/Dxe/Misc/PropertiesTable.c
diff --git a/MdeModulePkg/Core/Dxe/Misc/SetWatchdogTimer.c b/Core/MdeModulePkg/Core/Dxe/Misc/SetWatchdogTimer.c
index f153815e86..f153815e86 100644
--- a/MdeModulePkg/Core/Dxe/Misc/SetWatchdogTimer.c
+++ b/Core/MdeModulePkg/Core/Dxe/Misc/SetWatchdogTimer.c
diff --git a/MdeModulePkg/Core/Dxe/Misc/Stall.c b/Core/MdeModulePkg/Core/Dxe/Misc/Stall.c
index 95a561546f..95a561546f 100644
--- a/MdeModulePkg/Core/Dxe/Misc/Stall.c
+++ b/Core/MdeModulePkg/Core/Dxe/Misc/Stall.c
diff --git a/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c b/Core/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c
index 6622eeeaf1..6622eeeaf1 100644
--- a/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c
+++ b/Core/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c
diff --git a/MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c b/Core/MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c
index 3acc4544b4..3acc4544b4 100644
--- a/MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c
+++ b/Core/MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c
diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h b/Core/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
index 72d2532f50..72d2532f50 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
+++ b/Core/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/Core/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
index c54afe4aa6..c54afe4aa6 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
+++ b/Core/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.uni b/Core/MdeModulePkg/Core/DxeIplPeim/DxeIpl.uni
index 1a319c209c..1a319c209c 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.uni
+++ b/Core/MdeModulePkg/Core/DxeIplPeim/DxeIpl.uni
diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIplExtra.uni b/Core/MdeModulePkg/Core/DxeIplPeim/DxeIplExtra.uni
index 883a246dc8..883a246dc8 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIplExtra.uni
+++ b/Core/MdeModulePkg/Core/DxeIplPeim/DxeIplExtra.uni
diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/Core/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index 50b5440d15..50b5440d15 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/Core/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
diff --git a/MdeModulePkg/Core/DxeIplPeim/Ebc/DxeLoadFunc.c b/Core/MdeModulePkg/Core/DxeIplPeim/Ebc/DxeLoadFunc.c
index f06bd75891..f06bd75891 100644
--- a/MdeModulePkg/Core/DxeIplPeim/Ebc/DxeLoadFunc.c
+++ b/Core/MdeModulePkg/Core/DxeIplPeim/Ebc/DxeLoadFunc.c
diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c b/Core/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
index 1957326caf..1957326caf 100644
--- a/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
+++ b/Core/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.S b/Core/MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.S
index 96a3acbac1..96a3acbac1 100644
--- a/MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.S
+++ b/Core/MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.S
diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.asm b/Core/MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.asm
index 69fb9a15e7..69fb9a15e7 100644
--- a/MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.asm
+++ b/Core/MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.asm
diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.nasm b/Core/MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.nasm
index 99a0bbeea8..99a0bbeea8 100644
--- a/MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.nasm
+++ b/Core/MdeModulePkg/Core/DxeIplPeim/Ia32/IdtVectorAsm.nasm
diff --git a/MdeModulePkg/Core/DxeIplPeim/Ipf/DxeLoadFunc.c b/Core/MdeModulePkg/Core/DxeIplPeim/Ipf/DxeLoadFunc.c
index 7443648017..7443648017 100644
--- a/MdeModulePkg/Core/DxeIplPeim/Ipf/DxeLoadFunc.c
+++ b/Core/MdeModulePkg/Core/DxeIplPeim/Ipf/DxeLoadFunc.c
diff --git a/MdeModulePkg/Core/DxeIplPeim/X64/DxeLoadFunc.c b/Core/MdeModulePkg/Core/DxeIplPeim/X64/DxeLoadFunc.c
index 6488880eab..6488880eab 100644
--- a/MdeModulePkg/Core/DxeIplPeim/X64/DxeLoadFunc.c
+++ b/Core/MdeModulePkg/Core/DxeIplPeim/X64/DxeLoadFunc.c
diff --git a/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c b/Core/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c
index 48150be4e1..48150be4e1 100644
--- a/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c
+++ b/Core/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c
diff --git a/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.h b/Core/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.h
index 7c9bb49e3e..7c9bb49e3e 100644
--- a/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.h
+++ b/Core/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.h
diff --git a/MdeModulePkg/Core/Pei/BootMode/BootMode.c b/Core/MdeModulePkg/Core/Pei/BootMode/BootMode.c
index 39afeba838..39afeba838 100644
--- a/MdeModulePkg/Core/Pei/BootMode/BootMode.c
+++ b/Core/MdeModulePkg/Core/Pei/BootMode/BootMode.c
diff --git a/MdeModulePkg/Core/Pei/CpuIo/CpuIo.c b/Core/MdeModulePkg/Core/Pei/CpuIo/CpuIo.c
index c82c221540..c82c221540 100644
--- a/MdeModulePkg/Core/Pei/CpuIo/CpuIo.c
+++ b/Core/MdeModulePkg/Core/Pei/CpuIo/CpuIo.c
diff --git a/MdeModulePkg/Core/Pei/Dependency/Dependency.c b/Core/MdeModulePkg/Core/Pei/Dependency/Dependency.c
index e71566b5a7..e71566b5a7 100644
--- a/MdeModulePkg/Core/Pei/Dependency/Dependency.c
+++ b/Core/MdeModulePkg/Core/Pei/Dependency/Dependency.c
diff --git a/MdeModulePkg/Core/Pei/Dependency/Dependency.h b/Core/MdeModulePkg/Core/Pei/Dependency/Dependency.h
index 5021ce056b..5021ce056b 100644
--- a/MdeModulePkg/Core/Pei/Dependency/Dependency.h
+++ b/Core/MdeModulePkg/Core/Pei/Dependency/Dependency.h
diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/Core/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index ff43a90ba5..ff43a90ba5 100644
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/Core/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/Core/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index 0bbb86d958..0bbb86d958 100644
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/Core/MdeModulePkg/Core/Pei/FwVol/FwVol.c
diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.h b/Core/MdeModulePkg/Core/Pei/FwVol/FwVol.h
index 1daeb6d97b..1daeb6d97b 100644
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.h
+++ b/Core/MdeModulePkg/Core/Pei/FwVol/FwVol.h
diff --git a/MdeModulePkg/Core/Pei/Hob/Hob.c b/Core/MdeModulePkg/Core/Pei/Hob/Hob.c
index e0ee8e7f10..e0ee8e7f10 100644
--- a/MdeModulePkg/Core/Pei/Hob/Hob.c
+++ b/Core/MdeModulePkg/Core/Pei/Hob/Hob.c
diff --git a/MdeModulePkg/Core/Pei/Image/Image.c b/Core/MdeModulePkg/Core/Pei/Image/Image.c
index 1985411285..1985411285 100644
--- a/MdeModulePkg/Core/Pei/Image/Image.c
+++ b/Core/MdeModulePkg/Core/Pei/Image/Image.c
diff --git a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c b/Core/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
index 719372e061..719372e061 100644
--- a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
+++ b/Core/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
diff --git a/MdeModulePkg/Core/Pei/PciCfg2/PciCfg2.c b/Core/MdeModulePkg/Core/Pei/PciCfg2/PciCfg2.c
index a20e7c00c5..a20e7c00c5 100644
--- a/MdeModulePkg/Core/Pei/PciCfg2/PciCfg2.c
+++ b/Core/MdeModulePkg/Core/Pei/PciCfg2/PciCfg2.c
diff --git a/MdeModulePkg/Core/Pei/PeiCore.uni b/Core/MdeModulePkg/Core/Pei/PeiCore.uni
index 79db0cc791..79db0cc791 100644
--- a/MdeModulePkg/Core/Pei/PeiCore.uni
+++ b/Core/MdeModulePkg/Core/Pei/PeiCore.uni
diff --git a/MdeModulePkg/Core/Pei/PeiCoreExtra.uni b/Core/MdeModulePkg/Core/Pei/PeiCoreExtra.uni
index ec430fccae..ec430fccae 100644
--- a/MdeModulePkg/Core/Pei/PeiCoreExtra.uni
+++ b/Core/MdeModulePkg/Core/Pei/PeiCoreExtra.uni
diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/Core/MdeModulePkg/Core/Pei/PeiMain.h
index 69eea51492..69eea51492 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.h
+++ b/Core/MdeModulePkg/Core/Pei/PeiMain.h
diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/Core/MdeModulePkg/Core/Pei/PeiMain.inf
index 39a464f326..39a464f326 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/Core/MdeModulePkg/Core/Pei/PeiMain.inf
diff --git a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c b/Core/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
index 27484bafc5..27484bafc5 100644
--- a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
+++ b/Core/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
diff --git a/MdeModulePkg/Core/Pei/Ppi/Ppi.c b/Core/MdeModulePkg/Core/Pei/Ppi/Ppi.c
index db6eded6d6..db6eded6d6 100644
--- a/MdeModulePkg/Core/Pei/Ppi/Ppi.c
+++ b/Core/MdeModulePkg/Core/Pei/Ppi/Ppi.c
diff --git a/MdeModulePkg/Core/Pei/Reset/Reset.c b/Core/MdeModulePkg/Core/Pei/Reset/Reset.c
index 2e9ac8215b..2e9ac8215b 100644
--- a/MdeModulePkg/Core/Pei/Reset/Reset.c
+++ b/Core/MdeModulePkg/Core/Pei/Reset/Reset.c
diff --git a/MdeModulePkg/Core/Pei/Security/Security.c b/Core/MdeModulePkg/Core/Pei/Security/Security.c
index 763126057d..763126057d 100644
--- a/MdeModulePkg/Core/Pei/Security/Security.c
+++ b/Core/MdeModulePkg/Core/Pei/Security/Security.c
diff --git a/MdeModulePkg/Core/Pei/StatusCode/StatusCode.c b/Core/MdeModulePkg/Core/Pei/StatusCode/StatusCode.c
index a7fb524ff4..a7fb524ff4 100644
--- a/MdeModulePkg/Core/Pei/StatusCode/StatusCode.c
+++ b/Core/MdeModulePkg/Core/Pei/StatusCode/StatusCode.c
diff --git a/MdeModulePkg/Core/PiSmmCore/Dependency.c b/Core/MdeModulePkg/Core/PiSmmCore/Dependency.c
index deaf4b445e..deaf4b445e 100644
--- a/MdeModulePkg/Core/PiSmmCore/Dependency.c
+++ b/Core/MdeModulePkg/Core/PiSmmCore/Dependency.c
diff --git a/MdeModulePkg/Core/PiSmmCore/Dispatcher.c b/Core/MdeModulePkg/Core/PiSmmCore/Dispatcher.c
index b2a6822048..b2a6822048 100644
--- a/MdeModulePkg/Core/PiSmmCore/Dispatcher.c
+++ b/Core/MdeModulePkg/Core/PiSmmCore/Dispatcher.c
diff --git a/MdeModulePkg/Core/PiSmmCore/Handle.c b/Core/MdeModulePkg/Core/PiSmmCore/Handle.c
index 9cedb2aeb5..9cedb2aeb5 100644
--- a/MdeModulePkg/Core/PiSmmCore/Handle.c
+++ b/Core/MdeModulePkg/Core/PiSmmCore/Handle.c
diff --git a/MdeModulePkg/Core/PiSmmCore/InstallConfigurationTable.c b/Core/MdeModulePkg/Core/PiSmmCore/InstallConfigurationTable.c
index b2f6769c10..b2f6769c10 100644
--- a/MdeModulePkg/Core/PiSmmCore/InstallConfigurationTable.c
+++ b/Core/MdeModulePkg/Core/PiSmmCore/InstallConfigurationTable.c
diff --git a/MdeModulePkg/Core/PiSmmCore/Locate.c b/Core/MdeModulePkg/Core/PiSmmCore/Locate.c
index a7220bae86..a7220bae86 100644
--- a/MdeModulePkg/Core/PiSmmCore/Locate.c
+++ b/Core/MdeModulePkg/Core/PiSmmCore/Locate.c
diff --git a/MdeModulePkg/Core/PiSmmCore/MemoryAttributesTable.c b/Core/MdeModulePkg/Core/PiSmmCore/MemoryAttributesTable.c
index e3c505ef18..e3c505ef18 100644
--- a/MdeModulePkg/Core/PiSmmCore/MemoryAttributesTable.c
+++ b/Core/MdeModulePkg/Core/PiSmmCore/MemoryAttributesTable.c
diff --git a/MdeModulePkg/Core/PiSmmCore/Notify.c b/Core/MdeModulePkg/Core/PiSmmCore/Notify.c
index 0054fe66aa..0054fe66aa 100644
--- a/MdeModulePkg/Core/PiSmmCore/Notify.c
+++ b/Core/MdeModulePkg/Core/PiSmmCore/Notify.c
diff --git a/MdeModulePkg/Core/PiSmmCore/Page.c b/Core/MdeModulePkg/Core/PiSmmCore/Page.c
index 4154c2e6a1..4154c2e6a1 100644
--- a/MdeModulePkg/Core/PiSmmCore/Page.c
+++ b/Core/MdeModulePkg/Core/PiSmmCore/Page.c
diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.c b/Core/MdeModulePkg/Core/PiSmmCore/PiSmmCore.c
index 9e4390e15a..9e4390e15a 100644
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.c
+++ b/Core/MdeModulePkg/Core/PiSmmCore/PiSmmCore.c
diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h b/Core/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h
index c12805a2dd..c12805a2dd 100644
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h
+++ b/Core/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h
diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf b/Core/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
index 95e34bd683..95e34bd683 100644
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
+++ b/Core/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.uni b/Core/MdeModulePkg/Core/PiSmmCore/PiSmmCore.uni
index 5b02e71e07..5b02e71e07 100644
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.uni
+++ b/Core/MdeModulePkg/Core/PiSmmCore/PiSmmCore.uni
diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCoreExtra.uni b/Core/MdeModulePkg/Core/PiSmmCore/PiSmmCoreExtra.uni
index c1ed17534c..c1ed17534c 100644
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCoreExtra.uni
+++ b/Core/MdeModulePkg/Core/PiSmmCore/PiSmmCoreExtra.uni
diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCorePrivateData.h b/Core/MdeModulePkg/Core/PiSmmCore/PiSmmCorePrivateData.h
index 8aec7a6568..8aec7a6568 100644
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCorePrivateData.h
+++ b/Core/MdeModulePkg/Core/PiSmmCore/PiSmmCorePrivateData.h
diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c b/Core/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c
index feb846ee9e..feb846ee9e 100644
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c
+++ b/Core/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c
diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf b/Core/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
index 07a765b5d2..07a765b5d2 100644
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
+++ b/Core/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.uni b/Core/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.uni
index edb3e236d9..edb3e236d9 100644
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.uni
+++ b/Core/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.uni
diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmIplExtra.uni b/Core/MdeModulePkg/Core/PiSmmCore/PiSmmIplExtra.uni
index 98410d8f0f..98410d8f0f 100644
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmIplExtra.uni
+++ b/Core/MdeModulePkg/Core/PiSmmCore/PiSmmIplExtra.uni
diff --git a/MdeModulePkg/Core/PiSmmCore/Pool.c b/Core/MdeModulePkg/Core/PiSmmCore/Pool.c
index f734b3f72d..f734b3f72d 100644
--- a/MdeModulePkg/Core/PiSmmCore/Pool.c
+++ b/Core/MdeModulePkg/Core/PiSmmCore/Pool.c
diff --git a/MdeModulePkg/Core/PiSmmCore/Smi.c b/Core/MdeModulePkg/Core/PiSmmCore/Smi.c
index ad483a1877..ad483a1877 100644
--- a/MdeModulePkg/Core/PiSmmCore/Smi.c
+++ b/Core/MdeModulePkg/Core/PiSmmCore/Smi.c
diff --git a/MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c b/Core/MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c
index ad3b54ace4..ad3b54ace4 100644
--- a/MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c
+++ b/Core/MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c
diff --git a/MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c b/Core/MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c
index 410e0836fd..410e0836fd 100644
--- a/MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c
+++ b/Core/MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c
diff --git a/MdeModulePkg/Core/RuntimeDxe/Crc32.c b/Core/MdeModulePkg/Core/RuntimeDxe/Crc32.c
index a6fe77fa34..a6fe77fa34 100644
--- a/MdeModulePkg/Core/RuntimeDxe/Crc32.c
+++ b/Core/MdeModulePkg/Core/RuntimeDxe/Crc32.c
diff --git a/MdeModulePkg/Core/RuntimeDxe/Runtime.c b/Core/MdeModulePkg/Core/RuntimeDxe/Runtime.c
index c61301cf80..c61301cf80 100644
--- a/MdeModulePkg/Core/RuntimeDxe/Runtime.c
+++ b/Core/MdeModulePkg/Core/RuntimeDxe/Runtime.c
diff --git a/MdeModulePkg/Core/RuntimeDxe/Runtime.h b/Core/MdeModulePkg/Core/RuntimeDxe/Runtime.h
index f2cee9c7c6..f2cee9c7c6 100644
--- a/MdeModulePkg/Core/RuntimeDxe/Runtime.h
+++ b/Core/MdeModulePkg/Core/RuntimeDxe/Runtime.h
diff --git a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf b/Core/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
index 035aa9a596..035aa9a596 100644
--- a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
+++ b/Core/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
diff --git a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.uni b/Core/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.uni
index fa5c4785e8..fa5c4785e8 100644
--- a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.uni
+++ b/Core/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.uni
diff --git a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxeExtra.uni b/Core/MdeModulePkg/Core/RuntimeDxe/RuntimeDxeExtra.uni
index 06bd6395e8..06bd6395e8 100644
--- a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxeExtra.uni
+++ b/Core/MdeModulePkg/Core/RuntimeDxe/RuntimeDxeExtra.uni
diff --git a/MdeModulePkg/Include/Guid/AcpiS3Context.h b/Core/MdeModulePkg/Include/Guid/AcpiS3Context.h
index de0f87cfb5..de0f87cfb5 100644
--- a/MdeModulePkg/Include/Guid/AcpiS3Context.h
+++ b/Core/MdeModulePkg/Include/Guid/AcpiS3Context.h
diff --git a/MdeModulePkg/Include/Guid/BootScriptExecutorVariable.h b/Core/MdeModulePkg/Include/Guid/BootScriptExecutorVariable.h
index 420ccea255..420ccea255 100644
--- a/MdeModulePkg/Include/Guid/BootScriptExecutorVariable.h
+++ b/Core/MdeModulePkg/Include/Guid/BootScriptExecutorVariable.h
diff --git a/MdeModulePkg/Include/Guid/CapsuleVendor.h b/Core/MdeModulePkg/Include/Guid/CapsuleVendor.h
index 15ca1055b6..15ca1055b6 100644
--- a/MdeModulePkg/Include/Guid/CapsuleVendor.h
+++ b/Core/MdeModulePkg/Include/Guid/CapsuleVendor.h
diff --git a/MdeModulePkg/Include/Guid/ConnectConInEvent.h b/Core/MdeModulePkg/Include/Guid/ConnectConInEvent.h
index 28dd4b93de..28dd4b93de 100644
--- a/MdeModulePkg/Include/Guid/ConnectConInEvent.h
+++ b/Core/MdeModulePkg/Include/Guid/ConnectConInEvent.h
diff --git a/MdeModulePkg/Include/Guid/ConsoleInDevice.h b/Core/MdeModulePkg/Include/Guid/ConsoleInDevice.h
index 014594f188..014594f188 100644
--- a/MdeModulePkg/Include/Guid/ConsoleInDevice.h
+++ b/Core/MdeModulePkg/Include/Guid/ConsoleInDevice.h
diff --git a/MdeModulePkg/Include/Guid/ConsoleOutDevice.h b/Core/MdeModulePkg/Include/Guid/ConsoleOutDevice.h
index 4d7de3d83f..4d7de3d83f 100644
--- a/MdeModulePkg/Include/Guid/ConsoleOutDevice.h
+++ b/Core/MdeModulePkg/Include/Guid/ConsoleOutDevice.h
diff --git a/MdeModulePkg/Include/Guid/Crc32GuidedSectionExtraction.h b/Core/MdeModulePkg/Include/Guid/Crc32GuidedSectionExtraction.h
index 896f0767db..896f0767db 100644
--- a/MdeModulePkg/Include/Guid/Crc32GuidedSectionExtraction.h
+++ b/Core/MdeModulePkg/Include/Guid/Crc32GuidedSectionExtraction.h
diff --git a/MdeModulePkg/Include/Guid/DebugMask.h b/Core/MdeModulePkg/Include/Guid/DebugMask.h
index 1e6beb562e..1e6beb562e 100644
--- a/MdeModulePkg/Include/Guid/DebugMask.h
+++ b/Core/MdeModulePkg/Include/Guid/DebugMask.h
diff --git a/MdeModulePkg/Include/Guid/DriverSampleHii.h b/Core/MdeModulePkg/Include/Guid/DriverSampleHii.h
index b5e1dbc099..b5e1dbc099 100644
--- a/MdeModulePkg/Include/Guid/DriverSampleHii.h
+++ b/Core/MdeModulePkg/Include/Guid/DriverSampleHii.h
diff --git a/MdeModulePkg/Include/Guid/EventExitBootServiceFailed.h b/Core/MdeModulePkg/Include/Guid/EventExitBootServiceFailed.h
index aa34d459ba..aa34d459ba 100644
--- a/MdeModulePkg/Include/Guid/EventExitBootServiceFailed.h
+++ b/Core/MdeModulePkg/Include/Guid/EventExitBootServiceFailed.h
diff --git a/MdeModulePkg/Include/Guid/FaultTolerantWrite.h b/Core/MdeModulePkg/Include/Guid/FaultTolerantWrite.h
index cb7b454b2b..cb7b454b2b 100644
--- a/MdeModulePkg/Include/Guid/FaultTolerantWrite.h
+++ b/Core/MdeModulePkg/Include/Guid/FaultTolerantWrite.h
diff --git a/MdeModulePkg/Include/Guid/FirmwarePerformance.h b/Core/MdeModulePkg/Include/Guid/FirmwarePerformance.h
index 4697a2c41e..4697a2c41e 100644
--- a/MdeModulePkg/Include/Guid/FirmwarePerformance.h
+++ b/Core/MdeModulePkg/Include/Guid/FirmwarePerformance.h
diff --git a/MdeModulePkg/Include/Guid/HiiBootMaintenanceFormset.h b/Core/MdeModulePkg/Include/Guid/HiiBootMaintenanceFormset.h
index 25dcff81fd..25dcff81fd 100644
--- a/MdeModulePkg/Include/Guid/HiiBootMaintenanceFormset.h
+++ b/Core/MdeModulePkg/Include/Guid/HiiBootMaintenanceFormset.h
diff --git a/MdeModulePkg/Include/Guid/HiiResourceSampleHii.h b/Core/MdeModulePkg/Include/Guid/HiiResourceSampleHii.h
index 2a86cad7bf..2a86cad7bf 100644
--- a/MdeModulePkg/Include/Guid/HiiResourceSampleHii.h
+++ b/Core/MdeModulePkg/Include/Guid/HiiResourceSampleHii.h
diff --git a/MdeModulePkg/Include/Guid/IdleLoopEvent.h b/Core/MdeModulePkg/Include/Guid/IdleLoopEvent.h
index 3673207674..3673207674 100644
--- a/MdeModulePkg/Include/Guid/IdleLoopEvent.h
+++ b/Core/MdeModulePkg/Include/Guid/IdleLoopEvent.h
diff --git a/MdeModulePkg/Include/Guid/Ip4Config2Hii.h b/Core/MdeModulePkg/Include/Guid/Ip4Config2Hii.h
index b1b41b9230..b1b41b9230 100644
--- a/MdeModulePkg/Include/Guid/Ip4Config2Hii.h
+++ b/Core/MdeModulePkg/Include/Guid/Ip4Config2Hii.h
diff --git a/MdeModulePkg/Include/Guid/Ip4IScsiConfigHii.h b/Core/MdeModulePkg/Include/Guid/Ip4IScsiConfigHii.h
index 4eb4c828ff..4eb4c828ff 100644
--- a/MdeModulePkg/Include/Guid/Ip4IScsiConfigHii.h
+++ b/Core/MdeModulePkg/Include/Guid/Ip4IScsiConfigHii.h
diff --git a/MdeModulePkg/Include/Guid/LoadModuleAtFixedAddress.h b/Core/MdeModulePkg/Include/Guid/LoadModuleAtFixedAddress.h
index ec467bbcb2..ec467bbcb2 100644
--- a/MdeModulePkg/Include/Guid/LoadModuleAtFixedAddress.h
+++ b/Core/MdeModulePkg/Include/Guid/LoadModuleAtFixedAddress.h
diff --git a/MdeModulePkg/Include/Guid/LzmaDecompress.h b/Core/MdeModulePkg/Include/Guid/LzmaDecompress.h
index 18a6552f9c..18a6552f9c 100644
--- a/MdeModulePkg/Include/Guid/LzmaDecompress.h
+++ b/Core/MdeModulePkg/Include/Guid/LzmaDecompress.h
diff --git a/MdeModulePkg/Include/Guid/MdeModuleHii.h b/Core/MdeModulePkg/Include/Guid/MdeModuleHii.h
index 81821da5a9..81821da5a9 100644
--- a/MdeModulePkg/Include/Guid/MdeModuleHii.h
+++ b/Core/MdeModulePkg/Include/Guid/MdeModuleHii.h
diff --git a/MdeModulePkg/Include/Guid/MdeModulePkgTokenSpace.h b/Core/MdeModulePkg/Include/Guid/MdeModulePkgTokenSpace.h
index 6ba7cd9df1..6ba7cd9df1 100644
--- a/MdeModulePkg/Include/Guid/MdeModulePkgTokenSpace.h
+++ b/Core/MdeModulePkg/Include/Guid/MdeModulePkgTokenSpace.h
diff --git a/MdeModulePkg/Include/Guid/MemoryProfile.h b/Core/MdeModulePkg/Include/Guid/MemoryProfile.h
index 777f950db7..777f950db7 100644
--- a/MdeModulePkg/Include/Guid/MemoryProfile.h
+++ b/Core/MdeModulePkg/Include/Guid/MemoryProfile.h
diff --git a/MdeModulePkg/Include/Guid/MemoryStatusCodeRecord.h b/Core/MdeModulePkg/Include/Guid/MemoryStatusCodeRecord.h
index 27d39e185e..27d39e185e 100644
--- a/MdeModulePkg/Include/Guid/MemoryStatusCodeRecord.h
+++ b/Core/MdeModulePkg/Include/Guid/MemoryStatusCodeRecord.h
diff --git a/MdeModulePkg/Include/Guid/MemoryTypeInformation.h b/Core/MdeModulePkg/Include/Guid/MemoryTypeInformation.h
index 57896d9463..57896d9463 100644
--- a/MdeModulePkg/Include/Guid/MemoryTypeInformation.h
+++ b/Core/MdeModulePkg/Include/Guid/MemoryTypeInformation.h
diff --git a/MdeModulePkg/Include/Guid/MtcVendor.h b/Core/MdeModulePkg/Include/Guid/MtcVendor.h
index 77bc2ae1b8..77bc2ae1b8 100644
--- a/MdeModulePkg/Include/Guid/MtcVendor.h
+++ b/Core/MdeModulePkg/Include/Guid/MtcVendor.h
diff --git a/MdeModulePkg/Include/Guid/NonDiscoverableDevice.h b/Core/MdeModulePkg/Include/Guid/NonDiscoverableDevice.h
index d182e4b9d2..d182e4b9d2 100644
--- a/MdeModulePkg/Include/Guid/NonDiscoverableDevice.h
+++ b/Core/MdeModulePkg/Include/Guid/NonDiscoverableDevice.h
diff --git a/MdeModulePkg/Include/Guid/PcdDataBaseHobGuid.h b/Core/MdeModulePkg/Include/Guid/PcdDataBaseHobGuid.h
index 1908eb84b3..1908eb84b3 100644
--- a/MdeModulePkg/Include/Guid/PcdDataBaseHobGuid.h
+++ b/Core/MdeModulePkg/Include/Guid/PcdDataBaseHobGuid.h
diff --git a/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h b/Core/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
index d2e848800b..d2e848800b 100644
--- a/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
+++ b/Core/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
diff --git a/MdeModulePkg/Include/Guid/Performance.h b/Core/MdeModulePkg/Include/Guid/Performance.h
index df40c6ce5b..df40c6ce5b 100644
--- a/MdeModulePkg/Include/Guid/Performance.h
+++ b/Core/MdeModulePkg/Include/Guid/Performance.h
diff --git a/MdeModulePkg/Include/Guid/PiSmmCommunicationRegionTable.h b/Core/MdeModulePkg/Include/Guid/PiSmmCommunicationRegionTable.h
index e3021ef267..e3021ef267 100644
--- a/MdeModulePkg/Include/Guid/PiSmmCommunicationRegionTable.h
+++ b/Core/MdeModulePkg/Include/Guid/PiSmmCommunicationRegionTable.h
diff --git a/MdeModulePkg/Include/Guid/PiSmmMemoryAttributesTable.h b/Core/MdeModulePkg/Include/Guid/PiSmmMemoryAttributesTable.h
index 317eae10ce..317eae10ce 100644
--- a/MdeModulePkg/Include/Guid/PiSmmMemoryAttributesTable.h
+++ b/Core/MdeModulePkg/Include/Guid/PiSmmMemoryAttributesTable.h
diff --git a/MdeModulePkg/Include/Guid/PlatDriOverrideHii.h b/Core/MdeModulePkg/Include/Guid/PlatDriOverrideHii.h
index bd8e493ef9..bd8e493ef9 100644
--- a/MdeModulePkg/Include/Guid/PlatDriOverrideHii.h
+++ b/Core/MdeModulePkg/Include/Guid/PlatDriOverrideHii.h
diff --git a/MdeModulePkg/Include/Guid/PlatformHasAcpi.h b/Core/MdeModulePkg/Include/Guid/PlatformHasAcpi.h
index ad51782137..ad51782137 100644
--- a/MdeModulePkg/Include/Guid/PlatformHasAcpi.h
+++ b/Core/MdeModulePkg/Include/Guid/PlatformHasAcpi.h
diff --git a/MdeModulePkg/Include/Guid/RamDiskHii.h b/Core/MdeModulePkg/Include/Guid/RamDiskHii.h
index 0457ee223d..0457ee223d 100644
--- a/MdeModulePkg/Include/Guid/RamDiskHii.h
+++ b/Core/MdeModulePkg/Include/Guid/RamDiskHii.h
diff --git a/MdeModulePkg/Include/Guid/RecoveryDevice.h b/Core/MdeModulePkg/Include/Guid/RecoveryDevice.h
index ad25065c6f..ad25065c6f 100644
--- a/MdeModulePkg/Include/Guid/RecoveryDevice.h
+++ b/Core/MdeModulePkg/Include/Guid/RecoveryDevice.h
diff --git a/MdeModulePkg/Include/Guid/SmiHandlerProfile.h b/Core/MdeModulePkg/Include/Guid/SmiHandlerProfile.h
index c5d29e8892..c5d29e8892 100644
--- a/MdeModulePkg/Include/Guid/SmiHandlerProfile.h
+++ b/Core/MdeModulePkg/Include/Guid/SmiHandlerProfile.h
diff --git a/MdeModulePkg/Include/Guid/SmmLockBox.h b/Core/MdeModulePkg/Include/Guid/SmmLockBox.h
index 8422847c5a..8422847c5a 100644
--- a/MdeModulePkg/Include/Guid/SmmLockBox.h
+++ b/Core/MdeModulePkg/Include/Guid/SmmLockBox.h
diff --git a/MdeModulePkg/Include/Guid/SmmVariableCommon.h b/Core/MdeModulePkg/Include/Guid/SmmVariableCommon.h
index 734eb19681..734eb19681 100644
--- a/MdeModulePkg/Include/Guid/SmmVariableCommon.h
+++ b/Core/MdeModulePkg/Include/Guid/SmmVariableCommon.h
diff --git a/MdeModulePkg/Include/Guid/StandardErrorDevice.h b/Core/MdeModulePkg/Include/Guid/StandardErrorDevice.h
index 7bc390241d..7bc390241d 100644
--- a/MdeModulePkg/Include/Guid/StandardErrorDevice.h
+++ b/Core/MdeModulePkg/Include/Guid/StandardErrorDevice.h
diff --git a/MdeModulePkg/Include/Guid/StatusCodeCallbackGuid.h b/Core/MdeModulePkg/Include/Guid/StatusCodeCallbackGuid.h
index 2a83471a99..2a83471a99 100644
--- a/MdeModulePkg/Include/Guid/StatusCodeCallbackGuid.h
+++ b/Core/MdeModulePkg/Include/Guid/StatusCodeCallbackGuid.h
diff --git a/MdeModulePkg/Include/Guid/StatusCodeDataTypeDebug.h b/Core/MdeModulePkg/Include/Guid/StatusCodeDataTypeDebug.h
index f478f801b6..f478f801b6 100644
--- a/MdeModulePkg/Include/Guid/StatusCodeDataTypeDebug.h
+++ b/Core/MdeModulePkg/Include/Guid/StatusCodeDataTypeDebug.h
diff --git a/MdeModulePkg/Include/Guid/StatusCodeDataTypeVariable.h b/Core/MdeModulePkg/Include/Guid/StatusCodeDataTypeVariable.h
index 9ea85f8099..9ea85f8099 100644
--- a/MdeModulePkg/Include/Guid/StatusCodeDataTypeVariable.h
+++ b/Core/MdeModulePkg/Include/Guid/StatusCodeDataTypeVariable.h
diff --git a/MdeModulePkg/Include/Guid/SystemNvDataGuid.h b/Core/MdeModulePkg/Include/Guid/SystemNvDataGuid.h
index 67c666259f..67c666259f 100644
--- a/MdeModulePkg/Include/Guid/SystemNvDataGuid.h
+++ b/Core/MdeModulePkg/Include/Guid/SystemNvDataGuid.h
diff --git a/MdeModulePkg/Include/Guid/TtyTerm.h b/Core/MdeModulePkg/Include/Guid/TtyTerm.h
index 900e5af892..900e5af892 100644
--- a/MdeModulePkg/Include/Guid/TtyTerm.h
+++ b/Core/MdeModulePkg/Include/Guid/TtyTerm.h
diff --git a/MdeModulePkg/Include/Guid/UsbKeyBoardLayout.h b/Core/MdeModulePkg/Include/Guid/UsbKeyBoardLayout.h
index 57d81643c6..57d81643c6 100644
--- a/MdeModulePkg/Include/Guid/UsbKeyBoardLayout.h
+++ b/Core/MdeModulePkg/Include/Guid/UsbKeyBoardLayout.h
diff --git a/MdeModulePkg/Include/Guid/VarErrorFlag.h b/Core/MdeModulePkg/Include/Guid/VarErrorFlag.h
index 1f05396763..1f05396763 100644
--- a/MdeModulePkg/Include/Guid/VarErrorFlag.h
+++ b/Core/MdeModulePkg/Include/Guid/VarErrorFlag.h
diff --git a/MdeModulePkg/Include/Guid/VariableFormat.h b/Core/MdeModulePkg/Include/Guid/VariableFormat.h
index ce71aab898..ce71aab898 100644
--- a/MdeModulePkg/Include/Guid/VariableFormat.h
+++ b/Core/MdeModulePkg/Include/Guid/VariableFormat.h
diff --git a/MdeModulePkg/Include/Guid/VariableIndexTable.h b/Core/MdeModulePkg/Include/Guid/VariableIndexTable.h
index ee0722fd48..ee0722fd48 100644
--- a/MdeModulePkg/Include/Guid/VariableIndexTable.h
+++ b/Core/MdeModulePkg/Include/Guid/VariableIndexTable.h
diff --git a/MdeModulePkg/Include/Guid/VlanConfigHii.h b/Core/MdeModulePkg/Include/Guid/VlanConfigHii.h
index 3848ce733d..3848ce733d 100644
--- a/MdeModulePkg/Include/Guid/VlanConfigHii.h
+++ b/Core/MdeModulePkg/Include/Guid/VlanConfigHii.h
diff --git a/MdeModulePkg/Include/Guid/ZeroGuid.h b/Core/MdeModulePkg/Include/Guid/ZeroGuid.h
index 7ba8dda205..7ba8dda205 100644
--- a/MdeModulePkg/Include/Guid/ZeroGuid.h
+++ b/Core/MdeModulePkg/Include/Guid/ZeroGuid.h
diff --git a/MdeModulePkg/Include/Library/AuthVariableLib.h b/Core/MdeModulePkg/Include/Library/AuthVariableLib.h
index 0731b8d748..0731b8d748 100644
--- a/MdeModulePkg/Include/Library/AuthVariableLib.h
+++ b/Core/MdeModulePkg/Include/Library/AuthVariableLib.h
diff --git a/MdeModulePkg/Include/Library/BootLogoLib.h b/Core/MdeModulePkg/Include/Library/BootLogoLib.h
index cacdd29ded..cacdd29ded 100644
--- a/MdeModulePkg/Include/Library/BootLogoLib.h
+++ b/Core/MdeModulePkg/Include/Library/BootLogoLib.h
diff --git a/MdeModulePkg/Include/Library/CapsuleLib.h b/Core/MdeModulePkg/Include/Library/CapsuleLib.h
index 26c14a09cd..26c14a09cd 100644
--- a/MdeModulePkg/Include/Library/CapsuleLib.h
+++ b/Core/MdeModulePkg/Include/Library/CapsuleLib.h
diff --git a/MdeModulePkg/Include/Library/CpuExceptionHandlerLib.h b/Core/MdeModulePkg/Include/Library/CpuExceptionHandlerLib.h
index 6cd8230127..6cd8230127 100644
--- a/MdeModulePkg/Include/Library/CpuExceptionHandlerLib.h
+++ b/Core/MdeModulePkg/Include/Library/CpuExceptionHandlerLib.h
diff --git a/MdeModulePkg/Include/Library/CustomizedDisplayLib.h b/Core/MdeModulePkg/Include/Library/CustomizedDisplayLib.h
index 1689e2c4f6..1689e2c4f6 100644
--- a/MdeModulePkg/Include/Library/CustomizedDisplayLib.h
+++ b/Core/MdeModulePkg/Include/Library/CustomizedDisplayLib.h
diff --git a/MdeModulePkg/Include/Library/DebugAgentLib.h b/Core/MdeModulePkg/Include/Library/DebugAgentLib.h
index 63d1c8f180..63d1c8f180 100644
--- a/MdeModulePkg/Include/Library/DebugAgentLib.h
+++ b/Core/MdeModulePkg/Include/Library/DebugAgentLib.h
diff --git a/MdeModulePkg/Include/Library/DpcLib.h b/Core/MdeModulePkg/Include/Library/DpcLib.h
index c392e3e3d7..c392e3e3d7 100644
--- a/MdeModulePkg/Include/Library/DpcLib.h
+++ b/Core/MdeModulePkg/Include/Library/DpcLib.h
diff --git a/MdeModulePkg/Include/Library/FileExplorerLib.h b/Core/MdeModulePkg/Include/Library/FileExplorerLib.h
index 2ae8ec6106..2ae8ec6106 100644
--- a/MdeModulePkg/Include/Library/FileExplorerLib.h
+++ b/Core/MdeModulePkg/Include/Library/FileExplorerLib.h
diff --git a/MdeModulePkg/Include/Library/FmpAuthenticationLib.h b/Core/MdeModulePkg/Include/Library/FmpAuthenticationLib.h
index 2910c915cc..2910c915cc 100644
--- a/MdeModulePkg/Include/Library/FmpAuthenticationLib.h
+++ b/Core/MdeModulePkg/Include/Library/FmpAuthenticationLib.h
diff --git a/MdeModulePkg/Include/Library/FrameBufferBltLib.h b/Core/MdeModulePkg/Include/Library/FrameBufferBltLib.h
index c92eb94885..c92eb94885 100644
--- a/MdeModulePkg/Include/Library/FrameBufferBltLib.h
+++ b/Core/MdeModulePkg/Include/Library/FrameBufferBltLib.h
diff --git a/MdeModulePkg/Include/Library/HiiLib.h b/Core/MdeModulePkg/Include/Library/HiiLib.h
index 3d87677b2f..3d87677b2f 100644
--- a/MdeModulePkg/Include/Library/HiiLib.h
+++ b/Core/MdeModulePkg/Include/Library/HiiLib.h
diff --git a/MdeModulePkg/Include/Library/HttpLib.h b/Core/MdeModulePkg/Include/Library/HttpLib.h
index 853982025c..853982025c 100644
--- a/MdeModulePkg/Include/Library/HttpLib.h
+++ b/Core/MdeModulePkg/Include/Library/HttpLib.h
diff --git a/MdeModulePkg/Include/Library/IpIoLib.h b/Core/MdeModulePkg/Include/Library/IpIoLib.h
index aab0c68059..aab0c68059 100644
--- a/MdeModulePkg/Include/Library/IpIoLib.h
+++ b/Core/MdeModulePkg/Include/Library/IpIoLib.h
diff --git a/MdeModulePkg/Include/Library/IpmiLib.h b/Core/MdeModulePkg/Include/Library/IpmiLib.h
index 71b0c1a5a3..71b0c1a5a3 100644
--- a/MdeModulePkg/Include/Library/IpmiLib.h
+++ b/Core/MdeModulePkg/Include/Library/IpmiLib.h
diff --git a/MdeModulePkg/Include/Library/LockBoxLib.h b/Core/MdeModulePkg/Include/Library/LockBoxLib.h
index db7fd05def..db7fd05def 100644
--- a/MdeModulePkg/Include/Library/LockBoxLib.h
+++ b/Core/MdeModulePkg/Include/Library/LockBoxLib.h
diff --git a/MdeModulePkg/Include/Library/MemoryProfileLib.h b/Core/MdeModulePkg/Include/Library/MemoryProfileLib.h
index 8543801391..8543801391 100644
--- a/MdeModulePkg/Include/Library/MemoryProfileLib.h
+++ b/Core/MdeModulePkg/Include/Library/MemoryProfileLib.h
diff --git a/MdeModulePkg/Include/Library/NetLib.h b/Core/MdeModulePkg/Include/Library/NetLib.h
index 4cd42270f6..4cd42270f6 100644
--- a/MdeModulePkg/Include/Library/NetLib.h
+++ b/Core/MdeModulePkg/Include/Library/NetLib.h
diff --git a/MdeModulePkg/Include/Library/NonDiscoverableDeviceRegistrationLib.h b/Core/MdeModulePkg/Include/Library/NonDiscoverableDeviceRegistrationLib.h
index c2d9e48353..c2d9e48353 100644
--- a/MdeModulePkg/Include/Library/NonDiscoverableDeviceRegistrationLib.h
+++ b/Core/MdeModulePkg/Include/Library/NonDiscoverableDeviceRegistrationLib.h
diff --git a/MdeModulePkg/Include/Library/OemHookStatusCodeLib.h b/Core/MdeModulePkg/Include/Library/OemHookStatusCodeLib.h
index edd370deb6..edd370deb6 100644
--- a/MdeModulePkg/Include/Library/OemHookStatusCodeLib.h
+++ b/Core/MdeModulePkg/Include/Library/OemHookStatusCodeLib.h
diff --git a/MdeModulePkg/Include/Library/PciHostBridgeLib.h b/Core/MdeModulePkg/Include/Library/PciHostBridgeLib.h
index d42e9ecdd7..d42e9ecdd7 100644
--- a/MdeModulePkg/Include/Library/PciHostBridgeLib.h
+++ b/Core/MdeModulePkg/Include/Library/PciHostBridgeLib.h
diff --git a/MdeModulePkg/Include/Library/PlatformBootManagerLib.h b/Core/MdeModulePkg/Include/Library/PlatformBootManagerLib.h
index 52745032e4..52745032e4 100644
--- a/MdeModulePkg/Include/Library/PlatformBootManagerLib.h
+++ b/Core/MdeModulePkg/Include/Library/PlatformBootManagerLib.h
diff --git a/MdeModulePkg/Include/Library/PlatformHookLib.h b/Core/MdeModulePkg/Include/Library/PlatformHookLib.h
index 0f265d49a3..0f265d49a3 100644
--- a/MdeModulePkg/Include/Library/PlatformHookLib.h
+++ b/Core/MdeModulePkg/Include/Library/PlatformHookLib.h
diff --git a/MdeModulePkg/Include/Library/PlatformVarCleanupLib.h b/Core/MdeModulePkg/Include/Library/PlatformVarCleanupLib.h
index a4691f0e65..a4691f0e65 100644
--- a/MdeModulePkg/Include/Library/PlatformVarCleanupLib.h
+++ b/Core/MdeModulePkg/Include/Library/PlatformVarCleanupLib.h
diff --git a/MdeModulePkg/Include/Library/RecoveryLib.h b/Core/MdeModulePkg/Include/Library/RecoveryLib.h
index f49394a822..f49394a822 100644
--- a/MdeModulePkg/Include/Library/RecoveryLib.h
+++ b/Core/MdeModulePkg/Include/Library/RecoveryLib.h
diff --git a/MdeModulePkg/Include/Library/ResetSystemLib.h b/Core/MdeModulePkg/Include/Library/ResetSystemLib.h
index f98c9a6549..f98c9a6549 100644
--- a/MdeModulePkg/Include/Library/ResetSystemLib.h
+++ b/Core/MdeModulePkg/Include/Library/ResetSystemLib.h
diff --git a/MdeModulePkg/Include/Library/S3Lib.h b/Core/MdeModulePkg/Include/Library/S3Lib.h
index fcb8abd802..fcb8abd802 100644
--- a/MdeModulePkg/Include/Library/S3Lib.h
+++ b/Core/MdeModulePkg/Include/Library/S3Lib.h
diff --git a/MdeModulePkg/Include/Library/SecurityManagementLib.h b/Core/MdeModulePkg/Include/Library/SecurityManagementLib.h
index de87d09c54..de87d09c54 100644
--- a/MdeModulePkg/Include/Library/SecurityManagementLib.h
+++ b/Core/MdeModulePkg/Include/Library/SecurityManagementLib.h
diff --git a/MdeModulePkg/Include/Library/SmmCorePlatformHookLib.h b/Core/MdeModulePkg/Include/Library/SmmCorePlatformHookLib.h
index 773d0615b7..773d0615b7 100644
--- a/MdeModulePkg/Include/Library/SmmCorePlatformHookLib.h
+++ b/Core/MdeModulePkg/Include/Library/SmmCorePlatformHookLib.h
diff --git a/MdeModulePkg/Include/Library/SortLib.h b/Core/MdeModulePkg/Include/Library/SortLib.h
index a891cabee9..a891cabee9 100644
--- a/MdeModulePkg/Include/Library/SortLib.h
+++ b/Core/MdeModulePkg/Include/Library/SortLib.h
diff --git a/MdeModulePkg/Include/Library/TcpIoLib.h b/Core/MdeModulePkg/Include/Library/TcpIoLib.h
index 2871f6747e..2871f6747e 100644
--- a/MdeModulePkg/Include/Library/TcpIoLib.h
+++ b/Core/MdeModulePkg/Include/Library/TcpIoLib.h
diff --git a/MdeModulePkg/Include/Library/TpmMeasurementLib.h b/Core/MdeModulePkg/Include/Library/TpmMeasurementLib.h
index 68d35aa680..68d35aa680 100644
--- a/MdeModulePkg/Include/Library/TpmMeasurementLib.h
+++ b/Core/MdeModulePkg/Include/Library/TpmMeasurementLib.h
diff --git a/MdeModulePkg/Include/Library/UdpIoLib.h b/Core/MdeModulePkg/Include/Library/UdpIoLib.h
index e0b44ce18e..e0b44ce18e 100644
--- a/MdeModulePkg/Include/Library/UdpIoLib.h
+++ b/Core/MdeModulePkg/Include/Library/UdpIoLib.h
diff --git a/MdeModulePkg/Include/Library/UefiBootManagerLib.h b/Core/MdeModulePkg/Include/Library/UefiBootManagerLib.h
index 97ac1f233c..97ac1f233c 100644
--- a/MdeModulePkg/Include/Library/UefiBootManagerLib.h
+++ b/Core/MdeModulePkg/Include/Library/UefiBootManagerLib.h
diff --git a/MdeModulePkg/Include/Library/UefiHiiServicesLib.h b/Core/MdeModulePkg/Include/Library/UefiHiiServicesLib.h
index 8c8beee555..8c8beee555 100644
--- a/MdeModulePkg/Include/Library/UefiHiiServicesLib.h
+++ b/Core/MdeModulePkg/Include/Library/UefiHiiServicesLib.h
diff --git a/MdeModulePkg/Include/Library/VarCheckLib.h b/Core/MdeModulePkg/Include/Library/VarCheckLib.h
index a423bc0e54..a423bc0e54 100644
--- a/MdeModulePkg/Include/Library/VarCheckLib.h
+++ b/Core/MdeModulePkg/Include/Library/VarCheckLib.h
diff --git a/MdeModulePkg/Include/Ppi/AtaController.h b/Core/MdeModulePkg/Include/Ppi/AtaController.h
index 2333bef6aa..2333bef6aa 100644
--- a/MdeModulePkg/Include/Ppi/AtaController.h
+++ b/Core/MdeModulePkg/Include/Ppi/AtaController.h
diff --git a/MdeModulePkg/Include/Ppi/IpmiPpi.h b/Core/MdeModulePkg/Include/Ppi/IpmiPpi.h
index b8f7063424..b8f7063424 100644
--- a/MdeModulePkg/Include/Ppi/IpmiPpi.h
+++ b/Core/MdeModulePkg/Include/Ppi/IpmiPpi.h
diff --git a/MdeModulePkg/Include/Ppi/PostBootScriptTable.h b/Core/MdeModulePkg/Include/Ppi/PostBootScriptTable.h
index 5c152dfda0..5c152dfda0 100644
--- a/MdeModulePkg/Include/Ppi/PostBootScriptTable.h
+++ b/Core/MdeModulePkg/Include/Ppi/PostBootScriptTable.h
diff --git a/MdeModulePkg/Include/Ppi/SdMmcHostController.h b/Core/MdeModulePkg/Include/Ppi/SdMmcHostController.h
index 85dee24526..85dee24526 100644
--- a/MdeModulePkg/Include/Ppi/SdMmcHostController.h
+++ b/Core/MdeModulePkg/Include/Ppi/SdMmcHostController.h
diff --git a/MdeModulePkg/Include/Ppi/SecPerformance.h b/Core/MdeModulePkg/Include/Ppi/SecPerformance.h
index f8e2cf171e..f8e2cf171e 100644
--- a/MdeModulePkg/Include/Ppi/SecPerformance.h
+++ b/Core/MdeModulePkg/Include/Ppi/SecPerformance.h
diff --git a/MdeModulePkg/Include/Ppi/SerialPortPei.h b/Core/MdeModulePkg/Include/Ppi/SerialPortPei.h
index 2b754f9cca..2b754f9cca 100644
--- a/MdeModulePkg/Include/Ppi/SerialPortPei.h
+++ b/Core/MdeModulePkg/Include/Ppi/SerialPortPei.h
diff --git a/MdeModulePkg/Include/Ppi/SmmAccess.h b/Core/MdeModulePkg/Include/Ppi/SmmAccess.h
index 085ad644c8..085ad644c8 100644
--- a/MdeModulePkg/Include/Ppi/SmmAccess.h
+++ b/Core/MdeModulePkg/Include/Ppi/SmmAccess.h
diff --git a/MdeModulePkg/Include/Ppi/SmmCommunication.h b/Core/MdeModulePkg/Include/Ppi/SmmCommunication.h
index a22ed9f6d3..a22ed9f6d3 100644
--- a/MdeModulePkg/Include/Ppi/SmmCommunication.h
+++ b/Core/MdeModulePkg/Include/Ppi/SmmCommunication.h
diff --git a/MdeModulePkg/Include/Ppi/SmmControl.h b/Core/MdeModulePkg/Include/Ppi/SmmControl.h
index 341a29ba2a..341a29ba2a 100644
--- a/MdeModulePkg/Include/Ppi/SmmControl.h
+++ b/Core/MdeModulePkg/Include/Ppi/SmmControl.h
diff --git a/MdeModulePkg/Include/Ppi/UfsHostController.h b/Core/MdeModulePkg/Include/Ppi/UfsHostController.h
index 129636580e..129636580e 100644
--- a/MdeModulePkg/Include/Ppi/UfsHostController.h
+++ b/Core/MdeModulePkg/Include/Ppi/UfsHostController.h
diff --git a/MdeModulePkg/Include/Ppi/Usb2HostController.h b/Core/MdeModulePkg/Include/Ppi/Usb2HostController.h
index 7bcb341a94..7bcb341a94 100644
--- a/MdeModulePkg/Include/Ppi/Usb2HostController.h
+++ b/Core/MdeModulePkg/Include/Ppi/Usb2HostController.h
diff --git a/MdeModulePkg/Include/Ppi/UsbController.h b/Core/MdeModulePkg/Include/Ppi/UsbController.h
index f0537ecb66..f0537ecb66 100644
--- a/MdeModulePkg/Include/Ppi/UsbController.h
+++ b/Core/MdeModulePkg/Include/Ppi/UsbController.h
diff --git a/MdeModulePkg/Include/Ppi/UsbHostController.h b/Core/MdeModulePkg/Include/Ppi/UsbHostController.h
index 232a666734..232a666734 100644
--- a/MdeModulePkg/Include/Ppi/UsbHostController.h
+++ b/Core/MdeModulePkg/Include/Ppi/UsbHostController.h
diff --git a/MdeModulePkg/Include/Ppi/UsbIo.h b/Core/MdeModulePkg/Include/Ppi/UsbIo.h
index b024d4640a..b024d4640a 100644
--- a/MdeModulePkg/Include/Ppi/UsbIo.h
+++ b/Core/MdeModulePkg/Include/Ppi/UsbIo.h
diff --git a/MdeModulePkg/Include/Protocol/BootLogo.h b/Core/MdeModulePkg/Include/Protocol/BootLogo.h
index 1eba47a704..1eba47a704 100644
--- a/MdeModulePkg/Include/Protocol/BootLogo.h
+++ b/Core/MdeModulePkg/Include/Protocol/BootLogo.h
diff --git a/MdeModulePkg/Include/Protocol/DebuggerConfiguration.h b/Core/MdeModulePkg/Include/Protocol/DebuggerConfiguration.h
index eaaa6b925f..eaaa6b925f 100644
--- a/MdeModulePkg/Include/Protocol/DebuggerConfiguration.h
+++ b/Core/MdeModulePkg/Include/Protocol/DebuggerConfiguration.h
diff --git a/MdeModulePkg/Include/Protocol/DisplayProtocol.h b/Core/MdeModulePkg/Include/Protocol/DisplayProtocol.h
index 8ea9350419..8ea9350419 100644
--- a/MdeModulePkg/Include/Protocol/DisplayProtocol.h
+++ b/Core/MdeModulePkg/Include/Protocol/DisplayProtocol.h
diff --git a/MdeModulePkg/Include/Protocol/Dpc.h b/Core/MdeModulePkg/Include/Protocol/Dpc.h
index 99293e2987..99293e2987 100644
--- a/MdeModulePkg/Include/Protocol/Dpc.h
+++ b/Core/MdeModulePkg/Include/Protocol/Dpc.h
diff --git a/MdeModulePkg/Include/Protocol/EbcSimpleDebugger.h b/Core/MdeModulePkg/Include/Protocol/EbcSimpleDebugger.h
index 43b55b48eb..43b55b48eb 100644
--- a/MdeModulePkg/Include/Protocol/EbcSimpleDebugger.h
+++ b/Core/MdeModulePkg/Include/Protocol/EbcSimpleDebugger.h
diff --git a/MdeModulePkg/Include/Protocol/EbcVmTest.h b/Core/MdeModulePkg/Include/Protocol/EbcVmTest.h
index 9eedca1906..9eedca1906 100644
--- a/MdeModulePkg/Include/Protocol/EbcVmTest.h
+++ b/Core/MdeModulePkg/Include/Protocol/EbcVmTest.h
diff --git a/MdeModulePkg/Include/Protocol/EsrtManagement.h b/Core/MdeModulePkg/Include/Protocol/EsrtManagement.h
index 305fd5c908..305fd5c908 100644
--- a/MdeModulePkg/Include/Protocol/EsrtManagement.h
+++ b/Core/MdeModulePkg/Include/Protocol/EsrtManagement.h
diff --git a/MdeModulePkg/Include/Protocol/FaultTolerantWrite.h b/Core/MdeModulePkg/Include/Protocol/FaultTolerantWrite.h
index b96edfb68f..b96edfb68f 100644
--- a/MdeModulePkg/Include/Protocol/FaultTolerantWrite.h
+++ b/Core/MdeModulePkg/Include/Protocol/FaultTolerantWrite.h
diff --git a/MdeModulePkg/Include/Protocol/FileExplorer.h b/Core/MdeModulePkg/Include/Protocol/FileExplorer.h
index 62daca3ab7..62daca3ab7 100644
--- a/MdeModulePkg/Include/Protocol/FileExplorer.h
+++ b/Core/MdeModulePkg/Include/Protocol/FileExplorer.h
diff --git a/MdeModulePkg/Include/Protocol/FormBrowserEx.h b/Core/MdeModulePkg/Include/Protocol/FormBrowserEx.h
index 512de448d3..512de448d3 100644
--- a/MdeModulePkg/Include/Protocol/FormBrowserEx.h
+++ b/Core/MdeModulePkg/Include/Protocol/FormBrowserEx.h
diff --git a/MdeModulePkg/Include/Protocol/FormBrowserEx2.h b/Core/MdeModulePkg/Include/Protocol/FormBrowserEx2.h
index 1ccc5bd964..1ccc5bd964 100644
--- a/MdeModulePkg/Include/Protocol/FormBrowserEx2.h
+++ b/Core/MdeModulePkg/Include/Protocol/FormBrowserEx2.h
diff --git a/MdeModulePkg/Include/Protocol/GenericMemoryTest.h b/Core/MdeModulePkg/Include/Protocol/GenericMemoryTest.h
index 163e76d8f4..163e76d8f4 100644
--- a/MdeModulePkg/Include/Protocol/GenericMemoryTest.h
+++ b/Core/MdeModulePkg/Include/Protocol/GenericMemoryTest.h
diff --git a/MdeModulePkg/Include/Protocol/IpmiProtocol.h b/Core/MdeModulePkg/Include/Protocol/IpmiProtocol.h
index a02ca6cb73..a02ca6cb73 100644
--- a/MdeModulePkg/Include/Protocol/IpmiProtocol.h
+++ b/Core/MdeModulePkg/Include/Protocol/IpmiProtocol.h
diff --git a/MdeModulePkg/Include/Protocol/LoadPe32Image.h b/Core/MdeModulePkg/Include/Protocol/LoadPe32Image.h
index b56dd37ad0..b56dd37ad0 100644
--- a/MdeModulePkg/Include/Protocol/LoadPe32Image.h
+++ b/Core/MdeModulePkg/Include/Protocol/LoadPe32Image.h
diff --git a/MdeModulePkg/Include/Protocol/LockBox.h b/Core/MdeModulePkg/Include/Protocol/LockBox.h
index a3533c536c..a3533c536c 100644
--- a/MdeModulePkg/Include/Protocol/LockBox.h
+++ b/Core/MdeModulePkg/Include/Protocol/LockBox.h
diff --git a/MdeModulePkg/Include/Protocol/NonDiscoverableDevice.h b/Core/MdeModulePkg/Include/Protocol/NonDiscoverableDevice.h
index 976ae83873..976ae83873 100644
--- a/MdeModulePkg/Include/Protocol/NonDiscoverableDevice.h
+++ b/Core/MdeModulePkg/Include/Protocol/NonDiscoverableDevice.h
diff --git a/MdeModulePkg/Include/Protocol/PlatformLogo.h b/Core/MdeModulePkg/Include/Protocol/PlatformLogo.h
index 4773173889..4773173889 100644
--- a/MdeModulePkg/Include/Protocol/PlatformLogo.h
+++ b/Core/MdeModulePkg/Include/Protocol/PlatformLogo.h
diff --git a/MdeModulePkg/Include/Protocol/Print2.h b/Core/MdeModulePkg/Include/Protocol/Print2.h
index 61b574e78a..61b574e78a 100644
--- a/MdeModulePkg/Include/Protocol/Print2.h
+++ b/Core/MdeModulePkg/Include/Protocol/Print2.h
diff --git a/MdeModulePkg/Include/Protocol/Ps2Policy.h b/Core/MdeModulePkg/Include/Protocol/Ps2Policy.h
index 14346eed29..14346eed29 100644
--- a/MdeModulePkg/Include/Protocol/Ps2Policy.h
+++ b/Core/MdeModulePkg/Include/Protocol/Ps2Policy.h
diff --git a/MdeModulePkg/Include/Protocol/SmmExitBootServices.h b/Core/MdeModulePkg/Include/Protocol/SmmExitBootServices.h
index f34376723e..f34376723e 100644
--- a/MdeModulePkg/Include/Protocol/SmmExitBootServices.h
+++ b/Core/MdeModulePkg/Include/Protocol/SmmExitBootServices.h
diff --git a/MdeModulePkg/Include/Protocol/SmmFaultTolerantWrite.h b/Core/MdeModulePkg/Include/Protocol/SmmFaultTolerantWrite.h
index a12e53b740..a12e53b740 100644
--- a/MdeModulePkg/Include/Protocol/SmmFaultTolerantWrite.h
+++ b/Core/MdeModulePkg/Include/Protocol/SmmFaultTolerantWrite.h
diff --git a/MdeModulePkg/Include/Protocol/SmmFirmwareVolumeBlock.h b/Core/MdeModulePkg/Include/Protocol/SmmFirmwareVolumeBlock.h
index 53480d9737..53480d9737 100644
--- a/MdeModulePkg/Include/Protocol/SmmFirmwareVolumeBlock.h
+++ b/Core/MdeModulePkg/Include/Protocol/SmmFirmwareVolumeBlock.h
diff --git a/MdeModulePkg/Include/Protocol/SmmLegacyBoot.h b/Core/MdeModulePkg/Include/Protocol/SmmLegacyBoot.h
index 68a04e84fd..68a04e84fd 100644
--- a/MdeModulePkg/Include/Protocol/SmmLegacyBoot.h
+++ b/Core/MdeModulePkg/Include/Protocol/SmmLegacyBoot.h
diff --git a/MdeModulePkg/Include/Protocol/SmmReadyToBoot.h b/Core/MdeModulePkg/Include/Protocol/SmmReadyToBoot.h
index b6867f5f9b..b6867f5f9b 100644
--- a/MdeModulePkg/Include/Protocol/SmmReadyToBoot.h
+++ b/Core/MdeModulePkg/Include/Protocol/SmmReadyToBoot.h
diff --git a/MdeModulePkg/Include/Protocol/SmmSwapAddressRange.h b/Core/MdeModulePkg/Include/Protocol/SmmSwapAddressRange.h
index 60a0a2c4a2..60a0a2c4a2 100644
--- a/MdeModulePkg/Include/Protocol/SmmSwapAddressRange.h
+++ b/Core/MdeModulePkg/Include/Protocol/SmmSwapAddressRange.h
diff --git a/MdeModulePkg/Include/Protocol/SmmVarCheck.h b/Core/MdeModulePkg/Include/Protocol/SmmVarCheck.h
index 7faf5a95d3..7faf5a95d3 100644
--- a/MdeModulePkg/Include/Protocol/SmmVarCheck.h
+++ b/Core/MdeModulePkg/Include/Protocol/SmmVarCheck.h
diff --git a/MdeModulePkg/Include/Protocol/SmmVariable.h b/Core/MdeModulePkg/Include/Protocol/SmmVariable.h
index 75ab6c3057..75ab6c3057 100644
--- a/MdeModulePkg/Include/Protocol/SmmVariable.h
+++ b/Core/MdeModulePkg/Include/Protocol/SmmVariable.h
diff --git a/MdeModulePkg/Include/Protocol/SwapAddressRange.h b/Core/MdeModulePkg/Include/Protocol/SwapAddressRange.h
index 3ca87a0e6e..3ca87a0e6e 100644
--- a/MdeModulePkg/Include/Protocol/SwapAddressRange.h
+++ b/Core/MdeModulePkg/Include/Protocol/SwapAddressRange.h
diff --git a/MdeModulePkg/Include/Protocol/UfsHostController.h b/Core/MdeModulePkg/Include/Protocol/UfsHostController.h
index 909c981729..909c981729 100644
--- a/MdeModulePkg/Include/Protocol/UfsHostController.h
+++ b/Core/MdeModulePkg/Include/Protocol/UfsHostController.h
diff --git a/MdeModulePkg/Include/Protocol/VarCheck.h b/Core/MdeModulePkg/Include/Protocol/VarCheck.h
index 3525989c55..3525989c55 100644
--- a/MdeModulePkg/Include/Protocol/VarCheck.h
+++ b/Core/MdeModulePkg/Include/Protocol/VarCheck.h
diff --git a/MdeModulePkg/Include/Protocol/VariableLock.h b/Core/MdeModulePkg/Include/Protocol/VariableLock.h
index a2a73bc161..a2a73bc161 100644
--- a/MdeModulePkg/Include/Protocol/VariableLock.h
+++ b/Core/MdeModulePkg/Include/Protocol/VariableLock.h
diff --git a/MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.c b/Core/MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.c
index 054131fd3e..054131fd3e 100644
--- a/MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.c
+++ b/Core/MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.c
diff --git a/MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf b/Core/MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
index 900fef5d49..900fef5d49 100644
--- a/MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
+++ b/Core/MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
diff --git a/MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.uni b/Core/MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.uni
index c1b31f56d7..c1b31f56d7 100644
--- a/MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.uni
+++ b/Core/MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.uni
diff --git a/MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.c b/Core/MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.c
index a7db3f13f8..a7db3f13f8 100644
--- a/MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.c
+++ b/Core/MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.c
diff --git a/MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.inf b/Core/MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.inf
index efd8c0aa09..efd8c0aa09 100644
--- a/MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.inf
+++ b/Core/MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.inf
diff --git a/MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.uni b/Core/MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.uni
index 0e8fd69e1e..0e8fd69e1e 100644
--- a/MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.uni
+++ b/Core/MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.uni
diff --git a/MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.c b/Core/MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.c
index bd1a31a36e..bd1a31a36e 100644
--- a/MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.c
+++ b/Core/MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.c
diff --git a/MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf b/Core/MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
index 6d5195576f..6d5195576f 100644
--- a/MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
+++ b/Core/MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
diff --git a/MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.uni b/Core/MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.uni
index 7ae4aa6b92..7ae4aa6b92 100644
--- a/MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.uni
+++ b/Core/MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.uni
diff --git a/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c b/Core/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c
index 1a1242640c..1a1242640c 100644
--- a/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c
+++ b/Core/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c
diff --git a/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.inf b/Core/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.inf
index 96e0ebb212..96e0ebb212 100644
--- a/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.inf
+++ b/Core/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.inf
diff --git a/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.uni b/Core/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.uni
index 4288045e8d..4288045e8d 100644
--- a/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.uni
+++ b/Core/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.uni
diff --git a/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c b/Core/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c
index 0ccac96f41..0ccac96f41 100644
--- a/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c
+++ b/Core/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c
diff --git a/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf b/Core/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
index bb42f89676..bb42f89676 100644
--- a/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
+++ b/Core/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
diff --git a/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.uni b/Core/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.uni
index 04d88b37f3..04d88b37f3 100644
--- a/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.uni
+++ b/Core/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.uni
diff --git a/MdeModulePkg/Library/BaseSortLib/BaseSortLib.c b/Core/MdeModulePkg/Library/BaseSortLib/BaseSortLib.c
index ab8a60585e..ab8a60585e 100644
--- a/MdeModulePkg/Library/BaseSortLib/BaseSortLib.c
+++ b/Core/MdeModulePkg/Library/BaseSortLib/BaseSortLib.c
diff --git a/MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf b/Core/MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf
index 4b493f4eb6..4b493f4eb6 100644
--- a/MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf
+++ b/Core/MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf
diff --git a/MdeModulePkg/Library/BaseSortLib/BaseSortLib.uni b/Core/MdeModulePkg/Library/BaseSortLib/BaseSortLib.uni
index 58927615ff..58927615ff 100644
--- a/MdeModulePkg/Library/BaseSortLib/BaseSortLib.uni
+++ b/Core/MdeModulePkg/Library/BaseSortLib/BaseSortLib.uni
diff --git a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.c b/Core/MdeModulePkg/Library/BootLogoLib/BootLogoLib.c
index 8bd9985cb2..8bd9985cb2 100644
--- a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.c
+++ b/Core/MdeModulePkg/Library/BootLogoLib/BootLogoLib.c
diff --git a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf b/Core/MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
index 79b5fc511a..79b5fc511a 100644
--- a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
+++ b/Core/MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
diff --git a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.uni b/Core/MdeModulePkg/Library/BootLogoLib/BootLogoLib.uni
index fae0335f76..fae0335f76 100644
--- a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.uni
+++ b/Core/MdeModulePkg/Library/BootLogoLib/BootLogoLib.uni
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BmLib.c b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BmLib.c
index 0ef9bf0934..0ef9bf0934 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BmLib.c
+++ b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BmLib.c
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
index 3ff23a5a45..3ff23a5a45 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
+++ b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.h b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.h
index a8d7a0f8d0..a8d7a0f8d0 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.h
+++ b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.h
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr
index b0a636f566..b0a636f566 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr
+++ b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerCustomizedUi.c b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerCustomizedUi.c
index 7f62e5b795..7f62e5b795 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerCustomizedUi.c
+++ b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerCustomizedUi.c
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerCustomizedUi.h b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerCustomizedUi.h
index 13d02d6ef8..13d02d6ef8 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerCustomizedUi.h
+++ b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerCustomizedUi.h
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerCustomizedUiSupport.c b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerCustomizedUiSupport.c
index b25bc67c06..b25bc67c06 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerCustomizedUiSupport.c
+++ b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerCustomizedUiSupport.c
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerCustomizedUiSupport.h b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerCustomizedUiSupport.h
index 9f04bf573f..9f04bf573f 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerCustomizedUiSupport.h
+++ b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerCustomizedUiSupport.h
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerStrings.uni b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerStrings.uni
index 20b2a7744a..20b2a7744a 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerStrings.uni
+++ b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerStrings.uni
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
index 6f2cda33d2..6f2cda33d2 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
+++ b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.uni b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.uni
index 44411c8ca7..44411c8ca7 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.uni
+++ b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.uni
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootOption.c b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootOption.c
index 890728aff5..890728aff5 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootOption.c
+++ b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootOption.c
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/ConsoleOption.c b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/ConsoleOption.c
index a145a77c70..a145a77c70 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/ConsoleOption.c
+++ b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/ConsoleOption.c
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/Data.c b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/Data.c
index 4257e1a6ea..4257e1a6ea 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/Data.c
+++ b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/Data.c
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/FormGuid.h b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/FormGuid.h
index 299a149f60..299a149f60 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/FormGuid.h
+++ b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/FormGuid.h
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c
index b3cc3c88dd..b3cc3c88dd 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c
+++ b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/Variable.c b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/Variable.c
index c1c55b0fb2..c1c55b0fb2 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/Variable.c
+++ b/Core/MdeModulePkg/Library/BootMaintenanceManagerUiLib/Variable.c
diff --git a/MdeModulePkg/Library/BootManagerUiLib/BootManager.c b/Core/MdeModulePkg/Library/BootManagerUiLib/BootManager.c
index bf872f867e..bf872f867e 100644
--- a/MdeModulePkg/Library/BootManagerUiLib/BootManager.c
+++ b/Core/MdeModulePkg/Library/BootManagerUiLib/BootManager.c
diff --git a/MdeModulePkg/Library/BootManagerUiLib/BootManager.h b/Core/MdeModulePkg/Library/BootManagerUiLib/BootManager.h
index 1bedff412b..1bedff412b 100644
--- a/MdeModulePkg/Library/BootManagerUiLib/BootManager.h
+++ b/Core/MdeModulePkg/Library/BootManagerUiLib/BootManager.h
diff --git a/MdeModulePkg/Library/BootManagerUiLib/BootManagerStrings.uni b/Core/MdeModulePkg/Library/BootManagerUiLib/BootManagerStrings.uni
index 188a3abc8e..188a3abc8e 100644
--- a/MdeModulePkg/Library/BootManagerUiLib/BootManagerStrings.uni
+++ b/Core/MdeModulePkg/Library/BootManagerUiLib/BootManagerStrings.uni
diff --git a/MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf b/Core/MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf
index d2df24b4bd..d2df24b4bd 100644
--- a/MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf
+++ b/Core/MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf
diff --git a/MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.uni b/Core/MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.uni
index 5ffa9deb54..5ffa9deb54 100644
--- a/MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.uni
+++ b/Core/MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.uni
diff --git a/MdeModulePkg/Library/BootManagerUiLib/BootManagerVfr.Vfr b/Core/MdeModulePkg/Library/BootManagerUiLib/BootManagerVfr.Vfr
index 14c1f8fae3..14c1f8fae3 100644
--- a/MdeModulePkg/Library/BootManagerUiLib/BootManagerVfr.Vfr
+++ b/Core/MdeModulePkg/Library/BootManagerUiLib/BootManagerVfr.Vfr
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliCustomDecompressLib.inf b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliCustomDecompressLib.inf
index 578f97f7b3..578f97f7b3 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliCustomDecompressLib.inf
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliCustomDecompressLib.inf
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompress.c b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompress.c
index a30392148f..a30392148f 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompress.c
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompress.c
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompressLib.uni b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompressLib.uni
index c5e13b2e0e..c5e13b2e0e 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompressLib.uni
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompressLib.uni
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompressLibInternal.h b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompressLibInternal.h
index c2d84a80af..c2d84a80af 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompressLibInternal.h
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliDecompressLibInternal.h
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/GuidedSectionExtraction.c b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/GuidedSectionExtraction.c
index 427adb876a..427adb876a 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/GuidedSectionExtraction.c
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/GuidedSectionExtraction.c
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/LICENSE b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/LICENSE
index 49550fc2d0..49550fc2d0 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/LICENSE
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/LICENSE
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/README.md b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/README.md
index 01848adc17..01848adc17 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/README.md
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/README.md
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/ReadMe.txt b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/ReadMe.txt
index c19c0a162f..c19c0a162f 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/ReadMe.txt
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/ReadMe.txt
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/common/constants.h b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/common/constants.h
index f82a89bb81..f82a89bb81 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/common/constants.h
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/common/constants.h
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/common/dictionary.c b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/common/dictionary.c
index 58c88d2b46..58c88d2b46 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/common/dictionary.c
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/common/dictionary.c
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/common/dictionary.h b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/common/dictionary.h
index d8cfe1c349..d8cfe1c349 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/common/dictionary.h
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/common/dictionary.h
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/common/port.h b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/common/port.h
index 641bd38dc5..641bd38dc5 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/common/port.h
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/common/port.h
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/common/types.h b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/common/types.h
index de25359e8a..de25359e8a 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/common/types.h
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/common/types.h
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/bit_reader.c b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/bit_reader.c
index 21845ce83c..21845ce83c 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/bit_reader.c
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/bit_reader.c
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/bit_reader.h b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/bit_reader.h
index 9f65b78a85..9f65b78a85 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/bit_reader.h
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/bit_reader.h
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/context.h b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/context.h
index d4e7d866a6..d4e7d866a6 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/context.h
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/context.h
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/decode.c b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/decode.c
index 6557ba67d5..6557ba67d5 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/decode.c
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/decode.c
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/decode.h b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/decode.h
index 4a2fa2ec9b..4a2fa2ec9b 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/decode.h
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/decode.h
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/huffman.c b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/huffman.c
index 6b99cfea4b..6b99cfea4b 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/huffman.c
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/huffman.c
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/huffman.h b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/huffman.h
index 2680089186..2680089186 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/huffman.h
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/huffman.h
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/port.h b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/port.h
index 866965b1ef..866965b1ef 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/port.h
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/port.h
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/prefix.h b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/prefix.h
index 6006496433..6006496433 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/prefix.h
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/prefix.h
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/state.c b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/state.c
index e7e5e3cc72..e7e5e3cc72 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/state.c
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/state.c
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/state.h b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/state.h
index 22681cbb97..22681cbb97 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/state.h
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/state.h
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/transform.h b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/transform.h
index 9d6501a452..9d6501a452 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/transform.h
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/dec/transform.h
diff --git a/MdeModulePkg/Library/BrotliCustomDecompressLib/docs/brotli-comparison-study-2015-09-22.pdf b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/docs/brotli-comparison-study-2015-09-22.pdf
index 040f179e2b..040f179e2b 100644
--- a/MdeModulePkg/Library/BrotliCustomDecompressLib/docs/brotli-comparison-study-2015-09-22.pdf
+++ b/Core/MdeModulePkg/Library/BrotliCustomDecompressLib/docs/brotli-comparison-study-2015-09-22.pdf
diff --git a/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.c b/Core/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.c
index cbe4768633..cbe4768633 100644
--- a/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.c
+++ b/Core/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.c
diff --git a/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf b/Core/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf
index c79c5a76ee..c79c5a76ee 100644
--- a/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf
+++ b/Core/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf
diff --git a/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.uni b/Core/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.uni
index 2e213b7991..2e213b7991 100644
--- a/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.uni
+++ b/Core/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.uni
diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/Colors.h b/Core/MdeModulePkg/Library/CustomizedDisplayLib/Colors.h
index 2db8b99614..2db8b99614 100644
--- a/MdeModulePkg/Library/CustomizedDisplayLib/Colors.h
+++ b/Core/MdeModulePkg/Library/CustomizedDisplayLib/Colors.h
diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c b/Core/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
index e29892ff17..e29892ff17 100644
--- a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
+++ b/Core/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf b/Core/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
index 23528948a3..23528948a3 100644
--- a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
+++ b/Core/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.uni b/Core/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.uni
index 70fa44d466..70fa44d466 100644
--- a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.uni
+++ b/Core/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.uni
diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.c b/Core/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.c
index bc14a9dd76..bc14a9dd76 100644
--- a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.c
+++ b/Core/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.c
diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.h b/Core/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.h
index 7342b508b0..7342b508b0 100644
--- a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.h
+++ b/Core/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibInternal.h
diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibModStrs.uni b/Core/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibModStrs.uni
index 4a58241571..4a58241571 100644
--- a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibModStrs.uni
+++ b/Core/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLibModStrs.uni
diff --git a/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.c b/Core/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.c
index 253fbdc967..253fbdc967 100644
--- a/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.c
+++ b/Core/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.c
diff --git a/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf b/Core/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
index ce1eab2623..ce1eab2623 100644
--- a/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
+++ b/Core/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
diff --git a/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.uni b/Core/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.uni
index 561cd876bb..561cd876bb 100644
--- a/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.uni
+++ b/Core/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.uni
diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c b/Core/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
index 5098b70e97..5098b70e97 100644
--- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
+++ b/Core/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.h b/Core/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.h
index 88606cee3e..88606cee3e 100644
--- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.h
+++ b/Core/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.h
diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni b/Core/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
index 061e4be434..061e4be434 100644
--- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
+++ b/Core/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf b/Core/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
index 1dc665b940..1dc665b940 100644
--- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
+++ b/Core/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.uni b/Core/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.uni
index 2b2fc6453e..2b2fc6453e 100644
--- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.uni
+++ b/Core/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.uni
diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerVfr.Vfr b/Core/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerVfr.Vfr
index f7b2080c47..f7b2080c47 100644
--- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerVfr.Vfr
+++ b/Core/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerVfr.Vfr
diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c b/Core/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
index 2f397789b5..2f397789b5 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
+++ b/Core/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf b/Core/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
index a6cf54cb6b..a6cf54cb6b 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
+++ b/Core/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.uni b/Core/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.uni
index 05a80d007e..05a80d007e 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.uni
+++ b/Core/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.uni
diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleProcessLib.c b/Core/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleProcessLib.c
index ba3ff90b9f..ba3ff90b9f 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleProcessLib.c
+++ b/Core/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleProcessLib.c
diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleProcessLibNull.c b/Core/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleProcessLibNull.c
index 07e9e46eae..07e9e46eae 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleProcessLibNull.c
+++ b/Core/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleProcessLibNull.c
diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLib.c b/Core/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLib.c
index 3fed8e06e4..3fed8e06e4 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLib.c
+++ b/Core/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLib.c
diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLibNull.c b/Core/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLibNull.c
index a6860ef45d..a6860ef45d 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLibNull.c
+++ b/Core/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLibNull.c
diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c b/Core/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c
index c88a0fc540..c88a0fc540 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c
+++ b/Core/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c
diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf b/Core/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf
index 25b7d51f57..25b7d51f57 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf
+++ b/Core/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf
diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.uni b/Core/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.uni
index cd89b138c7..cd89b138c7 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.uni
+++ b/Core/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.uni
diff --git a/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.c b/Core/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.c
index b064240ccb..b064240ccb 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.c
+++ b/Core/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.c
diff --git a/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf b/Core/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
index b836607aae..b836607aae 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
+++ b/Core/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
diff --git a/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.uni b/Core/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.uni
index 87517870e9..87517870e9 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.uni
+++ b/Core/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.uni
diff --git a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf b/Core/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
index caba8cd4a4..caba8cd4a4 100644
--- a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
+++ b/Core/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
diff --git a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.uni b/Core/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.uni
index aa67c8baf1..aa67c8baf1 100644
--- a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.uni
+++ b/Core/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.uni
diff --git a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationProfileLib.inf b/Core/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationProfileLib.inf
index a2b5f8c102..a2b5f8c102 100644
--- a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationProfileLib.inf
+++ b/Core/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationProfileLib.inf
diff --git a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationProfileLib.uni b/Core/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationProfileLib.uni
index 82cdca62aa..82cdca62aa 100644
--- a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationProfileLib.uni
+++ b/Core/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationProfileLib.uni
diff --git a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationServices.h b/Core/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationServices.h
index 04ad3d6da3..04ad3d6da3 100644
--- a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationServices.h
+++ b/Core/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationServices.h
diff --git a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileLib.c b/Core/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileLib.c
index 8f28b988f5..8f28b988f5 100644
--- a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileLib.c
+++ b/Core/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileLib.c
diff --git a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileLibNull.c b/Core/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileLibNull.c
index 9ae0db8273..9ae0db8273 100644
--- a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileLibNull.c
+++ b/Core/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileLibNull.c
diff --git a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileServices.h b/Core/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileServices.h
index 619d7add9a..619d7add9a 100644
--- a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileServices.h
+++ b/Core/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryProfileServices.h
diff --git a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/MemoryAllocationLib.c b/Core/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/MemoryAllocationLib.c
index 95725c866f..95725c866f 100644
--- a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/MemoryAllocationLib.c
+++ b/Core/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/MemoryAllocationLib.c
diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c b/Core/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
index 51f488af6c..51f488af6c 100644
--- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
+++ b/Core/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf b/Core/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
index 5b89ce278d..5b89ce278d 100644
--- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
+++ b/Core/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.uni b/Core/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.uni
index dcdb8ae5c4..dcdb8ae5c4 100644
--- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.uni
+++ b/Core/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.uni
diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLibInternal.h b/Core/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLibInternal.h
index f1540d8c1c..f1540d8c1c 100644
--- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLibInternal.h
+++ b/Core/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLibInternal.h
diff --git a/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.c b/Core/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.c
index 5f2892823b..5f2892823b 100644
--- a/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.c
+++ b/Core/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.c
diff --git a/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf b/Core/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf
index d244897ab6..d244897ab6 100644
--- a/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf
+++ b/Core/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf
diff --git a/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.uni b/Core/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.uni
index d28cdf0fba..d28cdf0fba 100644
--- a/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.uni
+++ b/Core/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.uni
diff --git a/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.c b/Core/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.c
index 0ba88d8eeb..0ba88d8eeb 100644
--- a/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.c
+++ b/Core/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.c
diff --git a/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.inf b/Core/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.inf
index b471af7a88..b471af7a88 100644
--- a/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.inf
+++ b/Core/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.inf
diff --git a/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.uni b/Core/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.uni
index 9d74b88ad9..9d74b88ad9 100644
--- a/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.uni
+++ b/Core/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.uni
diff --git a/MdeModulePkg/Library/DxeDpcLib/DpcLib.c b/Core/MdeModulePkg/Library/DxeDpcLib/DpcLib.c
index 6eda8ca0fb..6eda8ca0fb 100644
--- a/MdeModulePkg/Library/DxeDpcLib/DpcLib.c
+++ b/Core/MdeModulePkg/Library/DxeDpcLib/DpcLib.c
diff --git a/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf b/Core/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
index d541acd5a9..d541acd5a9 100644
--- a/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
+++ b/Core/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
diff --git a/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.uni b/Core/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.uni
index 84e72e1c46..84e72e1c46 100644
--- a/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.uni
+++ b/Core/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.uni
diff --git a/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.c b/Core/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.c
index e1fca76f5b..e1fca76f5b 100644
--- a/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.c
+++ b/Core/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.c
diff --git a/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.inf b/Core/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.inf
index 5725a9b4ab..5725a9b4ab 100644
--- a/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.inf
+++ b/Core/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.inf
diff --git a/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.uni b/Core/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.uni
index ff8fd7919f..ff8fd7919f 100644
--- a/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.uni
+++ b/Core/MdeModulePkg/Library/DxeFileExplorerProtocol/DxeFileExplorerProtocol.uni
diff --git a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.c b/Core/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.c
index 8421caaa70..8421caaa70 100644
--- a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.c
+++ b/Core/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.c
diff --git a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.h b/Core/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.h
index af82c16fc3..af82c16fc3 100644
--- a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.h
+++ b/Core/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.h
diff --git a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf b/Core/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
index 92b9b91239..92b9b91239 100644
--- a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
+++ b/Core/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
diff --git a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.uni b/Core/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.uni
index bde5004b56..bde5004b56 100644
--- a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.uni
+++ b/Core/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.uni
diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c b/Core/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
index 9a70e9075d..9a70e9075d 100644
--- a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
+++ b/Core/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf b/Core/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
index f62a36fd50..f62a36fd50 100644
--- a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
+++ b/Core/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.uni b/Core/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.uni
index 755d29911b..755d29911b 100644
--- a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.uni
+++ b/Core/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.uni
diff --git a/MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.c b/Core/MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.c
index d15c6bd561..d15c6bd561 100644
--- a/MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.c
+++ b/Core/MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.c
diff --git a/MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.inf b/Core/MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.inf
index d7564311fa..d7564311fa 100644
--- a/MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.inf
+++ b/Core/MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.inf
diff --git a/MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.uni b/Core/MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.uni
index 5b7814b5df..5b7814b5df 100644
--- a/MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.uni
+++ b/Core/MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.uni
diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/Core/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index 7cd7e3aca0..7cd7e3aca0 100644
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/Core/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf b/Core/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
index 1ff3a4fe55..1ff3a4fe55 100644
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
+++ b/Core/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.uni b/Core/MdeModulePkg/Library/DxeNetLib/DxeNetLib.uni
index c324a50a61..c324a50a61 100644
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.uni
+++ b/Core/MdeModulePkg/Library/DxeNetLib/DxeNetLib.uni
diff --git a/MdeModulePkg/Library/DxeNetLib/NetBuffer.c b/Core/MdeModulePkg/Library/DxeNetLib/NetBuffer.c
index 95cb71714b..95cb71714b 100644
--- a/MdeModulePkg/Library/DxeNetLib/NetBuffer.c
+++ b/Core/MdeModulePkg/Library/DxeNetLib/NetBuffer.c
diff --git a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c b/Core/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
index cb62d522f3..cb62d522f3 100644
--- a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
+++ b/Core/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
diff --git a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf b/Core/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
index edc63c6f0b..edc63c6f0b 100644
--- a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
+++ b/Core/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
diff --git a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.uni b/Core/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.uni
index 0c04cb0529..0c04cb0529 100644
--- a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.uni
+++ b/Core/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.uni
diff --git a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/DxePrintLibPrint2Protocol.inf b/Core/MdeModulePkg/Library/DxePrintLibPrint2Protocol/DxePrintLibPrint2Protocol.inf
index 1cda2dc5cf..1cda2dc5cf 100644
--- a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/DxePrintLibPrint2Protocol.inf
+++ b/Core/MdeModulePkg/Library/DxePrintLibPrint2Protocol/DxePrintLibPrint2Protocol.inf
diff --git a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/DxePrintLibPrint2Protocol.uni b/Core/MdeModulePkg/Library/DxePrintLibPrint2Protocol/DxePrintLibPrint2Protocol.uni
index 3a9fb583a8..3a9fb583a8 100644
--- a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/DxePrintLibPrint2Protocol.uni
+++ b/Core/MdeModulePkg/Library/DxePrintLibPrint2Protocol/DxePrintLibPrint2Protocol.uni
diff --git a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c b/Core/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
index 9f702c4fef..9f702c4fef 100644
--- a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
+++ b/Core/MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
diff --git a/MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf b/Core/MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
index 962cf8b05b..962cf8b05b 100644
--- a/MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
+++ b/Core/MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
diff --git a/MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.uni b/Core/MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.uni
index c760ea72dc..c760ea72dc 100644
--- a/MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.uni
+++ b/Core/MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.uni
diff --git a/MdeModulePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c b/Core/MdeModulePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c
index ce843cc47f..ce843cc47f 100644
--- a/MdeModulePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/Core/MdeModulePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c
diff --git a/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.c b/Core/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.c
index b96d78664d..b96d78664d 100644
--- a/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.c
+++ b/Core/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.c
diff --git a/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf b/Core/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
index 0f8a13b99d..0f8a13b99d 100644
--- a/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
+++ b/Core/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
diff --git a/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.uni b/Core/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.uni
index 7a4186d156..7a4186d156 100644
--- a/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.uni
+++ b/Core/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.uni
diff --git a/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.c b/Core/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.c
index d8d0684273..d8d0684273 100644
--- a/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.c
+++ b/Core/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.c
diff --git a/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.inf b/Core/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.inf
index 2b057704f8..2b057704f8 100644
--- a/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.inf
+++ b/Core/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.inf
diff --git a/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.uni b/Core/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.uni
index 96c5762256..96c5762256 100644
--- a/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.uni
+++ b/Core/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.uni
diff --git a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.c b/Core/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.c
index 17183e1a6c..17183e1a6c 100644
--- a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.c
+++ b/Core/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.c
diff --git a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf b/Core/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
index 4f11c6f0c8..4f11c6f0c8 100644
--- a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
+++ b/Core/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
diff --git a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.uni b/Core/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.uni
index 7623613383..7623613383 100644
--- a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.uni
+++ b/Core/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.uni
diff --git a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c b/Core/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
index 4861095435..4861095435 100644
--- a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
+++ b/Core/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
diff --git a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf b/Core/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
index a9683c9a74..a9683c9a74 100644
--- a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
+++ b/Core/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
diff --git a/MdeModulePkg/Library/DxeUdpIoLib/DxeUpdIoLib.uni b/Core/MdeModulePkg/Library/DxeUdpIoLib/DxeUpdIoLib.uni
index 7218f59acf..7218f59acf 100644
--- a/MdeModulePkg/Library/DxeUdpIoLib/DxeUpdIoLib.uni
+++ b/Core/MdeModulePkg/Library/DxeUdpIoLib/DxeUpdIoLib.uni
diff --git a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c b/Core/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
index 9182751ad7..9182751ad7 100644
--- a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
+++ b/Core/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
diff --git a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.h b/Core/MdeModulePkg/Library/FileExplorerLib/FileExplorer.h
index b9a84fb667..b9a84fb667 100644
--- a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.h
+++ b/Core/MdeModulePkg/Library/FileExplorerLib/FileExplorer.h
diff --git a/MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf b/Core/MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
index c292aa2e49..c292aa2e49 100644
--- a/MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
+++ b/Core/MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
diff --git a/MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.uni b/Core/MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.uni
index 27ac33bca6..27ac33bca6 100644
--- a/MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.uni
+++ b/Core/MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.uni
diff --git a/MdeModulePkg/Library/FileExplorerLib/FileExplorerString.uni b/Core/MdeModulePkg/Library/FileExplorerLib/FileExplorerString.uni
index e16adb66fc..e16adb66fc 100644
--- a/MdeModulePkg/Library/FileExplorerLib/FileExplorerString.uni
+++ b/Core/MdeModulePkg/Library/FileExplorerLib/FileExplorerString.uni
diff --git a/MdeModulePkg/Library/FileExplorerLib/FileExplorerVfr.vfr b/Core/MdeModulePkg/Library/FileExplorerLib/FileExplorerVfr.vfr
index b2bf94d5c7..b2bf94d5c7 100644
--- a/MdeModulePkg/Library/FileExplorerLib/FileExplorerVfr.vfr
+++ b/Core/MdeModulePkg/Library/FileExplorerLib/FileExplorerVfr.vfr
diff --git a/MdeModulePkg/Library/FileExplorerLib/FormGuid.h b/Core/MdeModulePkg/Library/FileExplorerLib/FormGuid.h
index a243e9f6c5..a243e9f6c5 100644
--- a/MdeModulePkg/Library/FileExplorerLib/FormGuid.h
+++ b/Core/MdeModulePkg/Library/FileExplorerLib/FormGuid.h
diff --git a/MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.c b/Core/MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.c
index 02ff50466d..02ff50466d 100644
--- a/MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.c
+++ b/Core/MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.c
diff --git a/MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.inf b/Core/MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.inf
index f9b87ca53a..f9b87ca53a 100644
--- a/MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.inf
+++ b/Core/MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.inf
diff --git a/MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.uni b/Core/MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.uni
index 69fd6e1e37..69fd6e1e37 100644
--- a/MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.uni
+++ b/Core/MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.uni
diff --git a/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.c b/Core/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.c
index 011d9c52cd..011d9c52cd 100644
--- a/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.c
+++ b/Core/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.c
diff --git a/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf b/Core/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf
index 2b8d4ae28a..2b8d4ae28a 100644
--- a/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf
+++ b/Core/MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf
diff --git a/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.c b/Core/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.c
index 5d7b52c06e..5d7b52c06e 100644
--- a/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.c
+++ b/Core/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.c
diff --git a/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf b/Core/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf
index 1018a69e81..1018a69e81 100644
--- a/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf
+++ b/Core/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf
diff --git a/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.uni b/Core/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.uni
index e8164cccdc..e8164cccdc 100644
--- a/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.uni
+++ b/Core/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.uni
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/F86GuidedSectionExtraction.c b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/F86GuidedSectionExtraction.c
index ada9a809fa..ada9a809fa 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/F86GuidedSectionExtraction.c
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/F86GuidedSectionExtraction.c
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/GuidedSectionExtraction.c b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/GuidedSectionExtraction.c
index f19e0d28cd..f19e0d28cd 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/GuidedSectionExtraction.c
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/GuidedSectionExtraction.c
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/LZMA-SDK-README.txt b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/LZMA-SDK-README.txt
index 7a6a77f952..7a6a77f952 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/LZMA-SDK-README.txt
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/LZMA-SDK-README.txt
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf
index ccd620b280..ccd620b280 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaArchDecompressLib.uni b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaArchDecompressLib.uni
index dd921b2122..dd921b2122 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaArchDecompressLib.uni
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaArchDecompressLib.uni
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
index 127c7ded86..127c7ded86 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompress.c b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompress.c
index cdf4c08cab..cdf4c08cab 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompress.c
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompress.c
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompressLib.uni b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompressLib.uni
index 0958f85855..0958f85855 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompressLib.uni
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompressLib.uni
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompressLibInternal.h b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompressLibInternal.h
index 3096e91dbe..3096e91dbe 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompressLibInternal.h
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaDecompressLibInternal.h
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/7zTypes.h b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/7zTypes.h
index 838dac7669..838dac7669 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/7zTypes.h
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/7zTypes.h
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/7zVersion.h b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/7zVersion.h
index acb67a94e5..acb67a94e5 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/7zVersion.h
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/7zVersion.h
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Bra.h b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Bra.h
index aba8dce14f..aba8dce14f 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Bra.h
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Bra.h
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Bra86.c b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Bra86.c
index 8dd3ed48d9..8dd3ed48d9 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Bra86.c
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Bra86.c
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Compiler.h b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Compiler.h
index de8fab3749..de8fab3749 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Compiler.h
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Compiler.h
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/CpuArch.h b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/CpuArch.h
index ef6083c3b8..ef6083c3b8 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/CpuArch.h
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/CpuArch.h
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzFind.c b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzFind.c
index a860e068e4..a860e068e4 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzFind.c
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzFind.c
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzFind.h b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzFind.h
index 2ff6673771..2ff6673771 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzFind.h
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzFind.h
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzHash.h b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzHash.h
index 2191444072..2191444072 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzHash.h
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzHash.h
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzmaDec.c b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzmaDec.c
index 1c1f83ba60..1c1f83ba60 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzmaDec.c
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzmaDec.c
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzmaDec.h b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzmaDec.h
index 2633abeac9..2633abeac9 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzmaDec.h
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzmaDec.h
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Precomp.h b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Precomp.h
index edb5814439..edb5814439 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Precomp.h
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Precomp.h
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/DOC/lzma-history.txt b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/DOC/lzma-history.txt
index 7aaeb07ff4..7aaeb07ff4 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/DOC/lzma-history.txt
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/DOC/lzma-history.txt
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/DOC/lzma-sdk.txt b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/DOC/lzma-sdk.txt
index 86fef248f4..86fef248f4 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/DOC/lzma-sdk.txt
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/DOC/lzma-sdk.txt
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/UefiLzma.h b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/UefiLzma.h
index 863b3ef66b..863b3ef66b 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/UefiLzma.h
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/UefiLzma.h
diff --git a/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.c b/Core/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.c
index 536dfc7297..536dfc7297 100644
--- a/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.c
+++ b/Core/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.c
diff --git a/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf b/Core/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf
index dfcf8dcae9..dfcf8dcae9 100644
--- a/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf
+++ b/Core/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf
diff --git a/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c b/Core/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c
index 0df144fe79..0df144fe79 100644
--- a/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c
+++ b/Core/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c
diff --git a/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf b/Core/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
index 32ed1a41bf..32ed1a41bf 100644
--- a/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
+++ b/Core/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
diff --git a/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.uni b/Core/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.uni
index 26aa151ee7..26aa151ee7 100644
--- a/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.uni
+++ b/Core/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.uni
diff --git a/MdeModulePkg/Library/PciHostBridgeLibNull/PciHostBridgeLibNull.c b/Core/MdeModulePkg/Library/PciHostBridgeLibNull/PciHostBridgeLibNull.c
index 761e45b0de..761e45b0de 100644
--- a/MdeModulePkg/Library/PciHostBridgeLibNull/PciHostBridgeLibNull.c
+++ b/Core/MdeModulePkg/Library/PciHostBridgeLibNull/PciHostBridgeLibNull.c
diff --git a/MdeModulePkg/Library/PciHostBridgeLibNull/PciHostBridgeLibNull.inf b/Core/MdeModulePkg/Library/PciHostBridgeLibNull/PciHostBridgeLibNull.inf
index 8df14924ad..8df14924ad 100644
--- a/MdeModulePkg/Library/PciHostBridgeLibNull/PciHostBridgeLibNull.inf
+++ b/Core/MdeModulePkg/Library/PciHostBridgeLibNull/PciHostBridgeLibNull.inf
diff --git a/MdeModulePkg/Library/PciHostBridgeLibNull/PciHostBridgeLibNull.uni b/Core/MdeModulePkg/Library/PciHostBridgeLibNull/PciHostBridgeLibNull.uni
index 7b0fdee324..7b0fdee324 100644
--- a/MdeModulePkg/Library/PciHostBridgeLibNull/PciHostBridgeLibNull.uni
+++ b/Core/MdeModulePkg/Library/PciHostBridgeLibNull/PciHostBridgeLibNull.uni
diff --git a/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.c b/Core/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.c
index f979bdf42b..f979bdf42b 100644
--- a/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.c
+++ b/Core/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.c
diff --git a/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.inf b/Core/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.inf
index 7134810040..7134810040 100644
--- a/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.inf
+++ b/Core/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.inf
diff --git a/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.uni b/Core/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.uni
index 98fd021010..98fd021010 100644
--- a/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.uni
+++ b/Core/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.uni
diff --git a/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.c b/Core/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.c
index 4bcf0030a0..4bcf0030a0 100644
--- a/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.c
+++ b/Core/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.c
diff --git a/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.inf b/Core/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.inf
index 0380dee01f..0380dee01f 100644
--- a/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.inf
+++ b/Core/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.inf
diff --git a/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.uni b/Core/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.uni
index 394d09b153..394d09b153 100644
--- a/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.uni
+++ b/Core/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.uni
diff --git a/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c b/Core/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
index 163d530ae5..163d530ae5 100644
--- a/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
+++ b/Core/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
diff --git a/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf b/Core/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
index 55446672d7..55446672d7 100644
--- a/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
+++ b/Core/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
diff --git a/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.uni b/Core/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.uni
index 0cb03470c5..0cb03470c5 100644
--- a/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.uni
+++ b/Core/MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.uni
diff --git a/MdeModulePkg/Library/PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.c b/Core/MdeModulePkg/Library/PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.c
index cb6a007360..cb6a007360 100644
--- a/MdeModulePkg/Library/PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.c
+++ b/Core/MdeModulePkg/Library/PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.c
diff --git a/MdeModulePkg/Library/PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.inf b/Core/MdeModulePkg/Library/PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.inf
index 4a3cc6cd2f..4a3cc6cd2f 100644
--- a/MdeModulePkg/Library/PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.inf
+++ b/Core/MdeModulePkg/Library/PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.inf
diff --git a/MdeModulePkg/Library/PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.uni b/Core/MdeModulePkg/Library/PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.uni
index 65a5724a04..65a5724a04 100644
--- a/MdeModulePkg/Library/PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.uni
+++ b/Core/MdeModulePkg/Library/PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.uni
diff --git a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c b/Core/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
index 62527b2c34..62527b2c34 100644
--- a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
+++ b/Core/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
diff --git a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf b/Core/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
index 08aa064432..08aa064432 100644
--- a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
+++ b/Core/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
diff --git a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.uni b/Core/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.uni
index 79a50d3505..79a50d3505 100644
--- a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.uni
+++ b/Core/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.uni
diff --git a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c b/Core/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c
index d77c6e544b..d77c6e544b 100644
--- a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c
+++ b/Core/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c
diff --git a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf b/Core/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf
index 6c565acc40..6c565acc40 100644
--- a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf
+++ b/Core/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf
diff --git a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni b/Core/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni
index f02af2f624..f02af2f624 100644
--- a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni
+++ b/Core/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.uni
diff --git a/MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf b/Core/MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
index f66ce80cd5..f66ce80cd5 100644
--- a/MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
+++ b/Core/MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
diff --git a/MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.uni b/Core/MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.uni
index 0a4b62f42f..0a4b62f42f 100644
--- a/MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.uni
+++ b/Core/MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.uni
diff --git a/MdeModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c b/Core/MdeModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
index d41d4e981d..d41d4e981d 100644
--- a/MdeModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/Core/MdeModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c b/Core/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c
index 82882b8706..82882b8706 100644
--- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c
+++ b/Core/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c
diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf b/Core/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
index f582054870..f582054870 100644
--- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
+++ b/Core/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni b/Core/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni
index 0814fa7249..0814fa7249 100644
--- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni
+++ b/Core/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni
diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptExecute.c b/Core/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptExecute.c
index b865d4452f..b865d4452f 100644
--- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptExecute.c
+++ b/Core/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptExecute.c
diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptInternalFormat.h b/Core/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptInternalFormat.h
index 38171c56fd..38171c56fd 100644
--- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptInternalFormat.h
+++ b/Core/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptInternalFormat.h
diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c b/Core/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
index fe2d3a0284..fe2d3a0284 100644
--- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
+++ b/Core/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf b/Core/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
index 0feff36612..0feff36612 100644
--- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
+++ b/Core/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.uni b/Core/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.uni
index b6e576ed8a..b6e576ed8a 100644
--- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.uni
+++ b/Core/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.uni
diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/InternalBootScriptLib.h b/Core/MdeModulePkg/Library/PiDxeS3BootScriptLib/InternalBootScriptLib.h
index ffbf5d2688..ffbf5d2688 100644
--- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/InternalBootScriptLib.h
+++ b/Core/MdeModulePkg/Library/PiDxeS3BootScriptLib/InternalBootScriptLib.h
diff --git a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/MemoryAllocationLib.c b/Core/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/MemoryAllocationLib.c
index 96cb275cc9..96cb275cc9 100644
--- a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/MemoryAllocationLib.c
+++ b/Core/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/MemoryAllocationLib.c
diff --git a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf b/Core/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf
index f2a0bf8853..f2a0bf8853 100644
--- a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf
+++ b/Core/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf
diff --git a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.uni b/Core/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.uni
index 28e812b4df..28e812b4df 100644
--- a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.uni
+++ b/Core/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.uni
diff --git a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationProfileLib.inf b/Core/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationProfileLib.inf
index f9800b395f..f9800b395f 100644
--- a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationProfileLib.inf
+++ b/Core/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationProfileLib.inf
diff --git a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationProfileLib.uni b/Core/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationProfileLib.uni
index a56b117061..a56b117061 100644
--- a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationProfileLib.uni
+++ b/Core/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationProfileLib.uni
diff --git a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationServices.h b/Core/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationServices.h
index a2b89acf5d..a2b89acf5d 100644
--- a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationServices.h
+++ b/Core/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationServices.h
diff --git a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileLib.c b/Core/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileLib.c
index ffae2212a8..ffae2212a8 100644
--- a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileLib.c
+++ b/Core/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileLib.c
diff --git a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileLibNull.c b/Core/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileLibNull.c
index 6f6c2ebc91..6f6c2ebc91 100644
--- a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileLibNull.c
+++ b/Core/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileLibNull.c
diff --git a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileServices.h b/Core/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileServices.h
index 29923ea0a2..29923ea0a2 100644
--- a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileServices.h
+++ b/Core/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryProfileServices.h
diff --git a/MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.c b/Core/MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.c
index 788fafae35..788fafae35 100644
--- a/MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.c
+++ b/Core/MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.c
diff --git a/MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf b/Core/MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf
index 80d523c71b..80d523c71b 100644
--- a/MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf
+++ b/Core/MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf
diff --git a/MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.uni b/Core/MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.uni
index f02afb61c6..f02afb61c6 100644
--- a/MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.uni
+++ b/Core/MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.uni
diff --git a/MdeModulePkg/Library/PlatformBootManagerLibNull/PlatformBootManager.c b/Core/MdeModulePkg/Library/PlatformBootManagerLibNull/PlatformBootManager.c
index 1390e19097..1390e19097 100644
--- a/MdeModulePkg/Library/PlatformBootManagerLibNull/PlatformBootManager.c
+++ b/Core/MdeModulePkg/Library/PlatformBootManagerLibNull/PlatformBootManager.c
diff --git a/MdeModulePkg/Library/PlatformBootManagerLibNull/PlatformBootManagerLibNull.inf b/Core/MdeModulePkg/Library/PlatformBootManagerLibNull/PlatformBootManagerLibNull.inf
index fb756ca2ff..fb756ca2ff 100644
--- a/MdeModulePkg/Library/PlatformBootManagerLibNull/PlatformBootManagerLibNull.inf
+++ b/Core/MdeModulePkg/Library/PlatformBootManagerLibNull/PlatformBootManagerLibNull.inf
diff --git a/MdeModulePkg/Library/PlatformBootManagerLibNull/PlatformBootManagerLibNull.uni b/Core/MdeModulePkg/Library/PlatformBootManagerLibNull/PlatformBootManagerLibNull.uni
index 459de510f9..459de510f9 100644
--- a/MdeModulePkg/Library/PlatformBootManagerLibNull/PlatformBootManagerLibNull.uni
+++ b/Core/MdeModulePkg/Library/PlatformBootManagerLibNull/PlatformBootManagerLibNull.uni
diff --git a/MdeModulePkg/Library/PlatformHookLibSerialPortPpi/PlatformHookLibSerialPortPpi.c b/Core/MdeModulePkg/Library/PlatformHookLibSerialPortPpi/PlatformHookLibSerialPortPpi.c
index 00b70c79e6..00b70c79e6 100644
--- a/MdeModulePkg/Library/PlatformHookLibSerialPortPpi/PlatformHookLibSerialPortPpi.c
+++ b/Core/MdeModulePkg/Library/PlatformHookLibSerialPortPpi/PlatformHookLibSerialPortPpi.c
diff --git a/MdeModulePkg/Library/PlatformHookLibSerialPortPpi/PlatformHookLibSerialPortPpi.inf b/Core/MdeModulePkg/Library/PlatformHookLibSerialPortPpi/PlatformHookLibSerialPortPpi.inf
index d577506b26..d577506b26 100644
--- a/MdeModulePkg/Library/PlatformHookLibSerialPortPpi/PlatformHookLibSerialPortPpi.inf
+++ b/Core/MdeModulePkg/Library/PlatformHookLibSerialPortPpi/PlatformHookLibSerialPortPpi.inf
diff --git a/MdeModulePkg/Library/PlatformHookLibSerialPortPpi/PlatformHookLibSerialPortPpi.uni b/Core/MdeModulePkg/Library/PlatformHookLibSerialPortPpi/PlatformHookLibSerialPortPpi.uni
index c9aa0f23a3..c9aa0f23a3 100644
--- a/MdeModulePkg/Library/PlatformHookLibSerialPortPpi/PlatformHookLibSerialPortPpi.uni
+++ b/Core/MdeModulePkg/Library/PlatformHookLibSerialPortPpi/PlatformHookLibSerialPortPpi.uni
diff --git a/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanup.h b/Core/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanup.h
index 5290aae158..5290aae158 100644
--- a/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanup.h
+++ b/Core/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanup.h
diff --git a/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanup.vfr b/Core/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanup.vfr
index 7dfeafa2c4..7dfeafa2c4 100644
--- a/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanup.vfr
+++ b/Core/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanup.vfr
diff --git a/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanupHii.h b/Core/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanupHii.h
index 02af877b44..02af877b44 100644
--- a/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanupHii.h
+++ b/Core/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanupHii.h
diff --git a/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanupLib.c b/Core/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanupLib.c
index c5fd30e219..c5fd30e219 100644
--- a/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanupLib.c
+++ b/Core/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanupLib.c
diff --git a/MdeModulePkg/Library/PlatformVarCleanupLib/PlatformVarCleanupLib.inf b/Core/MdeModulePkg/Library/PlatformVarCleanupLib/PlatformVarCleanupLib.inf
index 6e7fcb6a5c..6e7fcb6a5c 100644
--- a/MdeModulePkg/Library/PlatformVarCleanupLib/PlatformVarCleanupLib.inf
+++ b/Core/MdeModulePkg/Library/PlatformVarCleanupLib/PlatformVarCleanupLib.inf
diff --git a/MdeModulePkg/Library/PlatformVarCleanupLib/PlatformVarCleanupLib.uni b/Core/MdeModulePkg/Library/PlatformVarCleanupLib/PlatformVarCleanupLib.uni
index ef3f40bbd9..ef3f40bbd9 100644
--- a/MdeModulePkg/Library/PlatformVarCleanupLib/PlatformVarCleanupLib.uni
+++ b/Core/MdeModulePkg/Library/PlatformVarCleanupLib/PlatformVarCleanupLib.uni
diff --git a/MdeModulePkg/Library/PlatformVarCleanupLib/VfrStrings.uni b/Core/MdeModulePkg/Library/PlatformVarCleanupLib/VfrStrings.uni
index d30512329f..d30512329f 100644
--- a/MdeModulePkg/Library/PlatformVarCleanupLib/VfrStrings.uni
+++ b/Core/MdeModulePkg/Library/PlatformVarCleanupLib/VfrStrings.uni
diff --git a/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/ReportStatusCodeLib.c b/Core/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/ReportStatusCodeLib.c
index e533af3d33..e533af3d33 100644
--- a/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/Core/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/ReportStatusCodeLib.c
diff --git a/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf b/Core/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
index 49d9933b58..49d9933b58 100644
--- a/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
+++ b/Core/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
diff --git a/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.uni b/Core/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.uni
index 61f811497a..61f811497a 100644
--- a/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.uni
+++ b/Core/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.uni
diff --git a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.c b/Core/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.c
index cd1f1a5d5f..cd1f1a5d5f 100644
--- a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.c
+++ b/Core/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.c
diff --git a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.inf b/Core/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.inf
index 1b2fbd3ea3..1b2fbd3ea3 100644
--- a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.inf
+++ b/Core/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.inf
diff --git a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.uni b/Core/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.uni
index c3264fcfb9..c3264fcfb9 100644
--- a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.uni
+++ b/Core/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.uni
diff --git a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLibInternal.h b/Core/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLibInternal.h
index 8eb30320ee..8eb30320ee 100644
--- a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLibInternal.h
+++ b/Core/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLibInternal.h
diff --git a/MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.c b/Core/MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.c
index ef38c8fdf5..ef38c8fdf5 100644
--- a/MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.c
+++ b/Core/MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.c
diff --git a/MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.inf b/Core/MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.inf
index ff7c1d26b3..ff7c1d26b3 100644
--- a/MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.inf
+++ b/Core/MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.inf
diff --git a/MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.uni b/Core/MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.uni
index 43e2ac1867..43e2ac1867 100644
--- a/MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.uni
+++ b/Core/MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.uni
diff --git a/MdeModulePkg/Library/SmmIpmiLibSmmIpmiProtocol/SmmIpmiLibSmmIpmiProtocol.c b/Core/MdeModulePkg/Library/SmmIpmiLibSmmIpmiProtocol/SmmIpmiLibSmmIpmiProtocol.c
index 70d12a2138..70d12a2138 100644
--- a/MdeModulePkg/Library/SmmIpmiLibSmmIpmiProtocol/SmmIpmiLibSmmIpmiProtocol.c
+++ b/Core/MdeModulePkg/Library/SmmIpmiLibSmmIpmiProtocol/SmmIpmiLibSmmIpmiProtocol.c
diff --git a/MdeModulePkg/Library/SmmIpmiLibSmmIpmiProtocol/SmmIpmiLibSmmIpmiProtocol.inf b/Core/MdeModulePkg/Library/SmmIpmiLibSmmIpmiProtocol/SmmIpmiLibSmmIpmiProtocol.inf
index 37f4318388..37f4318388 100644
--- a/MdeModulePkg/Library/SmmIpmiLibSmmIpmiProtocol/SmmIpmiLibSmmIpmiProtocol.inf
+++ b/Core/MdeModulePkg/Library/SmmIpmiLibSmmIpmiProtocol/SmmIpmiLibSmmIpmiProtocol.inf
diff --git a/MdeModulePkg/Library/SmmIpmiLibSmmIpmiProtocol/SmmIpmiLibSmmIpmiProtocol.uni b/Core/MdeModulePkg/Library/SmmIpmiLibSmmIpmiProtocol/SmmIpmiLibSmmIpmiProtocol.uni
index fa9791129a..fa9791129a 100644
--- a/MdeModulePkg/Library/SmmIpmiLibSmmIpmiProtocol/SmmIpmiLibSmmIpmiProtocol.uni
+++ b/Core/MdeModulePkg/Library/SmmIpmiLibSmmIpmiProtocol/SmmIpmiLibSmmIpmiProtocol.uni
diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c b/Core/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c
index 9659f014e9..9659f014e9 100644
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c
+++ b/Core/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c
diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf b/Core/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
index 48cdb9c66a..48cdb9c66a 100644
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
+++ b/Core/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.uni b/Core/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.uni
index d68c912afe..d68c912afe 100644
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.uni
+++ b/Core/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.uni
diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxLibPrivate.h b/Core/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxLibPrivate.h
index 31da89af0f..31da89af0f 100644
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxLibPrivate.h
+++ b/Core/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxLibPrivate.h
diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c b/Core/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c
index cea1fed682..cea1fed682 100644
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c
+++ b/Core/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c
diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf b/Core/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf
index dceff8f0f6..dceff8f0f6 100644
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf
+++ b/Core/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf
diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.uni b/Core/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.uni
index 37bb75663c..37bb75663c 100644
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.uni
+++ b/Core/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.uni
diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.c b/Core/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.c
index 4960df7555..4960df7555 100644
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.c
+++ b/Core/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.c
diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf b/Core/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf
index eb7ba0bb2e..eb7ba0bb2e 100644
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf
+++ b/Core/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf
diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.uni b/Core/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.uni
index 4e719facbe..4e719facbe 100644
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.uni
+++ b/Core/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.uni
diff --git a/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/MemoryAllocationLib.c b/Core/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/MemoryAllocationLib.c
index 2a18155e56..2a18155e56 100644
--- a/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/MemoryAllocationLib.c
+++ b/Core/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/MemoryAllocationLib.c
diff --git a/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/SmmMemoryAllocationProfileLib.inf b/Core/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/SmmMemoryAllocationProfileLib.inf
index 60ec75c30e..60ec75c30e 100644
--- a/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/SmmMemoryAllocationProfileLib.inf
+++ b/Core/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/SmmMemoryAllocationProfileLib.inf
diff --git a/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/SmmMemoryAllocationProfileLib.uni b/Core/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/SmmMemoryAllocationProfileLib.uni
index a0774f0204..a0774f0204 100644
--- a/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/SmmMemoryAllocationProfileLib.uni
+++ b/Core/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/SmmMemoryAllocationProfileLib.uni
diff --git a/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/SmmMemoryProfileLib.c b/Core/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/SmmMemoryProfileLib.c
index 85e7c9c132..85e7c9c132 100644
--- a/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/SmmMemoryProfileLib.c
+++ b/Core/MdeModulePkg/Library/SmmMemoryAllocationProfileLib/SmmMemoryProfileLib.c
diff --git a/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.c b/Core/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.c
index 4a08c24789..4a08c24789 100644
--- a/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.c
+++ b/Core/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.c
diff --git a/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.inf b/Core/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.inf
index c3d01a1e51..c3d01a1e51 100644
--- a/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.inf
+++ b/Core/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.inf
diff --git a/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.uni b/Core/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.uni
index 9751183d9b..9751183d9b 100644
--- a/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.uni
+++ b/Core/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.uni
diff --git a/MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLib.c b/Core/MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLib.c
index 5394fb9e97..5394fb9e97 100644
--- a/MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/Core/MdeModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLib.c
diff --git a/MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf b/Core/MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf
index 15799299fc..15799299fc 100644
--- a/MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf
+++ b/Core/MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf
diff --git a/MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.uni b/Core/MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.uni
index 88f28ff704..88f28ff704 100644
--- a/MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.uni
+++ b/Core/MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.uni
diff --git a/MdeModulePkg/Library/SmmSmiHandlerProfileLib/SmmSmiHandlerProfileLib.c b/Core/MdeModulePkg/Library/SmmSmiHandlerProfileLib/SmmSmiHandlerProfileLib.c
index 2911619971..2911619971 100644
--- a/MdeModulePkg/Library/SmmSmiHandlerProfileLib/SmmSmiHandlerProfileLib.c
+++ b/Core/MdeModulePkg/Library/SmmSmiHandlerProfileLib/SmmSmiHandlerProfileLib.c
diff --git a/MdeModulePkg/Library/SmmSmiHandlerProfileLib/SmmSmiHandlerProfileLib.inf b/Core/MdeModulePkg/Library/SmmSmiHandlerProfileLib/SmmSmiHandlerProfileLib.inf
index ba0d65ec08..ba0d65ec08 100644
--- a/MdeModulePkg/Library/SmmSmiHandlerProfileLib/SmmSmiHandlerProfileLib.inf
+++ b/Core/MdeModulePkg/Library/SmmSmiHandlerProfileLib/SmmSmiHandlerProfileLib.inf
diff --git a/MdeModulePkg/Library/SmmSmiHandlerProfileLib/SmmSmiHandlerProfileLib.uni b/Core/MdeModulePkg/Library/SmmSmiHandlerProfileLib/SmmSmiHandlerProfileLib.uni
index f65827dbe2..f65827dbe2 100644
--- a/MdeModulePkg/Library/SmmSmiHandlerProfileLib/SmmSmiHandlerProfileLib.uni
+++ b/Core/MdeModulePkg/Library/SmmSmiHandlerProfileLib/SmmSmiHandlerProfileLib.uni
diff --git a/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.c b/Core/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.c
index 8a0377b7a4..8a0377b7a4 100644
--- a/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.c
+++ b/Core/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.c
diff --git a/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf b/Core/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
index fef783a4f9..fef783a4f9 100644
--- a/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
+++ b/Core/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
diff --git a/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.uni b/Core/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.uni
index 901bbaf140..901bbaf140 100644
--- a/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.uni
+++ b/Core/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.uni
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c b/Core/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
index aa79c9075f..aa79c9075f 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
+++ b/Core/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c b/Core/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c
index 501a0cc255..501a0cc255 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c
+++ b/Core/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmConnect.c b/Core/MdeModulePkg/Library/UefiBootManagerLib/BmConnect.c
index b1c94ad9d9..b1c94ad9d9 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmConnect.c
+++ b/Core/MdeModulePkg/Library/UefiBootManagerLib/BmConnect.c
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmConsole.c b/Core/MdeModulePkg/Library/UefiBootManagerLib/BmConsole.c
index 80511814ee..80511814ee 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmConsole.c
+++ b/Core/MdeModulePkg/Library/UefiBootManagerLib/BmConsole.c
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c b/Core/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c
index ddcee8b067..ddcee8b067 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c
+++ b/Core/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c b/Core/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c
index 0f2e677c8a..0f2e677c8a 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c
+++ b/Core/MdeModulePkg/Library/UefiBootManagerLib/BmHotkey.c
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c b/Core/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c
index b0a35058d0..b0a35058d0 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c
+++ b/Core/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c b/Core/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c
index 11ab86792a..11ab86792a 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c
+++ b/Core/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmPerformance.c b/Core/MdeModulePkg/Library/UefiBootManagerLib/BmPerformance.c
index 4d4495b2a8..4d4495b2a8 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmPerformance.c
+++ b/Core/MdeModulePkg/Library/UefiBootManagerLib/BmPerformance.c
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/InternalBm.h b/Core/MdeModulePkg/Library/UefiBootManagerLib/InternalBm.h
index ef09050a1a..ef09050a1a 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/InternalBm.h
+++ b/Core/MdeModulePkg/Library/UefiBootManagerLib/InternalBm.h
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf b/Core/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
index 264d726c26..264d726c26 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
+++ b/Core/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.uni b/Core/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.uni
index baa9d82636..baa9d82636 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.uni
+++ b/Core/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.uni
diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLanguage.c b/Core/MdeModulePkg/Library/UefiHiiLib/HiiLanguage.c
index f4ef36cec2..f4ef36cec2 100644
--- a/MdeModulePkg/Library/UefiHiiLib/HiiLanguage.c
+++ b/Core/MdeModulePkg/Library/UefiHiiLib/HiiLanguage.c
diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/Core/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
index cd0cd35a0f..cd0cd35a0f 100644
--- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
+++ b/Core/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiString.c b/Core/MdeModulePkg/Library/UefiHiiLib/HiiString.c
index c6a241e657..c6a241e657 100644
--- a/MdeModulePkg/Library/UefiHiiLib/HiiString.c
+++ b/Core/MdeModulePkg/Library/UefiHiiLib/HiiString.c
diff --git a/MdeModulePkg/Library/UefiHiiLib/InternalHiiLib.h b/Core/MdeModulePkg/Library/UefiHiiLib/InternalHiiLib.h
index 9bf7696ea3..9bf7696ea3 100644
--- a/MdeModulePkg/Library/UefiHiiLib/InternalHiiLib.h
+++ b/Core/MdeModulePkg/Library/UefiHiiLib/InternalHiiLib.h
diff --git a/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf b/Core/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
index 62f435a089..62f435a089 100644
--- a/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
+++ b/Core/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
diff --git a/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.uni b/Core/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.uni
index 760617f705..760617f705 100644
--- a/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.uni
+++ b/Core/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.uni
diff --git a/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c b/Core/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c
index bd3a125603..bd3a125603 100644
--- a/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c
+++ b/Core/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c
diff --git a/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf b/Core/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
index a009e9a715..a009e9a715 100644
--- a/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
+++ b/Core/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
diff --git a/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.uni b/Core/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.uni
index f5546e98c4..f5546e98c4 100644
--- a/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.uni
+++ b/Core/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.uni
diff --git a/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/DxeMemoryProfileLib.c b/Core/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/DxeMemoryProfileLib.c
index 78c75fbc73..78c75fbc73 100644
--- a/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/DxeMemoryProfileLib.c
+++ b/Core/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/DxeMemoryProfileLib.c
diff --git a/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/MemoryAllocationLib.c b/Core/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/MemoryAllocationLib.c
index cef7fc0c05..cef7fc0c05 100644
--- a/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/MemoryAllocationLib.c
+++ b/Core/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/MemoryAllocationLib.c
diff --git a/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/UefiMemoryAllocationProfileLib.inf b/Core/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/UefiMemoryAllocationProfileLib.inf
index 21b544cc10..21b544cc10 100644
--- a/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/UefiMemoryAllocationProfileLib.inf
+++ b/Core/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/UefiMemoryAllocationProfileLib.inf
diff --git a/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/UefiMemoryAllocationProfileLib.uni b/Core/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/UefiMemoryAllocationProfileLib.uni
index 7da7d783e3..7da7d783e3 100644
--- a/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/UefiMemoryAllocationProfileLib.uni
+++ b/Core/MdeModulePkg/Library/UefiMemoryAllocationProfileLib/UefiMemoryAllocationProfileLib.uni
diff --git a/MdeModulePkg/Library/UefiSortLib/UefiSortLib.c b/Core/MdeModulePkg/Library/UefiSortLib/UefiSortLib.c
index 8a45cd0d9f..8a45cd0d9f 100644
--- a/MdeModulePkg/Library/UefiSortLib/UefiSortLib.c
+++ b/Core/MdeModulePkg/Library/UefiSortLib/UefiSortLib.c
diff --git a/MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf b/Core/MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
index 32c02b012f..32c02b012f 100644
--- a/MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
+++ b/Core/MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
diff --git a/MdeModulePkg/Library/UefiSortLib/UefiSortLib.uni b/Core/MdeModulePkg/Library/UefiSortLib/UefiSortLib.uni
index 58927615ff..58927615ff 100644
--- a/MdeModulePkg/Library/UefiSortLib/UefiSortLib.uni
+++ b/Core/MdeModulePkg/Library/UefiSortLib/UefiSortLib.uni
diff --git a/MdeModulePkg/Library/VarCheckHiiLib/InternalVarCheckStructure.h b/Core/MdeModulePkg/Library/VarCheckHiiLib/InternalVarCheckStructure.h
index a9faed48d9..a9faed48d9 100644
--- a/MdeModulePkg/Library/VarCheckHiiLib/InternalVarCheckStructure.h
+++ b/Core/MdeModulePkg/Library/VarCheckHiiLib/InternalVarCheckStructure.h
diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHii.h b/Core/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHii.h
index a54b867983..a54b867983 100644
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHii.h
+++ b/Core/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHii.h
diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c b/Core/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c
index f018c87ba1..f018c87ba1 100644
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c
+++ b/Core/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.c
diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.h b/Core/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.h
index f81be2ea88..f81be2ea88 100644
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.h
+++ b/Core/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGen.h
diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c b/Core/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c
index 71ece272e1..71ece272e1 100644
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c
+++ b/Core/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c
diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromHii.c b/Core/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromHii.c
index 41cde34af7..41cde34af7 100644
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromHii.c
+++ b/Core/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromHii.c
diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf b/Core/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf
index 98e6983f6c..98e6983f6c 100644
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf
+++ b/Core/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf
diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.uni b/Core/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.uni
index ef3f40bbd9..ef3f40bbd9 100644
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.uni
+++ b/Core/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.uni
diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c b/Core/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c
index 93ff9340e9..93ff9340e9 100644
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c
+++ b/Core/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibNullClass.c
diff --git a/MdeModulePkg/Library/VarCheckLib/VarCheckLib.c b/Core/MdeModulePkg/Library/VarCheckLib/VarCheckLib.c
index 5ca0d3edca..5ca0d3edca 100644
--- a/MdeModulePkg/Library/VarCheckLib/VarCheckLib.c
+++ b/Core/MdeModulePkg/Library/VarCheckLib/VarCheckLib.c
diff --git a/MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf b/Core/MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
index 099f83dd6a..099f83dd6a 100644
--- a/MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
+++ b/Core/MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
diff --git a/MdeModulePkg/Library/VarCheckLib/VarCheckLib.uni b/Core/MdeModulePkg/Library/VarCheckLib/VarCheckLib.uni
index 93150a7b34..93150a7b34 100644
--- a/MdeModulePkg/Library/VarCheckLib/VarCheckLib.uni
+++ b/Core/MdeModulePkg/Library/VarCheckLib/VarCheckLib.uni
diff --git a/MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.inf b/Core/MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.inf
index b9d235be60..b9d235be60 100644
--- a/MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.inf
+++ b/Core/MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.inf
diff --git a/MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.uni b/Core/MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.uni
index e060b87975..e060b87975 100644
--- a/MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.uni
+++ b/Core/MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.uni
diff --git a/MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLibNullClass.c b/Core/MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLibNullClass.c
index 72b0363b19..72b0363b19 100644
--- a/MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLibNullClass.c
+++ b/Core/MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLibNullClass.c
diff --git a/MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdStructure.h b/Core/MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdStructure.h
index 8180bc5cfd..8180bc5cfd 100644
--- a/MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdStructure.h
+++ b/Core/MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdStructure.h
diff --git a/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf b/Core/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
index 128c44d695..128c44d695 100644
--- a/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
+++ b/Core/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
diff --git a/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.uni b/Core/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.uni
index 8acd3f44a6..8acd3f44a6 100644
--- a/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.uni
+++ b/Core/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.uni
diff --git a/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLibNullClass.c b/Core/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLibNullClass.c
index 80dc6341ad..80dc6341ad 100644
--- a/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLibNullClass.c
+++ b/Core/MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLibNullClass.c
diff --git a/MdeModulePkg/License.txt b/Core/MdeModulePkg/License.txt
index be68999be6..be68999be6 100644
--- a/MdeModulePkg/License.txt
+++ b/Core/MdeModulePkg/License.txt
diff --git a/MdeModulePkg/Logo/Logo.bmp b/Core/MdeModulePkg/Logo/Logo.bmp
index 3e85229e17..3e85229e17 100644
--- a/MdeModulePkg/Logo/Logo.bmp
+++ b/Core/MdeModulePkg/Logo/Logo.bmp
diff --git a/MdeModulePkg/Logo/Logo.c b/Core/MdeModulePkg/Logo/Logo.c
index 313dd4a793..313dd4a793 100644
--- a/MdeModulePkg/Logo/Logo.c
+++ b/Core/MdeModulePkg/Logo/Logo.c
diff --git a/MdeModulePkg/Logo/Logo.idf b/Core/MdeModulePkg/Logo/Logo.idf
index f4c39b78c4..f4c39b78c4 100644
--- a/MdeModulePkg/Logo/Logo.idf
+++ b/Core/MdeModulePkg/Logo/Logo.idf
diff --git a/MdeModulePkg/Logo/Logo.inf b/Core/MdeModulePkg/Logo/Logo.inf
index e2e61c82c5..e2e61c82c5 100644
--- a/MdeModulePkg/Logo/Logo.inf
+++ b/Core/MdeModulePkg/Logo/Logo.inf
diff --git a/MdeModulePkg/Logo/Logo.uni b/Core/MdeModulePkg/Logo/Logo.uni
index 2566e1842c..2566e1842c 100644
--- a/MdeModulePkg/Logo/Logo.uni
+++ b/Core/MdeModulePkg/Logo/Logo.uni
diff --git a/MdeModulePkg/Logo/LogoDxe.inf b/Core/MdeModulePkg/Logo/LogoDxe.inf
index 28fe74d4d4..28fe74d4d4 100644
--- a/MdeModulePkg/Logo/LogoDxe.inf
+++ b/Core/MdeModulePkg/Logo/LogoDxe.inf
diff --git a/MdeModulePkg/Logo/LogoDxe.uni b/Core/MdeModulePkg/Logo/LogoDxe.uni
index 698776d63d..698776d63d 100644
--- a/MdeModulePkg/Logo/LogoDxe.uni
+++ b/Core/MdeModulePkg/Logo/LogoDxe.uni
diff --git a/MdeModulePkg/Logo/LogoDxeExtra.uni b/Core/MdeModulePkg/Logo/LogoDxeExtra.uni
index 1aead5a496..1aead5a496 100644
--- a/MdeModulePkg/Logo/LogoDxeExtra.uni
+++ b/Core/MdeModulePkg/Logo/LogoDxeExtra.uni
diff --git a/MdeModulePkg/Logo/LogoExtra.uni b/Core/MdeModulePkg/Logo/LogoExtra.uni
index ec22a4d5ff..ec22a4d5ff 100644
--- a/MdeModulePkg/Logo/LogoExtra.uni
+++ b/Core/MdeModulePkg/Logo/LogoExtra.uni
diff --git a/MdeModulePkg/MdeModulePkg.dec b/Core/MdeModulePkg/MdeModulePkg.dec
index ca09cbc109..ca09cbc109 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/Core/MdeModulePkg/MdeModulePkg.dec
diff --git a/MdeModulePkg/MdeModulePkg.dsc b/Core/MdeModulePkg/MdeModulePkg.dsc
index 6ceec92111..6ceec92111 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/Core/MdeModulePkg/MdeModulePkg.dsc
diff --git a/MdeModulePkg/MdeModulePkg.uni b/Core/MdeModulePkg/MdeModulePkg.uni
index d6015de75f..d6015de75f 100644
--- a/MdeModulePkg/MdeModulePkg.uni
+++ b/Core/MdeModulePkg/MdeModulePkg.uni
diff --git a/MdeModulePkg/MdeModulePkgExtra.uni b/Core/MdeModulePkg/MdeModulePkgExtra.uni
index 82efdaf658..82efdaf658 100644
--- a/MdeModulePkg/MdeModulePkgExtra.uni
+++ b/Core/MdeModulePkg/MdeModulePkgExtra.uni
diff --git a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c b/Core/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c
index 44bdd94fa8..44bdd94fa8 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c
+++ b/Core/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c
diff --git a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.uni b/Core/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.uni
index 68b3e48e20..68b3e48e20 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.uni
+++ b/Core/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.uni
diff --git a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf b/Core/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
index 34b1600171..34b1600171 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
+++ b/Core/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
diff --git a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformExtra.uni b/Core/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformExtra.uni
index e976c59983..e976c59983 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformExtra.uni
+++ b/Core/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformExtra.uni
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.c b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.c
index 2b3bb35625..2b3bb35625 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.c
+++ b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.c
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h
index f11bdee9ac..f11bdee9ac 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h
+++ b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.c b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.c
index f39de844e0..f39de844e0 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.c
+++ b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.c
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h
index d6d81ae04d..d6d81ae04d 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h
+++ b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable.h
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
index ffb8d08f98..ffb8d08f98 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
+++ b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.uni b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.uni
index b8d82f30fe..b8d82f30fe 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.uni
+++ b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.uni
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxeExtra.uni b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxeExtra.uni
index ea2b025a9d..ea2b025a9d 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
index 05340f80db..05340f80db 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
+++ b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/Aml.c b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/Aml.c
index 30f71bdda4..30f71bdda4 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/Aml.c
+++ b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/Aml.c
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlChild.c b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlChild.c
index c7e8af96d3..c7e8af96d3 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlChild.c
+++ b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlChild.c
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlNamespace.c b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlNamespace.c
index 03b7394c4d..03b7394c4d 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlNamespace.c
+++ b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlNamespace.c
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlOption.c b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlOption.c
index f4cad10af6..f4cad10af6 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlOption.c
+++ b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlOption.c
diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlString.c b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlString.c
index 9f47b48835..9f47b48835 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlString.c
+++ b/Core/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AmlString.c
diff --git a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.c b/Core/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.c
index 6a7165a954..6a7165a954 100644
--- a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.c
+++ b/Core/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.c
diff --git a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf b/Core/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
index 9fd1da448c..9fd1da448c 100644
--- a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
+++ b/Core/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
diff --git a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.uni b/Core/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.uni
index cda6ae1f60..cda6ae1f60 100644
--- a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.uni
+++ b/Core/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.uni
diff --git a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxeExtra.uni b/Core/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxeExtra.uni
index a64b85725d..a64b85725d 100644
--- a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
index 29af7f55ec..29af7f55ec 100644
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
+++ b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.uni b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.uni
index f362a02b56..f362a02b56 100644
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.uni
+++ b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.uni
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxeExtra.uni b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxeExtra.uni
index 3fd8ad68ef..3fd8ad68ef 100644
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/S3Asm.S b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/S3Asm.S
index 21516d5ad9..21516d5ad9 100644
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/S3Asm.S
+++ b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/S3Asm.S
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/S3Asm.asm b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/S3Asm.asm
index 2fc14a1e28..2fc14a1e28 100644
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/S3Asm.asm
+++ b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/S3Asm.asm
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/S3Asm.nasm b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/S3Asm.nasm
index cedc11a066..cedc11a066 100644
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/S3Asm.nasm
+++ b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/S3Asm.nasm
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/SetIdtEntry.c b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/SetIdtEntry.c
index 63b06ba5d6..63b06ba5d6 100644
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/SetIdtEntry.c
+++ b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/SetIdtEntry.c
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c
index 4545d6e581..4545d6e581 100644
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c
+++ b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.h b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.h
index 75327569d7..75327569d7 100644
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.h
+++ b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.h
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/S3Asm.S b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/S3Asm.S
index e59fd048b0..e59fd048b0 100644
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/S3Asm.S
+++ b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/S3Asm.S
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/S3Asm.asm b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/S3Asm.asm
index 4422f22fe7..4422f22fe7 100644
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/S3Asm.asm
+++ b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/S3Asm.asm
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/S3Asm.nasm b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/S3Asm.nasm
index 403e4c05aa..403e4c05aa 100644
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/S3Asm.nasm
+++ b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/S3Asm.nasm
diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c
index 70eecf5762..70eecf5762 100644
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c
+++ b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
index 6f6ea073aa..6f6ea073aa 100644
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
+++ b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
index 49d8420ba4..49d8420ba4 100644
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
+++ b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.uni b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.uni
index e35fa48e7d..e35fa48e7d 100644
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.uni
+++ b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.uni
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxeExtra.uni b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxeExtra.uni
index 5a6d683a2e..5a6d683a2e 100644
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.c b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.c
index 396462e7aa..396462e7aa 100644
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.c
+++ b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.c
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf
index 25049f8323..25049f8323 100644
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf
+++ b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.uni b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.uni
index 8e718c0c01..8e718c0c01 100644
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.uni
+++ b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.uni
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePeiExtra.uni b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePeiExtra.uni
index 06029482cb..06029482cb 100644
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePeiExtra.uni
+++ b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePeiExtra.uni
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c
index c750331374..c750331374 100644
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c
+++ b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.c
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
index 724e7bcd1d..724e7bcd1d 100644
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
+++ b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.uni b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.uni
index 94f3b8e0fd..94f3b8e0fd 100644
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.uni
+++ b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.uni
diff --git a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmmExtra.uni b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmmExtra.uni
index d96e87f04f..d96e87f04f 100644
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmmExtra.uni
+++ b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmmExtra.uni
diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c b/Core/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c
index 3c05558b23..3c05558b23 100644
--- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c
+++ b/Core/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c
diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/InternalS3SaveState.h b/Core/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/InternalS3SaveState.h
index 2cc638abbc..2cc638abbc 100644
--- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/InternalS3SaveState.h
+++ b/Core/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/InternalS3SaveState.h
diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c b/Core/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
index efc0ef9140..efc0ef9140 100644
--- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
+++ b/Core/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf b/Core/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
index 05e98f40cd..05e98f40cd 100644
--- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
+++ b/Core/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.uni b/Core/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.uni
index 312803e69c..312803e69c 100644
--- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.uni
+++ b/Core/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.uni
diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxeExtra.uni b/Core/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxeExtra.uni
index c648ff8ae7..c648ff8ae7 100644
--- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/InternalSmmSaveState.h b/Core/MdeModulePkg/Universal/Acpi/SmmS3SaveState/InternalSmmSaveState.h
index d6263fd727..d6263fd727 100644
--- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/InternalSmmSaveState.h
+++ b/Core/MdeModulePkg/Universal/Acpi/SmmS3SaveState/InternalSmmSaveState.h
diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c b/Core/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
index 0d1580dc35..0d1580dc35 100644
--- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
+++ b/Core/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.inf b/Core/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.inf
index f1f264ec43..f1f264ec43 100644
--- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.inf
+++ b/Core/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.inf
diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.uni b/Core/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.uni
index 6fbf297333..6fbf297333 100644
--- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.uni
+++ b/Core/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.uni
diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveStateExtra.uni b/Core/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveStateExtra.uni
index 531138b8b6..531138b8b6 100644
--- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveStateExtra.uni
+++ b/Core/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveStateExtra.uni
diff --git a/MdeModulePkg/Universal/BdsDxe/Bds.h b/Core/MdeModulePkg/Universal/BdsDxe/Bds.h
index 1f8a192424..1f8a192424 100644
--- a/MdeModulePkg/Universal/BdsDxe/Bds.h
+++ b/Core/MdeModulePkg/Universal/BdsDxe/Bds.h
diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf b/Core/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
index a00b44276d..a00b44276d 100644
--- a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
+++ b/Core/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxe.uni b/Core/MdeModulePkg/Universal/BdsDxe/BdsDxe.uni
index 6f2758b017..6f2758b017 100644
--- a/MdeModulePkg/Universal/BdsDxe/BdsDxe.uni
+++ b/Core/MdeModulePkg/Universal/BdsDxe/BdsDxe.uni
diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxeExtra.uni b/Core/MdeModulePkg/Universal/BdsDxe/BdsDxeExtra.uni
index e3f1fe82b7..e3f1fe82b7 100644
--- a/MdeModulePkg/Universal/BdsDxe/BdsDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/BdsDxe/BdsDxeExtra.uni
diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c b/Core/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
index b5e6ef61e1..b5e6ef61e1 100644
--- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
+++ b/Core/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
diff --git a/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.c b/Core/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.c
index 87e39c3c8d..87e39c3c8d 100644
--- a/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.c
+++ b/Core/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.c
diff --git a/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.h b/Core/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.h
index 2ac05d5566..2ac05d5566 100644
--- a/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.h
+++ b/Core/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.h
diff --git a/MdeModulePkg/Universal/BdsDxe/Language.c b/Core/MdeModulePkg/Universal/BdsDxe/Language.c
index 09127316fb..09127316fb 100644
--- a/MdeModulePkg/Universal/BdsDxe/Language.c
+++ b/Core/MdeModulePkg/Universal/BdsDxe/Language.c
diff --git a/MdeModulePkg/Universal/BdsDxe/Language.h b/Core/MdeModulePkg/Universal/BdsDxe/Language.h
index 3d5f34f561..3d5f34f561 100644
--- a/MdeModulePkg/Universal/BdsDxe/Language.h
+++ b/Core/MdeModulePkg/Universal/BdsDxe/Language.h
diff --git a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.c b/Core/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.c
index 412ecbda55..412ecbda55 100644
--- a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.c
+++ b/Core/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.c
diff --git a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf b/Core/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf
index 488f421341..488f421341 100644
--- a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf
+++ b/Core/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf
diff --git a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.uni b/Core/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.uni
index 487299c41f..487299c41f 100644
--- a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.uni
+++ b/Core/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.uni
diff --git a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxeExtra.uni b/Core/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxeExtra.uni
index a87e296075..a87e296075 100644
--- a/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxeExtra.uni
diff --git a/MdeModulePkg/Universal/CapsulePei/Capsule.h b/Core/MdeModulePkg/Universal/CapsulePei/Capsule.h
index 3614c21f87..3614c21f87 100644
--- a/MdeModulePkg/Universal/CapsulePei/Capsule.h
+++ b/Core/MdeModulePkg/Universal/CapsulePei/Capsule.h
diff --git a/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf b/Core/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
index c54bc21a95..c54bc21a95 100644
--- a/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
+++ b/Core/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
diff --git a/MdeModulePkg/Universal/CapsulePei/CapsulePei.uni b/Core/MdeModulePkg/Universal/CapsulePei/CapsulePei.uni
index 227a965d19..227a965d19 100644
--- a/MdeModulePkg/Universal/CapsulePei/CapsulePei.uni
+++ b/Core/MdeModulePkg/Universal/CapsulePei/CapsulePei.uni
diff --git a/MdeModulePkg/Universal/CapsulePei/CapsulePeiExtra.uni b/Core/MdeModulePkg/Universal/CapsulePei/CapsulePeiExtra.uni
index d6d3a67d8f..d6d3a67d8f 100644
--- a/MdeModulePkg/Universal/CapsulePei/CapsulePeiExtra.uni
+++ b/Core/MdeModulePkg/Universal/CapsulePei/CapsulePeiExtra.uni
diff --git a/MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf b/Core/MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf
index 8318eaa2d6..8318eaa2d6 100644
--- a/MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf
+++ b/Core/MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf
diff --git a/MdeModulePkg/Universal/CapsulePei/CapsuleX64.uni b/Core/MdeModulePkg/Universal/CapsulePei/CapsuleX64.uni
index 731cf14e59..731cf14e59 100644
--- a/MdeModulePkg/Universal/CapsulePei/CapsuleX64.uni
+++ b/Core/MdeModulePkg/Universal/CapsulePei/CapsuleX64.uni
diff --git a/MdeModulePkg/Universal/CapsulePei/CapsuleX64Extra.uni b/Core/MdeModulePkg/Universal/CapsulePei/CapsuleX64Extra.uni
index 5395ec576c..5395ec576c 100644
--- a/MdeModulePkg/Universal/CapsulePei/CapsuleX64Extra.uni
+++ b/Core/MdeModulePkg/Universal/CapsulePei/CapsuleX64Extra.uni
diff --git a/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c b/Core/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c
index 3e7054cd38..3e7054cd38 100644
--- a/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c
+++ b/Core/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c
diff --git a/MdeModulePkg/Universal/CapsulePei/Common/CommonHeader.h b/Core/MdeModulePkg/Universal/CapsulePei/Common/CommonHeader.h
index cac444204b..cac444204b 100644
--- a/MdeModulePkg/Universal/CapsulePei/Common/CommonHeader.h
+++ b/Core/MdeModulePkg/Universal/CapsulePei/Common/CommonHeader.h
diff --git a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c b/Core/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c
index cca455ec39..cca455ec39 100644
--- a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c
+++ b/Core/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c
diff --git a/MdeModulePkg/Universal/CapsulePei/X64/PageFaultHandler.S b/Core/MdeModulePkg/Universal/CapsulePei/X64/PageFaultHandler.S
index 9e17cc39ee..9e17cc39ee 100644
--- a/MdeModulePkg/Universal/CapsulePei/X64/PageFaultHandler.S
+++ b/Core/MdeModulePkg/Universal/CapsulePei/X64/PageFaultHandler.S
diff --git a/MdeModulePkg/Universal/CapsulePei/X64/PageFaultHandler.asm b/Core/MdeModulePkg/Universal/CapsulePei/X64/PageFaultHandler.asm
index 2f1eab72ef..2f1eab72ef 100644
--- a/MdeModulePkg/Universal/CapsulePei/X64/PageFaultHandler.asm
+++ b/Core/MdeModulePkg/Universal/CapsulePei/X64/PageFaultHandler.asm
diff --git a/MdeModulePkg/Universal/CapsulePei/X64/PageFaultHandler.nasm b/Core/MdeModulePkg/Universal/CapsulePei/X64/PageFaultHandler.nasm
index 91ace09934..91ace09934 100644
--- a/MdeModulePkg/Universal/CapsulePei/X64/PageFaultHandler.nasm
+++ b/Core/MdeModulePkg/Universal/CapsulePei/X64/PageFaultHandler.nasm
diff --git a/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c b/Core/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c
index e1871c3c2a..e1871c3c2a 100644
--- a/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c
+++ b/Core/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c
diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf b/Core/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
index 9ab04ce1b3..9ab04ce1b3 100644
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
+++ b/Core/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.uni b/Core/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.uni
index 8fdf7097a9..8fdf7097a9 100644
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.uni
+++ b/Core/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.uni
diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxeExtra.uni b/Core/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxeExtra.uni
index 50acf088f1..50acf088f1 100644
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxeExtra.uni
diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c b/Core/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c
index 216798d161..216798d161 100644
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c
+++ b/Core/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c
diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/SaveLongModeContext.c b/Core/MdeModulePkg/Universal/CapsuleRuntimeDxe/SaveLongModeContext.c
index 72cea7956b..72cea7956b 100644
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/SaveLongModeContext.c
+++ b/Core/MdeModulePkg/Universal/CapsuleRuntimeDxe/SaveLongModeContext.c
diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c b/Core/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c
index b0512fdf13..b0512fdf13 100644
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c
+++ b/Core/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c
diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c b/Core/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c
index ac74d0bc82..ac74d0bc82 100644
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c b/Core/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c
index 6b53e8ac74..6b53e8ac74 100644
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c
+++ b/Core/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c
diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h b/Core/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h
index 6d853c1360..6d853c1360 100644
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h
+++ b/Core/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h
diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf b/Core/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
index 1d404dfc6f..1d404dfc6f 100644
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
+++ b/Core/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.uni b/Core/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.uni
index e9ad87f456..e9ad87f456 100644
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.uni
+++ b/Core/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.uni
diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxeExtra.uni b/Core/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxeExtra.uni
index 8edad9e12e..8edad9e12e 100644
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c b/Core/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c
index 9ad1726599..9ad1726599 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/Core/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
index b230f5e261..b230f5e261 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
+++ b/Core/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h b/Core/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
index eeea06186f..eeea06186f 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
+++ b/Core/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf b/Core/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
index ff10a50b50..ff10a50b50 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
+++ b/Core/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni b/Core/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni
index 8b0cb0becc..8b0cb0becc 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni
+++ b/Core/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni b/Core/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni
index c05a53970c..c05a53970c 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c b/Core/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
index b7cdd7af39..b7cdd7af39 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
+++ b/Core/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c b/Core/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c
index 13be3a1b67..13be3a1b67 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/Core/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
index 7b1c37b357..7b1c37b357 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
+++ b/Core/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h b/Core/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
index 0db6f04c11..0db6f04c11 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
+++ b/Core/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf b/Core/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
index ccf44979d5..ccf44979d5 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+++ b/Core/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.uni b/Core/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.uni
index 3679352bf8..3679352bf8 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.uni
+++ b/Core/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.uni
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni b/Core/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni
index 9dc3e4e0c3..9dc3e4e0c3 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/LaffStd.c b/Core/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/LaffStd.c
index ef9692df80..ef9692df80 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/LaffStd.c
+++ b/Core/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/LaffStd.c
diff --git a/MdeModulePkg/Universal/Console/GraphicsOutputDxe/ComponentName.c b/Core/MdeModulePkg/Universal/Console/GraphicsOutputDxe/ComponentName.c
index aa19263154..aa19263154 100644
--- a/MdeModulePkg/Universal/Console/GraphicsOutputDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Universal/Console/GraphicsOutputDxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutput.c b/Core/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutput.c
index c6ccfe29c9..c6ccfe29c9 100644
--- a/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutput.c
+++ b/Core/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutput.c
diff --git a/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutput.h b/Core/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutput.h
index fb1ab7e356..fb1ab7e356 100644
--- a/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutput.h
+++ b/Core/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutput.h
diff --git a/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutputDxe.inf b/Core/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutputDxe.inf
index 1a2e720a89..1a2e720a89 100644
--- a/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutputDxe.inf
+++ b/Core/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutputDxe.inf
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Ansi.c b/Core/MdeModulePkg/Universal/Console/TerminalDxe/Ansi.c
index 15147c1f2c..15147c1f2c 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Ansi.c
+++ b/Core/MdeModulePkg/Universal/Console/TerminalDxe/Ansi.c
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c b/Core/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c
index 41812bb04f..41812bb04f 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/Core/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
index 5d55969c96..5d55969c96 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
+++ b/Core/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h b/Core/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
index c15d17cd0b..c15d17cd0b 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
+++ b/Core/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c b/Core/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
index 1392f16670..1392f16670 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
+++ b/Core/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/Core/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
index e677a76e6b..e677a76e6b 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
+++ b/Core/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf b/Core/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
index 0780296798..0780296798 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
+++ b/Core/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.uni b/Core/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.uni
index ffcb418b9f..ffcb418b9f 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.uni
+++ b/Core/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.uni
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxeExtra.uni b/Core/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxeExtra.uni
index e2f494517d..e2f494517d 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Vtutf8.c b/Core/MdeModulePkg/Universal/Console/TerminalDxe/Vtutf8.c
index 586e8ab769..586e8ab769 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Vtutf8.c
+++ b/Core/MdeModulePkg/Universal/Console/TerminalDxe/Vtutf8.c
diff --git a/MdeModulePkg/Universal/DebugPortDxe/ComponentName.c b/Core/MdeModulePkg/Universal/DebugPortDxe/ComponentName.c
index f8eee09b80..f8eee09b80 100644
--- a/MdeModulePkg/Universal/DebugPortDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Universal/DebugPortDxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c b/Core/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c
index dcb623cfeb..dcb623cfeb 100644
--- a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c
+++ b/Core/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c
diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h b/Core/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
index 3ce702dfa4..3ce702dfa4 100644
--- a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
+++ b/Core/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.inf b/Core/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.inf
index b727cda3cf..b727cda3cf 100644
--- a/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.inf
+++ b/Core/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.inf
diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.uni b/Core/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.uni
index 69e310c715..69e310c715 100644
--- a/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.uni
+++ b/Core/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.uni
diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxeExtra.uni b/Core/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxeExtra.uni
index a1f5f32bff..a1f5f32bff 100644
--- a/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxeExtra.uni
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupport.c b/Core/MdeModulePkg/Universal/DebugSupportDxe/DebugSupport.c
index 9a8f86de10..9a8f86de10 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupport.c
+++ b/Core/MdeModulePkg/Universal/DebugSupportDxe/DebugSupport.c
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf b/Core/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf
index 72a5dadb29..72a5dadb29 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf
+++ b/Core/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.uni b/Core/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.uni
index e6bbf1e565..e6bbf1e565 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.uni
+++ b/Core/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.uni
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxeExtra.uni b/Core/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxeExtra.uni
index 9e92374696..9e92374696 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxeExtra.uni
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/AsmFuncs.S b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ia32/AsmFuncs.S
index fd1a96b76f..fd1a96b76f 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/AsmFuncs.S
+++ b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ia32/AsmFuncs.S
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/AsmFuncs.asm b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ia32/AsmFuncs.asm
index 32cbc31654..32cbc31654 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/AsmFuncs.asm
+++ b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ia32/AsmFuncs.asm
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/AsmFuncs.nasm b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ia32/AsmFuncs.nasm
index fc151c272b..fc151c272b 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/AsmFuncs.nasm
+++ b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ia32/AsmFuncs.nasm
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/DebugSupport.h b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ia32/DebugSupport.h
index 7f7d8e5ba6..7f7d8e5ba6 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/DebugSupport.h
+++ b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ia32/DebugSupport.h
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c
index f0c529a41b..f0c529a41b 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c
+++ b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.h b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.h
index 0a1577fab3..0a1577fab3 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.h
+++ b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.h
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c
index 23222737f8..23222737f8 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c
+++ b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/AsmFuncs.s b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ipf/AsmFuncs.s
index db75fc088e..db75fc088e 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/AsmFuncs.s
+++ b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ipf/AsmFuncs.s
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/Common.i b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ipf/Common.i
index a11f780125..a11f780125 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/Common.i
+++ b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ipf/Common.i
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/Ds64Macros.i b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ipf/Ds64Macros.i
index 8ce97f32c2..8ce97f32c2 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/Ds64Macros.i
+++ b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ipf/Ds64Macros.i
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.c b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.c
index 44f59e8ec8..44f59e8ec8 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.c
+++ b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.c
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.h b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.h
index 0cf29cadfb..0cf29cadfb 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.h
+++ b/Core/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.h
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.S b/Core/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.S
index 7f0919ee1b..7f0919ee1b 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.S
+++ b/Core/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.S
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.asm b/Core/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.asm
index bce49ef762..bce49ef762 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.asm
+++ b/Core/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.asm
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.nasm b/Core/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.nasm
index 134842a68a..134842a68a 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.nasm
+++ b/Core/MdeModulePkg/Universal/DebugSupportDxe/X64/AsmFuncs.nasm
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupport.h b/Core/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupport.h
index 044e5d9d07..044e5d9d07 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupport.h
+++ b/Core/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupport.h
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupportX64.c b/Core/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupportX64.c
index fa8869d287..fa8869d287 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupportX64.c
+++ b/Core/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupportX64.c
diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c b/Core/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c
index 70f03bd27a..70f03bd27a 100644
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c
+++ b/Core/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c
diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf b/Core/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
index ba6ed6b6d8..ba6ed6b6d8 100644
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
+++ b/Core/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.uni b/Core/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.uni
index 0f485742f5..0f485742f5 100644
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.uni
+++ b/Core/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.uni
diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxeExtra.uni b/Core/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxeExtra.uni
index 8ac8e3491b..8ac8e3491b 100644
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf b/Core/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
index facad470ef..facad470ef 100644
--- a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
+++ b/Core/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.uni b/Core/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.uni
index 7b17af011c..7b17af011c 100644
--- a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.uni
+++ b/Core/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.uni
diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPeiExtra.uni b/Core/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPeiExtra.uni
index 47244c8813..47244c8813 100644
--- a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPeiExtra.uni
+++ b/Core/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPeiExtra.uni
diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c b/Core/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
index d3cbfaa2b1..d3cbfaa2b1 100644
--- a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
+++ b/Core/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h b/Core/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h
index 1c8843cfc4..1c8843cfc4 100644
--- a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h
+++ b/Core/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h
diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/ComponentName.c b/Core/MdeModulePkg/Universal/Disk/DiskIoDxe/ComponentName.c
index 8c3db5e725..8c3db5e725 100644
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Universal/Disk/DiskIoDxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c b/Core/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c
index b8bde2a25e..b8bde2a25e 100644
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c
+++ b/Core/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c
diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h b/Core/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h
index 7591e469a1..7591e469a1 100644
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h
+++ b/Core/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h
diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf b/Core/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
index cee27d5b11..cee27d5b11 100644
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
+++ b/Core/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.uni b/Core/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.uni
index 88d7debf72..88d7debf72 100644
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.uni
+++ b/Core/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.uni
diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxeExtra.uni b/Core/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxeExtra.uni
index d970e76cca..d970e76cca 100644
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/ComponentName.c b/Core/MdeModulePkg/Universal/Disk/PartitionDxe/ComponentName.c
index c917cd79e6..c917cd79e6 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Universal/Disk/PartitionDxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c b/Core/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
index 2af38429dd..2af38429dd 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
+++ b/Core/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c b/Core/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
index 35860515c1..35860515c1 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
+++ b/Core/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c b/Core/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
index 377fb19319..377fb19319 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
+++ b/Core/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c b/Core/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
index 1c53bf0233..1c53bf0233 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
+++ b/Core/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h b/Core/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h
index 7cb19882cb..7cb19882cb 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h
+++ b/Core/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf b/Core/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
index 680626378f..680626378f 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
+++ b/Core/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.uni b/Core/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.uni
index ef0b6efa64..ef0b6efa64 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.uni
+++ b/Core/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.uni
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxeExtra.uni b/Core/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxeExtra.uni
index 5530042aee..5530042aee 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDisk.asl b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDisk.asl
index 115dca09c0..115dca09c0 100644
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDisk.asl
+++ b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDisk.asl
diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskBlockIo.c b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskBlockIo.c
index f36e1c8ff2..f36e1c8ff2 100644
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskBlockIo.c
+++ b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskBlockIo.c
diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDriver.c b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDriver.c
index b2bafc58bb..b2bafc58bb 100644
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDriver.c
+++ b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDriver.c
diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
index cdd2da6904..cdd2da6904 100644
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
+++ b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.uni b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.uni
index 19ffdbdd8e..19ffdbdd8e 100644
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.uni
+++ b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.uni
diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskFileExplorer.c b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskFileExplorer.c
index 2cfd4bbf6c..2cfd4bbf6c 100644
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskFileExplorer.c
+++ b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskFileExplorer.c
diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskHii.vfr b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskHii.vfr
index 5f3d0fa7df..5f3d0fa7df 100644
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskHii.vfr
+++ b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskHii.vfr
diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskHiiStrings.uni b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskHiiStrings.uni
index 9cc0b08441..9cc0b08441 100644
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskHiiStrings.uni
+++ b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskHiiStrings.uni
diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.c b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.c
index b562bc1025..b562bc1025 100644
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.c
+++ b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.c
diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.h b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.h
index 077bb77b25..077bb77b25 100644
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.h
+++ b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.h
diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskNVData.h b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskNVData.h
index 2c1fd0ee5c..2c1fd0ee5c 100644
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskNVData.h
+++ b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskNVData.h
diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskProtocol.c b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskProtocol.c
index 6784e2b2f1..6784e2b2f1 100644
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskProtocol.c
+++ b/Core/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskProtocol.c
diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf b/Core/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
index 46c834c648..46c834c648 100644
--- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
+++ b/Core/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.uni b/Core/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.uni
index de9a52399e..de9a52399e 100644
--- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.uni
+++ b/Core/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.uni
diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxeExtra.uni b/Core/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxeExtra.uni
index 34e3208c06..34e3208c06 100644
--- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c b/Core/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c
index a37f5c923c..a37f5c923c 100644
--- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c
+++ b/Core/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c
diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h b/Core/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h
index ac6dfc4033..ac6dfc4033 100644
--- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h
+++ b/Core/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h
diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngine.uni b/Core/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngine.uni
index 79868ec776..79868ec776 100644
--- a/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngine.uni
+++ b/Core/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngine.uni
diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf b/Core/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
index bf5e8e541c..bf5e8e541c 100644
--- a/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
+++ b/Core/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineExtra.uni b/Core/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineExtra.uni
index 7d97faf7dd..7d97faf7dd 100644
--- a/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineExtra.uni
+++ b/Core/MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineExtra.uni
diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c b/Core/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
index e1ac5a3223..e1ac5a3223 100644
--- a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
+++ b/Core/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.h b/Core/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.h
index 45532ab126..45532ab126 100644
--- a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.h
+++ b/Core/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.h
diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplayStr.uni b/Core/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplayStr.uni
index bd9c8b407c..bd9c8b407c 100644
--- a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplayStr.uni
+++ b/Core/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplayStr.uni
diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c b/Core/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c
index d02c0bf074..d02c0bf074 100644
--- a/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c
+++ b/Core/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c
diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c b/Core/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c
index 557e8ecd94..557e8ecd94 100644
--- a/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c
+++ b/Core/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c
diff --git a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthConfigureVfr.Vfr b/Core/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthConfigureVfr.Vfr
index 12c8d6063c..12c8d6063c 100644
--- a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthConfigureVfr.Vfr
+++ b/Core/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthConfigureVfr.Vfr
diff --git a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.c b/Core/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.c
index 16b703495a..16b703495a 100644
--- a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.c
+++ b/Core/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.c
diff --git a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.h b/Core/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.h
index 179bc94470..179bc94470 100644
--- a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.h
+++ b/Core/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.h
diff --git a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf b/Core/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
index 482981c143..482981c143 100644
--- a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
+++ b/Core/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
diff --git a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.uni b/Core/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.uni
index 3389ff50ae..3389ff50ae 100644
--- a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.uni
+++ b/Core/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.uni
diff --git a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxeExtra.uni b/Core/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxeExtra.uni
index 740461b6af..740461b6af 100644
--- a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxeExtra.uni
diff --git a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerStrings.uni b/Core/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerStrings.uni
index 3c1a4f0d2a..3c1a4f0d2a 100644
--- a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerStrings.uni
+++ b/Core/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerStrings.uni
diff --git a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerVfr.Vfr b/Core/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerVfr.Vfr
index cfc1cf7f7e..cfc1cf7f7e 100644
--- a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerVfr.Vfr
+++ b/Core/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerVfr.Vfr
diff --git a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerVfr.h b/Core/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerVfr.h
index 61ca04af11..61ca04af11 100644
--- a/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerVfr.h
+++ b/Core/MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerVfr.h
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/Core/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
index f103b9ca21..f103b9ca21 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
+++ b/Core/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h b/Core/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
index 6c97239cf3..6c97239cf3 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
+++ b/Core/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.uni b/Core/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.uni
index 91ee7136a8..91ee7136a8 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.uni
+++ b/Core/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.uni
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf b/Core/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
index 4233e635bc..4233e635bc 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
+++ b/Core/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleExtra.uni b/Core/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleExtra.uni
index 1f34d2d6c2..1f34d2d6c2 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleExtra.uni
+++ b/Core/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleExtra.uni
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr b/Core/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr
index daa2577383..daa2577383 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr
+++ b/Core/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni b/Core/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni
index 01afcd5cae..01afcd5cae 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni
+++ b/Core/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h b/Core/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
index 195cc8ad62..195cc8ad62 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
+++ b/Core/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/Core/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
index 4bdaf765bc..4bdaf765bc 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
+++ b/Core/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni b/Core/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
index 8d24a476f3..8d24a476f3 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
+++ b/Core/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
diff --git a/MdeModulePkg/Universal/EbcDxe/AArch64/EbcLowLevel.S b/Core/MdeModulePkg/Universal/EbcDxe/AArch64/EbcLowLevel.S
index b1f09725ec..b1f09725ec 100644
--- a/MdeModulePkg/Universal/EbcDxe/AArch64/EbcLowLevel.S
+++ b/Core/MdeModulePkg/Universal/EbcDxe/AArch64/EbcLowLevel.S
diff --git a/MdeModulePkg/Universal/EbcDxe/AArch64/EbcSupport.c b/Core/MdeModulePkg/Universal/EbcDxe/AArch64/EbcSupport.c
index 7c13ce12a3..7c13ce12a3 100644
--- a/MdeModulePkg/Universal/EbcDxe/AArch64/EbcSupport.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/AArch64/EbcSupport.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger.inf b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger.inf
index ce413c0b25..ce413c0b25 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger.inf
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger.inf
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger.uni b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger.uni
index 2586274906..2586274906 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger.uni
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger.uni
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EbcDebuggerConfig.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EbcDebuggerConfig.c
index 2a123bfc53..2a123bfc53 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EbcDebuggerConfig.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EbcDebuggerConfig.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/Edb.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/Edb.c
index c002d65871..c002d65871 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/Edb.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/Edb.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/Edb.h b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/Edb.h
index a08b1b03b1..a08b1b03b1 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/Edb.h
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/Edb.h
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdBranch.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdBranch.c
index e47bea1167..e47bea1167 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdBranch.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdBranch.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdBreak.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdBreak.c
index 5759a3b9f9..5759a3b9f9 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdBreak.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdBreak.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdBreakpoint.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdBreakpoint.c
index 090c647720..090c647720 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdBreakpoint.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdBreakpoint.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdExtIo.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdExtIo.c
index a263d23ef6..a263d23ef6 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdExtIo.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdExtIo.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdExtPci.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdExtPci.c
index 07b5e4854a..07b5e4854a 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdExtPci.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdExtPci.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdGo.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdGo.c
index 8c68879863..8c68879863 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdGo.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdGo.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdHelp.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdHelp.c
index 5cbed02f19..5cbed02f19 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdHelp.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdHelp.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdMemory.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdMemory.c
index 3dc6376215..3dc6376215 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdMemory.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdMemory.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdQuit.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdQuit.c
index a2f20dcfb7..a2f20dcfb7 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdQuit.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdQuit.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdRegister.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdRegister.c
index 9e32d18585..9e32d18585 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdRegister.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdRegister.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdScope.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdScope.c
index 49a21bd2d1..49a21bd2d1 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdScope.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdScope.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdStep.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdStep.c
index f4ecf5dd89..f4ecf5dd89 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdStep.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdStep.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c
index 3ca793059f..3ca793059f 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommand.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommand.c
index 67a4905e90..67a4905e90 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommand.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommand.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommand.h b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommand.h
index 141879f433..141879f433 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommand.h
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommand.h
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h
index d452b2bb2e..d452b2bb2e 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasm.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasm.c
index dddf78239c..dddf78239c 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasm.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasm.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasm.h b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasm.h
index a765d14179..a765d14179 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasm.h
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasm.h
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasmSupport.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasmSupport.c
index 26a86548b4..26a86548b4 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasmSupport.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasmSupport.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasmSupport.h b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasmSupport.h
index a95b5834a8..a95b5834a8 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasmSupport.h
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbDisasmSupport.h
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbHook.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbHook.c
index c95a22db4d..c95a22db4d 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbHook.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbHook.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbHook.h b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbHook.h
index 8d8bdc611f..8d8bdc611f 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbHook.h
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbHook.h
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupport.h b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupport.h
index 4df396657c..4df396657c 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupport.h
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupport.h
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupportFile.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupportFile.c
index 6ef7b23be7..6ef7b23be7 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupportFile.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupportFile.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupportString.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupportString.c
index 78a0559079..78a0559079 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupportString.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupportString.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupportUI.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupportUI.c
index 14f8627eb5..14f8627eb5 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupportUI.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupportUI.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c
index 4e640ea0e6..4e640ea0e6 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.h b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.h
index 2e8c5e2f4f..2e8c5e2f4f 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.h
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.h
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebuggerConfig.inf b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebuggerConfig.inf
index 0d931a46f0..0d931a46f0 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebuggerConfig.inf
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebuggerConfig.inf
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebuggerConfig.uni b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebuggerConfig.uni
index 5201b93583..5201b93583 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebuggerConfig.uni
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebuggerConfig.uni
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebuggerConfigExtra.uni b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebuggerConfigExtra.uni
index b3ad472c4c..b3ad472c4c 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebuggerConfigExtra.uni
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebuggerConfigExtra.uni
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebuggerExtra.uni b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebuggerExtra.uni
index 539248d84d..539248d84d 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebuggerExtra.uni
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebuggerExtra.uni
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebuggerHook.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebuggerHook.c
index c5a19342f6..c5a19342f6 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebuggerHook.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebuggerHook.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebuggerHook.h b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebuggerHook.h
index cf81b4ad44..cf81b4ad44 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebuggerHook.h
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDebuggerHook.h
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf b/Core/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
index d11888e25f..d11888e25f 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDxe.uni b/Core/MdeModulePkg/Universal/EbcDxe/EbcDxe.uni
index 9ee429f87a..9ee429f87a 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDxe.uni
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDxe.uni
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDxeExtra.uni b/Core/MdeModulePkg/Universal/EbcDxe/EbcDxeExtra.uni
index ef917c961d..ef917c961d 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcDxeExtra.uni
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
index 2dfed8ecf5..2dfed8ecf5 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.h b/Core/MdeModulePkg/Universal/EbcDxe/EbcExecute.h
index b7489514b9..b7489514b9 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.h
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcExecute.h
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcInt.c b/Core/MdeModulePkg/Universal/EbcDxe/EbcInt.c
index 727ba8bcae..727ba8bcae 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcInt.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcInt.c
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcInt.h b/Core/MdeModulePkg/Universal/EbcDxe/EbcInt.h
index 8aa7a4abbd..8aa7a4abbd 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcInt.h
+++ b/Core/MdeModulePkg/Universal/EbcDxe/EbcInt.h
diff --git a/MdeModulePkg/Universal/EbcDxe/Ia32/EbcLowLevel.S b/Core/MdeModulePkg/Universal/EbcDxe/Ia32/EbcLowLevel.S
index caf8d40ffb..caf8d40ffb 100644
--- a/MdeModulePkg/Universal/EbcDxe/Ia32/EbcLowLevel.S
+++ b/Core/MdeModulePkg/Universal/EbcDxe/Ia32/EbcLowLevel.S
diff --git a/MdeModulePkg/Universal/EbcDxe/Ia32/EbcLowLevel.asm b/Core/MdeModulePkg/Universal/EbcDxe/Ia32/EbcLowLevel.asm
index d5e742399f..d5e742399f 100644
--- a/MdeModulePkg/Universal/EbcDxe/Ia32/EbcLowLevel.asm
+++ b/Core/MdeModulePkg/Universal/EbcDxe/Ia32/EbcLowLevel.asm
diff --git a/MdeModulePkg/Universal/EbcDxe/Ia32/EbcLowLevel.nasm b/Core/MdeModulePkg/Universal/EbcDxe/Ia32/EbcLowLevel.nasm
index 29a101d177..29a101d177 100644
--- a/MdeModulePkg/Universal/EbcDxe/Ia32/EbcLowLevel.nasm
+++ b/Core/MdeModulePkg/Universal/EbcDxe/Ia32/EbcLowLevel.nasm
diff --git a/MdeModulePkg/Universal/EbcDxe/Ia32/EbcSupport.c b/Core/MdeModulePkg/Universal/EbcDxe/Ia32/EbcSupport.c
index a825846f89..a825846f89 100644
--- a/MdeModulePkg/Universal/EbcDxe/Ia32/EbcSupport.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/Ia32/EbcSupport.c
diff --git a/MdeModulePkg/Universal/EbcDxe/Ipf/EbcLowLevel.s b/Core/MdeModulePkg/Universal/EbcDxe/Ipf/EbcLowLevel.s
index 4ae24dee7d..4ae24dee7d 100644
--- a/MdeModulePkg/Universal/EbcDxe/Ipf/EbcLowLevel.s
+++ b/Core/MdeModulePkg/Universal/EbcDxe/Ipf/EbcLowLevel.s
diff --git a/MdeModulePkg/Universal/EbcDxe/Ipf/EbcSupport.c b/Core/MdeModulePkg/Universal/EbcDxe/Ipf/EbcSupport.c
index f99348f181..f99348f181 100644
--- a/MdeModulePkg/Universal/EbcDxe/Ipf/EbcSupport.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/Ipf/EbcSupport.c
diff --git a/MdeModulePkg/Universal/EbcDxe/Ipf/EbcSupport.h b/Core/MdeModulePkg/Universal/EbcDxe/Ipf/EbcSupport.h
index d90ea82ad0..d90ea82ad0 100644
--- a/MdeModulePkg/Universal/EbcDxe/Ipf/EbcSupport.h
+++ b/Core/MdeModulePkg/Universal/EbcDxe/Ipf/EbcSupport.h
diff --git a/MdeModulePkg/Universal/EbcDxe/X64/EbcLowLevel.S b/Core/MdeModulePkg/Universal/EbcDxe/X64/EbcLowLevel.S
index b01486a871..b01486a871 100644
--- a/MdeModulePkg/Universal/EbcDxe/X64/EbcLowLevel.S
+++ b/Core/MdeModulePkg/Universal/EbcDxe/X64/EbcLowLevel.S
diff --git a/MdeModulePkg/Universal/EbcDxe/X64/EbcLowLevel.asm b/Core/MdeModulePkg/Universal/EbcDxe/X64/EbcLowLevel.asm
index 1fbd165be7..1fbd165be7 100644
--- a/MdeModulePkg/Universal/EbcDxe/X64/EbcLowLevel.asm
+++ b/Core/MdeModulePkg/Universal/EbcDxe/X64/EbcLowLevel.asm
diff --git a/MdeModulePkg/Universal/EbcDxe/X64/EbcLowLevel.nasm b/Core/MdeModulePkg/Universal/EbcDxe/X64/EbcLowLevel.nasm
index 19299a7ada..19299a7ada 100644
--- a/MdeModulePkg/Universal/EbcDxe/X64/EbcLowLevel.nasm
+++ b/Core/MdeModulePkg/Universal/EbcDxe/X64/EbcLowLevel.nasm
diff --git a/MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c b/Core/MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c
index 33a174917b..33a174917b 100644
--- a/MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c
+++ b/Core/MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c
diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.c b/Core/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.c
index 16b18e0a54..16b18e0a54 100644
--- a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.c
+++ b/Core/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.c
diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf b/Core/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
index 2c66f15399..2c66f15399 100644
--- a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
+++ b/Core/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.uni b/Core/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.uni
index d47caf3a7e..d47caf3a7e 100644
--- a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.uni
+++ b/Core/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.uni
diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtDxeExtra.uni b/Core/MdeModulePkg/Universal/EsrtDxe/EsrtDxeExtra.uni
index ebd0c3b998..ebd0c3b998 100644
--- a/MdeModulePkg/Universal/EsrtDxe/EsrtDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/EsrtDxe/EsrtDxeExtra.uni
diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.c b/Core/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.c
index 35a237e3cc..35a237e3cc 100644
--- a/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.c
+++ b/Core/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.c
diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h b/Core/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h
index a238dfb8f7..a238dfb8f7 100644
--- a/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h
+++ b/Core/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c
index 49e747b901..49e747b901 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.h b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.h
index be6929c654..be6929c654 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.h
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.h
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.c b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.c
index 3fa5431cab..3fa5431cab 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.c
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.c
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
index 5649241f71..5649241f71 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.uni b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.uni
index e828c227a6..e828c227a6 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.uni
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.uni
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxeExtra.uni b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxeExtra.uni
index 9852e42699..9852e42699 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxeExtra.uni
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c
index 1e75328f9b..1e75328f9b 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
index 3b57c3cf64..3b57c3cf64 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmCommon.h b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmCommon.h
index 061673bce2..061673bce2 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmCommon.h
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmCommon.h
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.c b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.c
index 772d10dcd4..772d10dcd4 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.c
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.c
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.h b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.h
index b4c20aee0f..b4c20aee0f 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.h
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.h
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf
index 82dd36c320..82dd36c320 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.uni b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.uni
index d991eeab69..d991eeab69 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.uni
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.uni
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxeExtra.uni b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxeExtra.uni
index 8abf874098..8abf874098 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxeExtra.uni
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c
index 96044693cc..96044693cc 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/SmmFaultTolerantWriteDxe.uni b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/SmmFaultTolerantWriteDxe.uni
index b91a6594a7..b91a6594a7 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/SmmFaultTolerantWriteDxe.uni
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/SmmFaultTolerantWriteDxe.uni
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/SmmFaultTolerantWriteDxeExtra.uni b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/SmmFaultTolerantWriteDxeExtra.uni
index ad1fcc0e70..ad1fcc0e70 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/SmmFaultTolerantWriteDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/SmmFaultTolerantWriteDxeExtra.uni
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c
index b4327b5619..b4327b5619 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c
diff --git a/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.c b/Core/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.c
index 14e18e5ae2..14e18e5ae2 100644
--- a/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.c
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.c
diff --git a/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf b/Core/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf
index 12b26604e2..12b26604e2 100644
--- a/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf
diff --git a/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.uni b/Core/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.uni
index 49dcc7b2bc..49dcc7b2bc 100644
--- a/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.uni
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.uni
diff --git a/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePeiExtra.uni b/Core/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePeiExtra.uni
index b9fd9425a9..b9fd9425a9 100644
--- a/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePeiExtra.uni
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePeiExtra.uni
diff --git a/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.c b/Core/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.c
index 7a60bbe081..7a60bbe081 100644
--- a/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.c
+++ b/Core/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.c
diff --git a/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.inf b/Core/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.inf
index 86d7533261..86d7533261 100644
--- a/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.inf
+++ b/Core/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.inf
diff --git a/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.uni b/Core/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.uni
index 583bdfed9d..583bdfed9d 100644
--- a/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.uni
+++ b/Core/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxe.uni
diff --git a/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxeExtra.uni b/Core/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxeExtra.uni
index 467dfb85b7..467dfb85b7 100644
--- a/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/FileExplorerDxe/FileExplorerDxeExtra.uni
diff --git a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/ComponentName.c b/Core/MdeModulePkg/Universal/FvSimpleFileSystemDxe/ComponentName.c
index 5ea05975ae..5ea05975ae 100644
--- a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Universal/FvSimpleFileSystemDxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c b/Core/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c
index b81110ff98..b81110ff98 100644
--- a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c
+++ b/Core/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.c
diff --git a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.uni b/Core/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.uni
index 75491148e3..75491148e3 100644
--- a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.uni
+++ b/Core/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystem.uni
diff --git a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf b/Core/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
index a648c2efc8..a648c2efc8 100644
--- a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
+++ b/Core/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
diff --git a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemEntryPoint.c b/Core/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemEntryPoint.c
index 4e6089b057..4e6089b057 100644
--- a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemEntryPoint.c
+++ b/Core/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemEntryPoint.c
diff --git a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemExtra.uni b/Core/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemExtra.uni
index eca54c42d8..eca54c42d8 100644
--- a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemExtra.uni
+++ b/Core/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemExtra.uni
diff --git a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemInternal.h b/Core/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemInternal.h
index 495ba97a59..495ba97a59 100644
--- a/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemInternal.h
+++ b/Core/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemInternal.h
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
index 1b48c1cebe..1b48c1cebe 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
+++ b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index c9ff1cff62..c9ff1cff62 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
index 4fd83f8072..4fd83f8072 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
+++ b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
index b85cf88f54..b85cf88f54 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
+++ b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
index e6760c3d52..e6760c3d52 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
+++ b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.uni b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.uni
index 58f220879b..58f220879b 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.uni
+++ b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.uni
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
index 6bb1d033ba..6bb1d033ba 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
+++ b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseEntry.c b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseEntry.c
index 9d09c60b23..9d09c60b23 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseEntry.c
+++ b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseEntry.c
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseExtra.uni b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseExtra.uni
index d85eef1ee9..d85eef1ee9 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseExtra.uni
+++ b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseExtra.uni
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
index e2fa16e6e0..e2fa16e6e0 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
+++ b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ImageEx.c b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/ImageEx.c
index 33dbc7d5d5..33dbc7d5d5 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ImageEx.c
+++ b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/ImageEx.c
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/String.c b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
index d5a7488a79..d5a7488a79 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
+++ b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.c b/Core/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.c
index adce780e09..adce780e09 100644
--- a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.c
+++ b/Core/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.c
diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.uni b/Core/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.uni
index acef41e282..acef41e282 100644
--- a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.uni
+++ b/Core/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.uni
diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleDxe.inf b/Core/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleDxe.inf
index 51a598cb05..51a598cb05 100644
--- a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleDxe.inf
+++ b/Core/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleDxe.inf
diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleExtra.uni b/Core/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleExtra.uni
index b7c85c1cc5..b7c85c1cc5 100644
--- a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleExtra.uni
+++ b/Core/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleExtra.uni
diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/Sample.vfr b/Core/MdeModulePkg/Universal/HiiResourcesSampleDxe/Sample.vfr
index 3ca20988e8..3ca20988e8 100644
--- a/MdeModulePkg/Universal/HiiResourcesSampleDxe/Sample.vfr
+++ b/Core/MdeModulePkg/Universal/HiiResourcesSampleDxe/Sample.vfr
diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/SampleStrings.uni b/Core/MdeModulePkg/Universal/HiiResourcesSampleDxe/SampleStrings.uni
index f3464b38fe..f3464b38fe 100644
--- a/MdeModulePkg/Universal/HiiResourcesSampleDxe/SampleStrings.uni
+++ b/Core/MdeModulePkg/Universal/HiiResourcesSampleDxe/SampleStrings.uni
diff --git a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.c b/Core/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.c
index a956ea975a..a956ea975a 100644
--- a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.c
+++ b/Core/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.c
diff --git a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.h b/Core/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.h
index be4f85481f..be4f85481f 100644
--- a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.h
+++ b/Core/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2.h
diff --git a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.inf b/Core/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.inf
index 46cd490d8f..46cd490d8f 100644
--- a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.inf
+++ b/Core/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.inf
diff --git a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.uni b/Core/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.uni
index b665bbfc4e..b665bbfc4e 100644
--- a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.uni
+++ b/Core/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.uni
diff --git a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2DxeExtra.uni b/Core/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2DxeExtra.uni
index 22335058d2..22335058d2 100644
--- a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2DxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2DxeExtra.uni
diff --git a/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.c b/Core/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.c
index bd86db50f0..bd86db50f0 100644
--- a/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.c
+++ b/Core/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.c
diff --git a/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.inf b/Core/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.inf
index a4ded94e7f..a4ded94e7f 100644
--- a/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.inf
+++ b/Core/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.inf
diff --git a/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.uni b/Core/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.uni
index 19e42a2830..19e42a2830 100644
--- a/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.uni
+++ b/Core/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.uni
diff --git a/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2Extra.uni b/Core/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2Extra.uni
index aa5eb98400..aa5eb98400 100644
--- a/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2Extra.uni
+++ b/Core/MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2Extra.uni
diff --git a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.c b/Core/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.c
index 2dc8815f2e..2dc8815f2e 100644
--- a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.c
+++ b/Core/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.c
diff --git a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf b/Core/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf
index 772cad9890..772cad9890 100644
--- a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf
+++ b/Core/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf
diff --git a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.uni b/Core/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.uni
index 4e5cce8a42..4e5cce8a42 100644
--- a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.uni
+++ b/Core/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.uni
diff --git a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBoxExtra.uni b/Core/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBoxExtra.uni
index 9c07cb509d..9c07cb509d 100644
--- a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBoxExtra.uni
+++ b/Core/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBoxExtra.uni
diff --git a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.inf b/Core/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.inf
index 975dc4cd3a..975dc4cd3a 100644
--- a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.inf
+++ b/Core/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.inf
diff --git a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.uni b/Core/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.uni
index 1e380c2889..1e380c2889 100644
--- a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.uni
+++ b/Core/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.uni
diff --git a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxeExtra.uni b/Core/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxeExtra.uni
index 2ae0328901..2ae0328901 100644
--- a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxeExtra.uni
diff --git a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c b/Core/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c
index 477c914059..477c914059 100644
--- a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c
+++ b/Core/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c
diff --git a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.h b/Core/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.h
index 391c8a4c81..391c8a4c81 100644
--- a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.h
+++ b/Core/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.h
diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.c b/Core/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.c
index 9c9849c776..9c9849c776 100644
--- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.c
+++ b/Core/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.c
diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h b/Core/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h
index 77c18eb331..77c18eb331 100644
--- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h
+++ b/Core/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h
diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf b/Core/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
index 96770e5b8d..96770e5b8d 100644
--- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
+++ b/Core/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.uni b/Core/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.uni
index e8f6fa6ea9..e8f6fa6ea9 100644
--- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.uni
+++ b/Core/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.uni
diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxeExtra.uni b/Core/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxeExtra.uni
index f0b5372ed8..f0b5372ed8 100644
--- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Metronome/Metronome.c b/Core/MdeModulePkg/Universal/Metronome/Metronome.c
index c3dc0b875a..c3dc0b875a 100644
--- a/MdeModulePkg/Universal/Metronome/Metronome.c
+++ b/Core/MdeModulePkg/Universal/Metronome/Metronome.c
diff --git a/MdeModulePkg/Universal/Metronome/Metronome.h b/Core/MdeModulePkg/Universal/Metronome/Metronome.h
index 3556e6b342..3556e6b342 100644
--- a/MdeModulePkg/Universal/Metronome/Metronome.h
+++ b/Core/MdeModulePkg/Universal/Metronome/Metronome.h
diff --git a/MdeModulePkg/Universal/Metronome/Metronome.inf b/Core/MdeModulePkg/Universal/Metronome/Metronome.inf
index a688f3cc02..a688f3cc02 100644
--- a/MdeModulePkg/Universal/Metronome/Metronome.inf
+++ b/Core/MdeModulePkg/Universal/Metronome/Metronome.inf
diff --git a/MdeModulePkg/Universal/Metronome/Metronome.uni b/Core/MdeModulePkg/Universal/Metronome/Metronome.uni
index 693026d41e..693026d41e 100644
--- a/MdeModulePkg/Universal/Metronome/Metronome.uni
+++ b/Core/MdeModulePkg/Universal/Metronome/Metronome.uni
diff --git a/MdeModulePkg/Universal/Metronome/MetronomeExtra.uni b/Core/MdeModulePkg/Universal/Metronome/MetronomeExtra.uni
index 51b622066d..51b622066d 100644
--- a/MdeModulePkg/Universal/Metronome/MetronomeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Metronome/MetronomeExtra.uni
diff --git a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.c b/Core/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.c
index 2bfede6681..2bfede6681 100644
--- a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.c
+++ b/Core/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.c
diff --git a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf b/Core/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
index e44e268014..e44e268014 100644
--- a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
+++ b/Core/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
diff --git a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.uni b/Core/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.uni
index 04240c8a4a..04240c8a4a 100644
--- a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.uni
+++ b/Core/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.uni
diff --git a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxeExtra.uni b/Core/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxeExtra.uni
index 4865903eb1..4865903eb1 100644
--- a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c b/Core/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c
index 91edcccc0d..91edcccc0d 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c
+++ b/Core/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.h b/Core/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.h
index d5fd3ea5c2..d5fd3ea5c2 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.h
+++ b/Core/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.h
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf b/Core/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
index 9dff604a94..9dff604a94 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
+++ b/Core/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.uni b/Core/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.uni
index 4f02ae151d..4f02ae151d 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.uni
+++ b/Core/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.uni
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxeExtra.uni b/Core/MdeModulePkg/Universal/Network/ArpDxe/ArpDxeExtra.uni
index 9af9fb1ac3..9af9fb1ac3 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Network/ArpDxe/ArpDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c b/Core/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
index a02de203c0..a02de203c0 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
+++ b/Core/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h b/Core/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h
index a5dce7d9a5..a5dce7d9a5 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h
+++ b/Core/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c b/Core/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c
index abe02c1af4..abe02c1af4 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c
+++ b/Core/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c b/Core/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c
index ee47fb1ef7..ee47fb1ef7 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c
index 2ea07608f1..2ea07608f1 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c
+++ b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
index 1f1e21c3cb..1f1e21c3cb 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
+++ b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.h b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.h
index a74cb64488..a74cb64488 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.h
+++ b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.h
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
index 9b6c9c1dcc..9b6c9c1dcc 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
+++ b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.uni b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.uni
index 1684cc592a..1684cc592a 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.uni
+++ b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.uni
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4DxeExtra.uni b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4DxeExtra.uni
index dca59ae452..dca59ae452 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4DxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4DxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
index 1db4c667d7..1db4c667d7 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
+++ b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h
index e546a08f92..e546a08f92 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h
+++ b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
index 3898223af5..3898223af5 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
+++ b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h
index 1e85651554..1e85651554 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h
+++ b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.c b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.c
index 485c9c98ed..485c9c98ed 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.c
+++ b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.c
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.h b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.h
index 02ffa25aba..02ffa25aba 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.h
+++ b/Core/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.h
diff --git a/MdeModulePkg/Universal/Network/DpcDxe/Dpc.c b/Core/MdeModulePkg/Universal/Network/DpcDxe/Dpc.c
index c605f721eb..c605f721eb 100644
--- a/MdeModulePkg/Universal/Network/DpcDxe/Dpc.c
+++ b/Core/MdeModulePkg/Universal/Network/DpcDxe/Dpc.c
diff --git a/MdeModulePkg/Universal/Network/DpcDxe/Dpc.h b/Core/MdeModulePkg/Universal/Network/DpcDxe/Dpc.h
index 443bc3904e..443bc3904e 100644
--- a/MdeModulePkg/Universal/Network/DpcDxe/Dpc.h
+++ b/Core/MdeModulePkg/Universal/Network/DpcDxe/Dpc.h
diff --git a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf b/Core/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
index 8a1f8baf79..8a1f8baf79 100644
--- a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
+++ b/Core/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
diff --git a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.uni b/Core/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.uni
index db33b33b40..db33b33b40 100644
--- a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.uni
+++ b/Core/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.uni
diff --git a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxeExtra.uni b/Core/MdeModulePkg/Universal/Network/DpcDxe/DpcDxeExtra.uni
index 7c57022cb8..7c57022cb8 100644
--- a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Network/DpcDxe/DpcDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c b/Core/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c
index 063b372292..063b372292 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.h b/Core/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.h
index b400abaa41..b400abaa41 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.h
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.h
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4Dxe.uni b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4Dxe.uni
index 80bdc2c7e2..80bdc2c7e2 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4Dxe.uni
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4Dxe.uni
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4DxeExtra.uni b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4DxeExtra.uni
index 9b717d49d3..9b717d49d3 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4DxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4DxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.c b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.c
index 6307684ff0..6307684ff0 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.c
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.c
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h
index f6a64e56da..f6a64e56da 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCommon.h b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCommon.h
index 650c68d53b..650c68d53b 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCommon.h
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCommon.h
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
index ea727af1ff..ea727af1ff 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
index ef881d8827..ef881d8827 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
index 2456c51c8c..2456c51c8c 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni
index 6acf139cd0..6acf139cd0 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
index 7c2e4e65fa..7c2e4e65fa 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
index 869a56a491..869a56a491 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h
index 59f8672719..59f8672719 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
index 5295d346ec..5295d346ec 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h
index 14f640444f..14f640444f 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
index 4fd2a62af9..4fd2a62af9 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c
index e9e37b7e37..e9e37b7e37 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.h b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.h
index e635e47b92..e635e47b92 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.h
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.h
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
index 45d89a6933..45d89a6933 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.h b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.h
index 4f3828db63..4f3828db63 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.h
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.h
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
index 082199c1b7..082199c1b7 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiInitiatorName.c b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiInitiatorName.c
index e753d9eebd..e753d9eebd 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiInitiatorName.c
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiInitiatorName.c
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiInitiatorName.h b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiInitiatorName.h
index f967fb3830..f967fb3830 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiInitiatorName.h
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiInitiatorName.h
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
index ae202c3fe2..ae202c3fe2 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h
index 0ab44d06ae..0ab44d06ae 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
index 14f13f8fce..14f13f8fce 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h
index 48b4e7251f..48b4e7251f 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c
index e73a6dd5f7..e73a6dd5f7 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.h b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.h
index 2b3c0b77d9..2b3c0b77d9 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.h
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.h
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c b/Core/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c
index 5dc7d994d6..5dc7d994d6 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h b/Core/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h
index 8de4e869b4..8de4e869b4 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h
+++ b/Core/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c
index 2ccfb3cc1c..2ccfb3cc1c 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.c b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.c
index 7c7d182073..7c7d182073 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.c
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.h b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.h
index 9689f373cf..9689f373cf 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.h
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2.vfr b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2.vfr
index a18db22846..a18db22846 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2.vfr
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2.vfr
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c
index f4dfbb6e31..f4dfbb6e31 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.h b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.h
index a431f6f732..a431f6f732 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.h
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Impl.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.c b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.c
index c8dc6976d7..c8dc6976d7 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.c
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.h b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.h
index 5a82e6d229..5a82e6d229 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.h
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Config2Nv.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
index 792db5c173..792db5c173 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.h b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.h
index 8c5298b645..8c5298b645 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.h
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
index 313528783d..313528783d 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.uni b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.uni
index e25b0242d6..e25b0242d6 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.uni
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.uni
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeExtra.uni b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeExtra.uni
index 9335e9cfa3..9335e9cfa3 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeStrings.uni b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeStrings.uni
index a491378ab5..a491378ab5 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeStrings.uni
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4DxeStrings.uni
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c
index b4b086496c..b4b086496c 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.h b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.h
index 30199dced6..30199dced6 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.h
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
index 7512a00f4b..7512a00f4b 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h
index 577286360b..577286360b 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c
index e0edc93ff8..e0edc93ff8 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.h b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.h
index 756c697a3a..756c697a3a 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.h
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
index 3cdf8ecaad..3cdf8ecaad 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
index f6b4047941..f6b4047941 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
index 09b8f2bac2..09b8f2bac2 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.h b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.h
index 1c8e8b2a15..1c8e8b2a15 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.h
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4NvData.h b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4NvData.h
index a02b331980..a02b331980 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4NvData.h
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4NvData.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c
index 6a92573275..6a92573275 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.h b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.h
index f9c65d026d..f9c65d026d 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.h
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c
index 68d1f0943f..68d1f0943f 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.h b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.h
index e833352c1b..e833352c1b 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.h
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.h
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.c b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.c
index d240d5343a..d240d5343a 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.c
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.c
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.h b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.h
index 778c97dc8b..778c97dc8b 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.h
+++ b/Core/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.h
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c b/Core/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
index b6f96087ed..b6f96087ed 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.h b/Core/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.h
index 6232c3e1ed..6232c3e1ed 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.h
+++ b/Core/MdeModulePkg/Universal/Network/MnpDxe/ComponentName.h
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c b/Core/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
index d1a4cb5dd2..d1a4cb5dd2 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
+++ b/Core/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c b/Core/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
index 5718e4df24..5718e4df24 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
+++ b/Core/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h b/Core/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h
index f83ff9fa05..f83ff9fa05 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h
+++ b/Core/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf b/Core/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
index 07e62f5ba2..07e62f5ba2 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
+++ b/Core/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.uni b/Core/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.uni
index 645cc1bf36..645cc1bf36 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.uni
+++ b/Core/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.uni
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxeExtra.uni b/Core/MdeModulePkg/Universal/Network/MnpDxe/MnpDxeExtra.uni
index 4cecf1f868..4cecf1f868 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Network/MnpDxe/MnpDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h b/Core/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h
index 51391afe26..51391afe26 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h
+++ b/Core/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c b/Core/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
index ba0f36e710..ba0f36e710 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
+++ b/Core/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c b/Core/MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c
index 31c2e3e5b8..31c2e3e5b8 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c
+++ b/Core/MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpVlan.c b/Core/MdeModulePkg/Universal/Network/MnpDxe/MnpVlan.c
index 98cbc2e35d..98cbc2e35d 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpVlan.c
+++ b/Core/MdeModulePkg/Universal/Network/MnpDxe/MnpVlan.c
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpVlan.h b/Core/MdeModulePkg/Universal/Network/MnpDxe/MnpVlan.h
index d8eac8d07a..d8eac8d07a 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpVlan.h
+++ b/Core/MdeModulePkg/Universal/Network/MnpDxe/MnpVlan.h
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c
index 901c2df064..901c2df064 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c
+++ b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
index a23d405baa..a23d405baa 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
+++ b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h
index 936eab1ba1..936eab1ba1 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h
+++ b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
index 3d7c8c00e0..3d7c8c00e0 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
+++ b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.uni b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.uni
index 74f7ff7fed..74f7ff7fed 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.uni
+++ b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.uni
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4DxeExtra.uni b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4DxeExtra.uni
index 6d69022e70..6d69022e70 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4DxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4DxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
index 5494231166..5494231166 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
+++ b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
index 527fd1db10..527fd1db10 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
+++ b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.c b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.c
index e40561a96b..e40561a96b 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.c
+++ b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.c
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h
index b7fdbf23e1..b7fdbf23e1 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h
+++ b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
index e983d79791..e983d79791 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
+++ b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
index c625fda020..c625fda020 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
+++ b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.h b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.h
index 802e3867db..802e3867db 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.h
+++ b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.h
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
index e825714700..e825714700 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
+++ b/Core/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Callback.c b/Core/MdeModulePkg/Universal/Network/SnpDxe/Callback.c
index 7f35642937..7f35642937 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Callback.c
+++ b/Core/MdeModulePkg/Universal/Network/SnpDxe/Callback.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c b/Core/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
index d8b8184018..d8b8184018 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Universal/Network/SnpDxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Get_status.c b/Core/MdeModulePkg/Universal/Network/SnpDxe/Get_status.c
index 4c3bdae107..4c3bdae107 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Get_status.c
+++ b/Core/MdeModulePkg/Universal/Network/SnpDxe/Get_status.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c b/Core/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c
index 63bdf92f55..63bdf92f55 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c
+++ b/Core/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Mcast_ip_to_mac.c b/Core/MdeModulePkg/Universal/Network/SnpDxe/Mcast_ip_to_mac.c
index 23dba90194..23dba90194 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Mcast_ip_to_mac.c
+++ b/Core/MdeModulePkg/Universal/Network/SnpDxe/Mcast_ip_to_mac.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Nvdata.c b/Core/MdeModulePkg/Universal/Network/SnpDxe/Nvdata.c
index 443979087e..443979087e 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Nvdata.c
+++ b/Core/MdeModulePkg/Universal/Network/SnpDxe/Nvdata.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Receive.c b/Core/MdeModulePkg/Universal/Network/SnpDxe/Receive.c
index ace5630066..ace5630066 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Receive.c
+++ b/Core/MdeModulePkg/Universal/Network/SnpDxe/Receive.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Receive_filters.c b/Core/MdeModulePkg/Universal/Network/SnpDxe/Receive_filters.c
index c37018c826..c37018c826 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Receive_filters.c
+++ b/Core/MdeModulePkg/Universal/Network/SnpDxe/Receive_filters.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Reset.c b/Core/MdeModulePkg/Universal/Network/SnpDxe/Reset.c
index 2381264c11..2381264c11 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Reset.c
+++ b/Core/MdeModulePkg/Universal/Network/SnpDxe/Reset.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Shutdown.c b/Core/MdeModulePkg/Universal/Network/SnpDxe/Shutdown.c
index 1f51992778..1f51992778 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Shutdown.c
+++ b/Core/MdeModulePkg/Universal/Network/SnpDxe/Shutdown.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c b/Core/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
index 9f61aee057..9f61aee057 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
+++ b/Core/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Snp.h b/Core/MdeModulePkg/Universal/Network/SnpDxe/Snp.h
index 9d5ae98e51..9d5ae98e51 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Snp.h
+++ b/Core/MdeModulePkg/Universal/Network/SnpDxe/Snp.h
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf b/Core/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
index 90fd8d5475..90fd8d5475 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
+++ b/Core/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.uni b/Core/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.uni
index cd1e9ba521..cd1e9ba521 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.uni
+++ b/Core/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.uni
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxeExtra.uni b/Core/MdeModulePkg/Universal/Network/SnpDxe/SnpDxeExtra.uni
index 5476a45f4e..5476a45f4e 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Network/SnpDxe/SnpDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Start.c b/Core/MdeModulePkg/Universal/Network/SnpDxe/Start.c
index 210f081078..210f081078 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Start.c
+++ b/Core/MdeModulePkg/Universal/Network/SnpDxe/Start.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Station_address.c b/Core/MdeModulePkg/Universal/Network/SnpDxe/Station_address.c
index 0917baf674..0917baf674 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Station_address.c
+++ b/Core/MdeModulePkg/Universal/Network/SnpDxe/Station_address.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Statistics.c b/Core/MdeModulePkg/Universal/Network/SnpDxe/Statistics.c
index 3e564991e3..3e564991e3 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Statistics.c
+++ b/Core/MdeModulePkg/Universal/Network/SnpDxe/Statistics.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Stop.c b/Core/MdeModulePkg/Universal/Network/SnpDxe/Stop.c
index a52d3b1163..a52d3b1163 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Stop.c
+++ b/Core/MdeModulePkg/Universal/Network/SnpDxe/Stop.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c b/Core/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c
index 73461bce42..73461bce42 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c
+++ b/Core/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/WaitForPacket.c b/Core/MdeModulePkg/Universal/Network/SnpDxe/WaitForPacket.c
index 23d7455fd1..23d7455fd1 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/WaitForPacket.c
+++ b/Core/MdeModulePkg/Universal/Network/SnpDxe/WaitForPacket.c
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c
index bb3a39c5b1..bb3a39c5b1 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c
+++ b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c
index 0476077c20..0476077c20 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c
+++ b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.h b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.h
index bfd750a8ce..bfd750a8ce 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.h
+++ b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.h
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c
index f8b535cf6e..f8b535cf6e 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c
+++ b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h
index 8c25c63b11..8c25c63b11 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h
+++ b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
index 702cae8d65..702cae8d65 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
+++ b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
index 7d84767f5e..7d84767f5e 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
+++ b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.h b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.h
index edaa1a4a81..edaa1a4a81 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.h
+++ b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.h
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
index ba3c377b5f..ba3c377b5f 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
+++ b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.uni b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.uni
index b6d30d9851..b6d30d9851 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.uni
+++ b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.uni
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4DxeExtra.uni b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4DxeExtra.uni
index a3e36b362c..a3e36b362c 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4DxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4DxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Func.h b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Func.h
index 53b7aac8ae..53b7aac8ae 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Func.h
+++ b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Func.h
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
index 1000538f87..1000538f87 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
+++ b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Io.c b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Io.c
index b98d1e783a..b98d1e783a 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Io.c
+++ b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Io.c
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.c b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.c
index 2679f1b8a0..2679f1b8a0 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.c
+++ b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.c
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.h b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.h
index cd904584bf..cd904584bf 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.h
+++ b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.h
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
index 1a7c41aa0b..1a7c41aa0b 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
+++ b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c
index 0da249c3cc..0da249c3cc 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c
+++ b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.h b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.h
index 9676df015d..9676df015d 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.h
+++ b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.h
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c
index 0eec8f07b9..0eec8f07b9 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c
+++ b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h
index 01d6034b13..01d6034b13 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h
+++ b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
index a8e4a933cf..a8e4a933cf 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
+++ b/Core/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c b/Core/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c
index cf311055e2..cf311055e2 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c
+++ b/Core/MdeModulePkg/Universal/Network/Udp4Dxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c b/Core/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c
index 4d179d1b28..4d179d1b28 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c
+++ b/Core/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.h b/Core/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.h
index 88421aa816..88421aa816 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.h
+++ b/Core/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.h
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf b/Core/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
index e1b4898c31..e1b4898c31 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+++ b/Core/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.uni b/Core/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.uni
index 87c235d528..87c235d528 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.uni
+++ b/Core/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.uni
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4DxeExtra.uni b/Core/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4DxeExtra.uni
index 249c4407ef..249c4407ef 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4DxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4DxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c b/Core/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
index df41433a1a..df41433a1a 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
+++ b/Core/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h b/Core/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h
index 31edfbda43..31edfbda43 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h
+++ b/Core/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c b/Core/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c
index d719883925..d719883925 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c
+++ b/Core/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/ComponentName.c b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/ComponentName.c
index f4ef59ce5e..f4ef59ce5e 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
index f0720e5a8c..f0720e5a8c 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
+++ b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h
index d19d2a318f..d19d2a318f 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h
+++ b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
index 76c140d8e3..76c140d8e3 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
+++ b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.h b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.h
index f436c895b4..f436c895b4 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.h
+++ b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.h
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
index 259568edae..259568edae 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
+++ b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h
index 834c0d0089..834c0d0089 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h
+++ b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c
index 8017b73dd7..8017b73dd7 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c
+++ b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.h b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.h
index 241b079d72..241b079d72 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.h
+++ b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.h
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.c b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.c
index 077905671e..077905671e 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.c
+++ b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.c
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h
index 16ac05ec82..16ac05ec82 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h
+++ b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxe.uni b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxe.uni
index 1770b15b6f..1770b15b6f 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxe.uni
+++ b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxe.uni
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxeExtra.uni b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxeExtra.uni
index eb59002e3a..eb59002e3a 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxe4BcDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
index fe8f210467..fe8f210467 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
+++ b/Core/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/ComponentName.c b/Core/MdeModulePkg/Universal/Network/VlanConfigDxe/ComponentName.c
index a5a2f77ce2..a5a2f77ce2 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/ComponentName.c
+++ b/Core/MdeModulePkg/Universal/Network/VlanConfigDxe/ComponentName.c
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfig.vfr b/Core/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfig.vfr
index da3fe015c2..da3fe015c2 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfig.vfr
+++ b/Core/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfig.vfr
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDriver.c b/Core/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDriver.c
index 7dfea2e32a..7dfea2e32a 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDriver.c
+++ b/Core/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDriver.c
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf b/Core/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
index a36c57871e..a36c57871e 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
+++ b/Core/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.uni b/Core/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.uni
index dabec1f1c5..dabec1f1c5 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.uni
+++ b/Core/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.uni
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxeExtra.uni b/Core/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxeExtra.uni
index 1c15b7cedb..1c15b7cedb 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c b/Core/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
index f035706218..f035706218 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
+++ b/Core/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.h b/Core/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.h
index 2aa43b4230..2aa43b4230 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.h
+++ b/Core/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.h
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigNvData.h b/Core/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigNvData.h
index 7dd2fc605b..7dd2fc605b 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigNvData.h
+++ b/Core/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigNvData.h
diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni b/Core/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni
index d7a1769ff4..d7a1769ff4 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni
+++ b/Core/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigStrings.uni
diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c b/Core/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
index 9d710bbf1f..9d710bbf1f 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/Core/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf b/Core/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
index 54cd8d9b9f..54cd8d9b9f 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+++ b/Core/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
diff --git a/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni b/Core/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni
index 922391c3ce..922391c3ce 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni
+++ b/Core/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni
diff --git a/MdeModulePkg/Universal/PCD/Dxe/PcdDxeExtra.uni b/Core/MdeModulePkg/Universal/PCD/Dxe/PcdDxeExtra.uni
index 729312a2d8..729312a2d8 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/PcdDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/PCD/Dxe/PcdDxeExtra.uni
diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.c b/Core/MdeModulePkg/Universal/PCD/Dxe/Service.c
index efe72483c5..efe72483c5 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.c
+++ b/Core/MdeModulePkg/Universal/PCD/Dxe/Service.c
diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.h b/Core/MdeModulePkg/Universal/PCD/Dxe/Service.h
index 0257a3487c..0257a3487c 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.h
+++ b/Core/MdeModulePkg/Universal/PCD/Dxe/Service.h
diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.c b/Core/MdeModulePkg/Universal/PCD/Pei/Pcd.c
index a3f7337cec..a3f7337cec 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/Core/MdeModulePkg/Universal/PCD/Pei/Pcd.c
diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/Core/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
index 1d9c9242d9..1d9c9242d9 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
+++ b/Core/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
diff --git a/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni b/Core/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni
index b0d3f1f79a..b0d3f1f79a 100644
--- a/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni
+++ b/Core/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni
diff --git a/MdeModulePkg/Universal/PCD/Pei/PcdPeimExtra.uni b/Core/MdeModulePkg/Universal/PCD/Pei/PcdPeimExtra.uni
index a618943612..a618943612 100644
--- a/MdeModulePkg/Universal/PCD/Pei/PcdPeimExtra.uni
+++ b/Core/MdeModulePkg/Universal/PCD/Pei/PcdPeimExtra.uni
diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.c b/Core/MdeModulePkg/Universal/PCD/Pei/Service.c
index 5e1cb72ba5..5e1cb72ba5 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Service.c
+++ b/Core/MdeModulePkg/Universal/PCD/Pei/Service.c
diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.h b/Core/MdeModulePkg/Universal/PCD/Pei/Service.h
index fa14abeaa3..fa14abeaa3 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Service.h
+++ b/Core/MdeModulePkg/Universal/PCD/Pei/Service.h
diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf b/Core/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf
index 27bce7b7b7..27bce7b7b7 100644
--- a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf
+++ b/Core/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf
diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.uni b/Core/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.uni
index cf9c4ca190..cf9c4ca190 100644
--- a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.uni
+++ b/Core/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.uni
diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2PeiExtra.uni b/Core/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2PeiExtra.uni
index d19af92778..d19af92778 100644
--- a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2PeiExtra.uni
+++ b/Core/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2PeiExtra.uni
diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c b/Core/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
index ed53e12699..ed53e12699 100644
--- a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
+++ b/Core/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/InternalPlatDriOverrideDxe.h b/Core/MdeModulePkg/Universal/PlatformDriOverrideDxe/InternalPlatDriOverrideDxe.h
index 75af763522..75af763522 100644
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/InternalPlatDriOverrideDxe.h
+++ b/Core/MdeModulePkg/Universal/PlatformDriOverrideDxe/InternalPlatDriOverrideDxe.h
diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c b/Core/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c
index 76c240b73d..76c240b73d 100644
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c
+++ b/Core/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c
diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.uni b/Core/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.uni
index 22d33d313f..22d33d313f 100644
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.uni
+++ b/Core/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.uni
diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxeExtra.uni b/Core/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxeExtra.uni
index 0648a02afd..0648a02afd 100644
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxeExtra.uni
diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideLib.c b/Core/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideLib.c
index 86c34be88d..86c34be88d 100644
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideLib.c
+++ b/Core/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideLib.c
diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatOverMngr.h b/Core/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatOverMngr.h
index ca2094551d..ca2094551d 100644
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatOverMngr.h
+++ b/Core/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatOverMngr.h
diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf b/Core/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf
index 4225fb92c3..4225fb92c3 100644
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf
+++ b/Core/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf
diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr b/Core/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr
index 52240a1f77..52240a1f77 100644
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr
+++ b/Core/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr
diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/VfrStrings.uni b/Core/MdeModulePkg/Universal/PlatformDriOverrideDxe/VfrStrings.uni
index c17208b493..c17208b493 100644
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/VfrStrings.uni
+++ b/Core/MdeModulePkg/Universal/PlatformDriOverrideDxe/VfrStrings.uni
diff --git a/MdeModulePkg/Universal/PrintDxe/Print.c b/Core/MdeModulePkg/Universal/PrintDxe/Print.c
index 80298367b9..80298367b9 100644
--- a/MdeModulePkg/Universal/PrintDxe/Print.c
+++ b/Core/MdeModulePkg/Universal/PrintDxe/Print.c
diff --git a/MdeModulePkg/Universal/PrintDxe/PrintDxe.inf b/Core/MdeModulePkg/Universal/PrintDxe/PrintDxe.inf
index 19eef5a8a8..19eef5a8a8 100644
--- a/MdeModulePkg/Universal/PrintDxe/PrintDxe.inf
+++ b/Core/MdeModulePkg/Universal/PrintDxe/PrintDxe.inf
diff --git a/MdeModulePkg/Universal/PrintDxe/PrintDxe.uni b/Core/MdeModulePkg/Universal/PrintDxe/PrintDxe.uni
index 10f0ff81c5..10f0ff81c5 100644
--- a/MdeModulePkg/Universal/PrintDxe/PrintDxe.uni
+++ b/Core/MdeModulePkg/Universal/PrintDxe/PrintDxe.uni
diff --git a/MdeModulePkg/Universal/PrintDxe/PrintDxeExtra.uni b/Core/MdeModulePkg/Universal/PrintDxe/PrintDxeExtra.uni
index 339fac2a5c..339fac2a5c 100644
--- a/MdeModulePkg/Universal/PrintDxe/PrintDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/PrintDxe/PrintDxeExtra.uni
diff --git a/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxe.c b/Core/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxe.c
index 718c567346..718c567346 100644
--- a/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxe.c
+++ b/Core/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxe.c
diff --git a/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxe.inf b/Core/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxe.inf
index 3f699f6b5a..3f699f6b5a 100644
--- a/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxe.inf
+++ b/Core/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxe.inf
diff --git a/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxe.uni b/Core/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxe.uni
index 9df097f7ce..9df097f7ce 100644
--- a/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxe.uni
+++ b/Core/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxe.uni
diff --git a/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxeExtra.uni b/Core/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxeExtra.uni
index e107e78523..e107e78523 100644
--- a/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxeExtra.uni
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/AUTHORS b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/AUTHORS
index 3b3287e7d4..3b3287e7d4 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/AUTHORS
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/AUTHORS
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/COPYING b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/COPYING
index f3d17ae519..f3d17ae519 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/COPYING
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/COPYING
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaIntrinsics.c b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaIntrinsics.c
index c48522eb56..c48522eb56 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaIntrinsics.c
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaIntrinsics.c
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaUefiPort.c b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaUefiPort.c
index b4a9adfefa..b4a9adfefa 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaUefiPort.c
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaUefiPort.c
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaUefiPort.h b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaUefiPort.h
index d24ac1d880..d24ac1d880 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaUefiPort.h
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaUefiPort.h
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/README b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/README
index 18952eed00..18952eed00 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/README
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/README
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/enc/ascii.c b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/enc/ascii.c
index 25afc980be..25afc980be 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/enc/ascii.c
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/enc/ascii.c
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/enc/unicode.c b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/enc/unicode.c
index 6747b3d839..6747b3d839 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/enc/unicode.c
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/enc/unicode.c
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/enc/utf16_le.c b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/enc/utf16_le.c
index b8685c4393..b8685c4393 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/enc/utf16_le.c
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/enc/utf16_le.c
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/oniggnu.h b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/oniggnu.h
index 7ec8e2e7f1..7ec8e2e7f1 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/oniggnu.h
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/oniggnu.h
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/onigposix.h b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/onigposix.h
index 7c2cad123b..7c2cad123b 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/onigposix.h
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/onigposix.h
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/oniguruma.h b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/oniguruma.h
index 462565aeca..462565aeca 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/oniguruma.h
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/oniguruma.h
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regcomp.c b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regcomp.c
index ea63b09d0c..ea63b09d0c 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regcomp.c
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regcomp.c
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regenc.c b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regenc.c
index ec052627da..ec052627da 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regenc.c
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regenc.c
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regenc.h b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regenc.h
index 1d39f9c054..1d39f9c054 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regenc.h
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regenc.h
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regerror.c b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regerror.c
index 1544e23f10..1544e23f10 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regerror.c
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regerror.c
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c
index a175f3a6cc..a175f3a6cc 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/reggnu.c b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/reggnu.c
index 1b523286ef..1b523286ef 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/reggnu.c
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/reggnu.c
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regint.h b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regint.h
index d5b30898a3..d5b30898a3 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regint.h
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regint.h
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c
index a87fbfc426..a87fbfc426 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.h b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.h
index f1eb892640..f1eb892640 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.h
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.h
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regposerr.c b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regposerr.c
index fb1b9286a2..fb1b9286a2 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regposerr.c
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regposerr.c
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regposix.c b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regposix.c
index 06cad487ae..06cad487ae 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regposix.c
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regposix.c
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regsyntax.c b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regsyntax.c
index dc4d68183b..dc4d68183b 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regsyntax.c
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regsyntax.c
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regtrav.c b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regtrav.c
index fbc71d899f..fbc71d899f 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regtrav.c
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regtrav.c
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regversion.c b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regversion.c
index 2c81244303..2c81244303 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regversion.c
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regversion.c
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/st.c b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/st.c
index 8dcfdc3eb1..8dcfdc3eb1 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/st.c
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/st.c
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/st.h b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/st.h
index a620002449..a620002449 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/st.h
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/st.h
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.c b/Core/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.c
index a5ee7d52fd..a5ee7d52fd 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.c
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.c
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.h b/Core/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.h
index 0defa56e81..0defa56e81 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.h
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.h
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf b/Core/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf
index d4d9a83992..d4d9a83992 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf
+++ b/Core/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.c b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.c
index 8a2dc8a9bd..8a2dc8a9bd 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.c
+++ b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.c
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.h b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.h
index 318a3f5af1..318a3f5af1 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.h
+++ b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.h
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
index a3de382d00..a3de382d00 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
+++ b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.uni b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.uni
index 89497e1fc5..89497e1fc5 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.uni
+++ b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.uni
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPeiExtra.uni b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPeiExtra.uni
index f4cca9a5f5..f4cca9a5f5 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPeiExtra.uni
+++ b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPeiExtra.uni
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.c b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.c
index f859075da6..f859075da6 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.c
+++ b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.c
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.h b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.h
index c82f296f8d..c82f296f8d 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.h
+++ b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.h
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
index 0445d94340..0445d94340 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
+++ b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.uni b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.uni
index e266659e84..e266659e84 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.uni
+++ b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.uni
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxeExtra.uni b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxeExtra.uni
index d16c249412..d16c249412 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxeExtra.uni
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.c b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.c
index 79c8d1e36f..79c8d1e36f 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.c
+++ b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.c
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.h b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.h
index 83f1bed003..83f1bed003 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.h
+++ b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.h
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
index 36c97ef57a..36c97ef57a 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
+++ b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.uni b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.uni
index 45d78cc675..45d78cc675 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.uni
+++ b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.uni
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmmExtra.uni b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmmExtra.uni
index af3dc75523..af3dc75523 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmmExtra.uni
+++ b/Core/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmmExtra.uni
diff --git a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.c b/Core/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.c
index f61e65e151..f61e65e151 100644
--- a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.c
+++ b/Core/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.c
diff --git a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h b/Core/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h
index c3a2a7f127..c3a2a7f127 100644
--- a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h
+++ b/Core/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystem.h
diff --git a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf b/Core/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
index 7ef52b3283..7ef52b3283 100644
--- a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
+++ b/Core/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
diff --git a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.uni b/Core/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.uni
index e55ffd97ef..e55ffd97ef 100644
--- a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.uni
+++ b/Core/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.uni
diff --git a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxeExtra.uni b/Core/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxeExtra.uni
index 32448f24ec..32448f24ec 100644
--- a/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxeExtra.uni
diff --git a/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.c b/Core/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.c
index b100883be6..b100883be6 100644
--- a/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.c
+++ b/Core/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.c
diff --git a/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf b/Core/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf
index 39482fe1b2..39482fe1b2 100644
--- a/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf
+++ b/Core/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf
diff --git a/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.uni b/Core/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.uni
index 9244919d3a..9244919d3a 100644
--- a/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.uni
+++ b/Core/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.uni
diff --git a/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxeExtra.uni b/Core/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxeExtra.uni
index 21aa52a6a0..21aa52a6a0 100644
--- a/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxeExtra.uni
diff --git a/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.c b/Core/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.c
index c4a3508fbd..c4a3508fbd 100644
--- a/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.c
+++ b/Core/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.c
diff --git a/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.inf b/Core/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.inf
index 912031a27b..912031a27b 100644
--- a/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.inf
+++ b/Core/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.inf
diff --git a/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.uni b/Core/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.uni
index be710cec10..be710cec10 100644
--- a/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.uni
+++ b/Core/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.uni
diff --git a/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPeiExtra.uni b/Core/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPeiExtra.uni
index 0c0a944000..0c0a944000 100644
--- a/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPeiExtra.uni
+++ b/Core/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPeiExtra.uni
diff --git a/MdeModulePkg/Universal/SecurityStubDxe/Defer3rdPartyImageLoad.c b/Core/MdeModulePkg/Universal/SecurityStubDxe/Defer3rdPartyImageLoad.c
index 7135a9d87c..7135a9d87c 100644
--- a/MdeModulePkg/Universal/SecurityStubDxe/Defer3rdPartyImageLoad.c
+++ b/Core/MdeModulePkg/Universal/SecurityStubDxe/Defer3rdPartyImageLoad.c
diff --git a/MdeModulePkg/Universal/SecurityStubDxe/Defer3rdPartyImageLoad.h b/Core/MdeModulePkg/Universal/SecurityStubDxe/Defer3rdPartyImageLoad.h
index 75553bad3b..75553bad3b 100644
--- a/MdeModulePkg/Universal/SecurityStubDxe/Defer3rdPartyImageLoad.h
+++ b/Core/MdeModulePkg/Universal/SecurityStubDxe/Defer3rdPartyImageLoad.h
diff --git a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c b/Core/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
index a75d8dc223..a75d8dc223 100644
--- a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
+++ b/Core/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
diff --git a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf b/Core/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
index 7f8f6cbb62..7f8f6cbb62 100644
--- a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
+++ b/Core/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
diff --git a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.uni b/Core/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.uni
index 2050dd6b34..2050dd6b34 100644
--- a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.uni
+++ b/Core/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.uni
diff --git a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxeExtra.uni b/Core/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxeExtra.uni
index dfc807b29b..dfc807b29b 100644
--- a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxeExtra.uni
diff --git a/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf b/Core/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
index a1453bd037..a1453bd037 100644
--- a/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
+++ b/Core/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
diff --git a/MdeModulePkg/Universal/SerialDxe/SerialDxe.uni b/Core/MdeModulePkg/Universal/SerialDxe/SerialDxe.uni
index e2daf27485..e2daf27485 100644
--- a/MdeModulePkg/Universal/SerialDxe/SerialDxe.uni
+++ b/Core/MdeModulePkg/Universal/SerialDxe/SerialDxe.uni
diff --git a/MdeModulePkg/Universal/SerialDxe/SerialDxeExtra.uni b/Core/MdeModulePkg/Universal/SerialDxe/SerialDxeExtra.uni
index 3790487cef..3790487cef 100644
--- a/MdeModulePkg/Universal/SerialDxe/SerialDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/SerialDxe/SerialDxeExtra.uni
diff --git a/MdeModulePkg/Universal/SerialDxe/SerialIo.c b/Core/MdeModulePkg/Universal/SerialDxe/SerialIo.c
index d2383e56dd..d2383e56dd 100644
--- a/MdeModulePkg/Universal/SerialDxe/SerialIo.c
+++ b/Core/MdeModulePkg/Universal/SerialDxe/SerialIo.c
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c b/Core/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
index 901b35c720..901b35c720 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
+++ b/Core/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.h b/Core/MdeModulePkg/Universal/SetupBrowserDxe/Expression.h
index 5660a997b8..5660a997b8 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.h
+++ b/Core/MdeModulePkg/Universal/SetupBrowserDxe/Expression.h
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c b/Core/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
index 6b3e5e098e..6b3e5e098e 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
+++ b/Core/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/Core/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index 08d46cf554..08d46cf554 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/Core/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/Core/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index 83dc2b86c7..83dc2b86c7 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/Core/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/Core/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index f1accdf841..f1accdf841 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/Core/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowser.uni b/Core/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowser.uni
index 4d158360ef..4d158360ef 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowser.uni
+++ b/Core/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowser.uni
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/Core/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
index 012a39bee5..012a39bee5 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+++ b/Core/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserExtra.uni b/Core/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserExtra.uni
index b456e2a54c..b456e2a54c 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserExtra.uni
+++ b/Core/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserExtra.uni
diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c b/Core/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
index 4e757e1c47..4e757e1c47 100644
--- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
+++ b/Core/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.h b/Core/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.h
index 10cff8dd59..10cff8dd59 100644
--- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.h
+++ b/Core/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.h
diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf b/Core/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
index 4fd6b97b42..4fd6b97b42 100644
--- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
+++ b/Core/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.uni b/Core/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.uni
index 6deb93ec00..6deb93ec00 100644
--- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.uni
+++ b/Core/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.uni
diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxeExtra.uni b/Core/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxeExtra.uni
index 94f5ec59a5..94f5ec59a5 100644
--- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxeExtra.uni
diff --git a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.c b/Core/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.c
index bc5e7464e1..bc5e7464e1 100644
--- a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.c
+++ b/Core/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.c
diff --git a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.inf b/Core/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.inf
index c5a779cca7..c5a779cca7 100644
--- a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.inf
+++ b/Core/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.inf
diff --git a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.uni b/Core/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.uni
index 6b6ee92122..6b6ee92122 100644
--- a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.uni
+++ b/Core/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.uni
diff --git a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxeExtra.uni b/Core/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxeExtra.uni
index ed298ad9e6..ed298ad9e6 100644
--- a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxeExtra.uni
diff --git a/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.c b/Core/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.c
index 3ad264b117..3ad264b117 100644
--- a/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.c
+++ b/Core/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.c
diff --git a/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.inf b/Core/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.inf
index 84a2318173..84a2318173 100644
--- a/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.inf
+++ b/Core/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.inf
diff --git a/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.uni b/Core/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.uni
index dfb5579c45..dfb5579c45 100644
--- a/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.uni
+++ b/Core/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.uni
diff --git a/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferExtraDxe.uni b/Core/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferExtraDxe.uni
index 14b3a69bf4..14b3a69bf4 100644
--- a/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferExtraDxe.uni
+++ b/Core/MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferExtraDxe.uni
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/MemoryStausCodeWorker.c b/Core/MdeModulePkg/Universal/StatusCodeHandler/Pei/MemoryStausCodeWorker.c
index bdf1d2700e..bdf1d2700e 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/MemoryStausCodeWorker.c
+++ b/Core/MdeModulePkg/Universal/StatusCodeHandler/Pei/MemoryStausCodeWorker.c
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/SerialStatusCodeWorker.c b/Core/MdeModulePkg/Universal/StatusCodeHandler/Pei/SerialStatusCodeWorker.c
index 1b891b307d..1b891b307d 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/SerialStatusCodeWorker.c
+++ b/Core/MdeModulePkg/Universal/StatusCodeHandler/Pei/SerialStatusCodeWorker.c
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c b/Core/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c
index 368f2056d9..368f2056d9 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c
+++ b/Core/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.h b/Core/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.h
index d2434292ec..d2434292ec 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.h
+++ b/Core/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.h
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf b/Core/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
index 7c4faa360e..7c4faa360e 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
+++ b/Core/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.uni b/Core/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.uni
index caa070218f..caa070218f 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.uni
+++ b/Core/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.uni
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPeiExtra.uni b/Core/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPeiExtra.uni
index 273f09a577..273f09a577 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPeiExtra.uni
+++ b/Core/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPeiExtra.uni
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/MemoryStatusCodeWorker.c b/Core/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/MemoryStatusCodeWorker.c
index a306d7517f..a306d7517f 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/MemoryStatusCodeWorker.c
+++ b/Core/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/MemoryStatusCodeWorker.c
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c b/Core/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c
index 45986fcae3..45986fcae3 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c
+++ b/Core/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c b/Core/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c
index 9149ca4efa..9149ca4efa 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c
+++ b/Core/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.h b/Core/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.h
index a3185f5b52..a3185f5b52 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.h
+++ b/Core/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.h
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf b/Core/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
index 637804f5de..637804f5de 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
+++ b/Core/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.uni b/Core/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.uni
index 6e0141dbc7..6e0141dbc7 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.uni
+++ b/Core/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.uni
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxeExtra.uni b/Core/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxeExtra.uni
index 2093444b50..2093444b50 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxeExtra.uni
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/MemoryStatusCodeWorker.c b/Core/MdeModulePkg/Universal/StatusCodeHandler/Smm/MemoryStatusCodeWorker.c
index 6baf2dd0f2..6baf2dd0f2 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/MemoryStatusCodeWorker.c
+++ b/Core/MdeModulePkg/Universal/StatusCodeHandler/Smm/MemoryStatusCodeWorker.c
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c b/Core/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c
index 8f2fbf4f7a..8f2fbf4f7a 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c
+++ b/Core/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.c b/Core/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.c
index 5e84ea43da..5e84ea43da 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.c
+++ b/Core/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.c
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.h b/Core/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.h
index 1a374c2ead..1a374c2ead 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.h
+++ b/Core/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.h
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf b/Core/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
index 7b5073546e..7b5073546e 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
+++ b/Core/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.uni b/Core/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.uni
index 693d0d11ea..693d0d11ea 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.uni
+++ b/Core/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.uni
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmmExtra.uni b/Core/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmmExtra.uni
index 05422d5ee5..05422d5ee5 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmmExtra.uni
+++ b/Core/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmmExtra.uni
diff --git a/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.c b/Core/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.c
index 30349b5ec5..30349b5ec5 100644
--- a/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.c
+++ b/Core/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.c
diff --git a/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.inf b/Core/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.inf
index f71d5262ea..f71d5262ea 100644
--- a/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.inf
+++ b/Core/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.inf
diff --git a/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.uni b/Core/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.uni
index 7e5f2a2988..7e5f2a2988 100644
--- a/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.uni
+++ b/Core/MdeModulePkg/Universal/TimestampDxe/TimestampDxe.uni
diff --git a/MdeModulePkg/Universal/TimestampDxe/TimestampDxeExtra.uni b/Core/MdeModulePkg/Universal/TimestampDxe/TimestampDxeExtra.uni
index aba52deb8d..aba52deb8d 100644
--- a/MdeModulePkg/Universal/TimestampDxe/TimestampDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/TimestampDxe/TimestampDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c b/Core/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
index 27ea1496a0..27ea1496a0 100644
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
+++ b/Core/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf b/Core/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
index 0dafddee55..0dafddee55 100644
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
+++ b/Core/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.uni b/Core/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.uni
index 6ad6018121..6ad6018121 100644
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.uni
+++ b/Core/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.uni
diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxeExtra.uni b/Core/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxeExtra.uni
index c3bbd2bf7b..c3bbd2bf7b 100644
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/InitVariable.c b/Core/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/InitVariable.c
index 1feedc07c3..1feedc07c3 100644
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/InitVariable.c
+++ b/Core/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/InitVariable.c
diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h b/Core/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
index 81a45681a2..81a45681a2 100644
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
+++ b/Core/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
diff --git a/MdeModulePkg/Universal/Variable/Pei/PeiVariable.uni b/Core/MdeModulePkg/Universal/Variable/Pei/PeiVariable.uni
index 65ca7d02db..65ca7d02db 100644
--- a/MdeModulePkg/Universal/Variable/Pei/PeiVariable.uni
+++ b/Core/MdeModulePkg/Universal/Variable/Pei/PeiVariable.uni
diff --git a/MdeModulePkg/Universal/Variable/Pei/PeiVariableExtra.uni b/Core/MdeModulePkg/Universal/Variable/Pei/PeiVariableExtra.uni
index 8b967d4e8f..8b967d4e8f 100644
--- a/MdeModulePkg/Universal/Variable/Pei/PeiVariableExtra.uni
+++ b/Core/MdeModulePkg/Universal/Variable/Pei/PeiVariableExtra.uni
diff --git a/MdeModulePkg/Universal/Variable/Pei/Variable.c b/Core/MdeModulePkg/Universal/Variable/Pei/Variable.c
index a072c31e60..a072c31e60 100644
--- a/MdeModulePkg/Universal/Variable/Pei/Variable.c
+++ b/Core/MdeModulePkg/Universal/Variable/Pei/Variable.c
diff --git a/MdeModulePkg/Universal/Variable/Pei/Variable.h b/Core/MdeModulePkg/Universal/Variable/Pei/Variable.h
index 580d69fb42..580d69fb42 100644
--- a/MdeModulePkg/Universal/Variable/Pei/Variable.h
+++ b/Core/MdeModulePkg/Universal/Variable/Pei/Variable.h
diff --git a/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf b/Core/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
index 72a440dcd1..72a440dcd1 100644
--- a/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
+++ b/Core/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Measurement.c b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/Measurement.c
index 936b5b00a3..936b5b00a3 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Measurement.c
+++ b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/Measurement.c
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Reclaim.c b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/Reclaim.c
index 616812ccd8..616812ccd8 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Reclaim.c
+++ b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/Reclaim.c
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockDxe.c b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockDxe.c
index c32eb3b1ac..c32eb3b1ac 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockDxe.c
+++ b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockDxe.c
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockSmm.c b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockSmm.c
index d06317ca9c..d06317ca9c 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockSmm.c
+++ b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockSmm.c
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VarCheck.c b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VarCheck.c
index ad56a9f5be..ad56a9f5be 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VarCheck.c
+++ b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VarCheck.c
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index 0a325de165..0a325de165 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
index 55df13191b..55df13191b 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
+++ b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c
index fe1b2b588c..fe1b2b588c 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c
+++ b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableExLib.c b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableExLib.c
index 615b4cec28..615b4cec28 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableExLib.c
+++ b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableExLib.c
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
index bc24a251c8..bc24a251c8 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
+++ b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.uni b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.uni
index d01df96eb7..d01df96eb7 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.uni
+++ b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.uni
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxeExtra.uni b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxeExtra.uni
index 2d8eaf2669..2d8eaf2669 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxeExtra.uni
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c
index 2184634f35..2184634f35 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c
+++ b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf
index ccfb6fc740..ccfb6fc740 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf
+++ b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.uni b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.uni
index cb82cda33e..cb82cda33e 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.uni
+++ b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.uni
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmExtra.uni b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmExtra.uni
index 0de8776086..0de8776086 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmExtra.uni
+++ b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmExtra.uni
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.c b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.c
index e209d54755..e209d54755 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.c
+++ b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.c
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
index 9975f5ae1d..9975f5ae1d 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
+++ b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.uni b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.uni
index b5a6bd1eec..b5a6bd1eec 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.uni
+++ b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.uni
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxeExtra.uni b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxeExtra.uni
index 674e201e88..674e201e88 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxeExtra.uni
diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c b/Core/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
index 6dedfbf702..6dedfbf702 100644
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
+++ b/Core/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h b/Core/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h
index e7bb0b2bfd..e7bb0b2bfd 100644
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h
+++ b/Core/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h
diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf b/Core/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
index bde84574b9..bde84574b9 100644
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
+++ b/Core/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.uni b/Core/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.uni
index 6f3d86bb04..6f3d86bb04 100644
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.uni
+++ b/Core/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.uni
diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimerExtra.uni b/Core/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimerExtra.uni
index 1d83d5ed25..1d83d5ed25 100644
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimerExtra.uni
+++ b/Core/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimerExtra.uni
author	Guo Mang <mang.guo@intel.com>	2017-04-27 11:05:07 +0800
committer	Guo Mang <mang.guo@intel.com>	2017-04-27 11:05:07 +0800
commit	c23f114d3cfbb29b8734b87213d1ec0de404197b (patch)
tree	4f3612573be055139a88213559212a40b7862fee
parent	001e57a103fce87245bfb7ae9c32ffb499a64135 (diff)
download	edk2-platforms-c23f114d3cfbb29b8734b87213d1ec0de404197b.tar.xz