3 files changed, 1 insertions, 71 deletions
diff --git a/src/cmd_away.cpp b/src/cmd_away.cpp
index 38a9eb77e..8814259af 100644
--- a/src/cmd_away.cpp
+++ b/src/cmd_away.cpp
@@ -19,13 +19,7 @@ using namespace std;
 #include "inspircd_config.h"
 #include "inspircd.h"
 #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>
@@ -34,33 +28,17 @@ using namespace std;
 #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_away.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_away::Handle (char **parameters, int pcnt, userrec *user)
 {
diff --git a/src/cmd_commands.cpp b/src/cmd_commands.cpp
index 8d4f74122..6ad8ae8b0 100644
--- a/src/cmd_commands.cpp
+++ b/src/cmd_commands.cpp
@@ -33,41 +33,24 @@ using namespace std;
 #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_commands.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_commands::Handle (char **parameters, int pcnt, userrec *user)
 {
 	for (unsigned int i = 0; i < ServerInstance->Parser->cmdlist.size(); i++)
 	{
 		WriteServ(user->fd,"902 %s :%s %s %d",user->nick,ServerInstance->Parser->cmdlist[i]->command.c_str(),ServerInstance->Parser->cmdlist[i]->source.c_str(),ServerInstance->Parser->cmdlist[i]->min_params);
-}
+	}
 	WriteServ(user->fd,"903 %s :End of COMMANDS list",user->nick);
 }
 
diff --git a/src/cmd_connect.cpp b/src/cmd_connect.cpp
index 19a07703f..79d62fa93 100644
--- a/src/cmd_connect.cpp
+++ b/src/cmd_connect.cpp
@@ -19,49 +19,18 @@ using namespace std;
 #include "inspircd_config.h"
 #include "inspircd.h"
 #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_connect.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_connect::Handle (char **parameters, int pcnt, userrec *user)
 {
 }