5 files changed, 12 insertions, 16 deletions

diff --git a/src/mongo/base/generate_error_codes.py b/src/mongo/base/generate_error_codes.py
index ad93656a7d1..f8dd6ba4317 100644
--- a/src/mongo/base/generate_error_codes.py
+++ b/src/mongo/base/generate_error_codes.py
@@ -184,7 +184,6 @@ header_template = '''// AUTO-GENERATED FILE DO NOT EDIT
 #include <string>
 
 #include "mongo/base/string_data.h"
-#include "mongo/client/export_macros.h"
 
 namespace mongo {
 
@@ -195,7 +194,7 @@ namespace mongo {
      * Do not update this file directly. Update src/mongo/base/error_codes.err instead.
      */
 
-    class MONGO_CLIENT_API ErrorCodes {
+    class ErrorCodes {
     public:
         enum Error {
             %(error_code_enum_declarations)s,
diff --git a/src/mongo/base/initializer.h b/src/mongo/base/initializer.h
index 02c4da6a332..a8abc6603b3 100644
--- a/src/mongo/base/initializer.h
+++ b/src/mongo/base/initializer.h
@@ -34,7 +34,6 @@
 #include "mongo/base/initializer_context.h"
 #include "mongo/base/initializer_dependency_graph.h"
 #include "mongo/base/status.h"
-#include "mongo/client/export_macros.h"
 
 namespace mongo {
 
@@ -46,7 +45,7 @@ namespace mongo {
      * edges to the graph.  Then, one executes the process, causing each initialization operation to
      * execute in an order that respects the programmer-established prerequistes.
      */
-    class MONGO_CLIENT_API Initializer {
+    class Initializer {
         MONGO_DISALLOW_COPYING(Initializer);
     public:
         Initializer();
@@ -80,17 +79,17 @@ namespace mongo {
      * This means that the few initializers that might want to terminate the program by failing
      * should probably arrange to terminate the process themselves.
      */
-    MONGO_CLIENT_API Status runGlobalInitializers(const InitializerContext::ArgumentVector& args,
+    Status runGlobalInitializers(const InitializerContext::ArgumentVector& args,
                                                   const InitializerContext::EnvironmentMap& env);
 
-    MONGO_CLIENT_API Status runGlobalInitializers(
+    Status runGlobalInitializers(
             int argc, const char* const* argv, const char* const* envp);
 
     /**
      * Same as runGlobalInitializers(), except prints a brief message to std::cerr
      * and terminates the process on failure.
      */
-    MONGO_CLIENT_API void runGlobalInitializersOrDie(
+    void runGlobalInitializersOrDie(
             int argc, const char* const* argv, const char* const* envp);
 
 }  // namespace mongo
diff --git a/src/mongo/base/parse_number.cpp b/src/mongo/base/parse_number.cpp
index 4ae34a48ebc..ea3dfaccfdf 100644
--- a/src/mongo/base/parse_number.cpp
+++ b/src/mongo/base/parse_number.cpp
@@ -193,7 +193,7 @@ namespace mongo {
     // Definition of the various supported implementations of parseNumberFromStringWithBase.
 
 #define DEFINE_PARSE_NUMBER_FROM_STRING_WITH_BASE(NUMBER_TYPE)          \
-    template MONGO_CLIENT_API Status parseNumberFromStringWithBase<NUMBER_TYPE>(StringData, int, NUMBER_TYPE*);
+    template Status parseNumberFromStringWithBase<NUMBER_TYPE>(StringData, int, NUMBER_TYPE*);
 
     DEFINE_PARSE_NUMBER_FROM_STRING_WITH_BASE(long)
     DEFINE_PARSE_NUMBER_FROM_STRING_WITH_BASE(long long)
diff --git a/src/mongo/base/parse_number.h b/src/mongo/base/parse_number.h
index 900a0963e55..f9a5e44d1b8 100644
--- a/src/mongo/base/parse_number.h
+++ b/src/mongo/base/parse_number.h
@@ -33,7 +33,6 @@
 
 #include "mongo/base/status.h"
 #include "mongo/base/string_data.h"
-#include "mongo/client/export_macros.h"
 
 namespace mongo {
 
@@ -55,7 +54,7 @@ namespace mongo {
      * See parse_number.cpp for the available instantiations, and add any new instantiations there.
      */
     template <typename NumberType>
-    MONGO_CLIENT_API Status parseNumberFromStringWithBase(StringData stringValue, int base, NumberType* result);
+    Status parseNumberFromStringWithBase(StringData stringValue, int base, NumberType* result);
 
     template <typename NumberType>
     static Status parseNumberFromString(StringData stringValue, NumberType* result) {
diff --git a/src/mongo/base/status.h b/src/mongo/base/status.h
index e8b82023179..2e1b73f4ddd 100644
--- a/src/mongo/base/status.h
+++ b/src/mongo/base/status.h
@@ -32,7 +32,6 @@
 #include <string>
 
 #include "mongo/base/error_codes.h"
-#include "mongo/client/export_macros.h"
 #include "mongo/platform/atomic_word.h"
 
 namespace mongo {
@@ -60,7 +59,7 @@ namespace mongo {
      * TODO: generate base/error_codes.h out of a description file
      * TODO: check 'location' duplicates against assert numbers
      */
-    class MONGO_CLIENT_API Status {
+    class Status {
     public:
         // Short-hand for returning an OK status.
         static inline Status OK();
@@ -145,16 +144,16 @@ namespace mongo {
         static inline void unref(ErrorInfo* error);
     };
 
-    MONGO_CLIENT_API inline bool operator==(const ErrorCodes::Error lhs, const Status& rhs);
+    inline bool operator==(const ErrorCodes::Error lhs, const Status& rhs);
 
-    MONGO_CLIENT_API inline bool operator!=(const ErrorCodes::Error lhs, const Status& rhs);
+    inline bool operator!=(const ErrorCodes::Error lhs, const Status& rhs);
 
     //
     // Convenience method for unittest code. Please use accessors otherwise.
     //
 
-    MONGO_CLIENT_API std::ostream& operator<<(std::ostream& os, const Status& status);
-    MONGO_CLIENT_API std::ostream& operator<<(std::ostream& os, ErrorCodes::Error);
+    std::ostream& operator<<(std::ostream& os, const Status& status);
+    std::ostream& operator<<(std::ostream& os, ErrorCodes::Error);
 
 }  // namespace mongo