Index: src/Makefile.dep
===================================================================
--- src/Makefile.dep	(revision 6720)
+++ src/Makefile.dep	(revision 6721)
@@ -816,15 +816,9 @@
  ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
  event.h compat_misc.h ../src_plugins/hid_gtk/colors.h \
  ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
- ../src_plugins/lib_gtk_common/bu_box.h \
- ../src_plugins/lib_gtk_common/bu_text_view.h \
- ../src_plugins/lib_gtk_common/bu_check_button.h \
- ../src_plugins/lib_gtk_common/bu_spin_button.h \
- ../src_plugins/lib_gtk_common/bu_status_line.h \
- ../src_plugins/lib_gtk_common/wt_coord_entry.h \
- ../src_plugins/lib_gtk_common/dlg_propedit.h \
- ../src_plugins/lib_gtk_common/bu_cursor_pos.h
+ ../src_plugins/lib_gtk_common/dlg_propedit.h
 ../src_plugins/hid_gtk/ghid-cell-renderer-visibility.o: \
  ../src_plugins/hid_gtk/ghid-cell-renderer-visibility.c ../config.h \
  ../src_plugins/hid_gtk/gui.h board.h const.h macro.h global_typedefs.h \
@@ -852,15 +846,9 @@
  ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
  event.h compat_misc.h ../src_plugins/hid_gtk/colors.h \
  ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
- ../src_plugins/lib_gtk_common/bu_box.h \
- ../src_plugins/lib_gtk_common/bu_text_view.h \
- ../src_plugins/lib_gtk_common/bu_check_button.h \
- ../src_plugins/lib_gtk_common/bu_spin_button.h \
- ../src_plugins/lib_gtk_common/bu_status_line.h \
- ../src_plugins/lib_gtk_common/wt_coord_entry.h \
- ../src_plugins/lib_gtk_common/dlg_propedit.h \
- ../src_plugins/lib_gtk_common/bu_cursor_pos.h compat_nls.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h compat_nls.h \
  ../src_plugins/hid_gtk/ghid-cell-renderer-visibility.h \
  ../src_plugins/lib_gtk_common/util_str.h
 ../src_plugins/hid_gtk/ghid-main-menu.o: \
@@ -890,15 +878,9 @@
  ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h conf_core.h \
  event.h compat_misc.h ../src_plugins/hid_gtk/colors.h \
  ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
- ../src_plugins/lib_gtk_common/bu_box.h \
- ../src_plugins/lib_gtk_common/bu_text_view.h \
- ../src_plugins/lib_gtk_common/bu_check_button.h \
- ../src_plugins/lib_gtk_common/bu_spin_button.h \
- ../src_plugins/lib_gtk_common/bu_status_line.h \
- ../src_plugins/lib_gtk_common/wt_coord_entry.h \
- ../src_plugins/lib_gtk_common/dlg_propedit.h \
- ../src_plugins/lib_gtk_common/bu_cursor_pos.h pcb-printf.h misc_util.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h pcb-printf.h misc_util.h \
  error.h ../src_plugins/hid_gtk/gschem_accel_label.h
 ../src_plugins/hid_gtk/gschem_accel_label.o: \
  ../src_plugins/hid_gtk/gschem_accel_label.c ../config.h \
@@ -942,15 +924,9 @@
  ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h event.h \
  compat_misc.h ../src_plugins/hid_gtk/colors.h \
  ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
- ../src_plugins/lib_gtk_common/bu_box.h \
- ../src_plugins/lib_gtk_common/bu_text_view.h \
- ../src_plugins/lib_gtk_common/bu_check_button.h \
- ../src_plugins/lib_gtk_common/bu_spin_button.h \
- ../src_plugins/lib_gtk_common/bu_status_line.h \
- ../src_plugins/lib_gtk_common/wt_coord_entry.h \
- ../src_plugins/lib_gtk_common/dlg_propedit.h \
- ../src_plugins/lib_gtk_common/bu_cursor_pos.h hid_draw_helpers.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h hid_draw_helpers.h \
  hid_attrib.h hid_helper.h hid_color.h
 ../src_plugins/hid_gtk/gtkhid-main.o: \
  ../src_plugins/hid_gtk/gtkhid-main.c ../config.h conf_core.h conf.h \
@@ -979,19 +955,16 @@
  ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h event.h \
  compat_misc.h ../src_plugins/hid_gtk/colors.h \
  ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
- ../src_plugins/lib_gtk_common/bu_box.h \
- ../src_plugins/lib_gtk_common/bu_text_view.h \
- ../src_plugins/lib_gtk_common/bu_check_button.h \
- ../src_plugins/lib_gtk_common/bu_spin_button.h \
- ../src_plugins/lib_gtk_common/bu_status_line.h \
- ../src_plugins/lib_gtk_common/wt_coord_entry.h \
- ../src_plugins/lib_gtk_common/dlg_propedit.h \
- ../src_plugins/lib_gtk_common/bu_cursor_pos.h hid_nogui.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h hid_nogui.h \
  hid_draw_helpers.h pcb-printf.h plugins.h hid_attrib.h hid_init.h \
  hid_flags.h hid_actions.h plug_footprint.h vtlibrary.h plug_io.h \
  misc_util.h layer.h compat_nls.h layer_vis.h \
  ../src_plugins/hid_gtk/gtkhid-main.h conf_hid.h \
+ ../src_plugins/lib_gtk_common/act_fileio.h \
+ ../src_plugins/lib_gtk_common/act_print.h \
+ ../src_plugins/lib_gtk_common/bu_status_line.h \
  ../src_plugins/lib_gtk_common/util_block_hook.h \
  ../src_plugins/lib_gtk_common/util_timer.h \
  ../src_plugins/lib_gtk_common/util_watch.h \
@@ -1002,6 +975,7 @@
  ../src_plugins/lib_gtk_common/dlg_input.h \
  ../src_plugins/lib_gtk_common/dlg_message.h \
  ../src_plugins/lib_gtk_common/dlg_print.h \
+ ../src_plugins/lib_gtk_common/dlg_progress.h \
  ../src_plugins/lib_gtk_common/dlg_report.h \
  ../src_plugins/lib_gtk_common/dlg_pinout.h obj_elem.h \
  ../src_plugins/lib_gtk_common/dlg_search.h \
