#include <stdio.h> // for FILE routines\r
#include <stdlib.h> // for malloc() and free()\r
\r
-#include <Base.h>\r
-#include <UefiBaseTypes.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> // for EFI_UGA_PIXEL definition\r
+#include <Protocol/Hii.h>\r
+\r
#include "EfiUtilityMsgs.h"\r
#include "EfiVfr.h"\r
#include "VfrServices.h"\r
\r
-#include <UgaDraw.h>\r
-#include <Hii.h>\r
\r
static const char *mSourceFileHeader[] = {\r
"//",\r