diff --git a/daemon/call.c b/daemon/call.c
index b257c05da..7bfba0997 100644
--- a/daemon/call.c
+++ b/daemon/call.c
@@ -3716,13 +3716,12 @@ static bool media_open_ports(struct call_media *media) {
 		__C_DBG("allocating stream_fds for %u ports", em->num_ports);
 		MEDIA_CLEAR(media, PUBLIC);
 
-		socket_port_q q = TYPED_GQUEUE_INIT;
+		socket_port_q q = IQUEUE_INIT;
 		if (!get_consecutive_ports(&q, em->num_ports, em_il->local_intf, label))
 			return false;
 
-		socket_port_list *spll;
-		while ((spll = t_queue_pop_head_link(&q))) {
-			__auto_type spl = spll->data;
+		struct socket_port_link *spl;
+		while ((spl = i_queue_pop_head(&q))) {
 			set_tos(&spl->socket, media->call->tos);
 			if (media->call->cpu_affinity >= 0) {
 				if (socket_cpu_affinity(&spl->socket, media->call->cpu_affinity))
diff --git a/daemon/media_socket.c b/daemon/media_socket.c
index ebc1b603f..f46e277df 100644
--- a/daemon/media_socket.c
+++ b/daemon/media_socket.c
@@ -801,8 +801,7 @@ static void release_reserved_port(struct port_pool *pp, ports_q *list, unsigned
 
 static void release_reserved_ports(socket_port_q *ports) {
 	while (ports->length) {
-		__auto_type pl = t_queue_pop_head_link(ports);
-		__auto_type p = pl->data;
+		__auto_type p = i_queue_pop_head(ports);
 		if (p->links.length)
 			release_reserved_port(p->pp, &p->links, GPOINTER_TO_UINT(p->links.head->data));
 		g_free(p);
@@ -1206,8 +1205,7 @@ static struct socket_port_link get_any_port_link(struct intf_spec *spec) {
 }
 
 static bool open_port_link_sockets(socket_port_q *out, struct intf_spec *spec, const str *label) {
-	for (__auto_type l = out->head; l; l = l->next) {
-		__auto_type spl = l->data;
+	IQUEUE_FOREACH(out, spl) {
 		unsigned int port = GPOINTER_TO_UINT(spl->links.head->data);
 		ilog(LOG_DEBUG, "Trying to bind the socket for port = '%d'", port);
 
@@ -1331,8 +1329,7 @@ new_cycle:
 
 		__auto_type splp = g_new(struct socket_port_link, 1);
 		*splp = spl;
-		splp->link.data = splp;
-		t_queue_push_tail_link(out, &splp->link);
+		i_queue_push_tail(out, splp);
 
 		/* find additional ports, usually it's only RTCP */
 		additional_port = port;
@@ -1354,8 +1351,7 @@ new_cycle:
 			/* track for which additional ports, we have to open sockets */
 			splp = g_new(struct socket_port_link, 1);
 			*splp = spl;
-			splp->link.data = splp;
-			t_queue_push_tail_link(out, &splp->link);
+			i_queue_push_tail(out, splp);
 		}
 
 		ilog(LOG_DEBUG, "Trying to bind the socket for RTP/RTCP ports (allocation attempt = '%d')",
@@ -1371,7 +1367,7 @@ new_cycle:
 	/* success */
 	ilog(LOG_DEBUG, "Opened %u socket(s) from port '%u' (on interface '%s') for a media relay",
 		num_ports,
-		out->head->data->socket.local.port,
+		out->head->socket.local.port,
 		sockaddr_print_buf(&spec->local_address.addr));
 	return true;
 
@@ -1390,7 +1386,7 @@ bool get_consecutive_ports(socket_port_q *out, unsigned int num_ports, struct lo
 void free_socket_intf_list(struct socket_intf_list *il) {
 	struct socket_port_link *spl;
 
-	while ((spl = t_queue_pop_head(&il->list)))
+	while ((spl = i_queue_pop_head(&il->list)))
 		free_port(spl);
 	g_free(il);
 }
diff --git a/include/media_socket.h b/include/media_socket.h
index 253f392df..421d5c13c 100644
--- a/include/media_socket.h
+++ b/include/media_socket.h
@@ -93,15 +93,17 @@ struct logical_intf {
 
 typedef void port_t;
 TYPED_GQUEUE(ports, port_t)
-TYPED_GQUEUE(socket_port, struct socket_port_link)
 
 struct socket_port_link {
 	socket_t			socket; // must be first
 	ports_q				links;
 	struct port_pool		*pp;
-	socket_port_list		link;
+	IQUEUE_LINK link;
 };
 
+typedef IQUEUE_TYPE(struct socket_port_link, link) socket_port_q;
+
+
 TYPED_GQUEUE(port_pool, struct port_pool)
 struct port_pool {
 	unsigned int			min, max;