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> 2016-12-22 15:55:38 +0800
committer: Guo Mang <mang.guo@intel.com> 2016-12-26 19:14:37 +0800
commit: 7f05fa00f73038b425002566d3afe6c3ade2ccdb (patch)
tree: 297e208d4ade33a8bb3d5d20f72c53e0d134e003
parent: ed2ecce34b3830562c4239093a41ba92d76d5f31 (diff)
download: edk2-platforms-7f05fa00f73038b425002566d3afe6c3ade2ccdb.tar.xz
1441 files changed, 0 insertions, 0 deletions
diff --git a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c b/Core/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c
index be1341061e..be1341061e 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 a93c11cb5e..a93c11cb5e 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 f26cc6b249..f26cc6b249 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 04fdd30fa7..04fdd30fa7 100644
--- a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuStrings.uni
+++ b/Core/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuStrings.uni
diff --git a/MdeModulePkg/Application/HelloWorld/HelloWorld.c b/Core/MdeModulePkg/Application/HelloWorld/HelloWorld.c
index 1821b2dd76..1821b2dd76 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 6514ef32ec..6514ef32ec 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 c24be4c135..c24be4c135 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 c9ef65c371..c9ef65c371 100644
--- a/MdeModulePkg/Application/HelloWorld/HelloWorldExtra.uni
+++ b/Core/MdeModulePkg/Application/HelloWorld/HelloWorldExtra.uni
diff --git a/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfo.c b/Core/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfo.c
index ea2a00bd83..ea2a00bd83 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 a1bc6752f0..a1bc6752f0 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 fe4882605d..fe4882605d 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 32905119ec..32905119ec 100644
--- a/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfoExtra.uni
+++ b/Core/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfoExtra.uni
diff --git a/MdeModulePkg/Application/UiApp/BootMaint/Bm.vfr b/Core/MdeModulePkg/Application/UiApp/BootMaint/Bm.vfr
index de1ffba9cb..de1ffba9cb 100644
--- a/MdeModulePkg/Application/UiApp/BootMaint/Bm.vfr
+++ b/Core/MdeModulePkg/Application/UiApp/BootMaint/Bm.vfr
diff --git a/MdeModulePkg/Application/UiApp/BootMaint/BmLib.c b/Core/MdeModulePkg/Application/UiApp/BootMaint/BmLib.c
index 82f677de63..82f677de63 100644
--- a/MdeModulePkg/Application/UiApp/BootMaint/BmLib.c
+++ b/Core/MdeModulePkg/Application/UiApp/BootMaint/BmLib.c
diff --git a/MdeModulePkg/Application/UiApp/BootMaint/Bmstring.uni b/Core/MdeModulePkg/Application/UiApp/BootMaint/Bmstring.uni
index f91d599289..f91d599289 100644
--- a/MdeModulePkg/Application/UiApp/BootMaint/Bmstring.uni
+++ b/Core/MdeModulePkg/Application/UiApp/BootMaint/Bmstring.uni
diff --git a/MdeModulePkg/Application/UiApp/BootMaint/BootMaint.c b/Core/MdeModulePkg/Application/UiApp/BootMaint/BootMaint.c
index 98c46668f1..98c46668f1 100644
--- a/MdeModulePkg/Application/UiApp/BootMaint/BootMaint.c
+++ b/Core/MdeModulePkg/Application/UiApp/BootMaint/BootMaint.c
diff --git a/MdeModulePkg/Application/UiApp/BootMaint/BootMaint.h b/Core/MdeModulePkg/Application/UiApp/BootMaint/BootMaint.h
index 23d2d2b6d1..23d2d2b6d1 100644
--- a/MdeModulePkg/Application/UiApp/BootMaint/BootMaint.h
+++ b/Core/MdeModulePkg/Application/UiApp/BootMaint/BootMaint.h
diff --git a/MdeModulePkg/Application/UiApp/BootMaint/BootOption.c b/Core/MdeModulePkg/Application/UiApp/BootMaint/BootOption.c
index 5213e3cc98..5213e3cc98 100644
--- a/MdeModulePkg/Application/UiApp/BootMaint/BootOption.c
+++ b/Core/MdeModulePkg/Application/UiApp/BootMaint/BootOption.c
diff --git a/MdeModulePkg/Application/UiApp/BootMaint/ConsoleOption.c b/Core/MdeModulePkg/Application/UiApp/BootMaint/ConsoleOption.c
index 58ce8b7f3a..58ce8b7f3a 100644
--- a/MdeModulePkg/Application/UiApp/BootMaint/ConsoleOption.c
+++ b/Core/MdeModulePkg/Application/UiApp/BootMaint/ConsoleOption.c
diff --git a/MdeModulePkg/Application/UiApp/BootMaint/Data.c b/Core/MdeModulePkg/Application/UiApp/BootMaint/Data.c
index 4f05ac5fcc..4f05ac5fcc 100644
--- a/MdeModulePkg/Application/UiApp/BootMaint/Data.c
+++ b/Core/MdeModulePkg/Application/UiApp/BootMaint/Data.c
diff --git a/MdeModulePkg/Application/UiApp/BootMaint/FE.vfr b/Core/MdeModulePkg/Application/UiApp/BootMaint/FE.vfr
index 1401d21721..1401d21721 100644
--- a/MdeModulePkg/Application/UiApp/BootMaint/FE.vfr
+++ b/Core/MdeModulePkg/Application/UiApp/BootMaint/FE.vfr
diff --git a/MdeModulePkg/Application/UiApp/BootMaint/FileExplorer.c b/Core/MdeModulePkg/Application/UiApp/BootMaint/FileExplorer.c
index e4a68ef274..e4a68ef274 100644
--- a/MdeModulePkg/Application/UiApp/BootMaint/FileExplorer.c
+++ b/Core/MdeModulePkg/Application/UiApp/BootMaint/FileExplorer.c
diff --git a/MdeModulePkg/Application/UiApp/BootMaint/FormGuid.h b/Core/MdeModulePkg/Application/UiApp/BootMaint/FormGuid.h
index 257c1fdde7..257c1fdde7 100644
--- a/MdeModulePkg/Application/UiApp/BootMaint/FormGuid.h
+++ b/Core/MdeModulePkg/Application/UiApp/BootMaint/FormGuid.h
diff --git a/MdeModulePkg/Application/UiApp/BootMaint/UpdatePage.c b/Core/MdeModulePkg/Application/UiApp/BootMaint/UpdatePage.c
index 73f451c43c..73f451c43c 100644
--- a/MdeModulePkg/Application/UiApp/BootMaint/UpdatePage.c
+++ b/Core/MdeModulePkg/Application/UiApp/BootMaint/UpdatePage.c
diff --git a/MdeModulePkg/Application/UiApp/BootMaint/Variable.c b/Core/MdeModulePkg/Application/UiApp/BootMaint/Variable.c
index a8d9cd5efb..a8d9cd5efb 100644
--- a/MdeModulePkg/Application/UiApp/BootMaint/Variable.c
+++ b/Core/MdeModulePkg/Application/UiApp/BootMaint/Variable.c
diff --git a/MdeModulePkg/Application/UiApp/BootMngr/BootManager.c b/Core/MdeModulePkg/Application/UiApp/BootMngr/BootManager.c
index 4390deef24..4390deef24 100644
--- a/MdeModulePkg/Application/UiApp/BootMngr/BootManager.c
+++ b/Core/MdeModulePkg/Application/UiApp/BootMngr/BootManager.c
diff --git a/MdeModulePkg/Application/UiApp/BootMngr/BootManager.h b/Core/MdeModulePkg/Application/UiApp/BootMngr/BootManager.h
index a85973ed24..a85973ed24 100644
--- a/MdeModulePkg/Application/UiApp/BootMngr/BootManager.h
+++ b/Core/MdeModulePkg/Application/UiApp/BootMngr/BootManager.h
diff --git a/MdeModulePkg/Application/UiApp/BootMngr/BootManagerStrings.uni b/Core/MdeModulePkg/Application/UiApp/BootMngr/BootManagerStrings.uni
index 013c15176a..013c15176a 100644
--- a/MdeModulePkg/Application/UiApp/BootMngr/BootManagerStrings.uni
+++ b/Core/MdeModulePkg/Application/UiApp/BootMngr/BootManagerStrings.uni
diff --git a/MdeModulePkg/Application/UiApp/BootMngr/BootManagerVfr.Vfr b/Core/MdeModulePkg/Application/UiApp/BootMngr/BootManagerVfr.Vfr
index a5465f4226..a5465f4226 100644
--- a/MdeModulePkg/Application/UiApp/BootMngr/BootManagerVfr.Vfr
+++ b/Core/MdeModulePkg/Application/UiApp/BootMngr/BootManagerVfr.Vfr
diff --git a/MdeModulePkg/Application/UiApp/DeviceMngr/DeviceManager.c b/Core/MdeModulePkg/Application/UiApp/DeviceMngr/DeviceManager.c
index 18b2bd7e99..18b2bd7e99 100644
--- a/MdeModulePkg/Application/UiApp/DeviceMngr/DeviceManager.c
+++ b/Core/MdeModulePkg/Application/UiApp/DeviceMngr/DeviceManager.c
diff --git a/MdeModulePkg/Application/UiApp/DeviceMngr/DeviceManager.h b/Core/MdeModulePkg/Application/UiApp/DeviceMngr/DeviceManager.h
index 9c1c34160a..9c1c34160a 100644
--- a/MdeModulePkg/Application/UiApp/DeviceMngr/DeviceManager.h
+++ b/Core/MdeModulePkg/Application/UiApp/DeviceMngr/DeviceManager.h
diff --git a/MdeModulePkg/Application/UiApp/DeviceMngr/DeviceManagerStrings.uni b/Core/MdeModulePkg/Application/UiApp/DeviceMngr/DeviceManagerStrings.uni
index 551df81736..551df81736 100644
--- a/MdeModulePkg/Application/UiApp/DeviceMngr/DeviceManagerStrings.uni
+++ b/Core/MdeModulePkg/Application/UiApp/DeviceMngr/DeviceManagerStrings.uni
diff --git a/MdeModulePkg/Application/UiApp/DeviceMngr/DeviceManagerVfr.Vfr b/Core/MdeModulePkg/Application/UiApp/DeviceMngr/DeviceManagerVfr.Vfr
index 2c575f56b0..2c575f56b0 100644
--- a/MdeModulePkg/Application/UiApp/DeviceMngr/DeviceManagerVfr.Vfr
+++ b/Core/MdeModulePkg/Application/UiApp/DeviceMngr/DeviceManagerVfr.Vfr
diff --git a/MdeModulePkg/Application/UiApp/DeviceMngr/DriverHealthVfr.Vfr b/Core/MdeModulePkg/Application/UiApp/DeviceMngr/DriverHealthVfr.Vfr
index aa540563e7..aa540563e7 100644
--- a/MdeModulePkg/Application/UiApp/DeviceMngr/DriverHealthVfr.Vfr
+++ b/Core/MdeModulePkg/Application/UiApp/DeviceMngr/DriverHealthVfr.Vfr
diff --git a/MdeModulePkg/Application/UiApp/FormsetGuid.h b/Core/MdeModulePkg/Application/UiApp/FormsetGuid.h
index 68a5a3f481..68a5a3f481 100644
--- a/MdeModulePkg/Application/UiApp/FormsetGuid.h
+++ b/Core/MdeModulePkg/Application/UiApp/FormsetGuid.h
diff --git a/MdeModulePkg/Application/UiApp/FrontPage.c b/Core/MdeModulePkg/Application/UiApp/FrontPage.c
index 906c5900de..906c5900de 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 52545d63c4..52545d63c4 100644
--- a/MdeModulePkg/Application/UiApp/FrontPage.h
+++ b/Core/MdeModulePkg/Application/UiApp/FrontPage.h
diff --git a/MdeModulePkg/Application/UiApp/FrontPageStrings.uni b/Core/MdeModulePkg/Application/UiApp/FrontPageStrings.uni
index 37df7afc8e..37df7afc8e 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 82d241024b..82d241024b 100644
--- a/MdeModulePkg/Application/UiApp/FrontPageVfr.Vfr
+++ b/Core/MdeModulePkg/Application/UiApp/FrontPageVfr.Vfr
diff --git a/MdeModulePkg/Application/UiApp/Language.c b/Core/MdeModulePkg/Application/UiApp/Language.c
index df7a0b3561..df7a0b3561 100644
--- a/MdeModulePkg/Application/UiApp/Language.c
+++ b/Core/MdeModulePkg/Application/UiApp/Language.c
diff --git a/MdeModulePkg/Application/UiApp/Language.h b/Core/MdeModulePkg/Application/UiApp/Language.h
index 274de5ce2f..274de5ce2f 100644
--- a/MdeModulePkg/Application/UiApp/Language.h
+++ b/Core/MdeModulePkg/Application/UiApp/Language.h
diff --git a/MdeModulePkg/Application/UiApp/String.c b/Core/MdeModulePkg/Application/UiApp/String.c
index 7884ae3fce..7884ae3fce 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 b8cb8762ec..b8cb8762ec 100644
--- a/MdeModulePkg/Application/UiApp/String.h
+++ b/Core/MdeModulePkg/Application/UiApp/String.h
diff --git a/MdeModulePkg/Application/UiApp/Strings.uni b/Core/MdeModulePkg/Application/UiApp/Strings.uni
index c1994d7b59..c1994d7b59 100644
--- a/MdeModulePkg/Application/UiApp/Strings.uni
+++ b/Core/MdeModulePkg/Application/UiApp/Strings.uni
diff --git a/MdeModulePkg/Application/UiApp/Ui.h b/Core/MdeModulePkg/Application/UiApp/Ui.h
index 8159878007..8159878007 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 9553c7bab5..9553c7bab5 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 020fb2d9e4..020fb2d9e4 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 f2337ecbc5..f2337ecbc5 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 138a6fed4d..138a6fed4d 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 f23f161062..f23f161062 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 4d1b5848a5..4d1b5848a5 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 870900f106..870900f106 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 6f3407c01a..6f3407c01a 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 0285409ec5..0285409ec5 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 d89350dfe3..d89350dfe3 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 420ad273dc..420ad273dc 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 e7449f9714..e7449f9714 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 45a8be7713..45a8be7713 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 269bbf9780..269bbf9780 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 a3008f92d9..a3008f92d9 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 f0a1f5e650..f0a1f5e650 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 13381e6282..13381e6282 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 03f9776d1f..03f9776d1f 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 9496661f9e..9496661f9e 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 a5a804303a..a5a804303a 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 d1f60d4f09..d1f60d4f09 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 7067c6e6f0..7067c6e6f0 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 5025c25300..5025c25300 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 44354a0f99..44354a0f99 100644
--- a/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxeExtra.uni
+++ b/Core/MdeModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxeExtra.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 4e9e05f0e4..4e9e05f0e4 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 7177658092..7177658092 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 0ddb7ab705..0ddb7ab705 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 0039424c15..0039424c15 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 88a66aee71..88a66aee71 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 5594e6699e..5594e6699e 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 28be3803f1..28be3803f1 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 09769eaf24..09769eaf24 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 74037769a4..74037769a4 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 c0f6890275..c0f6890275 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 3f5163896d..3f5163896d 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 6b3755852b..6b3755852b 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 be1b829200..be1b829200 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 75ab58e15d..75ab58e15d 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 ec4663cf91..ec4663cf91 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 3d581b69fd..3d581b69fd 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 46732f797a..46732f797a 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 0a3aaac3da..0a3aaac3da 100644
--- a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportExtra.uni
+++ b/Core/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupportExtra.uni
diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/ComponentName.c b/Core/MdeModulePkg/Bus/Pci/NvmExpressDxe/ComponentName.c
index 60849aea03..60849aea03 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 9938bf4541..9938bf4541 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 21c6255caa..21c6255caa 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 6cb2f92e8d..6cb2f92e8d 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 1c71a81ec5..1c71a81ec5 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 00acf2b5cf..00acf2b5cf 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 36fbc2acfe..36fbc2acfe 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 2f8bf5922d..2f8bf5922d 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 f6b6288f65..f6b6288f65 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 06c1db7d8e..06c1db7d8e 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 f9871527dd..f9871527dd 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 beecf79a35..beecf79a35 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 b99d3181ac..b99d3181ac 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 330ccc8cbf..330ccc8cbf 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 9b34afdc9d..9b34afdc9d 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 63eff41a74..63eff41a74 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 7329143136..7329143136 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 ff164d1f09..ff164d1f09 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 b070eb1b5f..b070eb1b5f 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 257874b8b0..257874b8b0 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 1fb9ba9720..1fb9ba9720 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 416063268f..416063268f 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 f3407bcb63..f3407bcb63 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 2bc4f8c5e8..2bc4f8c5e8 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 e12d59f1d0..e12d59f1d0 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 c866e88016..c866e88016 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 f35222b634..f35222b634 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 b2d76d67af..b2d76d67af 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 994dc847c9..994dc847c9 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 617f583b35..617f583b35 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 935bdba93e..935bdba93e 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 aeafee247c..aeafee247c 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 f147e69044..f147e69044 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 f1870f3a1b..f1870f3a1b 100644
--- a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/SerialIo.c
+++ b/Core/MdeModulePkg/Bus/Pci/PciSioSerialDxe/SerialIo.c
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 5b3a137d80..5b3a137d80 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 fb359fd615..fb359fd615 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 7b7ea3af7b..7b7ea3af7b 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 4487eb968f..4487eb968f 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 179e36c3a2..179e36c3a2 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 8635d8231c..8635d8231c 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 d011d39f1c..d011d39f1c 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 71d9f6cf77..71d9f6cf77 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 e42d482885..e42d482885 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 368b75d753..368b75d753 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 b3cfb23139..b3cfb23139 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 5cde35591a..5cde35591a 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 54c69d78ed..54c69d78ed 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 39c28ab7d8..39c28ab7d8 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 7999151b3f..7999151b3f 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 eea95dfa2b..eea95dfa2b 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 9c598b1868..9c598b1868 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 d0f22050ad..d0f22050ad 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 c25342dc1f..c25342dc1f 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 663ba39d32..663ba39d32 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 eaea38d94d..eaea38d94d 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 ccf4dc26e5..ccf4dc26e5 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 451007efb6..451007efb6 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 d977f2f8c2..d977f2f8c2 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 3632e8a769..3632e8a769 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 cce1cfdbe5..cce1cfdbe5 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 420965e83d..420965e83d 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 6cd9a18701..6cd9a18701 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 2406df51b8..2406df51b8 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 1a3d294a05..1a3d294a05 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 47539e55c8..47539e55c8 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 0cb5610ce5..0cb5610ce5 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskExtra.uni
+++ b/Core/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskExtra.uni
diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.c b/Core/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.c
index 0a76e26aa2..0a76e26aa2 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 23b6e633b9..23b6e633b9 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 706fcdc8f4..706fcdc8f4 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 cc6c3d4e3e..cc6c3d4e3e 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 68800570cb..68800570cb 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 a423a921de..a423a921de 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 4f7087f44f..4f7087f44f 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 1e627bd9cd..1e627bd9cd 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 771b7ba3b5..771b7ba3b5 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 26986cbf26..26986cbf26 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 a423a921de..a423a921de 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 eaad626d61..eaad626d61 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 3f7125ab57..3f7125ab57 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 2e2cdf5a7b..2e2cdf5a7b 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 ef002f53bb..ef002f53bb 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 70f9e62436..70f9e62436 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 305ab09c3e..305ab09c3e 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 9687eb0bca..9687eb0bca 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 79453fed26..79453fed26 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 e3752d1f83..e3752d1f83 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 e67a88541b..e67a88541b 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 66a8c01eda..66a8c01eda 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 3520fdba45..3520fdba45 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 f350021862..f350021862 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 fb7558b730..fb7558b730 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 58edb3f65f..58edb3f65f 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 86dd99d254..86dd99d254 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 77586520c4..77586520c4 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 b337726abf..b337726abf 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 9f99650703..9f99650703 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 dd83540285..dd83540285 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 bdbddf559b..bdbddf559b 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 77cf18cd97..77cf18cd97 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 7603d47e39..7603d47e39 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 42e696fcc9..42e696fcc9 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 628d6933c0..628d6933c0 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 763dcaed03..763dcaed03 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 6da63cbd48..6da63cbd48 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 6aab5aaa10..6aab5aaa10 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 0776cd6d24..0776cd6d24 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 9dd7d394d2..9dd7d394d2 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 094ad27f07..094ad27f07 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 fefe5bec19..fefe5bec19 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 e3e4d036db..e3e4d036db 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 0a34711b22..0a34711b22 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 034520c5c6..034520c5c6 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 a8c4c34d83..a8c4c34d83 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 c110f4d072..c110f4d072 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 087e55e649..087e55e649 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 0ca765d691..0ca765d691 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 1acac5d8fd..1acac5d8fd 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 fffd821b51..fffd821b51 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 bd7c6c6493..bd7c6c6493 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 d98b55ab93..d98b55ab93 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 53780f8e6b..53780f8e6b 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 5355940b58..5355940b58 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 a76ae2fe67..a76ae2fe67 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 7141373fd5..7141373fd5 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 9dbb85da7c..9dbb85da7c 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 fc08159d52..fc08159d52 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 47660729ba..47660729ba 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 416ed3dca8..416ed3dca8 100644
--- a/MdeModulePkg/Core/Dxe/Misc/MemoryAttributesTable.c
+++ b/Core/MdeModulePkg/Core/Dxe/Misc/MemoryAttributesTable.c
diff --git a/MdeModulePkg/Core/Dxe/Misc/PropertiesTable.c b/Core/MdeModulePkg/Core/Dxe/Misc/PropertiesTable.c
index 06f3451b4e..06f3451b4e 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 73e90785e2..73e90785e2 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 3c4f3f58db..3c4f3f58db 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 df2dc70b17..df2dc70b17 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 75372ace8d..75372ace8d 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 66c58b1d0f..66c58b1d0f 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 cfd1333c7a..cfd1333c7a 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 ec8cebc428..ec8cebc428 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 d7d693fdeb..d7d693fdeb 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 8ce72cb316..8ce72cb316 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/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 ab1e91462e..ab1e91462e 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 20c31f571d..20c31f571d 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 e7e795d123..e7e795d123 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 363ff7e694..363ff7e694 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 9c54192d86..9c54192d86 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 2f9b9dea31..2f9b9dea31 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 abd228e709..abd228e709 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 f01d0e307a..f01d0e307a 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 24983201d0..24983201d0 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 d36f89c3dd..d36f89c3dd 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 706e835a70..706e835a70 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 44f693ac83..44f693ac83 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 1f85ae8def..1f85ae8def 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 705d6d4df9..705d6d4df9 100644
--- a/MdeModulePkg/Core/PiSmmCore/Locate.c
+++ b/Core/MdeModulePkg/Core/PiSmmCore/Locate.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 9cc2a4cabc..9cc2a4cabc 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 aaa7efd8e0..aaa7efd8e0 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 0e9c92abef..0e9c92abef 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 9c06b2ac2f..9c06b2ac2f 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 33864d233d..33864d233d 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 5faa16de92..5faa16de92 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 50c3b34dfd..50c3b34dfd 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 6f027a6056..6f027a6056 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 5c98fd3b12..5c98fd3b12 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 352b7722fc..352b7722fc 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 761988e416..761988e416 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 816d0f5193..816d0f5193 100644
--- a/MdeModulePkg/Core/PiSmmCore/Smi.c
+++ b/Core/MdeModulePkg/Core/PiSmmCore/Smi.c
diff --git a/MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c b/Core/MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c
index 51fa7f947d..51fa7f947d 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 c0fe02724c..c0fe02724c 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 4049b83022..4049b83022 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 9c70b9df39..9c70b9df39 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 d6c3243094..d6c3243094 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/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 ac95f7e21a..ac95f7e21a 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 c40046c878..c40046c878 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/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/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/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 5fa75e6ca9..5fa75e6ca9 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/CapsuleLib.h b/Core/MdeModulePkg/Include/Library/CapsuleLib.h
index 487cb0f311..487cb0f311 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 b3016eee5d..b3016eee5d 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 31e1091e88..31e1091e88 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 01b06a73fb..01b06a73fb 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/HiiLib.h b/Core/MdeModulePkg/Include/Library/HiiLib.h
index 0e323df221..0e323df221 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 ce5a839c9b..ce5a839c9b 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 37cba070a1..37cba070a1 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/NetLib.h b/Core/MdeModulePkg/Include/Library/NetLib.h
index 280c51a01d..280c51a01d 100644
--- a/MdeModulePkg/Include/Library/NetLib.h
+++ b/Core/MdeModulePkg/Include/Library/NetLib.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 f95293470b..f95293470b 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 5538d90738..5538d90738 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 aa4ae56d04..aa4ae56d04 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/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/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 b84608357b..b84608357b 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/FormBrowserEx.h b/Core/MdeModulePkg/Include/Protocol/FormBrowserEx.h
index ef3e8cbceb..ef3e8cbceb 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/Print2.h b/Core/MdeModulePkg/Include/Protocol/Print2.h
index 1c127d5542..1c127d5542 100644
--- a/MdeModulePkg/Include/Protocol/Print2.h
+++ b/Core/MdeModulePkg/Include/Protocol/Print2.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 02237fffe2..02237fffe2 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 fc9d06d24b..fc9d06d24b 100644
--- a/MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.inf
+++ b/Core/MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.inf
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 b45b1ae3ce..b45b1ae3ce 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 d21a77401c..d21a77401c 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 a097a82b30..a097a82b30 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 f4fc31913b..f4fc31913b 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 641a86efc7..641a86efc7 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 2163301c42..2163301c42 100644
--- a/MdeModulePkg/Library/BaseSortLib/BaseSortLib.uni
+++ b/Core/MdeModulePkg/Library/BaseSortLib/BaseSortLib.uni
diff --git a/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.c b/Core/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.c
index 2fea24ac31..2fea24ac31 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 9dfc23603f..9dfc23603f 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 622410359c..622410359c 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 18a5c3b563..18a5c3b563 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 64046df4c0..64046df4c0 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 09e1366189..09e1366189 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 797c0f4076..797c0f4076 100644
--- a/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.uni
+++ b/Core/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.uni
diff --git a/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.c b/Core/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.c
index fb5c25536f..fb5c25536f 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 f669eccc71..f669eccc71 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 0747f6e697..0747f6e697 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 6fffafc5ed..6fffafc5ed 100644
--- a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.uni
+++ b/Core/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.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/MemoryAllocationLib.c b/Core/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/MemoryAllocationLib.c
index d7d9ff311e..d7d9ff311e 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 0eb8e579d7..0eb8e579d7 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 5f290634c5..5f290634c5 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 094a214862..094a214862 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 2b9ccd2fee..2b9ccd2fee 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 de1b1368da..de1b1368da 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 7e6e0c4e8e..7e6e0c4e8e 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 cad57024cd..cad57024cd 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 b1e53686ae..b1e53686ae 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 3624f669f8..3624f669f8 100644
--- a/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.uni
+++ b/Core/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.uni
diff --git a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.c b/Core/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.c
index 143baabdec..143baabdec 100644
--- a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.c
+++ b/Core/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.c
diff --git a/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf b/Core/MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
index e26f6fa691..e26f6fa691 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 806c443929..806c443929 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 cc93c2b89c..cc93c2b89c 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 5545a50671..5545a50671 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 5b56b39656..5b56b39656 100644
--- a/MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.inf
+++ b/Core/MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.inf
diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/Core/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index 6a84847039..6a84847039 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 bd74cfacbd..bd74cfacbd 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 bbbdbc048a..bbbdbc048a 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 2ddd983126..2ddd983126 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 d2997bce98..d2997bce98 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 3d09b4be4d..3d09b4be4d 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 96a8bd0a09..96a8bd0a09 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 4acdcb8714..4acdcb8714 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 61da4060f5..61da4060f5 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 6ead295caf..6ead295caf 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 7af6478bec..7af6478bec 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 b92de07144..b92de07144 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 064d9e59b6..064d9e59b6 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 e1d72f3f1c..e1d72f3f1c 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 0e96b4b76b..0e96b4b76b 100644
--- a/MdeModulePkg/Library/DxeUdpIoLib/DxeUpdIoLib.uni
+++ b/Core/MdeModulePkg/Library/DxeUdpIoLib/DxeUpdIoLib.uni
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 5466eb1b67..5466eb1b67 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 e05b3bb853..e05b3bb853 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 ec7585d55b..ec7585d55b 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 1830dae73c..1830dae73c 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 f5624fd039..f5624fd039 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 e32b6a3025..e32b6a3025 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 498e4e1088..498e4e1088 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/7zVersion.h b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/7zVersion.h
index 5a6bcadac6..5a6bcadac6 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 b9018eb991..b9018eb991 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 93566cb212..93566cb212 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/CpuArch.h b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/CpuArch.h
index 006361f2f2..006361f2f2 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 492cea2e41..492cea2e41 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 423d67e0c3..423d67e0c3 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 c923417501..c923417501 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 e3db4edbb4..e3db4edbb4 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 ad7d7057a4..ad7d7057a4 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/Types.h b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Types.h
index 30b16e3bb0..30b16e3bb0 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Types.h
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/Types.h
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/history.txt b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/history.txt
index 9bed5ebbef..9bed5ebbef 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/history.txt
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/history.txt
diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/lzma.txt b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/lzma.txt
index d4f4af929a..d4f4af929a 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/lzma.txt
+++ b/Core/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/lzma.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/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 3e8cdd8d7f..3e8cdd8d7f 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 6e3dcdd690..6e3dcdd690 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 408aadb76d..408aadb76d 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 686c606c79..686c606c79 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 f1d98277a3..f1d98277a3 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 fe2abee431..fe2abee431 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 e2e2646f91..e2e2646f91 100644
--- a/MdeModulePkg/Library/PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.inf
+++ b/Core/MdeModulePkg/Library/PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.inf
diff --git a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c b/Core/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
index 0b5a717caa..0b5a717caa 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 7a5d2407ac..7a5d2407ac 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 3be291a988..3be291a988 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 6c7a2cdb7a..6c7a2cdb7a 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 53c74d809f..53c74d809f 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 ac0ce9f08d..ac0ce9f08d 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 45dd581b08..45dd581b08 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 99cb407dbd..99cb407dbd 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 0459bae4c6..0459bae4c6 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 de314db479..de314db479 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 775b2f8715..775b2f8715 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 e540278483..e540278483 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 5e13a3eda2..5e13a3eda2 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 e8f7081149..e8f7081149 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 adfc0381c1..adfc0381c1 100644
--- a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.uni
+++ b/Core/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.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/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 3e0854c169..3e0854c169 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 329790afb0..329790afb0 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 09074a8a4e..09074a8a4e 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 d88a279f8e..d88a279f8e 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 d99174c4b9..d99174c4b9 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 c56a17584a..c56a17584a 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 e4a0debafa..e4a0debafa 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 56f8e3625f..56f8e3625f 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 5392a9bf1b..5392a9bf1b 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 e59cc28d53..e59cc28d53 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 160a749390..160a749390 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 40c74dc5d8..40c74dc5d8 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 40d79a3804..40d79a3804 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 f13e5a433b..f13e5a433b 100644
--- a/MdeModulePkg/Library/SmmIpmiLibSmmIpmiProtocol/SmmIpmiLibSmmIpmiProtocol.inf
+++ b/Core/MdeModulePkg/Library/SmmIpmiLibSmmIpmiProtocol/SmmIpmiLibSmmIpmiProtocol.inf
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 78aa7db639..78aa7db639 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 bd3204b195..bd3204b195 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 d4302d2543..d4302d2543 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 a3fef6620b..a3fef6620b 100644
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.uni
+++ b/Core/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.uni
diff --git a/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.c b/Core/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.c
index c01d16d1eb..c01d16d1eb 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 aa804d269e..aa804d269e 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 99cfab569d..99cfab569d 100644
--- a/MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.uni
+++ b/Core/MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.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 71a2b1f392..71a2b1f392 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 52f2d038f3..52f2d038f3 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
+++ b/Core/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.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 86b4fac424..86b4fac424 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 bffbedaf84..bffbedaf84 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 8d398fb4c6..8d398fb4c6 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 6b9690a37c..6b9690a37c 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 e675904857..e675904857 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 0abd019440..0abd019440 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 c808ed2ffe..c808ed2ffe 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 a2c6441dbe..a2c6441dbe 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 961fdcada2..961fdcada2 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 2519afa7d4..2519afa7d4 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 66d72acf27..66d72acf27 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 bfae3f8fc0..bfae3f8fc0 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 7385c4db9d..7385c4db9d 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 f7ad669b8e..f7ad669b8e 100644
--- a/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.uni
+++ b/Core/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.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 2163301c42..2163301c42 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 d770785490..d770785490 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 cab92967aa..cab92967aa 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 21fc80e89c..21fc80e89c 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 24d24c5dd5..24d24c5dd5 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 e4a0debafa..e4a0debafa 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 3afa7962aa..3afa7962aa 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 60c141a6b9..60c141a6b9 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 d9761a1103..d9761a1103 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 4a3d932be9..4a3d932be9 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 77ef210fb2..77ef210fb2 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 a18cbfa5a8..a18cbfa5a8 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 15144bd4c0..15144bd4c0 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.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 aa15048a31..aa15048a31 100644
--- a/MdeModulePkg/Logo/Logo.uni
+++ b/Core/MdeModulePkg/Logo/Logo.uni
diff --git a/MdeModulePkg/Logo/LogoExtra.uni b/Core/MdeModulePkg/Logo/LogoExtra.uni
index 8b27ec593a..8b27ec593a 100644
--- a/MdeModulePkg/Logo/LogoExtra.uni
+++ b/Core/MdeModulePkg/Logo/LogoExtra.uni
diff --git a/MdeModulePkg/MdeModulePkg.dec b/Core/MdeModulePkg/MdeModulePkg.dec
index a1f6bb6897..a1f6bb6897 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/Core/MdeModulePkg/MdeModulePkg.dec
diff --git a/MdeModulePkg/MdeModulePkg.dsc b/Core/MdeModulePkg/MdeModulePkg.dsc
index 30e546da1d..30e546da1d 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/Core/MdeModulePkg/MdeModulePkg.dsc
diff --git a/MdeModulePkg/MdeModulePkg.uni b/Core/MdeModulePkg/MdeModulePkg.uni
index ea385ff178..ea385ff178 100644
--- a/MdeModulePkg/MdeModulePkg.uni
+++ b/Core/MdeModulePkg/MdeModulePkg.uni
diff --git a/MdeModulePkg/MdeModulePkgExtra.uni b/Core/MdeModulePkg/MdeModulePkgExtra.uni
index cbee5edbf1..cbee5edbf1 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 e67102d47b..e67102d47b 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 613bba3117..613bba3117 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 57fdc7844e..57fdc7844e 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 ebedefb906..ebedefb906 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 e9cd728dbf..e9cd728dbf 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 8e6af22a80..8e6af22a80 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 27355aa983..27355aa983 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 c6abf1bf0c..c6abf1bf0c 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 93bbe480e8..93bbe480e8 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 804ffa5a6b..804ffa5a6b 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 c167cedcdc..c167cedcdc 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 9a3921d580..9a3921d580 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 c761f609b9..c761f609b9 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 21bf53cc6a..21bf53cc6a 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 135270d842..135270d842 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 710546e114..710546e114 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/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 f8b2782244..f8b2782244 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 772347a57e..772347a57e 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 0b7432daf7..0b7432daf7 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/SetIdtEntry.c b/Core/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c
index 6674560597..6674560597 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 9d25f6f98a..9d25f6f98a 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 a39550b9df..a39550b9df 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 fdb9152f6d..fdb9152f6d 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 3412a0ed1a..3412a0ed1a 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 5a7e09301f..5a7e09301f 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 60acf9799e..60acf9799e 100644
--- a/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmmExtra.uni
+++ b/Core/MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmmExtra.uni
diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/InternalS3SaveState.h b/Core/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/InternalS3SaveState.h
index f5ca60611e..f5ca60611e 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 60cd9b1b3b..60cd9b1b3b 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 2f021ed90a..2f021ed90a 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 d27e16b2aa..d27e16b2aa 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 0007d0ca71..0007d0ca71 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 e4227282c9..e4227282c9 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 be9a5619fe..be9a5619fe 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 ab1b4901b8..ab1b4901b8 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 11a636c144..11a636c144 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 2171d14791..2171d14791 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 12d61e79c9..12d61e79c9 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 dcaa13ac22..dcaa13ac22 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 170a4f45bb..170a4f45bb 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 c8898925e6..c8898925e6 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 008eee0efa..008eee0efa 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 8cdbde0a50..8cdbde0a50 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 68d8e42745..68d8e42745 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 d7aa37186f..d7aa37186f 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 c082315258..c082315258 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 871be9b513..871be9b513 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 1630dfc383..1630dfc383 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 10d3c4c5ce..10d3c4c5ce 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 88d5e2057c..88d5e2057c 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 d789fbbc75..d789fbbc75 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 6210d2133e..6210d2133e 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 61fafc7fe0..61fafc7fe0 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/X64Entry.c b/Core/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c
index 670e2c7d5f..670e2c7d5f 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 7a7a3e3706..7a7a3e3706 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 8bd8739994..8bd8739994 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 a9d83883eb..a9d83883eb 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 ed8820a8f7..ed8820a8f7 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 7e0dd5cf13..7e0dd5cf13 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 795123d106..795123d106 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 4e59e1bbd7..4e59e1bbd7 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 de66b468e4..de66b468e4 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 b707a6d110..b707a6d110 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 1e1cc7ec6c..1e1cc7ec6c 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 dae97b09a2..dae97b09a2 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 e32abbaea1..e32abbaea1 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 cb8037d71b..cb8037d71b 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 86515ff49d..86515ff49d 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 74218c8b4e..74218c8b4e 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 549c03beb3..549c03beb3 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 49dfb5c8da..49dfb5c8da 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/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 6fde3b2c7a..6fde3b2c7a 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 269d2aeb5a..269d2aeb5a 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 3be877b466..3be877b466 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 9fa952ad2a..9fa952ad2a 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 667ec097de..667ec097de 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 c26e92b060..c26e92b060 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 298b6b2da3..298b6b2da3 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 e263649452..e263649452 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 597a2cf137..597a2cf137 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 f1faa3d2c9..f1faa3d2c9 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 be3ca60bfb..be3ca60bfb 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 5e49ee0140..5e49ee0140 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/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/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 187e2a8577..187e2a8577 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 bb94010999..bb94010999 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 e9d45e5b86..e9d45e5b86 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 9ef1b035d7..9ef1b035d7 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 b76d2a6e79..b76d2a6e79 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 f78118a6a8..f78118a6a8 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 5ca26722a7..5ca26722a7 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 97f2d508a2..97f2d508a2 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 9fd078ac70..9fd078ac70 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 7a2a1b84e3..7a2a1b84e3 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 22384499c5..22384499c5 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 4b0159c4fa..4b0159c4fa 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 53e439843d..53e439843d 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 a9b13695a9..a9b13695a9 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxeExtra.uni
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 4ca63be4d1..4ca63be4d1 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 1ec5c4c3f9..1ec5c4c3f9 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 9f9d7cc790..9f9d7cc790 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 31b4ae2f1c..31b4ae2f1c 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 a391442d16..a391442d16 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 063e94c6bc..063e94c6bc 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 ff94518b06..ff94518b06 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 bbbbdaa8c1..bbbbdaa8c1 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 c074f4b4a3..c074f4b4a3 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 f88d76d64c..f88d76d64c 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 772a75030c..772a75030c 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 e3e4311c7f..e3e4311c7f 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 8ec1d4e6e8..8ec1d4e6e8 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 97dee9c79a..97dee9c79a 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 82b0bc5077..82b0bc5077 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 f5c0b4670b..f5c0b4670b 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 b97d184964..b97d184964 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 24e48f8868..24e48f8868 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 c8262a45a0..c8262a45a0 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 bd28797a55..bd28797a55 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 0a5c2424d5..0a5c2424d5 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
+++ b/Core/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf b/Core/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
index 0dfe005e7b..0dfe005e7b 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 2c81a105c4..2c81a105c4 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 6a8adee72d..6a8adee72d 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 433eea250f..433eea250f 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 bdc70b1d43..bdc70b1d43 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 549e0dd8dc..549e0dd8dc 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 01ac441215..01ac441215 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 b16fda69fa..b16fda69fa 100644
--- a/MdeModulePkg/Universal/EbcDxe/Ia32/EbcLowLevel.asm
+++ b/Core/MdeModulePkg/Universal/EbcDxe/Ia32/EbcLowLevel.asm
diff --git a/MdeModulePkg/Universal/EbcDxe/Ia32/EbcSupport.c b/Core/MdeModulePkg/Universal/EbcDxe/Ia32/EbcSupport.c
index bddfbf630d..bddfbf630d 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 23b6c1bd84..23b6c1bd84 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/EbcSupport.c b/Core/MdeModulePkg/Universal/EbcDxe/X64/EbcSupport.c
index bdde5e41fa..bdde5e41fa 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 8fbc75bfcf..8fbc75bfcf 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 029041531d..029041531d 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 dc762dd93a..dc762dd93a 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 f6d1e97451..f6d1e97451 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 7a6c377854..7a6c377854 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 849d1f4233..849d1f4233 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 f570729273..f570729273 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 694784ba57..694784ba57 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 d4135ffab3..d4135ffab3 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 bc5e6177c3..bc5e6177c3 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 14ecfa127e..14ecfa127e 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 6b0a8f99fd..6b0a8f99fd 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 09223217e4..09223217e4 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 8b7cf4863b..8b7cf4863b 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 54aec337c5..54aec337c5 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 31f1e0bda6..31f1e0bda6 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 7ef1733c5e..7ef1733c5e 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 d13ce532aa..d13ce532aa 100644
--- a/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePeiExtra.uni
+++ b/Core/MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePeiExtra.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 c6137aca1f..c6137aca1f 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 fc8c9291ab..fc8c9291ab 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 975ab88ca1..975ab88ca1 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 7988ee5297..7988ee5297 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 d1306b3f38..d1306b3f38 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 2f53197d46..2f53197d46 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 ec56795ebb..ec56795ebb 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 4b70b995f5..4b70b995f5 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 bb0090aaa6..bb0090aaa6 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 81138b1371..81138b1371 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 7892503b47..7892503b47 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 6448c97256..6448c97256 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 d9687316dc..d9687316dc 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 c46c96545e..c46c96545e 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
+++ b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/String.c b/Core/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
index 2d04be4b62..2d04be4b62 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 f84a4d59e9..f84a4d59e9 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 63969d3e31..63969d3e31 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 ba5a1d3fe4..ba5a1d3fe4 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 068418c453..068418c453 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 0d1d0b8fcc..0d1d0b8fcc 100644
--- a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2DxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2DxeExtra.uni
diff --git a/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.c b/Core/MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.c
index f1880d464d..f1880d464d 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 dd3292dcf3..dd3292dcf3 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 ebc5a0d139..ebc5a0d139 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 925947ac89..925947ac89 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 0f03bb7a9a..0f03bb7a9a 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 6161274a94..6161274a94 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 9607f257e3..9607f257e3 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 336523d8cc..336523d8cc 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 fa9fef9770..fa9fef9770 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 30a767db19..30a767db19 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 ddb0d2ed49..ddb0d2ed49 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 032a1dd221..032a1dd221 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 851afdd2c8..851afdd2c8 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 81ddd62634..81ddd62634 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 24b466fdbc..24b466fdbc 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 38148cba45..38148cba45 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 de8045a6d8..de8045a6d8 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 633c3e7d38..633c3e7d38 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 9253df2b3f..9253df2b3f 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 b4a63ef173..b4a63ef173 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 43f1ab374e..43f1ab374e 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 f06b0d4803..f06b0d4803 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 4f491b4bba..4f491b4bba 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 44213cf40a..44213cf40a 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 4bc991557a..4bc991557a 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 d7700bccc4..d7700bccc4 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 f532780970..f532780970 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 82e3e7985c..82e3e7985c 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 ca47539550..ca47539550 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 21266b08c5..21266b08c5 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 0753072161..0753072161 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 7b77fd386b..7b77fd386b 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 140f2425a2..140f2425a2 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 d574ce21dd..d574ce21dd 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 77754b896a..77754b896a 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 e55bee8af9..e55bee8af9 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 372efdc15e..372efdc15e 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 8c761f882c..8c761f882c 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 ebd9f5b40d..ebd9f5b40d 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 8a95493dcd..8a95493dcd 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 1ac79e7ca1..1ac79e7ca1 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 004a8bc703..004a8bc703 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 d38857c677..d38857c677 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 edbddba021..edbddba021 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 ab72525646..ab72525646 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 381dcb1e97..381dcb1e97 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 3dc4d88f13..3dc4d88f13 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 32984bad66..32984bad66 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 f561af0c75..f561af0c75 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 398f730582..398f730582 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 7923ef1c7f..7923ef1c7f 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 c940cf688c..c940cf688c 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 669e041c10..669e041c10 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 6dada9605b..6dada9605b 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 b9a294b199..b9a294b199 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 e802b9516b..e802b9516b 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 ea0023ddcb..ea0023ddcb 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 2ddcec8962..2ddcec8962 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 126d968200..126d968200 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 a4f5eef7cf..a4f5eef7cf 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 ab0cf08400..ab0cf08400 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 c66be6487b..c66be6487b 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 1cbfc30e5c..1cbfc30e5c 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 6e14c1f37f..6e14c1f37f 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 13c4a6c825..13c4a6c825 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 8d2508c774..8d2508c774 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 7ed2e5250f..7ed2e5250f 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 8f2ab9b24a..8f2ab9b24a 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 3f40ef3ce7..3f40ef3ce7 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 bb98f4c8a7..bb98f4c8a7 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 5ff294f8b5..5ff294f8b5 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 67f65ffc42..67f65ffc42 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 5d45e3a7a4..5d45e3a7a4 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 aec08b1811..aec08b1811 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 730e397452..730e397452 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 e6c5af77ec..e6c5af77ec 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 2e31643821..2e31643821 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 52472d4440..52472d4440 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 feed86c590..feed86c590 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 5b327af721..5b327af721 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 30e9406161..30e9406161 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 5fe98d4068..5fe98d4068 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 a1789dcd65..a1789dcd65 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 7690fe5a13..7690fe5a13 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 209127d18f..209127d18f 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 c7d3d32185..c7d3d32185 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 95f47f91bc..95f47f91bc 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 b44e851b26..b44e851b26 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 faf9ca5e28..faf9ca5e28 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 db2127015f..db2127015f 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 6cb5ff0b73..6cb5ff0b73 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 09a7a35b02..09a7a35b02 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 4f077d6b96..4f077d6b96 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 5ea22acb14..5ea22acb14 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 6c06373004..6c06373004 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 1626060ee2..1626060ee2 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 89977e6690..89977e6690 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 ce8d8add3f..ce8d8add3f 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 3016da7324..3016da7324 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 6f41aa671d..6f41aa671d 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 f416ffc2b9..f416ffc2b9 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 f132359193..f132359193 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 3dc2c6f3bf..3dc2c6f3bf 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 ade7f17af8..ade7f17af8 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 5e0fe42a88..5e0fe42a88 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 bf95abd8b8..bf95abd8b8 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 14d47849d8..14d47849d8 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 829eb2b046..829eb2b046 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 3b4b5018f7..3b4b5018f7 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 eb1e1cef0b..eb1e1cef0b 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 4d8ab0f13f..4d8ab0f13f 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 15f1924f89..15f1924f89 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 0645f914c7..0645f914c7 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 b25cabc8b8..b25cabc8b8 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 6eee5eac0f..6eee5eac0f 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 45ce01b1fa..45ce01b1fa 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 c75187c2b1..c75187c2b1 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 b7272b0f70..b7272b0f70 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 394a7fa448..394a7fa448 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 1274d6720d..1274d6720d 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 f4e1ad7cee..f4e1ad7cee 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 66e893314e..66e893314e 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 7d880e6277..7d880e6277 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 7800cfd3a2..7800cfd3a2 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 af55acfd2b..af55acfd2b 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 9ea06520d1..9ea06520d1 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 fe3471e577..fe3471e577 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 0f1f2bd579..0f1f2bd579 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 e413fe6a3c..e413fe6a3c 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 24841aaa70..24841aaa70 100644
--- a/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxeExtra.uni
+++ b/Core/MdeModulePkg/Universal/PropertiesTableAttributesDxe/PropertiesTableAttributesDxeExtra.uni
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 3ab998028e..3ab998028e 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 965c094b62..965c094b62 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 3eb0842356..3eb0842356 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 89be808583..89be808583 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 bbee22e73e..bbee22e73e 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 92264ec5d0..92264ec5d0 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 aa1ca162d6..aa1ca162d6 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 b47b59ead4..b47b59ead4 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 b20565f568..b20565f568 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 b469cb8ec8..b469cb8ec8 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 35844350af..35844350af 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 be3fb2ae15..be3fb2ae15 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 99472a3c52..99472a3c52 100644
--- a/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPeiExtra.uni
+++ b/Core/MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPeiExtra.uni
diff --git a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c b/Core/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.c
index 22e6c7f4ea..22e6c7f4ea 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 9d1c7b8dcb..9d1c7b8dcb 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 866060beae..866060beae 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 cd3616e435..cd3616e435 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 145101b708..145101b708 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 9df8bea8aa..9df8bea8aa 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 bfb8420d05..bfb8420d05 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 de928d1719..de928d1719 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 75dc421167..75dc421167 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 8e8607d4c0..8e8607d4c0 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 356cd9cd9a..356cd9cd9a 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 cc9896959b..cc9896959b 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 0abb09cf87..0abb09cf87 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 0f9678ab13..0f9678ab13 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 6aa728db03..6aa728db03 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 53c88fe06b..53c88fe06b 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 f29c47b7b4..f29c47b7b4 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 7f9c02e9db..7f9c02e9db 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 b3631121e8..b3631121e8 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 f9e0196677..f9e0196677 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 98b0f52a6a..98b0f52a6a 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 4e081c44b8..4e081c44b8 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 2e2985636a..2e2985636a 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 60cc966cc3..60cc966cc3 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 8680497693..8680497693 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 2bf341202e..2bf341202e 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 ba22ca48cf..ba22ca48cf 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 4051091dbe..4051091dbe 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 67638c621b..67638c621b 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 78d908b16e..78d908b16e 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 ee85a69c5a..ee85a69c5a 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 1e66fbf83f..1e66fbf83f 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 94507a04c3..94507a04c3 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 40f0c6c022..40f0c6c022 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 eecdd61520..eecdd61520 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 08e2f02733..08e2f02733 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 977332e1cf..977332e1cf 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 a0041c353a..a0041c353a 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 766bb0a14b..766bb0a14b 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 d636fcf20d..d636fcf20d 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 7c11eff3c1..7c11eff3c1 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 24b14d6d9c..24b14d6d9c 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 c68a41ddfe..c68a41ddfe 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 2f92fae310..2f92fae310 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 461b0fc885..461b0fc885 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 43360ee6cd..43360ee6cd 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 5c224b9737..5c224b9737 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 caf51dfba6..caf51dfba6 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 5e7b5c5341..5e7b5c5341 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 48745b62f5..48745b62f5 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 e7361c8512..e7361c8512 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 fb16af31b1..fb16af31b1 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 02f01064f3..02f01064f3 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 60502d0451..60502d0451 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 46f984c809..46f984c809 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 0a076ae467..0a076ae467 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 82ddb00a19..82ddb00a19 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 39cf83edec..39cf83edec 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 e79ea93c81..e79ea93c81 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 b018eb2ae1..b018eb2ae1 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 628d3fe504..628d3fe504 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 e3595cbce6..e3595cbce6 100644
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimerExtra.uni
+++ b/Core/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimerExtra.uni
author	Guo Mang <mang.guo@intel.com>	2016-12-22 15:55:38 +0800
committer	Guo Mang <mang.guo@intel.com>	2016-12-26 19:14:37 +0800
commit	7f05fa00f73038b425002566d3afe6c3ade2ccdb (patch)
tree	297e208d4ade33a8bb3d5d20f72c53e0d134e003
parent	ed2ecce34b3830562c4239093a41ba92d76d5f31 (diff)
download	edk2-platforms-7f05fa00f73038b425002566d3afe6c3ade2ccdb.tar.xz