diff --git a/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLib.h b/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLib.h
index da408d83bc..d0cb00d934 100644
--- a/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLib.h
+++ b/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLib.h
@@ -6,6 +6,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
+#ifndef FRAMEBUFFER_MEM_DRAW_LIB_INTERNAL_H_
+#define FRAMEBUFFER_MEM_DRAW_LIB_INTERNAL_H_
+
 /**
   Get pertenant information about the frame buffer
 
@@ -16,3 +19,5 @@ EFI_STATUS
 GetGraphicsInfo (
   EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE  **Mode
   );
+
+#endif
diff --git a/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibDxe.c b/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibDxe.c
index 1ee4a42127..80cbb4d264 100644
--- a/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibDxe.c
+++ b/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibDxe.c
@@ -22,7 +22,6 @@ STATIC EFI_GRAPHICS_OUTPUT_PROTOCOL  *mGraphicsOutput = NULL;
  Get Graphics Information
 */
 EFI_STATUS
-EFIAPI
 GetGraphicsInfo (
   EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE  **Mode
   )
diff --git a/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibPeim.c b/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibPeim.c
index e5c3210794..05e73c180c 100644
--- a/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibPeim.c
+++ b/MsGraphicsPkg/Library/FrameBufferMemDrawLib/FrameBufferMemDrawLibPeim.c
@@ -23,7 +23,6 @@ STATIC BOOLEAN                               mInitialized = FALSE;
  Get Graphics Information
 */
 EFI_STATUS
-EFIAPI
 GetGraphicsInfo (
   EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE  **Mode
   )