-extern EFI_GUID gHandleParsingHiiGuid;\r
-extern EFI_GUID gShellDebug1HiiGuid;\r
-extern EFI_GUID gShellDriver1HiiGuid;\r
-extern EFI_GUID gShellInstall1HiiGuid;\r
-extern EFI_GUID gShellLevel1HiiGuid;\r
-extern EFI_GUID gShellLevel2HiiGuid;\r
-extern EFI_GUID gShellLevel3HiiGuid;\r
-extern EFI_GUID gShellNetwork1HiiGuid;\r
+#define SHELL_NETWORK2_HII_GUID \\r
+ { \\r
+ 0x174b2b5, 0xf505, 0x4b12, { 0xaa, 0x60, 0x59, 0xdf, 0xf8, 0xd6, 0xea, 0x37 } \\r
+ }\r
+\r
+#define SHELL_TFTP_HII_GUID \\r
+ { \\r
+ 0x738a9314, 0x82c1, 0x4592, { 0x8f, 0xf7, 0xc1, 0xbd, 0xf1, 0xb2, 0x0e, 0xd4 } \\r
+ }\r
+\r
+#define SHELL_HTTP_HII_GUID \\r
+ { \\r
+ 0x390f84b3, 0x221c, 0x4d9e, { 0xb5, 0x06, 0x6d, 0xb9, 0x42, 0x3e, 0x0a, 0x7e } \\r
+ }\r
+\r
+#define SHELL_BCFG_HII_GUID \\r
+ { \\r
+ 0x5f5f605d, 0x1583, 0x4a2d, {0xa6, 0xb2, 0xeb, 0x12, 0xda, 0xb4, 0xa2, 0xb6 } \\r
+ }\r
+\r
+extern EFI_GUID gHandleParsingHiiGuid;\r
+extern EFI_GUID gShellDebug1HiiGuid;\r
+extern EFI_GUID gShellDriver1HiiGuid;\r
+extern EFI_GUID gShellInstall1HiiGuid;\r
+extern EFI_GUID gShellLevel1HiiGuid;\r
+extern EFI_GUID gShellLevel2HiiGuid;\r
+extern EFI_GUID gShellLevel3HiiGuid;\r
+extern EFI_GUID gShellNetwork1HiiGuid;\r
+extern EFI_GUID gShellNetwork2HiiGuid;\r
+extern EFI_GUID gShellTftpHiiGuid;\r
+extern EFI_GUID gShellHttpHiiGuid;\r
+extern EFI_GUID gShellBcfgHiiGuid;\r