Merge "Fixing circular dependency" am: 37673f0bf5 am: 05bfd352be am: 7d9cfa4826

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2541230

Change-Id: I48ca36d548378a033c694b5cd27e4fb493f84922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fastboot/task.h b/fastboot/task.h
index e80f88d..801a0f6 100644
--- a/fastboot/task.h
+++ b/fastboot/task.h
@@ -18,11 +18,14 @@
 #include <sstream>
 #include <string>
 
-#include "fastboot.h"
 #include "fastboot_driver.h"
 #include "super_flash_helper.h"
 #include "util.h"
 
+struct FlashingPlan;
+struct Image;
+using ImageEntry = std::pair<const Image*, std::string>;
+
 class Task {
   public:
     Task() = default;