Index: trunk/src/obj_all.h
===================================================================
--- trunk/src/obj_all.h	(revision 15843)
+++ trunk/src/obj_all.h	(nonexistent)
@@ -1,5 +0,0 @@
-#include "obj_arc.h"
-#include "obj_line.h"
-#include "obj_poly.h"
-#include "obj_text.h"
-#include "obj_rat.h"
Index: trunk/src/Makefile.dep
===================================================================
--- trunk/src/Makefile.dep	(revision 15843)
+++ trunk/src/Makefile.dep	(revision 15844)
@@ -23,7 +23,7 @@
  ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h conf.h pcb-printf.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h list_conf.h \
- conf.h conf_core.h compat_misc.h error.h obj_all.h dolists.h
+ conf.h conf_core.h compat_misc.h error.h dolists.h
 ../src_plugins/autocrop/autocrop.o: ../src_plugins/autocrop/autocrop.c \
  ../config.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 \
@@ -45,7 +45,7 @@
  undo_old.h move.h draw.h polygon.h plugins.h ../src_3rd/puplug/puplug.h \
  ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
  ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
- ../src_3rd/puplug/error.h obj_all.h box.h hid_actions.h dolists.h
+ ../src_3rd/puplug/error.h box.h hid_actions.h dolists.h
 ../src_plugins/autoplace/action.o: ../src_plugins/autoplace/action.c \
  ../config.h ../src_plugins/autoplace/autoplace.h global_typedefs.h \
  pcb_bool.h unit.h plugins.h ../src_3rd/puplug/puplug.h \
@@ -126,9 +126,8 @@
  ../src_plugins/autoroute/mtspace.h ../src_plugins/autoroute/vector.h \
  polygon.h rats.h netlist.h route_style.h remove.h obj_pinvia_therm.h \
  undo.h ../src_3rd/libuundo/uundo.h undo_old.h pcb-printf.h layer.h \
- compat_nls.h obj_all.h obj_line_draw.h obj_pstk_draw.h \
- obj_pstk_inlines.h data.h thermal.h \
- ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h
+ compat_nls.h obj_line_draw.h obj_pstk_draw.h obj_pstk_inlines.h data.h \
+ thermal.h ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h
 ../src_plugins/autoroute/mtspace.o: ../src_plugins/autoroute/mtspace.c \
  ../config.h box.h math_helper.h global_typedefs.h pcb_bool.h unit.h \
  macro.h move.h obj_common.h flag.h globalconst.h attrib.h data_parent.h \
@@ -159,9 +158,8 @@
  vtpadstack_t.h hid.h rtree.h undo.h ../src_3rd/libuundo/uundo.h \
  undo_old.h plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
  ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
- ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h obj_all.h \
- hid_actions.h compat_misc.h ../src_plugins/boardflip/boardflip.h unit.h \
- dolists.h
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h hid_actions.h \
+ compat_misc.h ../src_plugins/boardflip/boardflip.h unit.h dolists.h
 ../src_plugins/diag/diag.o: ../src_plugins/diag/diag.c ../config.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 \
@@ -365,7 +363,7 @@
  ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
  ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
  vtpadstack_t.h draw.h ../src_plugins/draw_fab/../report/drill.h \
- obj_all.h plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
  ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
  ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h stub_draw.h \
  ../src_plugins/draw_fab/draw_fab_conf.h conf.h pcb-printf.h \
@@ -391,7 +389,7 @@
  rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
  ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
  ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
- vtpadstack_t.h draw.h font.h const.h hid_actions.h obj_all.h plugins.h \
+ vtpadstack_t.h draw.h font.h const.h hid_actions.h plugins.h \
  ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
  ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
  ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h stub_draw.h \
@@ -421,7 +419,7 @@
  ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
  ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
  ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h compat_misc.h \
- compat_fs.h misc_util.h obj_all.h rtree.h hid.h hid_attrib.h hid_nogui.h \
+ compat_fs.h misc_util.h rtree.h hid.h hid_attrib.h hid_nogui.h \
  hid_draw_helpers.h hid_init.h hid_helper.h
 ../src_plugins/export_bom/bom.o: ../src_plugins/export_bom/bom.c \
  ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \
@@ -1594,9 +1592,8 @@
  obj_pstk_shape.h polygon.h vtpadstack_t.h find.h rats.h netlist.h \
  library.h route_style.h vtroutestyle.h select.h operation.h undo.h \
  ../src_3rd/libuundo/uundo.h undo_old.h remove.h crosshair.h draw.h \
- obj_all.h event.h hid.h hid_actions.h \
- ../src_plugins/hid_lesstif/lesstif.h hid_cfg_input.h \
- ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ event.h hid.h hid_actions.h ../src_plugins/hid_lesstif/lesstif.h \
+ hid_cfg_input.h ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htpp.h hid_cfg.h \
  compat_nls.h board.h rats_patch.h board.h \
  ../src_plugins/hid_lesstif/stdarg.h
@@ -2010,10 +2007,10 @@
  ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
  vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h \
  ../src_plugins/io_autotrax/read.h layer.h const.h netlist.h \
- route_style.h polygon.h misc_util.h conf_core.h move.h macro.h obj_all.h \
- safe_fs.h rotate.h compat_misc.h ../src_plugins/boardflip/boardflip.h \
- unit.h hid_actions.h ../src_plugins/lib_compat_help/pstk_compat.h \
- obj_pstk.h ../src_plugins/lib_compat_help/pstk_help.h \
+ route_style.h polygon.h misc_util.h conf_core.h move.h macro.h safe_fs.h \
+ rotate.h compat_misc.h ../src_plugins/boardflip/boardflip.h unit.h \
+ hid_actions.h ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h \
+ ../src_plugins/lib_compat_help/pstk_help.h \
  ../src_plugins/lib_compat_help/subc_help.h obj_subc.h
 ../src_plugins/io_autotrax/write.o: ../src_plugins/io_autotrax/write.c \
  ../config.h compat_misc.h board.h const.h macro.h global_typedefs.h \
@@ -2036,9 +2033,9 @@
  rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
  ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
  vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h \
- ../src_plugins/io_autotrax/write.h layer.h const.h obj_all.h \
- polygon_offs.h ../src_plugins/io_autotrax/../lib_polyhelp/polyhelp.h \
- obj_poly.h ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h
+ ../src_plugins/io_autotrax/write.h layer.h const.h polygon_offs.h \
+ ../src_plugins/io_autotrax/../lib_polyhelp/polyhelp.h obj_poly.h \
+ ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h
 ../src_plugins/io_eagle/eagle_bin.o: ../src_plugins/io_eagle/eagle_bin.c \
  ../config.h ../src_plugins/io_eagle/eagle_bin.h \
  ../src_plugins/io_eagle/egb_tree.h ../src_3rd/genht/htss.h \
@@ -2195,10 +2192,10 @@
  ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
  board.h ../src_plugins/io_hyp/hyp_l.h ../src_plugins/io_hyp/hyp_y.h \
- error.h pcb-printf.h obj_all.h obj_rat.h flag_str.h polygon.h rtree.h \
+ error.h pcb-printf.h flag_str.h polygon.h rtree.h \
  ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h layer.h data.h \
  crosshair.h vtonpoint.h hid.h error.h drc.h route.h buffer.h \
- obj_rat_list.h obj_subc_list.h obj_subc.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
  ../src_3rd/libminuid/libminuid.h ../src_3rd/genht/htsp.h ht_subc.h \
  ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
  ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
@@ -2281,7 +2278,7 @@
  vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h \
  ../src_plugins/io_kicad/read.h layer.h const.h netlist.h route_style.h \
  polygon.h plug_footprint.h vtlibrary.h misc_util.h conf_core.h move.h \
- macro.h obj_all.h rotate.h compat_misc.h safe_fs.h attrib.h \
+ macro.h rotate.h compat_misc.h safe_fs.h attrib.h \
  ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h \
  ../src_plugins/lib_compat_help/pstk_help.h \
  ../src_plugins/lib_compat_help/subc_help.h obj_subc.h
@@ -2338,7 +2335,7 @@
  ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
  vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h \
  ../src_plugins/io_kicad/write.h layer.h const.h netlist.h route_style.h \
- obj_all.h obj_pstk_inlines.h data.h thermal.h \
+ obj_pstk_inlines.h data.h thermal.h \
  ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h
 ../src_plugins/io_kicad_legacy/io_kicad_legacy.o: \
  ../src_plugins/io_kicad_legacy/io_kicad_legacy.c ../config.h plugins.h \
@@ -2385,7 +2382,7 @@
  ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
  vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h \
  ../src_plugins/io_kicad_legacy/write.h layer.h const.h netlist.h \
- route_style.h obj_all.h obj_pstk_inlines.h data.h thermal.h \
+ route_style.h obj_pstk_inlines.h data.h thermal.h \
  ../src_plugins/io_kicad_legacy/../io_kicad/uniq_name.h \
  ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h
 ../src_plugins/io_lihata/common.o: ../src_plugins/io_lihata/common.c \
@@ -2448,7 +2445,7 @@
  ../src_3rd/puplug/error.h plug_io.h conf.h pcb-printf.h \
  ../src_3rd/liblihata/lihata.h list_conf.h flag_str.h compat_misc.h \
  macro.h error.h misc_util.h layer.h ../src_plugins/io_lihata/common.h \
- polygon.h conf_core.h obj_all.h obj_subc.h pcb_minuid.h thermal.h \
+ polygon.h conf_core.h obj_subc.h pcb_minuid.h thermal.h \
  ../src_plugins/io_lihata/io_lihata.h conf.h \
  ../src_plugins/io_lihata/lht_conf.h safe_fs.h plug_footprint.h \
  vtlibrary.h vtpadstack.h obj_pstk_inlines.h data.h thermal.h \
@@ -2638,9 +2635,8 @@
  vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h error.h \
  ../src_plugins/io_pcb/file.h plug_io.h ../src_plugins/io_pcb/parse_l.h \
  polygon.h remove.h rtree.h flag_str.h obj_pinvia_therm.h rats_patch.h \
- route_style.h compat_misc.h obj_all.h \
- ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h \
- ../src_plugins/io_pcb/parse_y.h
+ route_style.h compat_misc.h ../src_plugins/lib_compat_help/pstk_compat.h \
+ obj_pstk.h ../src_plugins/io_pcb/parse_y.h
 ../src_plugins/io_tedax/footprint.o: ../src_plugins/io_tedax/footprint.c \
  ../config.h ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \
  ../src_3rd/genht/htip.h ../src_3rd/genht/hash.h \
@@ -3092,7 +3088,7 @@
  ../src_plugins/lib_gtk_common/dlg_drc.h \
  ../src_plugins/lib_gtk_common/glue.h hid.h conf.h \
  ../src_plugins/lib_gtk_common/compat.h hid_actions.h compat_nls.h \
- obj_all.h obj_pstk_draw.h obj_rat_draw.h obj_line_draw.h obj_arc_draw.h \
+ obj_pstk_draw.h obj_rat_draw.h obj_line_draw.h obj_arc_draw.h \
  obj_poly_draw.h layer_vis.h ../src_plugins/lib_gtk_common/wt_preview.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
  ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h \
