Index: trunk/src/Makefile.dep
===================================================================
--- trunk/src/Makefile.dep	(revision 4542)
+++ trunk/src/Makefile.dep	(revision 4543)
@@ -622,7 +622,7 @@
  hid_init.h dolists.h
 ../src_plugins/hid_gtk/ghid-cell-renderer-visibility.o: \
  ../src_plugins/hid_gtk/ghid-cell-renderer-visibility.c \
- ../src_plugins/hid_gtk/gtkhid.h conf_hid.h error.h conf.h ../config.h \
+ ../src_plugins/hid_gtk/gtkhid.h conf_hid.h conf.h ../config.h \
  global_typedefs.h pcb_bool.h unit.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 \
@@ -631,8 +631,8 @@
  ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \
  ../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 ../src_plugins/hid_gtk/gui.h board.h \
- const.h macro.h vtroutestyle.h global_objs.h \
+ ../src_3rd/genlist/gendlist.h error.h ../src_plugins/hid_gtk/gui.h \
+ board.h const.h macro.h vtroutestyle.h global_objs.h \
  ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h polyarea.h \
  layer.h list_line.h list_arc.h list_text.h list_poly.h library.h \
  rats_patch.h board.h list_common.h list_pad.h list_pin.h list_rat.h \
@@ -650,7 +650,7 @@
  ../src_plugins/hid_gtk/ghid-cell-renderer-visibility.h
 ../src_plugins/hid_gtk/ghid-coord-entry.o: \
  ../src_plugins/hid_gtk/ghid-coord-entry.c \
- ../src_plugins/hid_gtk/gtkhid.h conf_hid.h error.h conf.h ../config.h \
+ ../src_plugins/hid_gtk/gtkhid.h conf_hid.h conf.h ../config.h \
  global_typedefs.h pcb_bool.h unit.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 \
@@ -659,8 +659,8 @@
  ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \
  ../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 ../src_plugins/hid_gtk/gui.h board.h \
- const.h macro.h vtroutestyle.h global_objs.h \
+ ../src_3rd/genlist/gendlist.h error.h ../src_plugins/hid_gtk/gui.h \
+ board.h const.h macro.h vtroutestyle.h global_objs.h \
  ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h polyarea.h \
  layer.h list_line.h list_arc.h list_text.h list_poly.h library.h \
  rats_patch.h board.h list_common.h list_pad.h list_pin.h list_rat.h \
@@ -677,7 +677,7 @@
  ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h pcb-printf.h compat_nls.h
 ../src_plugins/hid_gtk/ghid-layer-selector.o: \
  ../src_plugins/hid_gtk/ghid-layer-selector.c \
- ../src_plugins/hid_gtk/gtkhid.h conf_hid.h error.h conf.h ../config.h \
+ ../src_plugins/hid_gtk/gtkhid.h conf_hid.h conf.h ../config.h \
  global_typedefs.h pcb_bool.h unit.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 \
@@ -686,8 +686,8 @@
  ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \
  ../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 ../src_plugins/hid_gtk/gui.h board.h \
- const.h macro.h vtroutestyle.h global_objs.h \
+ ../src_3rd/genlist/gendlist.h error.h ../src_plugins/hid_gtk/gui.h \
+ board.h const.h macro.h vtroutestyle.h global_objs.h \
  ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h polyarea.h \
  layer.h list_line.h list_arc.h list_text.h list_poly.h library.h \
  rats_patch.h board.h list_common.h list_pad.h list_pin.h list_rat.h \
@@ -708,14 +708,14 @@
  ../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/liblihata/genht/ht_inlines.h \
- ../src_plugins/hid_gtk/gtkhid.h conf_hid.h error.h conf.h ../config.h \
+ ../src_plugins/hid_gtk/gtkhid.h conf_hid.h conf.h ../config.h \
  global_typedefs.h pcb_bool.h unit.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/genvector/vtp0.h list_conf.h \
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
- ../src_3rd/genlist/gendlist.h ../src_plugins/hid_gtk/gui.h board.h \
- const.h macro.h vtroutestyle.h global_objs.h \
+ ../src_3rd/genlist/gendlist.h error.h ../src_plugins/hid_gtk/gui.h \
+ board.h const.h macro.h vtroutestyle.h global_objs.h \
  ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h polyarea.h \
  layer.h list_line.h list_arc.h list_text.h list_poly.h library.h \
  rats_patch.h board.h list_common.h list_pad.h list_pin.h list_rat.h \
