5 files changed, 11 insertions, 10 deletions
diff --git a/DuetPkg/PciBusNoEnumerationDxe/ComponentName.c b/DuetPkg/PciBusNoEnumerationDxe/ComponentName.c
index 48b0dcee2c..647e571d3c 100644
--- a/DuetPkg/PciBusNoEnumerationDxe/ComponentName.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/ComponentName.c
@@ -55,7 +55,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gPciBusComponentName2
 };
 
 
-STATIC EFI_UNICODE_STRING_TABLE mPciBusDriverNameTable[] = {
+EFI_UNICODE_STRING_TABLE mPciBusDriverNameTable[] = {
   { "eng;en", L"PCI Bus Driver" },
   { NULL, NULL }
 };
diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciBus.c b/DuetPkg/PciBusNoEnumerationDxe/PciBus.c
index d50becdb9d..214e3994f6 100644
--- a/DuetPkg/PciBusNoEnumerationDxe/PciBus.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciBus.c
@@ -74,6 +74,9 @@ EFI_DRIVER_BINDING_PROTOCOL                   gPciBusDriverBinding = {
 };
 
 BOOLEAN gFullEnumeration;
+
+UINT64 gAllOne    = 0xFFFFFFFFFFFFFFFFULL;
+UINT64 gAllZero   = 0;
  
 //
 // PCI Bus Driver Support Functions
diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciBus.h b/DuetPkg/PciBusNoEnumerationDxe/PciBus.h
index fe974bee33..420c868bbe 100644
--- a/DuetPkg/PciBusNoEnumerationDxe/PciBus.h
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciBus.h
@@ -204,8 +204,8 @@ extern EFI_COMPONENT_NAME2_PROTOCOL  gPciBusComponentName2;
 extern EFI_DRIVER_BINDING_PROTOCOL  gPciBusDriverBinding;
 
 extern BOOLEAN                     gFullEnumeration;
-static UINT64                      gAllOne = 0xFFFFFFFFFFFFFFFFULL;
-static UINT64                      gAllZero   = 0;
+extern UINT64                      gAllOne;
+extern UINT64                      gAllZero;
 
 #include "PciIo.h"
 #include "PciCommand.h"
diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciIo.c b/DuetPkg/PciBusNoEnumerationDxe/PciIo.c
index 1a0937fe7e..03fc0944a7 100644
--- a/DuetPkg/PciBusNoEnumerationDxe/PciIo.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciIo.c
@@ -267,7 +267,7 @@ PciIoSetBarAttributes(
 //
 // Pci Io Protocol Interface
 //
-static EFI_PCI_IO_PROTOCOL  PciIoInterface = {
+EFI_PCI_IO_PROTOCOL  PciIoInterface = {
   PciIoPollMem,
   PciIoPollIo,
   {
diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c b/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c
index d14a0d56da..7629384bab 100644
--- a/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c
@@ -31,13 +31,12 @@ typedef struct {
   UINT8       Func;
 } EFI_PCI_ROM_IMAGE_MAPPING;
 
-static UINTN                      mNumberOfPciRomImages     = 0;
-static UINTN                      mMaxNumberOfPciRomImages  = 0;
-static EFI_PCI_ROM_IMAGE_MAPPING  *mRomImageTable           = NULL;
+UINTN                      mNumberOfPciRomImages     = 0;
+UINTN                      mMaxNumberOfPciRomImages  = 0;
+EFI_PCI_ROM_IMAGE_MAPPING  *mRomImageTable           = NULL;
 
-static CHAR16 mHexDigit[17] = L"0123456789ABCDEF";
+CHAR16 mHexDigit[17] = L"0123456789ABCDEF";
 
-static
 VOID
 PciRomAddImageMapping (
   IN EFI_HANDLE  ImageHandle,
@@ -77,7 +76,6 @@ PciRomAddImageMapping (
   mNumberOfPciRomImages++;
 }
 
-static
 VOID
 HexToString (
   CHAR16  *String,