Index: trunk/src/Makefile.dep
===================================================================
--- trunk/src/Makefile.dep	(revision 4628)
+++ trunk/src/Makefile.dep	(revision 4629)
@@ -78,7 +78,7 @@
  ../src_plugins/autoroute/mtspace.h ../src_plugins/autoroute/vector.h \
  polygon.h rtree.h rats.h netlist.h route_style.h remove.h \
  obj_pinvia_therm.h undo.h pcb-printf.h set.h layer.h compat_nls.h \
- obj_all.h ptrlist.h
+ obj_all.h obj_line_draw.h obj_pinvia_draw.h ptrlist.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 ../src_3rd/genlist/gendlist.h flag.h \
@@ -228,7 +228,7 @@
  font.h box.h math_helper.h move.h misc_util.h build_run.h data.h \
  crosshair.h rubberband.h vtonpoint.h hid.h error.h drc.h buffer.h draw.h \
  ../src_plugins/draw_fab/../report/drill.h obj_all.h plugins.h \
- stub_draw_fab.h
+ stub_draw_fab.h obj_text_draw.h rtree.h
 ../src_plugins/export_bboard/bboard.o: \
  ../src_plugins/export_bboard/bboard.c ../config.h math_helper.h board.h \
  const.h macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
@@ -1126,7 +1126,8 @@
  ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \
  ../src_plugins/hid_gtk/win_place.h \
  ../src_plugins/hid_gtk/gui-drc-window.h hid_actions.h compat_nls.h \
- obj_all.h
+ obj_all.h obj_pinvia_draw.h rtree.h obj_pad_draw.h obj_rat_draw.h \
+ obj_line_draw.h obj_arc_draw.h obj_poly_draw.h
 ../src_plugins/hid_gtk/gui-keyref-window.o: \
  ../src_plugins/hid_gtk/gui-keyref-window.c ../config.h \
  ../src_plugins/hid_gtk/gui.h board.h const.h macro.h global_typedefs.h \
@@ -2160,7 +2161,7 @@
  font.h box.h math_helper.h move.h misc_util.h data.h crosshair.h \
  rubberband.h vtonpoint.h hid.h error.h drc.h buffer.h macro.h remove.h \
  hid.h error.h rtree.h draw.h set.h polygon.h rtree.h plugins.h \
- hid_actions.h obj_poly.h dolists.h
+ hid_actions.h obj_poly.h obj_poly_draw.h dolists.h
 ../src_plugins/propedit/propedit.o: ../src_plugins/propedit/propedit.c \
  plugins.h ../config.h ../src_plugins/propedit/props.h global_typedefs.h \
  pcb_bool.h unit.h ../src_3rd/liblihata/genht/htsp.h \
@@ -2673,7 +2674,9 @@
  find.h insert.h polygon.h rtree.h remove.h rotate.h search.h rats.h \
  netlist.h route_style.h select.h operation.h set.h undo.h stub_stroke.h \
  funchash_core.h funchash.h funchash_core_list.h hid_actions.h \
- compat_misc.h compat_nls.h
+ compat_misc.h compat_nls.h obj_pinvia_draw.h obj_pad_draw.h \
+ obj_line_draw.h obj_arc_draw.h obj_elem_draw.h obj_text_draw.h \
+ obj_rat_draw.h obj_poly_draw.h
 attrib.o: attrib.c ../config.h compat_misc.h attrib.h
 board.o: board.c ../config.h board.h const.h macro.h global_typedefs.h \
  pcb_bool.h unit.h vtroutestyle.h ../src_3rd/genvector/genvector_impl.h \
@@ -2884,7 +2887,8 @@
  obj_rat.h library.h rats_patch.h font.h box.h math_helper.h move.h \
  misc_util.h crosshair.h rubberband.h vtonpoint.h hid.h error.h drc.h \
  data.h buffer.h draw.h search.h rats.h netlist.h route_style.h polygon.h \