@@ -2436,9 +2436,9 @@
  ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \
  ../src_3rd/liblihata/dom_internal.h ../src_3rd/liblihata/tree.h \
  ../src_3rd/liblihata/dom.h
-action_act.o: action_act.c ../config.h error.h action_helper.h \
- global_typedefs.h pcb_bool.h unit.h hid_actions.h hid.h drc.h attrib.h \
- undo.h library.h compat_nls.h
+action_act.o: action_act.c ../config.h action_helper.h global_typedefs.h \
+ pcb_bool.h unit.h hid_actions.h hid.h error.h drc.h attrib.h undo.h \
+ library.h compat_nls.h
 action_helper.o: action_helper.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 ../src_3rd/genvector/genvector_impl.h \
@@ -2453,14 +2453,13 @@
  ../src_3rd/genlist/gendlist.h attrib.h flag.h polyarea.h layer.h \
  list_line.h list_arc.h list_text.h list_poly.h library.h rats_patch.h \
  list_common.h list_pad.h list_pin.h list_rat.h vtonpoint.h hid.h error.h \
- drc.h buffer.h change.h copy.h create.h rubberband.h crosshair.h data.h \
- global_element.h list_element.h ht_element.h \
- ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h draw.h \
- find.h insert.h line.h misc.h mymem.h move.h polygon.h rtree.h \
- math_helper.h rats.h netlist.h route_style.h remove.h rotate.h search.h \
- misc_util.h select.h operation.h set.h undo.h stub_stroke.h \
- funchash_core.h funchash.h funchash_core_list.h hid_actions.h \
- compat_misc.h compat_nls.h
+ drc.h change.h copy.h create.h rubberband.h data.h global_element.h \
+ list_element.h ht_element.h ../src_3rd/liblihata/genht/ht.h \
+ ../src_3rd/liblihata/genht/hash.h crosshair.h buffer.h draw.h find.h \
+ insert.h line.h misc.h mymem.h move.h polygon.h rtree.h math_helper.h \
+ remove.h rotate.h search.h rats.h netlist.h route_style.h misc_util.h \
+ select.h operation.h set.h undo.h stub_stroke.h funchash_core.h \
+ funchash.h funchash_core_list.h hid_actions.h compat_misc.h compat_nls.h
 attrib.o: attrib.c ../config.h compat_misc.h attrib.h
 board.o: board.c ../config.h board.h const.h macro.h global_typedefs.h \
  pcb_bool.h unit.h vtroutestyle.h ../src_3rd/genvector/genvector_impl.h \
@@ -2490,12 +2489,12 @@
  board.h const.h macro.h vtroutestyle.h layer.h list_line.h list_arc.h \
  list_text.h list_poly.h library.h rats_patch.h list_common.h list_pad.h \
  list_pin.h list_rat.h vtonpoint.h hid.h error.h drc.h copy.h create.h \
- rubberband.h crosshair.h data.h global_element.h list_element.h \
- ht_element.h ../src_3rd/liblihata/genht/ht.h \
- ../src_3rd/liblihata/genht/hash.h plug_io.h mirror.h misc.h mymem.h \
- misc_util.h polygon.h rtree.h math_helper.h rotate.h remove.h select.h \
- operation.h set.h funchash_core.h funchash.h funchash_core_list.h \
- compat_misc.h compat_nls.h
+ rubberband.h data.h global_element.h list_element.h ht_element.h \
+ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \
+ crosshair.h plug_io.h mirror.h misc.h mymem.h misc_util.h polygon.h \
+ rtree.h math_helper.h rotate.h remove.h select.h operation.h set.h \
+ funchash_core.h funchash.h funchash_core_list.h compat_misc.h \
+ compat_nls.h
 build_run.o: build_run.c ../config.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h conf_core.h conf.h \
@@ -2506,11 +2505,11 @@
  ../src_3rd/liblihata/genht/ht_inlines.h ../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 hid.h error.h drc.h attrib.h board.h const.h macro.h \
