diff --git a/src/google/protobuf/descriptor.h b/src/google/protobuf/descriptor.h
index 9ac74624032a..b351b5ff4b60 100644
--- a/src/google/protobuf/descriptor.h
+++ b/src/google/protobuf/descriptor.h
@@ -39,7 +39,7 @@
 #include <utility>
 #include <vector>
 
-#include "google/protobuf/stubs/common.h"
+#include "base/types.h"
 #include "absl/base/attributes.h"
 #include "absl/base/call_once.h"
 #include "absl/container/btree_map.h"
diff --git a/src/google/protobuf/extension_set.h b/src/google/protobuf/extension_set.h
index 3be56c47240e..4980dcdbad35 100644
--- a/src/google/protobuf/extension_set.h
+++ b/src/google/protobuf/extension_set.h
@@ -26,7 +26,7 @@
 #include <utility>
 #include <vector>
 
-#include "google/protobuf/stubs/common.h"
+#include "base/types.h"
 #include "absl/base/call_once.h"
 #include "absl/base/casts.h"
 #include "absl/base/prefetch.h"