made cvpcb and gerbview compilable with last changes in pcbnew

cvpcb/cvpcb.cpp

@@ -10,6 +10,7 @@
 #include "cvpcb.h"
 #include "trigo.h"
 #include "gr_basic.h"
+#include "zones.h"
 
 #include "bitmaps.h"
 

gerbview/gerbview.cpp

@@ -14,6 +14,7 @@
 #include "gerbview.h"
 #include "pcbplot.h"
 #include "trigo.h"
+#include "zones.h"
 #include "bitmaps.h"
 #include "protos.h"
 

pcbnew/autoplac.cpp

@@ -9,6 +9,7 @@
 #include "common.h"
 #include "pcbnew.h"
 #include "autorout.h"
+#include "zones.h"
 #include "cell.h"
 
 #include "protos.h"

pcbnew/autorout.cpp

@@ -8,6 +8,7 @@
 #include "pcbnew.h"
 #include "autorout.h"
 #include "cell.h"
+#include "zones.h"
 
 #include "protos.h"
 

pcbnew/autorout.h

@@ -96,13 +96,6 @@ enum CommandOpt {
     ROUTE_PAD
 };
 
-/* parametre Pas de routage pour routage automatique et generation des zones */
-
-#if defined MAIN
-int        g_GridRoutingSize = 250;
-#else
-extern int g_GridRoutingSize;
-#endif
 
 /* Variables et structures d'autoroutage */
 

pcbnew/board.cpp

@@ -10,6 +10,7 @@
 #include "common.h"
 #include "pcbnew.h"
 #include "autorout.h"
+#include "zones.h"
 #include "cell.h"
 
 #include "protos.h"

pcbnew/graphpcb.cpp

@@ -10,6 +10,7 @@
 #include "common.h"
 #include "pcbnew.h"
 #include "autorout.h"
+#include "zones.h"
 #include "trigo.h"
 #include "cell.h"
 

pcbnew/solve.cpp

@@ -10,6 +10,7 @@
 #include "common.h"
 #include "pcbnew.h"
 #include "autorout.h"
+#include "zones.h"
 
 #include "protos.h"
 

pcbnew/zones.h

@@ -28,6 +28,13 @@ enum zone_cmd {
 /* variables used in zone dialogs and functions */
 /************************************************/
 
+/* parametre grid size for automatic routing and zone filling  */
+#if defined MAIN
+int        g_GridRoutingSize = 250;
+#else
+extern int g_GridRoutingSize;
+#endif
+
 // @todo: make a class like ZONE_GENERAL_SETTING instead of many global variables
 eda_global bool g_Zone_45_Only
 #ifdef MAIN