diff --git a/configure.ac b/configure.ac
index 4131d8a7..0ebc52d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1271,5 +1271,5 @@ Configuration:
 	Nickname length    : $NICKLEN
 	Topic length       : $TOPICLEN
 
-Use (g)make to compile Charybdis, then (g)make install to install it.
+Use make to compile Charybdis, then make install to install it.
 "
diff --git a/include/cache.h b/include/cache.h
index 02705e8b..9fada168 100644
--- a/include/cache.h
+++ b/include/cache.h
@@ -3,7 +3,6 @@
 #define INCLUDED_CACHE_H
 
 #include "client.h"
-#include "tools.h"
 
 #define HELP_MAX	100
 
diff --git a/include/class.h b/include/class.h
index 78064ebd..af6fa84b 100644
--- a/include/class.h
+++ b/include/class.h
@@ -27,8 +27,6 @@
 #ifndef INCLUDED_class_h
 #define INCLUDED_class_h
 
-#include "tools.h"
-
 struct ConfItem;
 struct Client;
 struct _patricia_tree_t;
diff --git a/include/client.h b/include/client.h
index bfce2c03..caa05192 100644
--- a/include/client.h
+++ b/include/client.h
@@ -35,14 +35,12 @@
 #endif
 
 #include "ircd_defs.h"
-#include "linebuf.h"
 #include "channel.h"
 #include "res.h"
 #include "snomask.h"
 #include "irc_string.h"
 #include "sprintf_irc.h"
 #include "ircd.h"
-#include "commio.h"
 
 /* other structs */
 struct Blacklist;
diff --git a/include/hash.h b/include/hash.h
index d732a964..97660221 100644
--- a/include/hash.h
+++ b/include/hash.h
@@ -27,8 +27,6 @@
 #ifndef INCLUDED_hash_h
 #define INCLUDED_hash_h
 
-#include "tools.h"
-
 struct Dictionary;
 
 extern rb_dlink_list *clientTable;
diff --git a/include/ircd.h b/include/ircd.h
index 652f20d1..d3d0e0f1 100644
--- a/include/ircd.h
+++ b/include/ircd.h
@@ -28,8 +28,6 @@
 #define INCLUDED_ircd_h
 
 #include "config.h"
-#include "tools.h"
-#include "memory.h"
 
 struct Client;
 struct rb_dlink_list;
diff --git a/include/modules.h b/include/modules.h
index 168a7ac2..d61061ad 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -40,7 +40,6 @@
 #endif
 
 #include "msg.h"
-#include "memory.h"
 #include "hook.h"
 
 struct module
diff --git a/include/newconf.h b/include/newconf.h
index ea2d8e99..dfc46232 100644
--- a/include/newconf.h
+++ b/include/newconf.h
@@ -10,7 +10,6 @@
 
 #include <stdio.h>
 
-#include "tools.h"
 #include "client.h"
 
 struct ConfEntry
diff --git a/include/packet.h b/include/packet.h
index 13b7febf..7962e6b3 100644
--- a/include/packet.h
+++ b/include/packet.h
@@ -27,8 +27,6 @@
 #ifndef INCLUDED_packet_h
 #define INCLUDED_packet_h
 
