Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 5033)
+++ trunk/src/crosshair.c	(revision 5034)
@@ -47,12 +47,14 @@
 #include "obj_line_draw.h"
 #include "obj_arc_draw.h"
 
-
-
 typedef struct {
 	int x, y;
 } point;
 
+pcb_crosshair_t Crosshair;  /* information about cursor settings */
+pcb_mark_t Marked;          /* a cross-hair mark */
+
+
 /* ---------------------------------------------------------------------------
  * some local prototypes
  */
Index: trunk/src/crosshair.h
===================================================================
--- trunk/src/crosshair.h	(revision 5033)
+++ trunk/src/crosshair.h	(revision 5034)
@@ -96,6 +96,10 @@
 #define PCB_CH_STATE_SECOND 1
 #define PCB_CH_STATE_THIRD  2
 
+extern pcb_crosshair_t Crosshair;
+extern pcb_mark_t Marked;
+
+
 pcb_coord_t pcb_grid_fit(pcb_coord_t x, pcb_coord_t grid_spacing, pcb_coord_t grid_offset);
 void pcb_notify_crosshair_change(pcb_bool changes_complete);
 void pcb_notify_mark_change(pcb_bool changes_complete);
Index: trunk/src/data.c
===================================================================
--- trunk/src/data.c	(revision 5033)
+++ trunk/src/data.c	(revision 5034)
@@ -37,10 +37,6 @@
 /* ---------------------------------------------------------------------------
  * some shared identifiers
  */
-
-pcb_crosshair_t Crosshair;				/* information about cursor settings */
-pcb_mark_t Marked;								/* a cross-hair mark */
-
 int LayerStack[MAX_LAYER];			/* determines the layer draw order */
 
 pcb_buffer_t Buffers[MAX_BUFFER]; /* my buffers */
Index: trunk/src/data.h
===================================================================
--- trunk/src/data.h	(revision 5033)
+++ trunk/src/data.h	(revision 5034)
@@ -53,13 +53,6 @@
 };
 
 
-/* ---------------------------------------------------------------------------
- * some shared identifiers
- */
-extern pcb_crosshair_t Crosshair;
-
-extern pcb_mark_t Marked;
-
 #define max_group (PCB->Data->LayerN)
 #define max_copper_layer (PCB->Data->LayerN)
 #define solder_silk_layer (max_copper_layer + SOLDER_LAYER)