SERVER-17863 Sort in config.h header when possible

21 files changed, 27 insertions, 41 deletions

diff --git a/src/mongo/util/assert_util.cpp b/src/mongo/util/assert_util.cpp
index 198ea4722f0..99a594a85b5 100644
--- a/src/mongo/util/assert_util.cpp
+++ b/src/mongo/util/assert_util.cpp
@@ -29,8 +29,6 @@
 
 #define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kDefault
 
-#include "mongo/config.h"
-
 #include "mongo/platform/basic.h"
 
 #include "mongo/util/assert_util.h"
@@ -43,6 +41,7 @@ using namespace std;
 #endif
 
 #include "mongo/bson/bsonobjbuilder.h"
+#include "mongo/config.h"
 #include "mongo/util/debug_util.h"
 #include "mongo/util/debugger.h"
 #include "mongo/util/exit.h"
diff --git a/src/mongo/util/background.cpp b/src/mongo/util/background.cpp
index 4d484dc82b9..cad78c9ddc7 100644
--- a/src/mongo/util/background.cpp
+++ b/src/mongo/util/background.cpp
@@ -29,8 +29,6 @@
 
 #define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kCommand
 
-#include "mongo/config.h"
-
 #include "mongo/platform/basic.h"
 
 #include "mongo/util/background.h"
@@ -40,6 +38,7 @@
 #include <boost/thread/once.hpp>
 #include <boost/thread/thread.hpp>
 
+#include "mongo/config.h"
 #include "mongo/stdx/functional.h"
 #include "mongo/util/concurrency/mutex.h"
 #include "mongo/util/concurrency/spin_lock.h"
diff --git a/src/mongo/util/concurrency/rwlockimpl.cpp b/src/mongo/util/concurrency/rwlockimpl.cpp
index c184f03a6dc..b2b6dd5dbcb 100644
--- a/src/mongo/util/concurrency/rwlockimpl.cpp
+++ b/src/mongo/util/concurrency/rwlockimpl.cpp
@@ -29,8 +29,6 @@
 */
 
 
-#include "mongo/config.h"
-
 #if defined(_WIN32)
 #define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
@@ -45,6 +43,7 @@
 
 using namespace std;
 
+#include "mongo/config.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/time_support.h"
 #include "rwlockimpl.h"
diff --git a/src/mongo/util/concurrency/simplerwlock.h b/src/mongo/util/concurrency/simplerwlock.h
index e37450ca7f6..821150e7add 100644
--- a/src/mongo/util/concurrency/simplerwlock.h
+++ b/src/mongo/util/concurrency/simplerwlock.h
@@ -28,11 +28,10 @@
 
 #pragma once
 
-#include "mongo/config.h"
-
 #include <boost/noncopyable.hpp>
 
 #include "mongo/base/string_data.h"
