Index: trunk/src/Makefile.dep
===================================================================
--- trunk/src/Makefile.dep	(revision 4541)
+++ trunk/src/Makefile.dep	(revision 4542)
@@ -568,15 +568,14 @@
  remove.h rtree.h flag_str.h undo.h pcb-printf.h plugins.h hid_actions.h \
  compat_misc.h dolists.h
 ../src_plugins/fp_fs/fp_fs.o: ../src_plugins/fp_fs/fp_fs.c ../config.h \
- mymem.h rubberband.h global_objs.h ../src_3rd/genlist/gendlist.h \
- attrib.h flag.h globalconst.h global_typedefs.h pcb_bool.h unit.h \
- polyarea.h data.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 \
+ mymem.h global_typedefs.h pcb_bool.h unit.h data.h globalconst.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 vtonpoint.h \
+ list_rat.h layer.h crosshair.h rubberband.h vtonpoint.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h hid.h error.h drc.h buffer.h \
  paths.h plugins.h plug_footprint.h vtlibrary.h compat_fs.h compat_misc.h \
@@ -1548,10 +1547,10 @@
  ../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_3rd/genvector/vtp0.h list_conf.h plug_import.h conf_core.h \
- error.h misc.h mymem.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 rats_patch.h \
- compat_misc.h compat_nls.h
+ error.h misc.h mymem.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 \
+ rats_patch.h compat_misc.h compat_nls.h
 ../src_plugins/import_sch/import_sch.o: \
  ../src_plugins/import_sch/import_sch.c ../config.h conf_core.h conf.h \
  global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
@@ -1766,7 +1765,7 @@
  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 vtonpoint.h hid.h error.h drc.h misc.h mymem.h \
- rubberband.h compat_misc.h
+ compat_misc.h
 ../src_plugins/io_pcb/file.o: ../src_plugins/io_pcb/file.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 \
@@ -2462,8 +2461,8 @@
  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 compat_misc.h ../config.h attrib.h
-board.o: board.c board.h ../config.h const.h macro.h global_typedefs.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 \
  ../src_3rd/genvector/genvector_undef.h global_objs.h \
  ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h polyarea.h \
@@ -2474,7 +2473,7 @@
  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
-box.o: box.c box.h math_helper.h global_typedefs.h ../config.h pcb_bool.h \
+box.o: box.c ../config.h box.h math_helper.h global_typedefs.h pcb_bool.h \
  unit.h global_objs.h ../src_3rd/genlist/gendlist.h attrib.h flag.h \
  globalconst.h polyarea.h macro.h misc_util.h
 buffer.o: buffer.c ../config.h conf_core.h conf.h global_typedefs.h \
@@ -2512,7 +2511,7 @@
  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
-buildin.o: buildin.c plugins.h buildin.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 \
  ../src_3rd/genvector/genvector_impl.h \
@@ -2553,11 +2552,10 @@
 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 \
- compat_misc.h compat_nls.h ../src_3rd/genvector/gds_char.h \
+ compat_misc.h compat_nls.h globalconst.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
- ../src_3rd/genvector/genvector_undef.h error.h mymem.h rubberband.h \
- global_objs.h ../src_3rd/genlist/gendlist.h attrib.h flag.h \
- globalconst.h global_typedefs.h pcb_bool.h unit.h polyarea.h
+ ../src_3rd/genvector/genvector_undef.h error.h mymem.h global_typedefs.h \
+ pcb_bool.h unit.h
 compat_lrealpath.o: compat_lrealpath.c ../config.h compat_lrealpath.h \
  compat_misc.h
 compat_misc.o: compat_misc.c ../config.h compat_misc.h compat_inc.h
@@ -2565,7 +2563,7 @@
  ../src_3rd/liblihata/tree.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/liblihata/genht/ht_inlines.h conf.h ../config.h \
+ ../src_3rd/liblihata/genht/ht_inlines.h ../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 \
@@ -2593,7 +2591,7 @@
  ../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 const.h conf.h ../config.h global_typedefs.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/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
@@ -2604,7 +2602,7 @@
  ../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 conf_hid.h error.h conf.h ../config.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 \
  ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
@@ -2743,7 +2741,7 @@
  ../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_misc.h compat_nls.h
-event.o: event.c event.h error.h fptr_cast.h
+event.o: event.c ../config.h event.h error.h fptr_cast.h
 file_act.o: file_act.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 \