-#include "commio.h"
-
 /*
  * this hides in here rather than a config.h because it really shouldn't
  * be tweaked unless you *REALLY REALLY* know what you're doing!
diff --git a/include/parse.h b/include/parse.h
index e4d25e33..27772faa 100644
--- a/include/parse.h
+++ b/include/parse.h
@@ -28,7 +28,6 @@
 #define INCLUDED_parse_h_h
 
 #include "irc_dictionary.h"
-#include "tools.h"
 
 struct Message;
 struct Client;
diff --git a/include/res.h b/include/res.h
index 8f533132..76338974 100644
--- a/include/res.h
+++ b/include/res.h
@@ -9,7 +9,6 @@
 
 #include "ircd_defs.h"
 #include "common.h"
-#include "commio.h"
 #include "reslib.h"
 #include "irc_string.h"
 #include "sprintf_irc.h"
diff --git a/include/s_newconf.h b/include/s_newconf.h
index 65bbcac7..bd3282c6 100644
--- a/include/s_newconf.h
+++ b/include/s_newconf.h
@@ -36,7 +36,6 @@
 #define INCLUDED_s_newconf_h
 
 #include "setup.h"
-#include "tools.h"
 
 #ifdef HAVE_LIBCRYPTO
 #include <openssl/rsa.h>
diff --git a/include/substitution.h b/include/substitution.h
index 2f23b7c3..408649cc 100644
--- a/include/substitution.h
+++ b/include/substitution.h
@@ -34,7 +34,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 
 #ifndef SUBSTITUTION_H
 #define SUBSTITUTION_H
diff --git a/modules/core/m_die.c b/modules/core/m_die.c
index a40f7f83..ec81e79c 100644
--- a/modules/core/m_die.c
+++ b/modules/core/m_die.c
@@ -25,12 +25,10 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "client.h"
 #include "ircd.h"
 #include "irc_string.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_log.h"
 #include "s_conf.h"
 #include "send.h"
diff --git a/modules/core/m_error.c b/modules/core/m_error.c
index 0310eca8..96d15dc0 100644
--- a/modules/core/m_error.c
+++ b/modules/core/m_error.c
@@ -31,7 +31,6 @@
 #include "numeric.h"
 #include "send.h"
 #include "msg.h"
-#include "memory.h"
 #include "modules.h"
 #include "s_log.h"
 #include "s_conf.h"
diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index 2332fc37..fbb2e4ad 100644
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "common.h"
diff --git a/modules/core/m_kick.c b/modules/core/m_kick.c
index e2189de6..edec515f 100644
--- a/modules/core/m_kick.c
+++ b/modules/core/m_kick.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "irc_string.h"
diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index 5adecbaf..085f1fae 100644
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -41,7 +41,6 @@
 #include "msg.h"
 #include "packet.h"
 #include "send.h"
-#include "event.h"
 #include "s_newconf.h"
 #include "s_stats.h"
 
diff --git a/modules/core/m_mode.c b/modules/core/m_mode.c
index 76228523..b2ab73cd 100644
--- a/modules/core/m_mode.c
+++ b/modules/core/m_mode.c
@@ -25,8 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
-#include "balloc.h"
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
diff --git a/modules/core/m_part.c b/modules/core/m_part.c
index d31da2f5..0557002d 100644
--- a/modules/core/m_part.c
+++ b/modules/core/m_part.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "common.h"
diff --git a/modules/core/m_server.c b/modules/core/m_server.c
index 56a23412..29512ec7 100644
--- a/modules/core/m_server.c
+++ b/modules/core/m_server.c
@@ -25,10 +25,8 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "client.h"		/* client struct */
 #include "common.h"		/* TRUE bleah */
-#include "event.h"
 #include "hash.h"		/* add_to_client_hash */
 #include "irc_string.h"
 #include "ircd.h"		/* me */
diff --git a/modules/core/m_sjoin.c b/modules/core/m_sjoin.c
index 7acac514..b8eda6ae 100644
--- a/modules/core/m_sjoin.c
+++ b/modules/core/m_sjoin.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
diff --git a/modules/m_cap.c b/modules/m_cap.c
index 4e31f70e..5b696250 100644
--- a/modules/m_cap.c
+++ b/modules/m_cap.c
@@ -31,7 +31,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "class.h"
 #include "client.h"
 #include "irc_string.h"
diff --git a/modules/m_challenge.c b/modules/m_challenge.c
index ef708d2c..d71abcc8 100644
--- a/modules/m_challenge.c
+++ b/modules/m_challenge.c
@@ -36,7 +36,6 @@
 #include <openssl/err.h>
 #endif
 
-#include "memory.h"
 #include "client.h"
 #include "ircd.h"
 #include "modules.h"
diff --git a/modules/m_chghost.c b/modules/m_chghost.c
index ffb6aefa..f805cbbf 100644
--- a/modules/m_chghost.c
+++ b/modules/m_chghost.c
@@ -10,7 +10,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "send.h"
 #include "channel.h"
 #include "client.h"
@@ -18,7 +17,6 @@
 #include "config.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "memory.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_serv.h"
diff --git a/modules/m_close.c b/modules/m_close.c
index e8419d41..19d4e012 100644
--- a/modules/m_close.c
+++ b/modules/m_close.c
@@ -25,11 +25,9 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "client.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "commio.h"
 #include "send.h"
 #include "msg.h"
 #include "parse.h"
diff --git a/modules/m_connect.c b/modules/m_connect.c
index 34f9c006..22fb7f21 100644
--- a/modules/m_connect.c
+++ b/modules/m_connect.c
@@ -29,7 +29,6 @@
 #include "ircd.h"
 #include "irc_string.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_log.h"
diff --git a/modules/m_dline.c b/modules/m_dline.c
index 37fffde2..9bc7deff 100644
--- a/modules/m_dline.c
+++ b/modules/m_dline.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "class.h"
 #include "client.h"
@@ -35,7 +34,6 @@
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_log.h"
diff --git a/modules/m_encap.c b/modules/m_encap.c
index 1a1f801a..742c35d7 100644
--- a/modules/m_encap.c
+++ b/modules/m_encap.c
@@ -30,7 +30,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "send.h"
 #include "channel.h"
 #include "client.h"
