Index: trunk/src/librnd/core/globalconst.h
===================================================================
--- trunk/src/librnd/core/globalconst.h	(revision 29336)
+++ trunk/src/librnd/core/globalconst.h	(revision 29337)
@@ -69,7 +69,6 @@
 #define PCB_MAX_LINE_POINT_DISTANCE     0   /* maximum distance when searching line points; same for arc point */
 #define PCB_MAX_POLYGON_POINT_DISTANCE  0   /* maximum distance when searching polygon points */
 #define PCB_MAX_NETLIST_LINE_LENGTH     255 /* maximum line length for netlist files */
-#define PCB_MAX_MODESTACK_DEPTH         16  /* maximum depth of mode stack */
 #define PCB_MIN_GRID_DISTANCE           4   /* minimum distance between point to enable grid drawing */
 #define PCB_EMARK_SIZE                  PCB_MIL_TO_COORD(10) 	/* size of diamond element mark */
 #define PCB_SUBC_AUX_UNIT               PCB_MM_TO_COORD(1) /* size of the unit vector for the subc-aux layer */
Index: trunk/src/tool.c
===================================================================
--- trunk/src/tool.c	(revision 29336)
+++ trunk/src/tool.c	(revision 29337)
@@ -35,10 +35,8 @@
 #include <librnd/core/actions.h>
 #include <librnd/core/conf_hid.h>
 
-#include "conf_core.h"
-#include "crosshair.h"
+#define PCB_MAX_MODESTACK_DEPTH         16  /* maximum depth of mode stack */
 
-
 vtp0_t pcb_tools;
 
 pcb_toolid_t pcb_tool_prev_id;
@@ -267,6 +265,8 @@
 /**** tool helper functions ****/
 
 #include "board.h"
+#include "conf_core.h"
+#include "crosshair.h"
 #include "data.h"
 #include "draw.h"