@@ -2801,16 +2799,16 @@
  list_conf.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 find.h compat_nls.h
-flag.o: flag.c flag.h globalconst.h ../config.h
+flag.o: flag.c ../config.h flag.h globalconst.h
 flag_str.o: flag_str.c ../config.h const.h flag_str.h global_objs.h \
  ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h \
  global_typedefs.h pcb_bool.h unit.h polyarea.h compat_misc.h macro.h
-fptr_cast.o: fptr_cast.c fptr_cast.h
-free_atexit.o: free_atexit.c
+fptr_cast.o: fptr_cast.c ../config.h fptr_cast.h
+free_atexit.o: free_atexit.c ../config.h
 funchash.o: funchash.c ../src_3rd/liblihata/genht/htpi.h \
  ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \
  ../src_3rd/liblihata/genht/hash.h funchash_core.h funchash.h \
- funchash_core_list.h macro.h
+ funchash_core_list.h ../config.h macro.h
 gui_act.o: gui_act.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 \
@@ -2846,9 +2844,8 @@
  error.h event.h hid_actions.h hid.h drc.h attrib.h compat_misc.h \
  compat_nls.h
 hid_attrib.o: hid_attrib.c ../config.h hid_attrib.h hid.h error.h drc.h \
- unit.h global_typedefs.h pcb_bool.h attrib.h misc.h mymem.h rubberband.h \
- global_objs.h ../src_3rd/genlist/gendlist.h flag.h globalconst.h \
- polyarea.h misc_util.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ unit.h global_typedefs.h pcb_bool.h attrib.h misc.h mymem.h misc_util.h \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h compat_fs.h
 hid_cfg.o: hid_cfg.c ../src_3rd/liblihata/lihata.h \
@@ -2878,8 +2875,8 @@
  ../src_3rd/liblihata/genht/hash.h compat_misc.h \
  ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \
  ../src_3rd/liblihata/genht/ht.c
-hid_draw_helpers.o: hid_draw_helpers.c const.h math_helper.h \
- global_objs.h ../src_3rd/genlist/gendlist.h ../config.h attrib.h flag.h \
+hid_draw_helpers.o: hid_draw_helpers.c const.h ../config.h math_helper.h \
+ global_objs.h ../src_3rd/genlist/gendlist.h attrib.h flag.h \
  globalconst.h global_typedefs.h pcb_bool.h unit.h polyarea.h hid.h \
  error.h drc.h polygon.h rtree.h macro.h
 hid_extents.o: hid_extents.c ../config.h board.h const.h macro.h \
@@ -2928,9 +2925,8 @@
  misc.h mymem.h hid_helper.h hid_attrib.h compat_misc.h
 hid_init.o: hid_init.c ../config.h hid.h error.h drc.h unit.h \
  global_typedefs.h pcb_bool.h attrib.h hid_nogui.h compat_dl.h \
- compat_inc.h misc.h mymem.h rubberband.h global_objs.h \
- ../src_3rd/genlist/gendlist.h flag.h globalconst.h polyarea.h plugins.h \
- hid_attrib.h hid_flags.h misc_util.h conf_core.h conf.h pcb-printf.h \
+ compat_inc.h misc.h mymem.h plugins.h hid_attrib.h hid_flags.h \
+ misc_util.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 \
@@ -2938,7 +2934,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 compat_misc.h fptr_cast.h
+ ../src_3rd/genlist/gendlist.h globalconst.h compat_misc.h fptr_cast.h
 hid_nogui.o: hid_nogui.c ../config.h hid.h error.h drc.h unit.h \
  global_typedefs.h pcb_bool.h attrib.h compat_misc.h compat_nls.h
 ht_element.o: ht_element.c ../config.h global_element.h list_pin.h \
@@ -2988,7 +2984,7 @@
  ../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 hid_actions.h compat_misc.h
-library.o: library.c library.h global_typedefs.h ../config.h pcb_bool.h \
+library.o: library.c ../config.h library.h global_typedefs.h pcb_bool.h \
  unit.h macro.h
 line.o: line.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 \
@@ -3060,27 +3056,26 @@
  unit.h polyarea.h list_text.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  ../src_3rd/genlist/gentdlist_impl.c