@@ -38,7 +37,6 @@
 #include "config.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "memory.h"
 #include "s_serv.h"
 #include "hash.h"
 #include "msg.h"
diff --git a/modules/m_etrace.c b/modules/m_etrace.c
index 6cf9cb3b..219926e3 100644
--- a/modules/m_etrace.c
+++ b/modules/m_etrace.c
@@ -42,7 +42,6 @@
 #include "irc_string.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_serv.h"
 #include "s_conf.h"
 #include "s_newconf.h"
diff --git a/modules/m_gline.c b/modules/m_gline.c
index ca418a88..4f39befc 100644
--- a/modules/m_gline.c
+++ b/modules/m_gline.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "s_gline.h"
 #include "channel.h"
 #include "client.h"
@@ -36,7 +35,6 @@
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "scache.h"
diff --git a/modules/m_info.c b/modules/m_info.c
index 27b2f367..08d43957 100644
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "m_info.h"
 #include "channel.h"
 #include "client.h"
diff --git a/modules/m_invite.c b/modules/m_invite.c
index 35e392ff..eb6c0414 100644
--- a/modules/m_invite.c
+++ b/modules/m_invite.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "common.h"
 #include "channel.h"
 #include "client.h"
diff --git a/modules/m_kline.c b/modules/m_kline.c
index 7c51c081..66a3b7f1 100644
--- a/modules/m_kline.c
+++ b/modules/m_kline.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "class.h"
 #include "client.h"
@@ -35,7 +34,6 @@
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_log.h"
@@ -45,7 +43,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "event.h"
 #include "reject.h"
 
 static int mo_kline(struct Client *, struct Client *, int, const char **);
diff --git a/modules/m_knock.c b/modules/m_knock.c
index 8cf5ea77..fce94690 100644
--- a/modules/m_knock.c
+++ b/modules/m_knock.c
@@ -25,7 +25,6 @@
 
 #include "stdinc.h"
 #include "sprintf_irc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
diff --git a/modules/m_list.c b/modules/m_list.c
index f668e73d..f3581a5a 100644
--- a/modules/m_list.c
+++ b/modules/m_list.c
@@ -34,7 +34,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
@@ -47,7 +46,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "event.h"
 
 static rb_dlink_list safelisting_clients = { NULL, NULL, 0 };
 
diff --git a/modules/m_monitor.c b/modules/m_monitor.c
index eb0dafa9..e64b9479 100644
--- a/modules/m_monitor.c
+++ b/modules/m_monitor.c
@@ -31,7 +31,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "client.h"
 #include "msg.h"
 #include "parse.h"
diff --git a/modules/m_motd.c b/modules/m_motd.c
index 802b4071..6b17c31c 100644
--- a/modules/m_motd.c
+++ b/modules/m_motd.c
@@ -26,7 +26,6 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "tools.h"
 #include "ircd.h"
 #include "send.h"
 #include "numeric.h"
diff --git a/modules/m_names.c b/modules/m_names.c
index c4bd65fd..bb4b238b 100644
--- a/modules/m_names.c
+++ b/modules/m_names.c
@@ -26,7 +26,6 @@
 
 #include "stdinc.h"
 #include "sprintf_irc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "common.h"
diff --git a/modules/m_oper.c b/modules/m_oper.c
index ac7a1d34..61da90ce 100644
--- a/modules/m_oper.c
+++ b/modules/m_oper.c
@@ -25,13 +25,11 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "client.h"
 #include "common.h"
 #include "irc_string.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_log.h"
diff --git a/modules/m_operspy.c b/modules/m_operspy.c
index 6428fef1..00202334 100644
--- a/modules/m_operspy.c
+++ b/modules/m_operspy.c
@@ -30,7 +30,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "send.h"
 #include "channel.h"
 #include "client.h"
@@ -38,7 +37,6 @@
 #include "config.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "memory.h"
 #include "s_serv.h"
 #include "hash.h"
 #include "msg.h"
diff --git a/modules/m_scan.c b/modules/m_scan.c
index e6bf0865..37a07833 100644
--- a/modules/m_scan.c
+++ b/modules/m_scan.c
@@ -41,7 +41,6 @@
 #include "irc_string.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_serv.h"
 #include "s_conf.h"
 #include "s_newconf.h"
diff --git a/modules/m_services.c b/modules/m_services.c
index 539d20d5..899c1a36 100644
--- a/modules/m_services.c
+++ b/modules/m_services.c
@@ -31,7 +31,6 @@
 
 #include "stdinc.h"
 
-#include "tools.h"
 #include "send.h"
 #include "channel.h"
 #include "client.h"
@@ -39,7 +38,6 @@
 #include "config.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "memory.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_serv.h"
