diff --git a/Ext4Pkg/Ext4Pkg.dsc b/Ext4Pkg/Ext4Pkg.dsc
index e85e2fb40b..18cfc102b8 100644
--- a/Ext4Pkg/Ext4Pkg.dsc
+++ b/Ext4Pkg/Ext4Pkg.dsc
@@ -20,11 +20,11 @@
   BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
+!include MdePkg/MdeLibs.dsc.inc
+
 [BuildOptions]
   *_*_*_CC_FLAGS                       = -D DISABLE_NEW_DEPRECATED_INTERFACES
 
-!include MdePkg/MdeLibs.dsc.inc
-
 [LibraryClasses]
   #
   # Entry Point Libraries
diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index e4086ef8e6..7e35f2c422 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -517,3 +517,4 @@
   MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf
 
 [BuildOptions]
+
diff --git a/MdePkg/Include/Library/DebugLib.h b/MdePkg/Include/Library/DebugLib.h
index 617232704f..e7dbb5b980 100644
--- a/MdePkg/Include/Library/DebugLib.h
+++ b/MdePkg/Include/Library/DebugLib.h
@@ -16,6 +16,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef __DEBUG_LIB_H__
 #define __DEBUG_LIB_H__
 
+#include <Library/BaseLib.h>
 #include <Library/PcdLib.h>
 
 //
diff --git a/MdePkg/Library/BasePeCoffLib2/PeCoffDebug.c b/MdePkg/Library/BasePeCoffLib2/PeCoffDebug.c
index b84a9fd22f..f467228e3c 100644
--- a/MdePkg/Library/BasePeCoffLib2/PeCoffDebug.c
+++ b/MdePkg/Library/BasePeCoffLib2/PeCoffDebug.c
@@ -16,7 +16,6 @@
 
 #include <IndustryStandard/PeImage2.h>
 
-#include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/BaseOverflowLib.h>
 #include <Library/DebugLib.h>
diff --git a/MdePkg/Library/BasePeCoffLib2/PeCoffHash.c b/MdePkg/Library/BasePeCoffLib2/PeCoffHash.c
index 4abd98df02..651b426f8f 100644
--- a/MdePkg/Library/BasePeCoffLib2/PeCoffHash.c
+++ b/MdePkg/Library/BasePeCoffLib2/PeCoffHash.c
@@ -16,7 +16,6 @@
 
 #include <Guid/WinCertificate.h>
 
-#include <Library/BaseLib.h>
 #include <Library/BaseOverflowLib.h>
 #include <Library/DebugLib.h>
 #include <Library/MemoryAllocationLib.h>
diff --git a/MdePkg/Library/BasePeCoffLib2/PeCoffHii.c b/MdePkg/Library/BasePeCoffLib2/PeCoffHii.c
index 1674cdc935..05650617c2 100644
--- a/MdePkg/Library/BasePeCoffLib2/PeCoffHii.c
+++ b/MdePkg/Library/BasePeCoffLib2/PeCoffHii.c
@@ -15,7 +15,6 @@
 
 #include <IndustryStandard/PeImage2.h>
 
-#include <Library/BaseLib.h>
 #include <Library/BaseOverflowLib.h>
 #include <Library/DebugLib.h>
 #include <Library/PeCoffLib2.h>
diff --git a/MdePkg/Library/BasePeCoffLib2/PeCoffInfo.c b/MdePkg/Library/BasePeCoffLib2/PeCoffInfo.c
index 0f83a4c8fb..65329f6c0b 100644
--- a/MdePkg/Library/BasePeCoffLib2/PeCoffInfo.c
+++ b/MdePkg/Library/BasePeCoffLib2/PeCoffInfo.c
@@ -12,7 +12,6 @@
 #include <Uefi/UefiBaseType.h>
 #include <Uefi/UefiSpec.h>
 
-#include <Library/BaseLib.h>
 #include <Library/BaseOverflowLib.h>
 #include <Library/DebugLib.h>
 #include <Library/PeCoffLib2.h>
diff --git a/MdePkg/Library/BasePeCoffLib2/PeCoffInit.c b/MdePkg/Library/BasePeCoffLib2/PeCoffInit.c
index 6937115072..552abc9c43 100644
--- a/MdePkg/Library/BasePeCoffLib2/PeCoffInit.c
+++ b/MdePkg/Library/BasePeCoffLib2/PeCoffInit.c
@@ -18,7 +18,6 @@
 
 #include <Guid/WinCertificate.h>
 
-#include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/BaseOverflowLib.h>
 #include <Library/DebugLib.h>
diff --git a/MdePkg/Library/BasePeCoffLib2/PeCoffLoad.c b/MdePkg/Library/BasePeCoffLib2/PeCoffLoad.c
index 2063e82910..4125a22471 100644
--- a/MdePkg/Library/BasePeCoffLib2/PeCoffLoad.c
+++ b/MdePkg/Library/BasePeCoffLib2/PeCoffLoad.c
@@ -16,7 +16,6 @@
 
 #include <IndustryStandard/PeImage2.h>
 
-#include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
 #include <Library/PeCoffLib2.h>
diff --git a/MdePkg/Library/BasePeCoffLib2/PeCoffRelocate.c b/MdePkg/Library/BasePeCoffLib2/PeCoffRelocate.c
index 7d8de64ded..7ce6e54e13 100644
--- a/MdePkg/Library/BasePeCoffLib2/PeCoffRelocate.c
+++ b/MdePkg/Library/BasePeCoffLib2/PeCoffRelocate.c
@@ -15,7 +15,6 @@
 
 #include <IndustryStandard/PeImage2.h>
 
-#include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/BaseOverflowLib.h>
 #include <Library/DebugLib.h>