Index: trunk/src/Makefile.dep
===================================================================
--- trunk/src/Makefile.dep	(revision 15925)
+++ trunk/src/Makefile.dep	(revision 15926)
@@ -1,8 +1,8 @@
 ### Generated file, do not edit, run make dep ###
 
 ../src_plugins/acompnet/acompnet.o: ../src_plugins/acompnet/acompnet.c \
- ../config.h board.h macro.h global_typedefs.h pcb_bool.h unit.h \
- vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../config.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -25,8 +25,8 @@
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h list_conf.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 macro.h global_typedefs.h pcb_bool.h unit.h \
- vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../config.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -58,12 +58,12 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h compat_nls.h board.h \
  vtroutestyle.h library.h rats_patch.h board.h event.h dolists.h
 ../src_plugins/autoplace/autoplace.o: \
- ../src_plugins/autoplace/autoplace.c ../config.h board.h macro.h \
+ ../src_plugins/autoplace/autoplace.c ../config.h board.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -85,7 +85,7 @@
  rats.h netlist.h route_style.h remove.h rotate.h compat_misc.h obj_rat.h \
  obj_term.h obj_pstk_inlines.h data.h thermal.h data_it.h
 ../src_plugins/autoroute/action.o: ../src_plugins/autoroute/action.c \
- ../config.h ../src_plugins/autoroute/autoroute.h board.h macro.h \
+ ../config.h ../src_plugins/autoroute/autoroute.h board.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -114,7 +114,7 @@
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
  obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
  ../src_3rd/libminuid/libminuid.h rtree.h \
@@ -130,7 +130,7 @@
  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 \
+ move.h obj_common.h flag.h globalconst.h attrib.h data_parent.h \
  misc_util.h heap.h rtree.h ../src_3rd/genrtree/genrtree_api.h \
  rtree2_compat.h ../src_plugins/autoroute/mtspace.h \
  ../src_plugins/autoroute/vector.h
@@ -137,7 +137,7 @@
 ../src_plugins/autoroute/vector.o: ../src_plugins/autoroute/vector.c \
  ../config.h math_helper.h ../src_plugins/autoroute/vector.h macro.h
 ../src_plugins/boardflip/boardflip.o: \
- ../src_plugins/boardflip/boardflip.c ../config.h board.h macro.h \
+ ../src_plugins/boardflip/boardflip.c ../config.h board.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -161,8 +161,8 @@
  ../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 macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
- attrib.h ../src_3rd/genvector/genvector_impl.h \
+ board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -187,7 +187,7 @@
  ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h error.h event.h \
  ../src_plugins/diag/integrity.h hid.h hid_attrib.h hid_dad.h \
  compat_misc.h hid_attrib.h search.h rats.h netlist.h route_style.h \
- dolists.h ../src_plugins/diag/diag_conf_fields.h
+ macro.h dolists.h ../src_plugins/diag/diag_conf_fields.h
 ../src_plugins/diag/diag_conf.o: ../src_plugins/diag/diag_conf.c \
  ../config.h conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
@@ -198,8 +198,8 @@
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h
 ../src_plugins/diag/integrity.o: ../src_plugins/diag/integrity.c \
- ../config.h board.h macro.h global_typedefs.h pcb_bool.h unit.h \
- vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../config.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -222,8 +222,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h hid_attrib.h hid.h \
  hid_actions.h hid_dad.h compat_misc.h hid_attrib.h pcb-printf.h \
@@ -243,7 +243,7 @@
  ../src_plugins/dialogs/dlg_padstack.c obj_pstk.h obj_pstk_op.h \
  operation.h obj_pstk_inlines.h data.h thermal.h operation.h dolists.h
 ../src_plugins/distalign/distalign.o: \
- ../src_plugins/distalign/distalign.c board.h ../config.h macro.h \
+ ../src_plugins/distalign/distalign.c board.h ../config.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -264,10 +264,10 @@
  undo_old.h rats.h netlist.h route_style.h error.h move.h draw.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 action_helper.h \
- hid_actions.h compat_misc.h dolists.h
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h macro.h \
+ action_helper.h hid_actions.h compat_misc.h dolists.h
 ../src_plugins/distaligntext/distaligntext.o: \
- ../src_plugins/distaligntext/distaligntext.c ../config.h board.h macro.h \
+ ../src_plugins/distaligntext/distaligntext.c ../config.h board.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -292,7 +292,7 @@
  hid_actions.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 list_conf.h \
- box.h compat_misc.h dolists.h
+ box.h macro.h compat_misc.h dolists.h
 ../src_plugins/djopt/djopt.o: ../src_plugins/djopt/djopt.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 \
@@ -301,16 +301,15 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 macro.h \
- vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h board.h data.h \
- crosshair.h vtonpoint.h hid.h error.h drc.h route.h buffer.h \
- obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
- ../src_3rd/libminuid/libminuid.h rtree.h \
- ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ 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 remove.h move.h \
  draw.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h flag_str.h find.h \
@@ -318,11 +317,11 @@
  ../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_flags.h hid_actions.h \
- ../src_plugins/djopt/djopt_conf.h conf.h obj_line.h event.h \
+ ../src_plugins/djopt/djopt_conf.h conf.h obj_line.h event.h macro.h \
  obj_pstk_inlines.h data.h thermal.h dolists.h \
  ../src_plugins/djopt/djopt_conf_fields.h
 ../src_plugins/draw_csect/draw_csect.o: \
- ../src_plugins/draw_csect/draw_csect.c ../config.h board.h macro.h \
+ ../src_plugins/draw_csect/draw_csect.c ../config.h board.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -345,8 +344,8 @@
  ../src_3rd/puplug/error.h stub_draw.h compat_misc.h hid_actions.h \
  event.h layer_vis.h obj_text_draw.h obj_line_draw.h dolists.h
 ../src_plugins/draw_fab/draw_fab.o: ../src_plugins/draw_fab/draw_fab.c \
- ../config.h board.h macro.h global_typedefs.h pcb_bool.h unit.h \
- vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../config.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -369,10 +368,10 @@
  ../src_plugins/draw_fab/draw_fab_conf.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 obj_pstk_inlines.h data.h thermal.h obj_text_draw.h \
- ../src_plugins/draw_fab/draw_fab_conf_fields.h
+ conf.h conf_core.h macro.h obj_pstk_inlines.h data.h thermal.h \
+ obj_text_draw.h ../src_plugins/draw_fab/draw_fab_conf_fields.h
 ../src_plugins/draw_fontsel/draw_fontsel.o: \
- ../src_plugins/draw_fontsel/draw_fontsel.c ../config.h board.h macro.h \
+ ../src_plugins/draw_fontsel/draw_fontsel.c ../config.h board.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -399,7 +398,7 @@
  obj_text.h obj_text_draw.h obj_line_draw.h
 ../src_plugins/export_bboard/bboard.o: \
  ../src_plugins/export_bboard/bboard.c ../config.h math_helper.h board.h \
- macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -430,7 +429,7 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 build_run.h board.h macro.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h build_run.h board.h \
  vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
  data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
  obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
@@ -446,11 +445,11 @@
  ../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 safe_fs.h hid.h hid_nogui.h \
- hid_attrib.h hid_helper.h hid_init.h
+ hid_attrib.h hid_helper.h hid_init.h macro.h
 ../src_plugins/export_dsn/dsn.o: ../src_plugins/export_dsn/dsn.c \
  ../config.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
- ../src_3rd/genvector/genvector_undef.h board.h macro.h global_typedefs.h \
+ ../src_3rd/genvector/genvector_undef.h board.h global_typedefs.h \
  pcb_bool.h unit.h vtroutestyle.h attrib.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -485,13 +484,13 @@
  ../src_3rd/genht/ht.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 math_helper.h board.h \
- macro.h vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h \
- flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
- obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
- obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
- math_helper.h move.h misc_util.h layer_grp.h library.h rats_patch.h \
- board.h data.h crosshair.h vtonpoint.h hid.h error.h drc.h route.h \
- buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h library.h rats_patch.h board.h data.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
  ../src_3rd/libminuid/libminuid.h 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 \
@@ -520,8 +519,8 @@
  ../src_3rd/genht/ht.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 ../src_3rd/genht/htsi.h \
- math_helper.h board.h macro.h vtroutestyle.h attrib.h layer.h \
- obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ math_helper.h board.h vtroutestyle.h attrib.h layer.h obj_arc_list.h \
+ obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
  ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
@@ -560,7 +559,7 @@
  ../src_3rd/genlist/gendlist.h globalconst.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 board.h macro.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h board.h \
  vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
  data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
  obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
@@ -589,7 +588,7 @@
  compat_cc.h
 ../src_plugins/export_gerber/gerber.o: \
  ../src_plugins/export_gerber/gerber.c ../config.h math_helper.h board.h \
- macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -612,10 +611,10 @@
  compat_misc.h safe_fs.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 \
- hid.h hid_nogui.h hid_draw_helpers.h hid_init.h hid_attrib.h hid_flags.h \
- conf_core.h
+ macro.h hid.h hid_nogui.h hid_draw_helpers.h hid_init.h hid_attrib.h \
+ hid_flags.h conf_core.h
 ../src_plugins/export_ipcd356/ipcd356.o: \
- ../src_plugins/export_ipcd356/ipcd356.c ../config.h board.h macro.h \
+ ../src_plugins/export_ipcd356/ipcd356.c ../config.h board.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -647,8 +646,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
  error.h drc.h layer_grp.h route.h buffer.h obj_rat_list.h obj_rat.h \
@@ -666,8 +665,8 @@
  ../src_plugins/export_lpr/../export_ps/ps.h hid_nogui.h hid_init.h \
  hid_attrib.h hid_actions.h
 ../src_plugins/export_nelma/nelma.o: ../src_plugins/export_nelma/nelma.c \
- ../config.h board.h macro.h global_typedefs.h pcb_bool.h unit.h \
- vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../config.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -700,16 +699,15 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 macro.h \
- vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h board.h data.h \
- crosshair.h vtonpoint.h hid.h error.h drc.h route.h buffer.h \
- obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
- ../src_3rd/libminuid/libminuid.h rtree.h \
- ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ 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 data_it.h data.h \
  compat_misc.h plugins.h ../src_3rd/puplug/puplug.h \
@@ -728,8 +726,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h vtc0.h vtr0.h layer_ui.h layer.h \
  board.h vtroutestyle.h layer_grp.h library.h rats_patch.h board.h data.h \
@@ -750,8 +748,8 @@
  ../src_3rd/genht/ht.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 ../src_3rd/genvector/vti0.h \
- compat_misc.h board.h macro.h vtroutestyle.h attrib.h layer.h \
- obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ compat_misc.h board.h vtroutestyle.h attrib.h layer.h obj_arc_list.h \
+ obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
  ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
@@ -779,16 +777,15 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 macro.h \
- vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h board.h data.h \
- crosshair.h vtonpoint.h hid.h error.h drc.h route.h buffer.h \
- obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
- ../src_3rd/libminuid/libminuid.h rtree.h \
- ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ 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 error.h layer.h \
  misc_util.h compat_misc.h plugins.h ../src_3rd/puplug/puplug.h \
@@ -807,13 +804,13 @@
  ../src_3rd/genht/ht.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 math_helper.h board.h \
- macro.h vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h \
- flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
- obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
- obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
- math_helper.h move.h misc_util.h layer_grp.h library.h rats_patch.h \
- board.h data.h crosshair.h vtonpoint.h hid.h error.h drc.h route.h \
- buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h library.h rats_patch.h board.h data.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
  ../src_3rd/libminuid/libminuid.h 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 \
@@ -822,8 +819,8 @@
  ../src_plugins/export_ps/ps.h hid_init.h hid_attrib.h hid_helper.h \
  hid_flags.h hid_color.h
 ../src_plugins/export_ps/ps.o: ../src_plugins/export_ps/ps.c ../config.h \
- math_helper.h board.h macro.h global_typedefs.h pcb_bool.h unit.h \
- vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ math_helper.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -858,10 +855,10 @@
  ../src_3rd/genht/ht.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 ../src_3rd/genht/htsi.h \
- ../src_3rd/genht/hash.h math_helper.h board.h macro.h vtroutestyle.h \
- attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
- obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
- obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/hash.h math_helper.h board.h vtroutestyle.h attrib.h \
+ layer.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
  ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
  vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
@@ -885,13 +882,13 @@
  ../src_3rd/genht/ht.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 math_helper.h board.h \
- macro.h vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h \
- flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
- obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
- obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
- math_helper.h move.h misc_util.h layer_grp.h library.h rats_patch.h \
- board.h data.h crosshair.h vtonpoint.h hid.h error.h drc.h route.h \
- buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h library.h rats_patch.h board.h data.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
  ../src_3rd/libminuid/libminuid.h 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 \
@@ -910,7 +907,7 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 build_run.h board.h macro.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h build_run.h board.h \
  vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
  data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
  obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
@@ -936,15 +933,15 @@
  ../src_3rd/genht/ht.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 math_helper.h build_run.h \
- board.h macro.h vtroutestyle.h attrib.h layer.h obj_arc_list.h \
- obj_common.h flag.h data_parent.h obj_arc.h \
- ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
- obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
- layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
- vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
- obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
- rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ board.h vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h \
+ flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h error.h drc.h route.h \
+ buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h 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 data_it.h data.h \
  error.h pcb-printf.h plugins.h ../src_3rd/puplug/puplug.h \
@@ -951,8 +948,9 @@
  ../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 obj_pstk_inlines.h thermal.h \
- layer.h netlist.h route_style.h safe_fs.h hid.h hid_nogui.h hid_attrib.h \
- hid_helper.h hid_init.h ../src_plugins/lib_compat_help/elem_rot.h \
+ layer.h netlist.h route_style.h safe_fs.h macro.h hid.h hid_nogui.h \
+ hid_attrib.h hid_helper.h hid_init.h \
+ ../src_plugins/lib_compat_help/elem_rot.h \
  ../src_plugins/export_xy/default_templ.h
 ../src_plugins/extedit/extedit.o: ../src_plugins/extedit/extedit.c \
  ../config.h hid.h error.h drc.h unit.h global_typedefs.h pcb_bool.h \
