diff --git a/fastboot/fastboot_driver.h b/fastboot/fastboot_driver.h
index f60c9f1c3..64e3c2b86 100644
--- a/fastboot/fastboot_driver.h
+++ b/fastboot/fastboot_driver.h
@@ -33,7 +33,6 @@
 #include <vector>
 
 #include <android-base/endian.h>
-#include <android-base/logging.h>
 #include <android-base/stringprintf.h>
 #include <android-base/unique_fd.h>
 #include <bootimg.h>
diff --git a/fastboot/task.cpp b/fastboot/task.cpp
index de48a16de..d43fd8084 100644
--- a/fastboot/task.cpp
+++ b/fastboot/task.cpp
@@ -14,13 +14,16 @@
 // limitations under the License.
 //
 #include "task.h"
+
 #include <iostream>
+
+#include <android-base/logging.h>
+#include <android-base/parseint.h>
+
 #include "fastboot.h"
 #include "filesystem.h"
 #include "super_flash_helper.h"
 
-#include <android-base/parseint.h>
-
 using namespace std::string_literals;
 FlashTask::FlashTask(const std::string& _slot, const std::string& _pname, const std::string& _fname,
                      const bool apply_vbmeta)