- vtroutestyle.h global_objs.h ../src_3rd/genlist/gendlist.h flag.h \
- polyarea.h layer.h list_line.h list_arc.h list_text.h list_poly.h \
- library.h rats_patch.h list_common.h list_pad.h list_pin.h list_rat.h \
- vtonpoint.h hid_actions.h hid_init.h plug_io.h compat_misc.h
+ globalconst.h board.h const.h macro.h vtroutestyle.h global_objs.h \
+ ../src_3rd/genlist/gendlist.h attrib.h flag.h polyarea.h layer.h \
+ list_line.h list_arc.h list_text.h list_poly.h library.h rats_patch.h \
+ list_common.h list_pad.h list_pin.h list_rat.h vtonpoint.h hid.h error.h \
+ drc.h build_run.h hid_init.h plug_io.h compat_misc.h
 buildin.o: buildin.c ../config.h plugins.h buildin.h
 change.o: change.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 \
@@ -2548,7 +2547,7 @@
  drc.h buffer.h funchash_core.h funchash.h funchash_core_list.h board.h \
  const.h macro.h vtroutestyle.h library.h rats_patch.h action_helper.h \
  hid_actions.h change.h draw.h search.h rats.h netlist.h route_style.h \
- misc_util.h misc.h mymem.h set.h undo.h compat_misc.h compat_nls.h
+ misc_util.h set.h undo.h compat_misc.h compat_nls.h
 clip.o: clip.c ../config.h clip.h global_typedefs.h pcb_bool.h unit.h
 compat_dl.o: compat_dl.c ../config.h compat_dl.h compat_inc.h
 compat_fs.o: compat_fs.c ../config.h compat_inc.h compat_fs.h \
@@ -2570,8 +2569,7 @@
  ../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 conf_core.h globalconst.h conf_hid.h \
- error.h hid_cfg.h hid_init.h hid.h drc.h attrib.h hid_attrib.h \
- misc_util.h paths.h compat_fs.h compat_misc.h \
+ error.h hid_cfg.h misc_util.h paths.h compat_fs.h compat_misc.h \
  ../src_3rd/genvector/genvector_impl.c
 conf_act.o: conf_act.c ../config.h board.h const.h macro.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
@@ -2581,18 +2579,15 @@
  layer.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  list_arc.h list_text.h list_poly.h library.h rats_patch.h list_common.h \
- list_pad.h list_pin.h list_rat.h vtonpoint.h hid.h error.h drc.h data.h \
- global_element.h list_element.h ht_element.h \
- ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \
- ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \
- conf.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ list_pad.h list_pin.h list_rat.h vtonpoint.h hid.h error.h drc.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 conf_core.h misc.h mymem.h \
- misc_util.h route_style.h
-conf_core.o: conf_core.c ../config.h const.h conf.h global_typedefs.h \
- pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/liblihata/genht/ht_inlines.h ../src_3rd/genvector/vtp0.h \
+ list_conf.h misc_util.h route_style.h
+conf_core.o: conf_core.c ../config.h conf.h global_typedefs.h pcb_bool.h \
+ unit.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 \
@@ -2602,9 +2597,9 @@
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h conf_core.h globalconst.h \
  conf_core_fields.h
-conf_hid.o: conf_hid.c ../config.h conf_hid.h error.h conf.h \
- global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
- ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+conf_hid.o: conf_hid.c ../config.h conf_hid.h conf.h global_typedefs.h \
+ pcb_bool.h unit.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 \
@@ -2611,7 +2606,7 @@
  ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \
  ../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 ../src_3rd/liblihata/genht/hash.h \
+ ../src_3rd/genlist/gendlist.h error.h ../src_3rd/liblihata/genht/hash.h \
  ../src_3rd/liblihata/genht/htpp.h conf_core.h globalconst.h
 conf_internal.o: conf_internal.c
 copy.o: copy.c ../config.h conf_core.h conf.h global_typedefs.h \
@@ -2667,9 +2662,9 @@
  vtonpoint.h hid.h error.h drc.h box.h math_helper.h misc_util.h \
  crosshair.h rubberband.h data.h global_element.h list_element.h \
  ht_element.h ../src_3rd/liblihata/genht/ht.h \