- rtree.h hid_actions.h compat_misc.h compat_nls.h
+ rtree.h hid_actions.h compat_misc.h compat_nls.h obj_line_draw.h \
+ obj_arc_draw.h
 data.o: data.c ../config.h board.h const.h macro.h global_typedefs.h \
  pcb_bool.h unit.h vtroutestyle.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h attrib.h \
@@ -2979,8 +2983,9 @@
  search.h rats.h netlist.h library.h route_style.h vtroutestyle.h \
  misc_util.h set.h undo.h plug_io.h hid_actions.h compat_misc.h obj_all.h \
  find_geo.c macro.h find_lookup.c compat_nls.h board.h rats_patch.h \
- font.h box.h move.h find_drc.c find_misc.c find_clear.c find_debug.c \
- find_print.c
+ font.h box.h move.h find_drc.c obj_arc_draw.h obj_pad_draw.h \
+ obj_rat_draw.h obj_line_draw.h obj_elem_draw.h obj_poly_draw.h \
+ obj_pinvia_draw.h find_misc.c find_clear.c find_debug.c find_print.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 \
  ../src_3rd/genvector/genvector_impl.h \
@@ -3048,7 +3053,8 @@
  vtonpoint.h hid.h error.h drc.h buffer.h action_helper.h undo.h \
  funchash_core.h funchash.h funchash_core_list.h draw.h search.h rats.h \
  netlist.h route_style.h find.h set.h stub_stroke.h hid_actions.h \
- hid_init.h compat_nls.h
+ hid_init.h compat_nls.h obj_elem_draw.h rtree.h obj_pinvia_draw.h \
+ obj_pad_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 \
@@ -3341,7 +3347,8 @@
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
  ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \
- ../src_3rd/genvector/vtp0.h list_conf.h obj_arc_op.h operation.h draw.h
+ ../src_3rd/genvector/vtp0.h list_conf.h obj_arc_op.h operation.h draw.h \
+ obj_arc_draw.h
 obj_arc_list.o: obj_arc_list.c obj_arc_list.h obj_common.h \
  ../src_3rd/genlist/gendlist.h flag.h globalconst.h ../config.h attrib.h \
  global_typedefs.h pcb_bool.h unit.h obj_arc.h \
@@ -3378,7 +3385,8 @@
  ../src_3rd/genvector/vtp0.h list_conf.h conf_core.h compat_nls.h \
  compat_misc.h rotate.h remove.h polygon.h rtree.h undo.h obj_pinvia_op.h \
  operation.h obj_pad_op.h obj_pinvia_draw.h obj_pad_draw.h \
- obj_line_draw.h obj_arc_draw.h obj_elem_op.h draw.h obj_text_draw.h
+ obj_line_draw.h obj_arc_draw.h obj_elem_op.h draw.h obj_text_draw.h \
+ obj_elem_draw.h
 obj_elem_list.o: obj_elem_list.c ../config.h obj_elem.h obj_common.h \
  ../src_3rd/genlist/gendlist.h flag.h globalconst.h attrib.h \
  global_typedefs.h pcb_bool.h unit.h obj_arc_list.h obj_arc.h \
@@ -3407,7 +3415,8 @@
  ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
  ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \
  ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
- compat_nls.h compat_misc.h rotate.h obj_line_op.h operation.h draw.h
+ compat_nls.h compat_misc.h rotate.h obj_line_op.h operation.h draw.h \
+ obj_line_draw.h obj_rat_draw.h obj_pinvia_draw.h
 obj_line_drcenf.o: obj_line_drcenf.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 \
@@ -3451,7 +3460,7 @@
  ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
  ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \
  ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
- obj_pad_op.h operation.h draw.h obj_text_draw.h
+ obj_pad_op.h operation.h draw.h obj_text_draw.h obj_pad_draw.h
 obj_pad_list.o: obj_pad_list.c obj_pad_list.h obj_pad.h obj_common.h \
  ../src_3rd/genlist/gendlist.h flag.h globalconst.h ../config.h attrib.h \
  global_typedefs.h pcb_bool.h unit.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -3477,7 +3486,7 @@
  ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \
  ../src_3rd/genvector/vtp0.h list_conf.h polygon.h rtree.h compat_nls.h \
  compat_misc.h stub_vendor.h obj_pinvia_op.h operation.h draw.h \
