diff --git a/aosp/hardware_android.h b/aosp/hardware_android.h
index d20e8df..cb655c9 100644
--- a/aosp/hardware_android.h
+++ b/aosp/hardware_android.h
@@ -20,7 +20,7 @@
 #include <string>
 #include <string_view>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 #include <base/time/time.h>
 
 #include "update_engine/common/error_code.h"
diff --git a/aosp/network_selector_android.h b/aosp/network_selector_android.h
index b79d1b3..2a3cb2e 100644
--- a/aosp/network_selector_android.h
+++ b/aosp/network_selector_android.h
@@ -17,7 +17,7 @@
 #ifndef UPDATE_ENGINE_AOSP_NETWORK_SELECTOR_ANDROID_H_
 #define UPDATE_ENGINE_AOSP_NETWORK_SELECTOR_ANDROID_H_
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 #include "update_engine/common/network_selector_interface.h"
 
diff --git a/certificate_checker.h b/certificate_checker.h
index 5d0b5ba..0dc61b2 100644
--- a/certificate_checker.h
+++ b/certificate_checker.h
@@ -22,7 +22,7 @@
 
 #include <string>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 #include <gtest/gtest_prod.h>  // for FRIEND_TEST
 
 namespace chromeos_update_engine {
diff --git a/common/action.h b/common/action.h
index d32322c..e9b5bd4 100644
--- a/common/action.h
+++ b/common/action.h
@@ -23,7 +23,7 @@
 #include <string>
 
 #include <base/logging.h>
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 #include "update_engine/common/action_pipe.h"
 #include "update_engine/common/action_processor.h"
diff --git a/common/action_pipe.h b/common/action_pipe.h
index 4c56812..f1498b1 100644
--- a/common/action_pipe.h
+++ b/common/action_pipe.h
@@ -24,7 +24,7 @@
 #include <string>
 
 #include <base/logging.h>
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 // The structure of these classes (Action, ActionPipe, ActionProcessor, etc.)
 // is based on the KSAction* classes from the Google Update Engine code at
diff --git a/common/action_processor.h b/common/action_processor.h
index 5a4286f..ee7e51c 100644
--- a/common/action_processor.h
+++ b/common/action_processor.h
@@ -21,7 +21,7 @@
 #include <memory>
 #include <vector>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 #include "update_engine/common/error_code.h"
 
diff --git a/common/boot_control_interface.h b/common/boot_control_interface.h
index 2de21a1..045236a 100644
--- a/common/boot_control_interface.h
+++ b/common/boot_control_interface.h
@@ -23,7 +23,7 @@
 #include <vector>
 
 #include <base/callback.h>
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 #include "update_engine/common/dynamic_partition_control_interface.h"
 #include "update_engine/update_metadata.pb.h"
diff --git a/common/dlcservice_interface.h b/common/dlcservice_interface.h
index 7b57710..a075092 100644
--- a/common/dlcservice_interface.h
+++ b/common/dlcservice_interface.h
@@ -21,7 +21,7 @@
 #include <string>
 #include <vector>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 namespace chromeos_update_engine {
 
diff --git a/common/excluder_interface.h b/common/excluder_interface.h
index 1dfd227..81a0c37 100644
--- a/common/excluder_interface.h
+++ b/common/excluder_interface.h
@@ -20,7 +20,7 @@
 #include <memory>
 #include <string>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 namespace chromeos_update_engine {
 
diff --git a/common/fake_prefs.h b/common/fake_prefs.h
index 721cf24..c87c57c 100644
--- a/common/fake_prefs.h
+++ b/common/fake_prefs.h
@@ -23,7 +23,7 @@
 #include <string_view>
 #include <vector>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 #include "update_engine/common/prefs_interface.h"
 
diff --git a/common/file_fetcher.h b/common/file_fetcher.h
index cc0e880..997d487 100644
--- a/common/file_fetcher.h
+++ b/common/file_fetcher.h
@@ -22,7 +22,7 @@
 #include <utility>
 
 #include <base/logging.h>
-#include <base/macros.h>
+#include <android-base/macros.h>
 #include <brillo/streams/stream.h>
 
 #include "update_engine/common/http_fetcher.h"
diff --git a/common/hash_calculator.h b/common/hash_calculator.h
index 36bfcc8..e0a08e3 100644
--- a/common/hash_calculator.h
+++ b/common/hash_calculator.h
@@ -24,7 +24,7 @@
 #include <vector>
 
 #include <base/logging.h>
-#include <base/macros.h>
+#include <android-base/macros.h>
 #include <brillo/secure_blob.h>
 
 // This class provides a simple wrapper around OpenSSL providing a hash of data
diff --git a/common/http_common.cc b/common/http_common.cc
index c8bac47..f05c594 100644
--- a/common/http_common.cc
+++ b/common/http_common.cc
@@ -20,7 +20,7 @@
 
 #include <cstdlib>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 #include <base/stl_util.h>
 
 namespace chromeos_update_engine {
diff --git a/common/http_fetcher.h b/common/http_fetcher.h
index f32c01d..58ee99e 100644
--- a/common/http_fetcher.h
+++ b/common/http_fetcher.h
@@ -24,7 +24,7 @@
 
 #include <base/callback.h>
 #include <base/logging.h>
-#include <base/macros.h>
+#include <android-base/macros.h>
 #include <brillo/message_loops/message_loop.h>
 #include <brillo/secure_blob.h>
 
@@ -47,7 +47,7 @@
   // |proxy_resolver| is the resolver that will be consulted for proxy
   // settings. It may be null, in which case direct connections will
   // be used. Does not take ownership of the resolver.
-  explicit HttpFetcher()
+  HttpFetcher()
       : post_data_set_(false),
         http_response_code_(0),
         delegate_(nullptr),
diff --git a/common/hwid_override.h b/common/hwid_override.h
index d39b572..438993a 100644
--- a/common/hwid_override.h
+++ b/common/hwid_override.h
@@ -21,7 +21,7 @@
 #include <string>
 
 #include <base/files/file_path.h>
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 namespace chromeos_update_engine {
 
diff --git a/common/network_selector_stub.h b/common/network_selector_stub.h
index b32df91..668a66c 100644
--- a/common/network_selector_stub.h
+++ b/common/network_selector_stub.h
@@ -17,7 +17,7 @@
 #ifndef UPDATE_ENGINE_COMMON_NETWORK_SELECTOR_STUB_H_
 #define UPDATE_ENGINE_COMMON_NETWORK_SELECTOR_STUB_H_
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 #include "update_engine/common/network_selector_interface.h"
 
diff --git a/common/prefs_unittest.cc b/common/prefs_unittest.cc
index cef6d44..77c746d 100644
--- a/common/prefs_unittest.cc
+++ b/common/prefs_unittest.cc
@@ -24,7 +24,7 @@
 
 #include <base/files/file_util.h>
 #include <base/files/scoped_temp_dir.h>
-#include <base/macros.h>
+#include <android-base/macros.h>
 #include <base/strings/string_util.h>
 #include <base/strings/stringprintf.h>
 #include <gmock/gmock.h>
diff --git a/common/subprocess.h b/common/subprocess.h
index e59776a..d4edcc9 100644
--- a/common/subprocess.h
+++ b/common/subprocess.h
@@ -27,7 +27,7 @@
 #include <base/callback.h>
 #include <base/files/file_descriptor_watcher_posix.h>
 #include <base/logging.h>
-#include <base/macros.h>
+#include <android-base/macros.h>
 #include <brillo/asynchronous_signal_handler_interface.h>
 #include <brillo/message_loops/message_loop.h>
 #ifdef __CHROMEOS__
diff --git a/fake_file_writer.h b/fake_file_writer.h
index 75507ea..68765d8 100644
--- a/fake_file_writer.h
+++ b/fake_file_writer.h
@@ -19,7 +19,7 @@
 
 #include <vector>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 #include <brillo/secure_blob.h>
 
 #include "update_engine/payload_consumer/file_writer.h"
diff --git a/libcurl_http_fetcher.h b/libcurl_http_fetcher.h
index 0e34f9d..b21cdca 100644
--- a/libcurl_http_fetcher.h
+++ b/libcurl_http_fetcher.h
@@ -26,7 +26,7 @@
 
 #include <base/files/file_descriptor_watcher_posix.h>
 #include <base/logging.h>
-#include <base/macros.h>
+#include <android-base/macros.h>
 #include <brillo/message_loops/message_loop.h>
 
 #include "update_engine/certificate_checker.h"
diff --git a/payload_consumer/certificate_parser_android.h b/payload_consumer/certificate_parser_android.h
index ccb9293..e2a3921 100644
--- a/payload_consumer/certificate_parser_android.h
+++ b/payload_consumer/certificate_parser_android.h
@@ -21,7 +21,7 @@
 #include <string>
 #include <vector>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 #include "payload_consumer/certificate_parser_interface.h"
 
diff --git a/payload_consumer/certificate_parser_stub.h b/payload_consumer/certificate_parser_stub.h
index a51c2c6..4f78efe 100644
--- a/payload_consumer/certificate_parser_stub.h
+++ b/payload_consumer/certificate_parser_stub.h
@@ -21,7 +21,7 @@
 #include <string>
 #include <vector>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 #include "update_engine/payload_consumer/certificate_parser_interface.h"
 
diff --git a/payload_consumer/install_plan.h b/payload_consumer/install_plan.h
index 097c6ce..04f6667 100644
--- a/payload_consumer/install_plan.h
+++ b/payload_consumer/install_plan.h
@@ -20,7 +20,7 @@
 #include <string>
 #include <vector>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 #include <brillo/secure_blob.h>
 
 #include "update_engine/common/action.h"
diff --git a/payload_consumer/payload_metadata.h b/payload_consumer/payload_metadata.h
index a38405d..4d2d5b0 100644
--- a/payload_consumer/payload_metadata.h
+++ b/payload_consumer/payload_metadata.h
@@ -22,7 +22,7 @@
 #include <string>
 #include <vector>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 #include <brillo/secure_blob.h>
 
 #include "update_engine/common/error_code.h"
diff --git a/payload_consumer/verity_writer_interface.h b/payload_consumer/verity_writer_interface.h
index 3ebe768..fee31ee 100644
--- a/payload_consumer/verity_writer_interface.h
+++ b/payload_consumer/verity_writer_interface.h
@@ -20,7 +20,7 @@
 #include <cstdint>
 #include <memory>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 #include "common/utils.h"
 #include "payload_consumer/file_descriptor.h"
diff --git a/payload_generator/blob_file_writer.h b/payload_generator/blob_file_writer.h
index bdd4c08..cd33df6 100644
--- a/payload_generator/blob_file_writer.h
+++ b/payload_generator/blob_file_writer.h
@@ -17,7 +17,7 @@
 #ifndef UPDATE_ENGINE_PAYLOAD_GENERATOR_BLOB_FILE_WRITER_H_
 #define UPDATE_ENGINE_PAYLOAD_GENERATOR_BLOB_FILE_WRITER_H_
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 #include <base/synchronization/lock.h>
 #include <brillo/secure_blob.h>
diff --git a/payload_generator/extent_ranges.h b/payload_generator/extent_ranges.h
index bd468a1..61a4167 100644
--- a/payload_generator/extent_ranges.h
+++ b/payload_generator/extent_ranges.h
@@ -20,7 +20,7 @@
 #include <set>
 #include <vector>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 #include "update_engine/common/utils.h"
 #include "update_engine/payload_generator/extent_utils.h"
diff --git a/payload_generator/extent_utils.cc b/payload_generator/extent_utils.cc
index 851db8a..d318fd2 100644
--- a/payload_generator/extent_utils.cc
+++ b/payload_generator/extent_utils.cc
@@ -18,11 +18,12 @@
 
 #include <inttypes.h>
 
+#include <set>
 #include <string>
 #include <vector>
 
 #include <base/logging.h>
-#include <base/macros.h>
+#include <android-base/macros.h>
 #include <base/strings/stringprintf.h>
 
 #include "update_engine/payload_consumer/payload_constants.h"
diff --git a/payload_generator/payload_signer.h b/payload_generator/payload_signer.h
index 9676b71..297a54e 100644
--- a/payload_generator/payload_signer.h
+++ b/payload_generator/payload_signer.h
@@ -20,7 +20,7 @@
 #include <string>
 #include <vector>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 #include <brillo/key_value_store.h>
 #include <brillo/secure_blob.h>