- ../src_3rd/liblihata/genht/hash.h buffer.h draw.h line.h rtree.h \
- search.h rats.h netlist.h route_style.h polygon.h misc.h mymem.h \
- hid_actions.h compat_misc.h compat_nls.h
+ ../src_3rd/liblihata/genht/hash.h buffer.h draw.h line.h search.h rats.h \
+ netlist.h route_style.h polygon.h rtree.h misc.h mymem.h hid_actions.h \
+ compat_misc.h compat_nls.h
 data.o: data.c ../config.h board.h const.h macro.h global_typedefs.h \
  pcb_bool.h unit.h vtroutestyle.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h global_objs.h \
@@ -2699,7 +2694,7 @@
  drc.h data.h global_element.h list_element.h ht_element.h \
  ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \
  crosshair.h rubberband.h buffer.h draw.h misc.h mymem.h rotate.h rtree.h \
- draw_fab.h hid_helper.h
+ draw_fab.h
 draw_fab.o: draw_fab.c ../config.h board.h const.h macro.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
  ../src_3rd/genvector/genvector_impl.h \
@@ -2712,14 +2707,14 @@
  build_run.h data.h global_element.h list_element.h ht_element.h \
  ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \
  ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \
- draw.h drill.h misc.h mymem.h draw_fab.h polygon.h rtree.h math_helper.h
-drill.o: drill.c ../config.h const.h data.h globalconst.h \
- global_typedefs.h pcb_bool.h unit.h global_objs.h \
- ../src_3rd/genlist/gendlist.h attrib.h flag.h polyarea.h \
- global_element.h list_pin.h ../src_3rd/genlist/gentdlist_impl.h \
- ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
- list_pad.h list_line.h list_arc.h list_element.h ht_element.h \
- ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \
+ draw.h drill.h draw_fab.h
+drill.o: drill.c ../config.h data.h globalconst.h global_typedefs.h \
+ pcb_bool.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h attrib.h \
+ flag.h polyarea.h global_element.h list_pin.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h list_pad.h list_line.h list_arc.h \
+ list_element.h ht_element.h ../src_3rd/liblihata/genht/ht.h \
+ ../src_3rd/liblihata/genht/ht_inlines.h \
  ../src_3rd/liblihata/genht/hash.h list_common.h list_text.h list_poly.h \
  list_rat.h layer.h crosshair.h rubberband.h vtonpoint.h \
  ../src_3rd/genvector/genvector_impl.h \
@@ -2761,7 +2756,7 @@
  ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \
  action_helper.h set.h plug_io.h plug_import.h misc.h mymem.h remove.h \
  create.h draw.h find.h search.h rats.h netlist.h route_style.h \
- misc_util.h hid_actions.h hid_attrib.h compat_misc.h compat_nls.h
+ misc_util.h hid_actions.h compat_misc.h compat_nls.h
 find.o: find.c ../config.h const.h math_helper.h conf_core.h conf.h \
  global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
@@ -2828,7 +2823,7 @@
  ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \
  action_helper.h undo.h funchash_core.h funchash.h funchash_core_list.h \
  draw.h search.h rats.h netlist.h route_style.h misc_util.h find.h set.h \
- misc.h mymem.h stub_stroke.h hid_actions.h hid_init.h compat_nls.h
+ stub_stroke.h hid_actions.h hid_init.h compat_nls.h
 heap.o: heap.c ../config.h heap.h
 hid_actions.o: hid_actions.c ../config.h conf_core.h conf.h \
  global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
Index: trunk/src/action_act.c
===================================================================
--- trunk/src/action_act.c	(revision 4542)
+++ trunk/src/action_act.c	(revision 4543)
@@ -28,7 +28,6 @@
 #include <stdio.h>
 #include "config.h"
 
-#include "error.h"
 #include "action_helper.h"
 #include "hid_actions.h"
 #include "undo.h"
Index: trunk/src/action_helper.c
===================================================================
--- trunk/src/action_helper.c	(revision 4542)
+++ trunk/src/action_helper.c	(revision 4543)
@@ -33,14 +33,11 @@
 
 #include "action_helper.h"
 #include "board.h"