@@ -961,8 +959,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h hid_attrib.h hid.h \
  hid_actions.h hid_dad.h compat_misc.h hid_attrib.h pcb-printf.h \
@@ -991,16 +989,15 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 macro.h \
- vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h board.h data.h \
- crosshair.h vtonpoint.h hid.h error.h drc.h route.h buffer.h \
- obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
- ../src_3rd/libminuid/libminuid.h rtree.h \
- ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ 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 draw.h flag.h \
  layer.h move.h remove.h rtree.h flag_str.h undo.h \
@@ -1015,7 +1012,7 @@
  ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
  ../src_3rd/puplug/error.h plug_footprint.h vtlibrary.h \
  ../src_3rd/genvector/genvector_impl.h \
- ../src_3rd/genvector/genvector_undef.h board.h macro.h global_typedefs.h \
+ ../src_3rd/genvector/genvector_undef.h board.h global_typedefs.h \
  pcb_bool.h unit.h vtroutestyle.h attrib.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -1042,7 +1039,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
  error.h drc.h layer_grp.h route.h buffer.h obj_rat_list.h obj_rat.h \
@@ -1118,8 +1115,8 @@
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h
 ../src_plugins/hid_batch/batch.o: ../src_plugins/hid_batch/batch.c \
- ../config.h board.h macro.h global_typedefs.h pcb_bool.h unit.h \
- vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../config.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -1152,9 +1149,9 @@
  hid.h error.h drc.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
  data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
  obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h macro.h \
- move.h misc_util.h layer_grp.h route.h clip.h data.h crosshair.h \
- buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h route.h clip.h data.h crosshair.h buffer.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
  ../src_3rd/libminuid/libminuid.h 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 \
@@ -1196,8 +1193,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h layer_grp.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.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 \
@@ -1239,17 +1236,16 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h layer_grp.h \
- route.h clip.h data.h crosshair.h buffer.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 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 layer.h hid_draw_helpers.h \
- hid_attrib.h hid_helper.h hid_color.h \
- ../src_plugins/lib_gtk_config/hid_gtk_conf.h conf.h pcb-printf.h \
- ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h layer_grp.h route.h clip.h \
+ data.h crosshair.h buffer.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 \
+ 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 layer.h hid_draw_helpers.h hid_attrib.h hid_helper.h \
+ hid_color.h ../src_plugins/lib_gtk_config/hid_gtk_conf.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 ../src_plugins/lib_gtk_config/lib_gtk_config.h hid.h event.h \
  conf_hid.h ../src_plugins/lib_gtk_common/glue.h \
@@ -1290,8 +1286,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h layer_grp.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.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 \
@@ -1337,9 +1333,9 @@
  hid.h error.h drc.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
  data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
  obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h macro.h \
- move.h misc_util.h layer_grp.h route.h clip.h data.h crosshair.h \
- buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h route.h clip.h data.h crosshair.h buffer.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
  ../src_3rd/libminuid/libminuid.h 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 \
@@ -1381,8 +1377,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h layer_grp.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.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 \
@@ -1427,8 +1423,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h layer_grp.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.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 \
@@ -1474,7 +1470,7 @@
  attrib.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
  obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
  ../src_3rd/libminuid/libminuid.h rtree.h \
@@ -1501,7 +1497,7 @@
  attrib.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
  obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
  ../src_3rd/libminuid/libminuid.h rtree.h \
@@ -1525,7 +1521,7 @@
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
  obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
  ../src_3rd/libminuid/libminuid.h rtree.h \
@@ -1535,8 +1531,8 @@
  crosshair.h conf_hid.h layer.h pcb-printf.h clip.h event.h error.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 safe_fs.h hid.h \
- hid_nogui.h hid_draw_helpers.h hid_cfg.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h macro.h safe_fs.h \
+ hid.h hid_nogui.h hid_draw_helpers.h hid_cfg.h \
  ../src_plugins/hid_lesstif/lesstif.h hid_cfg_input.h \
  ../src_3rd/genht/htpp.h hid_cfg.h compat_nls.h board.h vtroutestyle.h \
  library.h rats_patch.h board.h hid_attrib.h hid_helper.h hid_init.h \
@@ -1557,7 +1553,7 @@
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
  obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
  ../src_3rd/libminuid/libminuid.h rtree.h \
@@ -1580,7 +1576,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
  error.h drc.h layer_grp.h route.h buffer.h obj_rat_list.h obj_rat.h \
@@ -1612,7 +1608,7 @@
  attrib.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
  obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
  ../src_3rd/libminuid/libminuid.h rtree.h \
@@ -1638,11 +1634,11 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h layer_grp.h layer.h
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h layer.h
 ../src_plugins/hid_remote/remote.o: ../src_plugins/hid_remote/remote.c \
- ../config.h board.h macro.h global_typedefs.h pcb_bool.h unit.h \
- vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../config.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -1677,8 +1673,8 @@
 ../src_plugins/import_dsn/dsn.o: ../src_plugins/import_dsn/dsn.c \
  ../config.h ../src_3rd/gensexpr/gsxl.h \
  ../src_3rd/gensexpr/gensexpr_impl.h ../src_3rd/gensexpr/gsx_parse.h \
- board.h macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
- attrib.h ../src_3rd/genvector/genvector_impl.h \
+ board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -1702,8 +1698,8 @@
  ../src_3rd/puplug/error.h ../src_plugins/lib_compat_help/pstk_compat.h \
  obj_pstk.h dolists.h
 ../src_plugins/import_edif/edif.o: ../src_plugins/import_edif/edif.c \
- math_helper.h board.h ../config.h macro.h global_typedefs.h pcb_bool.h \
- unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ math_helper.h board.h ../config.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -1725,7 +1721,7 @@
  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
 ../src_plugins/import_edif/import_edif.o: \
- ../src_plugins/import_edif/import_edif.c ../config.h board.h macro.h \
+ ../src_plugins/import_edif/import_edif.c ../config.h board.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -1751,9 +1747,8 @@
  netlist.h route_style.h rats_patch.h plug_io.h
 ../src_plugins/import_hpgl/hpgl.o: ../src_plugins/import_hpgl/hpgl.c \
  ../config.h ../src_3rd/libuhpgl/libuhpgl.h ../src_3rd/libuhpgl/parse.h \
- ../src_3rd/libuhpgl/libuhpgl.h board.h macro.h global_typedefs.h \
- pcb_bool.h unit.h vtroutestyle.h attrib.h \
- ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/libuhpgl/libuhpgl.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -1777,8 +1772,8 @@
  ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h hid.h dolists.h
 ../src_plugins/import_ltspice/ltspice.o: \
  ../src_plugins/import_ltspice/ltspice.c ../config.h \
- ../src_3rd/qparse/qparse.h board.h macro.h global_typedefs.h pcb_bool.h \
- unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/qparse/qparse.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -1802,7 +1797,7 @@
  ../src_3rd/puplug/error.h hid.h dolists.h
 ../src_plugins/import_mentor_sch/mentor_sch.o: \
  ../src_plugins/import_mentor_sch/mentor_sch.c ../config.h board.h \
- macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -1847,13 +1842,13 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
- math_helper.h macro.h move.h misc_util.h layer_grp.h safe_fs.h conf.h \
+ math_helper.h move.h misc_util.h layer_grp.h safe_fs.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/genvector/vtp0.h list_conf.h
 ../src_plugins/import_mucs/mucs.o: ../src_plugins/import_mucs/mucs.c \
- ../config.h board.h macro.h global_typedefs.h pcb_bool.h unit.h \
- vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../config.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -1878,7 +1873,7 @@
  ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h dolists.h
 ../src_plugins/import_netlist/import_netlist.o: \
  ../src_plugins/import_netlist/import_netlist.c ../config.h board.h \
- macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -1900,7 +1895,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 rats_patch.h \
- compat_misc.h compat_nls.h paths.h safe_fs.h
+ compat_misc.h compat_nls.h paths.h safe_fs.h macro.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 \
@@ -1910,16 +1905,15 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 macro.h \
- vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h board.h data.h \
- crosshair.h vtonpoint.h hid.h error.h drc.h route.h buffer.h \
- obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
- ../src_3rd/libminuid/libminuid.h rtree.h \
- ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ 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 action_helper.h \
  change.h error.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h plugins.h \
@@ -1932,8 +1926,8 @@
  ../src_plugins/import_sch/import_sch_conf_fields.h
 ../src_plugins/import_tinycad/tinycad.o: \
  ../src_plugins/import_tinycad/tinycad.c ../config.h \
- ../src_3rd/qparse/qparse.h board.h macro.h global_typedefs.h pcb_bool.h \
- unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/qparse/qparse.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -1971,10 +1965,10 @@
  globalconst.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 obj_line_list.h \
  obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h macro.h \
- move.h misc_util.h crosshair.h vtonpoint.h hid.h error.h drc.h \
- layer_grp.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
- obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h \
+ route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h 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 \
@@ -1982,7 +1976,7 @@
  rats_patch.h board.h netlist.h route_style.h conf_core.h buffer.h hid.h \
  action_helper.h compat_misc.h
 ../src_plugins/io_autotrax/read.o: ../src_plugins/io_autotrax/read.c \
- ../config.h ../src_3rd/qparse/qparse.h compat_misc.h board.h macro.h \
+ ../config.h ../src_3rd/qparse/qparse.h compat_misc.h board.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -2009,8 +2003,8 @@
  ../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 macro.h global_typedefs.h pcb_bool.h \
- unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../config.h compat_misc.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -2049,8 +2043,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h plug_io.h library.h \
  conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
@@ -2060,8 +2054,8 @@
  board.h vtroutestyle.h rats_patch.h board.h conf.h \
  ../src_plugins/io_eagle/read_dru.h hid_actions.h hid.h dolists.h
 ../src_plugins/io_eagle/read.o: ../src_plugins/io_eagle/read.c \
- ../config.h board.h macro.h global_typedefs.h pcb_bool.h unit.h \
- vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../config.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -2097,12 +2091,12 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 safe_fs.h board.h macro.h vtroutestyle.h \
- attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h rats_patch.h board.h layer_grp.h error.h
+ ../src_3rd/genlist/gendlist.h safe_fs.h board.h vtroutestyle.h attrib.h \
+ layer.h globalconst.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h rats_patch.h board.h layer_grp.h error.h
 ../src_plugins/io_eagle/trparse_bin.o: \
  ../src_plugins/io_eagle/trparse_bin.c ../config.h error.h safe_fs.h \
  conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
@@ -2128,8 +2122,8 @@
  ../src_plugins/io_eagle/trparse_xml.h
 ../src_plugins/io_hyp/hyp_l.o: ../src_plugins/io_hyp/hyp_l.c \
  ../src_plugins/io_hyp/hyp_y.h ../src_plugins/io_hyp/parser.h pcb_bool.h \
- board.h ../config.h macro.h global_typedefs.h pcb_bool.h unit.h \
- vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ board.h ../config.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -2140,7 +2134,7 @@
  ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
  board.h
 ../src_plugins/io_hyp/hyp_y.o: ../src_plugins/io_hyp/hyp_y.c \
- ../src_plugins/io_hyp/parser.h pcb_bool.h board.h ../config.h macro.h \
+ ../src_plugins/io_hyp/parser.h pcb_bool.h board.h ../config.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -2160,7 +2154,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h hid_draw_helpers.h \
  hid_nogui.h hid_actions.h hid.h hid_init.h hid_attrib.h hid_helper.h \
@@ -2174,7 +2168,7 @@
  pcb_bool.h board.h vtroutestyle.h rats_patch.h board.h \
  ../src_plugins/io_hyp/write.h dolists.h
 ../src_plugins/io_hyp/parser.o: ../src_plugins/io_hyp/parser.c \
- ../src_plugins/io_hyp/parser.h pcb_bool.h board.h ../config.h macro.h \
+ ../src_plugins/io_hyp/parser.h pcb_bool.h board.h ../config.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -2208,10 +2202,10 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 board.h macro.h vtroutestyle.h attrib.h \
- layer.h globalconst.h obj_arc_list.h obj_common.h flag.h data_parent.h \
- obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
- obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genlist/gendlist.h board.h vtroutestyle.h attrib.h layer.h \
+ globalconst.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
  ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  layer_grp.h rats_patch.h board.h data.h crosshair.h vtonpoint.h hid.h \
  error.h drc.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
@@ -2238,10 +2232,10 @@
  globalconst.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 obj_line_list.h \
  obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h macro.h \
- move.h misc_util.h crosshair.h vtonpoint.h hid.h error.h drc.h \
- layer_grp.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
- obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h \
+ route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h 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 \
@@ -2250,7 +2244,7 @@
 ../src_plugins/io_kicad/read.o: ../src_plugins/io_kicad/read.c \
  ../src_3rd/gensexpr/gsxl.h ../src_3rd/gensexpr/gensexpr_impl.h \
  ../src_3rd/gensexpr/gsx_parse.h ../src_3rd/genht/htsi.h \
- ../src_3rd/genht/ht.h compat_misc.h ../config.h board.h macro.h \
+ ../src_3rd/genht/ht.h compat_misc.h ../config.h board.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -2279,8 +2273,8 @@
 ../src_plugins/io_kicad/read_net.o: ../src_plugins/io_kicad/read_net.c \
  ../config.h ../src_3rd/gensexpr/gsxl.h \
  ../src_3rd/gensexpr/gensexpr_impl.h ../src_3rd/gensexpr/gsx_parse.h \
- ../src_plugins/io_kicad/read_net.h unit.h board.h macro.h \
- global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_plugins/io_kicad/read_net.h unit.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -2307,8 +2301,8 @@
  ../src_3rd/genht/hash.h ../config.h ../src_plugins/io_kicad/uniq_name.h \
  ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h compat_misc.h
 ../src_plugins/io_kicad/write.o: ../src_plugins/io_kicad/write.c \
- ../config.h compat_misc.h board.h macro.h global_typedefs.h pcb_bool.h \
- unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../config.h compat_misc.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -2346,16 +2340,16 @@
  data.h globalconst.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 obj_line_list.h \
  obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h macro.h \