-main.o: main.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 \
- ../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 \
+main.o: main.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 \
+ ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h polyarea.h \
+ 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/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 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 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 \
- create.h plug_io.h set.h misc.h mymem.h compat_lrealpath.h free_atexit.h \
- polygon.h rtree.h math_helper.h buildin.h paths.h flag_str.h plugins.h \
- plug_footprint.h vtlibrary.h event.h funchash.h hid_actions.h \
- hid_attrib.h hid_init.h compat_misc.h compat_nls.h dolists.h \
- generated_lists.h
+ create.h plug_io.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 set.h misc.h mymem.h \
+ compat_lrealpath.h free_atexit.h polygon.h rtree.h math_helper.h \
+ buildin.h paths.h flag_str.h plugins.h plug_footprint.h vtlibrary.h \
+ event.h funchash.h conf_core.h hid_actions.h hid_attrib.h hid_init.h \
+ compat_misc.h compat_nls.h dolists.h generated_lists.h
 main_act.o: main_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 \
  hid_attrib.h hid_init.h data.h globalconst.h global_objs.h \
@@ -3199,8 +3194,8 @@
  ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \
  ../src_3rd/genvector/vtp0.h list_conf.h find.h mymem.h rats.h netlist.h \
  route_style.h create.h hid_actions.h compat_misc.h compat_nls.h
-obj_any.o: obj_any.c obj_any.h global_objs.h \
- ../src_3rd/genlist/gendlist.h ../config.h attrib.h flag.h globalconst.h \
+obj_any.o: obj_any.c ../config.h obj_any.h global_objs.h \
+ ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h \
  global_typedefs.h pcb_bool.h unit.h polyarea.h \
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.c
@@ -3309,7 +3304,7 @@
  ../src_3rd/liblihata/genht/hash.h buffer.h draw.h polygon.h rtree.h \
  remove.h search.h rats.h netlist.h route_style.h set.h thermal.h mymem.h \
  undo.h misc.h compat_nls.h
-polygon1.o: polygon1.c rtree.h global_typedefs.h ../config.h pcb_bool.h \
+polygon1.o: polygon1.c ../config.h rtree.h global_typedefs.h pcb_bool.h \
  unit.h math_helper.h heap.h compat_cc.h pcb-printf.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h polyarea.h global_objs.h \
@@ -3440,10 +3435,8 @@
 route_style.o: route_style.c ../config.h const.h pcb-printf.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h unit.h route_style.h \
- vtroutestyle.h misc.h mymem.h rubberband.h global_objs.h \
- ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h \
- global_typedefs.h pcb_bool.h polyarea.h misc_util.h error.h conf.h \
- ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
+ vtroutestyle.h misc.h mymem.h global_typedefs.h pcb_bool.h misc_util.h \
+ error.h conf.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/liblihata/genht/ht_inlines.h ../src_3rd/genvector/vtp0.h \
@@ -3545,8 +3538,8 @@
 stub_mincut.o: stub_mincut.c ../config.h global_objs.h \
  ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h \
  global_typedefs.h pcb_bool.h unit.h polyarea.h stub_mincut.h const.h
-stub_stroke.o: stub_stroke.c error.h pcb_bool.h
-stub_vendor.o: stub_vendor.c stub_vendor.h ../config.h global_typedefs.h \
+stub_stroke.o: stub_stroke.c error.h ../config.h pcb_bool.h
+stub_vendor.o: stub_vendor.c ../config.h stub_vendor.h global_typedefs.h \
  pcb_bool.h unit.h
 thermal.o: thermal.c ../config.h board.h const.h macro.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
@@ -3557,7 +3550,7 @@
  ../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 misc.h \
- mymem.h rubberband.h polygon.h rtree.h math_helper.h thermal.h
+ mymem.h polygon.h rtree.h math_helper.h thermal.h
 undo.o: undo.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 \
Index: trunk/src/attrib.c
===================================================================
--- trunk/src/attrib.c	(revision 4541)
+++ trunk/src/attrib.c	(revision 4542)
@@ -27,6 +27,7 @@
 /* attribute lists */
 #include <stdlib.h>
 #include <string.h>
+#include "config.h"
 #include "compat_misc.h"
 #include "attrib.h"
 
Index: trunk/src/board.c
===================================================================
--- trunk/src/board.c	(revision 4541)
+++ trunk/src/board.c	(revision 4542)
@@ -23,7 +23,7 @@
  *  Thomas.Nau@rz.uni-ulm.de
  *
  */