-#include "buffer.h"
 #include "change.h"
 #include "copy.h"
 #include "create.h"
-#include "crosshair.h"
 #include "data.h"
 #include "draw.h"
-#include "error.h"
 #include "find.h"
 #include "insert.h"
 #include "line.h"
@@ -47,22 +44,17 @@
 #include "misc.h"
 #include "move.h"
 #include "polygon.h"
-#include "rats.h"
 #include "remove.h"
 #include "rotate.h"
-#include "rubberband.h"
 #include "search.h"
 #include "select.h"
 #include "set.h"
 #include "undo.h"
-#include "rtree.h"
 #include "stub_stroke.h"
 #include "funchash_core.h"
 #include "hid_actions.h"
 #include "compat_misc.h"
 #include "compat_nls.h"
-#include "layer.h"
-#include "polyarea.h"
 
 /* --------------------------------------------------------------------------- */
 
Index: trunk/src/board.c
===================================================================
--- trunk/src/board.c	(revision 4542)
+++ trunk/src/board.c	(revision 4543)
@@ -25,8 +25,6 @@
  */
 #include "config.h"
 #include "board.h"
-#include "attrib.h"
-#include "library.h"
 #include "data.h"
 
 PCBTypePtr PCB;									/* pointer to layout struct */
Index: trunk/src/buffer.c
===================================================================
--- trunk/src/buffer.c	(revision 4542)
+++ trunk/src/buffer.c	(revision 4543)
@@ -30,16 +30,12 @@
 #include "config.h"
 #include "conf_core.h"
 
-#include <stdlib.h>
-
 #include "action_helper.h"
 #include "buffer.h"
 #include "board.h"
 #include "copy.h"
 #include "create.h"
-#include "crosshair.h"
 #include "data.h"
-#include "error.h"
 #include "plug_io.h"
 #include "mirror.h"
 #include "misc.h"
@@ -47,14 +43,11 @@
 #include "polygon.h"
 #include "rotate.h"
 #include "remove.h"
-#include "rtree.h"
 #include "select.h"
 #include "set.h"
 #include "funchash_core.h"
 #include "compat_misc.h"
 #include "compat_nls.h"
-#include "layer.h"
-#include "math_helper.h"
 
 /* ---------------------------------------------------------------------------
  * some local prototypes
Index: trunk/src/build_run.c
===================================================================
--- trunk/src/build_run.c	(revision 4542)
+++ trunk/src/build_run.c	(revision 4543)
@@ -27,9 +27,8 @@
 #include "config.h"
 #include <genvector/gds_char.h>
 #include "conf_core.h"
-#include "hid.h"
 #include "board.h"
-#include "hid_actions.h"
+#include "build_run.h"
 #include "hid_init.h"
 #include "plug_io.h"
 #include "compat_misc.h"
Index: trunk/src/change.c
===================================================================
--- trunk/src/change.c	(revision 4542)
+++ trunk/src/change.c	(revision 4543)
@@ -30,10 +30,6 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <setjmp.h>
-
 #include "conf_core.h"
 
 #include "board.h"
@@ -40,16 +36,13 @@
 #include "crosshair.h"
 #include "data.h"
 #include "draw.h"
-#include "error.h"
 #include "misc.h"
 #include "mirror.h"
 #include "polygon.h"
-#include "rtree.h"
 #include "select.h"
 #include "undo.h"
 #include "hid_actions.h"
 #include "compat_nls.h"
-#include "layer.h"
 
 /* ---------------------------------------------------------------------------
  * some local prototypes
Index: trunk/src/change_act.c
===================================================================
--- trunk/src/change_act.c	(revision 4542)
+++ trunk/src/change_act.c	(revision 4543)
@@ -28,8 +28,6 @@
 /* action routines for output window
  */
 
-#include <assert.h>
-
 #include "config.h"
 #include "conf_core.h"
 
@@ -39,20 +37,15 @@
 #include "board.h"
 #include "action_helper.h"
 #include "hid_actions.h"
-#include "crosshair.h"
 #include "change.h"
 #include "draw.h"
 #include "search.h"
-#include "misc.h"
 #include "set.h"
