Index: trunk/src/data.c
===================================================================
--- trunk/src/data.c	(revision 4498)
+++ trunk/src/data.c	(revision 4499)
@@ -36,7 +36,6 @@
 
 CrosshairType Crosshair;				/* information about cursor settings */
 MarkType Marked;								/* a cross-hair mark */
-OutputType Output;							/* some widgets ... used for drawing */
 PCBTypePtr PCB;									/* pointer to layout struct */
 
 int LayerStack[MAX_LAYER];			/* determines the layer draw order */
Index: trunk/src/data.h
===================================================================
--- trunk/src/data.h	(revision 4498)
+++ trunk/src/data.h	(revision 4499)
@@ -40,8 +40,6 @@
 
 extern MarkType Marked;
 
-extern OutputType Output;
-
 extern PCBTypePtr PCB;
 
 #define max_group (PCB->Data->LayerN)
Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 4498)
+++ trunk/src/draw.c	(revision 4499)
@@ -54,6 +54,8 @@
 #define	LARGE_TEXT_SIZE			3
 #define	N_TEXT_SIZES			4
 
+OutputType Output;							/* some widgets ... used for drawing */
+
 /* ---------------------------------------------------------------------------
  * some local identifiers
  */
Index: trunk/src/draw.h
===================================================================
--- trunk/src/draw.h	(revision 4498)
+++ trunk/src/draw.h	(revision 4499)
@@ -31,6 +31,17 @@
 
 #include "global.h"
 
+/* ---------------------------------------------------------------------------
+ * some useful values of our widgets
+ */
+typedef struct {								/* holds information about output window */
+	hidGC bgGC,										/* background and foreground; */
+	  fgGC,												/* changed from some routines */
+	  pmGC;												/* depth 1 pixmap GC to store clip */
+} OutputType, *OutputTypePtr;
+
+extern OutputType Output;
+
 /* Temporarily inhibid drawing if this is non-zero. A function that calls a
    lot of other functions that would call Draw() a lot in turn may increase
    this value before the calls, then decrease it at the end and call Draw().
Index: trunk/src/global.h
===================================================================
--- trunk/src/global.h	(revision 4498)
+++ trunk/src/global.h	(revision 4499)
@@ -61,16 +61,6 @@
 #define PCB_CLAMP(x, low, high)  (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
 #define PCB_ABS(a)	   (((a) < 0) ? -(a) : (a))
 
-/* ---------------------------------------------------------------------------
- * some useful values of our widgets
- */
-typedef struct {								/* holds information about output window */
-	hidGC bgGC,										/* background and foreground; */
-	  fgGC,												/* changed from some routines */
-	  pmGC;												/* depth 1 pixmap GC to store clip */
-} OutputType, *OutputTypePtr;
-
-
 /* ----------------------------------------------------------------------
  * layer group. A layer group identifies layers which are always switched
  * on/off together.