diff --git a/inc/efidef.h b/inc/efidef.h
index c67ba23..d266980 100644
--- a/inc/efidef.h
+++ b/inc/efidef.h
@@ -80,6 +80,10 @@ typedef VOID            *EFI_EVENT;
     #define OPTIONAL
 #endif
 
+// STATIC - Name is internal to the module
+#define STATIC      static
+
+
 
 //
 // A GUID
diff --git a/inc/efilib.h b/inc/efilib.h
index 3502265..06d5ebd 100644
--- a/inc/efilib.h
+++ b/inc/efilib.h
@@ -211,12 +211,10 @@ extern EFI_DEVICE_PATH EndInstanceDevicePath[];
 extern EFI_MEMORY_TYPE PoolAllocationType;
 
 //
-// STATIC - Name is internal to the module
 // INTERNAL - Name is internal to the component (i.e., directory)
 // BOOTSERVCE - Name of a boot service function
 //
 
-#define STATIC      static
 #define INTERNAL
 #define BOOTSERVICE
 
diff --git a/inc/legacy.h b/inc/legacy.h
index 34f2157..a3a6efc 100644
--- a/inc/legacy.h
+++ b/inc/legacy.h
@@ -27,7 +27,7 @@ ReallocatePool_1 (
         IN VOID   *OldPool  OPTIONAL
 );
 
-static
+STATIC
 inline
 VOID *
 EFIAPI
@@ -77,7 +77,7 @@ CompareGuid_1 (
     IN CONST EFI_GUID     *Guid2
 );
 
-static
+STATIC
 inline
 INTN
 EFIAPI