-#include "error.h"
 #include "undo.h"
-#include "rubberband.h"
-#include "misc_util.h"
 #include "compat_misc.h"
 #include "compat_nls.h"
-#include "layer.h"
 
+
 static void ChangeFlag(const char *, const char *, int, const char *);
 static int ActionChangeSize(int argc, const char **argv, Coord x, Coord y);
 static int ActionChange2ndSize(int argc, const char **argv, Coord x, Coord y);
Index: trunk/src/clip.c
===================================================================
--- trunk/src/clip.c	(revision 4542)
+++ trunk/src/clip.c	(revision 4543)
@@ -27,7 +27,6 @@
 
 #include "config.h"
 #include "clip.h"
-#include <math.h>
 
 /* Clip the line to the clipBox
  * return pcb_true if something to be drawn
Index: trunk/src/conf.c
===================================================================
--- trunk/src/conf.c	(revision 4542)
+++ trunk/src/conf.c	(revision 4543)
@@ -32,8 +32,6 @@
 #include "conf_core.h"
 #include "conf_hid.h"
 #include "hid_cfg.h"
-#include "hid_init.h"
-#include "hid_attrib.h"
 #include "misc_util.h"
 #include "error.h"
 #include "paths.h"
Index: trunk/src/conf_act.c
===================================================================
--- trunk/src/conf_act.c	(revision 4542)
+++ trunk/src/conf_act.c	(revision 4543)
@@ -25,11 +25,7 @@
 
 #include "config.h"
 #include "board.h"
-#include "data.h"
-#include "conf.h"
 #include "conf_core.h"
-#include "error.h"
-#include "misc.h"
 #include "misc_util.h"
 #include "route_style.h"
 
Index: trunk/src/conf_core.c
===================================================================
--- trunk/src/conf_core.c	(revision 4542)
+++ trunk/src/conf_core.c	(revision 4543)
@@ -1,5 +1,4 @@
 #include "config.h"
-#include "const.h"
 #include "conf.h"
 #include "conf_core.h"
 conf_core_t conf_core;
Index: trunk/src/conf_hid.h
===================================================================
--- trunk/src/conf_hid.h	(revision 4542)
+++ trunk/src/conf_hid.h	(revision 4543)
@@ -1,8 +1,8 @@
 #ifndef PCB_CONF_HID_H
 #define PCB_CONF_HID_H
 
+#include "conf.h"
 #include "error.h"
-#include "conf.h"
 
 typedef struct conf_hid_callbacks_s {
 	/* Called before/after a value of a config item is updated - this doesn't necessarily mean the value actually changes */
Index: trunk/src/copy.c
===================================================================
--- trunk/src/copy.c	(revision 4542)
+++ trunk/src/copy.c	(revision 4543)
@@ -32,17 +32,13 @@
 #include "config.h"
 #include "conf_core.h"
 
-#include <stdlib.h>
-
 #include "board.h"
 #include "create.h"
 #include "data.h"
 #include "draw.h"
 #include "misc.h"
-#include "layer.h"
 #include "move.h"
 #include "polygon.h"
-#include "rtree.h"
 #include "select.h"
 #include "undo.h"
 #include "compat_misc.h"
Index: trunk/src/create.c
===================================================================
--- trunk/src/create.c	(revision 4542)
+++ trunk/src/create.c	(revision 4543)
@@ -28,10 +28,7 @@
 
 #include "config.h"
 
-#include <assert.h>
-#include <memory.h>
 #include <setjmp.h>
-#include <stdlib.h>
 
 #include "conf_core.h"
 
@@ -39,9 +36,7 @@
 #include "math_helper.h"
 #include "create.h"
 #include "data.h"
-#include "error.h"
 #include "misc.h"
-#include "layer.h"
 #include "rtree.h"
 #include "search.h"
 #include "undo.h"
@@ -49,7 +44,6 @@
 #include "stub_vendor.h"
 #include "hid_actions.h"
 #include "paths.h"
-#include "misc_util.h"
 #include "compat_misc.h"
 #include "compat_nls.h"
 
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 4542)
+++ trunk/src/crosshair.c	(revision 4543)
@@ -28,10 +28,6 @@
 /* crosshair stuff */
 
 #include "config.h"
