#include <stdlib.h>\r
#include <ctype.h>\r
\r
-#include "Tiano.h" // need a guid definition\r
+#include <UefiBaseTypes.h>\r
+#include <Base.h>\r
+#include <CommonLib.h>\r
+\r
#include "EfiUtilityMsgs.h"\r
-#include "EfiCapsule.h"\r
-#include "EfiFirmwareVolumeHeader.h"\r
-#include "EfiFirmwareFileSystem.h" // for FV header GUID\r
+#include "MultiPhase.h"\r
+#include "Capsule.h"\r
+#include "Guid/Capsule.h"\r
+#include "FirmwareVolumeImageFormat.h"\r
+#include "FirmwareVolumeHeader.h"\r
+#include "FirmwareFileSystem.h" // for FV header GUID\r
+#include "Guid/FirmwareFileSystem.h" // for FV header GUID\r
#define MAX_PATH 256\r
#define PROGRAM_NAME "GenCapsuleHdr"\r
\r