5 files changed, 3 insertions, 98 deletions
diff --git a/src/cmd_die.cpp b/src/cmd_die.cpp
index e1a6a70a4..a957c0257 100644
--- a/src/cmd_die.cpp
+++ b/src/cmd_die.cpp
@@ -21,46 +21,19 @@ using namespace std;
 #include "inspircd_io.h"
 #include <time.h>
 #include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
 #include "users.h"
 #include "ctables.h"
 #include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
 #include "wildcard.h"
 #include "message.h"
 #include "commands.h"
-#include "mode.h"
-#include "xline.h"
 #include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
-#include "socketengine.h"
 #include "typedefs.h"
-#include "command_parse.h"
 #include "cmd_die.h"
 
 extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[65536];
 
 void cmd_die::Handle (char **parameters, int pcnt, userrec *user)
 {
diff --git a/src/cmd_eline.cpp b/src/cmd_eline.cpp
index eafa83913..bab583311 100644
--- a/src/cmd_eline.cpp
+++ b/src/cmd_eline.cpp
@@ -21,11 +21,6 @@ using namespace std;
 #include "inspircd_io.h"
 #include <time.h>
 #include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
 #include <map>
 #include <sstream>
 #include <vector>
@@ -38,29 +33,17 @@ using namespace std;
 #include "wildcard.h"
 #include "message.h"
 #include "commands.h"
-#include "mode.h"
 #include "xline.h"
 #include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
-#include "socketengine.h"
 #include "typedefs.h"
 #include "command_parse.h"
 #include "cmd_eline.h"
 
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[65536];
 
 void cmd_eline::Handle (char **parameters, int pcnt, userrec *user)
 {
diff --git a/src/cmd_gline.cpp b/src/cmd_gline.cpp
index 7304e6fc2..35cf82d88 100644
--- a/src/cmd_gline.cpp
+++ b/src/cmd_gline.cpp
@@ -21,11 +21,6 @@ using namespace std;
 #include "inspircd_io.h"
 #include <time.h>
 #include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
 #include <map>
 #include <sstream>
 #include <vector>
@@ -38,29 +33,17 @@ using namespace std;
 #include "wildcard.h"
 #include "message.h"
 #include "commands.h"
-#include "mode.h"
 #include "xline.h"
 #include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
-#include "socketengine.h"
 #include "typedefs.h"
 #include "command_parse.h"
-#include "cmd_gline.h"
+#include "cmd_eline.h"
 
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[65536];
 
 void cmd_gline::Handle (char **parameters, int pcnt, userrec *user)
 {
diff --git a/src/cmd_qline.cpp b/src/cmd_qline.cpp
index 9f3d3c316..ff43a6411 100644
--- a/src/cmd_qline.cpp
+++ b/src/cmd_qline.cpp
@@ -21,11 +21,6 @@ using namespace std;
 #include "inspircd_io.h"
 #include <time.h>
 #include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
 #include <map>
 #include <sstream>
 #include <vector>
@@ -38,29 +33,17 @@ using namespace std;
 #include "wildcard.h"
 #include "message.h"
 #include "commands.h"
-#include "mode.h"
 #include "xline.h"
 #include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
-#include "socketengine.h"
 #include "typedefs.h"
 #include "command_parse.h"
-#include "cmd_qline.h"
+#include "cmd_eline.h"
 
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[65536];
 
 void cmd_qline::Handle (char **parameters, int pcnt, userrec *user)
 {
diff --git a/src/cmd_zline.cpp b/src/cmd_zline.cpp
index cf3b9b411..45a4717db 100644
--- a/src/cmd_zline.cpp
+++ b/src/cmd_zline.cpp
@@ -21,11 +21,6 @@ using namespace std;
 #include "inspircd_io.h"
 #include <time.h>
 #include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
 #include <map>
 #include <sstream>
 #include <vector>
@@ -38,29 +33,17 @@ using namespace std;
 #include "wildcard.h"
 #include "message.h"
 #include "commands.h"
-#include "mode.h"
 #include "xline.h"
 #include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
-#include "socketengine.h"
 #include "typedefs.h"
 #include "command_parse.h"
-#include "cmd_zline.h"
+#include "cmd_eline.h"
 
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[65536];
 
 void cmd_zline::Handle (char **parameters, int pcnt, userrec *user)
 {