diff --git a/src/google/protobuf/varint_shuffle_test.cc b/src/google/protobuf/varint_shuffle_test.cc
index aeb88f4a66f42..5cbce10a6647c 100644
--- a/src/google/protobuf/varint_shuffle_test.cc
+++ b/src/google/protobuf/varint_shuffle_test.cc
@@ -7,6 +7,7 @@
 
 #include "google/protobuf/varint_shuffle.h"
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/src/google/protobuf/wire_format_unittest.cc b/src/google/protobuf/wire_format_unittest.cc
index 2acfa84fe80cc..23490bb9d27de 100644
--- a/src/google/protobuf/wire_format_unittest.cc
+++ b/src/google/protobuf/wire_format_unittest.cc
@@ -18,9 +18,9 @@
 #include "absl/base/casts.h"
 #include "absl/strings/cord.h"
 #include "absl/strings/string_view.h"
+#include "google/protobuf/parse_context.h"
 #include "google/protobuf/repeated_ptr_field.h"
 #include "google/protobuf/unittest.pb.h"
-#include "google/protobuf/unittest_import.pb.h"
 #include "google/protobuf/unittest_mset.pb.h"
 #include "google/protobuf/unittest_mset_wire_format.pb.h"
 #include "google/protobuf/unittest_proto3_arena.pb.h"