- obj_text_draw.h
+ obj_text_draw.h obj_pinvia_draw.h
 obj_pinvia_list.o: obj_pinvia_list.c obj_pinvia_list.h obj_pinvia.h \
  obj_common.h ../src_3rd/genlist/gendlist.h flag.h globalconst.h \
  ../config.h attrib.h global_typedefs.h pcb_bool.h unit.h \
@@ -3541,8 +3550,8 @@
  ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
  ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \
  ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
- undo.h rtree.h obj_line_draw.h obj_rat_op.h operation.h draw.h rats.h \
- netlist.h route_style.h
+ undo.h rtree.h obj_line_draw.h obj_rat_op.h operation.h draw.h \
+ obj_rat_draw.h rats.h netlist.h route_style.h
 obj_rat_list.o: obj_rat_list.c obj_rat_list.h obj_rat.h obj_common.h \
  ../src_3rd/genlist/gendlist.h flag.h globalconst.h ../config.h attrib.h \
  global_typedefs.h pcb_bool.h unit.h ../src_3rd/genlist/gentdlist_impl.h \
@@ -3563,7 +3572,7 @@
  box.h math_helper.h move.h misc_util.h data.h crosshair.h rubberband.h \
  vtonpoint.h hid.h error.h drc.h buffer.h compat_misc.h compat_nls.h \
  undo.h polygon.h rtree.h obj_text_op.h operation.h draw.h \
- obj_line_draw.h conf_core.h conf.h pcb-printf.h \
+ obj_line_draw.h obj_text_draw.h conf_core.h conf.h pcb-printf.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/liblihata/lihata.h \
  ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
  ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \
@@ -3681,7 +3690,7 @@
  misc_util.h data.h crosshair.h rubberband.h vtonpoint.h hid.h error.h \
  drc.h buffer.h draw.h polygon.h rtree.h remove.h search.h rats.h \
  netlist.h route_style.h set.h obj_pinvia_therm.h undo.h compat_nls.h \
- obj_all.h
+ obj_all.h obj_poly_draw.h
 polygon1.o: polygon1.c ../config.h rtree.h global_typedefs.h pcb_bool.h \
  unit.h math_helper.h heap.h compat_cc.h pcb-printf.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
@@ -3730,7 +3739,7 @@
  misc_util.h data.h crosshair.h rubberband.h vtonpoint.h hid.h error.h \
  drc.h buffer.h draw.h find.h polygon.h rtree.h rats.h netlist.h \
  route_style.h search.h undo.h stub_mincut.h compat_misc.h compat_nls.h \
- ptrlist.h
+ obj_rat_draw.h ptrlist.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 \
  ../src_3rd/genvector/genvector_impl.h \
@@ -3751,7 +3760,7 @@
  misc_util.h data.h crosshair.h rubberband.h vtonpoint.h hid.h error.h \
  drc.h buffer.h action_helper.h undo.h set.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
+ netlist.h route_style.h draw.h obj_rat_draw.h rtree.h
 rats_patch.o: rats_patch.c rats_patch.h board.h ../config.h const.h \
  macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
  ../src_3rd/genvector/genvector_impl.h \
@@ -3822,7 +3831,8 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \
  ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
  compat_nls.h obj_all_op.h obj_arc_op.h obj_elem_op.h obj_line_op.h \
- obj_pad_op.h obj_pinvia_op.h obj_poly_op.h obj_text_op.h obj_rat_op.h
+ obj_pad_op.h obj_pinvia_op.h obj_poly_op.h obj_text_op.h obj_rat_op.h \
+ obj_line_draw.h obj_rat_draw.h
 route_style.o: route_style.c ../config.h pcb-printf.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h unit.h route_style.h \