@@ -1033,16 +1007,12 @@
  ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h event.h \
  compat_misc.h ../src_plugins/hid_gtk/colors.h \
  ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
- ../src_plugins/lib_gtk_common/bu_box.h \
- ../src_plugins/lib_gtk_common/bu_text_view.h \
- ../src_plugins/lib_gtk_common/bu_check_button.h \
- ../src_plugins/lib_gtk_common/bu_spin_button.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h crosshair.h hid_actions.h \
+ compat_nls.h ../src_plugins/lib_gtk_common/bu_text_view.h \
  ../src_plugins/lib_gtk_common/bu_status_line.h \
- ../src_plugins/lib_gtk_common/wt_coord_entry.h \
- ../src_plugins/lib_gtk_common/dlg_propedit.h \
- ../src_plugins/lib_gtk_common/bu_cursor_pos.h crosshair.h hid_actions.h \
- compat_nls.h ../src_plugins/lib_gtk_common/util_str.h
+ ../src_plugins/lib_gtk_common/util_str.h
 ../src_plugins/hid_gtk/gui-config.o: ../src_plugins/hid_gtk/gui-config.c \
  ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \
  pcb-printf.h ../src_3rd/genvector/gds_char.h \
@@ -1069,15 +1039,9 @@
  ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h event.h \
  compat_misc.h ../src_plugins/hid_gtk/colors.h \
  ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
- ../src_plugins/lib_gtk_common/bu_box.h \
- ../src_plugins/lib_gtk_common/bu_text_view.h \
- ../src_plugins/lib_gtk_common/bu_check_button.h \
- ../src_plugins/lib_gtk_common/bu_spin_button.h \
- ../src_plugins/lib_gtk_common/bu_status_line.h \
- ../src_plugins/lib_gtk_common/wt_coord_entry.h \
  ../src_plugins/lib_gtk_common/dlg_propedit.h \
- ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
  ../src_plugins/hid_gtk/gtkhid-main.h conf_hid.h action_helper.h change.h \
  plug_io.h error.h draw.h pcb-printf.h hid_attrib.h misc_util.h \
  ../src_plugins/hid_gtk/gtk_conf_list.h paths.h plug_footprint.h \
@@ -1085,10 +1049,15 @@
  ../src_3rd/liblihata/tree.h ../src_plugins/lib_gtk_common/util_str.h \
  ../src_plugins/lib_gtk_common/wt_preview.h obj_elem.h layer.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h \
+ ../src_plugins/lib_gtk_common/bu_box.h \
  ../src_plugins/lib_gtk_common/bu_entry.h \
  ../src_plugins/lib_gtk_common/wt_coord_entry.h \
  ../src_plugins/lib_gtk_common/bu_notebook.h \
- ../src_plugins/lib_gtk_common/win_place.h
+ ../src_plugins/lib_gtk_common/bu_text_view.h \
+ ../src_plugins/lib_gtk_common/bu_check_button.h \
+ ../src_plugins/lib_gtk_common/bu_status_line.h \
+ ../src_plugins/lib_gtk_common/win_place.h \
+ ../src_plugins/lib_gtk_common/bu_spin_button.h
 ../src_plugins/hid_gtk/gui-drc-window.o: \
  ../src_plugins/hid_gtk/gui-drc-window.c ../config.h conf_core.h conf.h \
  global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
@@ -1116,15 +1085,9 @@
  ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h event.h \
  compat_misc.h ../src_plugins/hid_gtk/colors.h \
  ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
- ../src_plugins/lib_gtk_common/bu_box.h \
- ../src_plugins/lib_gtk_common/bu_text_view.h \
- ../src_plugins/lib_gtk_common/bu_check_button.h \
- ../src_plugins/lib_gtk_common/bu_spin_button.h \
- ../src_plugins/lib_gtk_common/bu_status_line.h \
- ../src_plugins/lib_gtk_common/wt_coord_entry.h \
  ../src_plugins/lib_gtk_common/dlg_propedit.h \
- ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
  ../src_plugins/hid_gtk/gui-drc-window.h hid_actions.h compat_nls.h \
  obj_all.h obj_pinvia_draw.h obj_pad_draw.h obj_rat_draw.h \
  obj_line_draw.h obj_arc_draw.h obj_poly_draw.h layer_vis.h \
@@ -1156,17 +1119,12 @@
  ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h event.h \
  compat_misc.h ../src_plugins/hid_gtk/colors.h \
  ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
- ../src_plugins/lib_gtk_common/bu_box.h \
- ../src_plugins/lib_gtk_common/bu_text_view.h \
- ../src_plugins/lib_gtk_common/bu_check_button.h \
- ../src_plugins/lib_gtk_common/bu_spin_button.h \
- ../src_plugins/lib_gtk_common/bu_status_line.h \
- ../src_plugins/lib_gtk_common/wt_coord_entry.h \
- ../src_plugins/lib_gtk_common/dlg_propedit.h \
- ../src_plugins/lib_gtk_common/bu_cursor_pos.h buffer.h plug_footprint.h \
- vtlibrary.h compat_nls.h ../src_plugins/lib_gtk_common/wt_preview.h \
- obj_elem.h layer.h ../src_plugins/lib_gtk_common/ui_zoompan.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h buffer.h plug_footprint.h \
+ vtlibrary.h compat_nls.h ../src_plugins/lib_gtk_common/bu_box.h \
+ ../src_plugins/lib_gtk_common/wt_preview.h obj_elem.h layer.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h \
  ../src_plugins/lib_gtk_common/win_place.h \
  ../src_plugins/hid_gtk/gui-library-window.h
 ../src_plugins/hid_gtk/gui-log-window.o: \
@@ -1195,17 +1153,12 @@
  ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h event.h \
  compat_misc.h ../src_plugins/hid_gtk/colors.h \
  ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
