18 files changed, 3 insertions, 18 deletions
diff --git a/src/mongo/db/client.cpp b/src/mongo/db/client.cpp
index e50f6da33ef..ddb342a7b92 100644
--- a/src/mongo/db/client.cpp
+++ b/src/mongo/db/client.cpp
@@ -43,7 +43,6 @@
 #include "mongo/db/jsobj.h"
 #include "mongo/db/pagefault.h"
 #include "mongo/db/repl/rs.h"
-#include "mongo/db/security.h"
 #include "mongo/s/chunk_version.h"
 #include "mongo/s/d_logic.h"
 #include "mongo/s/stale_exception.h" // for SendStaleConfigException
diff --git a/src/mongo/db/client.h b/src/mongo/db/client.h
index c6cd74d65c2..1649a22d20d 100644
--- a/src/mongo/db/client.h
+++ b/src/mongo/db/client.h
@@ -31,7 +31,6 @@
 #include "mongo/db/lasterror.h"
 #include "mongo/db/lockstate.h"
 #include "mongo/db/namespace-inl.h"
-#include "mongo/db/security.h"
 #include "mongo/db/stats/top.h"
 #include "mongo/util/concurrency/rwlock.h"
 #include "mongo/util/concurrency/threadlocal.h"
diff --git a/src/mongo/db/commands/isself.cpp b/src/mongo/db/commands/isself.cpp
index d02cfa8b1b8..698f865b73c 100644
--- a/src/mongo/db/commands/isself.cpp
+++ b/src/mongo/db/commands/isself.cpp
@@ -28,7 +28,6 @@
 #include "mongo/db/jsobj.h"
 #include "../../util/net/listen.h"
 #include "../commands.h"
-#include "../security.h"
 #include "mongo/util/net/hostandport.h"
 #include "mongo/client/dbclientinterface.h"
 
diff --git a/src/mongo/db/commands/pipeline_command.cpp b/src/mongo/db/commands/pipeline_command.cpp
index 8cca0ebe156..d5905325bd2 100644
--- a/src/mongo/db/commands/pipeline_command.cpp
+++ b/src/mongo/db/commands/pipeline_command.cpp
@@ -21,6 +21,7 @@
 #include "mongo/db/auth/action_set.h"
 #include "mongo/db/auth/action_type.h"
 #include "mongo/db/auth/privilege.h"
+#include "mongo/db/commands.h"
 #include "mongo/db/interrupt_status_mongod.h"
 #include "mongo/db/pipeline/accumulator.h"
 #include "mongo/db/pipeline/document.h"
diff --git a/src/mongo/db/commands/server_status.h b/src/mongo/db/commands/server_status.h
index dc9899d2284..dedfd0dadf6 100644
--- a/src/mongo/db/commands/server_status.h
+++ b/src/mongo/db/commands/server_status.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <string>
+#include "mongo/db/commands.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/stats/counters.h"
 #include "mongo/platform/atomic_word.h"
diff --git a/src/mongo/db/connection_factory.cpp b/src/mongo/db/connection_factory.cpp
index 47cf30874da..0d5a10070fe 100644
--- a/src/mongo/db/connection_factory.cpp
+++ b/src/mongo/db/connection_factory.cpp
@@ -18,7 +18,6 @@
 
 #include "mongo/client/connpool.h"
 #include "mongo/db/client.h"
-#include "mongo/db/security.h"
 
 // This file contains the server-only (mongod and mongos) implementation of the factory functions
 // for getting ScopedDbConnections.  Handles setting authentication info on the underlying
diff --git a/src/mongo/db/dbcommands.cpp b/src/mongo/db/dbcommands.cpp
index 13e58378890..3ef89a06c00 100644
--- a/src/mongo/db/dbcommands.cpp
+++ b/src/mongo/db/dbcommands.cpp
@@ -50,7 +50,6 @@
 #include "mongo/db/repl.h"
 #include "mongo/db/repl_block.h"
 #include "mongo/db/replutil.h"
-#include "mongo/db/security.h"
 #include "mongo/s/d_writeback.h"
 #include "mongo/s/stale_exception.h"  // for SendStaleConfigException
 #include "mongo/scripting/engine.h"
diff --git a/src/mongo/db/dbcommands_generic.cpp b/src/mongo/db/dbcommands_generic.cpp
index de1d3631d8c..f9863bcc0df 100644
--- a/src/mongo/db/dbcommands_generic.cpp
+++ b/src/mongo/db/dbcommands_generic.cpp
@@ -39,7 +39,6 @@
 #include "db.h"
 #include "instance.h"
 #include "lasterror.h"
-#include "security.h"
 #include "../scripting/engine.h"
 #include "stats/counters.h"
 #include "background.h"
diff --git a/src/mongo/db/dbwebserver.cpp b/src/mongo/db/dbwebserver.cpp
index 1c6ae0d5923..d05cf596c7e 100644
--- a/src/mongo/db/dbwebserver.cpp
+++ b/src/mongo/db/dbwebserver.cpp
@@ -29,7 +29,6 @@
 #include "../util/md5.hpp"
 #include "db.h"
 #include "instance.h"
