diff --git a/User/Include/UserGlobalVar.h b/User/Include/UserGlobalVar.h
index c0dc6161..df41ffcc 100644
--- a/User/Include/UserGlobalVar.h
+++ b/User/Include/UserGlobalVar.h
@@ -71,9 +71,11 @@ extern EFI_GUID     gEfiLegacyRegionProtocolGuid;
 extern EFI_GUID     gEfiLegacyRegion2ProtocolGuid;
 extern EFI_GUID     gEfiPciRootBridgeIoProtocolGuid;
 extern EFI_GUID     gEfiSmbiosTableGuid;
+extern EFI_GUID     gEfiUnicodeCollationProtocolGuid;
 extern EFI_GUID     gEfiUnicodeCollation2ProtocolGuid;
 extern EFI_GUID     gEfiFileSystemInfoGuid;
 extern EFI_GUID     gEfiDiskIoProtocolGuid;
+extern EFI_GUID     gEfiDiskIo2ProtocolGuid;
 extern EFI_GUID     gEfiBlockIoProtocolGuid;
 extern EFI_GUID     gEfiDriverBindingProtocolGuid;
 extern EFI_GUID     gEfiComponentNameProtocolGuid;
diff --git a/User/Library/UserGlobalVar.c b/User/Library/UserGlobalVar.c
index ee37d558..f4ddd879 100644
--- a/User/Library/UserGlobalVar.c
+++ b/User/Library/UserGlobalVar.c
@@ -157,6 +157,9 @@ EFI_GUID     gEfiPciRootBridgeIoProtocolGuid = {
 EFI_GUID     gEfiSmbiosTableGuid = {
   0xEB9D2D31, 0x2D88, 0x11D3, { 0x9A, 0x16, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }
 };
+EFI_GUID     gEfiUnicodeCollationProtocolGuid = {
+  0x1D85CD7F, 0xF43D, 0x11D2, { 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }
+};
 EFI_GUID     gEfiUnicodeCollation2ProtocolGuid = {
   0xa4c751fc, 0x23ae, 0x4c3e, { 0x92, 0xe9, 0x49, 0x64, 0xcf, 0x63, 0xf3, 0x49 }
 };
@@ -166,6 +169,9 @@ EFI_GUID     gEfiFileSystemInfoGuid = {
 EFI_GUID     gEfiDiskIoProtocolGuid = {
   0xCE345171, 0xBA0B, 0x11D2, { 0x8E, 0x4F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }
 };
+EFI_GUID     gEfiDiskIo2ProtocolGuid = {
+  0x151c8eae, 0x7f2c, 0x472c, { 0x9e, 0x54, 0x98, 0x28, 0x19, 0x4f, 0x6a, 0x88 }
+};
 EFI_GUID     gEfiBlockIoProtocolGuid = {
   0x964E5B21, 0x6459, 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }
 };
diff --git a/Utilities/TestExt4Dxe/TestExt4Dxe.c b/Utilities/TestExt4Dxe/TestExt4Dxe.c
index 56237efa..f4351e7d 100755
--- a/Utilities/TestExt4Dxe/TestExt4Dxe.c
+++ b/Utilities/TestExt4Dxe/TestExt4Dxe.c
@@ -5,6 +5,8 @@
 #include <Ext4Dxe.h>
 
 #include <UserFile.h>
+#include <UserGlobalVar.h>
+#include <UserMemory.h>
 #include <string.h>
 
 #define MAP_TABLE_SIZE  0x100
@@ -12,13 +14,6 @@
 
 #define TO_UPPER(a)  (CHAR16) ((a) <= 0xFF ? mEngUpperMap[a] : (a))
 
-EFI_GUID  gEfiUnicodeCollationProtocolGuid = {
-  0x1D85CD7F, 0xF43D, 0x11D2, { 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }
-};
-EFI_GUID  gEfiDiskIo2ProtocolGuid = {
-  0x151c8eae, 0x7f2c, 0x472c, { 0x9e, 0x54, 0x98, 0x28, 0x19, 0x4f, 0x6a, 0x88 }
-};
-
 UINT8  _gPcd_FixedAtBuild_PcdUefiVariableDefaultLang[4]         = { 101, 110, 103, 0 };
 UINT8  _gPcd_FixedAtBuild_PcdUefiVariableDefaultPlatformLang[6] = { 101, 110, 45, 85, 83, 0 };