Index: hooks.c
===================================================================
--- hooks.c	(revision 32611)
+++ hooks.c	(revision 32612)
@@ -13,7 +13,8 @@
 
 #define version "2.2.4"
 
-#define LIBRND_ROOT "../src_3rd/librnd"
+#define LIBRND_ROOT         "../src_3rd/librnd"
+#define LIBRND_PLUGIN_ROOT  "../src_3rd/librnd_plugins"
 #include "../src_3rd/puplug/scconfig_hooks.h"
 #include "../src_3rd/libfungw/scconfig_hooks.h"
 #include "../src_3rd/libporty_net/hooks_net.c"
@@ -325,8 +326,6 @@
 
 	printf("Generating pcb-rnd config.h (%d)\n", generr |= tmpasm("..", "config.h.in", "config.h"));
 
-	printf("Generating opengl.h (%d)\n", generr |= tmpasm("../src_plugins/lib_hid_gl", "opengl.h.in", "opengl.h"));
-
 	printf("Generating tests/librnd/inc_all.h (%d)\n", generr |= tmpasm("../tests/librnd", "inc_all.h.in", "inc_all.h"));
 
 	if (plug_is_enabled("export_vfs_fuse"))
Index: plugins.h
===================================================================
--- plugins.h	(revision 32611)
+++ plugins.h	(revision 32612)
@@ -7,16 +7,16 @@
 plugin_header("\nLibrary plugins:\n")
 plugin_def("lib_compat_help",  "#compatibility helper functions", sbuildin, 1, 0)
 plugin_def("lib_formula",      "mathematical forumlas",           sbuildin, 1, 0)
-plugin_def("lib_gensexpr",     "#s-expression library",           sdisable, 0, 0)
-plugin_def("lib_gtk_common",   "all-hid_gtk common code",         sdisable, 0, 0)
+plugin_def("lib_gensexpr",     "#s-expression library",           sdisable, 0, 1)
+plugin_def("lib_gtk_common",   "all-hid_gtk common code",         sdisable, 0, 1)
 plugin_def("lib_hid_common",   "all-gui-hid common code",         sdisable, 0, 1)
-plugin_def("lib_hid_gl",       "openGL rendering",                sdisable, 0, 0)
+plugin_def("lib_hid_gl",       "openGL rendering",                sdisable, 0, 1)
 plugin_def("lib_hid_pcbui",    "common PCB-related GUI elements", sdisable, 0, 0)
 plugin_def("lib_netmap",       "map nets and objects",            sdisable, 0, 0)
 plugin_def("lib_polyhelp",     "polygon helpers",                 sbuildin, 1, 0)
-plugin_def("lib_portynet",     "#IPv4 tcp",                       sbuildin, 1, 0)
+plugin_def("lib_portynet",     "#IPv4 tcp",                       sbuildin, 1, 1)
 plugin_def("lib_vfs",          "fetch data for VFS export",       sdisable, 0, 0)
-plugin_def("lib_wget",         "wget(1) wrapper",                 sdisable, 0, 0)
+plugin_def("lib_wget",         "wget(1) wrapper",                 sdisable, 0, 1)
 
 plugin_header("\nFeature plugins:\n")
 plugin_def("acompnet",         "net auto-completion",             sdisable, 1, 0)
@@ -40,9 +40,9 @@
 plugin_def("extedit",          "edit with external program",      sbuildin, 1, 0)
 plugin_def("exto_std",         "standard extended objects",       sbuildin, 1, 0)
 plugin_def("fontmode",         "font editor",                     sbuildin, 1, 0)
-plugin_def("irc",              "on-line support (IRC)",           sbuildin, 1, 0)
+plugin_def("irc",              "on-line support (IRC)",           sbuildin, 1, 1)
 plugin_def("jostle",           "push lines out of the way",       sbuildin, 1, 0)
-plugin_def("loghid",           "diagnostics: log HID calls",      sdisable, 1, 0)
+plugin_def("loghid",           "diagnostics: log HID calls",      sdisable, 1, 1)
 plugin_def("millpath",         "calculate toolpath for milling",  sdisable, 1, 0)
 plugin_def("mincut",           "minimal cut shorts",              sbuildin, 1, 0)
 plugin_def("oldactions",       "old/obsolete actions",            sdisable, 1, 0)
@@ -139,7 +139,7 @@
 plugin_def("hid_gtk2_gdk",     "GTK2 GUI, software render",       sbuildin, 1, 1)
 plugin_def("hid_gtk2_gl",      "GTK2 GUI, opengl render",         sbuildin, 1, 1)
 plugin_def("hid_lesstif",      "the lesstif gui",                 sbuildin, 1, 1)
-plugin_def("hid_remote",       "remote HID server",               sdisable, 0, 0)
+plugin_def("hid_remote",       "remote HID server",               sdisable, 0, 1)
 
 
 plugin_dep("ar_cpcb", "lib_compat_help", 0)
@@ -194,8 +194,8 @@
 plugin_dep("io_pcb", "lib_compat_help", 0)
 plugin_dep("io_tedax", "lib_compat_help", 0)
 plugin_dep("io_tedax", "lib_netmap", 0)
-plugin_dep("irc", "lib_portynet", 0)
-plugin_dep("lib_gtk_common", "lib_hid_common", 0)
+plugin_dep("irc", "lib_portynet", 01)
+plugin_dep("lib_gtk_common", "lib_hid_common", 01)
 plugin_dep("lib_hid_pcbui", "lib_hid_common", 0)
 plugin_dep("lib_vfs", "propedit", 0)
 plugin_dep("millpath", "lib_polyhelp", 0)
Index: template/plugin_intconf.tmpasm
===================================================================
--- template/plugin_intconf.tmpasm	(revision 32611)
+++ template/plugin_intconf.tmpasm	(revision 32612)
@@ -4,9 +4,18 @@
 
 switch ?/local/pcb/mod/CONFFILE
 case {...}
-put /local/pcb/MCFG [@$(PLUGDIR)/@/local/pcb/mod@/@/local/pcb/mod/CONFFILE@@]
-put /local/pcb/ICFG [@$(PLUGDIR)/@/local/pcb/mod@/conf_internal.c@]
 
+put /local/pcb/mod/is_hidlib  [@/local/pcb/@/local/pcb/mod@/hidlib@]
+resolve /local/pcb/mod/is_hidlib ?/local/pcb/mod/is_hidlib
+if ?/local/pcb/mod/is_hidlib
+then
+	put /local/pcb/MCFG [@$(LIBRND_PLUGDIR)/@/local/pcb/mod@/@/local/pcb/mod/CONFFILE@@]
+	put /local/pcb/ICFG [@$(LIBRND_PLUGDIR)/@/local/pcb/mod@/conf_internal.c@]
+else
+	put /local/pcb/MCFG [@$(PLUGDIR)/@/local/pcb/mod@/@/local/pcb/mod/CONFFILE@@]
+	put /local/pcb/ICFG [@$(PLUGDIR)/@/local/pcb/mod@/conf_internal.c@]
+end
+
 append /local/pcb/DEPDEPS [@ @/local/pcb/ICFG@ @]
 append /local/pcb/DISTCLEANFILES [@ @/local/pcb/ICFG@ @]
 append /local/pcb/RULES [@