-
+#include "config.h"
 #include "board.h"
 #include "attrib.h"
 #include "library.h"
Index: trunk/src/box.c
===================================================================
--- trunk/src/box.c	(revision 4541)
+++ trunk/src/box.c	(revision 4542)
@@ -28,6 +28,7 @@
 
 #define STEP_POINT 100
 #include <string.h>
+#include "config.h"
 #include "box.h"
 
 /* ---------------------------------------------------------------------------
Index: trunk/src/compat_dl.c
===================================================================
--- trunk/src/compat_dl.c	(revision 4541)
+++ trunk/src/compat_dl.c	(revision 4542)
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include "compat_dl.h"
-#include "config.h"
 
 #ifdef USE_LOADLIBRARY
 #include <windows.h>
Index: trunk/src/compat_fs.c
===================================================================
--- trunk/src/compat_fs.c	(revision 4541)
+++ trunk/src/compat_fs.c	(revision 4542)
@@ -41,16 +41,14 @@
 #include <signal.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <math.h>
 #include <assert.h>
 #include "compat_fs.h"
 #include "compat_misc.h"
 #include "compat_nls.h"
+#include "globalconst.h"
 
 #include <genvector/gds_char.h>
 
-#include "config.h"
-
 #include "error.h"
 #include "mymem.h"
 
Index: trunk/src/compat_misc.c
===================================================================
--- trunk/src/compat_misc.c	(revision 4541)
+++ trunk/src/compat_misc.c	(revision 4542)
@@ -28,7 +28,6 @@
 #include <math.h>
 #include "compat_misc.h"
 #include "compat_inc.h"
-#include "config.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
Index: trunk/src/conf.c
===================================================================
--- trunk/src/conf.c	(revision 4541)
+++ trunk/src/conf.c	(revision 4542)
@@ -27,6 +27,7 @@
 #include <genht/hash.h>
 #include <liblihata/tree.h>
 #include <stdarg.h>
+#include "config.h"
 #include "conf.h"
 #include "conf_core.h"
 #include "conf_hid.h"
@@ -38,7 +39,6 @@
 #include "paths.h"
 #include "compat_fs.h"
 #include "compat_misc.h"
-#include "error.h"
 
 /* conf list node's name */
 const char *conf_list_name = "pcb-rnd-conf-v1";
Index: trunk/src/conf_act.c
===================================================================
--- trunk/src/conf_act.c	(revision 4541)
+++ trunk/src/conf_act.c	(revision 4542)
@@ -26,7 +26,6 @@
 #include "config.h"
 #include "board.h"
 #include "data.h"
-#include "config.h"
 #include "conf.h"
 #include "conf_core.h"
 #include "error.h"
Index: trunk/src/conf_core.c
===================================================================
--- trunk/src/conf_core.c	(revision 4541)
+++ trunk/src/conf_core.c	(revision 4542)
@@ -1,3 +1,4 @@
+#include "config.h"
 #include "const.h"
 #include "conf.h"
 #include "conf_core.h"
Index: trunk/src/conf_hid.c
===================================================================
--- trunk/src/conf_hid.c	(revision 4541)
+++ trunk/src/conf_hid.c	(revision 4542)
@@ -1,3 +1,4 @@
+#include "config.h"
 #include "conf_hid.h"
 #include <genht/hash.h>
 #include <genht/htpp.h>
Index: trunk/src/error.c
===================================================================
--- trunk/src/error.c	(revision 4541)
+++ trunk/src/error.c	(revision 4542)
@@ -35,11 +35,8 @@
 #include <stdarg.h>
 #include <signal.h>
 #include <string.h>
-#include <stdarg.h>
 #include <fcntl.h>
 
-#include "config.h"
-
 #include "data.h"
 #include "error.h"
 #include "plug_io.h"
Index: trunk/src/event.c
===================================================================
--- trunk/src/event.c	(revision 4541)
+++ trunk/src/event.c	(revision 4542)
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include "config.h"
 #include "event.h"
 #include "error.h"
 #include "fptr_cast.h"
Index: trunk/src/flag.c
===================================================================
--- trunk/src/flag.c	(revision 4541)
+++ trunk/src/flag.c	(revision 4542)
@@ -26,6 +26,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include "config.h"
 #include "flag.h"
 
 /* This just fills in a FlagType with current flags.  */
