Index: trunk/src/Makefile.dep
===================================================================
--- trunk/src/Makefile.dep	(revision 15636)
+++ trunk/src/Makefile.dep	(revision 15637)
@@ -3212,9 +3212,9 @@
  ../src_plugins/lib_gtk_common/dlg_drc.h \
  ../src_plugins/lib_gtk_common/glue.h hid.h conf.h \
  ../src_plugins/lib_gtk_common/compat.h hid_actions.h compat_nls.h \
- obj_all.h obj_elem.h obj_pad.h obj_pinvia_draw.h obj_pad_draw.h \
- obj_rat_draw.h obj_line_draw.h obj_arc_draw.h obj_poly_draw.h \
- layer_vis.h ../src_plugins/lib_gtk_common/wt_preview.h obj_elem.h \
+ obj_all.h obj_elem.h obj_pad.h obj_pinvia_draw.h obj_rat_draw.h \
+ obj_line_draw.h obj_arc_draw.h obj_poly_draw.h layer_vis.h \
+ ../src_plugins/lib_gtk_common/wt_preview.h obj_elem.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 \
@@ -5333,9 +5333,9 @@
  remove.h rotate.h compat_misc.h search.h rats.h netlist.h route_style.h \
  select.h operation.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h \
  stub_stroke.h funchash_core.h funchash.h funchash_core_list.h \
- hid_actions.h compat_nls.h event.h obj_pinvia_draw.h obj_pad_draw.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
+ hid_actions.h compat_nls.h event.h obj_pinvia_draw.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 const.h macro.h global_typedefs.h \
  pcb_bool.h unit.h vtroutestyle.h attrib.h \
@@ -5632,10 +5632,10 @@
  rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
  ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h vtpadstack.h \
  obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h rotate.h compat_misc.h \
- stub_draw.h obj_all.h obj_elem.h obj_pad.h layer_ui.h obj_pad_draw.h \
- obj_pinvia_draw.h obj_pstk_draw.h obj_line_draw.h obj_arc_draw.h \
- obj_rat_draw.h obj_poly_draw.h obj_text_draw.h obj_subc_parent.h \
- draw_composite.c draw_ly_spec.c
+ stub_draw.h obj_all.h obj_elem.h obj_pad.h layer_ui.h obj_pinvia_draw.h \
+ obj_pstk_draw.h obj_line_draw.h obj_arc_draw.h obj_rat_draw.h \
+ obj_poly_draw.h obj_text_draw.h obj_subc_parent.h draw_composite.c \
+ draw_ly_spec.c
 error.o: error.c ../config.h data.h globalconst.h global_typedefs.h \
  pcb_bool.h unit.h layer.h attrib.h obj_all_list.h obj_arc_list.h \
  obj_common.h flag.h data_parent.h obj_arc.h \
@@ -5707,9 +5707,9 @@
  obj_text_draw.h obj_subc_parent.h find_geo.c obj_arc_ui.h \
  obj_pstk_inlines.h board.h rats_patch.h thermal.h find_lookup.c \
  compat_nls.h find_intconn.c find_drc.c data_it.h obj_arc_draw.h \
- obj_pad_draw.h obj_rat_draw.h obj_line_draw.h obj_poly_draw.h \
- obj_pinvia_draw.h obj_pstk_draw.h find_misc.c change.h find_clear.c \
- find_debug.c find_print.c find_any_isect.c
+ obj_rat_draw.h obj_line_draw.h obj_poly_draw.h obj_pinvia_draw.h \
+ obj_pstk_draw.h find_misc.c change.h find_clear.c find_debug.c \
+ find_print.c find_any_isect.c
 find_act.o: find_act.c ../config.h board.h const.h macro.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
@@ -5801,7 +5801,7 @@
  funchash_core_list.h change.h draw.h search.h rats.h netlist.h \
  route_style.h find.h stub_stroke.h hid_actions.h hid_init.h compat_nls.h \
  compat_misc.h event.h layer_vis.h hid_attrib.h operation.h obj_subc_op.h \
- obj_pinvia_draw.h obj_pad_draw.h
+ obj_pinvia_draw.h
 heap.o: heap.c ../config.h heap.h
 hid_actions.o: hid_actions.c ../config.h conf_core.h conf.h \
  global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
@@ -6368,8 +6368,7 @@
  ../src_3rd/libuundo/uundo.h undo_old.h compat_misc.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 \