- move.h misc_util.h crosshair.h vtonpoint.h hid.h error.h drc.h \
- layer_grp.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
- obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h \
+ route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h 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_kicad_legacy/write.o: \
  ../src_plugins/io_kicad_legacy/write.c ../config.h compat_misc.h board.h \
- macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -2375,7 +2369,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 netlist.h route_style.h \
- obj_pstk_inlines.h data.h thermal.h \
+ macro.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 \
@@ -2385,8 +2379,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
  error.h drc.h layer_grp.h route.h buffer.h obj_rat_list.h obj_rat.h \
@@ -2416,8 +2410,8 @@
  ../src_3rd/liblihata/tree.h ../src_3rd/liblihata/dom.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
  ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \
- ../src_3rd/libminuid/libminuid.h ../config.h board.h macro.h \
- global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/libminuid/libminuid.h ../config.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -2449,8 +2443,8 @@
  ../src_3rd/liblihata/tree.h ../src_3rd/liblihata/dom.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
  ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \
- ../src_3rd/libminuid/libminuid.h ../config.h board.h macro.h \
- global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/libminuid/libminuid.h ../config.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -2499,13 +2493,13 @@
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  layer_grp.h dolists.h
 ../src_plugins/io_mentor_cell/read.o: \
  ../src_plugins/io_mentor_cell/read.c ../config.h \
  ../src_3rd/qparse/qparse.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
- ../src_3rd/genvector/genvector_undef.h board.h macro.h global_typedefs.h \
+ ../src_3rd/genvector/genvector_undef.h board.h global_typedefs.h \
  pcb_bool.h unit.h vtroutestyle.h attrib.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -2526,10 +2520,10 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h conf.h \
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
- ../src_3rd/genlist/gendlist.h board.h macro.h vtroutestyle.h attrib.h \
- layer.h globalconst.h obj_arc_list.h obj_common.h flag.h data_parent.h \
- obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
- obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genlist/gendlist.h board.h vtroutestyle.h attrib.h layer.h \
+ globalconst.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
  ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  layer_grp.h library.h rats_patch.h board.h compat_misc.h
 ../src_plugins/io_pcb/file.o: ../src_plugins/io_pcb/file.c ../config.h \
@@ -2541,7 +2535,7 @@
  ../src_3rd/genht/ht.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 buffer.h obj_common.h flag.h \
- attrib.h data_parent.h change.h board.h macro.h vtroutestyle.h layer.h \
+ attrib.h data_parent.h change.h board.h vtroutestyle.h layer.h \
  obj_arc_list.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
  obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
  obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
@@ -2556,7 +2550,7 @@
  netlist.h route_style.h remove.h flag_str.h compat_fs.h compat_misc.h \
  paths.h rats_patch.h hid_actions.h hid_flags.h \
  ../src_plugins/io_pcb/attribs.h route_style.h obj_poly.h thermal.h \
- event.h ../src_plugins/lib_compat_help/layer_compat.h \
+ event.h macro.h ../src_plugins/lib_compat_help/layer_compat.h \
  ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h \
  ../src_plugins/lib_compat_help/subc_help.h obj_subc.h \
  ../src_plugins/lib_compat_help/elem_rot.h
@@ -2573,7 +2567,7 @@
  ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h ../src_plugins/io_pcb/file.h board.h \
- macro.h vtroutestyle.h attrib.h layer.h globalconst.h obj_arc_list.h \
+ vtroutestyle.h attrib.h layer.h globalconst.h obj_arc_list.h \
  obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
@@ -2593,7 +2587,7 @@
  obj_arc_list.h obj_common.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  layer_grp.h route.h data.h crosshair.h buffer.h obj_rat_list.h obj_rat.h \
  obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
  ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
@@ -2603,11 +2597,10 @@
  rats_patch.h board.h plug_io.h ../src_plugins/io_pcb/parse_common.h \
  ../src_plugins/io_pcb/parse_y.h plug_footprint.h vtlibrary.h \
  ../src_plugins/io_pcb/attribs.h compat_misc.h compat_nls.h compat_cc.h \
- obj_common.h paths.h safe_fs.h
+ obj_common.h paths.h safe_fs.h macro.h
 ../src_plugins/io_pcb/parse_y.o: ../src_plugins/io_pcb/parse_y.c \
- ../config.h flag.h globalconst.h board.h macro.h global_typedefs.h \
- pcb_bool.h unit.h vtroutestyle.h attrib.h \
- ../src_3rd/genvector/genvector_impl.h \
+ ../config.h flag.h globalconst.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h obj_arc_list.h \
  obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -2638,9 +2631,8 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
- obj_text_list.h obj_text.h font.h box.h math_helper.h macro.h move.h \
- misc_util.h ../src_3rd/genvector/gds_char.h \
- ../src_3rd/genvector/genvector_impl.h \
+ obj_text_list.h obj_text.h font.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
  error.h drc.h layer_grp.h route.h buffer.h obj_rat_list.h obj_rat.h \
  obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
@@ -2663,7 +2655,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
  error.h drc.h layer_grp.h route.h buffer.h obj_rat_list.h obj_rat.h \
@@ -2682,8 +2674,8 @@
  action_helper.h compat_misc.h plug_io.h dolists.h
 ../src_plugins/io_tedax/netlist.o: ../src_plugins/io_tedax/netlist.c \
  ../config.h ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \
- ../src_3rd/genht/hash.h board.h macro.h global_typedefs.h pcb_bool.h \
- unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genht/hash.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -2705,8 +2697,8 @@
 ../src_plugins/io_tedax/parse.o: ../src_plugins/io_tedax/parse.c \
  ../config.h ../src_plugins/io_tedax/parse.h error.h compat_misc.h
 ../src_plugins/jostle/jostle.o: ../src_plugins/jostle/jostle.c \
- ../config.h board.h macro.h global_typedefs.h pcb_bool.h unit.h \
- vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../config.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -2742,8 +2734,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h \
  ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h \
@@ -2763,7 +2755,7 @@
  route_style.h remove.h find.h ../src_plugins/lib_compat_help/subc_help.c \
  ../src_plugins/lib_compat_help/subc_help.h obj_subc.h \
  ../src_plugins/lib_compat_help/elem_rot.c \
- ../src_plugins/lib_compat_help/elem_rot.h conf_core.h data_it.h
+ ../src_plugins/lib_compat_help/elem_rot.h conf_core.h data_it.h macro.h
 ../src_plugins/lib_gensexpr/lib_gensexpr.o: \
  ../src_plugins/lib_gensexpr/lib_gensexpr.c plugins.h \
  ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
@@ -2778,7 +2770,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h conf_core.h conf.h \
  pcb-printf.h ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
@@ -2795,8 +2787,8 @@
  ../src_plugins/lib_gtk_common/util_str.h
 ../src_plugins/lib_gtk_common/act_print.o: \
  ../src_plugins/lib_gtk_common/act_print.c ../config.h \
- ../src_plugins/lib_gtk_common/act_print.h board.h macro.h \
- global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_plugins/lib_gtk_common/act_print.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -2835,7 +2827,7 @@
  drc.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
  obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  layer_grp.h crosshair.h vtonpoint.h route.h misc_util.h compat_nls.h \
  math_helper.h
 ../src_plugins/lib_gtk_common/bu_dwg_tooltip.o: \
@@ -2846,8 +2838,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h library.h search.h rats.h \
  netlist.h library.h route_style.h vtroutestyle.h layer.h layer_grp.h \
@@ -2878,8 +2870,8 @@
  ../src_plugins/lib_gtk_common/bu_icons.data
 ../src_plugins/lib_gtk_common/bu_info_bar.o: \
  ../src_plugins/lib_gtk_common/bu_info_bar.c ../config.h \
- ../src_plugins/lib_gtk_common/bu_info_bar.h board.h macro.h \
- global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_plugins/lib_gtk_common/bu_info_bar.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -2897,8 +2889,8 @@
  ../src_plugins/lib_gtk_common/bu_menu.c ../config.h \
  ../src_3rd/liblihata/tree.h ../src_3rd/liblihata/dom.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
- ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h board.h macro.h \
- global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -2930,7 +2922,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h conf.h pcb-printf.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
@@ -2960,12 +2952,12 @@
  ../src_3rd/genht/ht.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 compat_misc.h compat_nls.h \
- board.h macro.h vtroutestyle.h attrib.h layer.h obj_arc_list.h \
- obj_common.h flag.h data_parent.h obj_arc.h \
- ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
- obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
- layer_grp.h library.h rats_patch.h board.h
+ board.h vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h \
+ flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h layer_grp.h library.h rats_patch.h \
+ board.h
 ../src_plugins/lib_gtk_common/bu_text_view.o: \
  ../src_plugins/lib_gtk_common/bu_text_view.c ../config.h \
  ../src_plugins/lib_gtk_common/bu_text_view.h
@@ -2989,7 +2981,7 @@
  attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
  obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  layer_grp.h pcb-printf.h hid_attrib.h hid.h hid_init.h misc_util.h \
  compat_misc.h compat_nls.h ../src_plugins/lib_gtk_common/compat.h \
  ../src_plugins/lib_gtk_common/bu_box.h \
@@ -3010,7 +3002,7 @@
  attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
  obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  layer_grp.h pcb-printf.h hid_attrib.h hid.h hid_init.h misc_util.h \
  compat_misc.h compat_nls.h ../src_plugins/lib_gtk_common/compat.h \
  ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h
@@ -3024,7 +3016,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h conf.h pcb-printf.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
@@ -3039,7 +3031,7 @@
  ../src_plugins/lib_gtk_config/hid_gtk_conf.h
 ../src_plugins/lib_gtk_common/dlg_confirm.o: \
  ../src_plugins/lib_gtk_common/dlg_confirm.c ../config.h \
- ../src_plugins/lib_gtk_common/dlg_confirm.h compat_nls.h board.h macro.h \
+ ../src_plugins/lib_gtk_common/dlg_confirm.h compat_nls.h board.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -3062,16 +3054,15 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 macro.h \
- vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h board.h data.h \
- crosshair.h vtonpoint.h hid.h error.h drc.h route.h buffer.h \
- obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
- ../src_3rd/libminuid/libminuid.h rtree.h \
- ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ 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 error.h search.h \
  rats.h netlist.h route_style.h draw.h layer.h pcb-printf.h undo.h \
@@ -3101,13 +3092,13 @@
  layer.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  layer_grp.h ../src_plugins/lib_gtk_common/dlg_print.h pcb-printf.h \
  hid_attrib.h hid.h hid_init.h misc_util.h compat_misc.h compat_nls.h \
  ../src_plugins/lib_gtk_common/compat.h
 ../src_plugins/lib_gtk_common/dlg_file_chooser.o: \
  ../src_plugins/lib_gtk_common/dlg_file_chooser.c ../config.h board.h \
- macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -3134,7 +3125,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h \
  ../src_plugins/lib_gtk_common/glue.h conf.h pcb-printf.h \
@@ -3160,7 +3151,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h \
  ../src_plugins/lib_gtk_common/glue.h conf.h pcb-printf.h \
@@ -3190,8 +3181,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h compat_misc.h \
  safe_fs.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
@@ -3218,7 +3209,7 @@
  obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  layer_grp.h compat_nls.h ../src_plugins/lib_gtk_common/win_place.h \
  ../src_plugins/lib_gtk_common/bu_text_view.h \
  ../src_plugins/lib_gtk_common/compat.h \
@@ -3236,7 +3227,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h conf.h pcb-printf.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
@@ -3266,7 +3257,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h \
  ../src_plugins/lib_gtk_common/glue.h conf.h pcb-printf.h \
@@ -3299,7 +3290,7 @@
  layer.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  layer_grp.h pcb-printf.h hid_attrib.h hid.h hid_init.h misc_util.h \
  compat_misc.h compat_nls.h ../src_plugins/lib_gtk_common/dlg_attribute.h
 ../src_plugins/lib_gtk_common/dlg_progress.o: \
@@ -3316,7 +3307,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h conf.h pcb-printf.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
@@ -3345,8 +3336,8 @@
  global_typedefs.h pcb_bool.h unit.h ../src_3rd/genrtree/genrtree_api.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 macro.h vtroutestyle.h \
- attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_plugins/lib_gtk_common/compat.h board.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 \
@@ -3372,12 +3363,12 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h layer_grp.h compat_nls.h misc_util.h \
- pcb-printf.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 \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h compat_nls.h misc_util.h pcb-printf.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 \
  ../src_plugins/lib_gtk_common/win_place.h \
  ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \
  ../src_plugins/lib_gtk_common/bu_box.h \
@@ -3401,7 +3392,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
- math_helper.h macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
  layer_grp.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
  ../src_3rd/genvector/vtp0.h list_conf.h conf.h \
  ../src_plugins/lib_gtk_common/compat.h hid_cfg_input.h \
@@ -3440,9 +3431,8 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
- obj_text_list.h obj_text.h font.h box.h math_helper.h macro.h move.h \
- misc_util.h ../src_3rd/genvector/gds_char.h \
- ../src_3rd/genvector/genvector_impl.h \
+ obj_text_list.h obj_text.h font.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h conf.h pcb-printf.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
  conf.h ../src_plugins/lib_gtk_common/compat.h compat_misc.h
@@ -3458,9 +3448,8 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
- obj_text_list.h obj_text.h font.h box.h math_helper.h macro.h move.h \
- misc_util.h ../src_3rd/genvector/gds_char.h \
- ../src_3rd/genvector/genvector_impl.h \
+ obj_text_list.h obj_text.h font.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h conf.h pcb-printf.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
  conf.h ../src_plugins/lib_gtk_common/compat.h board.h vtroutestyle.h \
@@ -3491,9 +3480,8 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
- obj_text_list.h obj_text.h font.h box.h math_helper.h macro.h move.h \
- misc_util.h ../src_3rd/genvector/gds_char.h \
- ../src_3rd/genvector/genvector_impl.h \
+ obj_text_list.h obj_text.h font.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h conf.h pcb-printf.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
  conf.h ../src_plugins/lib_gtk_common/compat.h \