@@ -3890,7 +3900,9 @@
  obj_rat.h library.h rats_patch.h font.h box.h math_helper.h move.h \
  misc_util.h data.h crosshair.h rubberband.h vtonpoint.h hid.h error.h \
  drc.h buffer.h draw.h search.h rats.h netlist.h route_style.h select.h \
- operation.h undo.h find.h compat_misc.h compat_nls.h \
+ operation.h undo.h find.h compat_misc.h compat_nls.h obj_elem_draw.h \
+ rtree.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 \
  ../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 \
@@ -3963,7 +3975,7 @@
  ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
  ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \
  ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
- compat_misc.h compat_nls.h
+ compat_misc.h compat_nls.h obj_elem_draw.h obj_poly_draw.h
 undo_act.o: undo_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 \
@@ -3984,7 +3996,7 @@
  misc_util.h data.h crosshair.h rubberband.h vtonpoint.h hid.h error.h \
  drc.h buffer.h action_helper.h funchash_core.h funchash.h \
  funchash_core_list.h undo.h polygon.h rtree.h set.h search.h rats.h \
- netlist.h route_style.h draw.h
+ netlist.h route_style.h draw.h obj_line_draw.h
 unit.o: unit.c ../config.h compat_misc.h compat_nls.h unit.h
 vtlibrary.o: vtlibrary.c vtlibrary.h \
  ../src_3rd/genvector/genvector_impl.h \
Index: trunk/src/action_helper.c
===================================================================
--- trunk/src/action_helper.c	(revision 4628)
+++ trunk/src/action_helper.c	(revision 4629)
@@ -52,6 +52,16 @@
 #include "compat_misc.h"
 #include "compat_nls.h"
 