- ../src_plugins/lib_gtk_common/bu_box.h \
- ../src_plugins/lib_gtk_common/bu_text_view.h \
- ../src_plugins/lib_gtk_common/bu_check_button.h \
- ../src_plugins/lib_gtk_common/bu_spin_button.h \
- ../src_plugins/lib_gtk_common/bu_status_line.h \
- ../src_plugins/lib_gtk_common/wt_coord_entry.h \
- ../src_plugins/lib_gtk_common/dlg_propedit.h \
- ../src_plugins/lib_gtk_common/bu_cursor_pos.h pcb-printf.h hid_actions.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h pcb-printf.h hid_actions.h \
  compat_nls.h ../src_plugins/hid_gtk/gtkhid-main.h \
- ../src_plugins/lib_gtk_common/win_place.h
+ ../src_plugins/lib_gtk_common/win_place.h \
+ ../src_plugins/lib_gtk_common/bu_text_view.h
 ../src_plugins/hid_gtk/gui-netlist-window.o: \
  ../src_plugins/hid_gtk/gui-netlist-window.c ../config.h conf_core.h \
  conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
@@ -1234,17 +1187,14 @@
  ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h event.h \
  compat_misc.h ../src_plugins/hid_gtk/colors.h \
  ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
- ../src_plugins/lib_gtk_common/bu_box.h \
- ../src_plugins/lib_gtk_common/bu_text_view.h \
- ../src_plugins/lib_gtk_common/bu_check_button.h \
- ../src_plugins/lib_gtk_common/bu_spin_button.h \
- ../src_plugins/lib_gtk_common/bu_status_line.h \
- ../src_plugins/lib_gtk_common/wt_coord_entry.h \
  ../src_plugins/lib_gtk_common/dlg_propedit.h \
- ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
  ../src_plugins/lib_gtk_common/util_str.h \
- ../src_plugins/lib_gtk_common/win_place.h
+ ../src_plugins/lib_gtk_common/win_place.h \
+ ../src_plugins/lib_gtk_common/bu_text_view.h \
+ ../src_plugins/lib_gtk_common/bu_box.h \
+ ../src_plugins/lib_gtk_common/bu_check_button.h
 ../src_plugins/hid_gtk/gui-output-events.o: \
  ../src_plugins/hid_gtk/gui-output-events.c ../config.h conf_core.h \
  conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
@@ -1271,17 +1221,13 @@
  ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h event.h \
  compat_misc.h ../src_plugins/hid_gtk/colors.h \
  ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
- ../src_plugins/lib_gtk_common/bu_box.h \
- ../src_plugins/lib_gtk_common/bu_text_view.h \
- ../src_plugins/lib_gtk_common/bu_check_button.h \
- ../src_plugins/lib_gtk_common/bu_spin_button.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h action_helper.h crosshair.h \
+ draw.h error.h layer.h find.h search.h rats.h netlist.h route_style.h \
+ rats.h ../src_plugins/hid_gtk/gtkhid-main.h conf_hid.h \
+ ../src_plugins/lib_gtk_common/bu_dwg_tooltip.h \
  ../src_plugins/lib_gtk_common/bu_status_line.h \
- ../src_plugins/lib_gtk_common/wt_coord_entry.h \
- ../src_plugins/lib_gtk_common/dlg_propedit.h \
- ../src_plugins/lib_gtk_common/bu_cursor_pos.h action_helper.h \
- crosshair.h draw.h error.h layer.h find.h search.h rats.h netlist.h \
- route_style.h rats.h ../src_plugins/hid_gtk/gtkhid-main.h conf_hid.h \
  ../src_plugins/lib_gtk_common/in_mouse.h \
  ../src_plugins/lib_gtk_common/in_keyboard.h \
  ../src_plugins/lib_gtk_common/../hid_gtk/gui.h
@@ -1311,15 +1257,9 @@
  ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h event.h \
  compat_misc.h ../src_plugins/hid_gtk/colors.h \
  ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
- ../src_plugins/lib_gtk_common/bu_box.h \
- ../src_plugins/lib_gtk_common/bu_text_view.h \
- ../src_plugins/lib_gtk_common/bu_check_button.h \
- ../src_plugins/lib_gtk_common/bu_spin_button.h \
- ../src_plugins/lib_gtk_common/bu_status_line.h \
- ../src_plugins/lib_gtk_common/wt_coord_entry.h \
- ../src_plugins/lib_gtk_common/dlg_propedit.h \
- ../src_plugins/lib_gtk_common/bu_cursor_pos.h hid_cfg_action.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h hid_cfg_action.h \
  action_helper.h buffer.h change.h copy.h crosshair.h draw.h error.h \
  plug_io.h find.h insert.h layer.h move.h pcb-printf.h polygon.h rtree.h \
  rats.h netlist.h route_style.h remove.h rotate.h search.h rats.h \
@@ -1328,6 +1268,10 @@
  ../src_plugins/hid_gtk/gui-icons-misc.data hid_attrib.h hid_actions.h \
  hid_flags.h compat_nls.h obj_line.h layer_vis.h \
  ../src_plugins/hid_gtk/gtkhid-main.h conf_hid.h \
+ ../src_plugins/lib_gtk_common/bu_box.h \
+ ../src_plugins/lib_gtk_common/bu_status_line.h \
+ ../src_plugins/lib_gtk_common/dlg_route_style.h \
+ ../src_plugins/lib_gtk_common/wt_route_style.h \
  ../src_plugins/lib_gtk_common/util_str.h \
  ../src_plugins/lib_gtk_common/in_mouse.h \
  ../src_plugins/lib_gtk_common/win_place.h
@@ -2019,6 +1963,58 @@
  misc_util.h obj_line.h event.h dolists.h
 ../src_plugins/lib_gensexpr/lib_gensexpr.o: \
  ../src_plugins/lib_gensexpr/lib_gensexpr.c plugins.h
