Remove more unnecessary header traffic

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7887 e03df62e-2008-0410-955e-edbf42e46eb7

73 files changed, 0 insertions, 159 deletions

diff --git a/src/channels.cpp b/src/channels.cpp
index 83f18abee..d33caa34c 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -13,9 +13,6 @@
 
 #include "inspircd.h"
 #include <stdarg.h>
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "mode.h"
 
diff --git a/src/cmd_admin.cpp b/src/cmd_admin.cpp
index 698468d0c..e4a31ff0c 100644
--- a/src/cmd_admin.cpp
+++ b/src/cmd_admin.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
 #include "commands/cmd_admin.h"
 
 
diff --git a/src/cmd_away.cpp b/src/cmd_away.cpp
index 10f96c80b..98209217f 100644
--- a/src/cmd_away.cpp
+++ b/src/cmd_away.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "commands/cmd_away.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_clearcache.cpp b/src/cmd_clearcache.cpp
index daf8fa78b..333593425 100644
--- a/src/cmd_clearcache.cpp
+++ b/src/cmd_clearcache.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
 #include "commands/cmd_clearcache.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_commands.cpp b/src/cmd_commands.cpp
index fc95de5f1..85437c2b0 100644
--- a/src/cmd_commands.cpp
+++ b/src/cmd_commands.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
 #include "commands/cmd_commands.h"
 
 /** Handle /COMMANDS
diff --git a/src/cmd_connect.cpp b/src/cmd_connect.cpp
index c744166bf..0f1e10695 100644
--- a/src/cmd_connect.cpp
+++ b/src/cmd_connect.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
 #include "commands/cmd_connect.h"
 
 /*
diff --git a/src/cmd_die.cpp b/src/cmd_die.cpp
index 734ee8ba3..6025ea2b5 100644
--- a/src/cmd_die.cpp
+++ b/src/cmd_die.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
 #include "commands/cmd_die.h"
 #include "exitcodes.h"
 
diff --git a/src/cmd_eline.cpp b/src/cmd_eline.cpp
index 793f7a413..96e04da71 100644
--- a/src/cmd_eline.cpp
+++ b/src/cmd_eline.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "xline.h"
 #include "commands/cmd_eline.h"
 
diff --git a/src/cmd_gline.cpp b/src/cmd_gline.cpp
index f208d40bf..bed81c984 100644
--- a/src/cmd_gline.cpp
+++ b/src/cmd_gline.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "xline.h"
 #include "commands/cmd_gline.h"
 
diff --git a/src/cmd_info.cpp b/src/cmd_info.cpp
index 3564b0c6a..8b2affa42 100644
--- a/src/cmd_info.cpp
+++ b/src/cmd_info.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "commands/cmd_info.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_invite.cpp b/src/cmd_invite.cpp
index 72902998c..9c2c26442 100644
--- a/src/cmd_invite.cpp
+++ b/src/cmd_invite.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "commands/cmd_invite.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_ison.cpp b/src/cmd_ison.cpp
index e5cbe270f..4ca319afc 100644
--- a/src/cmd_ison.cpp
+++ b/src/cmd_ison.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
 #include "commands/cmd_ison.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp
index 218e0f7b8..4e69cbb4e 100644
--- a/src/cmd_join.cpp
+++ b/src/cmd_join.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
 #include "commands/cmd_join.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_kick.cpp b/src/cmd_kick.cpp
index 17933a43f..bd700113f 100644
--- a/src/cmd_kick.cpp
+++ b/src/cmd_kick.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "inspircd.h"
 #include "commands/cmd_kick.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index 26f354b8f..2e04ab08f 100644
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -12,10 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
-#include "wildcard.h"
 #include "commands/cmd_kill.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_kline.cpp b/src/cmd_kline.cpp
index 05856893a..ec31228ed 100644
--- a/src/cmd_kline.cpp
+++ b/src/cmd_kline.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "xline.h"
 #include "commands/cmd_kline.h"
 
diff --git a/src/cmd_links.cpp b/src/cmd_links.cpp
index 83e558d5d..45011d3e8 100644
--- a/src/cmd_links.cpp
+++ b/src/cmd_links.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "commands/cmd_links.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_list.cpp b/src/cmd_list.cpp
index c9039b86b..1e994965b 100644
--- a/src/cmd_list.cpp
+++ b/src/cmd_list.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "inspircd.h"
 #include "commands/cmd_list.h"
 #include "wildcard.h"
 
diff --git a/src/cmd_loadmodule.cpp b/src/cmd_loadmodule.cpp
index 08179d120..c23dace62 100644
--- a/src/cmd_loadmodule.cpp
+++ b/src/cmd_loadmodule.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
 #include "commands/cmd_loadmodule.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_lusers.cpp b/src/cmd_lusers.cpp
index fa58ca076..0d70fa788 100644
--- a/src/cmd_lusers.cpp
+++ b/src/cmd_lusers.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "inspircd.h"
 #include "commands/cmd_lusers.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_map.cpp b/src/cmd_map.cpp
index c75a18b3f..70918e392 100644
--- a/src/cmd_map.cpp
+++ b/src/cmd_map.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
 #include "commands/cmd_map.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_mode.cpp b/src/cmd_mode.cpp
index 18c1e69ad..4e4466d36 100644
--- a/src/cmd_mode.cpp
+++ b/src/cmd_mode.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
 #include "commands/cmd_mode.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_modules.cpp b/src/cmd_modules.cpp
index be236fcd9..aa31122a7 100644
--- a/src/cmd_modules.cpp
+++ b/src/cmd_modules.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "commands/cmd_modules.h"
 
diff --git a/src/cmd_motd.cpp b/src/cmd_motd.cpp
index 6aaf1a9af..38117be6b 100644
--- a/src/cmd_motd.cpp
+++ b/src/cmd_motd.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
 #include "commands/cmd_motd.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_names.cpp b/src/cmd_names.cpp
index cc6566cca..2b3a421a2 100644
--- a/src/cmd_names.cpp
+++ b/src/cmd_names.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
 #include "commands/cmd_names.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index c1638469e..93fdd560c 100644
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "xline.h"
 #include "commands/cmd_nick.h"
 
diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index 5df5b8ace..d97743a43 100644
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "commands/cmd_notice.h"
 
diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp
index 63c7dc3e3..d9ae74bf6 100644
--- a/src/cmd_oper.cpp
+++ b/src/cmd_oper.cpp
@@ -12,10 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "typedefs.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "commands/cmd_oper.h"
 #include "hashcomp.h"
diff --git a/src/cmd_part.cpp b/src/cmd_part.cpp
index 347466c22..9887d844e 100644
--- a/src/cmd_part.cpp
+++ b/src/cmd_part.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
 #include "commands/cmd_part.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_pass.cpp b/src/cmd_pass.cpp
index 29c83c3bf..9b57c375d 100644
--- a/src/cmd_pass.cpp
+++ b/src/cmd_pass.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
 #include "commands/cmd_pass.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_ping.cpp b/src/cmd_ping.cpp
index afb708d70..2ffd7850b 100644
--- a/src/cmd_ping.cpp
+++ b/src/cmd_ping.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
 #include "commands/cmd_ping.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_pong.cpp b/src/cmd_pong.cpp
index c89542240..08d47eca7 100644
--- a/src/cmd_pong.cpp
+++ b/src/cmd_pong.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
 #include "commands/cmd_pong.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index 04f500951..00a7f1366 100644
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "commands/cmd_privmsg.h"
 
diff --git a/src/cmd_qline.cpp b/src/cmd_qline.cpp
index bb1122854..41643c5d6 100644
--- a/src/cmd_qline.cpp
+++ b/src/cmd_qline.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "xline.h"
 #include "commands/cmd_qline.h"
 
diff --git a/src/cmd_quit.cpp b/src/cmd_quit.cpp
index a859c1790..671e1ccef 100644
--- a/src/cmd_quit.cpp
+++ b/src/cmd_quit.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "commands/cmd_quit.h"
 
 
diff --git a/src/cmd_rehash.cpp b/src/cmd_rehash.cpp
index 6e214be0a..ed972007d 100644
--- a/src/cmd_rehash.cpp
+++ b/src/cmd_rehash.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "commands/cmd_rehash.h"
 
 
diff --git a/src/cmd_reloadmodule.cpp b/src/cmd_reloadmodule.cpp
index 41da0c40d..d05d36f3b 100644
--- a/src/cmd_reloadmodule.cpp
+++ b/src/cmd_reloadmodule.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
 #include "commands/cmd_reloadmodule.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_restart.cpp b/src/cmd_restart.cpp
index c910df8ba..b9afd7c9d 100644
--- a/src/cmd_restart.cpp
+++ b/src/cmd_restart.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
 #include "commands/cmd_restart.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_rules.cpp b/src/cmd_rules.cpp
index 95b744412..ef63d58fd 100644
--- a/src/cmd_rules.cpp
+++ b/src/cmd_rules.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
 #include "commands/cmd_rules.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_server.cpp b/src/cmd_server.cpp
index cace13c38..0b71ba005 100644
--- a/src/cmd_server.cpp
+++ b/src/cmd_server.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
 #include "commands/cmd_server.h"
 
 
diff --git a/src/cmd_squit.cpp b/src/cmd_squit.cpp
index 49360d84f..94e7c148b 100644
--- a/src/cmd_squit.cpp
+++ b/src/cmd_squit.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
 #include "commands/cmd_squit.h"
 
 /*
diff --git a/src/cmd_stats.cpp b/src/cmd_stats.cpp
index 2185b325e..58fcbb977 100644
--- a/src/cmd_stats.cpp
+++ b/src/cmd_stats.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
 #ifndef WIN32
 #include <sys/resource.h>
 
@@ -22,8 +21,6 @@
 #endif
 
 #endif
-#include "users.h"
-#include "modules.h"
 #include "xline.h"
 #include "commands/cmd_stats.h"
 #include "commands/cmd_whowas.h"
diff --git a/src/cmd_summon.cpp b/src/cmd_summon.cpp
index 520bdf090..3b3595c3f 100644
--- a/src/cmd_summon.cpp
+++ b/src/cmd_summon.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
 #include "commands/cmd_summon.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_time.cpp b/src/cmd_time.cpp
index cd0f0e1c7..d34a1eed5 100644
--- a/src/cmd_time.cpp
+++ b/src/cmd_time.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
 #include "commands/cmd_time.h"
 
 
diff --git a/src/cmd_topic.cpp b/src/cmd_topic.cpp
index 33005cab2..d30383024 100644
--- a/src/cmd_topic.cpp
+++ b/src/cmd_topic.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "commands/cmd_topic.h"
 
 
diff --git a/src/cmd_trace.cpp b/src/cmd_trace.cpp
index 42105df98..d4e0b9254 100644
--- a/src/cmd_trace.cpp
+++ b/src/cmd_trace.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
 #include "commands/cmd_trace.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_unloadmodule.cpp b/src/cmd_unloadmodule.cpp
index 44c2133e7..137525d32 100644
--- a/src/cmd_unloadmodule.cpp
+++ b/src/cmd_unloadmodule.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
 #include "commands/cmd_unloadmodule.h"
 
 
diff --git a/src/cmd_user.cpp b/src/cmd_user.cpp
index 4e1584a81..42e70c1df 100644
--- a/src/cmd_user.cpp
+++ b/src/cmd_user.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
 #include "commands/cmd_user.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_userhost.cpp b/src/cmd_userhost.cpp
index 9e644bdd1..8a0e187fb 100644
--- a/src/cmd_userhost.cpp
+++ b/src/cmd_userhost.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
 #include "commands/cmd_userhost.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_users.cpp b/src/cmd_users.cpp
index 97b9b247d..15319d16e 100644
--- a/src/cmd_users.cpp
+++ b/src/cmd_users.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
 #include "commands/cmd_users.h"
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
diff --git a/src/cmd_version.cpp b/src/cmd_version.cpp
index 599b7bf75..2b6522d81 100644
--- a/src/cmd_version.cpp
+++ b/src/cmd_version.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
 #include "commands/cmd_version.h"
 
 
diff --git a/src/cmd_wallops.cpp b/src/cmd_wallops.cpp
index d32b19ebd..a66ceddf5 100644
--- a/src/cmd_wallops.cpp
+++ b/src/cmd_wallops.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "modules.h"
 #include "commands/cmd_wallops.h"
 
 
diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp
index 6376d8dff..07370f31e 100644
--- a/src/cmd_who.cpp
+++ b/src/cmd_who.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "commands/cmd_who.h"
 
diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp
index 897ec60ac..dadb93902 100644
--- a/src/cmd_whois.cpp
+++ b/src/cmd_whois.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "commands/cmd_whois.h"
 #include "hashcomp.h"
 
diff --git a/src/cmd_whowas.cpp b/src/cmd_whowas.cpp
index 2d504c47c..f69d3ee32 100644
--- a/src/cmd_whowas.cpp
+++ b/src/cmd_whowas.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
 #include "commands/cmd_whowas.h"
 
 WhoWasMaintainTimer * timer;
diff --git a/src/cmd_zline.cpp b/src/cmd_zline.cpp
index 8fea70656..4a70069ab 100644
--- a/src/cmd_zline.cpp
+++ b/src/cmd_zline.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "xline.h"
 #include "commands/cmd_zline.h"
 
diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 8a6149a2c..fb89fd7ad 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -12,10 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include <algorithm>
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "xline.h"
 #include "socketengine.h"
diff --git a/src/commands.cpp b/src/commands.cpp
index 65b11e5a0..7f74471c8 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "xline.h"
 #include "command_parse.h"
diff --git a/src/configreader.cpp b/src/configreader.cpp
index 35dee3732..ec15db3a1 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include <sstream>
 #include <fstream>
 #include "xline.h"
 #include "exitcodes.h"
diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index ee257350e..9aecb8d83 100644
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
 #include "cull_list.h"
 
 CullItem::CullItem(userrec* u, std::string &r, const char* o_reason)
diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 01daaee86..80035ef70 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
 #include "dynamic.h"
 #ifndef WIN32
 #include <dlfcn.h>
diff --git a/src/filelogger.cpp b/src/filelogger.cpp
index 8bd28dde8..32a1f882f 100644
--- a/src/filelogger.cpp
+++ b/src/filelogger.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include <sstream>
 #include <fstream>
 #include "socketengine.h"
 #include "inspircd_se_config.h"
diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 66c9f21ba..608ed2f1b 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -13,11 +13,7 @@
 
 #include "inspircd.h"
 #include <stdarg.h>
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
-#include "mode.h"
 #include "xline.h"
 #include "exitcodes.h"
 
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index bfd7a9d45..9543ef856 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
 #include <signal.h>
 
 #ifndef WIN32
@@ -28,15 +27,11 @@
 	#endif
 #endif
 
-#include <exception>
 #include <fstream>
-#include "modules.h"
-#include "mode.h"
 #include "xline.h"
 #include "socketengine.h"
 #include "inspircd_se_config.h"
 #include "socket.h"
-#include "typedefs.h"
 #include "command_parse.h"
 #include "exitcodes.h"
 #include "caller.h"
diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index be90b6e84..fb0b207b6 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "socket.h"
-#include "configreader.h"
 #include "inspstring.h"
 #include "socketengine.h"
 #include "inspircd.h"
diff --git a/src/mode.cpp b/src/mode.cpp
index 755165421..7321d11c4 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -12,10 +12,7 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "modules.h"
 #include "inspstring.h"
-#include "mode.h"
 
 /* +s (secret) */
 #include "modes/cmode_s.h"
