diff --git a/src/google/protobuf/compiler/java/java_doc_comment.h b/src/google/protobuf/compiler/java/java_doc_comment.h
index 7244d9bac0..f77720b6f4 100644
--- a/src/google/protobuf/compiler/java/java_doc_comment.h
+++ b/src/google/protobuf/compiler/java/java_doc_comment.h
@@ -59,7 +59,7 @@ void WriteMethodDocComment(io::Printer* printer,
                            const MethodDescriptor* method);
 
 // Exposed for testing only.
-LIBPROTOC_EXPORT string EscapeJavadoc(const string& input);
+string EscapeJavadoc(const string& input);
 
 }  // namespace java
 }  // namespace compiler
diff --git a/src/google/protobuf/compiler/subprocess.h b/src/google/protobuf/compiler/subprocess.h
index 005649640e..de9fce9ec9 100644
--- a/src/google/protobuf/compiler/subprocess.h
+++ b/src/google/protobuf/compiler/subprocess.h
@@ -53,7 +53,7 @@ class Message;
 namespace compiler {
 
 // Utility class for launching sub-processes.
-class LIBPROTOC_EXPORT Subprocess {
+class Subprocess {
  public:
   Subprocess();
   ~Subprocess();
diff --git a/src/google/protobuf/message.cc b/src/google/protobuf/message.cc
index 441be53449..6119d26a3b 100644
--- a/src/google/protobuf/message.cc
+++ b/src/google/protobuf/message.cc
@@ -188,7 +188,7 @@ bool Message::SerializePartialToOstream(ostream* output) const {
 Reflection::~Reflection() {}
 
 #define HANDLE_TYPE(TYPE, CPPTYPE, CTYPE)                             \
-template<> LIBPROTOBUF_EXPORT                                         \
+template<>                                                            \
 const RepeatedField<TYPE>& Reflection::GetRepeatedField<TYPE>(        \
     const Message& message, const FieldDescriptor* field) const {     \
   return *static_cast<RepeatedField<TYPE>* >(                         \
@@ -196,7 +196,7 @@ const RepeatedField<TYPE>& Reflection::GetRepeatedField<TYPE>(        \
                           field, CPPTYPE, CTYPE, NULL));              \
 }                                                                     \
                                                                       \
-template<> LIBPROTOBUF_EXPORT                                         \
+template<>                                                            \
 RepeatedField<TYPE>* Reflection::MutableRepeatedField<TYPE>(          \
     Message* message, const FieldDescriptor* field) const {           \
   return static_cast<RepeatedField<TYPE>* >(                          \