@@ -3264,7 +3260,7 @@
  vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h error.h \
  macro.h const.h find.h rats.h netlist.h route_style.h remove.h search.h \
  rats.h select.h operation.h undo.h ../src_3rd/libuundo/uundo.h \
- undo_old.h hid_actions.h compat_nls.h obj_all.h \
+ undo_old.h hid_actions.h compat_nls.h \
  ../src_plugins/lib_gtk_common/util_str.h \
  ../src_plugins/lib_gtk_common/win_place.h \
  ../src_plugins/lib_gtk_common/bu_text_view.h \
@@ -3338,13 +3334,12 @@
  ../src_3rd/genht/htsp.h ../src_3rd/genvector/vtp0.h list_conf.h conf.h \
  ../src_plugins/lib_gtk_common/compat.h compat_misc.h compat_nls.h \
  polygon.h rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h \
- obj_all.h obj_rat.h board.h const.h vtroutestyle.h library.h \
- rats_patch.h board.h data.h crosshair.h vtonpoint.h hid.h route.h \
- buffer.h obj_rat_list.h obj_subc_list.h obj_subc.h \
- ../src_3rd/libminuid/libminuid.h ht_subc.h ../src_3rd/genht/ht.h \
- ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h vtpadstack.h \
- obj_pstk_shape.h polygon.h vtpadstack_t.h conf_core.h buffer.h draw.h \
- ../src_plugins/lib_gtk_common/bu_box.h \
+ board.h const.h vtroutestyle.h library.h rats_patch.h board.h data.h \
+ crosshair.h vtonpoint.h hid.h route.h buffer.h obj_rat_list.h obj_rat.h \
+ obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h conf_core.h \
+ buffer.h draw.h ../src_plugins/lib_gtk_common/bu_box.h \
  ../src_plugins/lib_gtk_common/wt_preview.h layer.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
  ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h \
@@ -3358,22 +3353,21 @@
  ../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 ../src_3rd/genrtree/genrtree_api.h \
- rtree2_compat.h math_helper.h polyarea.h obj_all.h obj_arc.h \
- ../src_3rd/genlist/gendlist.h obj_common.h attrib.h data_parent.h \
- obj_line.h obj_poly.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h obj_poly_list.h \
+ rtree2_compat.h math_helper.h polyarea.h \
+ ../src_plugins/lib_gtk_common/bu_box.h \
+ ../src_plugins/lib_gtk_common/compat.h board.h const.h macro.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h obj_arc_list.h \
+ obj_common.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
- ../src_3rd/genlist/gentdlist_undef.h obj_arc_list.h box.h macro.h move.h \
- misc_util.h ../src_3rd/genvector/gds_char.h \
- ../src_3rd/genvector/genvector_impl.h \
- ../src_3rd/genvector/genvector_undef.h obj_rat.h \
- ../src_plugins/lib_gtk_common/bu_box.h \
- ../src_plugins/lib_gtk_common/compat.h board.h const.h vtroutestyle.h \
- layer.h obj_line_list.h obj_text_list.h layer_grp.h library.h \
- rats_patch.h board.h conf_core.h conf.h pcb-printf.h \
- ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
- ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
- ../src_3rd/genht/htsp.h ../src_3rd/genvector/vtp0.h list_conf.h error.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h conf_core.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h error.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/glue.h hid.h error.h drc.h conf.h \
@@ -3690,7 +3684,7 @@
  ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
  ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
  vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h move.h \
- rotate.h compat_misc.h obj_all.h macro.h
+ rotate.h compat_misc.h macro.h
 ../src_plugins/lib_gtk_common/wt_route_style.o: \
  ../src_plugins/lib_gtk_common/wt_route_style.c ../config.h conf_core.h \
  conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
@@ -4527,8 +4521,8 @@
  ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
  ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
  ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h hid_actions.h \
- misc_util.h obj_all.h compat_misc.h obj_pstk_inlines.h data.h thermal.h \
- search.h rats.h netlist.h route_style.h find.h dolists.h
+ misc_util.h compat_misc.h obj_pstk_inlines.h data.h thermal.h search.h \
+ rats.h netlist.h route_style.h find.h dolists.h
 ../src_plugins/query/basic_fnc.o: ../src_plugins/query/basic_fnc.c \
  ../config.h data.h globalconst.h global_typedefs.h pcb_bool.h unit.h \
  layer.h attrib.h obj_arc_list.h obj_common.h flag.h data_parent.h \
@@ -4763,7 +4757,7 @@
  ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
  ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h action_helper.h \
  hid_actions.h misc_util.h ../src_plugins/report/report_conf.h conf.h \
- compat_misc.h compat_nls.h layer.h obj_all.h obj_term.h obj_pstk.h \
+ compat_misc.h compat_nls.h layer.h obj_term.h obj_pstk.h \
  obj_pstk_inlines.h thermal.h obj_subc_parent.h \
  ../src_3rd/genregex/regex_sei.h ../src_3rd/genregex/regex_templ.h \
  ../src_3rd/genregex/regex.h dolists.h \
@@ -4933,7 +4927,7 @@
  undo_old.h plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
  ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
  ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h hid_actions.h \
- obj_all.h obj_pstk_inlines.h data.h thermal.h dolists.h
+ obj_pstk_inlines.h data.h thermal.h dolists.h
 ../src_plugins/vendordrill/vendor.o: ../src_plugins/vendordrill/vendor.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 \
@@ -5375,7 +5369,7 @@
  ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
  ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
  ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
- vtpadstack_t.h data_list.h data_it.h list_common.h obj_all.h layer_it.h \
+ vtpadstack_t.h data_list.h data_it.h list_common.h layer_it.h \
  operation.h
 draw.o: draw.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 \
@@ -5397,9 +5391,9 @@
  ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
  ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
  vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h rotate.h \
- compat_misc.h stub_draw.h obj_all.h layer_ui.h obj_pstk_draw.h \
- obj_line_draw.h obj_arc_draw.h obj_rat_draw.h obj_poly_draw.h \
- obj_text_draw.h obj_subc_parent.h draw_composite.c draw_ly_spec.c
+ compat_misc.h stub_draw.h layer_ui.h obj_pstk_draw.h obj_line_draw.h \
+ obj_arc_draw.h obj_rat_draw.h obj_poly_draw.h obj_text_draw.h \
+ obj_subc_parent.h draw_composite.c draw_ly_spec.c
 error.o: error.c ../config.h data.h globalconst.h global_typedefs.h \
  pcb_bool.h unit.h layer.h attrib.h obj_arc_list.h obj_common.h flag.h \
  data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
@@ -5464,12 +5458,12 @@
  vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h find.h \
  search.h rats.h netlist.h library.h route_style.h vtroutestyle.h undo.h \
  ../src_3rd/libuundo/uundo.h undo_old.h plug_io.h hid_actions.h \
- compat_misc.h event.h layer_vis.h obj_all.h obj_text_draw.h \
- obj_subc_parent.h find_geo.c obj_arc_ui.h obj_pstk_inlines.h board.h \
- rats_patch.h thermal.h find_lookup.c compat_nls.h find_intconn.c \
- find_drc.c data_it.h obj_arc_draw.h obj_rat_draw.h obj_line_draw.h \
- obj_poly_draw.h obj_pstk_draw.h find_misc.c change.h find_clear.c \
- find_debug.c find_print.c find_any_isect.c
+ compat_misc.h event.h layer_vis.h obj_text_draw.h obj_subc_parent.h \
+ find_geo.c obj_arc_ui.h obj_pstk_inlines.h board.h rats_patch.h \
+ thermal.h find_lookup.c compat_nls.h find_intconn.c find_drc.c data_it.h \
+ obj_arc_draw.h obj_rat_draw.h obj_line_draw.h obj_poly_draw.h \
+ obj_pstk_draw.h find_misc.c change.h find_clear.c find_debug.c \
+ find_print.c find_any_isect.c
 find_act.o: find_act.c ../config.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 \
@@ -6468,8 +6462,8 @@
  ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
  vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h remove.h \
  search.h rats.h netlist.h route_style.h thermal.h undo.h \
- ../src_3rd/libuundo/uundo.h undo_old.h compat_nls.h obj_all.h \
- obj_poly_draw.h polygon_selfi.h polygon_offs.c
+ ../src_3rd/libuundo/uundo.h undo_old.h compat_nls.h obj_poly_draw.h \
+ polygon_selfi.h polygon_offs.c
 polygon1.o: polygon1.c ../config.h rtree.h global_typedefs.h pcb_bool.h \
  unit.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h math_helper.h \
  heap.h compat_cc.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
Index: trunk/src/data.c
===================================================================
--- trunk/src/data.c	(revision 15843)
+++ trunk/src/data.c	(revision 15844)
@@ -36,10 +36,15 @@
 #include "data_it.h"
 #include "rtree.h"
 #include "list_common.h"
-#include "obj_all.h"
 #include "layer_it.h"
 #include "operation.h"
 #include "flag.h"
