From 8eaa875cc4734806874a1297c27e0261082f824e Mon Sep 17 00:00:00 2001
From: Mikhail Krichanov <mikhailkrichanov@gmail.com>
Date: Fri, 3 Mar 2023 09:10:34 +0300
Subject: [PATCH] MdePkg: Placed import of PcdLib.h into DebugLib.h.

---
 MdePkg/Include/Library/DebugLib.h                    | 2 ++
 MdePkg/Library/BasePeCoffLib2/PeCoffDebug.c          | 1 -
 MdePkg/Library/BasePeCoffLib2/PeCoffHash.c           | 1 -
 MdePkg/Library/BasePeCoffLib2/PeCoffHii.c            | 1 -
 MdePkg/Library/BasePeCoffLib2/PeCoffInfo.c           | 1 -
 MdePkg/Library/BasePeCoffLib2/PeCoffInit.c           | 1 -
 MdePkg/Library/BasePeCoffLib2/PeCoffLoad.c           | 1 -
 MdePkg/Library/BasePeCoffLib2/PeCoffRelocate.c       | 1 -
 MdePkg/Library/BaseUeImageLib/UeImageLib.c           | 1 -
 MdePkg/Library/BaseUefiImageLib/CommonSupport.c      | 1 -
 MdePkg/Library/BaseUefiImageLib/PeCoffSupport.c      | 1 -
 MdePkg/Library/BaseUefiImageLib/UeSupport.c          | 1 -
 MdePkg/Library/BaseUefiImageLib/UefiImageLibPeCoff.c | 1 -
 MdePkg/Library/BaseUefiImageLib/UefiImageLibUe.c     | 1 -
 14 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/MdePkg/Include/Library/DebugLib.h b/MdePkg/Include/Library/DebugLib.h
index 5b9a258176..617232704f 100644
--- a/MdePkg/Include/Library/DebugLib.h
+++ b/MdePkg/Include/Library/DebugLib.h
@@ -16,6 +16,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef __DEBUG_LIB_H__
 #define __DEBUG_LIB_H__
 
+#include <Library/PcdLib.h>
+
 //
 // Declare bits for PcdDebugPropertyMask
 //
diff --git a/MdePkg/Library/BasePeCoffLib2/PeCoffDebug.c b/MdePkg/Library/BasePeCoffLib2/PeCoffDebug.c
index df280b88a9..b84a9fd22f 100644
--- a/MdePkg/Library/BasePeCoffLib2/PeCoffDebug.c
+++ b/MdePkg/Library/BasePeCoffLib2/PeCoffDebug.c
@@ -20,7 +20,6 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/BaseOverflowLib.h>
 #include <Library/DebugLib.h>
-#include <Library/PcdLib.h>
 #include <Library/PeCoffLib2.h>
 
 #include "BasePeCoffLib2Internals.h"
diff --git a/MdePkg/Library/BasePeCoffLib2/PeCoffHash.c b/MdePkg/Library/BasePeCoffLib2/PeCoffHash.c
index 59c5b84836..4abd98df02 100644
--- a/MdePkg/Library/BasePeCoffLib2/PeCoffHash.c
+++ b/MdePkg/Library/BasePeCoffLib2/PeCoffHash.c
@@ -20,7 +20,6 @@
 #include <Library/BaseOverflowLib.h>
 #include <Library/DebugLib.h>
 #include <Library/MemoryAllocationLib.h>
-#include <Library/PcdLib.h>
 #include <Library/PeCoffLib2.h>
 
 #include "BasePeCoffLib2Internals.h"
diff --git a/MdePkg/Library/BasePeCoffLib2/PeCoffHii.c b/MdePkg/Library/BasePeCoffLib2/PeCoffHii.c
index ab70344f5a..1674cdc935 100644
--- a/MdePkg/Library/BasePeCoffLib2/PeCoffHii.c
+++ b/MdePkg/Library/BasePeCoffLib2/PeCoffHii.c
@@ -18,7 +18,6 @@
 #include <Library/BaseLib.h>
 #include <Library/BaseOverflowLib.h>
 #include <Library/DebugLib.h>
-#include <Library/PcdLib.h>
 #include <Library/PeCoffLib2.h>
 
 #include "BasePeCoffLib2Internals.h"
diff --git a/MdePkg/Library/BasePeCoffLib2/PeCoffInfo.c b/MdePkg/Library/BasePeCoffLib2/PeCoffInfo.c
index 846be3a76c..0f83a4c8fb 100644
--- a/MdePkg/Library/BasePeCoffLib2/PeCoffInfo.c
+++ b/MdePkg/Library/BasePeCoffLib2/PeCoffInfo.c
@@ -15,7 +15,6 @@
 #include <Library/BaseLib.h>
 #include <Library/BaseOverflowLib.h>
 #include <Library/DebugLib.h>
-#include <Library/PcdLib.h>
 #include <Library/PeCoffLib2.h>
 
 #include "BasePeCoffLib2Internals.h"
diff --git a/MdePkg/Library/BasePeCoffLib2/PeCoffInit.c b/MdePkg/Library/BasePeCoffLib2/PeCoffInit.c
index c400a30175..6937115072 100644
--- a/MdePkg/Library/BasePeCoffLib2/PeCoffInit.c
+++ b/MdePkg/Library/BasePeCoffLib2/PeCoffInit.c
@@ -22,7 +22,6 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/BaseOverflowLib.h>
 #include <Library/DebugLib.h>