Index: trunk/src/flag_str.c
===================================================================
--- trunk/src/flag_str.c	(revision 4541)
+++ trunk/src/flag_str.c	(revision 4542)
@@ -32,7 +32,6 @@
 #include <string.h>
 
 #include "const.h"
-#include "config.h"
 #include "flag_str.h"
 #include "compat_misc.h"
 #include "macro.h"
Index: trunk/src/fptr_cast.c
===================================================================
--- trunk/src/fptr_cast.c	(revision 4541)
+++ trunk/src/fptr_cast.c	(revision 4542)
@@ -21,6 +21,7 @@
  */
 
 #include <assert.h>
+#include "config.h"
 #include "fptr_cast.h"
 
 void *pcb_cast_f2d(pcb_fptr_t f)
Index: trunk/src/free_atexit.c
===================================================================
--- trunk/src/free_atexit.c	(revision 4541)
+++ trunk/src/free_atexit.c	(revision 4542)
@@ -24,6 +24,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include "config.h"
 
 /* we need one ID per context - short int with 64k IDs should be enough */
 typedef unsigned int leaky_idx_t;
Index: trunk/src/funchash.c
===================================================================
--- trunk/src/funchash.c	(revision 4541)
+++ trunk/src/funchash.c	(revision 4542)
@@ -27,6 +27,7 @@
 #include <genht/htpi.h>
 #include <genht/hash.h>
 #include "funchash_core.h"
+#include "config.h"
 #include "macro.h"
 
 #define action_entry(x) { #x, F_ ## x},
Index: trunk/src/global_objs.h
===================================================================
--- trunk/src/global_objs.h	(revision 4541)
+++ trunk/src/global_objs.h	(revision 4542)
@@ -87,7 +87,7 @@
 	gdl_elem_t link;             /* a line is in a list: either on a layer or in an element */
 };
 