+#include "obj_arc.h"
+#include "obj_line.h"
+#include "obj_poly.h"
+#include "obj_text.h"
+#include "obj_pstk.h"
+#include "obj_subc.h"
 
 /* ---------------------------------------------------------------------------
  * some shared identifiers
Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 15843)
+++ trunk/src/draw.c	(revision 15844)
@@ -40,7 +40,6 @@
 #include "rotate.h"
 #include "rtree.h"
 #include "stub_draw.h"
-#include "obj_all.h"
 #include "layer_ui.h"
 
 #include "obj_pstk_draw.h"
Index: trunk/src/find.c
===================================================================
--- trunk/src/find.c	(revision 15843)
+++ trunk/src/find.c	(revision 15844)
@@ -79,9 +79,9 @@
 #include "event.h"
 #include "layer_vis.h"
 
-#include "obj_all.h"
+#include "obj_text_draw.h"
 #include "obj_pstk.h"
-#include "obj_text_draw.h"
+#include "obj_subc.h"
 #include "obj_subc_parent.h"
 
 #undef DEBUG
Index: trunk/src/polygon.c
===================================================================
--- trunk/src/polygon.c	(revision 15843)
+++ trunk/src/polygon.c	(revision 15844)
@@ -49,7 +49,6 @@
 #include "undo.h"
 #include "layer.h"
 #include "compat_nls.h"
-#include "obj_all.h"
 #include "obj_poly_draw.h"
 #include "polygon_selfi.h"
 
Index: trunk/src_plugins/acompnet/acompnet.c
===================================================================
--- trunk/src_plugins/acompnet/acompnet.c	(revision 15843)
+++ trunk/src_plugins/acompnet/acompnet.c	(revision 15844)
@@ -41,9 +41,6 @@
 #include "compat_misc.h"
 #include "error.h"
 
-#include "obj_all.h"
-
-
 static pcb_layer_t *ly;
 
 pcb_flag_t flg_mesh_pt;
Index: trunk/src_plugins/autocrop/autocrop.c
===================================================================
--- trunk/src_plugins/autocrop/autocrop.c	(revision 15843)
+++ trunk/src_plugins/autocrop/autocrop.c	(revision 15844)
@@ -55,7 +55,6 @@
 #include "draw.h"
 #include "polygon.h"
 #include "plugins.h"
-#include "obj_all.h"
 #include "box.h"
 #include "hid_actions.h"
 
Index: trunk/src_plugins/autoroute/autoroute.c
===================================================================
--- trunk/src_plugins/autoroute/autoroute.c	(revision 15843)
+++ trunk/src_plugins/autoroute/autoroute.c	(revision 15844)
@@ -87,7 +87,6 @@
 #include "compat_nls.h"
 #include <genvector/vtp0.h>
 #include "layer.h"
-#include "obj_all.h"
 
 #include "obj_line_draw.h"
 #include "obj_pstk_draw.h"
Index: trunk/src_plugins/boardflip/boardflip.c
===================================================================
--- trunk/src_plugins/boardflip/boardflip.c	(revision 15843)
+++ trunk/src_plugins/boardflip/boardflip.c	(revision 15844)
@@ -34,7 +34,6 @@
 #include "rtree.h"
 #include "undo.h"
 #include "plugins.h"
-#include "obj_all.h"
 #include "hid_actions.h"
 #include "compat_misc.h"
 #include "boardflip.h"
Index: trunk/src_plugins/draw_fab/draw_fab.c
===================================================================
--- trunk/src_plugins/draw_fab/draw_fab.c	(revision 15843)
+++ trunk/src_plugins/draw_fab/draw_fab.c	(revision 15844)
@@ -37,7 +37,6 @@
 #include "data.h"
 #include "draw.h"
 #include "../report/drill.h"
-#include "obj_all.h"
 #include "plugins.h"
 #include "stub_draw.h"
 #include "draw_fab_conf.h"
Index: trunk/src_plugins/draw_fontsel/draw_fontsel.c
===================================================================
--- trunk/src_plugins/draw_fontsel/draw_fontsel.c	(revision 15843)
+++ trunk/src_plugins/draw_fontsel/draw_fontsel.c	(revision 15844)
@@ -37,7 +37,6 @@
 #include "font.h"
 #include "const.h"
 #include "hid_actions.h"
-#include "obj_all.h"
 #include "plugins.h"
 #include "stub_draw.h"
 #include "pcb-printf.h"
Index: trunk/src_plugins/export_bboard/bboard.c
===================================================================
--- trunk/src_plugins/export_bboard/bboard.c	(revision 15843)
+++ trunk/src_plugins/export_bboard/bboard.c	(revision 15844)
@@ -53,7 +53,6 @@
 #include "compat_misc.h"
 #include "compat_fs.h"
 #include "misc_util.h"
-#include "obj_all.h"
 #include "rtree.h"
 
 #include "hid.h"
Index: trunk/src_plugins/hid_lesstif/netlist.c
===================================================================
--- trunk/src_plugins/hid_lesstif/netlist.c	(revision 15843)
+++ trunk/src_plugins/hid_lesstif/netlist.c	(revision 15844)
@@ -17,7 +17,6 @@
 #include "remove.h"
 #include "crosshair.h"
 #include "draw.h"
-#include "obj_all.h"
 #include "event.h"
 
 #include "hid.h"
Index: trunk/src_plugins/io_autotrax/read.c
===================================================================
--- trunk/src_plugins/io_autotrax/read.c	(revision 15843)
+++ trunk/src_plugins/io_autotrax/read.c	(revision 15844)
@@ -47,7 +47,6 @@
 #include "conf_core.h"
 #include "move.h"
 #include "macro.h"
-#include "obj_all.h"
 #include "safe_fs.h"
 #include "rotate.h"
 #include "../src_plugins/boardflip/boardflip.h"
Index: trunk/src_plugins/io_autotrax/write.c
===================================================================
--- trunk/src_plugins/io_autotrax/write.c	(revision 15843)
+++ trunk/src_plugins/io_autotrax/write.c	(revision 15844)
@@ -35,7 +35,6 @@
 #include "write.h"
 #include "layer.h"
 #include "const.h"
-#include "obj_all.h"
 #include "polygon_offs.h"
 #include "../lib_polyhelp/polyhelp.h"
 
Index: trunk/src_plugins/io_hyp/parser.c
===================================================================
--- trunk/src_plugins/io_hyp/parser.c	(revision 15843)
+++ trunk/src_plugins/io_hyp/parser.c	(revision 15844)
@@ -26,7 +26,6 @@
 #include "hyp_y.h"
 #include "error.h"
 #include "pcb-printf.h"
-#include "obj_all.h"
 #include "flag_str.h"
 #include "polygon.h"
 #include "board.h"
Index: trunk/src_plugins/io_kicad/read.c
===================================================================
--- trunk/src_plugins/io_kicad/read.c	(revision 15843)
+++ trunk/src_plugins/io_kicad/read.c	(revision 15844)
@@ -46,7 +46,6 @@
 #include "conf_core.h"
 #include "move.h"
 #include "macro.h"
-#include "obj_all.h"
 #include "rotate.h"
 #include "safe_fs.h"
 #include "attrib.h"
Index: trunk/src_plugins/io_kicad/write.c
===================================================================
--- trunk/src_plugins/io_kicad/write.c	(revision 15843)
+++ trunk/src_plugins/io_kicad/write.c	(revision 15844)
@@ -37,7 +37,6 @@
 #include "layer.h"
 #include "const.h"
 #include "netlist.h"
-#include "obj_all.h"
 #include "obj_pstk_inlines.h"
 
 #include "../src_plugins/lib_compat_help/pstk_compat.h"
Index: trunk/src_plugins/io_kicad_legacy/write.c
===================================================================
--- trunk/src_plugins/io_kicad_legacy/write.c	(revision 15843)
+++ trunk/src_plugins/io_kicad_legacy/write.c	(revision 15844)
@@ -36,7 +36,6 @@
 #include "layer.h"
 #include "const.h"
 #include "netlist.h"
-#include "obj_all.h"
 #include "obj_pstk_inlines.h"
 
 #include "../io_kicad/uniq_name.h"
Index: trunk/src_plugins/io_lihata/read.c
===================================================================
--- trunk/src_plugins/io_lihata/read.c	(revision 15843)
+++ trunk/src_plugins/io_lihata/read.c	(revision 15844)
@@ -48,7 +48,6 @@
 #include "common.h"
 #include "polygon.h"
 #include "conf_core.h"
-#include "obj_all.h"
 #include "obj_subc.h"
 #include "pcb_minuid.h"
 #include "thermal.h"
Index: trunk/src_plugins/io_pcb/parse_y.c
===================================================================
--- trunk/src_plugins/io_pcb/parse_y.c	(revision 15843)
+++ trunk/src_plugins/io_pcb/parse_y.c	(revision 15844)
@@ -121,7 +121,6 @@
 #include "rats_patch.h"
 #include "route_style.h"
 #include "compat_misc.h"
-#include "obj_all.h"
 #include "src_plugins/lib_compat_help/pstk_compat.h"
 
 static	pcb_layer_t *Layer;
@@ -174,7 +173,7 @@
 #include "parse_y.h"
 
 
-#line 178 "parse_y.c" /* yacc.c:339  */
+#line 177 "parse_y.c" /* yacc.c:339  */
 
 # ifndef YY_NULLPTR
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -265,7 +264,7 @@
 typedef union YYSTYPE YYSTYPE;
 union YYSTYPE
 {
-#line 120 "parse_y.y" /* yacc.c:355  */
+#line 119 "parse_y.y" /* yacc.c:355  */
 
 	int		integer;
 	double		number;
@@ -273,7 +272,7 @@
 	pcb_flag_t	flagtype;
 	PLMeasure	measure;
 
-#line 277 "parse_y.c" /* yacc.c:355  */
+#line 276 "parse_y.c" /* yacc.c:355  */
 };
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
@@ -288,7 +287,7 @@
 
 /* Copy the second part of user declarations.  */
 
-#line 292 "parse_y.c" /* yacc.c:358  */
+#line 291 "parse_y.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -590,28 +589,28 @@
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   147,   147,   148,   149,   150,   174,   174,   248,   248,
-     259,   259,   278,   279,   284,   284,   325,   327,   357,   364,
-     371,   401,   402,   403,   406,   414,   429,   463,   469,   475,
-     491,   493,   518,   520,   551,   553,   554,   555,   559,   569,
-     580,   607,   611,   616,   644,   648,   692,   701,   710,   714,
-     715,   719,   720,   724,   725,   725,   726,   727,   729,   729,
-     736,   740,   741,   742,   743,   744,   780,   790,   801,   811,
-     821,   857,   862,   894,   893,   922,   923,   927,   928,   932,
-     933,   934,   935,   936,   937,   939,   944,   945,   946,   947,
-     947,   948,   978,   987,   996,  1044,  1053,  1062,  1099,  1109,
-    1127,  1177,  1176,  1215,  1217,  1222,  1221,  1228,  1230,  1235,
-    1239,  1299,  1300,  1301,  1302,  1303,  1311,  1310,  1329,  1328,
-    1347,  1346,  1367,  1365,  1389,  1387,  1474,  1475,  1479,  1480,
-    1481,  1482,  1483,  1485,  1490,  1495,  1500,  1505,  1510,  1515,
-    1515,  1519,  1520,  1524,  1525,  1526,  1527,  1529,  1535,  1542,
-    1547,  1552,  1552,  1593,  1606,  1618,  1629,  1645,  1699,  1714,
-    1727,  1738,  1749,  1750,  1754,  1755,  1777,  1779,  1795,  1814,
-    1815,  1818,  1820,  1821,  1842,  1849,  1865,  1866,  1870,  1875,
-    1876,  1880,  1881,  1905,  1904,  1914,  1915,  1919,  1920,  1939,
-    1956,  1957,  1961,  1966,  1967,  1971,  1972,  1987,  1988,  1989,
-    2016,  2029,  2030,  2034,  2035,  2040,  2041,  2042,  2043,  2044,
-    2045,  2046,  2047,  2048,  2049
+       0,   146,   146,   147,   148,   149,   173,   173,   247,   247,
+     258,   258,   277,   278,   283,   283,   324,   326,   356,   363,
+     370,   400,   401,   402,   405,   413,   428,   462,   468,   474,
+     490,   492,   517,   519,   550,   552,   553,   554,   558,   568,
+     579,   606,   610,   615,   643,   647,   691,   700,   709,   713,
+     714,   718,   719,   723,   724,   724,   725,   726,   728,   728,
+     735,   739,   740,   741,   742,   743,   779,   789,   800,   810,
+     820,   856,   861,   893,   892,   921,   922,   926,   927,   931,
+     932,   933,   934,   935,   936,   938,   943,   944,   945,   946,
+     946,   947,   977,   986,   995,  1043,  1052,  1061,  1098,  1108,
+    1126,  1176,  1175,  1214,  1216,  1221,  1220,  1227,  1229,  1234,
+    1238,  1298,  1299,  1300,  1301,  1302,  1310,  1309,  1328,  1327,
+    1346,  1345,  1366,  1364,  1388,  1386,  1473,  1474,  1478,  1479,
+    1480,  1481,  1482,  1484,  1489,  1494,  1499,  1504,  1509,  1514,
+    1514,  1518,  1519,  1523,  1524,  1525,  1526,  1528,  1534,  1541,
+    1546,  1551,  1551,  1592,  1605,  1617,  1628,  1644,  1698,  1713,
+    1726,  1737,  1748,  1749,  1753,  1754,  1776,  1778,  1794,  1813,
+    1814,  1817,  1819,  1820,  1841,  1848,  1864,  1865,  1869,  1874,
+    1875,  1879,  1880,  1904,  1903,  1913,  1914,  1918,  1919,  1938,
+    1955,  1956,  1960,  1965,  1966,  1970,  1971,  1986,  1987,  1988,
+    2015,  2028,  2029,  2033,  2034,  2039,  2040,  2041,  2042,  2043,
+    2044,  2045,  2046,  2047,  2048
 };
 #endif
 
