diff --git a/python/google/protobuf/pyext/extension_dict.h b/python/google/protobuf/pyext/extension_dict.h
index 049d2e457..2456eda1e 100644
--- a/python/google/protobuf/pyext/extension_dict.h
+++ b/python/google/protobuf/pyext/extension_dict.h
@@ -48,7 +48,7 @@ class Message;
 class FieldDescriptor;
 
 #ifdef _SHARED_PTR_H
-using shared_ptr;
+using std::shared_ptr;
 #else
 using internal::shared_ptr;
 #endif
diff --git a/python/google/protobuf/pyext/map_container.h b/python/google/protobuf/pyext/map_container.h
index b11dfa34e..fbd6713f7 100644
--- a/python/google/protobuf/pyext/map_container.h
+++ b/python/google/protobuf/pyext/map_container.h
@@ -47,7 +47,7 @@ namespace protobuf {
 class Message;
 
 #ifdef _SHARED_PTR_H
-using shared_ptr;
+using std::shared_ptr;
 #else
 using internal::shared_ptr;
 #endif
diff --git a/python/google/protobuf/pyext/message.h b/python/google/protobuf/pyext/message.h
index 9dce198fc..3a4bec81c 100644
--- a/python/google/protobuf/pyext/message.h
+++ b/python/google/protobuf/pyext/message.h
@@ -53,8 +53,8 @@ class DescriptorPool;
 class MessageFactory;
 
 #ifdef _SHARED_PTR_H
-using shared_ptr;
-using std::std::string;
+using std::shared_ptr;
+using ::std::string;
 #else
 using internal::shared_ptr;
 #endif
diff --git a/python/google/protobuf/pyext/repeated_composite_container.h b/python/google/protobuf/pyext/repeated_composite_container.h
index 25463037b..a7b56b61b 100644
--- a/python/google/protobuf/pyext/repeated_composite_container.h
+++ b/python/google/protobuf/pyext/repeated_composite_container.h
@@ -50,7 +50,7 @@ class FieldDescriptor;
 class Message;
 
 #ifdef _SHARED_PTR_H
-using shared_ptr;
+using std::shared_ptr;
 #else
 using internal::shared_ptr;
 #endif
diff --git a/python/google/protobuf/pyext/repeated_scalar_container.h b/python/google/protobuf/pyext/repeated_scalar_container.h
index 608222e03..555e621c9 100644
--- a/python/google/protobuf/pyext/repeated_scalar_container.h
+++ b/python/google/protobuf/pyext/repeated_scalar_container.h
@@ -49,7 +49,7 @@ namespace protobuf {
 class Message;
 
 #ifdef _SHARED_PTR_H
-using shared_ptr;
+using std::shared_ptr;
 #else
 using internal::shared_ptr;
 #endif