diff --git a/src/core/BUILD b/src/core/BUILD
index 182485353ca..95245d1e5e5 100644
--- a/src/core/BUILD
+++ b/src/core/BUILD
@@ -6712,6 +6712,9 @@ grpc_cc_library(
     hdrs = [
         "lib/transport/message.h",
     ],
+    external_deps = [
+        "absl/strings",
+    ],
     deps = [
         "arena",
         "slice_buffer",
diff --git a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc
index 74f7392af9d..0b14723e214 100644
--- a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc
+++ b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc
@@ -18,6 +18,10 @@
 #include <AvailabilityMacros.h>
 #ifdef AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER
 
+#include "absl/status/status.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
+
 #include "src/core/lib/event_engine/cf_engine/cfstream_endpoint.h"
 #include "src/core/lib/event_engine/trace.h"
 #include "src/core/lib/gprpp/strerror.h"
diff --git a/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc b/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc
index a00ed40225b..ab318238c02 100644
--- a/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc
+++ b/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc
@@ -20,6 +20,7 @@
 
 #include <string>
 
+#include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 
 #include <grpc/event_engine/event_engine.h>
diff --git a/src/core/lib/gprpp/windows/directory_reader.cc b/src/core/lib/gprpp/windows/directory_reader.cc
index 790e213e789..3d45ee6532d 100644
--- a/src/core/lib/gprpp/windows/directory_reader.cc
+++ b/src/core/lib/gprpp/windows/directory_reader.cc
@@ -27,6 +27,7 @@
 #include <vector>
 
 #include "absl/status/statusor.h"
+#include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 
 #include <grpc/support/log.h>
diff --git a/src/core/lib/transport/message.cc b/src/core/lib/transport/message.cc
index 52602dcb7a2..6429fb2e445 100644
--- a/src/core/lib/transport/message.cc
+++ b/src/core/lib/transport/message.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/lib/transport/message.h"
 
+#include "absl/strings/str_cat.h"
+
 #include <grpc/impl/grpc_types.h>
 
 namespace grpc_core {
diff --git a/test/cpp/util/channelz_sampler.cc b/test/cpp/util/channelz_sampler.cc
index 60c0e126ded..db9c600c516 100644
--- a/test/cpp/util/channelz_sampler.cc
+++ b/test/cpp/util/channelz_sampler.cc
@@ -21,6 +21,7 @@
 
 #include <cstdlib>
 #include <fstream>
+#include <iomanip>
 #include <iostream>
 #include <memory>
 #include <ostream>