@@ -1788,13 +1787,13 @@
   switch (yyn)
     {
         case 5:
-#line 150 "parse_y.y" /* yacc.c:1646  */
+#line 149 "parse_y.y" /* yacc.c:1646  */
     { YYABORT; }
-#line 1794 "parse_y.c" /* yacc.c:1646  */
+#line 1793 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 6:
-#line 174 "parse_y.y" /* yacc.c:1646  */
+#line 173 "parse_y.y" /* yacc.c:1646  */
     {
 					/* reset flags for 'used layers';
 					 * init font and data pointers
@@ -1817,11 +1816,11 @@
 				layer_group_string = NULL;
 				old_fmt = 0;
 			}
-#line 1821 "parse_y.c" /* yacc.c:1646  */
+#line 1820 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 7:
-#line 210 "parse_y.y" /* yacc.c:1646  */
+#line 209 "parse_y.y" /* yacc.c:1646  */
     {
 			  pcb_board_t *pcb_save = PCB;
 			  if ((yy_settings_dest != CFR_invalid) && (layer_group_string != NULL))
@@ -1859,28 +1858,28 @@
 			PCB_ENDALL_LOOP;
 			PCB = pcb_save;
 			}
-#line 1863 "parse_y.c" /* yacc.c:1646  */
+#line 1862 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 8:
-#line 248 "parse_y.y" /* yacc.c:1646  */
+#line 247 "parse_y.y" /* yacc.c:1646  */
     { PreLoadElementPCB ();
 		    layer_group_string = NULL; }
-#line 1870 "parse_y.c" /* yacc.c:1646  */
+#line 1869 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 9:
-#line 251 "parse_y.y" /* yacc.c:1646  */
+#line 250 "parse_y.y" /* yacc.c:1646  */
     { LayerFlag[0] = pcb_true;
 		    LayerFlag[1] = pcb_true;
 		    yyData->LayerN = 2;
 		    PostLoadElementPCB ();
 		  }
-#line 1880 "parse_y.c" /* yacc.c:1646  */
+#line 1879 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 10:
-#line 259 "parse_y.y" /* yacc.c:1646  */
+#line 258 "parse_y.y" /* yacc.c:1646  */
     {
 					/* reset flags for 'used layers';
 					 * init font and data pointers
@@ -1896,11 +1895,11 @@
 					LayerFlag[i] = pcb_false;
 				yyData->LayerN = 0;
 			}
-#line 1900 "parse_y.c" /* yacc.c:1646  */
+#line 1899 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 14:
-#line 284 "parse_y.y" /* yacc.c:1646  */
+#line 283 "parse_y.y" /* yacc.c:1646  */
     {
 					/* mark all symbols invalid */
 				int	i;
@@ -1916,20 +1915,20 @@
 				}
 				*yyFontkitValid = pcb_false;
 			}
-#line 1920 "parse_y.c" /* yacc.c:1646  */
+#line 1919 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 15:
-#line 300 "parse_y.y" /* yacc.c:1646  */
+#line 299 "parse_y.y" /* yacc.c:1646  */
     {
 				*yyFontkitValid = pcb_true;
 		  		pcb_font_set_info(yyFont);
 			}
-#line 1929 "parse_y.c" /* yacc.c:1646  */
+#line 1928 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 17:
-#line 328 "parse_y.y" /* yacc.c:1646  */
+#line 327 "parse_y.y" /* yacc.c:1646  */
     {
   if (check_file_version ((yyvsp[-1].integer)) != 0)
     {
@@ -1936,11 +1935,11 @@
       YYABORT;
     }
 }
-#line 1940 "parse_y.c" /* yacc.c:1646  */
+#line 1939 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 18:
-#line 358 "parse_y.y" /* yacc.c:1646  */
+#line 357 "parse_y.y" /* yacc.c:1646  */
     {
 				yyPCB->Name = (yyvsp[-1].string);
 				yyPCB->MaxWidth = PCB_MAX_COORD;
@@ -1947,11 +1946,11 @@
 				yyPCB->MaxHeight = PCB_MAX_COORD;
 				old_fmt = 1;
 			}
-#line 1951 "parse_y.c" /* yacc.c:1646  */
+#line 1950 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 19:
-#line 365 "parse_y.y" /* yacc.c:1646  */
+#line 364 "parse_y.y" /* yacc.c:1646  */
     {
 				yyPCB->Name = (yyvsp[-3].string);
 				yyPCB->MaxWidth = OU ((yyvsp[-2].measure));
@@ -1958,11 +1957,11 @@
 				yyPCB->MaxHeight = OU ((yyvsp[-1].measure));
 				old_fmt = 1;
 			}
-#line 1962 "parse_y.c" /* yacc.c:1646  */
+#line 1961 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 20:
-#line 372 "parse_y.y" /* yacc.c:1646  */
+#line 371 "parse_y.y" /* yacc.c:1646  */
     {
 				yyPCB->Name = (yyvsp[-3].string);
 				yyPCB->MaxWidth = NU ((yyvsp[-2].measure));
@@ -1969,21 +1968,21 @@
 				yyPCB->MaxHeight = NU ((yyvsp[-1].measure));
 				old_fmt = 0;
 			}
-#line 1973 "parse_y.c" /* yacc.c:1646  */
+#line 1972 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 24:
-#line 407 "parse_y.y" /* yacc.c:1646  */
+#line 406 "parse_y.y" /* yacc.c:1646  */
     {
 				yyPCB->Grid = OU ((yyvsp[-3].measure));
 				yyPCB->GridOffsetX = OU ((yyvsp[-2].measure));
 				yyPCB->GridOffsetY = OU ((yyvsp[-1].measure));
 			}
-#line 1983 "parse_y.c" /* yacc.c:1646  */
+#line 1982 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 25:
-#line 415 "parse_y.y" /* yacc.c:1646  */
+#line 414 "parse_y.y" /* yacc.c:1646  */
     {
 				yyPCB->Grid = OU ((yyvsp[-4].measure));
 				yyPCB->GridOffsetX = OU ((yyvsp[-3].measure));
@@ -1995,11 +1994,11 @@
 						conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", POL_OVERWRITE);
 				}
 			}
-#line 1999 "parse_y.c" /* yacc.c:1646  */
+#line 1998 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 26:
-#line 430 "parse_y.y" /* yacc.c:1646  */
+#line 429 "parse_y.y" /* yacc.c:1646  */
     {
 				yyPCB->Grid = NU ((yyvsp[-4].measure));
 				yyPCB->GridOffsetX = NU ((yyvsp[-3].measure));
@@ -2011,48 +2010,48 @@
 						conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", POL_OVERWRITE);
 				}
 			}
-#line 2015 "parse_y.c" /* yacc.c:1646  */
+#line 2014 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 27:
-#line 464 "parse_y.y" /* yacc.c:1646  */
+#line 463 "parse_y.y" /* yacc.c:1646  */
     {
 				yyPCB->CursorX = OU ((yyvsp[-3].measure));
 				yyPCB->CursorY = OU ((yyvsp[-2].measure));
 				yyPCB->Zoom = (yyvsp[-1].number)*2;
 			}
-#line 2025 "parse_y.c" /* yacc.c:1646  */
+#line 2024 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 28:
-#line 470 "parse_y.y" /* yacc.c:1646  */
+#line 469 "parse_y.y" /* yacc.c:1646  */
     {
 				yyPCB->CursorX = NU ((yyvsp[-3].measure));
 				yyPCB->CursorY = NU ((yyvsp[-2].measure));
 				yyPCB->Zoom = (yyvsp[-1].number);
 			}
-#line 2035 "parse_y.c" /* yacc.c:1646  */
+#line 2034 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 31:
-#line 494 "parse_y.y" /* yacc.c:1646  */
+#line 493 "parse_y.y" /* yacc.c:1646  */
     {
 				/* Read in cmil^2 for now; in future this should be a noop. */
 				yyPCB->IsleArea = PCB_MIL_TO_COORD (PCB_MIL_TO_COORD ((yyvsp[-1].number)) / 100.0) / 100.0;
 			}
-#line 2044 "parse_y.c" /* yacc.c:1646  */
+#line 2043 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 33:
-#line 521 "parse_y.y" /* yacc.c:1646  */
+#line 520 "parse_y.y" /* yacc.c:1646  */
     {
 				yyPCB->ThermScale = (yyvsp[-1].number);
 			}
-#line 2052 "parse_y.c" /* yacc.c:1646  */
+#line 2051 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 38:
-#line 560 "parse_y.y" /* yacc.c:1646  */
+#line 559 "parse_y.y" /* yacc.c:1646  */
     {
 				yyPCB->Bloat = NU ((yyvsp[-3].measure));
 				yyPCB->Shrink = NU ((yyvsp[-2].measure));
@@ -2059,11 +2058,11 @@
 				yyPCB->minWid = NU ((yyvsp[-1].measure));
 				yyPCB->minRing = NU ((yyvsp[-1].measure));
 			}
-#line 2063 "parse_y.c" /* yacc.c:1646  */
+#line 2062 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 39:
-#line 570 "parse_y.y" /* yacc.c:1646  */
+#line 569 "parse_y.y" /* yacc.c:1646  */
     {
 				yyPCB->Bloat = NU ((yyvsp[-4].measure));
 				yyPCB->Shrink = NU ((yyvsp[-3].measure));
@@ -2071,11 +2070,11 @@
 				yyPCB->minSlk = NU ((yyvsp[-1].measure));
 				yyPCB->minRing = NU ((yyvsp[-2].measure));
 			}
-#line 2075 "parse_y.c" /* yacc.c:1646  */
+#line 2074 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 40:
-#line 581 "parse_y.y" /* yacc.c:1646  */
+#line 580 "parse_y.y" /* yacc.c:1646  */
     {
 				yyPCB->Bloat = NU ((yyvsp[-6].measure));
 				yyPCB->Shrink = NU ((yyvsp[-5].measure));
@@ -2084,36 +2083,36 @@
 				yyPCB->minDrill = NU ((yyvsp[-2].measure));
 				yyPCB->minRing = NU ((yyvsp[-1].measure));
 			}
-#line 2088 "parse_y.c" /* yacc.c:1646  */
+#line 2087 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 41:
-#line 608 "parse_y.y" /* yacc.c:1646  */
+#line 607 "parse_y.y" /* yacc.c:1646  */
     {
 				yy_pcb_flags = pcb_flag_make((yyvsp[-1].integer) & PCB_FLAGS);
 			}
