#include <stdlib.h>\r
#include <string.h>\r
#include <ctype.h> // for tolower()\r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <MultiPhase.h>\r
-#include <BaseLib.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/MultiPhase.h>\r
+#include <Common/InternalFormRepresentation.h>\r
+#include <Protocol/UgaDraw.h> // for EFI_UGA_PIXEL definition\r
+#include <Protocol/Hii.h>\r
+\r
#include "EfiUtilityMsgs.h"\r
#include "StrGather.h"\r
#include "StringDB.h"\r
-#include "InternalFormRepresentation.h"\r
\r
-// #include EFI_PROTOCOL_DEFINITION (Hii)\r
-#include <UgaDraw.h>\r
-#include <Hii.h>\r
\r
#define STRING_OFFSET RELOFST\r
\r