Snap for 12482619 from 370e0b070b84e7d5d76f7c576aa7bf713e899be4 to 25Q1-release
Change-Id: Ie5b622dc6220f7c5efb033450269d399ad0fadb5
diff --git a/payload_generator/full_update_generator.h b/payload_generator/full_update_generator.h
index e17dd37..b6d2c96 100644
--- a/payload_generator/full_update_generator.h
+++ b/payload_generator/full_update_generator.h
@@ -20,7 +20,7 @@
#include <string>
#include <vector>
-#include <base/macros.h>
+#include <android-base/macros.h>
#include "update_engine/payload_generator/blob_file_writer.h"
#include "update_engine/payload_generator/operations_generator.h"
diff --git a/payload_generator/payload_file.cc b/payload_generator/payload_file.cc
index 8f5b826..a1734c7 100644
--- a/payload_generator/payload_file.cc
+++ b/payload_generator/payload_file.cc
@@ -22,8 +22,6 @@
#include <map>
#include <utility>
-#include <base/strings/stringprintf.h>
-
#include "update_engine/common/hash_calculator.h"
#include "update_engine/common/utils.h"
#include "update_engine/payload_consumer/file_writer.h"
diff --git a/payload_generator/xz_android.cc b/payload_generator/xz_android.cc
index 97e2c32..1c93a6b 100644
--- a/payload_generator/xz_android.cc
+++ b/payload_generator/xz_android.cc
@@ -18,10 +18,10 @@
#include <algorithm>
+#include <android-base/logging.h>
#include <7zCrc.h>
#include <Xz.h>
#include <XzEnc.h>
-#include <base/logging.h>
namespace {