diff --git a/src/client.c b/src/client.c
index 34465e3..8cefb6f 100644
--- a/src/client.c
+++ b/src/client.c
@@ -72,12 +72,11 @@ static int qs_server(struct Client *, struct Client *, struct Client *, const ch
 
 static EVH check_pings;
 
-extern rb_bh *client_heap;
-extern rb_bh *lclient_heap;
-extern rb_bh *pclient_heap;
+static rb_bh *client_heap = NULL;
+static rb_bh *lclient_heap = NULL;
+static rb_bh *user_heap = NULL;
 static rb_bh *away_heap = NULL;
-
-extern char current_uid[IDLEN];
+static char current_uid[IDLEN];
 
 struct Dictionary *nd_dict = NULL;
 
diff --git a/src/ircd.c b/src/ircd.c
index 581b2e5..952caeb 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -119,12 +119,6 @@ int zlib_ok = 1;
 
 int testing_conf = 0;
 
-rb_bh *client_heap = NULL;
-rb_bh *lclient_heap = NULL;
-rb_bh *pclient_heap = NULL;
-
-char current_uid[IDLEN];
-
 /* patricia */
 rb_bh *prefix_heap;
 rb_bh *node_heap;