+../src_plugins/lib_gtk_common/act_fileio.o: \
+ ../src_plugins/lib_gtk_common/act_fileio.c ../config.h \
+ ../src_plugins/lib_gtk_common/act_fileio.h unit.h hid_actions.h hid.h \
+ error.h drc.h unit.h global_typedefs.h pcb_bool.h attrib.h layer.h \
+ globalconst.h obj_all_list.h obj_arc_list.h obj_common.h \
+ ../src_3rd/liblihata/genht/hash.h ../src_3rd/genlist/gendlist.h flag.h \
+ obj_arc.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_elem_list.h obj_elem.h obj_line_list.h obj_line.h obj_pad_list.h \
+ obj_pad.h obj_pinvia_list.h obj_pinvia.h obj_text.h ht_element.h \
+ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_rat_list.h \
+ obj_rat.h layer_grp.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \
+ ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ compat_nls.h plug_footprint.h vtlibrary.h compat_misc.h \
+ ../src_plugins/lib_gtk_common/dlg_file_chooser.h plug_io.h library.h \
+ ../src_plugins/lib_gtk_common/util_str.h \
+ ../src_plugins/lib_gtk_common/../hid_gtk/gui.h board.h const.h macro.h \
+ vtroutestyle.h rats_patch.h board.h font.h box.h math_helper.h move.h \
+ misc_util.h hid.h hid_cfg.h hid_cfg_input.h \
+ ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h crosshair.h \
+ vtonpoint.h buffer.h \
+ ../src_plugins/lib_gtk_common/../hid_gtk/ghid-main-menu.h \
+ ../src_plugins/lib_gtk_common/wt_layer_selector.h \
+ ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h event.h \
+ ../src_plugins/lib_gtk_common/../hid_gtk/colors.h \
+ ../src_plugins/lib_gtk_common/../hid_gtk/hid_gtk_conf.h conf.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h
+../src_plugins/lib_gtk_common/act_print.o: \
+ ../src_plugins/lib_gtk_common/act_print.c ../config.h \
+ ../src_plugins/lib_gtk_common/act_print.h board.h const.h macro.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_all_list.h obj_arc_list.h obj_common.h \
+ ../src_3rd/liblihata/genht/hash.h ../src_3rd/genlist/gendlist.h flag.h \
+ obj_arc.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_elem_list.h obj_elem.h obj_line_list.h obj_line.h obj_pad_list.h \
+ obj_pad.h obj_pinvia_list.h obj_pinvia.h obj_text.h ht_element.h \
+ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_rat_list.h \
+ obj_rat.h layer_grp.h library.h rats_patch.h board.h font.h box.h \
+ math_helper.h move.h misc_util.h hid.h error.h drc.h hid_init.h hid.h \
+ hid_attrib.h data.h crosshair.h vtonpoint.h buffer.h compat_nls.h \
+ ../src_plugins/lib_gtk_common/dlg_print.h
 ../src_plugins/lib_gtk_common/bu_box.o: \
  ../src_plugins/lib_gtk_common/bu_box.c ../config.h \
  ../src_plugins/lib_gtk_common/bu_box.h \
@@ -2045,6 +2041,23 @@
  ht_element.h ../src_3rd/liblihata/genht/ht.h obj_poly_list.h obj_poly.h \
  polyarea.h obj_text_list.h obj_rat_list.h obj_rat.h layer_grp.h \
  crosshair.h vtonpoint.h misc_util.h compat_nls.h math_helper.h
+../src_plugins/lib_gtk_common/bu_dwg_tooltip.o: \
+ ../src_plugins/lib_gtk_common/bu_dwg_tooltip.c ../config.h \
+ ../src_plugins/lib_gtk_common/bu_dwg_tooltip.h layer.h globalconst.h \
+ global_typedefs.h pcb_bool.h unit.h attrib.h obj_all_list.h \
+ obj_arc_list.h obj_common.h ../src_3rd/liblihata/genht/hash.h \
+ ../src_3rd/genlist/gendlist.h flag.h obj_arc.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_elem_list.h obj_elem.h \
+ obj_line_list.h obj_line.h obj_pad_list.h obj_pad.h obj_pinvia_list.h \
+ obj_pinvia.h obj_text.h ht_element.h ../src_3rd/liblihata/genht/ht.h \
+ ../src_3rd/liblihata/genht/ht_inlines.h obj_poly_list.h obj_poly.h \
+ polyarea.h obj_text_list.h obj_rat_list.h obj_rat.h library.h search.h \
+ rats.h netlist.h library.h route_style.h vtroutestyle.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h layer_grp.h misc_util.h \
+ const.h find.h board.h const.h macro.h rats_patch.h board.h font.h box.h \
+ math_helper.h move.h
 ../src_plugins/lib_gtk_common/bu_entry.o: \
  ../src_plugins/lib_gtk_common/bu_entry.c ../config.h \
  ../src_plugins/lib_gtk_common/bu_entry.h \
@@ -2177,15 +2190,9 @@
  ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h conf_core.h \
  event.h compat_misc.h ../src_plugins/lib_gtk_common/../hid_gtk/colors.h \
  ../src_plugins/lib_gtk_common/../hid_gtk/hid_gtk_conf.h conf.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
- ../src_plugins/lib_gtk_common/bu_box.h \
- ../src_plugins/lib_gtk_common/bu_text_view.h \
- ../src_plugins/lib_gtk_common/bu_check_button.h \
- ../src_plugins/lib_gtk_common/bu_spin_button.h \
- ../src_plugins/lib_gtk_common/bu_status_line.h \
- ../src_plugins/lib_gtk_common/wt_coord_entry.h \
- ../src_plugins/lib_gtk_common/dlg_propedit.h \
- ../src_plugins/lib_gtk_common/bu_cursor_pos.h
+ ../src_plugins/lib_gtk_common/dlg_propedit.h
 ../src_plugins/lib_gtk_common/dlg_input.o: \
  ../src_plugins/lib_gtk_common/dlg_input.c ../config.h \
  ../src_plugins/lib_gtk_common/dlg_input.h
@@ -2234,6 +2241,9 @@
  polyarea.h obj_text_list.h obj_rat_list.h obj_rat.h layer_grp.h \
  pcb-printf.h hid_attrib.h hid.h hid_init.h misc_util.h compat_misc.h \
  compat_nls.h ../src_plugins/lib_gtk_common/dlg_attribute.h
+../src_plugins/lib_gtk_common/dlg_progress.o: \
+ ../src_plugins/lib_gtk_common/dlg_progress.c ../config.h \
+ ../src_plugins/lib_gtk_common/dlg_progress.h pcb_bool.h compat_nls.h
 ../src_plugins/lib_gtk_common/dlg_propedit.o: \
  ../src_plugins/lib_gtk_common/dlg_propedit.c ../config.h compat_misc.h \
  compat_nls.h polygon.h flag.h globalconst.h rtree.h global_typedefs.h \
