diff --git a/include/ircd.h b/include/ircd.h
index ec8192ba9..c600f5c2a 100644
--- a/include/ircd.h
+++ b/include/ircd.h
@@ -99,11 +99,6 @@ extern rb_dlink_list local_oper_list;
 extern rb_dlink_list oper_list;
 extern rb_dlink_list dead_list;
 
-extern rb_bh *channel_heap;
-extern rb_bh *ban_heap;
-extern rb_bh *topic_heap;
-extern rb_bh *member_heap;
-
 extern int testing_conf;
 
 extern struct ev_entry *check_splitmode_ev;
diff --git a/src/channel.c b/src/channel.c
index 702038e77..36b847f64 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -41,6 +41,11 @@
 #include "s_newconf.h"
 #include "logger.h"
 
+static rb_bh *channel_heap;
+static rb_bh *ban_heap;
+static rb_bh *topic_heap;
+static rb_bh *member_heap;
+
 static int channel_capabs[] = { CAP_EX, CAP_IE,
 	CAP_SERVICE,
 	CAP_TS6
diff --git a/src/ircd.c b/src/ircd.c
index 217d011fb..7cc2fe08f 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -121,10 +121,6 @@ int zlib_ok = 1;
 int testing_conf = 0;
 
 struct config_channel_entry ConfigChannel;
-rb_bh *channel_heap;
-rb_bh *ban_heap;
-rb_bh *topic_heap;
-rb_bh *member_heap;
 
 rb_bh *client_heap = NULL;
 rb_bh *lclient_heap = NULL;