\r
--*/\r
\r
-#include <UefiBaseTypes.h>\r
-#include <Base.h>\r
#include <stdlib.h>\r
#include <stdio.h>\r
#include <string.h>\r
-#include "CommonLib.h"\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+#include <Common/FirmwareFileSystem.h>\r
+#include <Library/PeCoffLib.h>\r
+\r
#include "ParseInf.h"\r
#include "FvLib.h"\r
-\r
#include "EfiUtilityMsgs.h"\r
-#include "FirmwareFileSystem.h"\r
-#include "PeCoffLib.h"\r
-\r
#include "PeiRebaseExe.h"\r
\r
EFI_STATUS\r