-#line 2096 "parse_y.c" /* yacc.c:1646  */
+#line 2095 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 42:
-#line 612 "parse_y.y" /* yacc.c:1646  */
+#line 611 "parse_y.y" /* yacc.c:1646  */
     {
 			  yy_pcb_flags = pcb_strflg_board_s2f((yyvsp[-1].string), yyerror);
 			  free((yyvsp[-1].string));
 			}
-#line 2105 "parse_y.c" /* yacc.c:1646  */
+#line 2104 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 44:
-#line 645 "parse_y.y" /* yacc.c:1646  */
+#line 644 "parse_y.y" /* yacc.c:1646  */
     {
 			  layer_group_string = (yyvsp[-1].string);
 			}
-#line 2113 "parse_y.c" /* yacc.c:1646  */
+#line 2112 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 46:
-#line 693 "parse_y.y" /* yacc.c:1646  */
+#line 692 "parse_y.y" /* yacc.c:1646  */
     {
 				if (pcb_route_string_parse((yyvsp[-1].string), &yyPCB->RouteStyle, "mil"))
 				{
@@ -2122,11 +2121,11 @@
 				}
 				free((yyvsp[-1].string));
 			}
-#line 2126 "parse_y.c" /* yacc.c:1646  */
+#line 2125 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 47:
-#line 702 "parse_y.y" /* yacc.c:1646  */
+#line 701 "parse_y.y" /* yacc.c:1646  */
     {
 				if (pcb_route_string_parse(((yyvsp[-1].string) == NULL ? "" : (yyvsp[-1].string)), &yyPCB->RouteStyle, "cmil"))
 				{
@@ -2135,17 +2134,17 @@
 				}
 				free((yyvsp[-1].string));
 			}
-#line 2139 "parse_y.c" /* yacc.c:1646  */
+#line 2138 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 54:
-#line 725 "parse_y.y" /* yacc.c:1646  */
+#line 724 "parse_y.y" /* yacc.c:1646  */
     { attr_list = & yyPCB->Attributes; }
-#line 2145 "parse_y.c" /* yacc.c:1646  */
+#line 2144 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 58:
-#line 729 "parse_y.y" /* yacc.c:1646  */
+#line 728 "parse_y.y" /* yacc.c:1646  */
     {
 					/* clear pointer to force memory allocation by
 					 * the appropriate subroutine
@@ -2152,57 +2151,57 @@
 					 */
 				yysubc = NULL;
 			}
-#line 2156 "parse_y.c" /* yacc.c:1646  */
+#line 2155 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 60:
-#line 736 "parse_y.y" /* yacc.c:1646  */
+#line 735 "parse_y.y" /* yacc.c:1646  */
     { YYABORT; }
-#line 2162 "parse_y.c" /* yacc.c:1646  */
+#line 2161 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 66:
-#line 781 "parse_y.y" /* yacc.c:1646  */
+#line 780 "parse_y.y" /* yacc.c:1646  */
     {
 				pcb_old_via_new(yyData, NU ((yyvsp[-8].measure)), NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)),
 				                     NU ((yyvsp[-3].measure)), (yyvsp[-2].string), (yyvsp[-1].flagtype));
 				free ((yyvsp[-2].string));
 			}
-#line 2172 "parse_y.c" /* yacc.c:1646  */
+#line 2171 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 67:
-#line 791 "parse_y.y" /* yacc.c:1646  */
+#line 790 "parse_y.y" /* yacc.c:1646  */
     {
 				pcb_old_via_new(yyData, OU ((yyvsp[-8].measure)), OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].string),
 					pcb_flag_old((yyvsp[-1].integer)));
 				free ((yyvsp[-2].string));
 			}
-#line 2182 "parse_y.c" /* yacc.c:1646  */
+#line 2181 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 68:
-#line 802 "parse_y.y" /* yacc.c:1646  */
+#line 801 "parse_y.y" /* yacc.c:1646  */
     {
 				pcb_old_via_new(yyData, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)),
 					     OU ((yyvsp[-5].measure)) + OU((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer)));
 				free ((yyvsp[-2].string));
 			}
-#line 2192 "parse_y.c" /* yacc.c:1646  */
+#line 2191 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 69:
-#line 812 "parse_y.y" /* yacc.c:1646  */
+#line 811 "parse_y.y" /* yacc.c:1646  */
     {
 				pcb_old_via_new(yyData, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), 2*PCB_GROUNDPLANEFRAME,
 					OU((yyvsp[-4].measure)) + 2*PCB_MASKFRAME,  OU ((yyvsp[-3].measure)), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer)));
 				free ((yyvsp[-2].string));
 			}
-#line 2202 "parse_y.c" /* yacc.c:1646  */
+#line 2201 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 70:
-#line 822 "parse_y.y" /* yacc.c:1646  */
+#line 821 "parse_y.y" /* yacc.c:1646  */
     {
 				pcb_coord_t	hole = (OU((yyvsp[-3].measure)) * PCB_DEFAULT_DRILLINGHOLE);
 
@@ -2215,29 +2214,29 @@
 					OU((yyvsp[-3].measure)) + 2*PCB_MASKFRAME, hole, (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer)));
 				free ((yyvsp[-2].string));
 			}
-#line 2219 "parse_y.c" /* yacc.c:1646  */
+#line 2218 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 71:
-#line 858 "parse_y.y" /* yacc.c:1646  */
+#line 857 "parse_y.y" /* yacc.c:1646  */
     {
 				pcb_rat_new(yyData, NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), (yyvsp[-5].integer), (yyvsp[-2].integer),
 					conf_core.appearance.rat_thickness, (yyvsp[-1].flagtype));
 			}
-#line 2228 "parse_y.c" /* yacc.c:1646  */
+#line 2227 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 72:
-#line 863 "parse_y.y" /* yacc.c:1646  */
+#line 862 "parse_y.y" /* yacc.c:1646  */
     {
 				pcb_rat_new(yyData, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-5].integer), (yyvsp[-2].integer),
 					conf_core.appearance.rat_thickness, pcb_flag_old((yyvsp[-1].integer)));
 			}
-#line 2237 "parse_y.c" /* yacc.c:1646  */
+#line 2236 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 73:
-#line 894 "parse_y.y" /* yacc.c:1646  */
+#line 893 "parse_y.y" /* yacc.c:1646  */
     {
 				if ((yyvsp[-4].integer) <= 0 || (yyvsp[-4].integer) > PCB_MAX_LAYER)
 				{
@@ -2262,44 +2261,44 @@
 				if ((yyvsp[-2].string) != NULL)
 					free((yyvsp[-2].string));
 			}
-#line 2266 "parse_y.c" /* yacc.c:1646  */
+#line 2265 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 85:
-#line 940 "parse_y.y" /* yacc.c:1646  */
+#line 939 "parse_y.y" /* yacc.c:1646  */
     {
 				pcb_poly_new_from_rectangle(Layer,
 					OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-5].measure)) + OU ((yyvsp[-3].measure)), OU ((yyvsp[-4].measure)) + OU ((yyvsp[-2].measure)), 0, pcb_flag_old((yyvsp[-1].integer)));
 			}
-#line 2275 "parse_y.c" /* yacc.c:1646  */
+#line 2274 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 89:
-#line 947 "parse_y.y" /* yacc.c:1646  */
+#line 946 "parse_y.y" /* yacc.c:1646  */
     { attr_list = & Layer->meta.real.Attributes; }
-#line 2281 "parse_y.c" /* yacc.c:1646  */
+#line 2280 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 92:
-#line 979 "parse_y.y" /* yacc.c:1646  */
+#line 978 "parse_y.y" /* yacc.c:1646  */
     {
 				pcb_line_new(Layer, NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)),
 				                            NU ((yyvsp[-3].measure)), NU ((yyvsp[-2].measure)), (yyvsp[-1].flagtype));
 			}
-#line 2290 "parse_y.c" /* yacc.c:1646  */
+#line 2289 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 93:
-#line 988 "parse_y.y" /* yacc.c:1646  */
+#line 987 "parse_y.y" /* yacc.c:1646  */
     {
 				pcb_line_new(Layer, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)),
 						     OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), pcb_flag_old((yyvsp[-1].integer)));
 			}
-#line 2299 "parse_y.c" /* yacc.c:1646  */
+#line 2298 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 94:
-#line 997 "parse_y.y" /* yacc.c:1646  */
+#line 996 "parse_y.y" /* yacc.c:1646  */
     {
 				/* eliminate old-style rat-lines */
 			if ((IV ((yyvsp[-1].measure)) & PCB_FLAG_RAT) == 0)
@@ -2306,48 +2305,48 @@
 				pcb_line_new(Layer, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)),
 					200*PCB_GROUNDPLANEFRAME, pcb_flag_old(IV ((yyvsp[-1].measure))));
 			}
-#line 2310 "parse_y.c" /* yacc.c:1646  */
+#line 2309 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 95:
-#line 1045 "parse_y.y" /* yacc.c:1646  */
+#line 1044 "parse_y.y" /* yacc.c:1646  */
     {
 			  pcb_arc_new(Layer, NU ((yyvsp[-9].measure)), NU ((yyvsp[-8].measure)), NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), (yyvsp[-3].number), (yyvsp[-2].number),
 			                             NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), (yyvsp[-1].flagtype));
 			}
-#line 2319 "parse_y.c" /* yacc.c:1646  */
+#line 2318 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 96:
-#line 1054 "parse_y.y" /* yacc.c:1646  */
+#line 1053 "parse_y.y" /* yacc.c:1646  */
     {
 				pcb_arc_new(Layer, OU ((yyvsp[-9].measure)), OU ((yyvsp[-8].measure)), OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), (yyvsp[-3].number), (yyvsp[-2].number),
 						    OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), pcb_flag_old((yyvsp[-1].integer)));
 			}
-#line 2328 "parse_y.c" /* yacc.c:1646  */
+#line 2327 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 97:
-#line 1063 "parse_y.y" /* yacc.c:1646  */
+#line 1062 "parse_y.y" /* yacc.c:1646  */
     {
 				pcb_arc_new(Layer, OU ((yyvsp[-8].measure)), OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-6].measure)), IV ((yyvsp[-3].measure)), (yyvsp[-2].number),
 					OU ((yyvsp[-4].measure)), 200*PCB_GROUNDPLANEFRAME, pcb_flag_old((yyvsp[-1].integer)));
 			}
-#line 2337 "parse_y.c" /* yacc.c:1646  */
+#line 2336 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 98:
-#line 1100 "parse_y.y" /* yacc.c:1646  */
+#line 1099 "parse_y.y" /* yacc.c:1646  */
     {
 					/* use a default scale of 100% */
 				pcb_text_new(Layer,yyFont,OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].number), 100, (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer)));
 				free ((yyvsp[-2].string));
 			}
-#line 2347 "parse_y.c" /* yacc.c:1646  */
+#line 2346 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 99:
-#line 1110 "parse_y.y" /* yacc.c:1646  */
+#line 1109 "parse_y.y" /* yacc.c:1646  */
     {
 				if ((yyvsp[-1].integer) & PCB_FLAG_ONSILK)
 				{
@@ -2362,11 +2361,11 @@
 						      pcb_flag_old((yyvsp[-1].integer)));
 				free ((yyvsp[-2].string));
 			}
