diff --git a/include/villas/fpga/ip.h b/include/villas/fpga/ip.h
index c3d2570aa..cfe64fdb5 100644
--- a/include/villas/fpga/ip.h
+++ b/include/villas/fpga/ip.h
@@ -20,12 +20,6 @@
 #include "fpga/intc.h"
 #include "nodes/fpga.h"
 
-#define REGISTER_IP_TYPE(ip)			\
-__attribute__((constructor)) static		\
-void UNIQUE(__register_)() {		\
-	list_push(&ip_types, ip);		\
-}
-
 extern struct list ip_types;	/**< Table of existing FPGA IP core drivers */
 
 enum ip_state {
diff --git a/include/villas/nodes/cbuilder.h b/include/villas/nodes/cbuilder.h
index 57b36a268..f67589589 100644
--- a/include/villas/nodes/cbuilder.h
+++ b/include/villas/nodes/cbuilder.h
@@ -19,11 +19,6 @@
 
 #include "list.h"
 
-/* Helper macros for registering new models */
-#define REGISTER_CBMODEL(cb)				\
-__attribute__((constructor)) static void __register() {	\
-	list_push(&cbmodels, cb);			\
-}
 
 extern struct list cbmodels;	/**< Table of existing CBuilder models */