diff --git a/modules/m_set.c b/modules/m_set.c
index c27cd95e..6a72e75c 100644
--- a/modules/m_set.c
+++ b/modules/m_set.c
@@ -28,12 +28,10 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "event.h"
 #include "irc_string.h"
 #include "sprintf_irc.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_serv.h"
 #include "send.h"
 #include "common.h"
diff --git a/modules/m_signon.c b/modules/m_signon.c
index 378fd074..16b13ccf 100644
--- a/modules/m_signon.c
+++ b/modules/m_signon.c
@@ -31,7 +31,6 @@
 
 #include "stdinc.h"
 
-#include "tools.h"
 #include "send.h"
 #include "channel.h"
 #include "client.h"
@@ -39,7 +38,6 @@
 #include "config.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "memory.h"
 #include "s_conf.h"
 #include "s_serv.h"
 #include "hash.h"
diff --git a/modules/m_snote.c b/modules/m_snote.c
index 881d260a..785901e4 100644
--- a/modules/m_snote.c
+++ b/modules/m_snote.c
@@ -41,7 +41,6 @@
 #include "irc_string.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_serv.h"
 #include "s_conf.h"
 #include "s_newconf.h"
diff --git a/modules/m_stats.c b/modules/m_stats.c
index f7c2c936..a4bd4b16 100644
--- a/modules/m_stats.c
+++ b/modules/m_stats.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"		/* rb_dlink_node/rb_dlink_list */
 #include "class.h"		/* report_classes */
 #include "client.h"		/* Client */
 #include "common.h"		/* TRUE/FALSE */
@@ -38,14 +37,11 @@
 #include "numeric.h"		/* ERR_xxx */
 #include "scache.h"		/* list_scache */
 #include "send.h"		/* sendto_one */
-#include "commio.h"		/* highest_fd */
 #include "s_conf.h"		/* ConfItem */
 #include "s_serv.h"		/* hunt_server */
 #include "s_stats.h"		/* tstats */
 #include "s_user.h"		/* show_opers */
-#include "event.h"		/* events */
 #include "blacklist.h"		/* dnsbl stuff */
-#include "linebuf.h"
 #include "parse.h"
 #include "modules.h"
 #include "hook.h"
diff --git a/modules/m_tb.c b/modules/m_tb.c
index eac3ae32..875713e9 100644
--- a/modules/m_tb.c
+++ b/modules/m_tb.c
@@ -31,7 +31,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "send.h"
 #include "channel.h"
 #include "client.h"
diff --git a/modules/m_testline.c b/modules/m_testline.c
index 87d9575a..fbecbe8d 100644
--- a/modules/m_testline.c
+++ b/modules/m_testline.c
@@ -30,7 +30,6 @@
  * $Id: m_testline.c 3303 2007-03-28 15:22:49Z jilles $
  */
 #include "stdinc.h"
-#include "tools.h"
 #include "send.h"
 #include "client.h"
 #include "modules.h"
diff --git a/modules/m_topic.c b/modules/m_topic.c
index e63f3e42..1aabf4bb 100644
--- a/modules/m_topic.c
+++ b/modules/m_topic.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
diff --git a/modules/m_trace.c b/modules/m_trace.c
index d99cd5aa..2f95f5d6 100644
--- a/modules/m_trace.c
+++ b/modules/m_trace.c
@@ -34,7 +34,6 @@
 #include "irc_string.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_serv.h"
 #include "s_conf.h"
 #include "s_newconf.h"
diff --git a/modules/m_who.c b/modules/m_who.c
index f6b2d723..bb882598 100644
--- a/modules/m_who.c
+++ b/modules/m_who.c
@@ -24,7 +24,6 @@
  *  $Id: m_who.c 3350 2007-04-02 22:03:08Z jilles $
  */
 #include "stdinc.h"
-#include "tools.h"
 #include "common.h"
 #include "client.h"
 #include "channel.h"
diff --git a/modules/m_whois.c b/modules/m_whois.c
index caba2b7a..331630c7 100644
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "common.h"
 #include "client.h"
 #include "hash.h"
diff --git a/modules/m_xline.c b/modules/m_xline.c
index 9b257ff2..0f11a86d 100644
--- a/modules/m_xline.c
+++ b/modules/m_xline.c
@@ -31,7 +31,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "send.h"
 #include "channel.h"
 #include "client.h"
@@ -40,7 +39,6 @@
 #include "class.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "memory.h"
 #include "s_log.h"
 #include "s_serv.h"
 #include "whowas.h"
diff --git a/src/blacklist.c b/src/blacklist.c
index 6e0740a0..544c3bd9 100644
--- a/src/blacklist.c
+++ b/src/blacklist.c
@@ -36,8 +36,6 @@
 #include "stdinc.h"
 #include "client.h"
 #include "res.h"