@@ -3512,9 +3500,8 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
- obj_text_list.h obj_text.h font.h box.h math_helper.h macro.h move.h \
- misc_util.h ../src_3rd/genvector/gds_char.h \
- ../src_3rd/genvector/genvector_impl.h \
+ obj_text_list.h obj_text.h font.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h conf.h pcb-printf.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
  conf.h ../src_plugins/lib_gtk_common/compat.h action_helper.h error.h \
@@ -3535,12 +3522,12 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h
 ../src_plugins/lib_gtk_common/util_ext_chg.o: \
  ../src_plugins/lib_gtk_common/util_ext_chg.c ../config.h \
- ../src_plugins/lib_gtk_common/util_ext_chg.h pcb_bool.h board.h macro.h \
+ ../src_plugins/lib_gtk_common/util_ext_chg.h pcb_bool.h board.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -3560,7 +3547,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h hid_actions.h hid.h \
  compat_misc.h
@@ -3576,7 +3563,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h \
  ../src_plugins/lib_gtk_common/glue.h conf.h pcb-printf.h \
@@ -3593,7 +3580,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h \
  ../src_plugins/lib_gtk_common/glue.h conf.h pcb-printf.h \
@@ -3631,7 +3618,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h layer.h layer_ui.h \
  layer_vis.h board.h vtroutestyle.h layer_grp.h library.h rats_patch.h \
@@ -3663,7 +3650,7 @@
  layer.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h box.h \
- math_helper.h macro.h move.h misc_util.h layer_grp.h conf.h \
+ math_helper.h move.h misc_util.h layer_grp.h conf.h \
  ../src_plugins/lib_gtk_common/compat.h \
  ../src_plugins/lib_gtk_common/wt_preview.h layer.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h copy.h \
@@ -3690,7 +3677,7 @@
  error.h drc.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
  obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  layer_grp.h conf.h ../src_plugins/lib_gtk_common/compat.h pcb-printf.h \
  board.h library.h rats_patch.h board.h compat_nls.h \
  ../src_plugins/lib_gtk_common/bu_status_line.h
@@ -3720,7 +3707,7 @@
  attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
  obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  layer_grp.h event.h conf_hid.h ../src_plugins/lib_gtk_common/glue.h \
  conf.h ../src_plugins/lib_gtk_common/compat.h ../src_3rd/genht/hash.h \
  board.h vtroutestyle.h library.h rats_patch.h board.h data.h crosshair.h \
@@ -3758,7 +3745,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h event.h conf_hid.h \
  conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
@@ -3781,7 +3768,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
@@ -3834,7 +3821,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
@@ -3873,7 +3860,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h action_helper.h \
  ../src_plugins/lib_gtk_hid/gui.h \
@@ -3917,7 +3904,7 @@
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  layer_grp.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 \
  ../src_3rd/genht/htpp.h hid_cfg.h ../src_plugins/lib_gtk_common/glue.h \
@@ -3955,7 +3942,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
- math_helper.h macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
  layer_grp.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
  ../src_3rd/genvector/vtp0.h list_conf.h conf.h \
  ../src_plugins/lib_gtk_common/compat.h hid_cfg_input.h \
@@ -3985,7 +3972,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h \
  ../src_plugins/lib_gtk_hid/gui.h \
@@ -4051,7 +4038,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
@@ -4077,7 +4064,7 @@
  ../src_plugins/lib_gtk_common/glue.h board.h library.h rats_patch.h \
  board.h event.h ../src_plugins/lib_gtk_hid/render.h
 ../src_plugins/lib_hid_common/layer_menu.o: \
- ../src_plugins/lib_hid_common/layer_menu.c ../config.h board.h macro.h \
+ ../src_plugins/lib_hid_common/layer_menu.c ../config.h board.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -4116,8 +4103,8 @@
  hid.h error.h drc.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
  data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
  obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h macro.h \
- move.h misc_util.h layer_grp.h route.h data.h crosshair.h buffer.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h route.h data.h crosshair.h buffer.h \
  obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
  ../src_3rd/libminuid/libminuid.h rtree.h \
  ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
@@ -4146,8 +4133,8 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
- crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.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 rtree.h \
  ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
@@ -4162,9 +4149,8 @@
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h list_conf.h
 ../src_plugins/lib_netmap/netmap.o: ../src_plugins/lib_netmap/netmap.c \
  ../config.h ../src_3rd/genht/htpp.h ../src_3rd/genht/ht.h \
- ../src_plugins/lib_netmap/netmap.h board.h macro.h global_typedefs.h \
- pcb_bool.h unit.h vtroutestyle.h attrib.h \
- ../src_3rd/genvector/genvector_impl.h \
+ ../src_plugins/lib_netmap/netmap.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -4193,7 +4179,7 @@
  ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
  ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h pcb-printf.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
- ../src_3rd/genvector/genvector_undef.h obj_line.h box.h macro.h move.h \
+ ../src_3rd/genvector/genvector_undef.h obj_line.h box.h move.h \
  misc_util.h polygon_offs.h ../src_plugins/lib_polyhelp/topoly.h board.h \
  vtroutestyle.h layer.h obj_arc_list.h obj_arc.h \
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
@@ -4214,7 +4200,7 @@
  ../src_plugins/lib_polyhelp/topoly.c ../config.h \
  ../src_3rd/genvector/vtp0.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h ../src_3rd/genvector/vti0.h \
- ../src_plugins/lib_polyhelp/topoly.h board.h macro.h global_typedefs.h \
+ ../src_plugins/lib_polyhelp/topoly.h board.h global_typedefs.h \
  pcb_bool.h unit.h vtroutestyle.h attrib.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -4235,7 +4221,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h pcb-printf.h
 ../src_plugins/loghid/loghid.o: ../src_plugins/loghid/loghid.c \
@@ -4250,7 +4236,7 @@
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
  obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
  ../src_3rd/libminuid/libminuid.h rtree.h \
@@ -4274,8 +4260,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h \
  ../src_plugins/millpath/toolpath.h layer.h layer_grp.h polygon.h rtree.h \
@@ -4293,8 +4279,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h layer.h polygon.h \
  rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h board.h \
@@ -4332,8 +4318,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
  error.h drc.h layer_grp.h route.h buffer.h obj_rat_list.h obj_rat.h \
@@ -4370,7 +4356,7 @@
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
  obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
  ../src_3rd/libminuid/libminuid.h rtree.h \
@@ -4382,9 +4368,9 @@
  ../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 \
- plug_footprint.h vtlibrary.h obj_subc.h dolists.h
+ plug_footprint.h vtlibrary.h obj_subc.h macro.h dolists.h
 ../src_plugins/polycombine/polycombine.o: \
- ../src_plugins/polycombine/polycombine.c ../config.h board.h macro.h \
+ ../src_plugins/polycombine/polycombine.c ../config.h board.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -4408,7 +4394,7 @@
  ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h hid_actions.h \
  obj_poly.h dolists.h
 ../src_plugins/polystitch/polystitch.o: \
- ../src_plugins/polystitch/polystitch.c ../config.h board.h macro.h \
+ ../src_plugins/polystitch/polystitch.c ../config.h board.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -4443,7 +4429,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
- math_helper.h macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h pcb-printf.h error.h \
  dolists.h
@@ -4460,9 +4446,8 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
- math_helper.h macro.h move.h misc_util.h layer_grp.h \
- ../src_3rd/genht/hash.h ../src_3rd/genht/ht.c \
- ../src_3rd/genht/ht_inlines.h
+ math_helper.h move.h misc_util.h layer_grp.h ../src_3rd/genht/hash.h \
+ ../src_3rd/genht/ht.c ../src_3rd/genht/ht_inlines.h
 ../src_plugins/propedit/propsel.o: ../src_plugins/propedit/propsel.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 \
@@ -4470,8 +4455,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
  error.h drc.h layer_grp.h route.h buffer.h obj_rat_list.h obj_rat.h \
@@ -4494,16 +4479,15 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 macro.h \
- vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h board.h data.h \
- crosshair.h vtonpoint.h hid.h error.h drc.h route.h buffer.h \
- obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
- ../src_3rd/libminuid/libminuid.h rtree.h \
- ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ 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 draw.h move.h \
  pcb-printf.h remove.h rtree.h flag_str.h undo.h \
@@ -4520,8 +4504,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
  error.h drc.h layer_grp.h route.h buffer.h obj_rat_list.h obj_rat.h \
@@ -4550,7 +4534,7 @@
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
  obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
  ../src_3rd/libminuid/libminuid.h rtree.h \
@@ -4567,8 +4551,8 @@
  ../src_3rd/genregex/regex.h ../src_plugins/query/fields_sphash.h \
  obj_common.h layer.h fptr_cast.h
 ../src_plugins/query/query_access.o: ../src_plugins/query/query_access.c \
- ../config.h math_helper.h board.h macro.h global_typedefs.h pcb_bool.h \
- unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../config.h math_helper.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -4601,7 +4585,7 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_plugins/query/query_y.h \
  ../src_plugins/query/query_exec.h draw.h hid.h error.h drc.h layer.h \
  layer_grp.h select.h operation.h board.h vtroutestyle.h library.h \
@@ -4613,8 +4597,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
  error.h drc.h layer_grp.h route.h buffer.h obj_rat_list.h obj_rat.h \
@@ -4640,7 +4624,7 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_plugins/query/query_y.h \
  compat_misc.h
 ../src_plugins/query/query_y.o: ../src_plugins/query/query_y.c unit.h \
@@ -4655,12 +4639,12 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_plugins/query/query_l.h \
  compat_misc.h
 ../src_plugins/renumber/renumber.o: ../src_plugins/renumber/renumber.c \
- ../config.h board.h macro.h global_typedefs.h pcb_bool.h unit.h \
- vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../config.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -4683,9 +4667,9 @@
  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 list_conf.h compat_misc.h compat_nls.h \
- netlist.h route_style.h safe_fs.h pcb-printf.h dolists.h
+ netlist.h route_style.h safe_fs.h macro.h pcb-printf.h dolists.h
 ../src_plugins/renumber/renumberblock.o: \
- ../src_plugins/renumber/renumberblock.c ../config.h board.h macro.h \
+ ../src_plugins/renumber/renumberblock.c ../config.h board.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -4713,7 +4697,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
  error.h drc.h layer_grp.h route.h buffer.h obj_rat_list.h obj_rat.h \
@@ -4738,8 +4722,8 @@
  hid.h error.h drc.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
  data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
  obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h macro.h \
- move.h misc_util.h layer_grp.h route.h board.h vtroutestyle.h library.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h route.h board.h vtroutestyle.h library.h \
  rats_patch.h board.h data.h crosshair.h buffer.h obj_rat_list.h \
  obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
  rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
@@ -4763,7 +4747,7 @@
  globalconst.h ../config.h attrib.h global_typedefs.h pcb_bool.h unit.h \
  data_parent.h
 ../src_plugins/rubberband_orig/rubberband.o: \
- ../src_plugins/rubberband_orig/rubberband.c ../config.h board.h macro.h \
+ ../src_plugins/rubberband_orig/rubberband.c ../config.h board.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -4802,17 +4786,16 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 macro.h \
- vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h board.h build_run.h \
- action_helper.h buffer.h ../src_plugins/shand_cmd/command.h data.h \
- crosshair.h vtonpoint.h hid.h error.h drc.h route.h buffer.h \
- obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
- ../src_3rd/libminuid/libminuid.h rtree.h \
- ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h board.h build_run.h action_helper.h \
+ buffer.h ../src_plugins/shand_cmd/command.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ 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 error.h plug_io.h \
  rats.h netlist.h route_style.h plugins.h ../src_3rd/puplug/puplug.h \
@@ -4821,9 +4804,8 @@
  ../src_3rd/puplug/error.h hid_actions.h compat_misc.h misc_util.h tool.h \
  dolists.h
 ../src_plugins/shape/shape.o: ../src_plugins/shape/shape.c ../config.h \
- ../src_plugins/shape/shape.h board.h macro.h global_typedefs.h \
- pcb_bool.h unit.h vtroutestyle.h attrib.h \
- ../src_3rd/genvector/genvector_impl.h \
+ ../src_plugins/shape/shape.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -4850,9 +4832,8 @@
  hid_attrib.h dolists.h
 ../src_plugins/smartdisperse/smartdisperse.o: \
  ../src_plugins/smartdisperse/smartdisperse.c ../src_3rd/genht/htpi.h \
- ../src_3rd/genht/ht.h ../config.h board.h macro.h global_typedefs.h \
- pcb_bool.h unit.h vtroutestyle.h attrib.h \
- ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genht/ht.h ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -4874,8 +4855,8 @@
  ../src_3rd/puplug/error.h action_helper.h hid_actions.h compat_nls.h \
  obj_subc.h obj_subc_parent.h data.h dolists.h
 ../src_plugins/stroke/stroke.o: ../src_plugins/stroke/stroke.c \
- ../config.h math_helper.h board.h macro.h global_typedefs.h pcb_bool.h \
- unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../config.h math_helper.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -4901,7 +4882,7 @@
  ../src_3rd/puplug/error.h compat_nls.h tool.h
 ../src_plugins/teardrops/teardrops.o: \
  ../src_plugins/teardrops/teardrops.c ../config.h math_helper.h board.h \
- macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -4933,10 +4914,10 @@
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h globalconst.h \
  ../src_3rd/genregex/regex_sei.h ../src_3rd/genregex/regex_templ.h \
- ../src_3rd/genregex/regex.h change.h board.h macro.h vtroutestyle.h \
- attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
- obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
- obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genregex/regex.h change.h board.h vtroutestyle.h attrib.h \
+ layer.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
  ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
  vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
@@ -4950,7 +4931,7 @@
  ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h action_helper.h \
  hid_flags.h hid_actions.h hid_cfg.h \
  ../src_plugins/vendordrill/vendor_conf.h conf.h compat_misc.h \
