Index: trunk/src/data.h
===================================================================
--- trunk/src/data.h	(revision 28818)
+++ trunk/src/data.h	(revision 28819)
@@ -40,6 +40,7 @@
 #include "obj_rat_list.h"
 #include "obj_subc_list.h"
 #include "obj_pstk_list.h"
+#include "rtree2_compat.h"
 #include "vtpadstack.h"
 #include <genht/htip.h>
 
Index: trunk/src/obj_subc.h
===================================================================
--- trunk/src/obj_subc.h	(revision 28818)
+++ trunk/src/obj_subc.h	(revision 28819)
@@ -33,6 +33,7 @@
 #include "obj_common.h"
 #include "layer.h"
 #include "global_typedefs.h"
+#include "rtree2_compat.h"
 
 
 typedef enum pcb_subc_cached_s {
Index: trunk/src/polygon.h
===================================================================
--- trunk/src/polygon.h	(revision 28818)
+++ trunk/src/polygon.h	(revision 28819)
@@ -37,7 +37,9 @@
 #include "rtree.h"
 #include "math_helper.h"
 #include "polyarea.h"
+#include "rtree2_compat.h"
 
+
 /* Prototypes */
 
 void pcb_polygon_init(void);
Index: trunk/src/polygon1.c
===================================================================
--- trunk/src/polygon1.c	(revision 28818)
+++ trunk/src/polygon1.c	(revision 28819)
@@ -55,6 +55,7 @@
 #include "obj_common.h"
 #include "macro.h"
 #include "box.h"
+#include "rtree2_compat.h"
 
 
 #define ROUND(a) (long)((a) > 0 ? ((a) + 0.5) : ((a) - 0.5))
Index: trunk/src/rtree.c
===================================================================
--- trunk/src/rtree.c	(revision 28818)
+++ trunk/src/rtree.c	(revision 28819)
@@ -37,6 +37,7 @@
 #include <genrtree/genrtree_search.h>
 #include <genrtree/genrtree_delete.h>
 #include <genrtree/genrtree_debug.h>
+#include "rtree2_compat.h"
 
 /* Temporary compatibility layer for the transition */
 pcb_rtree_t *pcb_r_create_tree(void)
Index: trunk/src/rtree.h
===================================================================
--- trunk/src/rtree.h	(revision 28818)
+++ trunk/src/rtree.h	(revision 28819)
@@ -43,6 +43,4 @@
 
 #include <genrtree/genrtree_api.h>
 
-#include "rtree2_compat.h"
-
 #endif /* PCB_RTREE_H */
Index: trunk/src/rtree2_compat.h
===================================================================
--- trunk/src/rtree2_compat.h	(revision 28818)
+++ trunk/src/rtree2_compat.h	(revision 28819)
@@ -38,6 +38,11 @@
 /* Compatibility layer between the new rtree and the old rtree for the
    period of transition */
 
+#ifndef PCB_RTREE2_COMPAT_H
+#define PCB_RTREE2_COMPAT_H
+
+#include "rtree.h"
+
 /* callback direction to the search engine */
 typedef enum pcb_r_dir_e {
 	PCB_R_DIR_NOT_FOUND = 0,         /* object not found or not accepted */
@@ -89,3 +94,5 @@
 
 /* Free fields of the iterator - not needed anymore, will be removed */
 void pcb_r_end(pcb_rtree_it_t *it);
+
+#endif
Index: trunk/src_plugins/autoroute/mtspace.c
===================================================================
--- trunk/src_plugins/autoroute/mtspace.c	(revision 28818)
+++ trunk/src_plugins/autoroute/mtspace.c	(revision 28819)
@@ -52,6 +52,7 @@
 #include "rtree.h"
 #include "mtspace.h"
 #include "vector.h"
+#include "rtree2_compat.h"
 
 /* mtspace data structures are built on r-trees. */