Index: src/Makefile.in
===================================================================
--- src/Makefile.in	(revision 32053)
+++ src/Makefile.in	(revision 32054)
@@ -590,7 +590,10 @@
 sub /local/pcb/HDRS_HIDLIB {$(LIBRND)/core/conf_act.h } {}
 sub /local/pcb/HDRS_HIDLIB {$(LIBRND)/core/gui_act.h } {}
 sub /local/pcb/HDRS_HIDLIB {$(LIBRND)/core/main_act.h } {}
-append /local/pcb/HDRS_HIDLIB {$(LIBRND)/config.h $(LIBRND)/pcb_compat.h $(LIBRND)/core/global_typedefs.h $(LIBRND)/core/globalconst.h $(LIBRND)/core/math_helper.h $(LIBRND)/core/buildin.hidlib.h $(LIBRND)/core/hid_inlines.h $(LIBRND)/core/rotate.h $(LIBRND)/core/fptr_cast.h $(LIBRND)/core/safe_fs_dir.h $(LIBRND)/core/compat_inc.h $(LIBRND)/poly/rtree2_compat.h $(LIBRND)/core/color_cache.h }
+append /local/pcb/HDRS_HIDLIB {$(LIBRND)/config.h $(LIBRND)/core/global_typedefs.h $(LIBRND)/core/globalconst.h $(LIBRND)/core/math_helper.h $(LIBRND)/core/buildin.hidlib.h $(LIBRND)/core/hid_inlines.h $(LIBRND)/core/rotate.h $(LIBRND)/core/fptr_cast.h $(LIBRND)/core/safe_fs_dir.h $(LIBRND)/core/compat_inc.h $(LIBRND)/poly/rtree2_compat.h $(LIBRND)/core/color_cache.h }
+# compatibility layer: remove this when librnd goes separate:
+append /local/pcb/HDRS_HIDLIB { $(LIBRND)/pcb_compat.h $(LIBRND)/core/pcb-printf.h }
+
 gsub /local/pcb/HDRS_3RDLIB {../src_3rd/liblihata/dom_[^ ]*.h } {}
 gsub /local/pcb/HDRS_3RDLIB {../src_3rd/liblihata/tree_[^ ]*.h } {}
 gsub /local/pcb/HDRS_3RDLIB {../src_3rd/libulzw/libulzw_[^ ]*.h } {}
Index: src/librnd/pcb_compat.h
===================================================================
--- src/librnd/pcb_compat.h	(revision 32053)
+++ src/librnd/pcb_compat.h	(revision 32054)
@@ -121,7 +121,7 @@
 #define PCB_SW RND_SW
 #define PCB_NW RND_NW
 #define PCB_ANY_DIR RND_ANY_DIR
-#define rnd_box_t rnd_box_t
+#define pcb_box_t rnd_box_t
 #define pcb_direction_t rnd_direction_t
 #define pcb_cheap_point_s rnd_cheap_point_s
 #define pcb_cheap_point_t rnd_cheap_point_t
@@ -466,10 +466,10 @@
 #define pcb_unit_t rnd_unit_t
 #define pcb_point_s rnd_point_s
 #define pcb_point_t rnd_point_t
-#define rnd_box_s rnd_box_s
-#define rnd_box_t rnd_box_t
-#define rnd_box_list_s rnd_box_list_s
-#define rnd_box_list_t rnd_box_list_t
+#define pcb_box_s rnd_box_s
+#define pcb_box_t rnd_box_t
+#define pcb_box_list_s rnd_box_list_s
+#define pcb_box_list_t rnd_box_list_t
 #define pcb_polyarea_s rnd_polyarea_s
 #define pcb_polyarea_t rnd_polyarea_t
 #define pcb_rtree_s rnd_rtree_s
@@ -557,10 +557,10 @@
 #define PCB_HID_MOUSE_RELEASE RND_HID_MOUSE_RELEASE
 #define PCB_HID_MOUSE_MOTION RND_HID_MOUSE_MOTION
 #define PCB_HID_MOUSE_POPUP RND_HID_MOUSE_POPUP
-#define rnd_cap_invalid rnd_cap_invalid
-#define rnd_cap_square rnd_cap_square
-#define rnd_cap_round rnd_cap_round
-#define rnd_cap_style_t rnd_cap_style_t
+#define pcb_cap_invalid rnd_cap_invalid
+#define pcb_cap_square rnd_cap_square
+#define pcb_cap_round rnd_cap_round
+#define pcb_cap_style_t rnd_cap_style_t
 #define pcb_core_gc_t rnd_core_gc_t
 #define pcb_hidval_t rnd_hidval_t
 #define PCB_HIDCONCAT RND_HIDCONCAT
@@ -828,8 +828,8 @@
 #define pcb_dad_tree_free rnd_dad_tree_free
 #define pcb_hid_dad_close rnd_hid_dad_close
 #define pcb_hid_iterate rnd_hid_iterate
-#define rnd_hid_export_opt_func_dad_s rnd_hid_export_opt_func_dad_s
-#define rnd_hid_export_opt_func_dad_t rnd_hid_export_opt_func_dad_t
+#define pcb_hid_export_opt_func_dad_s rnd_hid_export_opt_func_dad_s
+#define pcb_hid_export_opt_func_dad_t rnd_hid_export_opt_func_dad_t
 #define PCB_DAD_SPIN_INT RND_DAD_SPIN_INT
 #define PCB_DAD_SPIN_DOUBLE RND_DAD_SPIN_DOUBLE
 #define PCB_DAD_SPIN_COORD RND_DAD_SPIN_COORD
@@ -837,10 +837,10 @@
 #define pcb_hid_dad_spin_t rnd_hid_dad_spin_t
 #define PCB_DAD_SPIN_GET_TYPE RND_DAD_SPIN_GET_TYPE
 #define PCB_DAD_SPIN_ANY RND_DAD_SPIN_ANY
-#define rnd_hid_dad_spin_up rnd_hid_dad_spin_up
-#define rnd_hid_dad_spin_down rnd_hid_dad_spin_down
-#define rnd_hid_dad_spin_unit rnd_hid_dad_spin_unit
-#define rnd_hid_dad_spin_unit rnd_hid_dad_spin_unit
+#define pcb_hid_dad_spin_up rnd_hid_dad_spin_up
+#define pcb_hid_dad_spin_down rnd_hid_dad_spin_down
+#define pcb_hid_dad_spin_unit rnd_hid_dad_spin_unit
+#define pcb_hid_dad_spin_unit rnd_hid_dad_spin_unit
 #define pcb_hid_dad_spin_warn rnd_hid_dad_spin_warn
 #define pcb_dad_spin_up_cb rnd_dad_spin_up_cb
 #define pcb_dad_spin_down_cb rnd_dad_spin_down_cb
@@ -1116,8 +1116,8 @@
 #define pcb_tool_flags_t rnd_tool_flags_t
 #define PCB_TOOL_CURSOR_NAMED RND_TOOL_CURSOR_NAMED
 #define PCB_TOOL_CURSOR_XBM RND_TOOL_CURSOR_XBM
-#define rnd_tool_s rnd_tool_s
-#define rnd_tool_t rnd_tool_t
+#define pcb_tool_s rnd_tool_s
+#define pcb_tool_t rnd_tool_t
 #define pcb_tools rnd_tools
 #define pcb_tool_prev_id rnd_tool_prev_id
 #define pcb_tool_next_id rnd_tool_next_id