Index: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in	(revision 32618)
+++ trunk/src/Makefile.in	(revision 32619)
@@ -1,4 +1,4 @@
-append /local/pcb/CFLAGS {-I. -I.. -I../src_3rd -I../src_3rd/librnd/plugins -I../src -I../src_3rd/liblihata }
+append /local/pcb/CFLAGS {-I. -I.. -I../src_3rd -I../src -I../src_3rd/liblihata }
 append /local/pcb/LDFLAGS cc/ldflags
 append /local/pcb/LDFLAGS cc/rdynamic
 append /local/pcb/LDFLAGS ?/local/pcb/cflags_profile
Index: trunk/src_plugins/dialogs/dialogs.c
===================================================================
--- trunk/src_plugins/dialogs/dialogs.c	(revision 32618)
+++ trunk/src_plugins/dialogs/dialogs.c	(revision 32619)
@@ -34,7 +34,7 @@
 #include <librnd/core/hid_dad.h>
 #include <librnd/core/plugins.h>
 #include "funchash_core.h"
-#include "lib_hid_common/dialogs_conf.h"
+#include <librnd/plugins/lib_hid_common/dialogs_conf.h>
 
 /* from lib_hid_common */
 extern conf_dialogs_t dialogs_conf;
Index: trunk/src_plugins/dialogs/dlg_infobar.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_infobar.c	(revision 32618)
+++ trunk/src_plugins/dialogs/dlg_infobar.c	(revision 32619)
@@ -32,8 +32,8 @@
 #include <librnd/core/actions.h>
 #include "board.h"
 #include <librnd/core/hid_dad.h>
-#include "lib_hid_common/xpm.h"
-#include "lib_hid_common/dlg_comm_m.h"
+#include <librnd/plugins/lib_hid_common/xpm.h>
+#include <librnd/plugins/lib_hid_common/dlg_comm_m.h>
 #include "plug_io.h"
 
 static void ifb_file_chg_reload_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
Index: trunk/src_plugins/dialogs/dlg_loadsave.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_loadsave.c	(revision 32618)
+++ trunk/src_plugins/dialogs/dlg_loadsave.c	(revision 32619)
@@ -36,7 +36,7 @@
 #include "conf_core.h"
 #include <librnd/core/hidlib_conf.h>
 #include "plug_io.h"
-#include "lib_hid_common/dialogs_conf.h"
+#include <librnd/plugins/lib_hid_common/dialogs_conf.h>
 
 #include "dlg_loadsave.h"
 
Index: trunk/src_plugins/dialogs/dlg_pref_win.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pref_win.c	(revision 32618)
+++ trunk/src_plugins/dialogs/dlg_pref_win.c	(revision 32619)
@@ -30,7 +30,7 @@
 #include <librnd/core/conf.h>
 #include "conf_core.h"
 #include <librnd/core/hidlib_conf.h>
-#include "lib_hid_common/dialogs_conf.h"
+#include <librnd/plugins/lib_hid_common/dialogs_conf.h>
 
 extern conf_dialogs_t dialogs_conf;
 extern void pcb_wplc_save_to_role(rnd_conf_role_t role);
Index: trunk/src_plugins/export_gerber/gerber.c
===================================================================
--- trunk/src_plugins/export_gerber/gerber.c	(revision 32618)
+++ trunk/src_plugins/export_gerber/gerber.c	(revision 32619)
@@ -39,7 +39,7 @@
 
 #include "../src_plugins/export_excellon/aperture.h"
 
-#include "lib_hid_common/xpm.h"
+#include <librnd/plugins/lib_hid_common/xpm.h>
 
 
 const char *gerber_cookie = "gerber HID";
Index: trunk/src_plugins/fp_wget/wget_common.c
===================================================================
--- trunk/src_plugins/fp_wget/wget_common.c	(revision 32618)
+++ trunk/src_plugins/fp_wget/wget_common.c	(revision 32619)
@@ -33,7 +33,7 @@
 #include <librnd/core/safe_fs.h>
 #include "globalconst.h"
 
-#include "lib_wget/lib_wget.h"
+#include <librnd/plugins/lib_wget/lib_wget.h>
 
 int fp_wget_offline = 0;
 
Index: trunk/src_plugins/lib_hid_pcbui/act.c
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/act.c	(revision 32618)
+++ trunk/src_plugins/lib_hid_pcbui/act.c	(revision 32619)
@@ -39,7 +39,7 @@
 #include "search.h"
 #include "obj_subc_parent.h"
 
-#include "lib_hid_common/zoompan.h"
+#include <librnd/plugins/lib_hid_common/zoompan.h>
 
 #include "util.h"
 #include "act.h"
Index: trunk/src_plugins/lib_hid_pcbui/lib_hid_pcbui.c
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/lib_hid_pcbui.c	(revision 32618)
+++ trunk/src_plugins/lib_hid_pcbui/lib_hid_pcbui.c	(revision 32619)
@@ -34,7 +34,7 @@
 #include "layer_menu.h"
 #include "layersel.h"
 #include "routest.h"
-#include "lib_hid_common/toolbar.h"
+#include <librnd/plugins/lib_hid_common/toolbar.h>
 #include "status.h"
 #include "act.h"
 
Index: trunk/src_plugins/order_pcbway/pcbway.c
===================================================================
--- trunk/src_plugins/order_pcbway/pcbway.c	(revision 32618)
+++ trunk/src_plugins/order_pcbway/pcbway.c	(revision 32619)
@@ -38,7 +38,7 @@
 #include <librnd/core/safe_fs.h>
 #include <librnd/core/paths.h>
 #include <librnd/core/compat_fs.h>
-#include "lib_wget/lib_wget.h"
+#include <librnd/plugins/lib_wget/lib_wget.h>
 #include "../src_plugins/order/order.h"
 #include "order_pcbway_conf.h"
 #include "../src_plugins/order_pcbway/conf_internal.c"