- compat_nls.h obj_pstk_inlines.h data.h thermal.h event.h \
+ compat_nls.h obj_pstk_inlines.h data.h thermal.h event.h macro.h \
  ../src_3rd/liblihata/tree.h dolists.h \
  ../src_plugins/vendordrill/vendor_conf_fields.h
 ../src_3rd/gensexpr/gsx_parse.o: ../src_3rd/gensexpr/gsx_parse.c \
@@ -5072,7 +5053,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h undo.h \
  ../src_3rd/libuundo/uundo.h undo_old.h library.h compat_nls.h safe_fs.h \
@@ -5089,13 +5070,13 @@
  ../src_3rd/genht/ht.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 action_helper.h board.h \
- macro.h vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h \
- flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
- obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
- obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
- math_helper.h move.h misc_util.h layer_grp.h library.h rats_patch.h \
- change.h copy.h data.h crosshair.h vtonpoint.h hid.h error.h drc.h \
- route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h library.h rats_patch.h change.h copy.h data.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
  ../src_3rd/libminuid/libminuid.h 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 \
@@ -5106,8 +5087,8 @@
  hid_actions.h compat_nls.h event.h obj_line_draw.h obj_arc_draw.h \
  obj_text_draw.h obj_rat_draw.h obj_poly_draw.h obj_pstk_draw.h tool.h
 attrib.o: attrib.c ../config.h compat_misc.h attrib.h
-board.o: board.c ../config.h board.h macro.h global_typedefs.h pcb_bool.h \
- unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+board.o: board.c ../config.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -5129,7 +5110,7 @@
  ../src_3rd/libuundo/uundo.h undo_old.h draw.h event.h safe_fs.h tool.h \
  defpcb_internal.c obj_pstk_inlines.h thermal.h
 box.o: box.c ../config.h rotate.h global_typedefs.h pcb_bool.h unit.h \
- compat_misc.h box.h math_helper.h macro.h move.h obj_common.h flag.h \
+ compat_misc.h box.h math_helper.h move.h obj_common.h flag.h \
  globalconst.h attrib.h data_parent.h misc_util.h
 brave.o: brave.c ../config.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
@@ -5145,7 +5126,7 @@
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  layer_grp.h
 buffer.o: buffer.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 \
@@ -5156,14 +5137,14 @@
  ../src_3rd/genht/ht.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 action_helper.h buffer.h \
- obj_common.h flag.h attrib.h data_parent.h board.h macro.h \
- vtroutestyle.h layer.h obj_arc_list.h obj_arc.h \
- ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
- obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
- layer_grp.h library.h rats_patch.h copy.h data.h crosshair.h vtonpoint.h \
- hid.h error.h drc.h route.h obj_rat_list.h obj_rat.h obj_subc_list.h \
- obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ obj_common.h flag.h attrib.h data_parent.h board.h vtroutestyle.h \
+ layer.h obj_arc_list.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h layer_grp.h library.h rats_patch.h \
+ copy.h data.h crosshair.h vtonpoint.h hid.h error.h drc.h route.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h 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 plug_io.h \
@@ -5181,13 +5162,13 @@
  ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.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 macro.h \
- vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h build_run.h hid_init.h \
- hid.h error.h drc.h plug_io.h compat_misc.h
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h build_run.h hid_init.h hid.h error.h \
+ drc.h plug_io.h compat_misc.h
 buildin.o: buildin.c ../src_3rd/puplug/libs.h ../src_3rd/puplug/puplug.h \
  ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
  ../src_3rd/puplug/libs.h
@@ -5199,7 +5180,7 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 change.h board.h macro.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h change.h board.h \
  vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
  data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
  obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
@@ -5211,8 +5192,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 select.h \
  operation.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h hid_actions.h \
- compat_nls.h obj_pstk_op.h obj_subc_parent.h obj_term.h obj_arc_op.h \
- obj_line_op.h obj_poly_op.h obj_text_op.h obj_subc_op.h
+ compat_nls.h macro.h obj_pstk_op.h obj_subc_parent.h obj_term.h \
+ obj_arc_op.h obj_line_op.h obj_poly_op.h obj_text_op.h obj_subc_op.h
 change_act.o: change_act.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 \
@@ -5225,7 +5206,7 @@
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
  obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
  ../src_3rd/libminuid/libminuid.h rtree.h \
@@ -5235,7 +5216,8 @@
  funchash.h funchash_core_list.h board.h vtroutestyle.h library.h \
  rats_patch.h action_helper.h hid_actions.h change.h draw.h search.h \
  rats.h netlist.h route_style.h undo.h ../src_3rd/libuundo/uundo.h \
- undo_old.h event.h compat_misc.h compat_nls.h obj_rat_draw.h data_it.h
+ undo_old.h event.h compat_misc.h compat_nls.h obj_rat_draw.h data_it.h \
+ macro.h
 clip.o: clip.c ../config.h clip.h global_typedefs.h pcb_bool.h unit.h
 compat_fs.o: compat_fs.c ../config.h compat_inc.h compat_fs.h \
  compat_misc.h compat_nls.h globalconst.h safe_fs.h conf.h \
@@ -5262,9 +5244,8 @@
  ../src_3rd/genlist/gendlist.h conf_core.h globalconst.h conf_hid.h \
  error.h hid_cfg.h misc_util.h paths.h compat_fs.h compat_misc.h \
  safe_fs.h build_run.h ../src_3rd/genvector/genvector_impl.c
-conf_act.o: conf_act.c ../config.h board.h macro.h global_typedefs.h \
- pcb_bool.h unit.h vtroutestyle.h attrib.h \
- ../src_3rd/genvector/genvector_impl.h \
+conf_act.o: conf_act.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -5277,7 +5258,7 @@
  ../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 route_style.h error.h hid.h \
- drc.h tool.h
+ drc.h tool.h macro.h
 conf_core.o: conf_core.c ../config.h conf.h global_typedefs.h pcb_bool.h \
  unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
@@ -5307,15 +5288,15 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 macro.h \
- vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h data.h crosshair.h \
- vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
- obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
- rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h 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 draw.h select.h \
  operation.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h obj_arc_op.h \
@@ -5328,23 +5309,23 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 macro.h \
- vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h crosshair.h vtonpoint.h \
- hid.h error.h drc.h route.h data.h buffer.h obj_rat_list.h obj_rat.h \
- obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h crosshair.h vtonpoint.h hid.h error.h \
+ drc.h route.h data.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h 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 draw.h \
  draw_wireframe.h search.h rats.h netlist.h route_style.h hid_actions.h \
  compat_misc.h compat_nls.h find.h undo.h ../src_3rd/libuundo/uundo.h \
- undo_old.h event.h action_helper.h obj_line_draw.h obj_arc_draw.h \
- obj_text_draw.h obj_pstk_draw.h obj_arc_ui.h tool.h
-data.o: data.c ../config.h board.h macro.h global_typedefs.h pcb_bool.h \
- unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ undo_old.h event.h action_helper.h macro.h obj_line_draw.h \
+ obj_arc_draw.h obj_text_draw.h obj_pstk_draw.h obj_arc_ui.h tool.h
+data.o: data.c ../config.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -5370,14 +5351,14 @@
  ../src_3rd/genht/ht.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 math_helper.h board.h \
- macro.h vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h \
- flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
- obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
- obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h data.h crosshair.h \
- vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
- obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
- rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h 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 draw.h rotate.h \
  compat_misc.h stub_draw.h layer_ui.h obj_pstk_draw.h obj_line_draw.h \
@@ -5389,8 +5370,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
  error.h drc.h layer_grp.h route.h buffer.h obj_rat_list.h obj_rat.h \
@@ -5403,9 +5384,8 @@
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h list_conf.h \
  compat_misc.h conf_core.h
 event.o: event.c ../config.h event.h unit.h error.h fptr_cast.h
-file_act.o: file_act.c ../config.h board.h macro.h global_typedefs.h \
- pcb_bool.h unit.h vtroutestyle.h attrib.h \
- ../src_3rd/genvector/genvector_impl.h \
+file_act.o: file_act.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -5438,24 +5418,22 @@
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h macro.h move.h misc_util.h crosshair.h \
- vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
- obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
- ../src_3rd/libminuid/libminuid.h rtree.h \
- ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/htip.h box.h move.h misc_util.h crosshair.h vtonpoint.h \
+ hid.h error.h drc.h layer_grp.h route.h buffer.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ 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 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_text_draw.h obj_subc_parent.h \
- find_geo.c obj_arc_ui.h obj_pstk_inlines.h board.h rats_patch.h \
+ find_geo.c macro.h 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 macro.h global_typedefs.h \
- pcb_bool.h unit.h vtroutestyle.h attrib.h \
- ../src_3rd/genvector/genvector_impl.h \
+find_act.o: find_act.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -5485,7 +5463,7 @@
  flag.h globalconst.h attrib.h data_parent.h polyarea.h obj_poly_list.h \
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_arc.h obj_arc_list.h box.h \
- math_helper.h macro.h move.h misc_util.h board.h vtroutestyle.h \
+ math_helper.h move.h misc_util.h board.h vtroutestyle.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h obj_line_list.h \
  obj_line.h obj_text_list.h obj_text.h ../src_3rd/genvector/gds_char.h \
@@ -5495,9 +5473,8 @@
  ../src_3rd/genht/htsp.h ../src_3rd/genvector/vtp0.h list_conf.h error.h \
  plug_io.h paths.h compat_nls.h compat_misc.h event.h build_run.h \
  font_internal.c
-font_act.o: font_act.c ../config.h board.h macro.h global_typedefs.h \
- pcb_bool.h unit.h vtroutestyle.h attrib.h \
- ../src_3rd/genvector/genvector_impl.h \
+font_act.o: font_act.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -5515,9 +5492,8 @@
 funchash.o: funchash.c ../src_3rd/genht/htpi.h ../src_3rd/genht/ht.h \
  ../src_3rd/genht/hash.h funchash_core.h funchash.h funchash_core_list.h \
  ../config.h macro.h compat_misc.h
-gui_act.o: gui_act.c ../config.h board.h macro.h global_typedefs.h \
- pcb_bool.h unit.h vtroutestyle.h attrib.h \
- ../src_3rd/genvector/genvector_impl.h \
+gui_act.o: gui_act.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -5554,7 +5530,7 @@
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  layer_grp.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 layer.h globalconst.h \
@@ -5563,7 +5539,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h pcb-printf.h
 hid_cfg.o: hid_cfg.c ../src_3rd/liblihata/lihata.h \
@@ -5587,7 +5563,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
- math_helper.h macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h
 hid_cfg_input.o: hid_cfg_input.c ../src_3rd/liblihata/lihata.h \
@@ -5605,7 +5581,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h \
  ../src_3rd/genht/hash.h compat_misc.h ../src_3rd/genht/ht.h \
@@ -5617,12 +5593,12 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h polygon.h rtree.h \
- ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h
-hid_extents.o: hid_extents.c ../config.h board.h macro.h \
- global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h macro.h
+hid_extents.o: hid_extents.c ../config.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -5646,7 +5622,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
  error.h drc.h layer_grp.h route.h buffer.h obj_rat_list.h obj_rat.h \
@@ -5658,7 +5634,7 @@
  library.h rats_patch.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 hid_flags.h hid_actions.h
-hid_helper.o: hid_helper.c ../config.h board.h macro.h global_typedefs.h \
+hid_helper.o: hid_helper.c ../config.h board.h global_typedefs.h \
  pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -5685,7 +5661,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h hid_nogui.h plugins.h \
  ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
@@ -5702,7 +5678,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h compat_misc.h \
  compat_nls.h conf_core.h conf.h pcb-printf.h \
@@ -5726,24 +5702,24 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 macro.h \
- vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h data.h crosshair.h \
- vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
- obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
- rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h 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 select.h \
  operation.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h obj_line_op.h \
  obj_arc_op.h obj_rat_op.h obj_poly_op.h
 intersect.o: intersect.c ../config.h intersect.h global_typedefs.h \
- pcb_bool.h unit.h box.h math_helper.h macro.h move.h obj_common.h flag.h \
+ pcb_bool.h unit.h box.h math_helper.h move.h obj_common.h flag.h \
  globalconst.h attrib.h data_parent.h misc_util.h
-layer.o: layer.c ../config.h board.h macro.h global_typedefs.h pcb_bool.h \
- unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+layer.o: layer.c ../config.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -5763,9 +5739,8 @@
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h list_conf.h \
  compat_misc.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h event.h \
  layer_ui.h layer_vis.h obj_pstk_inlines.h thermal.h list_common.h
-layer_grp.o: layer_grp.c ../config.h board.h macro.h global_typedefs.h \
- pcb_bool.h unit.h vtroutestyle.h attrib.h \
- ../src_3rd/genvector/genvector_impl.h \
+layer_grp.o: layer_grp.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -5787,14 +5762,13 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h event.h layer_ui.h \
  ../src_3rd/genvector/genvector_impl.c
-layer_vis.o: layer_vis.c ../config.h board.h macro.h global_typedefs.h \
- pcb_bool.h unit.h vtroutestyle.h attrib.h \
- ../src_3rd/genvector/genvector_impl.h \
+layer_vis.o: layer_vis.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -5814,7 +5788,8 @@
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h list_conf.h \
  layer_ui.h layer_vis.h event.h compat_misc.h conf_hid.h
 library.o: library.c ../config.h library.h global_typedefs.h pcb_bool.h \
- unit.h macro.h compat_misc.h
+ unit.h macro.h compat_misc.h obj_common.h flag.h globalconst.h attrib.h \
+ data_parent.h
 list_conf.o: list_conf.c conf.h ../config.h global_typedefs.h pcb_bool.h \
  unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
@@ -5825,7 +5800,7 @@
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.c
 main.o: main.c ../config.h ../src_3rd/libminuid/libminuid.h board.h \
- macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -5857,7 +5832,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h hid_init.h \
  conf_core.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
@@ -5878,23 +5853,22 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 macro.h \
- vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h data.h crosshair.h \
- vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
- obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
- rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h 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 draw.h select.h \
  operation.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h event.h \
  hid_actions.h compat_misc.h obj_arc_op.h obj_line_op.h obj_text_op.h \
  obj_subc_op.h obj_poly_op.h obj_pstk_op.h obj_rat_op.h
