5 files changed, 10 insertions, 10 deletions
diff --git a/MdeModulePkg/Core/Dxe/FwVol/Ffs.c b/MdeModulePkg/Core/Dxe/FwVol/Ffs.c
index 1375e6bf7d..1c11dde036 100644
--- a/MdeModulePkg/Core/Dxe/FwVol/Ffs.c
+++ b/MdeModulePkg/Core/Dxe/FwVol/Ffs.c
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 
 
-#include <DxeMain.h>
+#include "DxeMain.h"
 
 
 /**
diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
index 8c91641834..48b309fee9 100644
--- a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
-#include <DxeMain.h>
+#include "DxeMain.h"
 
 #define KEYSIZE       sizeof (UINTN)
 
@@ -87,7 +87,7 @@ GetFwVolHeader (
   //
   // Allocate a buffer for the caller
   //
-  *FwVolHeader = CoreAllocateBootServicesPool (TempFvh.HeaderLength);
+  *FwVolHeader = AllocatePool (TempFvh.HeaderLength);
   if (*FwVolHeader == NULL) {
     return EFI_OUT_OF_RESOURCES;
   }
@@ -210,7 +210,7 @@ FvCheck (
   // the header to check to make sure the volume is valid
   //
   Size = (UINTN)(FwVolHeader->FvLength - FwVolHeader->HeaderLength);
-  FvDevice->CachedFv = CoreAllocateBootServicesPool (Size);
+  FvDevice->CachedFv = AllocatePool (Size);
 
   if (FvDevice->CachedFv == NULL) {
     return EFI_OUT_OF_RESOURCES;
@@ -336,7 +336,7 @@ FvCheck (
       //
       // Create a FFS list entry for each non-deleted file
       //
-      FfsFileEntry = CoreAllocateZeroBootServicesPool (sizeof (FFS_FILE_LIST_ENTRY));
+      FfsFileEntry = AllocateZeroPool (sizeof (FFS_FILE_LIST_ENTRY));
       if (FfsFileEntry == NULL) {
         Status = EFI_OUT_OF_RESOURCES;
         goto Done;
@@ -465,7 +465,7 @@ NotifyFwVolBlock (
       //
       // No FwVol protocol on the handle so create a new one
       //
-      FvDevice = CoreAllocateCopyPool (sizeof (FV_DEVICE), &mFvDevice);
+      FvDevice = AllocateCopyPool (sizeof (FV_DEVICE), &mFvDevice);
       if (FvDevice == NULL) {
         return;
       }
diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVolAttrib.c b/MdeModulePkg/Core/Dxe/FwVol/FwVolAttrib.c
index 1b629ddf1f..664c3af967 100644
--- a/MdeModulePkg/Core/Dxe/FwVol/FwVolAttrib.c
+++ b/MdeModulePkg/Core/Dxe/FwVol/FwVolAttrib.c
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
-#include <DxeMain.h>
+#include "DxeMain.h"
 
 
 /**
diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVolRead.c b/MdeModulePkg/Core/Dxe/FwVol/FwVolRead.c
index 7346928934..fbf6d0a1ba 100644
--- a/MdeModulePkg/Core/Dxe/FwVol/FwVolRead.c
+++ b/MdeModulePkg/Core/Dxe/FwVol/FwVolRead.c
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
-#include <DxeMain.h>
+#include "DxeMain.h"
 
 /*++
 
@@ -342,7 +342,7 @@ FvReadFile (
     //
     // Caller passed in a pointer so allocate buffer for them
     //
-    *Buffer = CoreAllocateBootServicesPool (FileSize);
+    *Buffer = AllocatePool (FileSize);
     if (*Buffer == NULL) {
       return EFI_OUT_OF_RESOURCES;
     }
diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVolWrite.c b/MdeModulePkg/Core/Dxe/FwVol/FwVolWrite.c
index 6ff9bda021..1e0263e844 100644
--- a/MdeModulePkg/Core/Dxe/FwVol/FwVolWrite.c
+++ b/MdeModulePkg/Core/Dxe/FwVol/FwVolWrite.c
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
-#include <DxeMain.h>
+#include "DxeMain.h"