\r
#include <stdio.h>\r
\r
-#include "EfiCommon.h"\r
+#include <UefiBaseTypes.h>\r
+#include <Base.h>\r
#include "EfiImage.h"\r
-#include "EfiImageFormat.h"\r
+#include "FirmwareVolumeImageFormat.h"\r
#include "EfiUtilityMsgs.c"\r
\r
#include "SecFixup.h"\r