-#include "tools.h"
-#include "memory.h"
 #include "numeric.h"
 #include "reject.h"
 #include "s_conf.h"
diff --git a/src/cache.c b/src/cache.c
index 6f5efb23..3db464e7 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -36,11 +36,7 @@
 #include "ircd_defs.h"
 #include "common.h"
 #include "s_conf.h"
-#include "tools.h"
 #include "client.h"
-#include "memory.h"
-#include "balloc.h"
-#include "event.h"
 #include "hash.h"
 #include "cache.h"
 #include "sprintf_irc.h"
diff --git a/src/channel.c b/src/channel.c
index 4dc13cb6..a1b2905b 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "common.h"
@@ -41,9 +40,6 @@
 #include "whowas.h"
 #include "s_conf.h"		/* ConfigFileEntry, ConfigChannel */
 #include "s_newconf.h"
-#include "event.h"
-#include "memory.h"
-#include "balloc.h"
 #include "s_log.h"
 
 extern rb_dlink_list global_channel_list;
diff --git a/src/chmode.c b/src/chmode.c
index b2967b1c..d252f6f9 100644
--- a/src/chmode.c
+++ b/src/chmode.c
@@ -26,7 +26,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "common.h"
@@ -42,9 +41,6 @@
 #include "whowas.h"
 #include "s_conf.h"		/* ConfigFileEntry, ConfigChannel */
 #include "s_newconf.h"
-#include "event.h"
-#include "memory.h"
-#include "balloc.h"
 #include "s_log.h"
 
 /* bitmasks for error returns, so we send once per call */
diff --git a/src/class.c b/src/class.c
index 878e694d..92a0c0d7 100644
--- a/src/class.c
+++ b/src/class.c
@@ -27,7 +27,6 @@
 #include "stdinc.h"
 #include "config.h"
 
-#include "tools.h"
 #include "class.h"
 #include "client.h"
 #include "common.h"
@@ -37,7 +36,6 @@
 #include "s_newconf.h"
 #include "send.h"
 #include "irc_string.h"
-#include "memory.h"
 
 #define BAD_CONF_CLASS          -1
 #define BAD_PING                -2
diff --git a/src/client.c b/src/client.c
index ef5af5d2..6830bde5 100644
--- a/src/client.c
+++ b/src/client.c
@@ -27,11 +27,9 @@
 #include "stdinc.h"
 #include "config.h"
 
-#include "tools.h"
 #include "client.h"
 #include "class.h"
 #include "common.h"
-#include "event.h"
 #include "hash.h"
 #include "irc_string.h"
 #include "sprintf_irc.h"
@@ -40,7 +38,6 @@
 #include "numeric.h"
 #include "packet.h"
 #include "s_auth.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_log.h"
@@ -49,11 +46,8 @@
 #include "send.h"
 #include "whowas.h"
 #include "s_user.h"
-#include "linebuf.h"
 #include "hash.h"
-#include "memory.h"
 #include "hostmask.h"
-#include "balloc.h"
 #include "listener.h"
 #include "hook.h"
 #include "msg.h"
diff --git a/src/extban.c b/src/extban.c
index f02c98c4..c8a04df9 100644
--- a/src/extban.c
+++ b/src/extban.c
@@ -23,7 +23,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "common.h"
diff --git a/src/hash.c b/src/hash.c
index 2c821287..bf17b066 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -26,7 +26,6 @@
 
 #include "stdinc.h"
 #include "ircd_defs.h"
-#include "tools.h"
 #include "s_conf.h"
 #include "channel.h"
 #include "client.h"
@@ -36,7 +35,6 @@
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
-#include "memory.h"
 #include "msg.h"
 #include "cache.h"
 #include "s_newconf.h"
diff --git a/src/hook.c b/src/hook.c
index 69ce520a..f06e6f6d 100644
--- a/src/hook.c
+++ b/src/hook.c
@@ -37,8 +37,6 @@
  * $Id: hook.c 712 2006-02-06 04:42:14Z gxti $
  */
 #include "stdinc.h"
-#include "memory.h"
-#include "tools.h"
 #include "hook.h"
 #include "irc_string.h"
 
diff --git a/src/hostmask.c b/src/hostmask.c
index 9340d7e5..c24e2d0a 100644
--- a/src/hostmask.c
+++ b/src/hostmask.c
@@ -26,7 +26,6 @@
  */
 
 #include "stdinc.h"
-#include "memory.h"
 #include "ircd_defs.h"
 #include "s_conf.h"
 #include "hostmask.h"
diff --git a/src/irc_dictionary.c b/src/irc_dictionary.c
index eba262c6..1de03da8 100644
--- a/src/irc_dictionary.c
+++ b/src/irc_dictionary.c
@@ -24,12 +24,9 @@
 
 #include "stdinc.h"
 #include "sprintf_irc.h"
