diff --git a/modules/audio_processing/aec3/echo_canceller3.cc b/modules/audio_processing/aec3/echo_canceller3.cc
index a0cf4f9a82..d478896e71 100644
--- a/modules/audio_processing/aec3/echo_canceller3.cc
+++ b/modules/audio_processing/aec3/echo_canceller3.cc
@@ -9,8 +9,6 @@
  */
 #include "modules/audio_processing/aec3/echo_canceller3.h"
 
-#include <sstream>
-
 #include "modules/audio_processing/logging/apm_data_dumper.h"
 #include "rtc_base/atomicops.h"
 #include "rtc_base/logging.h"
diff --git a/modules/audio_processing/logging/apm_data_dumper.cc b/modules/audio_processing/logging/apm_data_dumper.cc
index 2f6a6d6a80..e2e8602b98 100644
--- a/modules/audio_processing/logging/apm_data_dumper.cc
+++ b/modules/audio_processing/logging/apm_data_dumper.cc
@@ -10,8 +10,7 @@
 
 #include "modules/audio_processing/logging/apm_data_dumper.h"
 
-#include <sstream>
-
+#include "rtc_base/strings/string_builder.h"
 #include "rtc_base/stringutils.h"
 
 // Check to verify that the define is properly set.
@@ -29,7 +28,8 @@ std::string FormFileName(const char* name,
                          int instance_index,
                          int reinit_index,
                          const std::string& suffix) {
-  std::stringstream ss;
+  char buf[1024];
+  rtc::SimpleStringBuilder ss(buf);
   ss << name << "_" << instance_index << "-" << reinit_index << suffix;
   return ss.str();
 }