-typedef struct text_st {
+struct pcb_text_s {
 	ANYOBJECTFIELDS;
 	int Scale;										/* text scaling in percent */
 	Coord X, Y;										/* origin */
@@ -95,7 +95,7 @@
 	char *TextString;							/* string */
 	void *Element;
 	gdl_elem_t link;              /* a text is in a list of a layer or an element */
-} TextType, *TextTypePtr;
+};
 
 struct polygon_st {							/* holds information about a polygon */
 	ANYOBJECTFIELDS;
Index: trunk/src/global_typedefs.h
===================================================================
--- trunk/src/global_typedefs.h	(revision 4541)
+++ trunk/src/global_typedefs.h	(revision 4542)
@@ -45,6 +45,7 @@
 typedef struct rtree rtree_t;
 typedef struct rats_patch_line_s rats_patch_line_t;
 typedef struct element_st ElementType, *ElementTypePtr, **ElementTypeHandle;
+typedef struct pcb_text_s  TextType, *TextTypePtr;
 
 typedef struct plug_io_s plug_io_t;
 
Index: trunk/src/hid_attrib.c
===================================================================
--- trunk/src/hid_attrib.c	(revision 4541)
+++ trunk/src/hid_attrib.c	(revision 4542)
@@ -1,5 +1,4 @@
 #include "config.h"
-#include "config.h"
 #include "hid_attrib.h"
 #include "misc.h"
 #include "misc_util.h"
Index: trunk/src/hid_cfg_action.c
===================================================================
--- trunk/src/hid_cfg_action.c	(revision 4541)
+++ trunk/src/hid_cfg_action.c	(revision 4542)
@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include "config.h"
 #include "hid_cfg_action.h"
 #include "hid_actions.h"
 
Index: trunk/src/hid_color.c
===================================================================
--- trunk/src/hid_color.c	(revision 4541)
+++ trunk/src/hid_color.c	(revision 4542)
@@ -1,6 +1,5 @@
 #include <string.h>
 #include "config.h"
-#include "config.h"
 #include "hid_color.h"
 #include <genht/hash.h>
 #include "compat_misc.h"
Index: trunk/src/hid_draw_helpers.c
===================================================================
--- trunk/src/hid_draw_helpers.c	(revision 4541)
+++ trunk/src/hid_draw_helpers.c	(revision 4542)
@@ -1,4 +1,5 @@
 #include "const.h"
+#include "config.h"
 #include "math_helper.h"
 #include "global_objs.h"
 #include "hid.h"
Index: trunk/src/hid_extents.c
===================================================================
--- trunk/src/hid_extents.c	(revision 4541)
+++ trunk/src/hid_extents.c	(revision 4542)
@@ -5,7 +5,6 @@
 #include <string.h>
 #include <math.h>
 
-#include "config.h"
 #include "board.h"
 #include "data.h"
 #include "layer.h"
Index: trunk/src/hid_init.c
===================================================================
--- trunk/src/hid_init.c	(revision 4541)
+++ trunk/src/hid_init.c	(revision 4542)
@@ -5,7 +5,6 @@
 #include <string.h>
 #include <strings.h>
 
-#include "config.h"
 #include "hid.h"
 #include "hid_nogui.h"
 
@@ -14,7 +13,6 @@
    includes. */
 #include "compat_dl.h"
 
-#include "config.h"
 #include "misc.h"
 #include "plugins.h"
 #include "hid_attrib.h"
Index: trunk/src/hid_nogui.c
===================================================================
--- trunk/src/hid_nogui.c	(revision 4541)
+++ trunk/src/hid_nogui.c	(revision 4542)
@@ -5,7 +5,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "config.h"
 #include "hid.h"
 #include "compat_misc.h"
 #include "compat_nls.h"
Index: trunk/src/library.c
===================================================================
--- trunk/src/library.c	(revision 4541)
+++ trunk/src/library.c	(revision 4542)
@@ -28,6 +28,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include "config.h"
 #include "library.h"
 #include "macro.h"
 
Index: trunk/src/main.c
===================================================================
--- trunk/src/main.c	(revision 4541)
+++ trunk/src/main.c	(revision 4542)
@@ -28,7 +28,6 @@
 /* main program, initializes some stuff and handles user input
  */
 #include "config.h"
-#include "conf_core.h"
 
 #include <stdlib.h>
 #include <string.h>
Index: trunk/src/misc.c
===================================================================
--- trunk/src/misc.c	(revision 4541)
+++ trunk/src/misc.c	(revision 4542)
@@ -36,7 +36,6 @@
 #include <memory.h>
 #include <ctype.h>
 #include <signal.h>
-#include <math.h>
 
 #include "board.h"
 #include "box.h"
Index: trunk/src/mymem.h
===================================================================
--- trunk/src/mymem.h	(revision 4541)
+++ trunk/src/mymem.h	(revision 4542)
@@ -31,10 +31,8 @@
 #define	PCB_MYMEM_H
 
 #include "config.h"
-
 #include <stdlib.h>
-#include "config.h"
-#include "rubberband.h"
+#include "global_typedefs.h"
 
 /* ---------------------------------------------------------------------------
  * number of additional objects that are allocated with one system call
@@ -48,7 +46,6 @@
 #define	STEP_UNDOLIST		500
 #define	STEP_POLYGONPOINT	10
 #define	STEP_POLYGONHOLEINDEX	10
-#define	STEP_RUBBERBAND		100
 
 /* ---------------------------------------------------------------------------
  * some memory types
Index: trunk/src/obj_any.c
===================================================================
--- trunk/src/obj_any.c	(revision 4541)
+++ trunk/src/obj_any.c	(revision 4542)
@@ -23,5 +23,6 @@
 /* object model - type+union that can represent any object */
 
 #define TDL_DONT_UNDEF
+#include "config.h"
 #include "obj_any.h"
 #include <genlist/gentdlist_impl.c>
Index: trunk/src/pcb-printf.c
===================================================================
--- trunk/src/pcb-printf.c	(revision 4541)
+++ trunk/src/pcb-printf.c	(revision 4542)
@@ -36,7 +36,6 @@
 #include <ctype.h>
 #include "const.h"
 #include "config.h"
-#include "config.h"
 
 #include "pcb-printf.h"
 
Index: trunk/src/plug_footprint.c
===================================================================
--- trunk/src/plug_footprint.c	(revision 4541)
+++ trunk/src/plug_footprint.c	(revision 4542)
@@ -32,7 +32,6 @@
 #include <genht/htsp.h>
 #include <genht/hash.h>
 #include "conf_core.h"
-#include "plugins.h"
 #include "error.h"
 #include "compat_misc.h"
 
Index: trunk/src/plug_footprint_act.c
===================================================================
--- trunk/src/plug_footprint_act.c	(revision 4541)
+++ trunk/src/plug_footprint_act.c	(revision 4542)
@@ -24,7 +24,6 @@
  */
 
 #include "config.h"
-#include "config.h"
 #include "hid.h"
 #include "plug_footprint.h"
 
Index: trunk/src/plug_import.c
===================================================================
--- trunk/src/plug_import.c	(revision 4541)
+++ trunk/src/plug_import.c	(revision 4542)
@@ -31,11 +31,7 @@
 #include "conf_core.h"
 
 #include <locale.h>
-
-#include "config.h"
-
 #include <time.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
Index: trunk/src/plug_io.c
===================================================================
--- trunk/src/plug_io.c	(revision 4541)
+++ trunk/src/plug_io.c	(revision 4542)
@@ -42,11 +42,8 @@
 #include "conf_core.h"
 
 #include <locale.h>
-#include "config.h"
-
 #include <dirent.h>
 #include <time.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
Index: trunk/src/plugins.c
===================================================================
--- trunk/src/plugins.c	(revision 4541)
+++ trunk/src/plugins.c	(revision 4542)
@@ -29,7 +29,6 @@
 
 /* for the action */
 #include "config.h"
-#include "config.h"
 #include "genvector/gds_char.h"
 #include "compat_misc.h"
 #include "hid.h"
Index: trunk/src/polygon1.c
===================================================================
--- trunk/src/polygon1.c	(revision 4541)
+++ trunk/src/polygon1.c	(revision 4542)
@@ -45,6 +45,7 @@
 #include	<setjmp.h>
 #include	<string.h>
 
+#include "config.h"
 #include "rtree.h"
 #include "math_helper.h"
 #include "heap.h"
Index: trunk/src/ptrlist.c
===================================================================
--- trunk/src/ptrlist.c	(revision 4541)
+++ trunk/src/ptrlist.c	(revision 4542)
@@ -27,6 +27,7 @@
 #warning TODO: remove this in favor of vtptr
 
 #include "global_typedefs.h"
+#include "config.h"
 #include "ptrlist.h"
 #include <stdlib.h>
 #include <string.h>
Index: trunk/src/route_style.c
===================================================================
--- trunk/src/route_style.c	(revision 4541)
+++ trunk/src/route_style.c	(revision 4542)
@@ -27,7 +27,6 @@
 #include <ctype.h>
 #include "config.h"
 #include "const.h"
-#include "config.h"
 #include "pcb-printf.h"
 #include "genvector/gds_char.h"
 #include "route_style.h"
Index: trunk/src/rubberband.c
===================================================================
--- trunk/src/rubberband.c	(revision 4541)
+++ trunk/src/rubberband.c	(revision 4542)
@@ -23,10 +23,10 @@
  *  Thomas.Nau@rz.uni-ulm.de
  *
  */
+/* functions used by 'rubberband moves' */
 
+#define	STEP_RUBBERBAND		100
 
-/* functions used by 'rubberband moves' */
-
 #include "config.h"
 
 #include <stdlib.h>
Index: trunk/src/stub_stroke.c
===================================================================
--- trunk/src/stub_stroke.c	(revision 4541)
+++ trunk/src/stub_stroke.c	(revision 4542)
@@ -20,6 +20,7 @@
  *
  */
 #include "error.h"
+#include "config.h"
 #include "pcb_bool.h"
 
 pcb_bool mid_stroke = pcb_false;
Index: trunk/src/stub_vendor.c
===================================================================
--- trunk/src/stub_vendor.c	(revision 4541)
+++ trunk/src/stub_vendor.c	(revision 4542)
@@ -20,6 +20,7 @@
  *
  */
 
+#include "config.h"
 #include "stub_vendor.h"
 
 static int stub_vendorDrillMap_dummy(int dia)
Index: trunk/src/unit.c
===================================================================
--- trunk/src/unit.c	(revision 4541)
+++ trunk/src/unit.c	(revision 4542)
@@ -30,7 +30,6 @@
 #include <string.h>
 #include <ctype.h>
 #include <locale.h>
-#include "config.h"
 #include "compat_misc.h"
 #include "compat_nls.h"
 #include "unit.h"