-#include "tools.h"
 #include "irc_string.h"
 #include "client.h"
-#include "memory.h"
 #include "setup.h"
-#include "balloc.h"
 #include "irc_dictionary.h"
 
 static BlockHeap *elem_heap = NULL;
diff --git a/src/irc_string.c b/src/irc_string.c
index b7f0957d..90c21d10 100644
--- a/src/irc_string.c
+++ b/src/irc_string.c
@@ -26,10 +26,8 @@
 
 #include "stdinc.h"
 #include "sprintf_irc.h"
-#include "tools.h"
 #include "irc_string.h"
 #include "client.h"
-#include "memory.h"
 #include "setup.h"
 
 #ifndef INADDRSZ
diff --git a/src/ircd.c b/src/ircd.c
index eb648b1c..c3bffde0 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -28,13 +28,11 @@
 #include "setup.h"
 #include "config.h"
 
-#include "tools.h"
 #include "ircd.h"
 #include "channel.h"
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "event.h"
 #include "hash.h"
 #include "irc_string.h"
 #include "ircd_signal.h"
@@ -47,7 +45,6 @@
 #include "res.h"
 #include "restart.h"
 #include "s_auth.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_log.h"
 #include "s_serv.h"		/* try_connections */
@@ -58,17 +55,14 @@
 #include "supported.h"
 #include "whowas.h"
 #include "modules.h"
-#include "memory.h"
 #include "hook.h"
 #include "ircd_getopt.h"
-#include "balloc.h"
 #include "newconf.h"
 #include "reject.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "cache.h"
 #include "monitor.h"
-#include "libcharybdis.h"
 #include "patchlevel.h"
 #include "serno.h"
 
diff --git a/src/ircd_signal.c b/src/ircd_signal.c
index e910505f..906e4a47 100644
--- a/src/ircd_signal.c
+++ b/src/ircd_signal.c
@@ -25,8 +25,6 @@
 #include "ircd.h"		/* dorehash */
 #include "restart.h"		/* server_reboot */
 #include "s_log.h"
-#include "memory.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "client.h"
 #include "send.h"
diff --git a/src/ircd_state.c b/src/ircd_state.c
index c1470955..973f1aba 100644
--- a/src/ircd_state.c
+++ b/src/ircd_state.c
@@ -38,14 +38,11 @@
 #include "config.h"
 
 #include "client.h"
-#include "tools.h"
-#include "tools.h"
 #include "ircd.h"
 #include "channel.h"
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "event.h"
 #include "hash.h"
 #include "irc_string.h"
 #include "ircd_signal.h"
@@ -58,7 +55,6 @@
 #include "res.h"
 #include "restart.h"
 #include "s_auth.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_log.h"
 #include "s_serv.h"             /* try_connections */
@@ -68,10 +64,8 @@
 #include "send.h"
 #include "whowas.h"
 #include "modules.h"
-#include "memory.h"
 #include "hook.h"
 #include "ircd_getopt.h"
-#include "balloc.h"
 #include "newconf.h"
 #include "patricia.h"
 #include "reject.h"
@@ -79,7 +73,6 @@
 #include "s_newconf.h"
 #include "cache.h"
 #include "monitor.h"
-#include "libcharybdis.h"
 #include "patchlevel.h"
 #include "serno.h"
 
diff --git a/src/kdparse.c b/src/kdparse.c
index 3beac3da..b94bb507 100644
--- a/src/kdparse.c
+++ b/src/kdparse.c
@@ -25,14 +25,12 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "s_log.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "hostmask.h"
 #include "client.h"
 #include "irc_string.h"
-#include "memory.h"
 #include "hash.h"
 
 /* conf_add_fields()
diff --git a/src/listener.c b/src/listener.c
index 78fd876c..d676f25d 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -33,12 +33,10 @@
 #include "ircd.h"
 #include "ircd_defs.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_stats.h"
 #include "send.h"
-#include "memory.h"
 #include "s_auth.h"
 #include "reject.h"
 #include "s_conf.h"
diff --git a/src/modules.c b/src/modules.c
index e3da9e51..78a795b7 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -38,8 +38,6 @@
 #include "parse.h"
 #include "ircd_defs.h"
 #include "irc_string.h"
-#include "memory.h"
-#include "tools.h"
 #include "sprintf_irc.h"
 
 
diff --git a/src/monitor.c b/src/monitor.c
index 227fd7ee..907c7f1b 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -32,13 +32,9 @@
  * $Id: monitor.c 3520 2007-06-30 22:15:35Z jilles $
  */
 #include "stdinc.h"
-#include "tools.h"
 #include "client.h"
