diff --git a/client/crash_report_database_win.cc b/client/crash_report_database_win.cc
index a5fd38c..0195f6b 100644
--- a/client/crash_report_database_win.cc
+++ b/client/crash_report_database_win.cc
@@ -25,7 +25,6 @@
 
 #include "base/logging.h"
 #include "base/numerics/safe_math.h"
-#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "client/settings.h"
 #include "util/file/directory_reader.h"
diff --git a/client/crashpad_client_fuchsia.cc b/client/crashpad_client_fuchsia.cc
index f9d1687..46afe00 100644
--- a/client/crashpad_client_fuchsia.cc
+++ b/client/crashpad_client_fuchsia.cc
@@ -22,7 +22,6 @@
 
 #include "base/fuchsia/fuchsia_logging.h"
 #include "base/logging.h"
-#include "base/strings/stringprintf.h"
 #include "client/client_argv_handling.h"
 
 namespace crashpad {
diff --git a/client/simulate_crash_mac.cc b/client/simulate_crash_mac.cc
index 0db32c5..48d81a0 100644
--- a/client/simulate_crash_mac.cc
+++ b/client/simulate_crash_mac.cc
@@ -22,7 +22,6 @@
 #include "base/logging.h"
 #include "base/mac/mach_logging.h"
 #include "base/mac/scoped_mach_port.h"
-#include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "util/mach/exc_client_variants.h"
 #include "util/mach/exception_behaviors.h"
diff --git a/handler/win/self_destroying_test_program.cc b/handler/win/self_destroying_test_program.cc
index 672e4df..8466ff2 100644
--- a/handler/win/self_destroying_test_program.cc
+++ b/handler/win/self_destroying_test_program.cc
@@ -18,7 +18,6 @@
 #include <winternl.h>
 
 #include "base/logging.h"
-#include "base/strings/stringprintf.h"
 #include "client/crashpad_client.h"
 #include "snapshot/win/process_reader_win.h"
 
diff --git a/snapshot/ios/exception_snapshot_ios_intermediate_dump.cc b/snapshot/ios/exception_snapshot_ios_intermediate_dump.cc
index a46880f..0d24029 100644
--- a/snapshot/ios/exception_snapshot_ios_intermediate_dump.cc
+++ b/snapshot/ios/exception_snapshot_ios_intermediate_dump.cc
@@ -16,7 +16,6 @@
 
 #include "base/logging.h"
 #include "base/mac/mach_logging.h"
-#include "base/strings/stringprintf.h"
 #include "snapshot/cpu_context.h"
 #include "snapshot/ios/intermediate_dump_reader_util.h"
 #include "snapshot/mac/cpu_context_mac.h"
diff --git a/snapshot/ios/process_snapshot_ios_intermediate_dump_test.cc b/snapshot/ios/process_snapshot_ios_intermediate_dump_test.cc
index 1dff588..9710439 100644
--- a/snapshot/ios/process_snapshot_ios_intermediate_dump_test.cc
+++ b/snapshot/ios/process_snapshot_ios_intermediate_dump_test.cc
@@ -19,6 +19,7 @@
 #include "base/cxx17_backports.h"
 #include "base/files/scoped_file.h"
 #include "base/posix/eintr_wrapper.h"
+#include "build/build_config.h"
 #include "client/annotation.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_file_writer.h"
diff --git a/snapshot/mac/module_snapshot_mac.cc b/snapshot/mac/module_snapshot_mac.cc
index 947744d..9064835 100644
--- a/snapshot/mac/module_snapshot_mac.cc
+++ b/snapshot/mac/module_snapshot_mac.cc
@@ -18,7 +18,6 @@
 #include <mach/mach.h>
 
 #include "base/files/file_path.h"
-#include "base/strings/stringprintf.h"
 #include "snapshot/mac/mach_o_image_annotations_reader.h"
 #include "snapshot/mac/mach_o_image_reader.h"
 #include "util/misc/tri_state.h"
diff --git a/snapshot/posix/timezone.cc b/snapshot/posix/timezone.cc
index 7a2f340..c413d70 100644
--- a/snapshot/posix/timezone.cc
+++ b/snapshot/posix/timezone.cc
@@ -17,6 +17,7 @@
 #include <stddef.h>
 #include <time.h>
 
+#include "base/check.h"
 #include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "build/build_config.h"
diff --git a/snapshot/win/process_reader_win.cc b/snapshot/win/process_reader_win.cc
index 51940c0..e3784ca 100644
--- a/snapshot/win/process_reader_win.cc
+++ b/snapshot/win/process_reader_win.cc
@@ -20,7 +20,6 @@
 #include <memory>
 
 #include "base/numerics/safe_conversions.h"
-#include "base/strings/stringprintf.h"
 #include "util/misc/capture_context.h"
 #include "util/misc/time.h"
 #include "util/win/nt_internals.h"
diff --git a/test/win/win_multiprocess.cc b/test/win/win_multiprocess.cc
index 2a17299..645effc 100644
--- a/test/win/win_multiprocess.cc
+++ b/test/win/win_multiprocess.cc
@@ -18,7 +18,6 @@
 
 #include "base/check.h"
 #include "base/scoped_generic.h"
-#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "util/stdlib/string_number_conversion.h"
 #include "util/string/split_string.h"
diff --git a/tools/mac/exception_port_tool.cc b/tools/mac/exception_port_tool.cc
index b9d3fdd..9e977b4 100644
--- a/tools/mac/exception_port_tool.cc
+++ b/tools/mac/exception_port_tool.cc
@@ -28,7 +28,6 @@
 #include "base/mac/mach_logging.h"
 #include "base/mac/scoped_mach_port.h"
 #include "base/macros.h"
-#include "base/strings/stringprintf.h"
 #include "tools/tool_support.h"
 #include "util/mach/bootstrap.h"
 #include "util/mach/exception_ports.h"
diff --git a/util/mac/xattr_test.cc b/util/mac/xattr_test.cc
index 56318d1..50031dc 100644
--- a/util/mac/xattr_test.cc
+++ b/util/mac/xattr_test.cc
@@ -22,7 +22,6 @@
 
 #include "base/files/scoped_file.h"
 #include "base/posix/eintr_wrapper.h"
-#include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 #include "test/errors.h"
 #include "test/scoped_temp_dir.h"
diff --git a/util/mach/exception_ports_test.cc b/util/mach/exception_ports_test.cc
index ef79808..d3a211f 100644
--- a/util/mach/exception_ports_test.cc
+++ b/util/mach/exception_ports_test.cc
@@ -24,7 +24,6 @@
 #include "base/mac/scoped_mach_port.h"
 #include "base/macros.h"
 #include "base/notreached.h"
-#include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "test/mac/mach_errors.h"
diff --git a/util/stream/zlib_output_stream.cc b/util/stream/zlib_output_stream.cc
index 2a03cd1..3ae7d91 100644
--- a/util/stream/zlib_output_stream.cc
+++ b/util/stream/zlib_output_stream.cc
@@ -14,6 +14,7 @@
 
 #include "util/stream/zlib_output_stream.h"
 
+#include "base/check.h"
 #include "base/cxx17_backports.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
diff --git a/util/win/exception_handler_server.cc b/util/win/exception_handler_server.cc
index 3ece556..9394256 100644
--- a/util/win/exception_handler_server.cc
+++ b/util/win/exception_handler_server.cc
@@ -24,7 +24,6 @@
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/rand_util.h"
-#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "util/file/file_writer.h"
 #include "util/misc/tri_state.h"