\r
--*/\r
\r
-#include "Base.h"\r
-#include "UefiBaseTypes.h"\r
-#include "FirmwareVolumeImageFormat.h"\r
-#include "FirmwareFileSystem.h"\r
-#include "FirmwareVolumeHeader.h"\r
-#include "FirmwareVolumeImageFormat.h"\r
-#include "ParseInf.h"\r
-#include "EfiCompress.h"\r
-#include "EfiCustomizedCompress.h"\r
-#include "Crc32.h"\r
-#include "GenFfsFile.h"\r
#include <stdio.h>\r
#include <ctype.h> // for isalpha()\r
//\r
#endif\r
#include <stdlib.h>\r
#include <string.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+#include <Common/FirmwareFileSystem.h>\r
+#include <Common/FirmwareVolumeHeader.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+\r
+#include "ParseInf.h"\r
+#include "EfiCompress.h"\r
+#include "EfiCustomizedCompress.h"\r
+#include "Crc32.h"\r
+#include "GenFfsFile.h"\r
#include "CommonLib.h"\r
#include "EfiUtilityMsgs.h"\r
#include "SimpleFileParsing.h"\r