-
-#include <memory.h>
-#include <math.h>
-
 #include "conf_core.h"
 
 #include "board.h"
@@ -39,15 +35,11 @@
 #include "crosshair.h"
 #include "data.h"
 #include "draw.h"
-#include "error.h"
 #include "line.h"
-#include "rtree.h"
 #include "search.h"
 #include "polygon.h"
 #include "misc.h"
-#include "misc_util.h"
 #include "hid_actions.h"
-#include "layer.h"
 #include "compat_misc.h"
 #include "compat_nls.h"
 
Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 4542)
+++ trunk/src/draw.c	(revision 4543)
@@ -35,13 +35,10 @@
 #include "board.h"
 #include "data.h"
 #include "draw.h"
-#include "error.h"
 #include "misc.h"
 #include "rotate.h"
 #include "rtree.h"
 #include "draw_fab.h"
-#include "hid_helper.h"
-#include "layer.h"
 
 #undef NDEBUG
 #include <assert.h>
Index: trunk/src/draw_fab.c
===================================================================
--- trunk/src/draw_fab.c	(revision 4542)
+++ trunk/src/draw_fab.c	(revision 4543)
@@ -28,7 +28,6 @@
 #include "config.h"
 
 #include <time.h>
-#include <setjmp.h>
 
 #include "board.h"
 #include "build_run.h"
@@ -35,10 +34,7 @@
 #include "data.h"
 #include "draw.h"
 #include "drill.h"
-#include "misc.h"
 #include "draw_fab.h"
-#include "polygon.h"
-#include "layer.h"
 
 /* ---------------------------------------------------------------------------
  * prints a FAB drawing.
Index: trunk/src/drill.c
===================================================================
--- trunk/src/drill.c	(revision 4542)
+++ trunk/src/drill.c	(revision 4543)
@@ -27,7 +27,6 @@
  */
 #include "config.h"
 
-#include "const.h"
 #include "data.h"
 #include "mymem.h"
 #include "drill.h"
Index: trunk/src/error.c
===================================================================
--- trunk/src/error.c	(revision 4542)
+++ trunk/src/error.c	(revision 4543)
@@ -29,13 +29,9 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <signal.h>
-#include <string.h>
-#include <fcntl.h>
 
 #include "data.h"
 #include "error.h"
@@ -42,7 +38,6 @@
 #include "plug_io.h"
 #include "compat_misc.h"
 #include "compat_nls.h"
-#include "pcb-printf.h"
 
 #define utf8_dup_string(a,b) *(a) = pcb_strdup(b)
 
Index: trunk/src/file_act.c
===================================================================
--- trunk/src/file_act.c	(revision 4542)
+++ trunk/src/file_act.c	(revision 4543)
@@ -30,13 +30,10 @@
 #include "conf_core.h"
 #include "data.h"
 #include "action_helper.h"
-#include "error.h"
 
-#include "crosshair.h"
 #include "set.h"
 #include "plug_io.h"
 #include "plug_import.h"
-#include "buffer.h"
 #include "misc.h"
 #include "remove.h"
 #include "create.h"
@@ -44,7 +41,6 @@
 #include "find.h"
 #include "search.h"
 #include "hid_actions.h"
-#include "hid_attrib.h"
 #include "compat_misc.h"
 #include "compat_nls.h"
 
Index: trunk/src/flag_str.c
===================================================================
--- trunk/src/flag_str.c	(revision 4542)
+++ trunk/src/flag_str.c	(revision 4543)
@@ -28,7 +28,6 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "const.h"
Index: trunk/src/gui_act.c
===================================================================
--- trunk/src/gui_act.c	(revision 4542)
+++ trunk/src/gui_act.c	(revision 4543)
@@ -36,16 +36,11 @@
 
 #include "draw.h"
 #include "search.h"
-#include "crosshair.h"
 #include "find.h"
 #include "set.h"
-#include "misc.h"
-#include "misc_util.h"
 #include "stub_stroke.h"
 #include "hid_actions.h"
 #include "hid_init.h"
-#include "route_style.h"
-#include "layer.h"
 #include "compat_nls.h"
 
 /* --------------------------------------------------------------------------- */