@@ -2264,20 +2274,38 @@
  ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
  event.h ../src_plugins/lib_gtk_common/../hid_gtk/colors.h \
  ../src_plugins/lib_gtk_common/../hid_gtk/hid_gtk_conf.h conf.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
- ../src_plugins/lib_gtk_common/bu_box.h \
- ../src_plugins/lib_gtk_common/bu_text_view.h \
- ../src_plugins/lib_gtk_common/bu_check_button.h \
- ../src_plugins/lib_gtk_common/bu_spin_button.h \
- ../src_plugins/lib_gtk_common/bu_status_line.h \
- ../src_plugins/lib_gtk_common/wt_coord_entry.h \
- ../src_plugins/lib_gtk_common/dlg_propedit.h \
- ../src_plugins/lib_gtk_common/bu_cursor_pos.h
+ ../src_plugins/lib_gtk_common/dlg_propedit.h
 ../src_plugins/lib_gtk_common/dlg_report.o: \
  ../src_plugins/lib_gtk_common/dlg_report.c ../config.h \
  ../src_plugins/lib_gtk_common/dlg_report.h \
  ../src_plugins/lib_gtk_common/compat.h \
  ../src_plugins/lib_gtk_common/bu_box.h
+../src_plugins/lib_gtk_common/dlg_route_style.o: \
+ ../src_plugins/lib_gtk_common/dlg_route_style.c ../config.h \
+ compat_misc.h compat_nls.h polygon.h flag.h globalconst.h rtree.h \
+ global_typedefs.h pcb_bool.h unit.h math_helper.h polyarea.h obj_all.h \
+ obj_arc.h obj_common.h ../src_3rd/liblihata/genht/hash.h \
+ ../src_3rd/genlist/gendlist.h attrib.h obj_elem.h obj_arc_list.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_pad_list.h obj_pad.h obj_pinvia_list.h obj_pinvia.h obj_text.h \
+ obj_poly.h obj_rat.h ../src_plugins/lib_gtk_common/bu_box.h \
+ ../src_plugins/lib_gtk_common/compat.h board.h const.h macro.h \
+ vtroutestyle.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h obj_all_list.h \
+ obj_elem_list.h ht_element.h ../src_3rd/liblihata/genht/ht.h \
+ ../src_3rd/liblihata/genht/ht_inlines.h obj_poly_list.h obj_text_list.h \
+ obj_rat_list.h layer_grp.h library.h rats_patch.h board.h font.h box.h \
+ move.h misc_util.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \
+ ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_plugins/lib_gtk_common/dlg_route_style.h \
+ ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \
+ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h
 ../src_plugins/lib_gtk_common/dlg_search.o: \
  ../src_plugins/lib_gtk_common/dlg_search.c ../config.h \
  ../src_plugins/lib_gtk_common/dlg_search.h ../src_3rd/genlist/gendlist.h \
@@ -2330,15 +2358,9 @@
  ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
  event.h compat_misc.h ../src_plugins/lib_gtk_common/../hid_gtk/colors.h \
  ../src_plugins/lib_gtk_common/../hid_gtk/hid_gtk_conf.h conf.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
- ../src_plugins/lib_gtk_common/bu_box.h \
- ../src_plugins/lib_gtk_common/bu_text_view.h \
- ../src_plugins/lib_gtk_common/bu_check_button.h \
- ../src_plugins/lib_gtk_common/bu_spin_button.h \
- ../src_plugins/lib_gtk_common/bu_status_line.h \
- ../src_plugins/lib_gtk_common/wt_coord_entry.h \
- ../src_plugins/lib_gtk_common/dlg_propedit.h \
- ../src_plugins/lib_gtk_common/bu_cursor_pos.h
+ ../src_plugins/lib_gtk_common/dlg_propedit.h
 ../src_plugins/lib_gtk_common/in_mouse.o: \
  ../src_plugins/lib_gtk_common/in_mouse.c \
  ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h \
@@ -2368,16 +2390,10 @@
  ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
  event.h compat_misc.h ../src_plugins/lib_gtk_common/../hid_gtk/colors.h \
  ../src_plugins/lib_gtk_common/../hid_gtk/hid_gtk_conf.h conf.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
- ../src_plugins/lib_gtk_common/bu_box.h \
- ../src_plugins/lib_gtk_common/bu_text_view.h \
- ../src_plugins/lib_gtk_common/bu_check_button.h \
- ../src_plugins/lib_gtk_common/bu_spin_button.h \
- ../src_plugins/lib_gtk_common/bu_status_line.h \
- ../src_plugins/lib_gtk_common/wt_coord_entry.h \
  ../src_plugins/lib_gtk_common/dlg_propedit.h \
- ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
- ../src_plugins/hid_gtk/gui.h
+ ../src_plugins/lib_gtk_common/bu_status_line.h
 ../src_plugins/lib_gtk_common/lib_gtk_common.o: \
  ../src_plugins/lib_gtk_common/lib_gtk_common.c plugins.h
 ../src_plugins/lib_gtk_common/menu_lht.o: \
@@ -2506,15 +2522,9 @@
  ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
  event.h compat_misc.h ../src_plugins/hid_gtk/colors.h \
  ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
- ../src_plugins/lib_gtk_common/bu_box.h \
- ../src_plugins/lib_gtk_common/bu_text_view.h \
- ../src_plugins/lib_gtk_common/bu_check_button.h \
- ../src_plugins/lib_gtk_common/bu_spin_button.h \
- ../src_plugins/lib_gtk_common/bu_status_line.h \
- ../src_plugins/lib_gtk_common/wt_coord_entry.h \
- ../src_plugins/lib_gtk_common/dlg_propedit.h \
- ../src_plugins/lib_gtk_common/bu_cursor_pos.h pcb-printf.h
+ ../src_plugins/lib_gtk_common/dlg_propedit.h pcb-printf.h
 ../src_plugins/lib_gtk_common/wt_preview.o: \
  ../src_plugins/lib_gtk_common/wt_preview.c ../config.h conf_core.h \
  conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