- obj_pad.h obj_pad_op.h obj_hash.h draw.h obj_text_draw.h obj_pad_draw.h \
- obj_elem.h
+ obj_pad.h obj_pad_op.h obj_hash.h draw.h obj_text_draw.h obj_elem.h
 obj_pinvia.o: obj_pinvia.c ../config.h board.h const.h macro.h \
  global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
  ../src_3rd/genvector/genvector_impl.h \
@@ -7089,10 +7088,10 @@
  obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h search.h rats.h \
  netlist.h route_style.h select.h operation.h undo.h \
  ../src_3rd/libuundo/uundo.h undo_old.h find.h compat_misc.h compat_nls.h \
- obj_pad_draw.h obj_arc_draw.h obj_pinvia_draw.h obj_line_draw.h \
- obj_poly_draw.h obj_text_draw.h obj_rat_draw.h obj_pstk_draw.h \
- obj_elem.h ../src_3rd/genregex/regex_sei.h \
- ../src_3rd/genregex/regex_templ.h ../src_3rd/genregex/regex.h
+ obj_arc_draw.h obj_pinvia_draw.h obj_line_draw.h obj_poly_draw.h \
+ obj_text_draw.h obj_rat_draw.h obj_pstk_draw.h obj_elem.h \
+ ../src_3rd/genregex/regex_sei.h ../src_3rd/genregex/regex_templ.h \
+ ../src_3rd/genregex/regex.h
 select_act.o: select_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 \
Index: trunk/src/action_helper.c
===================================================================
--- trunk/src/action_helper.c	(revision 15636)
+++ trunk/src/action_helper.c	(revision 15637)
@@ -60,7 +60,6 @@
 #include "event.h"
 
 #include "obj_pinvia_draw.h"
-#include "obj_pad_draw.h"
 #include "obj_line_draw.h"
 #include "obj_arc_draw.h"
 #include "obj_text_draw.h"
Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 15636)
+++ trunk/src/draw.c	(revision 15637)
@@ -43,7 +43,6 @@
 #include "obj_all.h"
 #include "layer_ui.h"
 
-#include "obj_pad_draw.h"
 #include "obj_pinvia_draw.h"
 #include "obj_pstk_draw.h"
 #include "obj_line_draw.h"
Index: trunk/src/find_drc.c
===================================================================
--- trunk/src/find_drc.c	(revision 15636)
+++ trunk/src/find_drc.c	(revision 15637)
@@ -32,7 +32,6 @@
 #include "data_it.h"
 
 #include "obj_arc_draw.h"
-#include "obj_pad_draw.h"
 #include "obj_rat_draw.h"
 #include "obj_line_draw.h"
 #include "obj_poly_draw.h"
Index: trunk/src/gui_act.c
===================================================================
--- trunk/src/gui_act.c	(revision 15636)
+++ trunk/src/gui_act.c	(revision 15637)
@@ -61,7 +61,6 @@
 #include "obj_subc_op.h"
 
 #include "obj_pinvia_draw.h"
-#include "obj_pad_draw.h"
 
 #define CLONE_TYPES PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLY
 
Index: trunk/src/obj_pad.c
===================================================================
--- trunk/src/obj_pad.c	(revision 15636)
+++ trunk/src/obj_pad.c	(revision 15637)
@@ -44,7 +44,6 @@
 /* TODO: remove this if draw.[ch] pads are moved */
 #include "draw.h"
 #include "obj_text_draw.h"
-#include "obj_pad_draw.h"
 
 #include "obj_elem.h"
 
Index: trunk/src/select.c
===================================================================
--- trunk/src/select.c	(revision 15636)
+++ trunk/src/select.c	(revision 15637)
@@ -45,7 +45,6 @@
 #include "compat_misc.h"
 #include "compat_nls.h"
 
-#include "obj_pad_draw.h"
 #include "obj_arc_draw.h"
 #include "obj_pinvia_draw.h"
 #include "obj_line_draw.h"
Index: trunk/src_plugins/lib_gtk_common/dlg_drc.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_drc.c	(revision 15636)
+++ trunk/src_plugins/lib_gtk_common/dlg_drc.c	(revision 15637)
@@ -43,7 +43,6 @@
 #include "compat_nls.h"
 #include "obj_all.h"
 #include "obj_pinvia_draw.h"
-#include "obj_pad_draw.h"
 #include "obj_rat_draw.h"
 #include "obj_line_draw.h"
 #include "obj_arc_draw.h"