-#include "memory.h"
-#include "balloc.h"
 #include "monitor.h"
 #include "hash.h"
-#include "event.h"
 #include "numeric.h"
 
 static struct monitor *monitorTable[MONITOR_HASH_SIZE];
diff --git a/src/newconf.c b/src/newconf.c
index b8203302..825a6d36 100644
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -9,9 +9,7 @@
 #include <openssl/rsa.h>
 #endif
 
-#include "memory.h"
 #include "newconf.h"
-#include "tools.h"
 #include "ircd_defs.h"
 #include "sprintf_irc.h"
 #include "common.h"
@@ -25,7 +23,6 @@
 #include "listener.h"
 #include "hostmask.h"
 #include "s_serv.h"
-#include "event.h"
 #include "hash.h"
 #include "cache.h"
 #include "ircd.h"
diff --git a/src/numeric.c b/src/numeric.c
index 1a8c96c2..f43b763d 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -31,7 +31,6 @@
 #include "numeric.h"
 #include "irc_string.h"
 #include "common.h"		/* NULL cripes */
-#include "memory.h"
 
 #include "messages.tab"
 
diff --git a/src/packet.c b/src/packet.c
index 98bace1b..b3647722 100644
--- a/src/packet.c
+++ b/src/packet.c
@@ -24,8 +24,6 @@
  *  $Id: packet.c 3446 2007-05-14 22:21:16Z jilles $
  */
 #include "stdinc.h"
-#include "tools.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_serv.h"
 #include "client.h"
@@ -34,7 +32,6 @@
 #include "parse.h"
 #include "packet.h"
 #include "irc_string.h"
-#include "memory.h"
 #include "hook.h"
 #include "send.h"
 
diff --git a/src/parse.c b/src/parse.c
index 3b5cd273..36976ce7 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -40,7 +40,6 @@
 #include "send.h"
 #include "msg.h"
 #include "s_conf.h"
-#include "memory.h"
 #include "s_serv.h"
 #include "packet.h"
 
diff --git a/src/reject.c b/src/reject.c
index afdfc856..47271b2d 100644
--- a/src/reject.c
+++ b/src/reject.c
@@ -28,8 +28,6 @@
 #include "patricia.h"
 #include "client.h"
 #include "s_conf.h"
-#include "event.h"
-#include "tools.h"
 #include "reject.h"
 #include "s_stats.h"
 #include "msg.h"
diff --git a/src/res.c b/src/res.c
index 74e8e856..22f0993c 100644
--- a/src/res.c
+++ b/src/res.c
@@ -29,11 +29,8 @@
 #include "ircd_defs.h"
 #include "common.h"
 #include "ircd.h"
-#include "commio.h"
 #include "res.h"
 #include "reslib.h"
-#include "tools.h"
-#include "event.h"
 #include "irc_string.h"
 #include "sprintf_irc.h"
 #include "numeric.h"
diff --git a/src/reslib.c b/src/reslib.c
index fce6f05e..288a57c8 100644
--- a/src/reslib.c
+++ b/src/reslib.c
@@ -84,11 +84,8 @@
 #include "ircd_defs.h"
 #include "common.h"
 #include "ircd.h"
-#include "commio.h"
 #include "res.h"
 #include "reslib.h"
-#include "tools.h"
-#include "event.h"
 #include "irc_string.h"
 #include "sprintf_irc.h"
 
diff --git a/src/restart.c b/src/restart.c
index bcfeebfa..2f7b4b9d 100644
--- a/src/restart.c
+++ b/src/restart.c
@@ -25,14 +25,12 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "restart.h"
 #include "common.h"
 #include "ircd.h"
 #include "send.h"
 #include "s_log.h"
 #include "client.h"		/* for FLAGS_ALL */
-#include "memory.h"
 
 /* external var */
 extern char **myargv;
diff --git a/src/s_auth.c b/src/s_auth.c
index 3aaa03ce..af4ab14b 100644
--- a/src/s_auth.c
+++ b/src/s_auth.c
@@ -35,23 +35,19 @@
  */
 #include "stdinc.h"
 #include "config.h"
-#include "tools.h"
 #include "s_auth.h"
 #include "s_conf.h"
 #include "client.h"
 #include "common.h"
-#include "event.h"
 #include "irc_string.h"
 #include "sprintf_irc.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "packet.h"
 #include "res.h"
-#include "commio.h"
 #include "s_log.h"
 #include "s_stats.h"
 #include "send.h"
-#include "memory.h"
 #include "hook.h"
 #include "blacklist.h"
 
diff --git a/src/s_conf.c b/src/s_conf.c
index 4694d4b0..871baa8f 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -26,7 +26,6 @@
 
 #include "stdinc.h"
 #include "ircd_defs.h"
