Index: trunk/src/obj_rat.c
===================================================================
--- trunk/src/obj_rat.c	(revision 23236)
+++ trunk/src/obj_rat.c	(revision 23237)
@@ -46,9 +46,6 @@
 #include "draw.h"
 #include "obj_rat_draw.h"
 
-/* TODO: merge rats.[ch] too */
-#include "rats.h"
-
 /*** allocation ***/
 
 void pcb_rat_reg(pcb_data_t *data, pcb_rat_t *rat)
Index: trunk/src/obj_rat.h
===================================================================
--- trunk/src/obj_rat.h	(revision 23236)
+++ trunk/src/obj_rat.h	(revision 23237)
@@ -52,4 +52,9 @@
 pcb_rat_t *pcb_rat_new(pcb_data_t *Data, long int id, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_layergrp_id_t group1, pcb_layergrp_id_t group2, pcb_coord_t Thickness, pcb_flag_t Flags);
 pcb_bool pcb_rats_destroy(pcb_bool selected);
 
+#define PCB_RAT_LOOP(top) do {                                          \
+  pcb_rat_t *line;                                                    \
+  gdl_iterator_t __it__;                                            \
+  ratlist_foreach(&(top)->Rat, &__it__, line) {
+
 #endif
Index: trunk/src/operation.c
===================================================================
--- trunk/src/operation.c	(revision 23236)
+++ trunk/src/operation.c	(revision 23237)
@@ -33,7 +33,6 @@
 #include "data.h"
 #include "conf_core.h"
 #include "undo.h"
-#include "rats.h"
 #include "brave.h"
 
 /* ----------------------------------------------------------------------
Index: trunk/src/rats.h
===================================================================
--- trunk/src/rats.h	(revision 23236)
+++ trunk/src/rats.h	(revision 23237)
@@ -73,10 +73,4 @@
         {                                                     \
                 connection = & (net)->Connection[n]
 
-#define PCB_RAT_LOOP(top) do {                                          \
-  pcb_rat_t *line;                                                    \
-  gdl_iterator_t __it__;                                            \
-  ratlist_foreach(&(top)->Rat, &__it__, line) {
-
-
 #endif
Index: trunk/src/tool_line.c
===================================================================
--- trunk/src/tool_line.c	(revision 23236)
+++ trunk/src/tool_line.c	(revision 23237)
@@ -43,7 +43,6 @@
 #include "find.h"
 #include "obj_line.h"
 #include "obj_subc.h"
-#include "rats.h"
 #include "search.h"
 #include "tool.h"
 #include "undo.h"