\r
#header<<\r
\r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <CommonLib.h>\r
-#include <MultiPhase.h>\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/MultiPhase.h>\r
+#include <Common/InternalFormRepresentation.h>\r
+#include <Protocol/UgaDraw.h>\r
+#include <Protocol/Hii.h>\r
+\r
+#include "CommonLib.h"\r
#include "EfiUtilityMsgs.h"\r
#include "EfiVfr.h"\r
#include "VfrServices.h"\r
-#include <UgaDraw.h>\r
-#include <Hii.h>\r
\r
#include <ctype.h>\r
#ifndef __GNUC__\r