\r
--*/\r
\r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include "FirmwareVolumeImageFormat.h"\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include <string.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+#include <Protocol/GuidedSectionExtraction.h>\r
+\r
#include "CommonLib.h"\r
#include "EfiCompress.h"\r
#include "EfiCustomizedCompress.h"\r
#include "Crc32.h"\r
#include "EfiUtilityMsgs.h"\r
-\r
-#include <stdio.h>\r
-#include <stdlib.h>\r
-#include <string.h>\r
-\r
#include "GenSection.h"\r
\r
-#include <GuidedSectionExtraction.h>\r
\r
#define UTILITY_NAME "GenSection"\r
\r