-#include "security.h"
 #include "stats/snapshots.h"
 #include "background.h"
 #include "commands.h"
diff --git a/src/mongo/db/instance.cpp b/src/mongo/db/instance.cpp
index 5a8ef365c26..b17cb5abc5d 100644
--- a/src/mongo/db/instance.cpp
+++ b/src/mongo/db/instance.cpp
@@ -54,7 +54,6 @@
 #include "mongo/db/pagefault.h"
 #include "mongo/db/repl.h"
 #include "mongo/db/replutil.h"
-#include "mongo/db/security.h"
 #include "mongo/db/stats/counters.h"
 #include "mongo/s/d_logic.h"
 #include "mongo/s/stale_exception.h" // for SendStaleConfigException
diff --git a/src/mongo/db/instance.h b/src/mongo/db/instance.h
index 620ed66ca43..1a5d3a9e8f7 100644
--- a/src/mongo/db/instance.h
+++ b/src/mongo/db/instance.h
@@ -21,7 +21,6 @@
 
 
 #include "curop-inl.h"
-#include "security.h"
 #include "cmdline.h"
 #include "client.h"
 #include "mongo/client/dbclientinterface.h"
diff --git a/src/mongo/db/repl.cpp b/src/mongo/db/repl.cpp
index 289f317635e..c1c37c6f7a2 100644
--- a/src/mongo/db/repl.cpp
+++ b/src/mongo/db/repl.cpp
@@ -45,7 +45,6 @@
 #include "pdfile.h"
 #include "db.h"
 #include "commands.h"
-#include "security.h"
 #include "cmdline.h"
 #include "repl_block.h"
 #include "repl/rs.h"
diff --git a/src/mongo/db/repl/heartbeat.cpp b/src/mongo/db/repl/heartbeat.cpp
index f817eadeebf..9fda15dd4c0 100644
--- a/src/mongo/db/repl/heartbeat.cpp
+++ b/src/mongo/db/repl/heartbeat.cpp
@@ -25,7 +25,6 @@
 #include "mongo/db/repl/connections.h"
 #include "mongo/db/repl/health.h"
 #include "mongo/db/repl/rs.h"
-#include "mongo/db/security.h"
 #include "mongo/util/background.h"
 #include "mongo/util/concurrency/msg.h"
 #include "mongo/util/concurrency/task.h"
diff --git a/src/mongo/db/repl/manager.cpp b/src/mongo/db/repl/manager.cpp
index df72dd47547..cbc3a3e7baa 100644
--- a/src/mongo/db/repl/manager.cpp
+++ b/src/mongo/db/repl/manager.cpp
@@ -21,7 +21,6 @@
 #include "rs.h"
 #include "connections.h"
 #include "../client.h"
-#include "mongo/db/security.h"
 
 namespace mongo {
 
diff --git a/src/mongo/db/security_commands.cpp b/src/mongo/db/security_commands.cpp
index c7575cb0116..fc60101b1f2 100644
--- a/src/mongo/db/security_commands.cpp
+++ b/src/mongo/db/security_commands.cpp
@@ -35,6 +35,7 @@
 #include "mongo/db/jsobj.h"
 #include "mongo/db/json.h"
 #include "mongo/db/pdfile.h"
+#include "mongo/db/security_common.h"
 #include "mongo/platform/random.h"
 #include "mongo/util/md5.hpp"
 #include "mongo/util/mongoutils/str.h"
diff --git a/src/mongo/db/security_common.h b/src/mongo/db/security_common.h
index 450fc5da68d..e476e2baca0 100644
--- a/src/mongo/db/security_common.h
+++ b/src/mongo/db/security_common.h
@@ -22,10 +22,6 @@
 
 namespace mongo {
 
-    // --noauth cmd line option
-    // TODO: Remove this, should be getting this from authorization_manager.h
-    extern bool noauth;
-
     /**
      * This method checks the validity of filename as a security key, hashes its
      * contents, and stores it in the internalSecurity variable.  Prints an
diff --git a/src/mongo/s/client_info.h b/src/mongo/s/client_info.h
index ccd0a3d8b71..5b973c9e2bc 100644
--- a/src/mongo/s/client_info.h
+++ b/src/mongo/s/client_info.h
@@ -20,7 +20,6 @@
 #include "mongo/pch.h"
 
 #include "mongo/db/client_basic.h"
-#include "mongo/db/security.h"
 #include "mongo/s/chunk.h"
 #include "mongo/s/writeback_listener.h"
 #include "mongo/util/net/hostandport.h"
diff --git a/src/mongo/s/shardconnection.cpp b/src/mongo/s/shardconnection.cpp
index e7079f66986..3a56a38a044 100644
--- a/src/mongo/s/shardconnection.cpp
+++ b/src/mongo/s/shardconnection.cpp
@@ -21,7 +21,6 @@
 #include <set>
 
 #include "mongo/db/client.h"
-#include "mongo/db/security.h"
 #include "mongo/s/config.h"
 #include "mongo/s/request.h"
 #include "mongo/s/shard.h"