8 files changed, 8 insertions, 107 deletions
diff --git a/include/commands.h b/include/commands.h
index 24fad4b3c..ac882782a 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -14,81 +14,3 @@
  * ---------------------------------------------------
  */
 
-#ifndef __COMMANDS_H
-#define __COMMANDS_H
-
-// include the common header files
-
-#include <typeinfo>
-#include <iostream>
-#include <string>
-#include <deque>
-#include <sstream>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-
-/*       XXX Serious WTFness XXX
- *
- * Well, unless someone invents a wildcard or
- * regexp #include, and makes it a standard,
- * we're stuck with this way of including all
- * the commands.
- */
-
-#include "commands/cmd_admin.h"
-#include "commands/cmd_away.h"
-#include "commands/cmd_commands.h"
-#include "commands/cmd_connect.h"
-#include "commands/cmd_die.h"
-#include "commands/cmd_eline.h"
-#include "commands/cmd_gline.h"
-#include "commands/cmd_info.h"
-#include "commands/cmd_invite.h"
-#include "commands/cmd_ison.h"
-#include "commands/cmd_join.h"
-#include "commands/cmd_kick.h"
-#include "commands/cmd_kill.h"
-#include "commands/cmd_kline.h"
-#include "commands/cmd_links.h"
-#include "commands/cmd_list.h"
-#include "commands/cmd_loadmodule.h"
-#include "commands/cmd_lusers.h"
-#include "commands/cmd_map.h"
-#include "commands/cmd_modules.h"
-#include "commands/cmd_motd.h"
-#include "commands/cmd_names.h"
-#include "commands/cmd_nick.h"
-#include "commands/cmd_notice.h"
-#include "commands/cmd_oper.h"
-#include "commands/cmd_part.h"
-#include "commands/cmd_pass.h"
-#include "commands/cmd_ping.h"
-#include "commands/cmd_pong.h"
-#include "commands/cmd_privmsg.h"
-#include "commands/cmd_qline.h"
-#include "commands/cmd_quit.h"
-#include "commands/cmd_rehash.h"
-#include "commands/cmd_restart.h"
-#include "commands/cmd_rules.h"
-#include "commands/cmd_server.h"
-#include "commands/cmd_squit.h"
-#include "commands/cmd_stats.h"
-#include "commands/cmd_summon.h"
-#include "commands/cmd_time.h"
-#include "commands/cmd_topic.h"
-#include "commands/cmd_trace.h"
-#include "commands/cmd_unloadmodule.h"
-#include "commands/cmd_user.h"
-#include "commands/cmd_userhost.h"
-#include "commands/cmd_users.h"
-#include "commands/cmd_version.h"
-#include "commands/cmd_wallops.h"
-#include "commands/cmd_who.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_whowas.h"
-#include "commands/cmd_zline.h"
-
-
-#endif
diff --git a/include/commands/cmd_motd.h b/include/commands/cmd_motd.h
index 9389ea61e..310627ab1 100644
--- a/include/commands/cmd_motd.h
+++ b/include/commands/cmd_motd.h
@@ -19,12 +19,9 @@
 
 // include the common header files
 
-#include <typeinfo>
-#include <iostream>
 #include <string>
-#include <deque>
-#include <sstream>
 #include <vector>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 
diff --git a/include/commands/cmd_pass.h b/include/commands/cmd_pass.h
index 412710a2b..6cc48d423 100644
--- a/include/commands/cmd_pass.h
+++ b/include/commands/cmd_pass.h
@@ -19,12 +19,9 @@
 
 // include the common header files
 
-#include <typeinfo>
-#include <iostream>
 #include <string>
-#include <deque>
-#include <sstream>
 #include <vector>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 
diff --git a/include/commands/cmd_pong.h b/include/commands/cmd_pong.h
index 2857f0b86..2399603e7 100644
--- a/include/commands/cmd_pong.h
+++ b/include/commands/cmd_pong.h
@@ -19,12 +19,9 @@
 
 // include the common header files
 
-#include <typeinfo>
-#include <iostream>
 #include <string>
-#include <deque>
-#include <sstream>
 #include <vector>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 
diff --git a/include/commands/cmd_rules.h b/include/commands/cmd_rules.h
index ae6bc86c7..496f4a0f0 100644
--- a/include/commands/cmd_rules.h
+++ b/include/commands/cmd_rules.h
@@ -19,12 +19,9 @@
 
 // include the common header files
 
-#include <typeinfo>
-#include <iostream>
 #include <string>
-#include <deque>
-#include <sstream>
 #include <vector>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 
diff --git a/include/commands/cmd_squit.h b/include/commands/cmd_squit.h
index 11da3d832..0c6f06f1a 100644
--- a/include/commands/cmd_squit.h
+++ b/include/commands/cmd_squit.h
@@ -19,12 +19,9 @@
 
 // include the common header files
 
-#include <typeinfo>
-#include <iostream>
 #include <string>
-#include <deque>
-#include <sstream>
 #include <vector>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 
diff --git a/include/commands/cmd_summon.h b/include/commands/cmd_summon.h
index c0bc6e17a..eaf4735d1 100644
--- a/include/commands/cmd_summon.h
+++ b/include/commands/cmd_summon.h
@@ -19,12 +19,9 @@
 
 // include the common header files
 
-#include <typeinfo>
-#include <iostream>
 #include <string>
-#include <deque>
-#include <sstream>
 #include <vector>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 
diff --git a/include/commands/cmd_users.h b/include/commands/cmd_users.h
index 552a42382..bd1607607 100644
--- a/include/commands/cmd_users.h
+++ b/include/commands/cmd_users.h
@@ -18,13 +18,10 @@
 #define __CMD_USERS_H__
 
 // include the common header files
-
-#include <typeinfo>
-#include <iostream>
+// 
 #include <string>
-#include <deque>
-#include <sstream>
 #include <vector>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"