@@ -2548,33 +2558,17 @@
  ../src_3rd/genvector/vtp0.h list_conf.h \
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h globalconst.h \
+ ../src_plugins/lib_gtk_common/dlg_route_style.h \
  ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \
- vtroutestyle.h attrib.h ../src_plugins/lib_gtk_common/../hid_gtk/gui.h \
- board.h const.h macro.h layer.h obj_all_list.h obj_arc_list.h \
- obj_common.h ../src_3rd/liblihata/genht/hash.h \
- ../src_3rd/genlist/gendlist.h flag.h obj_arc.h obj_elem_list.h \
- obj_elem.h obj_line_list.h obj_line.h obj_pad_list.h obj_pad.h \
- obj_pinvia_list.h obj_pinvia.h obj_text.h ht_element.h \
- ../src_3rd/liblihata/genht/ht.h obj_poly_list.h obj_poly.h polyarea.h \
- obj_text_list.h obj_rat_list.h obj_rat.h layer_grp.h library.h \
- rats_patch.h board.h font.h box.h math_helper.h move.h misc_util.h hid.h \
- error.h drc.h hid_cfg.h hid_cfg_input.h \
- ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h crosshair.h \
- vtonpoint.h hid.h buffer.h \
- ../src_plugins/lib_gtk_common/../hid_gtk/ghid-main-menu.h \
- ../src_plugins/lib_gtk_common/wt_layer_selector.h \
- ../src_plugins/lib_gtk_common/wt_route_style.h event.h compat_misc.h \
- ../src_plugins/lib_gtk_common/../hid_gtk/colors.h \
- ../src_plugins/lib_gtk_common/../hid_gtk/hid_gtk_conf.h conf.h \
- ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
- ../src_plugins/lib_gtk_common/bu_box.h \
- ../src_plugins/lib_gtk_common/bu_text_view.h \
- ../src_plugins/lib_gtk_common/bu_check_button.h \
- ../src_plugins/lib_gtk_common/bu_spin_button.h \
- ../src_plugins/lib_gtk_common/bu_status_line.h \
- ../src_plugins/lib_gtk_common/wt_coord_entry.h \
- ../src_plugins/lib_gtk_common/dlg_propedit.h \
- ../src_plugins/lib_gtk_common/bu_cursor_pos.h pcb-printf.h compat_nls.h
+ vtroutestyle.h attrib.h pcb-printf.h board.h const.h macro.h layer.h \
+ obj_all_list.h obj_arc_list.h obj_common.h \
+ ../src_3rd/liblihata/genht/hash.h ../src_3rd/genlist/gendlist.h flag.h \
+ obj_arc.h obj_elem_list.h obj_elem.h obj_line_list.h obj_line.h \
+ obj_pad_list.h obj_pad.h obj_pinvia_list.h obj_pinvia.h obj_text.h \
+ ht_element.h ../src_3rd/liblihata/genht/ht.h obj_poly_list.h obj_poly.h \
+ polyarea.h obj_text_list.h obj_rat_list.h obj_rat.h layer_grp.h \
+ library.h rats_patch.h board.h font.h box.h math_helper.h move.h \
+ misc_util.h compat_nls.h ../src_plugins/lib_gtk_common/bu_status_line.h
 ../src_plugins/lib_legacy_func/lib_legacy_func.o: \
  ../src_plugins/lib_legacy_func/lib_legacy_func.c \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
Index: src_plugins/hid_gtk/gtkhid-main.c
===================================================================
--- src_plugins/hid_gtk/gtkhid-main.c	(revision 6720)
+++ src_plugins/hid_gtk/gtkhid-main.c	(revision 6721)
@@ -33,6 +33,7 @@
 /* AV: Care to circular includes !!!? */
 #include "../src_plugins/lib_gtk_common/act_fileio.h"
 #include "../src_plugins/lib_gtk_common/act_print.h"
+#include "../src_plugins/lib_gtk_common/bu_status_line.h"
 #include "../src_plugins/lib_gtk_common/ui_zoompan.h"
 #include "../src_plugins/lib_gtk_common/util_block_hook.h"
 #include "../src_plugins/lib_gtk_common/util_timer.h"
Index: src_plugins/hid_gtk/gui-command-window.c
===================================================================
--- src_plugins/hid_gtk/gui-command-window.c	(revision 6720)
+++ src_plugins/hid_gtk/gui-command-window.c	(revision 6721)
@@ -37,6 +37,8 @@
 #include "hid_gtk_conf.h"
 #include "compat_nls.h"
 
+#include "../src_plugins/lib_gtk_common/bu_text_view.h"
+#include "../src_plugins/lib_gtk_common/bu_status_line.h"
 #include "../src_plugins/lib_gtk_common/util_str.h"
 
 static GtkWidget *command_window;
Index: src_plugins/hid_gtk/gui-config.c
===================================================================
--- src_plugins/hid_gtk/gui-config.c	(revision 6720)
+++ src_plugins/hid_gtk/gui-config.c	(revision 6721)
@@ -51,11 +51,17 @@
 #include "compat_nls.h"
 #include "fptr_cast.h"
 #include <liblihata/tree.h>
+
 #include "../src_plugins/lib_gtk_common/util_str.h"
 #include "../src_plugins/lib_gtk_common/wt_preview.h"
+#include "../src_plugins/lib_gtk_common/bu_box.h"
 #include "../src_plugins/lib_gtk_common/bu_entry.h"
 #include "../src_plugins/lib_gtk_common/bu_notebook.h"
+#include "../src_plugins/lib_gtk_common/bu_text_view.h"
+#include "../src_plugins/lib_gtk_common/bu_check_button.h"
+#include "../src_plugins/lib_gtk_common/bu_status_line.h"
 #include "../src_plugins/lib_gtk_common/win_place.h"
+#include "../src_plugins/lib_gtk_common/bu_spin_button.h"
 
 
 #if 0
Index: src_plugins/hid_gtk/gui-library-window.c
===================================================================
--- src_plugins/hid_gtk/gui-library-window.c	(revision 6720)
+++ src_plugins/hid_gtk/gui-library-window.c	(revision 6721)
@@ -64,6 +64,7 @@
 
 static GtkWidget *library_window;
 
