diff --git a/include/ioqueue.h b/include/ioqueue.h
index 1ced66fd..2d6f4735 100644
--- a/include/ioqueue.h
+++ b/include/ioqueue.h
@@ -35,21 +35,8 @@
 #define IOQUEUE_H
 
 #include <sys/uio.h>
-#include "queue.h"
 
-struct io {
-    struct emp_qelem queue;
-    int size;
-    int nbytes;
-    int offset;
-    char *data;
-};
-
-struct ioqueue {
-    struct io list;
-    int bufsize;
-    int cc;
-};
+struct ioqueue;
 
 extern struct ioqueue *ioq_create(int size);
 extern void ioq_destroy(struct ioqueue *ioq);
diff --git a/src/lib/gen/ioqueue.c b/src/lib/gen/ioqueue.c
index 655a364d..95f090fd 100644
--- a/src/lib/gen/ioqueue.c
+++ b/src/lib/gen/ioqueue.c
@@ -46,6 +46,20 @@
 #include "misc.h"
 #include "queue.h"
 
+struct io {
+    struct emp_qelem queue;
+    int size;
+    int nbytes;
+    int offset;
+    char *data;
+};
+
+struct ioqueue {
+    struct io list;
+    int bufsize;
+    int cc;
+};
+
 static int ioqtocbuf(struct ioqueue *ioq, char *buf, int cc, int stopc);
 static int ioqtoiov(struct ioqueue *ioq, struct iovec *iov, int max);
 static int ioqtobuf(struct ioqueue *ioq, char *buf, int cc);