-netlist.o: netlist.c ../config.h board.h macro.h global_typedefs.h \
- pcb_bool.h unit.h vtroutestyle.h attrib.h \
- ../src_3rd/genvector/genvector_impl.h \
+netlist.o: netlist.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -5921,8 +5895,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
  error.h drc.h layer_grp.h route.h buffer.h obj_rat_list.h obj_rat.h \
@@ -5936,8 +5910,8 @@
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h list_conf.h \
  hid_actions.h compat_nls.h compat_misc.h netlist.h route_style.h \
  data_it.h
-obj_arc.o: obj_arc.c ../config.h compat_nls.h board.h macro.h \
- global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+obj_arc.o: obj_arc.c ../config.h compat_nls.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -5973,9 +5947,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h layer_grp.h \
- route.h
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h layer_grp.h route.h
 obj_common.o: obj_common.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 \
@@ -5989,11 +5962,11 @@
  hid.h drc.h layer.h obj_arc_list.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  layer_grp.h route.h obj_pstk.h obj_pstk_shape.h polygon.h rtree.h \
  ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h vtpadstack_t.h
 obj_line.o: obj_line.c ../config.h undo.h ../src_3rd/libuundo/uundo.h \
- undo_old.h library.h global_typedefs.h pcb_bool.h unit.h board.h macro.h \
+ undo_old.h library.h global_typedefs.h pcb_bool.h unit.h board.h \
  vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -6025,22 +5998,22 @@
  ../src_3rd/genht/ht.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 math_helper.h board.h \
- macro.h vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h \
- flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
- obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
- obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h data.h crosshair.h \
- vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
- obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
- rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h 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 find.h
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h find.h macro.h
 obj_line_list.o: obj_line_list.c obj_line_list.h obj_line.h \
  ../src_3rd/genlist/gendlist.h obj_common.h flag.h globalconst.h \
  ../config.h attrib.h global_typedefs.h pcb_bool.h unit.h data_parent.h \
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.c
-obj_pinvia_therm.o: obj_pinvia_therm.c ../config.h board.h macro.h \
+obj_pinvia_therm.o: obj_pinvia_therm.c ../config.h board.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -6053,9 +6026,8 @@
  ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
  polygon.h rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h \
  obj_pinvia_therm.h
-obj_poly.o: obj_poly.c ../config.h board.h macro.h global_typedefs.h \
- pcb_bool.h unit.h vtroutestyle.h attrib.h \
- ../src_3rd/genvector/genvector_impl.h \
+obj_poly.o: obj_poly.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -6083,9 +6055,8 @@
  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
-obj_pstk.o: obj_pstk.c ../config.h board.h macro.h global_typedefs.h \
- pcb_bool.h unit.h vtroutestyle.h attrib.h \
- ../src_3rd/genvector/genvector_impl.h \
+obj_pstk.o: obj_pstk.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -6116,7 +6087,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h obj_pstk_shape.h polygon.h rtree.h \
  ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h vtpadstack_t.h \
  obj_pstk_inlines.h board.h vtroutestyle.h layer_grp.h library.h \
@@ -6135,8 +6106,8 @@
  ../config.h attrib.h global_typedefs.h pcb_bool.h unit.h data_parent.h \
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.c
-obj_pstk_proto.o: obj_pstk_proto.c ../config.h board.h macro.h \
- global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+obj_pstk_proto.o: obj_pstk_proto.c ../config.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -6157,9 +6128,8 @@
  vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h data_list.h \
  obj_pstk_inlines.h thermal.h rotate.h undo.h ../src_3rd/libuundo/uundo.h \
  undo_old.h obj_hash.h
-obj_rat.o: obj_rat.c ../config.h board.h macro.h global_typedefs.h \
- pcb_bool.h unit.h vtroutestyle.h attrib.h \
- ../src_3rd/genvector/genvector_impl.h \
+obj_rat.o: obj_rat.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -6189,7 +6159,7 @@
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h buffer.h obj_common.h flag.h \
  globalconst.h attrib.h global_typedefs.h pcb_bool.h unit.h data_parent.h \
- board.h macro.h vtroutestyle.h layer.h obj_arc_list.h obj_arc.h \
+ board.h vtroutestyle.h layer.h obj_arc_list.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_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
@@ -6204,7 +6174,7 @@
  vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h obj_subc_op.h \
  operation.h obj_subc_parent.h obj_poly_op.h obj_pstk_inlines.h thermal.h \
  obj_pstk_draw.h obj_line_op.h obj_term.h obj_text_draw.h draw.h \
- draw_wireframe.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h \
+ draw_wireframe.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h macro.h \
  compat_misc.h pcb_minuid.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 list_conf.h
@@ -6215,7 +6185,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
  error.h drc.h layer_grp.h route.h buffer.h obj_rat_list.h obj_rat.h \
@@ -6235,7 +6205,7 @@
 obj_term.o: obj_term.c ../config.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h \
  ../src_3rd/genvector/genvector_impl.h \
- ../src_3rd/genvector/genvector_undef.h change.h board.h macro.h \
+ ../src_3rd/genvector/genvector_undef.h change.h board.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h layer.h \
  globalconst.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -6250,9 +6220,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 pcb-printf.h \
- undo.h ../src_3rd/libuundo/uundo.h undo_old.h
+ undo.h ../src_3rd/libuundo/uundo.h undo_old.h macro.h
 obj_text.o: obj_text.c ../config.h rotate.h global_typedefs.h pcb_bool.h \
- unit.h compat_misc.h board.h macro.h vtroutestyle.h attrib.h \
+ unit.h compat_misc.h board.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -6280,8 +6250,8 @@
  polyarea.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_arc_list.h obj_arc.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h \
  ../src_3rd/genlist/gentdlist_impl.c
@@ -6297,7 +6267,7 @@
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
  obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
  ../src_3rd/libminuid/libminuid.h rtree.h \
@@ -6308,9 +6278,9 @@
  undo.h ../src_3rd/libuundo/uundo.h undo_old.h event.h funchash_core.h \
  funchash.h funchash_core_list.h search.h rats.h netlist.h route_style.h \
  draw.h copy.h remove.h compat_misc.h compat_nls.h layer_vis.h \
- operation.h
+ operation.h macro.h
 operation.o: operation.c ../config.h operation.h global_typedefs.h \
- pcb_bool.h unit.h board.h macro.h vtroutestyle.h attrib.h \
+ pcb_bool.h unit.h board.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -6368,7 +6338,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h plug_footprint.h \
  vtlibrary.h
@@ -6393,7 +6363,7 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 change.h board.h macro.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h change.h board.h \
  vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
  data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
  obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
@@ -6409,7 +6379,7 @@
  ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
  ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h event.h compat_misc.h \
  route_style.h compat_fs.h compat_nls.h compat_lrealpath.h layer_vis.h \
- safe_fs.h plug_footprint.h vtlibrary.h build_run.h compat_inc.h
+ safe_fs.h plug_footprint.h vtlibrary.h build_run.h macro.h compat_inc.h
 plugins.o: plugins.c 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 \
@@ -6422,8 +6392,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
- layer_grp.h
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h layer_grp.h
 polygon.o: polygon.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 \
@@ -6432,15 +6401,15 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 macro.h \
- vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h data.h crosshair.h \
- vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
- obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
- rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h 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 draw.h remove.h \
  search.h rats.h netlist.h route_style.h thermal.h undo.h \
@@ -6461,15 +6430,15 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 macro.h \
- vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h data.h crosshair.h \
- vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
- obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
- rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h 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 action_helper.h \
  undo.h ../src_3rd/libuundo/uundo.h undo_old.h funchash_core.h funchash.h \
@@ -6483,20 +6452,20 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 macro.h \
- vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h data.h crosshair.h \
- vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
- obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
- rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h 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 draw.h find.h \
  rats.h netlist.h route_style.h search.h undo.h \
  ../src_3rd/libuundo/uundo.h undo_old.h stub_mincut.h compat_misc.h \
- compat_nls.h obj_rat_draw.h obj_term.h obj_subc_parent.h \
+ compat_nls.h macro.h obj_rat_draw.h obj_term.h obj_subc_parent.h \
  obj_pstk_inlines.h thermal.h
 rats_act.o: rats_act.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 \
@@ -6506,21 +6475,21 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 macro.h \
- vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h data.h crosshair.h \
- vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
- obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
- rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h 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 action_helper.h \
  undo.h ../src_3rd/libuundo/uundo.h undo_old.h find.h remove.h \
  funchash_core.h funchash.h funchash_core_list.h compat_nls.h rats.h \
  netlist.h route_style.h draw.h obj_rat_draw.h
-rats_patch.o: rats_patch.c rats_patch.h board.h ../config.h macro.h \
+rats_patch.o: rats_patch.c rats_patch.h board.h ../config.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
@@ -6548,15 +6517,15 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 macro.h \
- vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h draw.h hid.h error.h \
- drc.h remove.h select.h operation.h undo.h ../src_3rd/libuundo/uundo.h \
- undo_old.h obj_arc_op.h obj_line_op.h obj_poly_op.h obj_text_op.h \
- obj_rat_op.h obj_subc_op.h obj_pstk_op.h
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h draw.h hid.h error.h drc.h remove.h \
+ select.h operation.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h \
+ obj_arc_op.h obj_line_op.h obj_poly_op.h obj_text_op.h obj_rat_op.h \
+ obj_subc_op.h obj_pstk_op.h
 remove_act.o: remove_act.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 \
@@ -6564,7 +6533,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
  error.h drc.h layer_grp.h route.h buffer.h obj_rat_list.h obj_rat.h \
@@ -6575,9 +6544,8 @@
  obj_pstk_shape.h polygon.h vtpadstack_t.h action_helper.h tool.h \
  remove.h board.h vtroutestyle.h library.h rats_patch.h funchash_core.h \
  funchash.h funchash_core_list.h
-rotate.o: rotate.c ../config.h board.h macro.h global_typedefs.h \
- pcb_bool.h unit.h vtroutestyle.h attrib.h \
- ../src_3rd/genvector/genvector_impl.h \
+rotate.o: rotate.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -6608,14 +6576,14 @@
  ../src_3rd/genht/ht.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 math_helper.h board.h \
- macro.h vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h \
- flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
- obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
- obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h data.h crosshair.h \
- vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
- obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
- rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h 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 find.h undo.h \
  ../src_3rd/libuundo/uundo.h undo_old.h obj_line_draw.h obj_arc_draw.h \
@@ -6629,8 +6597,8 @@
  ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.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 misc_util.h board.h macro.h layer.h \
- globalconst.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h misc_util.h board.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
  ../src_3rd/genht/htip.h box.h math_helper.h move.h layer_grp.h library.h \
@@ -6660,15 +6628,15 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 macro.h \
- vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h data.h crosshair.h \
- vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
- obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
- rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h 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 find.h search.h \
  rats.h netlist.h route_style.h obj_subc_parent.h obj_pstk_inlines.h \
@@ -6681,15 +6649,15 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 macro.h \
- vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h data.h crosshair.h \
- vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
- obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
- rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h 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 data_it.h draw.h \
  search.h rats.h netlist.h route_style.h select.h operation.h undo.h \
@@ -6705,15 +6673,15 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 macro.h \
- vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h data.h crosshair.h \
- vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
- obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
- rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h 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 action_helper.h \
  undo.h ../src_3rd/libuundo/uundo.h undo_old.h funchash_core.h funchash.h \
@@ -6726,7 +6694,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer_grp.h obj_text_draw.h
 stub_mincut.o: stub_mincut.c ../config.h stub_mincut.h global_typedefs.h \
@@ -6739,8 +6707,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h \
- macro.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h compat_misc.h data.h crosshair.h \
  vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
@@ -6754,7 +6722,7 @@
 tool.o: tool.c ../config.h tool.h ../src_3rd/genvector/vtp0.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h global_typedefs.h pcb_bool.h \
- unit.h board.h macro.h vtroutestyle.h attrib.h layer.h globalconst.h \
+ unit.h board.h vtroutestyle.h attrib.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.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 \
@@ -6778,19 +6746,18 @@
  ../src_3rd/genht/ht.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 action_helper.h board.h \
- macro.h vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h \
- flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
- obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
- obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
- math_helper.h move.h misc_util.h layer_grp.h library.h rats_patch.h \
- crosshair.h vtonpoint.h hid.h error.h drc.h route.h data.h buffer.h \
- obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
- ../src_3rd/libminuid/libminuid.h rtree.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h library.h rats_patch.h crosshair.h vtonpoint.h \
+ hid.h error.h drc.h route.h data.h buffer.h obj_rat_list.h obj_rat.h \
+ obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h 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 draw.h \
  draw_wireframe.h search.h rats.h netlist.h route_style.h tool.h undo.h \
- ../src_3rd/libuundo/uundo.h undo_old.h obj_arc_draw.h
+ ../src_3rd/libuundo/uundo.h undo_old.h macro.h obj_arc_draw.h
 tool_arrow.o: tool_arrow.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 \
@@ -6800,14 +6767,13 @@
  ../src_3rd/genht/ht.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 action_helper.h board.h \
- macro.h vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h \
- flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
- obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
- obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
- math_helper.h move.h misc_util.h layer_grp.h library.h rats_patch.h \
- buffer.h crosshair.h vtonpoint.h hid.h error.h drc.h route.h data.h \
- obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
- ../src_3rd/libminuid/libminuid.h rtree.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h library.h rats_patch.h buffer.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h data.h obj_rat_list.h obj_rat.h \
+ obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h 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 hid_actions.h \
@@ -6822,13 +6788,13 @@
  ../src_3rd/genht/ht.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 action_helper.h board.h \
- macro.h vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h \
- flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
- obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
- obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
- math_helper.h move.h misc_util.h layer_grp.h library.h rats_patch.h \
- buffer.h compat_misc.h data.h crosshair.h vtonpoint.h hid.h error.h \
- drc.h route.h obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h library.h rats_patch.h buffer.h compat_misc.h \
+ data.h crosshair.h vtonpoint.h hid.h error.h drc.h route.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
  ../src_3rd/libminuid/libminuid.h 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 \