+#include "../src_plugins/lib_gtk_common/bu_box.h"
 #include "../src_plugins/lib_gtk_common/wt_preview.h"
 #include "../src_plugins/lib_gtk_common/win_place.h"
 #include "gui-library-window.h"
Index: src_plugins/hid_gtk/gui-log-window.c
===================================================================
--- src_plugins/hid_gtk/gui-log-window.c	(revision 6720)
+++ src_plugins/hid_gtk/gui-log-window.c	(revision 6721)
@@ -39,6 +39,7 @@
 #include "gtkhid-main.h"
 
 #include "../src_plugins/lib_gtk_common/win_place.h"
+#include "../src_plugins/lib_gtk_common/bu_text_view.h"
 
 static GtkWidget *log_window, *log_text;
 static gboolean log_show_on_append = FALSE;
Index: src_plugins/hid_gtk/gui-netlist-window.c
===================================================================
--- src_plugins/hid_gtk/gui-netlist-window.c	(revision 6720)
+++ src_plugins/hid_gtk/gui-netlist-window.c	(revision 6721)
@@ -52,8 +52,10 @@
 #include "gui.h"
 #include "../src_plugins/lib_gtk_common/util_str.h"
 #include "../src_plugins/lib_gtk_common/win_place.h"
+#include "../src_plugins/lib_gtk_common/bu_text_view.h"
+#include "../src_plugins/lib_gtk_common/bu_box.h"
+#include "../src_plugins/lib_gtk_common/bu_check_button.h"
 
-
 #define NET_HIERARCHY_SEPARATOR "/"
 
 static GtkWidget *netlist_window;
Index: src_plugins/hid_gtk/gui-output-events.c
===================================================================
--- src_plugins/hid_gtk/gui-output-events.c	(revision 6720)
+++ src_plugins/hid_gtk/gui-output-events.c	(revision 6721)
@@ -45,6 +45,7 @@
 #include "gtkhid-main.h"
 
 #include "../src_plugins/lib_gtk_common/bu_dwg_tooltip.h"
+#include "../src_plugins/lib_gtk_common/bu_status_line.h"
 #include "../src_plugins/lib_gtk_common/in_mouse.h"
 #include "../src_plugins/lib_gtk_common/in_keyboard.h"
 
Index: src_plugins/hid_gtk/gui-top-window.c
===================================================================
--- src_plugins/hid_gtk/gui-top-window.c	(revision 6720)
+++ src_plugins/hid_gtk/gui-top-window.c	(revision 6721)
@@ -92,6 +92,10 @@
 #include "obj_line.h"
 #include "layer_vis.h"
 #include "gtkhid-main.h"
+
+#include "../src_plugins/lib_gtk_common/bu_box.h"
+#include "../src_plugins/lib_gtk_common/bu_status_line.h"
+#include "../src_plugins/lib_gtk_common/dlg_route_style.h"
 #include "../src_plugins/lib_gtk_common/util_str.h"
 #include "../src_plugins/lib_gtk_common/in_mouse.h"
 #include "../src_plugins/lib_gtk_common/wt_layer_selector.h"
@@ -663,7 +667,7 @@
 }
 
 /*! \brief Called when user clicks OK on route style dialog */
-static void route_styles_edited_cb(pcb_gtk_route_style_t * rss, gboolean save, gpointer data)
+void route_styles_edited_cb(pcb_gtk_route_style_t * rss, gboolean save, gpointer data)
 {
 	conf_setf(CFR_DESIGN, "design/routes", -1, "%s", pcb_route_string_make(&PCB->RouteStyle));
 	if (save)
@@ -672,27 +676,6 @@
 		(GHID_MAIN_MENU(ghidgui->menu_bar), GHID_ROUTE_STYLE(ghidgui->route_style_selector));
 }
 
-/*! \brief Called when a route style is selected */
-static void route_style_changed_cb(pcb_gtk_route_style_t * rss, pcb_route_style_t * rst, gpointer data)
-{
-	pcb_use_route_style(rst);
-	ghid_set_status_line_label();
-}
-
-/*! \brief Configure the route style selector */
-void make_route_style_buttons(pcb_gtk_route_style_t * rss)
-{
-	int i;
-
-	/* Make sure the <custom> item is added */
-	pcb_gtk_route_style_add_route_style(rss, NULL);
-
-	for (i = 0; i < vtroutestyle_len(&PCB->RouteStyle); ++i)
-		pcb_gtk_route_style_add_route_style(rss, &PCB->RouteStyle.array[i]);
-	g_signal_connect(G_OBJECT(rss), "select_style", G_CALLBACK(route_style_changed_cb), NULL);
-	g_signal_connect(G_OBJECT(rss), "style_edited", G_CALLBACK(route_styles_edited_cb), NULL);
-}
-
 /*
  *  ---------------------------------------------------------------
  * Mode buttons
Index: src_plugins/hid_gtk/gui.h
===================================================================
--- src_plugins/hid_gtk/gui.h	(revision 6720)
+++ src_plugins/hid_gtk/gui.h	(revision 6721)
@@ -42,22 +42,12 @@
 
 #include "hid_gtk_conf.h"
 
-
-/* TODO: REMOVE THESE */
+/* needed for a type in GhidGui - DO NOT ADD .h files that are not requred for the structs! */
+#include "../src_plugins/lib_gtk_common/bu_cursor_pos.h"
 #include "../src_plugins/lib_gtk_common/ui_zoompan.h"
-#include "../src_plugins/lib_gtk_common/bu_box.h"
-#include "../src_plugins/lib_gtk_common/bu_text_view.h"
-#include "../src_plugins/lib_gtk_common/bu_check_button.h"
-#include "../src_plugins/lib_gtk_common/bu_spin_button.h"
-#include "../src_plugins/lib_gtk_common/bu_status_line.h"
-#include "../src_plugins/lib_gtk_common/wt_coord_entry.h"
-#include "../src_plugins/lib_gtk_common/dlg_route_style.h"
 #include "../src_plugins/lib_gtk_common/dlg_propedit.h"
 
-/* needed for a type in GhidGui */
-#include "../src_plugins/lib_gtk_common/bu_cursor_pos.h"
 
