diff --git a/exec/Makefile.am b/exec/Makefile.am
index 49e9f5a9..8514afac 100644
--- a/exec/Makefile.am
+++ b/exec/Makefile.am
@@ -37,7 +37,7 @@ INCLUDES		= -I$(top_builddir)/include -I$(top_srcdir)/include $(nss_CFLAGS) $(rd
 
 TOTEM_SRC		= totemip.c totemnet.c totemudp.c \
 			  totemudpu.c totemrrp.c totemsrp.c totemmrp.c \
-			  totempg.c crypto.c
+			  totempg.c crypto.c cs_queue.h
 if BUILD_RDMA
 TOTEM_SRC		+= totemiba.c
 endif
diff --git a/include/corosync/cs_queue.h b/exec/cs_queue.h
similarity index 99%
rename from include/corosync/cs_queue.h
rename to exec/cs_queue.h
index 8fbe973b..1e8439f9 100644
--- a/include/corosync/cs_queue.h
+++ b/exec/cs_queue.h
@@ -35,7 +35,9 @@
 #define CS_QUEUE_H_DEFINED
 
 #include <string.h>
+#include <stdlib.h>
 #include <pthread.h>
+#include <errno.h>
 #include "assert.h"
 
 struct cs_queue {
diff --git a/exec/totemsrp.c b/exec/totemsrp.c
index ebd4007f..4a7a1c07 100644
--- a/exec/totemsrp.c
+++ b/exec/totemsrp.c
@@ -79,7 +79,6 @@
 #include <qb/qbloop.h>
 
 #include <corosync/swab.h>
-#include <corosync/cs_queue.h>
 #include <corosync/sq.h>
 #include <corosync/list.h>
 #include <corosync/hdb.h>
@@ -92,6 +91,7 @@
 #include "totemnet.h"
 
 #include "crypto.h"
+#include "cs_queue.h"
 
 #define LOCALHOST_IP				inet_addr("127.0.0.1")
 #define QUEUE_RTR_ITEMS_SIZE_MAX		16384 /* allow 16384 retransmit items */
diff --git a/include/Makefile.am b/include/Makefile.am
index 2c934d98..e0403854 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -36,7 +36,7 @@ CS_H			= hdb.h cs_config.h cpg.h cfg.h evs.h mar_gen.h swab.h 	\
 			confdb.h list.h corotypes.h quorum.h votequorum.h sam.h
 
 CS_INTERNAL_H		= ipc_cfg.h ipc_confdb.h ipc_cpg.h ipc_evs.h ipc_pload.h ipc_quorum.h 	\
-			jhash.h pload.h cs_queue.h quorum.h sq.h ipc_votequorum.h
+			jhash.h pload.h quorum.h sq.h ipc_votequorum.h
 
 LCR_H			= lcr_ckpt.h lcr_comp.h	lcr_ifact.h