#include <stdlib.h>\r
#include <ctype.h>\r
\r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <UgaDraw.h>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Guid/Apriori.h>\r
+#include <Guid/AcpiTableStorage.h>\r
+\r
#include "EfiUtilityMsgs.h"\r
\r
-#include <Apriori.h>\r
-#include <AcpiTableStorage.h>\r
-// #include <Bmp.h>\r
\r
#define GUID_XREF(varname, guid) { \\r
#varname, #guid, guid \\r