diff --git a/daemon/call.h b/daemon/call.h
index cea5ff6db..d5a4cf94b 100644
--- a/daemon/call.h
+++ b/daemon/call.h
@@ -399,23 +399,6 @@ void stream_msg_mh_src(struct packet_stream *, struct msghdr *);
 void callmaster_get_all_calls(struct callmaster *m, GQueue *q);
 
 
-str *call_request_tcp(char **, struct callmaster *);
-str *call_lookup_tcp(char **, struct callmaster *);
-void call_delete_tcp(char **, struct callmaster *);
-void calls_status_tcp(struct callmaster *, struct control_stream *);
-
-str *call_update_udp(char **, struct callmaster *);
-str *call_lookup_udp(char **, struct callmaster *);
-str *call_delete_udp(char **, struct callmaster *);
-str *call_query_udp(char **, struct callmaster *);
-
-const char *call_offer_ng(bencode_item_t *, struct callmaster *, bencode_item_t *);
-const char *call_answer_ng(bencode_item_t *, struct callmaster *, bencode_item_t *);
-const char *call_delete_ng(bencode_item_t *, struct callmaster *, bencode_item_t *);
-const char *call_query_ng(bencode_item_t *, struct callmaster *, bencode_item_t *);
-const char *call_list_ng(bencode_item_t *, struct callmaster *, bencode_item_t *);
-
-
 void calls_dump_redis(struct callmaster *);
 struct call_monologue *__monologue_create(struct call *call);
 void __monologue_tag(struct call_monologue *ml, const str *tag);
diff --git a/daemon/call_interfaces.c b/daemon/call_interfaces.c
index 2f1abf197..60739cb2c 100644
--- a/daemon/call_interfaces.c
+++ b/daemon/call_interfaces.c
@@ -6,6 +6,7 @@
 #include <stdlib.h>
 #include <pcre.h>
 
+#include "call_interfaces.h"
 #include "call.h"
 #include "aux.h"
 #include "log.h"
@@ -854,7 +855,8 @@ stats:
 	ng_stats(bencode_dictionary_add_dictionary(dict, "RTCP"), &totals->totals[1], NULL);
 }
 
-void ng_list_calls( struct callmaster *m, bencode_item_t *output, long long int limit) {
+#if GLIB_CHECK_VERSION(2,16,0)
+static void ng_list_calls( struct callmaster *m, bencode_item_t *output, long long int limit) {
 	GHashTableIter iter;
 	gpointer key, value;
 
@@ -867,6 +869,7 @@ void ng_list_calls( struct callmaster *m, bencode_item_t *output, long long int
 
 	rwlock_unlock_r(&m->hashlock);
 }
+#endif
 
 
 
@@ -891,6 +894,7 @@ const char *call_query_ng(bencode_item_t *input, struct callmaster *m, bencode_i
 }
 
 
+#if GLIB_CHECK_VERSION(2,16,0)
 const char *call_list_ng(bencode_item_t *input, struct callmaster *m, bencode_item_t *output) {
 	bencode_item_t *calls = NULL;
 	long long int limit;
@@ -907,3 +911,4 @@ const char *call_list_ng(bencode_item_t *input, struct callmaster *m, bencode_it
 
 	return NULL;
 }
+#endif
diff --git a/daemon/call_interfaces.h b/daemon/call_interfaces.h
index 768fa9e28..70936eb77 100644
--- a/daemon/call_interfaces.h
+++ b/daemon/call_interfaces.h
@@ -3,6 +3,7 @@
 
 
 
+#include <glib.h>
 #include "str.h"
 #include "bencode.h"
 
@@ -10,9 +11,27 @@
 
 struct call;
 struct call_stats;
-
-
-
+struct callmaster;
+struct control_stream;
+
+
+str *call_request_tcp(char **, struct callmaster *);
+str *call_lookup_tcp(char **, struct callmaster *);
+void call_delete_tcp(char **, struct callmaster *);
+void calls_status_tcp(struct callmaster *, struct control_stream *);
+
+str *call_update_udp(char **, struct callmaster *);
+str *call_lookup_udp(char **, struct callmaster *);
+str *call_delete_udp(char **, struct callmaster *);
+str *call_query_udp(char **, struct callmaster *);
+
+const char *call_offer_ng(bencode_item_t *, struct callmaster *, bencode_item_t *);
+const char *call_answer_ng(bencode_item_t *, struct callmaster *, bencode_item_t *);
+const char *call_delete_ng(bencode_item_t *, struct callmaster *, bencode_item_t *);
+const char *call_query_ng(bencode_item_t *, struct callmaster *, bencode_item_t *);
+#if GLIB_CHECK_VERSION(2,16,0)
+const char *call_list_ng(bencode_item_t *, struct callmaster *, bencode_item_t *);
+#endif
 void ng_call_stats(struct call *call, const str *fromtag, const str *totag, bencode_item_t *output,
 		struct call_stats *totals);
 
diff --git a/daemon/control_ng.c b/daemon/control_ng.c
index 8e9696d3f..9b800ae2d 100644
--- a/daemon/control_ng.c
+++ b/daemon/control_ng.c
@@ -10,6 +10,7 @@
 #include "cookie_cache.h"
 #include "call.h"
 #include "sdp.h"
+#include "call_interfaces.h"
 
 
 static void pretty_print(bencode_item_t *el, GString *s) {
@@ -117,8 +118,10 @@ static void control_ng_incoming(struct obj *obj, str *buf, struct sockaddr_in6 *
 		errstr = call_delete_ng(dict, c->callmaster, resp);
 	else if (!str_cmp(&cmd, "query"))
 		errstr = call_query_ng(dict, c->callmaster, resp);
+#if GLIB_CHECK_VERSION(2,16,0)
 	else if (!str_cmp(&cmd, "list"))
 	    errstr = call_list_ng(dict, c->callmaster, resp);
+#endif
 	else
 		errstr = "Unrecognized command";
 
diff --git a/daemon/control_tcp.c b/daemon/control_tcp.c
index 443b14af0..1a707aacb 100644
--- a/daemon/control_tcp.c
+++ b/daemon/control_tcp.c
@@ -15,6 +15,7 @@
 #include "streambuf.h"
 #include "log.h"
 #include "call.h"
+#include "call_interfaces.h"
 
 
 
diff --git a/daemon/control_udp.c b/daemon/control_udp.c
index ff8866b43..b00e9d439 100644
--- a/daemon/control_udp.c
+++ b/daemon/control_udp.c
@@ -16,6 +16,7 @@
 #include "log.h"
 #include "call.h"
 #include "udp_listener.h"
+#include "call_interfaces.h"
 
 
 static void control_udp_incoming(struct obj *obj, str *buf, struct sockaddr_in6 *sin, char *addr) {