-#include "tools.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_serv.h"
@@ -35,7 +34,6 @@
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "event.h"
 #include "hash.h"
 #include "irc_string.h"
 #include "sprintf_irc.h"
@@ -44,12 +42,9 @@
 #include "hostmask.h"
 #include "modules.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_log.h"
 #include "send.h"
 #include "s_gline.h"
-#include "memory.h"
-#include "balloc.h"
 #include "patricia.h"
 #include "reject.h"
 #include "cache.h"
diff --git a/src/s_gline.c b/src/s_gline.c
index c64bfedc..0764c401 100644
--- a/src/s_gline.c
+++ b/src/s_gline.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "common.h"
@@ -34,7 +33,6 @@
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "scache.h"
 #include "send.h"
@@ -42,8 +40,6 @@
 #include "s_serv.h"
 #include "s_gline.h"
 #include "hash.h"
-#include "event.h"
-#include "memory.h"
 
 rb_dlink_list glines;
 
diff --git a/src/s_newconf.c b/src/s_newconf.c
index 3c828b27..5efb6e86 100644
--- a/src/s_newconf.c
+++ b/src/s_newconf.c
@@ -37,16 +37,12 @@
 #include "common.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "tools.h"
 #include "client.h"
-#include "memory.h"
 #include "s_serv.h"
 #include "send.h"
 #include "hostmask.h"
 #include "newconf.h"
 #include "hash.h"
-#include "balloc.h"
-#include "event.h"
 #include "sprintf_irc.h"
 #include "irc_dictionary.h"
 
diff --git a/src/s_serv.c b/src/s_serv.c
index 167b77f8..a3d3c010 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -30,12 +30,10 @@
 #include <openssl/rsa.h>
 #endif
 
-#include "tools.h"
 #include "s_serv.h"
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "event.h"
 #include "hash.h"
 #include "irc_string.h"
 #include "sprintf_irc.h"
@@ -44,7 +42,6 @@
 #include "numeric.h"
 #include "packet.h"
 #include "res.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_log.h"
@@ -53,7 +50,6 @@
 #include "scache.h"
 #include "send.h"
 #include "client.h"
-#include "memory.h"
 #include "channel.h"		/* chcap_usage_counts stuff... */
 #include "hook.h"
 #include "msg.h"
diff --git a/src/s_stats.c b/src/s_stats.c
index a22e7299..4d0fc16b 100644
--- a/src/s_stats.c
+++ b/src/s_stats.c
@@ -30,9 +30,7 @@
 #include "irc_string.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "commio.h"
 #include "send.h"
-#include "memory.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "whowas.h"
diff --git a/src/s_user.c b/src/s_user.c
index 8c7a9203..07300934 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "s_user.h"
 #include "channel.h"
 #include "class.h"
@@ -38,7 +37,6 @@
 #include "listener.h"
 #include "msg.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_log.h"
@@ -48,7 +46,6 @@
 #include "send.h"
 #include "supported.h"
 #include "whowas.h"
-#include "memory.h"
 #include "packet.h"
 #include "reject.h"
 #include "cache.h"
diff --git a/src/scache.c b/src/scache.c
index 525e5bd1..8617743e 100644
--- a/src/scache.c
+++ b/src/scache.c
@@ -32,7 +32,6 @@
 #include "numeric.h"
 #include "send.h"
 #include "scache.h"
-#include "memory.h"
 #include "s_conf.h"
 
 
diff --git a/src/send.c b/src/send.c
index e73f0ec2..745f157c 100644
--- a/src/send.c
+++ b/src/send.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "send.h"
 #include "channel.h"
 #include "class.h"
@@ -34,14 +33,11 @@
 #include "irc_string.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_serv.h"
 #include "sprintf_irc.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "linebuf.h"
 #include "s_log.h"
-#include "memory.h"
 #include "hook.h"
 #include "monitor.h"
 
diff --git a/src/substitution.c b/src/substitution.c
index e6d48c47..28b9d315 100644
--- a/src/substitution.c
+++ b/src/substitution.c
@@ -34,8 +34,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
-#include "balloc.h"
 #include "s_user.h"
 #include "irc_string.h"
 
diff --git a/src/supported.c b/src/supported.c
index 8066c7f9..f8a32509 100644
--- a/src/supported.c
+++ b/src/supported.c
@@ -81,7 +81,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "client.h"
 #include "common.h"
 #include "numeric.h"
diff --git a/src/whowas.c b/src/whowas.c
index cd615c12..1f7cd75a 100644
--- a/src/whowas.c
+++ b/src/whowas.c
@@ -38,7 +38,6 @@
 #include "s_user.h"
 #include "send.h"
 #include "s_conf.h"
-#include "memory.h"
 #include "scache.h"
 
 /* internally defined function */