diff --git a/include/call.h b/include/call.h
index b11931de3..b017a8375 100644
--- a/include/call.h
+++ b/include/call.h
@@ -489,7 +489,7 @@ struct media_subscription {
 	struct media_subscription *reverse;	// opposite (subscription -> subscriber / vice versa)
 };
 
-typedef IQUEUE_TYPE(struct media_subscription, link) subscription_q;
+typedef IQUEUE(struct media_subscription, link) subscription_q;
 
 
 
diff --git a/include/codec.h b/include/codec.h
index 9bd7306f3..1661d0eab 100644
--- a/include/codec.h
+++ b/include/codec.h
@@ -101,7 +101,7 @@ struct codec_packet {
 	void (*plain_free_func)(void *);
 };
 
-typedef IQUEUE_TYPE(struct codec_packet, link) codec_packet_q;
+typedef IQUEUE(struct codec_packet, link) codec_packet_q;
 
 
 struct codec_scheduler {
diff --git a/include/media_socket.h b/include/media_socket.h
index 56ad7941b..d1adea206 100644
--- a/include/media_socket.h
+++ b/include/media_socket.h
@@ -101,7 +101,7 @@ struct socket_port_link {
 	IQUEUE_LINK link;
 };
 
-typedef IQUEUE_TYPE(struct socket_port_link, link) socket_port_q;
+typedef IQUEUE(struct socket_port_link, link) socket_port_q;
 
 
 TYPED_GQUEUE(port_pool, struct port_pool)
@@ -293,7 +293,7 @@ struct rtp_extension_data {
 	str content;
 };
 
-typedef IQUEUE_TYPE(struct rtp_extension_data, link) extmap_data_q;
+typedef IQUEUE(struct rtp_extension_data, link) extmap_data_q;
 
 
 struct media_packet {
diff --git a/lib/iqueue.h b/lib/iqueue.h
index 2fcfb577b..b707161e3 100644
--- a/lib/iqueue.h
+++ b/lib/iqueue.h
@@ -12,7 +12,7 @@
 	}
 
 
-#define IQUEUE_TYPE(ele_type, link_name) \
+#define IQUEUE(ele_type, link_name) \
 	struct { \
 		union { \
 			struct { \
@@ -32,10 +32,6 @@
 	}
 
 
-#define IQUEUE(ele_type, link_name, queue_name) \
-	IQUEUE_TYPE(ele_type, link_name) queue_name
-
-
 #define i_queue_init(list) do { \
 	(list)->head = NULL; \
 	(list)->tail = NULL; \