diff --git a/src/google/protobuf/any.cc b/src/google/protobuf/any.cc
index c6c914b3ac..a10b68969c 100644
--- a/src/google/protobuf/any.cc
+++ b/src/google/protobuf/any.cc
@@ -7,7 +7,7 @@
 
 #include "google/protobuf/any.h"
 
-#include "google/protobuf/arenastring.h"
+#include "absl/strings/string_view.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/generated_message_util.h"
 #include "google/protobuf/message.h"
diff --git a/src/google/protobuf/any.h b/src/google/protobuf/any.h
index 03ddf3f543..539ead0779 100644
--- a/src/google/protobuf/any.h
+++ b/src/google/protobuf/any.h
@@ -10,6 +10,7 @@
 
 #include <string>
 
+#include "absl/strings/string_view.h"
 #include "google/protobuf/port.h"
 #include "google/protobuf/arenastring.h"
 #include "google/protobuf/message_lite.h"
diff --git a/src/google/protobuf/any_lite.cc b/src/google/protobuf/any_lite.cc
index 0ea35922c2..02188aed5c 100644
--- a/src/google/protobuf/any_lite.cc
+++ b/src/google/protobuf/any_lite.cc
@@ -5,12 +5,16 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <cstdlib>
+#include <string>
+
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"
 #include "google/protobuf/any.h"
-#include "google/protobuf/arenastring.h"
 #include "google/protobuf/generated_message_util.h"
 #include "google/protobuf/io/zero_copy_stream_impl_lite.h"
+#include "google/protobuf/message_lite.h"
 
 namespace google {
 namespace protobuf {
diff --git a/src/google/protobuf/any_test.cc b/src/google/protobuf/any_test.cc
index f8f4eb98b3..c5fb2bcace 100644
--- a/src/google/protobuf/any_test.cc
+++ b/src/google/protobuf/any_test.cc
@@ -5,9 +5,14 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <limits.h>
+
+#include <cstdlib>
+#include <string>
+#include <utility>
+
 #include "google/protobuf/any.pb.h"
 #include <gtest/gtest.h>
-#include "absl/strings/str_cat.h"
 #include "google/protobuf/any_test.pb.h"
 #include "google/protobuf/unittest.pb.h"