\r
#include <stdio.h>\r
#include <stdlib.h>\r
-#include "EfiCommon.h"\r
+#include <UefiBaseTypes.h>\r
+#include <Base.h>\r
#include "EfiImage.h"\r
-#include "EfiImageFormat.h"\r
-#include "EfiFirmwareFileSystem.h"\r
-#include "EfiFirmwareVolumeHeader.h"\r
+#include <FirmwareVolumeImageFormat.h>\r
+#include "FirmwareFileSystem.h"\r
+#include "FirmwareVolumeHeader.h"\r
#include "EfiUtilityMsgs.c"\r
#include "CommonLib.h"\r
\r