-#line 2366 "parse_y.c" /* yacc.c:1646  */
+#line 2365 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 100:
-#line 1128 "parse_y.y" /* yacc.c:1646  */
+#line 1127 "parse_y.y" /* yacc.c:1646  */
     {
 				/* FIXME: shouldn't know about .f */
 				/* I don't think this matters because anything with hi_format
@@ -2386,19 +2385,19 @@
 					pcb_text_new(Layer, yyFont, NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].string), (yyvsp[-1].flagtype));
 				free ((yyvsp[-2].string));
 			}
-#line 2390 "parse_y.c" /* yacc.c:1646  */
+#line 2389 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 101:
-#line 1177 "parse_y.y" /* yacc.c:1646  */
+#line 1176 "parse_y.y" /* yacc.c:1646  */
     {
 				Polygon = pcb_poly_new(Layer, 0, (yyvsp[-2].flagtype));
 			}
-#line 2398 "parse_y.c" /* yacc.c:1646  */
+#line 2397 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 102:
-#line 1182 "parse_y.y" /* yacc.c:1646  */
+#line 1181 "parse_y.y" /* yacc.c:1646  */
     {
 				pcb_cardinal_t contour, contour_start, contour_end;
 				pcb_bool bad_contour_found = pcb_false;
@@ -2430,35 +2429,35 @@
 				    pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
 				  }
 			}
-#line 2434 "parse_y.c" /* yacc.c:1646  */
+#line 2433 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 105:
-#line 1222 "parse_y.y" /* yacc.c:1646  */
+#line 1221 "parse_y.y" /* yacc.c:1646  */
     {
 				pcb_poly_hole_new(Polygon);
 			}
-#line 2442 "parse_y.c" /* yacc.c:1646  */
+#line 2441 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 109:
-#line 1236 "parse_y.y" /* yacc.c:1646  */
+#line 1235 "parse_y.y" /* yacc.c:1646  */
     {
 				pcb_poly_point_new(Polygon, OU ((yyvsp[-2].measure)), OU ((yyvsp[-1].measure)));
 			}
-#line 2450 "parse_y.c" /* yacc.c:1646  */
+#line 2449 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 110:
-#line 1240 "parse_y.y" /* yacc.c:1646  */
+#line 1239 "parse_y.y" /* yacc.c:1646  */
     {
 				pcb_poly_point_new(Polygon, NU ((yyvsp[-2].measure)), NU ((yyvsp[-1].measure)));
 			}
-#line 2458 "parse_y.c" /* yacc.c:1646  */
+#line 2457 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 116:
-#line 1311 "parse_y.y" /* yacc.c:1646  */
+#line 1310 "parse_y.y" /* yacc.c:1646  */
     {
 				yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_no_flags(),
 					(yyvsp[-6].string), (yyvsp[-5].string), NULL, OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].integer), 100, pcb_no_flags(), pcb_false);
@@ -2466,19 +2465,19 @@
 				free ((yyvsp[-5].string));
 				pin_num = 1;
 			}
-#line 2470 "parse_y.c" /* yacc.c:1646  */
+#line 2469 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 117:
-#line 1319 "parse_y.y" /* yacc.c:1646  */
+#line 1318 "parse_y.y" /* yacc.c:1646  */
     {
 				io_pcb_element_fin(yyData);
 			}
-#line 2478 "parse_y.c" /* yacc.c:1646  */
+#line 2477 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 118:
-#line 1329 "parse_y.y" /* yacc.c:1646  */
+#line 1328 "parse_y.y" /* yacc.c:1646  */
     {
 				yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_flag_old((yyvsp[-9].integer)),
 					(yyvsp[-8].string), (yyvsp[-7].string), NULL, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), IV ((yyvsp[-4].measure)), IV ((yyvsp[-3].measure)), pcb_flag_old((yyvsp[-2].integer)), pcb_false);
@@ -2486,19 +2485,19 @@
 				free ((yyvsp[-7].string));
 				pin_num = 1;
 			}
-#line 2490 "parse_y.c" /* yacc.c:1646  */
+#line 2489 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 119:
-#line 1337 "parse_y.y" /* yacc.c:1646  */
+#line 1336 "parse_y.y" /* yacc.c:1646  */
     {
 				io_pcb_element_fin(yyData);
 			}
-#line 2498 "parse_y.c" /* yacc.c:1646  */
+#line 2497 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 120:
-#line 1347 "parse_y.y" /* yacc.c:1646  */
+#line 1346 "parse_y.y" /* yacc.c:1646  */
     {
 				yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_flag_old((yyvsp[-10].integer)),
 					(yyvsp[-9].string), (yyvsp[-8].string), (yyvsp[-7].string), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), IV ((yyvsp[-4].measure)), IV ((yyvsp[-3].measure)), pcb_flag_old((yyvsp[-2].integer)), pcb_false);
@@ -2507,19 +2506,19 @@
 				free ((yyvsp[-7].string));
 				pin_num = 1;
 			}
-#line 2511 "parse_y.c" /* yacc.c:1646  */
+#line 2510 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 121:
-#line 1356 "parse_y.y" /* yacc.c:1646  */
+#line 1355 "parse_y.y" /* yacc.c:1646  */
     {
 				io_pcb_element_fin(yyData);
 			}
-#line 2519 "parse_y.c" /* yacc.c:1646  */
+#line 2518 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 122:
-#line 1367 "parse_y.y" /* yacc.c:1646  */
+#line 1366 "parse_y.y" /* yacc.c:1646  */
     {
 				yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_flag_old((yyvsp[-12].integer)),
 					(yyvsp[-11].string), (yyvsp[-10].string), (yyvsp[-9].string), OU ((yyvsp[-8].measure)) + OU ((yyvsp[-6].measure)), OU ((yyvsp[-7].measure)) + OU ((yyvsp[-5].measure)),
@@ -2530,19 +2529,19 @@
 				free ((yyvsp[-10].string));
 				free ((yyvsp[-9].string));
 			}
-#line 2534 "parse_y.c" /* yacc.c:1646  */
+#line 2533 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 123:
-#line 1378 "parse_y.y" /* yacc.c:1646  */
+#line 1377 "parse_y.y" /* yacc.c:1646  */
     {
 				io_pcb_element_fin(yyData);
 			}
-#line 2542 "parse_y.c" /* yacc.c:1646  */
+#line 2541 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 124:
-#line 1389 "parse_y.y" /* yacc.c:1646  */
+#line 1388 "parse_y.y" /* yacc.c:1646  */
     {
 				yysubc = io_pcb_element_new(yyData, yysubc, yyFont, (yyvsp[-12].flagtype),
 					(yyvsp[-11].string), (yyvsp[-10].string), (yyvsp[-9].string), NU ((yyvsp[-8].measure)) + NU ((yyvsp[-6].measure)), NU ((yyvsp[-7].measure)) + NU ((yyvsp[-5].measure)),
@@ -2553,11 +2552,11 @@
 				free ((yyvsp[-10].string));
 				free ((yyvsp[-9].string));
 			}
-#line 2557 "parse_y.c" /* yacc.c:1646  */
+#line 2556 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 125:
-#line 1400 "parse_y.y" /* yacc.c:1646  */
+#line 1399 "parse_y.y" /* yacc.c:1646  */
     {
 				if (pcb_subc_is_empty(yysubc)) {
 					pcb_subc_free(yysubc);
@@ -2567,111 +2566,111 @@
 					io_pcb_element_fin(yyData);
 				}
 			}
-#line 2571 "parse_y.c" /* yacc.c:1646  */
+#line 2570 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 133:
-#line 1486 "parse_y.y" /* yacc.c:1646  */
+#line 1485 "parse_y.y" /* yacc.c:1646  */
     {
 				io_pcb_element_line_new(yysubc, NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), NU ((yyvsp[-2].measure)), NU ((yyvsp[-1].measure)));
 			}
-#line 2579 "parse_y.c" /* yacc.c:1646  */
+#line 2578 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 134:
-#line 1491 "parse_y.y" /* yacc.c:1646  */
+#line 1490 "parse_y.y" /* yacc.c:1646  */
     {
 				io_pcb_element_line_new(yysubc, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), OU ((yyvsp[-1].measure)));
 			}
-#line 2587 "parse_y.c" /* yacc.c:1646  */
+#line 2586 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 135:
-#line 1496 "parse_y.y" /* yacc.c:1646  */
+#line 1495 "parse_y.y" /* yacc.c:1646  */
     {
 				io_pcb_element_arc_new(yysubc, NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), (yyvsp[-3].number), (yyvsp[-2].number), NU ((yyvsp[-1].measure)));
 			}
-#line 2595 "parse_y.c" /* yacc.c:1646  */
+#line 2594 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 136:
-#line 1501 "parse_y.y" /* yacc.c:1646  */
+#line 1500 "parse_y.y" /* yacc.c:1646  */
     {
 				io_pcb_element_arc_new(yysubc, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].number), (yyvsp[-2].number), OU ((yyvsp[-1].measure)));
 			}
-#line 2603 "parse_y.c" /* yacc.c:1646  */
+#line 2602 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 137:
-#line 1506 "parse_y.y" /* yacc.c:1646  */
+#line 1505 "parse_y.y" /* yacc.c:1646  */
     {
 				yysubc_ox = NU ((yyvsp[-2].measure));
 				yysubc_oy = NU ((yyvsp[-1].measure));
 			}
-#line 2612 "parse_y.c" /* yacc.c:1646  */
+#line 2611 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 138:
-#line 1511 "parse_y.y" /* yacc.c:1646  */
+#line 1510 "parse_y.y" /* yacc.c:1646  */
     {
 				yysubc_ox = OU ((yyvsp[-2].measure));
 				yysubc_oy = OU ((yyvsp[-1].measure));
 			}
-#line 2621 "parse_y.c" /* yacc.c:1646  */
+#line 2620 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 139:
-#line 1515 "parse_y.y" /* yacc.c:1646  */
+#line 1514 "parse_y.y" /* yacc.c:1646  */
     { attr_list = & yysubc->Attributes; }
-#line 2627 "parse_y.c" /* yacc.c:1646  */
+#line 2626 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 147:
-#line 1530 "parse_y.y" /* yacc.c:1646  */
+#line 1529 "parse_y.y" /* yacc.c:1646  */
     {
 				io_pcb_element_line_new(yysubc, NU ((yyvsp[-5].measure)) + yysubc_ox,
 					NU ((yyvsp[-4].measure)) + yysubc_oy, NU ((yyvsp[-3].measure)) + yysubc_ox,
 					NU ((yyvsp[-2].measure)) + yysubc_oy, NU ((yyvsp[-1].measure)));
 			}
-#line 2637 "parse_y.c" /* yacc.c:1646  */
+#line 2636 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 148:
-#line 1536 "parse_y.y" /* yacc.c:1646  */
+#line 1535 "parse_y.y" /* yacc.c:1646  */
     {
 				io_pcb_element_line_new(yysubc, OU ((yyvsp[-5].measure)) + yysubc_ox,
 					OU ((yyvsp[-4].measure)) + yysubc_oy, OU ((yyvsp[-3].measure)) + yysubc_ox,
 					OU ((yyvsp[-2].measure)) + yysubc_oy, OU ((yyvsp[-1].measure)));
 			}