@@ -6836,7 +6802,7 @@
  search.h rats.h netlist.h route_style.h tool.h undo.h \
  ../src_3rd/libuundo/uundo.h undo_old.h
 tool_copy.o: tool_copy.c ../config.h action_helper.h global_typedefs.h \
- pcb_bool.h unit.h board.h macro.h vtroutestyle.h attrib.h \
+ pcb_bool.h unit.h board.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -6849,8 +6815,8 @@
  copy.h crosshair.h vtonpoint.h hid.h error.h drc.h route.h search.h \
  rats.h netlist.h route_style.h tool.h ../src_3rd/genvector/vtp0.h
 tool_insert.o: tool_insert.c ../config.h action_helper.h \
- global_typedefs.h pcb_bool.h unit.h board.h macro.h vtroutestyle.h \
- attrib.h ../src_3rd/genvector/genvector_impl.h \
+ global_typedefs.h pcb_bool.h unit.h board.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -6872,14 +6838,13 @@
  ../src_3rd/genht/ht.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 action_helper.h board.h \
- macro.h vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h \
- flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
- obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
- obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
- math_helper.h move.h misc_util.h layer_grp.h library.h rats_patch.h \
- crosshair.h vtonpoint.h hid.h error.h drc.h route.h data.h buffer.h \
- obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
- ../src_3rd/libminuid/libminuid.h rtree.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h library.h rats_patch.h crosshair.h vtonpoint.h \
+ hid.h error.h drc.h route.h data.h buffer.h obj_rat_list.h obj_rat.h \
+ obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h 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 draw.h \
@@ -6888,7 +6853,7 @@
  obj_pstk_draw.h obj_rat_draw.h \
  ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h
 tool_lock.o: tool_lock.c ../config.h action_helper.h global_typedefs.h \
- pcb_bool.h unit.h board.h macro.h vtroutestyle.h attrib.h \
+ pcb_bool.h unit.h board.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -6907,7 +6872,7 @@
  vtpadstack_t.h draw.h hid_actions.h search.h rats.h netlist.h \
  route_style.h tool.h tool_lock.h
 tool_move.o: tool_move.c ../config.h action_helper.h global_typedefs.h \
- pcb_bool.h unit.h board.h macro.h vtroutestyle.h attrib.h \
+ pcb_bool.h unit.h board.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -6933,7 +6898,7 @@
  obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  layer_grp.h route.h hid_actions.h polygon.h rtree.h \
  ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h tool.h
 tool_polyhole.o: tool_polyhole.c ../config.h conf_core.h conf.h \
@@ -6949,7 +6914,7 @@
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  layer_grp.h route.h hid_actions.h polygon.h rtree.h \
  ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h search.h rats.h \
  netlist.h library.h route_style.h vtroutestyle.h tool.h
@@ -6962,21 +6927,20 @@
  ../src_3rd/genht/ht.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 action_helper.h board.h \
- macro.h vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h \
- flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
- obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
- obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
- math_helper.h move.h misc_util.h layer_grp.h library.h rats_patch.h \
- crosshair.h vtonpoint.h hid.h error.h drc.h route.h data.h buffer.h \
- obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
- ../src_3rd/libminuid/libminuid.h rtree.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h library.h rats_patch.h crosshair.h vtonpoint.h \
+ hid.h error.h drc.h route.h data.h buffer.h obj_rat_list.h obj_rat.h \
+ obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h 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 draw.h tool.h \
  undo.h ../src_3rd/libuundo/uundo.h undo_old.h obj_poly_draw.h
 tool_remove.o: tool_remove.c ../config.h action_helper.h \
- global_typedefs.h pcb_bool.h unit.h board.h macro.h vtroutestyle.h \
- attrib.h ../src_3rd/genvector/genvector_impl.h \
+ global_typedefs.h pcb_bool.h unit.h board.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -7001,7 +6965,7 @@
  obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
  obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
- ../src_3rd/genht/htip.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
  layer_grp.h rotate.h compat_misc.h tool.h
 tool_text.o: tool_text.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 \
@@ -7012,13 +6976,13 @@
  ../src_3rd/genht/ht.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 action_helper.h board.h \
- macro.h vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h \
- flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
- obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
- obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
- math_helper.h move.h misc_util.h layer_grp.h library.h rats_patch.h \
- compat_nls.h data.h crosshair.h vtonpoint.h hid.h error.h drc.h route.h \
- buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h library.h rats_patch.h compat_nls.h data.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
  ../src_3rd/libminuid/libminuid.h 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 \
@@ -7026,8 +6990,8 @@
  hid_actions.h tool.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h \
  obj_text_draw.h
 tool_thermal.o: tool_thermal.c ../config.h action_helper.h \
- global_typedefs.h pcb_bool.h unit.h board.h macro.h vtroutestyle.h \
- attrib.h ../src_3rd/genvector/genvector_impl.h \
+ global_typedefs.h pcb_bool.h unit.h board.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -7053,13 +7017,13 @@
  ../src_3rd/genht/ht.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 action_helper.h board.h \
- macro.h vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h \
- flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
- obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
- obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
- math_helper.h move.h misc_util.h layer_grp.h library.h rats_patch.h \
- change.h compat_nls.h data.h crosshair.h vtonpoint.h hid.h error.h drc.h \
- route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h library.h rats_patch.h change.h compat_nls.h \
+ data.h crosshair.h vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
  ../src_3rd/libminuid/libminuid.h 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 \
@@ -7067,8 +7031,8 @@
  tool_thermal.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h \
  obj_pstk_draw.h ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h
 undo.o: undo.c ../config.h ../src_3rd/libuundo/uundo_debug.h \
- ../src_3rd/libuundo/uundo.h board.h macro.h global_typedefs.h pcb_bool.h \
- unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/libuundo/uundo.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -7097,15 +7061,15 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.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 macro.h \
- vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
- data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
- obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
- obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
- misc_util.h layer_grp.h library.h rats_patch.h data.h crosshair.h \
- vtonpoint.h hid.h error.h drc.h route.h buffer.h obj_rat_list.h \
- obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
- rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h 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 action_helper.h \
  funchash_core.h funchash.h funchash_core_list.h undo.h \
@@ -7112,7 +7076,7 @@
  ../src_3rd/libuundo/uundo.h undo_old.h undo_act.h search.h rats.h \
  netlist.h route_style.h obj_line_draw.h tool.h
 undo_old.o: undo_old.c ../config.h ../src_3rd/libuundo/uundo.h board.h \
- macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
  obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
@@ -7154,7 +7118,7 @@
  ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
  obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
  obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
- ../src_3rd/genht/ht.h box.h math_helper.h macro.h move.h misc_util.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
  ../src_3rd/genvector/gds_char.h obj_pstk_shape.h polygon.h rtree.h \
  ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h vtpadstack_t.h \
  vtpadstack.h ../src_3rd/genvector/genvector_impl.c
@@ -7169,8 +7133,8 @@
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
  ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
  obj_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 macro.h move.h \
- misc_util.h ../src_3rd/genvector/genvector_impl.c
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h move.h misc_util.h \
+ ../src_3rd/genvector/genvector_impl.c
 vtr0.o: vtr0.c vtr0.h ../config.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h \
  ../src_3rd/genvector/genvector_impl.c
Index: trunk/src/board.h
===================================================================
--- trunk/src/board.h	(revision 15925)
+++ trunk/src/board.h	(revision 15926)
@@ -39,7 +39,6 @@
 	PCB_NUM_NETLISTS         /* so that we know how many netlists we are dealing with */
 };
 
-#include "macro.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -63,7 +62,7 @@
 	   |  This struct is also used for the remove list and for buffer handling
 	 */
 struct pcb_board_s {
-	long ID;											/* see macro.h */
+	long ID;
 	char *Name,										/* name of board */
 	 *Filename,										/* name of file (from load) */
 	 *PrintFilename,							/* from print dialog */
Index: trunk/src/box.h
===================================================================
--- trunk/src/box.h	(revision 15925)
+++ trunk/src/box.h	(revision 15926)
@@ -47,7 +47,6 @@
 #include "math_helper.h"
 #include "global_typedefs.h"
 #include "config.h"
-#include "macro.h"
 #include "move.h"
 #include "obj_common.h"
 
Index: trunk/src/change.c
===================================================================
--- trunk/src/change.c	(revision 15925)
+++ trunk/src/change.c	(revision 15926)
@@ -42,6 +42,7 @@
 #include "undo.h"
 #include "hid_actions.h"
 #include "compat_nls.h"
+#include "macro.h"
 #include "obj_pstk_op.h"
 #include "obj_subc_parent.h"
 #include "obj_term.h"
Index: trunk/src/change_act.c
===================================================================
--- trunk/src/change_act.c	(revision 15925)
+++ trunk/src/change_act.c	(revision 15926)
@@ -53,6 +53,7 @@
 #include "compat_nls.h"
 #include "obj_rat_draw.h"
 #include "data_it.h"
+#include "macro.h"
 
 static void ChangeFlag(const char *, const char *, int, const char *);
 static int pcb_act_ChangeSize(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y);
Index: trunk/src/conf_act.c
===================================================================
--- trunk/src/conf_act.c	(revision 15925)
+++ trunk/src/conf_act.c	(revision 15926)
@@ -31,6 +31,7 @@
 #include "error.h"
 #include "hid.h"
 #include "tool.h"
+#include "macro.h"
 
 static const char pcb_acts_Conf[] =
 	"conf(set, path, value, [role], [policy]) - change a config setting to an absolute value\n"
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 15925)
+++ trunk/src/crosshair.c	(revision 15926)
@@ -47,6 +47,7 @@
 #include "undo.h"
 #include "event.h"
 #include "action_helper.h"
+#include "macro.h"
 
 #include "obj_line_draw.h"
 #include "obj_arc_draw.h"
Index: trunk/src/obj_line_drcenf.c
===================================================================
--- trunk/src/obj_line_drcenf.c	(revision 15925)
+++ trunk/src/obj_line_drcenf.c	(revision 15926)
@@ -38,6 +38,7 @@
 #include "data.h"
 #include "find.h"
 #include "rtree.h"
+#include "macro.h"
 
 static double drc_lines(pcb_point_t *end, pcb_bool way);
 
Index: trunk/src/obj_subc.c
===================================================================
--- trunk/src/obj_subc.c	(revision 15925)
+++ trunk/src/obj_subc.c	(revision 15926)
@@ -50,6 +50,7 @@
 #include "polygon.h"
 #include "operation.h"
 #include "undo.h"
+#include "macro.h"
 #include "compat_misc.h"
 #include "math_helper.h"
 #include "pcb_minuid.h"
Index: trunk/src/obj_term.c
===================================================================
--- trunk/src/obj_term.c	(revision 15925)
+++ trunk/src/obj_term.c	(revision 15926)
@@ -38,6 +38,7 @@
 #include "obj_subc_parent.h"
 #include "pcb-printf.h"
 #include "undo.h"
+#include "macro.h"
 #include "polygon.h"
 
 static const char core_term_cookie[] = "core-term";
Index: trunk/src/object_act.c
===================================================================
--- trunk/src/object_act.c	(revision 15925)
+++ trunk/src/object_act.c	(revision 15926)
@@ -53,6 +53,7 @@
 #include "layer_vis.h"
 #include "operation.h"
 #include "obj_pstk.h"
+#include "macro.h"
 
 static const char pcb_acts_Attributes[] = "Attributes(Layout|Layer|Element|Subc)\n" "Attributes(Layer,layername)";
 
Index: trunk/src/plug_io.c
===================================================================
--- trunk/src/plug_io.c	(revision 15925)
+++ trunk/src/plug_io.c	(revision 15926)
@@ -67,6 +67,7 @@
 #include "safe_fs.h"
 #include "plug_footprint.h"
 #include "build_run.h"
+#include "macro.h"
 
 /* for opendir */
 #include "compat_inc.h"
Index: trunk/src/rats.c
===================================================================
--- trunk/src/rats.c	(revision 15925)
+++ trunk/src/rats.c	(revision 15926)
@@ -50,6 +50,7 @@
 #include "compat_misc.h"
 #include "netlist.h"
 #include "compat_nls.h"
+#include "macro.h"
 #include <genvector/vtp0.h>
 #include "obj_rat_draw.h"
 #include "obj_term.h"
Index: trunk/src/tool_arc.c
===================================================================
--- trunk/src/tool_arc.c	(revision 15925)
+++ trunk/src/tool_arc.c	(revision 15926)
@@ -44,6 +44,7 @@
 #include "search.h"
 #include "tool.h"
 #include "undo.h"
+#include "macro.h"
 
 #include "obj_arc_draw.h"
 
Index: trunk/src_plugins/diag/diag.c
===================================================================
--- trunk/src_plugins/diag/diag.c	(revision 15925)
+++ trunk/src_plugins/diag/diag.c	(revision 15926)
@@ -45,6 +45,7 @@
 #include "hid_attrib.h"
 #include "hid_dad.h"
 #include "search.h"
+#include "macro.h"
 
 conf_diag_t conf_diag;
 
Index: trunk/src_plugins/distalign/distalign.c
===================================================================
--- trunk/src_plugins/distalign/distalign.c	(revision 15925)
+++ trunk/src_plugins/distalign/distalign.c	(revision 15926)
@@ -28,6 +28,7 @@
 #include "move.h"
 #include "draw.h"
 #include "plugins.h"
+#include "macro.h"
 #include "action_helper.h"
 #include "hid_actions.h"
 #include "compat_misc.h"
Index: trunk/src_plugins/distaligntext/distaligntext.c
===================================================================
--- trunk/src_plugins/distaligntext/distaligntext.c	(revision 15925)
+++ trunk/src_plugins/distaligntext/distaligntext.c	(revision 15926)
@@ -35,6 +35,7 @@
 #include "hid_actions.h"
 #include "conf_core.h"
 #include "box.h"
+#include "macro.h"
 #include "compat_misc.h"
 
 #define ARG(n) (argc > (n) ? argv[n] : 0)