-#include <Library/PcdLib.h>
 #include <Library/PeCoffLib2.h>
 
 #include "BasePeCoffLib2Internals.h"
diff --git a/MdePkg/Library/BasePeCoffLib2/PeCoffLoad.c b/MdePkg/Library/BasePeCoffLib2/PeCoffLoad.c
index ce23beb2c2..2063e82910 100644
--- a/MdePkg/Library/BasePeCoffLib2/PeCoffLoad.c
+++ b/MdePkg/Library/BasePeCoffLib2/PeCoffLoad.c
@@ -19,7 +19,6 @@
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
-#include <Library/PcdLib.h>
 #include <Library/PeCoffLib2.h>
 
 #include "BasePeCoffLib2Internals.h"
diff --git a/MdePkg/Library/BasePeCoffLib2/PeCoffRelocate.c b/MdePkg/Library/BasePeCoffLib2/PeCoffRelocate.c
index 9198a90fcb..7d8de64ded 100644
--- a/MdePkg/Library/BasePeCoffLib2/PeCoffRelocate.c
+++ b/MdePkg/Library/BasePeCoffLib2/PeCoffRelocate.c
@@ -19,7 +19,6 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/BaseOverflowLib.h>
 #include <Library/DebugLib.h>
-#include <Library/PcdLib.h>
 #include <Library/UefiImageExtraActionLib.h>
 #include <Library/PeCoffLib2.h>
 
diff --git a/MdePkg/Library/BaseUeImageLib/UeImageLib.c b/MdePkg/Library/BaseUeImageLib/UeImageLib.c
index 51ead23d00..0cffe26667 100644
--- a/MdePkg/Library/BaseUeImageLib/UeImageLib.c
+++ b/MdePkg/Library/BaseUeImageLib/UeImageLib.c
@@ -16,7 +16,6 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/BaseOverflowLib.h>
 #include <Library/DebugLib.h>
-#include <Library/PcdLib.h>
 #include <Library/UefiImageLib.h>
 #include <Library/UeImageLib.h>
 
diff --git a/MdePkg/Library/BaseUefiImageLib/CommonSupport.c b/MdePkg/Library/BaseUefiImageLib/CommonSupport.c
index 9aa07b9c73..08dca276f5 100644
--- a/MdePkg/Library/BaseUefiImageLib/CommonSupport.c
+++ b/MdePkg/Library/BaseUefiImageLib/CommonSupport.c
@@ -14,7 +14,6 @@
 #include <Library/BaseOverflowLib.h>
 #include <Library/CacheMaintenanceLib.h>
 #include <Library/DebugLib.h>
-#include <Library/PcdLib.h>
 #include <Library/UefiImageLib.h>
 
 RETURN_STATUS
diff --git a/MdePkg/Library/BaseUefiImageLib/PeCoffSupport.c b/MdePkg/Library/BaseUefiImageLib/PeCoffSupport.c
index 619dff7153..1beff65d82 100644
--- a/MdePkg/Library/BaseUefiImageLib/PeCoffSupport.c
+++ b/MdePkg/Library/BaseUefiImageLib/PeCoffSupport.c
@@ -17,7 +17,6 @@
 #include <Library/DebugLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/PeCoffLib2.h>
-#include <Library/PcdLib.h>
 #include <Library/UefiImageLib.h>
 
 /**
diff --git a/MdePkg/Library/BaseUefiImageLib/UeSupport.c b/MdePkg/Library/BaseUefiImageLib/UeSupport.c
index 2c68f43380..0620eda82d 100644
--- a/MdePkg/Library/BaseUefiImageLib/UeSupport.c
+++ b/MdePkg/Library/BaseUefiImageLib/UeSupport.c
@@ -7,7 +7,6 @@
 #include <Library/BaseOverflowLib.h>
 #include <Library/DebugLib.h>
 #include <Library/MemoryAllocationLib.h>
-#include <Library/PcdLib.h>
 #include <Library/UefiImageLib.h>
 #include <Library/UeImageLib.h>
 
diff --git a/MdePkg/Library/BaseUefiImageLib/UefiImageLibPeCoff.c b/MdePkg/Library/BaseUefiImageLib/UefiImageLibPeCoff.c
index 2a5b152456..384de239c5 100644
--- a/MdePkg/Library/BaseUefiImageLib/UefiImageLibPeCoff.c
+++ b/MdePkg/Library/BaseUefiImageLib/UefiImageLibPeCoff.c
@@ -20,7 +20,6 @@
 #include <Library/DebugLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/PeCoffLib2.h>
-#include <Library/PcdLib.h>
 #include <Library/UefiImageLib.h>
 
 #include "PeCoffSupport.h"
diff --git a/MdePkg/Library/BaseUefiImageLib/UefiImageLibUe.c b/MdePkg/Library/BaseUefiImageLib/UefiImageLibUe.c
index 469b1cfd86..deba64c36b 100644
--- a/MdePkg/Library/BaseUefiImageLib/UefiImageLibUe.c
+++ b/MdePkg/Library/BaseUefiImageLib/UefiImageLibUe.c
@@ -20,7 +20,6 @@
 #include <Library/DebugLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/UeImageLib.h>
-#include <Library/PcdLib.h>
 #include <Library/UefiImageLib.h>
 
 #include "UeSupport.h"