diff --git a/MdeModulePkg/Library/EdkFvbServiceLib/Fvb.c b/MdeModulePkg/Library/EdkFvbServiceLib/Fvb.c
index d1aa6041dd..65a2ac8c6f 100644
--- a/MdeModulePkg/Library/EdkFvbServiceLib/Fvb.c
+++ b/MdeModulePkg/Library/EdkFvbServiceLib/Fvb.c
@@ -27,14 +27,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //
 // Event for Set Virtual Map Changed Event
 //
-STATIC EFI_EVENT mSetVirtualMapChangedEvent = NULL;
+EFI_EVENT mSetVirtualMapChangedEvent = NULL;
 
 //
 // Lib will ASSERT if more FVB devices than this are added to the system.
 //
-STATIC FVB_ENTRY          *mFvbEntry;
-STATIC EFI_EVENT          mFvbRegistration;
-STATIC UINTN              mFvbCount;
+FVB_ENTRY          *mFvbEntry;
+EFI_EVENT          mFvbRegistration;
+UINTN              mFvbCount;
 
 /**
   Check whether an address is runtime memory or not.
@@ -135,7 +135,6 @@ IsRuntimeMemory (
   @param Context    Event Context
 
 **/
-STATIC
 VOID
 EFIAPI
 FvbNotificationEvent (
diff --git a/MdeModulePkg/Library/GraphicsLib/Graphics.c b/MdeModulePkg/Library/GraphicsLib/Graphics.c
index bbf07feddd..82c16594e8 100644
--- a/MdeModulePkg/Library/GraphicsLib/Graphics.c
+++ b/MdeModulePkg/Library/GraphicsLib/Graphics.c
@@ -38,7 +38,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/DxePiLib.h>
 #include <Library/PcdLib.h>
 
-STATIC EFI_GRAPHICS_OUTPUT_BLT_PIXEL mEfiColors[16] = {
+EFI_GRAPHICS_OUTPUT_BLT_PIXEL mEfiColors[16] = {
   { 0x00, 0x00, 0x00, 0x00 },
   { 0x98, 0x00, 0x00, 0x00 },
   { 0x00, 0x98, 0x00, 0x00 },