diff --git a/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLib.c b/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLib.c
index 4dca821bfb..a2f0efceba 100644
--- a/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLib.c
+++ b/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLib.c
@@ -8,10 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #include <Base.h>
 #include <Uefi.h>
-#include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-#include <Protocol/GraphicsOutput.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/FrameBufferMemDrawLib.h>
 #include <Library/FrameBufferBltLib.h>
diff --git a/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibDxe.c b/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibDxe.c
index 80cbb4d264..a6661579c5 100644
--- a/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibDxe.c
+++ b/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibDxe.c
@@ -8,13 +8,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #include <Base.h>
 #include <Uefi.h>
-#include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Protocol/GraphicsOutput.h>
 #include <Library/MemoryAllocationLib.h>
-#include <Library/FrameBufferMemDrawLib.h>
-#include <Library/FrameBufferBltLib.h>
 
 STATIC EFI_GRAPHICS_OUTPUT_PROTOCOL  *mGraphicsOutput = NULL;
 
diff --git a/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibDxe.inf b/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibDxe.inf
index 845b24a677..700dabdd7a 100644
--- a/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibDxe.inf
+++ b/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibDxe.inf
@@ -9,7 +9,7 @@
 
 [Defines]
   INF_VERSION    = 0x00010017
-  BASE_NAME      = FrameBufferMemDrawLib
+  BASE_NAME      = FrameBufferMemDrawLibDxe
   FILE_GUID      = 75561EAF-4537-4FA8-B65B-40E652602A8B
   VERSION_STRING = 1.0
   MODULE_TYPE    = DXE_DRIVER
@@ -21,6 +21,7 @@
   DebugLib
   FrameBufferBltLib
   MemoryAllocationLib
+  UefiBootServicesTableLib
 
 [Packages]
   MdePkg/MdePkg.dec
@@ -30,9 +31,7 @@
 [Sources]
   FrameBufferMemDrawLib.c
   FrameBufferMemDrawLibDxe.c
-
-[LibraryClasses]
-  UefiBootServicesTableLib
+  FrameBufferMemDrawLib.h
 
 [Protocols]
   gEfiGraphicsOutputProtocolGuid                ## SOMETIMES_CONSUMES
diff --git a/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibPei.inf b/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibPei.inf
index 23ceb8df75..5e9e731a4c 100644
--- a/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibPei.inf
+++ b/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibPei.inf
@@ -9,7 +9,7 @@
 
 [Defines]
   INF_VERSION    = 0x00010017
-  BASE_NAME      = FrameBufferMemDrawLib
+  BASE_NAME      = FrameBufferMemDrawLibPei
   FILE_GUID      = 23E999E3-B231-4076-8791-DA5151BB3DC4
   VERSION_STRING = 1.0
   MODULE_TYPE    = PEIM
@@ -19,25 +19,20 @@
   DebugLib
   FrameBufferBltLib
   MemoryAllocationLib
+  PeiServicesLib
 
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MsGraphicsPkg/MsGraphicsPkg.dec
 
-##
-## PEIM Version
-##
 [Sources]
   FrameBufferMemDrawLib.c
   FrameBufferMemDrawLibPeim.c
-
-[LibraryClasses]
-  PeiServicesLib
+  FrameBufferMemDrawLib.h
 
 [Ppis]
   gEfiPeiGraphicsPpiGuid
 
 [Depex]
   gEfiPeiGraphicsPpiGuid
-
diff --git a/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibPeim.c b/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibPeim.c
index 05e73c180c..e9c25b2479 100644
--- a/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibPeim.c
+++ b/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibPeim.c
@@ -10,8 +10,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #include <Ppi/Graphics.h>
 
-#include <Protocol/GraphicsOutput.h>
-
 #include <Library/DebugLib.h>
 #include <Library/PeiServicesLib.h>