diff --git a/src/irc/core/irc-core.c b/src/irc/core/irc-core.c
index 5969e41d..2dbb36e8 100644
--- a/src/irc/core/irc-core.c
+++ b/src/irc/core/irc-core.c
@@ -22,6 +22,7 @@
 
 #include "irc-server.h"
 #include "channels.h"
+#include "query.h"
 
 #include "ctcp.h"
 #include "irc-commands.h"
@@ -36,6 +37,7 @@ void irc_core_init(void)
 {
 	irc_servers_init();
 	channels_init();
+	query_init();
 
 	ctcp_init();
 	irc_commands_init();
@@ -58,6 +60,7 @@ void irc_core_deinit(void)
 	irc_commands_deinit();
 	ctcp_deinit();
 
+	query_deinit();
 	channels_deinit();
 	irc_servers_deinit();
 }
diff --git a/src/irc/core/query.h b/src/irc/core/query.h
index 048c890a..c46a831e 100644
--- a/src/irc/core/query.h
+++ b/src/irc/core/query.h
@@ -27,4 +27,7 @@ QUERY_REC *query_find(IRC_SERVER_REC *server, const char *nick);
 
 void query_change_server(QUERY_REC *query, IRC_SERVER_REC *server);
 
+void query_init(void);
+void query_deinit(void);
+
 #endif