diff --git a/client.c b/client.c
index c8c854727..b3284351e 100644
--- a/client.c
+++ b/client.c
@@ -24,6 +24,7 @@
 #include <xcb/xcb.h>
 #include <xcb/xcb_atom.h>
 
+#include "cnode.h"
 #include "image.h"
 #include "client.h"
 #include "tag.h"
diff --git a/cnode.h b/cnode.h
index 67bf7ca74..5f8dbcb71 100644
--- a/cnode.h
+++ b/cnode.h
@@ -24,6 +24,14 @@
 
 #include "client.h"
 
+struct client_node
+{
+    /** The client */
+    client_t *client;
+    /** Next and previous client_nodes */
+    client_node_t *prev, *next;
+};
+
 client_node_t * client_node_client_getby(client_node_t *, client_t *);
 client_node_t * client_node_client_add(client_node_t **, client_t *);
 
diff --git a/structs.h b/structs.h
index c489c924c..c678edc48 100644
--- a/structs.h
+++ b/structs.h
@@ -63,7 +63,7 @@ typedef struct button_t button_t;
 typedef struct widget_t widget_t;
 typedef struct widget_node_t widget_node_t;
 typedef struct client_t client_t;
-typedef struct client_node_t client_node_t;
+typedef struct client_node client_node_t;
 typedef struct tag tag_t;
 typedef struct tag_client_node_t tag_client_node_t;
 typedef widget_t *(widget_constructor_t)(alignment_t);
@@ -225,14 +225,6 @@ struct client_t
 };
 ARRAY_TYPE(client_t *, client)
 
-struct client_node_t
-{
-    /** The client */
-    client_t *client;
-    /** Next and previous client_nodes */
-    client_node_t *prev, *next;
-};
-
 /** Tag type */
 struct tag
 {