Index: trunk/src_plugins/djopt/djopt.c
===================================================================
--- trunk/src_plugins/djopt/djopt.c	(revision 15925)
+++ trunk/src_plugins/djopt/djopt.c	(revision 15926)
@@ -55,6 +55,7 @@
 #include "djopt_conf.h"
 #include "obj_line.h"
 #include "event.h"
+#include "macro.h"
 #include "obj_pstk_inlines.h"
 
 conf_djopt_t conf_djopt;
Index: trunk/src_plugins/draw_fab/draw_fab.c
===================================================================
--- trunk/src_plugins/draw_fab/draw_fab.c	(revision 15925)
+++ trunk/src_plugins/draw_fab/draw_fab.c	(revision 15926)
@@ -41,6 +41,7 @@
 #include "stub_draw.h"
 #include "draw_fab_conf.h"
 #include "conf_core.h"
+#include "macro.h"
 #include "obj_pstk_inlines.h"
 
 #include "obj_text_draw.h"
Index: trunk/src_plugins/export_bom/bom.c
===================================================================
--- trunk/src_plugins/export_bom/bom.c	(revision 15925)
+++ trunk/src_plugins/export_bom/bom.c	(revision 15926)
@@ -21,6 +21,7 @@
 #include "hid_attrib.h"
 #include "hid_helper.h"
 #include "hid_init.h"
+#include "macro.h"
 
 const char *bom_cookie = "bom HID";
 
Index: trunk/src_plugins/export_gerber/gerber.c
===================================================================
--- trunk/src_plugins/export_gerber/gerber.c	(revision 15925)
+++ trunk/src_plugins/export_gerber/gerber.c	(revision 15926)
@@ -23,6 +23,7 @@
 #include "hid_helper.h"
 #include "compat_misc.h"
 #include "safe_fs.h"
+#include "macro.h"
 
 #include "hid.h"
 #include "hid_nogui.h"
Index: trunk/src_plugins/export_xy/xy.c
===================================================================
--- trunk/src_plugins/export_xy/xy.c	(revision 15925)
+++ trunk/src_plugins/export_xy/xy.c	(revision 15926)
@@ -20,6 +20,7 @@
 #include "layer.h"
 #include "netlist.h"
 #include "safe_fs.h"
+#include "macro.h"
 
 #include "hid.h"
 #include "hid_nogui.h"
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 15925)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 15926)
@@ -26,6 +26,7 @@
 #include "event.h"
 #include "error.h"
 #include "plugins.h"
+#include "macro.h"
 #include "safe_fs.h"
 
 #include "hid.h"
Index: trunk/src_plugins/import_netlist/import_netlist.c
===================================================================
--- trunk/src_plugins/import_netlist/import_netlist.c	(revision 15925)
+++ trunk/src_plugins/import_netlist/import_netlist.c	(revision 15926)
@@ -39,6 +39,7 @@
 #include "compat_nls.h"
 #include "paths.h"
 #include "safe_fs.h"
+#include "macro.h"
 
 static pcb_plug_import_t import_netlist;
 
Index: trunk/src_plugins/io_kicad_legacy/write.c
===================================================================
--- trunk/src_plugins/io_kicad_legacy/write.c	(revision 15925)
+++ trunk/src_plugins/io_kicad_legacy/write.c	(revision 15926)
@@ -35,6 +35,7 @@
 #include "write.h"
 #include "layer.h"
 #include "netlist.h"
+#include "macro.h"
 #include "obj_pstk_inlines.h"
 
 #include "../io_kicad/uniq_name.h"
Index: trunk/src_plugins/io_pcb/file.c
===================================================================
--- trunk/src_plugins/io_pcb/file.c	(revision 15925)
+++ trunk/src_plugins/io_pcb/file.c	(revision 15926)
@@ -66,6 +66,7 @@
 #include "obj_poly.h"
 #include "thermal.h"
 #include "event.h"
+#include "macro.h"
 
 #include "src_plugins/lib_compat_help/layer_compat.h"
 #include "src_plugins/lib_compat_help/pstk_compat.h"
Index: trunk/src_plugins/io_pcb/parse_l.c
===================================================================
--- trunk/src_plugins/io_pcb/parse_l.c	(revision 15925)
+++ trunk/src_plugins/io_pcb/parse_l.c	(revision 15926)
@@ -699,6 +699,7 @@
 #include "obj_common.h"
 #include "paths.h"
 #include "safe_fs.h"
+#include "macro.h"
 
 #define YY_NO_INPUT
 
@@ -732,7 +733,7 @@
 
 static int Parse(FILE *Pipe, const char *Executable, const char *Path, const char *Filename);
 
-#line 736 "parse_l.c"
+#line 737 "parse_l.c"
 
 #define INITIAL 0
 
@@ -919,10 +920,10 @@
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 109 "parse_l.l"
+#line 110 "parse_l.l"
 
 
-#line 926 "parse_l.c"
+#line 927 "parse_l.c"
 
 	if ( !(yy_init) )
 		{
@@ -1017,227 +1018,227 @@
 
 case 1:
 YY_RULE_SETUP
-#line 111 "parse_l.l"
+#line 112 "parse_l.l"
 { return(T_FILEVERSION); }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 112 "parse_l.l"
+#line 113 "parse_l.l"
 { return(T_PCB); }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 113 "parse_l.l"
+#line 114 "parse_l.l"
 { return(T_GRID); }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 114 "parse_l.l"
+#line 115 "parse_l.l"
 { return(T_CURSOR); }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 115 "parse_l.l"
+#line 116 "parse_l.l"
 { return(T_THERMAL); }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 116 "parse_l.l"
+#line 117 "parse_l.l"
 { return(T_AREA); }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 117 "parse_l.l"
+#line 118 "parse_l.l"
 { return(T_DRC); }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 118 "parse_l.l"
+#line 119 "parse_l.l"
 { return(T_FLAGS); }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 119 "parse_l.l"
+#line 120 "parse_l.l"
 { return(T_LAYER); }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 120 "parse_l.l"
+#line 121 "parse_l.l"
 { return(T_PIN); }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 121 "parse_l.l"
+#line 122 "parse_l.l"
 { return(T_PAD); }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 122 "parse_l.l"
+#line 123 "parse_l.l"
 { return(T_VIA); }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 123 "parse_l.l"
+#line 124 "parse_l.l"
 { return(T_LINE); }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 124 "parse_l.l"
+#line 125 "parse_l.l"
 { return(T_RAT); }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 125 "parse_l.l"
+#line 126 "parse_l.l"
 { return(T_RECTANGLE); }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 126 "parse_l.l"
+#line 127 "parse_l.l"
 { return(T_TEXT); }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 127 "parse_l.l"
+#line 128 "parse_l.l"
 { return(T_ELEMENTLINE); }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 128 "parse_l.l"
+#line 129 "parse_l.l"
 { return(T_ELEMENTARC); }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 129 "parse_l.l"
+#line 130 "parse_l.l"
 { return(T_ELEMENT); }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 130 "parse_l.l"
+#line 131 "parse_l.l"
 { return(T_SYMBOLLINE); }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 131 "parse_l.l"
+#line 132 "parse_l.l"
 { return(T_SYMBOL); }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 132 "parse_l.l"
+#line 133 "parse_l.l"
 { return(T_MARK); }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 133 "parse_l.l"
+#line 134 "parse_l.l"
 { return(T_GROUPS); }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 134 "parse_l.l"
+#line 135 "parse_l.l"
 { return(T_STYLES); }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 135 "parse_l.l"
+#line 136 "parse_l.l"
 { return(T_POLYGON); }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 136 "parse_l.l"
+#line 137 "parse_l.l"
 { return(T_POLYGON_HOLE); }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 137 "parse_l.l"
+#line 138 "parse_l.l"
 { return(T_ARC); }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 138 "parse_l.l"
+#line 139 "parse_l.l"
 { return(T_NETLIST); }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 139 "parse_l.l"
+#line 140 "parse_l.l"
 { return(T_NET); }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 140 "parse_l.l"
+#line 141 "parse_l.l"
 { return(T_CONN); }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 141 "parse_l.l"
+#line 142 "parse_l.l"
 { return(T_NETLISTPATCH); }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 142 "parse_l.l"
+#line 143 "parse_l.l"
 { return(T_ADD_CONN); }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 143 "parse_l.l"
+#line 144 "parse_l.l"
 { return(T_DEL_CONN); }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 144 "parse_l.l"
+#line 145 "parse_l.l"
 { return(T_CHANGE_ATTRIB); }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 145 "parse_l.l"
+#line 146 "parse_l.l"
 { return(T_ATTRIBUTE); }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 147 "parse_l.l"
+#line 148 "parse_l.l"
 { return T_NM; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 148 "parse_l.l"
+#line 149 "parse_l.l"
 { return T_UM; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 149 "parse_l.l"
+#line 150 "parse_l.l"
 { return T_MM; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 150 "parse_l.l"
+#line 151 "parse_l.l"
 { return T_M; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 151 "parse_l.l"
+#line 152 "parse_l.l"
 { return T_KM; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 152 "parse_l.l"
+#line 153 "parse_l.l"
 { return T_UMIL; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 153 "parse_l.l"
+#line 154 "parse_l.l"
 { return T_CMIL; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 154 "parse_l.l"
+#line 155 "parse_l.l"
 { return T_MIL; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 155 "parse_l.l"
+#line 156 "parse_l.l"
 { return T_IN; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 157 "parse_l.l"
+#line 158 "parse_l.l"
 {
 						pcb_lval.integer = (unsigned) *(pcb_text+1);
 						return(CHAR_CONST);
@@ -1245,17 +1246,17 @@
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 161 "parse_l.l"
+#line 162 "parse_l.l"
 {	return parse_number(); }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 162 "parse_l.l"
+#line 163 "parse_l.l"
 {	pcb_lval.integer = pcb_round (strtod (pcb_text, NULL)); return INTEGER; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 164 "parse_l.l"
+#line 165 "parse_l.l"
 {	unsigned n;
 				sscanf((char *) pcb_text, "%x", &n);
 				pcb_lval.integer = n;
@@ -1264,7 +1265,7 @@
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 169 "parse_l.l"
+#line 170 "parse_l.l"
 {
 						char	*p1, *p2;
 
@@ -1300,23 +1301,23 @@
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 201 "parse_l.l"
+#line 202 "parse_l.l"
 { if (yy_parse_tags) { add_tag(pcb_text); }}
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 202 "parse_l.l"
+#line 203 "parse_l.l"
 {}
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 203 "parse_l.l"
+#line 204 "parse_l.l"
 {}
 	YY_BREAK
 case 53:
 /* rule 53 can match eol */
 YY_RULE_SETUP
-#line 204 "parse_l.l"
+#line 205 "parse_l.l"
 {
 #ifndef FLEX_SCANNER
 						pcb_lineno++;
@@ -1325,20 +1326,20 @@
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 209 "parse_l.l"
+#line 210 "parse_l.l"
 {}
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 210 "parse_l.l"
+#line 211 "parse_l.l"
 { return(*pcb_text); }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 212 "parse_l.l"
+#line 213 "parse_l.l"
 ECHO;
 	YY_BREAK
-#line 1342 "parse_l.c"
+#line 1343 "parse_l.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -2348,7 +2349,7 @@
 
 #define YYTABLES_NAME "yytables"
 
-#line 212 "parse_l.l"
+#line 213 "parse_l.l"
 
 
 
Index: trunk/src_plugins/io_pcb/parse_l.h
===================================================================
--- trunk/src_plugins/io_pcb/parse_l.h	(revision 15925)
+++ trunk/src_plugins/io_pcb/parse_l.h	(revision 15926)
@@ -324,7 +324,7 @@
 #undef YY_DECL
 #endif
 
-#line 212 "parse_l.l"
+#line 213 "parse_l.l"
 
 
 #line 331 "parse_l.h"
Index: trunk/src_plugins/io_pcb/parse_l.l
===================================================================
--- trunk/src_plugins/io_pcb/parse_l.l	(revision 15925)
+++ trunk/src_plugins/io_pcb/parse_l.l	(revision 15926)
@@ -61,6 +61,7 @@
 #include "obj_common.h"
 #include "paths.h"
 #include "safe_fs.h"
+#include "macro.h"
 
 #define YY_NO_INPUT
 
Index: trunk/src_plugins/lib_compat_help/elem_rot.c
===================================================================
--- trunk/src_plugins/lib_compat_help/elem_rot.c	(revision 15925)
+++ trunk/src_plugins/lib_compat_help/elem_rot.c	(revision 15926)
@@ -32,6 +32,7 @@
 #include "elem_rot.h"
 #include "conf_core.h"
 #include "data_it.h"
+#include "macro.h"
 
 static const int verbose_rot = 0;
 
Index: trunk/src_plugins/oldactions/oldactions.c
===================================================================
--- trunk/src_plugins/oldactions/oldactions.c	(revision 15925)
+++ trunk/src_plugins/oldactions/oldactions.c	(revision 15926)
@@ -42,8 +42,8 @@
 #include "hid_actions.h"
 #include "plug_footprint.h"
 #include "obj_subc.h"
+#include "macro.h"
 
-
 static void conf_toggle(conf_role_t role, const char *path)
 {
 	conf_native_t *n = conf_get_field(path);
Index: trunk/src_plugins/renumber/renumber.c
===================================================================
--- trunk/src_plugins/renumber/renumber.c	(revision 15925)
+++ trunk/src_plugins/renumber/renumber.c	(revision 15926)
@@ -46,6 +46,7 @@
 #include "compat_nls.h"
 #include "netlist.h"
 #include "safe_fs.h"
+#include "macro.h"
 
 #include "pcb-printf.h"
 
Index: trunk/src_plugins/vendordrill/vendor.c
===================================================================
--- trunk/src_plugins/vendordrill/vendor.c	(revision 15925)
+++ trunk/src_plugins/vendordrill/vendor.c	(revision 15926)
@@ -53,6 +53,7 @@
 #include "compat_nls.h"
 #include "obj_pstk_inlines.h"
 #include "event.h"
+#include "macro.h"
 #include <liblihata/lihata.h>
 #include <liblihata/tree.h>