diff --git a/src/modules.cpp b/src/modules.cpp
index 28d746323..906efd862 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -12,11 +12,7 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
-#include "mode.h"
 #include "xline.h"
 #include "socket.h"
 #include "socketengine.h"
diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index 962e5a638..e447cd637 100644
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -13,8 +13,6 @@
 
 #include "inspircd.h"
 #include <stdarg.h>
-#include "configreader.h"
-#include "users.h"
 #include "snomasks.h"
 
 SnomaskManager::SnomaskManager(InspIRCd* Instance) : ServerInstance(Instance)
diff --git a/src/socket.cpp b/src/socket.cpp
index 3e9db5fd4..c33eee5a6 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include <string>
-#include "configreader.h"
 #include "socket.h"
 #include "socketengine.h"
 #include "wildcard.h"
diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index 78a0bc31f..9c8b27267 100644
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "xline.h"
 #include "socketengine.h"
diff --git a/src/users.cpp b/src/users.cpp
index cdcc245d4..35a0e716f 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "channels.h"
-#include "users.h"
 #include <stdarg.h>
 #include "socketengine.h"
 #include "wildcard.h"
diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 8587f1714..aaa619f2f 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include <string>
 #include "hashcomp.h"
 #include "inspstring.h"
 
diff --git a/src/xline.cpp b/src/xline.cpp
index 6ae2aa632..a28e61766 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "xline.h"