-#line 2647 "parse_y.c" /* yacc.c:1646  */
+#line 2646 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 149:
-#line 1543 "parse_y.y" /* yacc.c:1646  */
+#line 1542 "parse_y.y" /* yacc.c:1646  */
     {
 				io_pcb_element_arc_new(yysubc, NU ((yyvsp[-7].measure)) + yysubc_ox,
 					NU ((yyvsp[-6].measure)) + yysubc_oy, NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), (yyvsp[-3].number), (yyvsp[-2].number), NU ((yyvsp[-1].measure)));
 			}
-#line 2656 "parse_y.c" /* yacc.c:1646  */
+#line 2655 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 150:
-#line 1548 "parse_y.y" /* yacc.c:1646  */
+#line 1547 "parse_y.y" /* yacc.c:1646  */
     {
 				io_pcb_element_arc_new(yysubc, OU ((yyvsp[-7].measure)) + yysubc_ox,
 					OU ((yyvsp[-6].measure)) + yysubc_oy, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].number), (yyvsp[-2].number), OU ((yyvsp[-1].measure)));
 			}
-#line 2665 "parse_y.c" /* yacc.c:1646  */
+#line 2664 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 151:
-#line 1552 "parse_y.y" /* yacc.c:1646  */
+#line 1551 "parse_y.y" /* yacc.c:1646  */
     { attr_list = & yysubc->Attributes; }
-#line 2671 "parse_y.c" /* yacc.c:1646  */
+#line 2670 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 153:
-#line 1594 "parse_y.y" /* yacc.c:1646  */
+#line 1593 "parse_y.y" /* yacc.c:1646  */
     {
 				pcb_pstk_t *pin = io_pcb_element_pin_new(yysubc, NU ((yyvsp[-9].measure)) + yysubc_ox,
 					NU ((yyvsp[-8].measure)) + yysubc_oy, NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), (yyvsp[-3].string),
@@ -2680,11 +2679,11 @@
 				free ((yyvsp[-3].string));
 				free ((yyvsp[-2].string));
 			}
-#line 2684 "parse_y.c" /* yacc.c:1646  */
+#line 2683 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 154:
-#line 1607 "parse_y.y" /* yacc.c:1646  */
+#line 1606 "parse_y.y" /* yacc.c:1646  */
     {
 				io_pcb_element_pin_new(yysubc, OU ((yyvsp[-9].measure)) + yysubc_ox,
 					OU ((yyvsp[-8].measure)) + yysubc_oy, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].string),
@@ -2692,11 +2691,11 @@
 				free ((yyvsp[-3].string));
 				free ((yyvsp[-2].string));
 			}
-#line 2696 "parse_y.c" /* yacc.c:1646  */
+#line 2695 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 155:
-#line 1619 "parse_y.y" /* yacc.c:1646  */
+#line 1618 "parse_y.y" /* yacc.c:1646  */
     {
 				io_pcb_element_pin_new(yysubc, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), 2*PCB_GROUNDPLANEFRAME,
 					OU ((yyvsp[-5].measure)) + 2*PCB_MASKFRAME, OU ((yyvsp[-4].measure)), (yyvsp[-3].string), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer)));
@@ -2703,11 +2702,11 @@
 				free ((yyvsp[-3].string));
 				free ((yyvsp[-2].string));
 			}
-#line 2707 "parse_y.c" /* yacc.c:1646  */
+#line 2706 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 156:
-#line 1630 "parse_y.y" /* yacc.c:1646  */
+#line 1629 "parse_y.y" /* yacc.c:1646  */
     {
 				char	p_number[8];
 
@@ -2717,11 +2716,11 @@
 
 				free ((yyvsp[-2].string));
 			}
-#line 2721 "parse_y.c" /* yacc.c:1646  */
+#line 2720 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 157:
-#line 1646 "parse_y.y" /* yacc.c:1646  */
+#line 1645 "parse_y.y" /* yacc.c:1646  */
     {
 				pcb_coord_t	hole = OU ((yyvsp[-3].measure)) * PCB_DEFAULT_DRILLINGHOLE;
 				char	p_number[8];
@@ -2736,11 +2735,11 @@
 					OU ((yyvsp[-3].measure)) + 2*PCB_MASKFRAME, hole, (yyvsp[-2].string), p_number, pcb_flag_old((yyvsp[-1].integer)));
 				free ((yyvsp[-2].string));
 			}
-#line 2740 "parse_y.c" /* yacc.c:1646  */
+#line 2739 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 158:
-#line 1700 "parse_y.y" /* yacc.c:1646  */
+#line 1699 "parse_y.y" /* yacc.c:1646  */
     {
 				pcb_pstk_t *pad = io_pcb_element_pad_new(yysubc, NU ((yyvsp[-10].measure)) + yysubc_ox,
 					NU ((yyvsp[-9].measure)) + yysubc_oy,
@@ -2751,11 +2750,11 @@
 				free ((yyvsp[-3].string));
 				free ((yyvsp[-2].string));
 			}
-#line 2755 "parse_y.c" /* yacc.c:1646  */
+#line 2754 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 159:
-#line 1715 "parse_y.y" /* yacc.c:1646  */
+#line 1714 "parse_y.y" /* yacc.c:1646  */
     {
 				io_pcb_element_pad_new(yysubc,OU ((yyvsp[-10].measure)) + yysubc_ox,
 					OU ((yyvsp[-9].measure)) + yysubc_oy, OU ((yyvsp[-8].measure)) + yysubc_ox,
@@ -2764,11 +2763,11 @@
 				free ((yyvsp[-3].string));
 				free ((yyvsp[-2].string));
 			}
-#line 2768 "parse_y.c" /* yacc.c:1646  */
+#line 2767 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 160:
-#line 1728 "parse_y.y" /* yacc.c:1646  */
+#line 1727 "parse_y.y" /* yacc.c:1646  */
     {
 				io_pcb_element_pad_new(yysubc,OU ((yyvsp[-8].measure)),OU ((yyvsp[-7].measure)),OU ((yyvsp[-6].measure)),OU ((yyvsp[-5].measure)),OU ((yyvsp[-4].measure)), 2*PCB_GROUNDPLANEFRAME,
 					OU ((yyvsp[-4].measure)) + 2*PCB_MASKFRAME, (yyvsp[-3].string), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer)));
@@ -2775,11 +2774,11 @@
 				free ((yyvsp[-3].string));
 				free ((yyvsp[-2].string));
 			}
-#line 2779 "parse_y.c" /* yacc.c:1646  */
+#line 2778 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 161:
-#line 1739 "parse_y.y" /* yacc.c:1646  */
+#line 1738 "parse_y.y" /* yacc.c:1646  */
     {
 				char		p_number[8];
 
@@ -2788,23 +2787,23 @@
 					OU ((yyvsp[-3].measure)) + 2*PCB_MASKFRAME, (yyvsp[-2].string),p_number, pcb_flag_old((yyvsp[-1].integer)));
 				free ((yyvsp[-2].string));
 			}
-#line 2792 "parse_y.c" /* yacc.c:1646  */
+#line 2791 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 162:
-#line 1749 "parse_y.y" /* yacc.c:1646  */
+#line 1748 "parse_y.y" /* yacc.c:1646  */
     { (yyval.flagtype) = pcb_flag_old((yyvsp[0].integer)); }
-#line 2798 "parse_y.c" /* yacc.c:1646  */
+#line 2797 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 163:
-#line 1750 "parse_y.y" /* yacc.c:1646  */
+#line 1749 "parse_y.y" /* yacc.c:1646  */
     { (yyval.flagtype) = pcb_strflg_s2f((yyvsp[0].string), yyerror, &yy_intconn); free((yyvsp[0].string)); }
-#line 2804 "parse_y.c" /* yacc.c:1646  */
+#line 2803 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 167:
-#line 1780 "parse_y.y" /* yacc.c:1646  */
+#line 1779 "parse_y.y" /* yacc.c:1646  */
     {
 				if ((yyvsp[-3].integer) <= 0 || (yyvsp[-3].integer) > PCB_MAX_FONTPOSITION)
 				{
@@ -2820,11 +2819,11 @@
 				Symbol->Valid = pcb_true;
 				Symbol->Delta = NU ((yyvsp[-2].measure));
 			}
-#line 2824 "parse_y.c" /* yacc.c:1646  */
+#line 2823 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 168:
-#line 1796 "parse_y.y" /* yacc.c:1646  */
+#line 1795 "parse_y.y" /* yacc.c:1646  */
     {
 				if ((yyvsp[-3].integer) <= 0 || (yyvsp[-3].integer) > PCB_MAX_FONTPOSITION)
 				{
@@ -2840,64 +2839,64 @@
 				Symbol->Valid = pcb_true;
 				Symbol->Delta = OU ((yyvsp[-2].measure));
 			}
-#line 2844 "parse_y.c" /* yacc.c:1646  */
+#line 2843 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 174:
-#line 1843 "parse_y.y" /* yacc.c:1646  */
+#line 1842 "parse_y.y" /* yacc.c:1646  */
     {
 				pcb_font_new_line_in_sym(Symbol, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), OU ((yyvsp[-1].measure)));
 			}
-#line 2852 "parse_y.c" /* yacc.c:1646  */
+#line 2851 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 175:
-#line 1850 "parse_y.y" /* yacc.c:1646  */
+#line 1849 "parse_y.y" /* yacc.c:1646  */
     {
 				pcb_font_new_line_in_sym(Symbol, NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), NU ((yyvsp[-2].measure)), NU ((yyvsp[-1].measure)));
 			}
-#line 2860 "parse_y.c" /* yacc.c:1646  */
+#line 2859 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 183:
-#line 1905 "parse_y.y" /* yacc.c:1646  */
+#line 1904 "parse_y.y" /* yacc.c:1646  */
     {
 				Menu = pcb_lib_net_new((pcb_lib_t *)&yyPCB->NetlistLib, (yyvsp[-3].string), (yyvsp[-2].string));
 				free ((yyvsp[-3].string));
 				free ((yyvsp[-2].string));
 			}
-#line 2870 "parse_y.c" /* yacc.c:1646  */
+#line 2869 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 189:
-#line 1940 "parse_y.y" /* yacc.c:1646  */
+#line 1939 "parse_y.y" /* yacc.c:1646  */
     {
 				pcb_lib_conn_new(Menu, (yyvsp[-1].string));
 				free ((yyvsp[-1].string));
 			}
-#line 2879 "parse_y.c" /* yacc.c:1646  */
+#line 2878 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 197:
-#line 1987 "parse_y.y" /* yacc.c:1646  */
+#line 1986 "parse_y.y" /* yacc.c:1646  */
     { pcb_ratspatch_append(yyPCB, RATP_ADD_CONN, (yyvsp[-2].string), (yyvsp[-1].string), NULL); free((yyvsp[-2].string)); free((yyvsp[-1].string)); }
