Index: work/hidlib/main.c
===================================================================
--- work/hidlib/main.c	(revision 25577)
+++ work/hidlib/main.c	(revision 25578)
@@ -6,6 +6,7 @@
 #include "hidlib.h"
 #include "hid_init.h"
 #include "hid.h"
+#include "buildin.hidlib.h"
 
 
 const char *pcb_hidlib_default_embedded_menu = "";
@@ -61,27 +62,6 @@
 }
 
 
-TODO("These should be generated by pcb-rnd:")
-extern int pplg_init_hid_gtk2_gdk(void);
-extern void pplg_uninit_hid_gtk2_gdk(void);
-extern int pplg_check_ver_hid_gtk2_gdk(int);
-extern int pplg_init_lib_gtk_common(void);
-extern void pplg_uninit_lib_gtk_common(void);
-extern int pplg_check_ver_lib_gtk_common(int);
-extern int pplg_init_lib_gtk_hid(void);
-extern void pplg_uninit_lib_gtk_hid(void);
-extern int pplg_check_ver_lib_gtk_hid(int);
-extern int pplg_init_lib_hid_common(void);
-extern void pplg_uninit_lib_hid_common(void);
-extern int pplg_check_ver_lib_hid_common(int);
-const pup_buildin_t pup_buildins[] = {
-	{"hid_gtk2_gdk", pplg_init_hid_gtk2_gdk, pplg_uninit_hid_gtk2_gdk, pplg_check_ver_hid_gtk2_gdk, 1, "default buildin;dep lib_gtk_common;dep lib_gtk_hid;autoload 1;"},
-	{"lib_gtk_common", pplg_init_lib_gtk_common, pplg_uninit_lib_gtk_common, pplg_check_ver_lib_gtk_common, 0, "dep lib_hid_common;default disable-all;"},
-	{"lib_gtk_hid", pplg_init_lib_gtk_hid, pplg_uninit_lib_gtk_hid, pplg_check_ver_lib_gtk_hid, 0, "default disable-all;dep lib_hid_common;"},
-	{"lib_hid_common", pplg_init_lib_hid_common, pplg_uninit_lib_hid_common, pplg_check_ver_lib_hid_common, 0, "default disable-all;"},
-	{NULL, NULL, NULL, NULL, 0, NULL}
-};
-
 typedef struct {
 	pcb_hidlib_t hidlib;
 } design_t;