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