+#include "obj_pinvia_draw.h"
+#include "obj_pad_draw.h"
+#include "obj_line_draw.h"
+#include "obj_arc_draw.h"
+#include "obj_elem_draw.h"
+#include "obj_text_draw.h"
+#include "obj_rat_draw.h"
+#include "obj_poly_draw.h"
+
+
 static void GetGridLockCoordinates(int type, void *ptr1, void *ptr2, void *ptr3, Coord * x, Coord * y)
 {
 	switch (type) {
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 4628)
+++ trunk/src/crosshair.c	(revision 4629)
@@ -41,6 +41,11 @@
 #include "compat_nls.h"
 #include "vtonpoint.h"
 
+#include "obj_line_draw.h"
+#include "obj_arc_draw.h"
+
+
+
 typedef struct {
 	int x, y;
 } point;
Index: trunk/src/draw.h
===================================================================
--- trunk/src/draw.h	(revision 4628)
+++ trunk/src/draw.h	(revision 4629)
@@ -78,38 +78,8 @@
 
 void Draw(void);
 void Redraw(void);
-void DrawVia(PinTypePtr);
-void DrawRat(RatTypePtr);
-void DrawViaName(PinTypePtr);
-void DrawPin(PinTypePtr);
-void DrawPinName(PinTypePtr);
-void DrawPad(PadTypePtr);
-void DrawPadName(PadTypePtr);
-void DrawLine(LayerTypePtr, LineTypePtr);
-void DrawArc(LayerTypePtr, ArcTypePtr);
-void DrawText(LayerTypePtr, TextTypePtr);
-void DrawTextLowLevel(TextTypePtr, Coord);
-void DrawPolygon(LayerTypePtr, PolygonTypePtr);
-void DrawElement(ElementTypePtr);
-void DrawElementName(ElementTypePtr);
-void DrawElementPackage(ElementTypePtr);
-void DrawElementPinsAndPads(ElementTypePtr);
 void DrawObject(int, void *, void *);
 void DrawLayer(LayerTypePtr, const BoxType *);
-void EraseVia(PinTypePtr);
-void EraseRat(RatTypePtr);
-void EraseViaName(PinTypePtr);
-void ErasePad(PadTypePtr);
-void ErasePadName(PadTypePtr);
-void ErasePin(PinTypePtr);
-void ErasePinName(PinTypePtr);
-void EraseLine(LineTypePtr);
-void EraseArc(ArcTypePtr);
-void EraseText(LayerTypePtr, TextTypePtr);
-void ErasePolygon(PolygonTypePtr);
-void EraseElement(ElementTypePtr);
-void EraseElementPinsAndPads(ElementTypePtr);
-void EraseElementName(ElementTypePtr);
 void EraseObject(int, void *, void *);
 
 #endif
Index: trunk/src/find_drc.c
===================================================================
--- trunk/src/find_drc.c	(revision 4628)
+++ trunk/src/find_drc.c	(revision 4629)
@@ -28,6 +28,14 @@
 #include "drc.h"
 #include "compat_nls.h"
 
+#include "obj_arc_draw.h"
+#include "obj_pad_draw.h"
+#include "obj_rat_draw.h"
+#include "obj_line_draw.h"
+#include "obj_elem_draw.h"
+#include "obj_poly_draw.h"
+#include "obj_pinvia_draw.h"
+
 /* DRC related functions */
 
 static void GotoError(void);
Index: trunk/src/gui_act.c
===================================================================
--- trunk/src/gui_act.c	(revision 4628)
+++ trunk/src/gui_act.c	(revision 4629)
@@ -43,6 +43,11 @@
 #include "hid_init.h"
 #include "compat_nls.h"
 
+#include "obj_elem_draw.h"
+#include "obj_pinvia_draw.h"
+#include "obj_pad_draw.h"
+
+
 /* --------------------------------------------------------------------------- */
 /* Toggle actions are kept for compatibility; new code should use the conf system instead */
 static const char display_syntax[] =
Index: trunk/src/obj_arc.c
===================================================================
--- trunk/src/obj_arc.c	(revision 4628)
+++ trunk/src/obj_arc.c	(revision 4629)
@@ -42,7 +42,9 @@
 
 /* TODO: could be removed if draw.c could be split up */
 #include "draw.h"
+#include "obj_arc_draw.h"
 
+
 ArcTypePtr GetArcMemory(LayerType * layer)
 {
 	ArcType *new_obj;
Index: trunk/src/obj_elem.c
===================================================================
--- trunk/src/obj_elem.c	(revision 4628)
+++ trunk/src/obj_elem.c	(revision 4629)
@@ -54,6 +54,7 @@
 /* TODO: remove this: */
 #include "draw.h"
 #include "obj_text_draw.h"
+#include "obj_elem_draw.h"
 
 /*** allocation ***/
 
Index: trunk/src/obj_elem_draw.h
===================================================================
--- trunk/src/obj_elem_draw.h	(revision 4628)
+++ trunk/src/obj_elem_draw.h	(revision 4629)
@@ -26,6 +26,7 @@
 
 /*** Standard draw of elements ***/
 
+#include "rtree.h"
 r_dir_t draw_element_name_callback(const BoxType * b, void *cl);
 r_dir_t draw_element_mark_callback(const BoxType * b, void *cl);
 r_dir_t draw_element_callback(const BoxType * b, void *cl);
Index: trunk/src/obj_line.c
===================================================================
--- trunk/src/obj_line.c	(revision 4628)
+++ trunk/src/obj_line.c	(revision 4629)
@@ -44,6 +44,9 @@
 
 /* TODO: maybe remove this and move lines from draw here? */
 #include "draw.h"
+#include "obj_line_draw.h"
+#include "obj_rat_draw.h"
+#include "obj_pinvia_draw.h"
 
 
 /**** allocation ****/
Index: trunk/src/obj_pad.c
===================================================================
--- trunk/src/obj_pad.c	(revision 4628)
+++ trunk/src/obj_pad.c	(revision 4629)
@@ -43,6 +43,7 @@
 /* TODO: remove this if draw.[ch] pads are moved */
 #include "draw.h"
 #include "obj_text_draw.h"
+#include "obj_pad_draw.h"
 
 /*** allocation ***/
 /* get next slot for a pad, allocates memory if necessary */
Index: trunk/src/obj_pinvia.c
===================================================================
--- trunk/src/obj_pinvia.c	(revision 4628)
+++ trunk/src/obj_pinvia.c	(revision 4629)
@@ -42,6 +42,7 @@
 /* TODO: consider removing this by moving pin/via functions here: */
 #include "draw.h"
 #include "obj_text_draw.h"
+#include "obj_pinvia_draw.h"
 
 /*** allocation ***/
 
Index: trunk/src/obj_pinvia_draw.h
===================================================================
--- trunk/src/obj_pinvia_draw.h	(revision 4628)
+++ trunk/src/obj_pinvia_draw.h	(revision 4629)
@@ -25,10 +25,14 @@
  */
 
 /*** Standard draw on pins and vias ***/
+
+#include "rtree.h"
 r_dir_t draw_pin_callback(const BoxType * b, void *cl);
 r_dir_t clear_pin_callback(const BoxType * b, void *cl);
 r_dir_t draw_via_callback(const BoxType * b, void *cl);
 r_dir_t draw_hole_callback(const BoxType * b, void *cl);
+
+
 void draw_pin(PinTypePtr pin, pcb_bool draw_hole);
 void EraseVia(PinTypePtr Via);
 void EraseViaName(PinTypePtr Via);
Index: trunk/src/obj_rat.c
===================================================================
--- trunk/src/obj_rat.c	(revision 4628)
+++ trunk/src/obj_rat.c	(revision 4629)
@@ -44,6 +44,7 @@
 
 /* TODO: consider moving the code from draw.c here and remove this: */
 #include "draw.h"
+#include "obj_rat_draw.h"
 
 /* TODO: merge rats.[ch] too */
 #include "rats.h"
Index: trunk/src/obj_rat_draw.h
===================================================================
--- trunk/src/obj_rat_draw.h	(revision 4628)
+++ trunk/src/obj_rat_draw.h	(revision 4629)
@@ -25,6 +25,9 @@
  */
 
 /*** Standard draw on rats ***/
+
+#include "rtree.h"
 r_dir_t draw_rat_callback(const BoxType * b, void *cl);
+
 void EraseRat(RatTypePtr Rat);
 void DrawRat(RatTypePtr Rat);
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 4628)
+++ trunk/src/obj_text.c	(revision 4629)
@@ -43,6 +43,7 @@
 /* TODO: remove this if draw.c is moved here: */
 #include "draw.h"
 #include "obj_line_draw.h"
+#include "obj_text_draw.h"
 #include "conf_core.h"
 
 /*** allocation ***/
Index: trunk/src/polygon.c
===================================================================
--- trunk/src/polygon.c	(revision 4628)
+++ trunk/src/polygon.c	(revision 4629)
@@ -93,6 +93,7 @@
 #include "layer.h"
 #include "compat_nls.h"
 #include "obj_all.h"
+#include "obj_poly_draw.h"
 
 #define ROUND(x) ((long)(((x) >= 0 ? (x) + 0.5  : (x) - 0.5)))
 
Index: trunk/src/rats.c
===================================================================
--- trunk/src/rats.c	(revision 4628)
+++ trunk/src/rats.c	(revision 4629)
@@ -46,6 +46,8 @@
 #include "netlist.h"
 #include "compat_nls.h"
 
+#include "obj_rat_draw.h"
+
 #warning TODO: remove this in favor of vtptr
 #include "ptrlist.h"
 
Index: trunk/src/rats_act.c
===================================================================
--- trunk/src/rats_act.c	(revision 4628)
+++ trunk/src/rats_act.c	(revision 4629)
@@ -42,6 +42,8 @@
 #include "rats.h"
 #include "draw.h"
 
+#include "obj_rat_draw.h"
+
 /* --------------------------------------------------------------------------- */
 
 static const char addrats_syntax[] = "AddRats(AllRats|SelectedRats|Close)";
Index: trunk/src/rotate.c
===================================================================
--- trunk/src/rotate.c	(revision 4628)
+++ trunk/src/rotate.c	(revision 4629)
@@ -46,6 +46,9 @@
 #include "compat_nls.h"
 #include "obj_all_op.h"
 
+#include "obj_line_draw.h"
+#include "obj_rat_draw.h"
+
 /* ----------------------------------------------------------------------
  * some local identifiers
  */
Index: trunk/src/select.c
===================================================================
--- trunk/src/select.c	(revision 4628)
+++ trunk/src/select.c	(revision 4629)
@@ -42,6 +42,15 @@
 #include "compat_misc.h"
 #include "compat_nls.h"
 
+#include "obj_elem_draw.h"
+#include "obj_pad_draw.h"
+#include "obj_arc_draw.h"
+#include "obj_pinvia_draw.h"
+#include "obj_line_draw.h"
+#include "obj_poly_draw.h"
+#include "obj_text_draw.h"
+#include "obj_rat_draw.h"
+
 #include <genregex/regex_sei.h>
 
 void pcb_select_element(ElementType *element, pcb_change_flag_t how, int redraw)
Index: trunk/src/undo.c
===================================================================
--- trunk/src/undo.c	(revision 4628)
+++ trunk/src/undo.c	(revision 4629)
@@ -61,6 +61,9 @@
 #include "compat_misc.h"
 #include "compat_nls.h"
 
+#include "obj_elem_draw.h"
+#include "obj_poly_draw.h"
+
 #define STEP_REMOVELIST 500
 #define STEP_UNDOLIST   500
 
Index: trunk/src/undo_act.c
===================================================================
--- trunk/src/undo_act.c	(revision 4628)
+++ trunk/src/undo_act.c	(revision 4629)
@@ -39,6 +39,8 @@
 #include "search.h"
 #include "draw.h"
 
+#include "obj_line_draw.h"
+
 /* --------------------------------------------------------------------------- */
 
 static const char atomic_syntax[] = "Atomic(Save|Restore|Close|Block)";
Index: trunk/src_plugins/autoroute/autoroute.c
===================================================================
--- trunk/src_plugins/autoroute/autoroute.c	(revision 4628)
+++ trunk/src_plugins/autoroute/autoroute.c	(revision 4629)
@@ -78,6 +78,9 @@
 #include "compat_nls.h"
 #include "obj_all.h"
 
+#include "obj_line_draw.h"
+#include "obj_pinvia_draw.h"
+
 #warning TODO: remove this in favor of vtptr
 #include "ptrlist.h"
 
Index: trunk/src_plugins/draw_fab/draw_fab.c
===================================================================
--- trunk/src_plugins/draw_fab/draw_fab.c	(revision 4628)
+++ trunk/src_plugins/draw_fab/draw_fab.c	(revision 4629)
@@ -38,6 +38,9 @@
 #include "plugins.h"
 #include "stub_draw_fab.h"
 
+#include "obj_text_draw.h"
+
+
 /* ---------------------------------------------------------------------------
  * prints a FAB drawing.
  */
Index: trunk/src_plugins/hid_gtk/gui-drc-window.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-drc-window.c	(revision 4628)
+++ trunk/src_plugins/hid_gtk/gui-drc-window.c	(revision 4629)
@@ -40,7 +40,14 @@
 #include "hid_actions.h"
 #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"
+#include "obj_poly_draw.h"
 
+
 #define VIOLATION_PIXMAP_PIXEL_SIZE   100
 #define VIOLATION_PIXMAP_PIXEL_BORDER 5
 #define VIOLATION_PIXMAP_PCB_SIZE     PCB_MIL_TO_COORD (100)
Index: trunk/src_plugins/polystitch/polystitch.c
===================================================================
--- trunk/src_plugins/polystitch/polystitch.c	(revision 4628)
+++ trunk/src_plugins/polystitch/polystitch.c	(revision 4629)
@@ -37,6 +37,7 @@
 #include "plugins.h"
 #include "hid_actions.h"
 #include "obj_poly.h"
+#include "obj_poly_draw.h"
 
 static PolygonType *inner_poly, *outer_poly;
 static LayerType *poly_layer;