-#line 2885 "parse_y.c" /* yacc.c:1646  */
+#line 2884 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 198:
-#line 1988 "parse_y.y" /* yacc.c:1646  */
+#line 1987 "parse_y.y" /* yacc.c:1646  */
     { pcb_ratspatch_append(yyPCB, RATP_DEL_CONN, (yyvsp[-2].string), (yyvsp[-1].string), NULL); free((yyvsp[-2].string)); free((yyvsp[-1].string)); }
-#line 2891 "parse_y.c" /* yacc.c:1646  */
+#line 2890 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 199:
-#line 1989 "parse_y.y" /* yacc.c:1646  */
+#line 1988 "parse_y.y" /* yacc.c:1646  */
     { pcb_ratspatch_append(yyPCB, RATP_CHANGE_ATTRIB, (yyvsp[-3].string), (yyvsp[-2].string), (yyvsp[-1].string)); free((yyvsp[-3].string)); free((yyvsp[-2].string)); free((yyvsp[-1].string)); }
-#line 2897 "parse_y.c" /* yacc.c:1646  */
+#line 2896 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 200:
-#line 2017 "parse_y.y" /* yacc.c:1646  */
+#line 2016 "parse_y.y" /* yacc.c:1646  */
     {
 				char *old_val, *key = (yyvsp[-2].string), *val = (yyvsp[-1].string) ? (yyvsp[-1].string) : (char *)"";
 				old_val = pcb_attribute_get(attr_list, key);
@@ -2908,95 +2907,95 @@
 				free(key);
 				free(val);
 			}
-#line 2912 "parse_y.c" /* yacc.c:1646  */
+#line 2911 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 201:
-#line 2029 "parse_y.y" /* yacc.c:1646  */
+#line 2028 "parse_y.y" /* yacc.c:1646  */
     { (yyval.string) = (yyvsp[0].string); }
-#line 2918 "parse_y.c" /* yacc.c:1646  */
+#line 2917 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 202:
-#line 2030 "parse_y.y" /* yacc.c:1646  */
+#line 2029 "parse_y.y" /* yacc.c:1646  */
     { (yyval.string) = 0; }
-#line 2924 "parse_y.c" /* yacc.c:1646  */
+#line 2923 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 203:
-#line 2034 "parse_y.y" /* yacc.c:1646  */
+#line 2033 "parse_y.y" /* yacc.c:1646  */
     { (yyval.number) = (yyvsp[0].number); }
-#line 2930 "parse_y.c" /* yacc.c:1646  */
+#line 2929 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 204:
-#line 2035 "parse_y.y" /* yacc.c:1646  */
+#line 2034 "parse_y.y" /* yacc.c:1646  */
     { (yyval.number) = (yyvsp[0].integer); }
-#line 2936 "parse_y.c" /* yacc.c:1646  */
+#line 2935 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 205:
-#line 2040 "parse_y.y" /* yacc.c:1646  */
+#line 2039 "parse_y.y" /* yacc.c:1646  */
     { do_measure(&(yyval.measure), (yyvsp[0].number), PCB_MIL_TO_COORD ((yyvsp[0].number)) / 100.0, 0); }
-#line 2942 "parse_y.c" /* yacc.c:1646  */
+#line 2941 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 206:
-#line 2041 "parse_y.y" /* yacc.c:1646  */
+#line 2040 "parse_y.y" /* yacc.c:1646  */
     { M ((yyval.measure), (yyvsp[-1].number), PCB_MIL_TO_COORD ((yyvsp[-1].number)) / 100000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
-#line 2948 "parse_y.c" /* yacc.c:1646  */
+#line 2947 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 207:
-#line 2042 "parse_y.y" /* yacc.c:1646  */
+#line 2041 "parse_y.y" /* yacc.c:1646  */
     { M ((yyval.measure), (yyvsp[-1].number), PCB_MIL_TO_COORD ((yyvsp[-1].number)) / 100.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
-#line 2954 "parse_y.c" /* yacc.c:1646  */
+#line 2953 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 208:
-#line 2043 "parse_y.y" /* yacc.c:1646  */
+#line 2042 "parse_y.y" /* yacc.c:1646  */
     { M ((yyval.measure), (yyvsp[-1].number), PCB_MIL_TO_COORD ((yyvsp[-1].number))); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
-#line 2960 "parse_y.c" /* yacc.c:1646  */
+#line 2959 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 209:
-#line 2044 "parse_y.y" /* yacc.c:1646  */
+#line 2043 "parse_y.y" /* yacc.c:1646  */
     { M ((yyval.measure), (yyvsp[-1].number), PCB_INCH_TO_COORD ((yyvsp[-1].number))); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
-#line 2966 "parse_y.c" /* yacc.c:1646  */
+#line 2965 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 210:
-#line 2045 "parse_y.y" /* yacc.c:1646  */
+#line 2044 "parse_y.y" /* yacc.c:1646  */
     { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) / 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_NANOMETER; }
-#line 2972 "parse_y.c" /* yacc.c:1646  */
+#line 2971 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 211:
-#line 2046 "parse_y.y" /* yacc.c:1646  */
+#line 2045 "parse_y.y" /* yacc.c:1646  */
     { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) / 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
-#line 2978 "parse_y.c" /* yacc.c:1646  */
+#line 2977 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 212:
-#line 2047 "parse_y.y" /* yacc.c:1646  */
+#line 2046 "parse_y.y" /* yacc.c:1646  */
     { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number))); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
-#line 2984 "parse_y.c" /* yacc.c:1646  */
+#line 2983 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 213:
-#line 2048 "parse_y.y" /* yacc.c:1646  */
+#line 2047 "parse_y.y" /* yacc.c:1646  */
     { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) * 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
-#line 2990 "parse_y.c" /* yacc.c:1646  */
+#line 2989 "parse_y.c" /* yacc.c:1646  */
     break;
 
   case 214:
-#line 2049 "parse_y.y" /* yacc.c:1646  */
+#line 2048 "parse_y.y" /* yacc.c:1646  */
     { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) * 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
-#line 2996 "parse_y.c" /* yacc.c:1646  */
+#line 2995 "parse_y.c" /* yacc.c:1646  */
     break;
 
 
-#line 3000 "parse_y.c" /* yacc.c:1646  */
+#line 2999 "parse_y.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -3224,7 +3223,7 @@
 #endif
   return yyresult;
 }
-#line 2052 "parse_y.y" /* yacc.c:1906  */
+#line 2051 "parse_y.y" /* yacc.c:1906  */
 
 
 /* ---------------------------------------------------------------------------
Index: trunk/src_plugins/io_pcb/parse_y.h
===================================================================
--- trunk/src_plugins/io_pcb/parse_y.h	(revision 15843)
+++ trunk/src_plugins/io_pcb/parse_y.h	(revision 15844)
@@ -101,7 +101,7 @@
 typedef union YYSTYPE YYSTYPE;
 union YYSTYPE
 {
-#line 120 "parse_y.y" /* yacc.c:1909  */
+#line 119 "parse_y.y" /* yacc.c:1909  */
 
 	int		integer;
 	double		number;
Index: trunk/src_plugins/io_pcb/parse_y.y
===================================================================
--- trunk/src_plugins/io_pcb/parse_y.y	(revision 15843)
+++ trunk/src_plugins/io_pcb/parse_y.y	(revision 15844)
@@ -58,7 +58,6 @@
 #include "rats_patch.h"
 #include "route_style.h"
 #include "compat_misc.h"
-#include "obj_all.h"
 #include "src_plugins/lib_compat_help/pstk_compat.h"
 
 static	pcb_layer_t *Layer;
Index: trunk/src_plugins/lib_gtk_common/dlg_drc.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_drc.c	(revision 15843)
+++ trunk/src_plugins/lib_gtk_common/dlg_drc.c	(revision 15844)
@@ -41,7 +41,6 @@
 #include "dlg_drc.h"
 #include "hid_actions.h"
 #include "compat_nls.h"
-#include "obj_all.h"
 #include "obj_pstk_draw.h"
 #include "obj_rat_draw.h"
 #include "obj_line_draw.h"
Index: trunk/src_plugins/lib_gtk_common/dlg_netlist.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_netlist.c	(revision 15843)
+++ trunk/src_plugins/lib_gtk_common/dlg_netlist.c	(revision 15844)
@@ -53,7 +53,6 @@
 #include "undo.h"
 #include "hid_actions.h"
 #include "compat_nls.h"
-#include "obj_all.h"
 
 #include "util_str.h"
 #include "win_place.h"
Index: trunk/src_plugins/lib_gtk_common/dlg_propedit.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_propedit.c	(revision 15843)
+++ trunk/src_plugins/lib_gtk_common/dlg_propedit.c	(revision 15844)
@@ -37,7 +37,6 @@
 #include "compat_misc.h"
 #include "compat_nls.h"
 #include "polygon.h"
-#include "obj_all.h"
 #include "board.h"
 #include "data.h"
 #include "conf_core.h"
Index: trunk/src_plugins/lib_gtk_common/dlg_route_style.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_route_style.c	(revision 15843)
+++ trunk/src_plugins/lib_gtk_common/dlg_route_style.c	(revision 15844)
@@ -36,7 +36,6 @@
 #include "compat_misc.h"
 #include "compat_nls.h"
 #include "polygon.h"
-#include "obj_all.h"
 
 #include "bu_box.h"
 #include "compat.h"
Index: trunk/src_plugins/lib_gtk_common/wt_preview.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/wt_preview.c	(revision 15843)
+++ trunk/src_plugins/lib_gtk_common/wt_preview.c	(revision 15844)
@@ -46,7 +46,6 @@
 #include "draw.h"
 #include "move.h"
 #include "rotate.h"
-#include "obj_all.h"
 #include "macro.h"
 
 static void preview_set_view(pcb_gtk_preview_t * preview)
Index: trunk/src_plugins/puller/puller.c
===================================================================
--- trunk/src_plugins/puller/puller.c	(revision 15843)
+++ trunk/src_plugins/puller/puller.c	(revision 15844)
@@ -73,7 +73,6 @@
 #include "plugins.h"
 #include "hid_actions.h"
 #include "misc_util.h"
-#include "obj_all.h"
 #include "compat_misc.h"
 #include "obj_pstk_inlines.h"
 #include "search.h"
Index: trunk/src_plugins/report/report.c
===================================================================
--- trunk/src_plugins/report/report.c	(revision 15843)
+++ trunk/src_plugins/report/report.c	(revision 15844)
@@ -60,7 +60,6 @@
 #include "compat_misc.h"
 #include "compat_nls.h"
 #include "layer.h"
-#include "obj_all.h"
 #include "obj_term.h"
 #include "obj_pstk.h"
 #include "obj_pstk_inlines.h"
Index: trunk/src_plugins/teardrops/teardrops.c
===================================================================
--- trunk/src_plugins/teardrops/teardrops.c	(revision 15843)
+++ trunk/src_plugins/teardrops/teardrops.c	(revision 15844)
@@ -24,7 +24,6 @@
 #include "undo.h"
 #include "plugins.h"
 #include "hid_actions.h"
-#include "obj_all.h"
 #include "obj_pstk_inlines.h"
 
 #define MIN_LINE_LENGTH 700