diff --git a/include/villas/nodes/cbuilder.h b/include/villas/nodes/cbuilder.h
index f67589589..c2364e018 100644
--- a/include/villas/nodes/cbuilder.h
+++ b/include/villas/nodes/cbuilder.h
@@ -19,14 +19,25 @@
 
 #include "list.h"
 
+/* Forward declaration */
+struct cbuilder;
 
-extern struct list cbmodels;	/**< Table of existing CBuilder models */
+struct cbuilder_model {
+	char *name;
+
+	void (*code)();
+	void (*ram)();
+	
+	int (*init)(struct cbuilder *cb);
+	int (*read)(float inputs[], int len);
+	int (*write)(float outputs[], int len);
+};
 
 struct cbuilder {
 	unsigned long step, read;
 	double timestep;
 
-	struct cbmodel *model;
+	struct cbuilder_model *model;
 	
 	float *params;
 	int paramlen;
@@ -41,15 +52,4 @@ struct cbuilder {
 	pthread_cond_t cv;
 };
 
-struct cbmodel {
-	char *name;
-
-	void (*code)();
-	void (*ram)();
-	
-	int (*init)(struct cbuilder *cb);
-	int (*read)(float inputs[], int len);
-	int (*write)(float outputs[], int len);
-};
-
 #endif /** _NODES_CBUILDER_H_ @} */
\ No newline at end of file