//\r
// Include files\r
//\r
-#define EFI_SPECIFICATION_VERSION 0x00020000\r
-#define EDK_RELEASE_VERSION 0x00020000\r
#ifdef __GNUC__\r
#include <uuid/uuid.h>\r
#include <sys/stat.h>\r
#include <io.h>\r
#endif\r
#include <assert.h>\r
-#include <Dxe.h>\r
-#include <Library/PeCoffLib.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/FirmwareVolumeImageFormat.h>\r
+#include <Common/Variable.h>\r
+#include <Common/WorkingBlockHeader.h>\r
+#include <Guid/FirmwareFileSystem.h>\r
+\r
#include "GenFvImageLib.h"\r
#include "GenFvImageLibInternal.h"\r
-#include <CommonLib.h>\r
-#include <FirmwareVolumeImageFormat.h>\r
-#include <Crc32.h>\r
-#include <EfiUtilityMsgs.h>\r
-#include <FvLib.h>\r
-#include <EfiCompress.h>\r
-#include <Variable.h>\r
-#include <WinNtInclude.h>\r
-#include <WorkingBlockHeader.h>\r
+#include "CommonLib.h"\r
+#include "Crc32.h"\r
+#include "EfiUtilityMsgs.h"\r
+#include "FvLib.h"\r
+#include "EfiCompress.h"\r
+#include "WinNtInclude.h"\r
\r
\r
//\r