-
 	/* Silk and rats lines are the two additional selectable to draw on.
 	   |  gui code in gui-top-window.c and group code in misc.c must agree
 	   |  on what layer is what!
@@ -254,7 +244,6 @@
 void ghid_notify_filename_changed(void);
 void ghid_install_accel_groups(GtkWindow * window, GhidGui * gui);
 void ghid_remove_accel_groups(GtkWindow * window, GhidGui * gui);
-void make_route_style_buttons(pcb_gtk_route_style_t * rss);
 
 /* gui-utils.c
 */
Index: src_plugins/lib_gtk_common/dlg_route_style.c
===================================================================
--- src_plugins/lib_gtk_common/dlg_route_style.c	(revision 6720)
+++ src_plugins/lib_gtk_common/dlg_route_style.c	(revision 6721)
@@ -25,6 +25,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 #include "config.h"
 
 #include "compat_misc.h"
@@ -34,13 +35,11 @@
 
 #include "bu_box.h"
 #include "compat.h"
+#include "board.h"
+#include "conf_core.h"
 
-/* FIXME: Get rid of that ... means get rid of global  ghidgui */
-#include "../hid_gtk/gui.h"
-
-/* and replace by this one, at least 
 #include "dlg_route_style.h"
-*/
+#include "wt_coord_entry.h"
 
 /* SIGNAL HANDLERS */
 
@@ -238,7 +237,7 @@
 		return;
 
 	dialog->inhibit_style_change = 1;
-	pcb_gtk_route_style_empty(GHID_ROUTE_STYLE(ghidgui->route_style_selector));
+	pcb_gtk_route_style_empty(dialog->rss);
 
 #warning TODO: some of these should be in core
 	pcb_gtk_route_style_copy(dialog->rss->selected);
@@ -245,7 +244,7 @@
 
 	vtroutestyle_remove(&PCB->RouteStyle, dialog->rss->selected, 1);
 	dialog->rss->active_style = NULL;
-	make_route_style_buttons(GHID_ROUTE_STYLE(ghidgui->route_style_selector));
+	make_route_style_buttons(GHID_ROUTE_STYLE(dialog->rss));
 	pcb_trace("Style: %d deleted\n", dialog->rss->selected);
 	pcb_board_set_changed_flag(pcb_true);
 	ghid_window_set_name_label(PCB->Name);
Index: src_plugins/lib_gtk_common/dlg_route_style.h
===================================================================
--- src_plugins/lib_gtk_common/dlg_route_style.h	(revision 6720)
+++ src_plugins/lib_gtk_common/dlg_route_style.h	(revision 6721)
@@ -20,3 +20,6 @@
 
 /** Builds and runs the "edit route style" dialog */
 void pcb_gtk_route_style_edit_dialog(pcb_gtk_route_style_t * rss);
+
+/* Temporary: hid_gtk call back */
+extern void ghid_window_set_name_label(gchar *name);
Index: src_plugins/lib_gtk_common/in_mouse.c
===================================================================
--- src_plugins/lib_gtk_common/in_mouse.c	(revision 6720)
+++ src_plugins/lib_gtk_common/in_mouse.c	(revision 6721)
@@ -34,8 +34,7 @@
 
 #include <gdk/gdkkeysyms.h>
 
-/*FIXME: Get rid of gui.h */
-#include "../src_plugins/hid_gtk/gui.h"
+#include "bu_status_line.h"
 
 pcb_hid_cfg_mouse_t ghid_mouse;
 int ghid_wheel_zoom = 0;
Index: src_plugins/lib_gtk_common/wt_route_style.c
===================================================================
--- src_plugins/lib_gtk_common/wt_route_style.c	(revision 6720)
+++ src_plugins/lib_gtk_common/wt_route_style.c	(revision 6721)
@@ -27,18 +27,18 @@
 #include "config.h"
 #include "conf_core.h"
 
-/*FIXME: Remove... */
-#include "../hid_gtk/gui.h"
-/* and replace with, at least
+#include <gdk/gdkkeysyms.h>
+
 #include "dlg_route_style.h"
-*/
 
 #include "pcb-printf.h"
+#include "board.h"
 #include "compat_nls.h"
 
-#include <gdk/gdkkeysyms.h>
+#include "bu_status_line.h"
 
 
+
 /** Global action creation counter */
 static gint action_count;
 
@@ -346,3 +346,23 @@
 	rss->button_radio_group = NULL;
 	rss->hidden_button = 0;
 }
+
+/** Called when a route style is selected */
+static void route_style_changed_cb(pcb_gtk_route_style_t * rss, pcb_route_style_t * rst, gpointer data)
+{
+	pcb_use_route_style(rst);
+	ghid_set_status_line_label();
+}
+
+void make_route_style_buttons(pcb_gtk_route_style_t *rss)
+{
+	int i;
+
+	/* Make sure the <custom> item is added */
+	pcb_gtk_route_style_add_route_style(rss, NULL);
+
+	for (i = 0; i < vtroutestyle_len(&PCB->RouteStyle); ++i)
+		pcb_gtk_route_style_add_route_style(rss, &PCB->RouteStyle.array[i]);
+	g_signal_connect(G_OBJECT(rss), "select_style", G_CALLBACK(route_style_changed_cb), NULL);
+	g_signal_connect(G_OBJECT(rss), "style_edited", G_CALLBACK(route_styles_edited_cb), NULL);
+}
Index: src_plugins/lib_gtk_common/wt_route_style.h
===================================================================
--- src_plugins/lib_gtk_common/wt_route_style.h	(revision 6720)
+++ src_plugins/lib_gtk_common/wt_route_style.h	(revision 6721)
@@ -141,5 +141,13 @@
 /** Removes all styles from a route style selector */
 void pcb_gtk_route_style_empty(pcb_gtk_route_style_t * rss);
 
+/**  Configure the route style selector */
+void make_route_style_buttons(pcb_gtk_route_style_t *rss);
+
+
+/* Temporary: call back to hid_gtk */
+extern void route_styles_edited_cb(pcb_gtk_route_style_t *rss, gboolean save, gpointer data);
+
+
 G_END_DECLS											/* keep c++ happy */
 #endif