+#include "mongo/config.h"
 #include "mongo/platform/atomic_word.h"
 
 namespace mongo {
diff --git a/src/mongo/util/concurrency/threadlocal.h b/src/mongo/util/concurrency/threadlocal.h
index 3d8b9326a70..4530ab9aa6d 100644
--- a/src/mongo/util/concurrency/threadlocal.h
+++ b/src/mongo/util/concurrency/threadlocal.h
@@ -28,10 +28,10 @@
 *    then also delete it in the license file.
 */
 
-#include "mongo/config.h"
-
 #include <boost/thread/tss.hpp>
 
+#include "mongo/config.h"
+
 namespace mongo { 
 
     using boost::thread_specific_ptr;
diff --git a/src/mongo/util/debug_util.h b/src/mongo/util/debug_util.h
index 5a31385ba42..2b1ae82b72b 100644
--- a/src/mongo/util/debug_util.h
+++ b/src/mongo/util/debug_util.h
@@ -29,6 +29,7 @@
 
 #pragma once
 
+#include "mongo/config.h"
 
 namespace mongo {
 
diff --git a/src/mongo/util/exception_filter_win32.cpp b/src/mongo/util/exception_filter_win32.cpp
index a53c8fa739f..cedb1b9d3dd 100644
--- a/src/mongo/util/exception_filter_win32.cpp
+++ b/src/mongo/util/exception_filter_win32.cpp
@@ -30,12 +30,12 @@
 
 #ifdef _WIN32
 
-#include "mongo/config.h"
+#include "mongo/platform/basic.h"
 
 #include <ostream>
-
-#include "mongo/platform/basic.h"
 #include <DbgHelp.h>
+
+#include "mongo/config.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/exit_code.h"
 #include "mongo/util/log.h"
diff --git a/src/mongo/util/net/httpclient.cpp b/src/mongo/util/net/httpclient.cpp
index b96fae5029e..4f7e9260555 100644
--- a/src/mongo/util/net/httpclient.cpp
+++ b/src/mongo/util/net/httpclient.cpp
@@ -27,13 +27,12 @@
  *    then also delete it in the license file.
  */
 
-#include "mongo/config.h"
-
 #include "mongo/platform/basic.h"
 
 #include "mongo/util/net/httpclient.h"
 
 #include "mongo/bson/util/builder.h"
+#include "mongo/config.h"
 #include "mongo/util/mongoutils/str.h"
 #include "mongo/util/net/message.h"
 #include "mongo/util/net/message_port.h"
diff --git a/src/mongo/util/net/listen.cpp b/src/mongo/util/net/listen.cpp
index 6bc9e1ace30..2a8e366e105 100644
--- a/src/mongo/util/net/listen.cpp
+++ b/src/mongo/util/net/listen.cpp
@@ -30,8 +30,6 @@
 
 #define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kNetwork
 
-#include "mongo/config.h"
-
 #include "mongo/platform/basic.h"
 
 #include "mongo/util/net/listen.h"
@@ -39,6 +37,7 @@
 #include <boost/scoped_array.hpp>
 #include <boost/shared_ptr.hpp>
 
+#include "mongo/config.h"
 #include "mongo/db/server_options.h"
 #include "mongo/base/owned_pointer_vector.h"
 #include "mongo/util/exit.h"
diff --git a/src/mongo/util/net/listen.h b/src/mongo/util/net/listen.h
index 614e5956a38..f2b336c3a7e 100644
--- a/src/mongo/util/net/listen.h
+++ b/src/mongo/util/net/listen.h
@@ -29,8 +29,6 @@
 
 #pragma once
 
-#include "mongo/config.h"
-
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/thread/mutex.hpp>
@@ -39,6 +37,7 @@
 #include <string>
 #include <vector>
 
+#include "mongo/config.h"
 #include "mongo/platform/atomic_word.h"
 #include "mongo/util/concurrency/ticketholder.h"
 #include "mongo/util/net/sock.h"
diff --git a/src/mongo/util/net/message_port.cpp b/src/mongo/util/net/message_port.cpp
index 4a502d53280..3d7829d2300 100644
--- a/src/mongo/util/net/message_port.cpp
+++ b/src/mongo/util/net/message_port.cpp
@@ -29,8 +29,6 @@
 
 #define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kNetwork
 
-#include "mongo/config.h"
-
 #include "mongo/platform/basic.h"
 
 #include "mongo/util/net/message_port.h"
@@ -39,6 +37,7 @@
 #include <fcntl.h>
 #include <time.h>
 
+#include "mongo/config.h"
 #include "mongo/util/allocator.h"
 #include "mongo/util/background.h"
 #include "mongo/util/log.h"
diff --git a/src/mongo/util/net/message_port.h b/src/mongo/util/net/message_port.h
index 34b0f8250ad..45f8eae4d62 100644
--- a/src/mongo/util/net/message_port.h
+++ b/src/mongo/util/net/message_port.h
@@ -29,12 +29,11 @@
 
 #pragma once
 
-#include "mongo/config.h"
-
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
 #include <vector>
 
+#include "mongo/config.h"
 #include "mongo/util/net/message.h"
 #include "mongo/util/net/sock.h"
 
diff --git a/src/mongo/util/net/message_server_port.cpp b/src/mongo/util/net/message_server_port.cpp
index 8b769e683f4..f84192f8cd8 100644
--- a/src/mongo/util/net/message_server_port.cpp
+++ b/src/mongo/util/net/message_server_port.cpp
@@ -29,8 +29,6 @@
 
 #define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kNetwork
 
-#include "mongo/config.h"
-
 #include "mongo/platform/basic.h"
 
 #include <boost/scoped_ptr.hpp>
@@ -38,6 +36,7 @@
 #include <memory>
 
 #include "mongo/base/disallow_copying.h"
+#include "mongo/config.h"
 #include "mongo/db/lasterror.h"
 #include "mongo/db/server_options.h"
 #include "mongo/db/stats/counters.h"
diff --git a/src/mongo/util/net/miniwebserver.cpp b/src/mongo/util/net/miniwebserver.cpp
index 7cc95cd150a..2dbf68b6d6f 100644
--- a/src/mongo/util/net/miniwebserver.cpp
+++ b/src/mongo/util/net/miniwebserver.cpp
@@ -29,8 +29,6 @@
 
 #define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kNetwork
 
-#include "mongo/config.h"
-
 #include "mongo/platform/basic.h"
 
 #include "mongo/util/net/miniwebserver.h"
@@ -38,6 +36,7 @@
 #include <boost/shared_ptr.hpp>
 #include <pcrecpp.h>
 
+#include "mongo/config.h"
 #include "mongo/util/hex.h"
 #include "mongo/util/log.h"
 
diff --git a/src/mongo/util/net/sock.cpp b/src/mongo/util/net/sock.cpp
index 4ee54137a8f..42a5dcdba04 100644
--- a/src/mongo/util/net/sock.cpp
+++ b/src/mongo/util/net/sock.cpp
@@ -29,8 +29,6 @@
 
 #define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kNetwork
 
-#include "mongo/config.h"
-
 #include "mongo/platform/basic.h"
 
 #include "mongo/util/net/sock.h"
@@ -49,6 +47,7 @@
 # endif
 #endif
 
+#include "mongo/config.h"
 #include "mongo/db/server_options.h"
 #include "mongo/util/background.h"
 #include "mongo/util/concurrency/value.h"
diff --git a/src/mongo/util/net/sock.h b/src/mongo/util/net/sock.h
index b0d5059d362..f1da6144d3e 100644
--- a/src/mongo/util/net/sock.h
+++ b/src/mongo/util/net/sock.h
@@ -29,8 +29,6 @@
 
 #pragma once
 
-#include "mongo/config.h"
-
 #include <stdio.h>
 
 #ifndef _WIN32
@@ -52,6 +50,7 @@
 #include <vector>
 
 #include "mongo/base/disallow_copying.h"
+#include "mongo/config.h"
 #include "mongo/logger/log_severity.h"
 #include "mongo/platform/compiler.h"
 #include "mongo/platform/cstdint.h"
diff --git a/src/mongo/util/net/ssl_manager.cpp b/src/mongo/util/net/ssl_manager.cpp
index 748ca80f5de..730c506f991 100644
--- a/src/mongo/util/net/ssl_manager.cpp
+++ b/src/mongo/util/net/ssl_manager.cpp
@@ -27,8 +27,6 @@
 
 #define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kNetwork
 
-#include "mongo/config.h"
-
 #include "mongo/platform/basic.h"
 
 #include "mongo/util/net/ssl_manager.h"
@@ -43,6 +41,7 @@
 
 #include "mongo/base/init.h"
 #include "mongo/bson/bsonobjbuilder.h"
+#include "mongo/config.h"
 #include "mongo/platform/atomic_word.h"
 #include "mongo/util/concurrency/mutex.h"
 #include "mongo/util/exit.h"
diff --git a/src/mongo/util/net/ssl_manager.h b/src/mongo/util/net/ssl_manager.h
index b5a29cb1272..d5cefff5e89 100644
--- a/src/mongo/util/net/ssl_manager.h
+++ b/src/mongo/util/net/ssl_manager.h
@@ -27,10 +27,10 @@
 
 #pragma once
 
-#include "mongo/config.h"
-
 #include <string>
 
+#include "mongo/config.h"
+
 #ifdef MONGO_CONFIG_SSL
 
 #include "mongo/base/disallow_copying.h"
diff --git a/src/mongo/util/quick_exit.cpp b/src/mongo/util/quick_exit.cpp
index 0f90570e344..f103dc58413 100644
--- a/src/mongo/util/quick_exit.cpp
+++ b/src/mongo/util/quick_exit.cpp
@@ -26,10 +26,10 @@
 *    it in the license file.
 */
 
-#include "mongo/config.h"
-
 #include "mongo/platform/basic.h"
 
+#include "mongo/config.h"
+
 #if defined(MONGO_CONFIG_HAVE_HEADER_UNISTD_H)
 #include <unistd.h>
 #endif
diff --git a/src/mongo/util/timer.cpp b/src/mongo/util/timer.cpp
index 5936f00c1f6..d2fd49b5b0c 100644
--- a/src/mongo/util/timer.cpp
+++ b/src/mongo/util/timer.cpp
@@ -27,12 +27,12 @@
  *    then also delete it in the license file.
  */
 
-#include "mongo/config.h"
-
 #include "mongo/platform/basic.h"
 
 #include "mongo/util/timer.h"
 
+#include "mongo/config.h"
+
 #include <ctime>
 #include <limits>
 #if defined(MONGO_CONFIG_HAVE_HEADER_UNISTD_H)
diff --git a/src/mongo/util/version_reporting.cpp b/src/mongo/util/version_reporting.cpp
index 104522bec77..f0dadcaa7ce 100644
--- a/src/mongo/util/version_reporting.cpp
+++ b/src/mongo/util/version_reporting.cpp
@@ -29,8 +29,6 @@
 
 #define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kControl
 
-#include "mongo/config.h"
-
 #include "mongo/platform/basic.h"
 
 #include "mongo/util/version_reporting.h"
@@ -40,6 +38,7 @@
 #include <string>
 
 #include "mongo/bson/bsonobjbuilder.h"
+#include "mongo/config.h"
 #include "mongo/db/global_environment_experiment.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/util/debug_util.h"