clean up code

55 files changed, 146 insertions, 172 deletions

diff --git a/tksao/Makefile.in b/tksao/Makefile.in
index a6e6d0e..0a1b225 100644
--- a/tksao/Makefile.in
+++ b/tksao/Makefile.in
@@ -223,16 +223,16 @@ cbsaoparser:
 	flex -Pli -ocolorbar/saolex.C colorbar/saolex.L
 
 fitsyparser :
-	bison -d -p ff -o fitsy++/parser.C fitsy++/parser.Y
-	flex -Pff -ofitsy++/lex.C fitsy++/lex.L
+	bison -d -p ff -o ../fitsy/parser.C ../fitsy/parser.Y
+	flex -Pff -o../fitsy/lex.C ../fitsy/lex.L
 
 nrrdparser :
-	bison -d -p nrrd -o fitsy++/nrrdparser.C fitsy++/nrrdparser.Y
-	flex -Pnrrd -ofitsy++/nrrdlex.C fitsy++/nrrdlex.L
+	bison -d -p nrrd -o ../fitsy/nrrdparser.C ../fitsy/nrrdparser.Y
+	flex -Pnrrd -o../fitsy/nrrdlex.C ../fitsy/nrrdlex.L
 
 enviparser :
-	bison -d -p envi -o fitsy++/enviparser.C fitsy++/enviparser.Y
-	flex -Penvi -ofitsy++/envilex.C fitsy++/envilex.L
+	bison -d -p envi -o ../fitsy/enviparser.C ../fitsy/enviparser.Y
+	flex -Penvi -o../fitsy/envilex.C ../fitsy/envilex.L
 
 ciaoparser :
 	bison -d -p ciao -o frame/ciaoparser.C frame/ciaoparser.Y
diff --git a/tksao/frame/annulus.C b/tksao/frame/annulus.C
index 0d78a02..af4c8fa 100644
--- a/tksao/frame/annulus.C
+++ b/tksao/frame/annulus.C
@@ -2,8 +2,6 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "annulus.h"
 #include "fitsimage.h"
 
diff --git a/tksao/frame/base.C b/tksao/frame/base.C
index 73a130c..c6490b2 100644
--- a/tksao/frame/base.C
+++ b/tksao/frame/base.C
@@ -10,6 +10,7 @@
 #include "marker.h"
 #include "wcsast.h"
 #include "ps.h"
+#include "util.h"
 
 #include "circle.h"
 #include "ellipse.h"
diff --git a/tksao/frame/base.h b/tksao/frame/base.h
index 9e51b7a..af86f87 100644
--- a/tksao/frame/base.h
+++ b/tksao/frame/base.h
@@ -21,7 +21,6 @@
 #include "inversescale.h"
 #include "list.h"
 #include "tag.h"
-#include "util.h"
 #include "point.h"
 #include "fitsmask.h"
 
diff --git a/tksao/frame/basebox.C b/tksao/frame/basebox.C
index 79cb2ae..8678f70 100644
--- a/tksao/frame/basebox.C
+++ b/tksao/frame/basebox.C
@@ -2,10 +2,9 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "basebox.h"
 #include "fitsimage.h"
+#include "util.h"
 
 BaseBox::BaseBox(Base* p, const Vector& ctr, double ang)
   : BaseMarker(p, ctr, ang)
diff --git a/tksao/frame/basecommand.C b/tksao/frame/basecommand.C
index fb85638..2514d89 100644
--- a/tksao/frame/basecommand.C
+++ b/tksao/frame/basecommand.C
@@ -5,8 +5,6 @@
 #include <fstream>
 #include "fdstream.hpp"
 
-#include <tk.h>
-
 #include "base.h"
 #include "context.h"
 #include "fitsimage.h"
@@ -14,6 +12,7 @@
 #include "outfile.h"
 #include "outchannel.h"
 #include "outsocket.h"
+#include "util.h"
 
 #include "sigbus.h"
 
diff --git a/tksao/frame/baseellipse.C b/tksao/frame/baseellipse.C
index 2f84fb9..842d95a 100644
--- a/tksao/frame/baseellipse.C
+++ b/tksao/frame/baseellipse.C
@@ -4,6 +4,7 @@
 
 #include "baseellipse.h"
 #include "fitsimage.h"
+#include "util.h"
 
 #define XPOINT_BLOCK 1024
 
diff --git a/tksao/frame/baseellipse.h b/tksao/frame/baseellipse.h
index 29287d4..e1804ed 100644
--- a/tksao/frame/baseellipse.h
+++ b/tksao/frame/baseellipse.h
@@ -5,8 +5,6 @@
 #ifndef __baseellipse_h__
 #define __baseellipse_h__
 
-#include <tk.h>
-
 #include "basemarker.h"
 
 class BaseEllipse : public BaseMarker {
diff --git a/tksao/frame/baseline.C b/tksao/frame/baseline.C
index a1c5598..f7230c4 100644
--- a/tksao/frame/baseline.C
+++ b/tksao/frame/baseline.C
@@ -2,8 +2,6 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "baseline.h"
 #include "fitsimage.h"
 
diff --git a/tksao/frame/basemarker.C b/tksao/frame/basemarker.C
index 1693542..608c255 100644
--- a/tksao/frame/basemarker.C
+++ b/tksao/frame/basemarker.C
@@ -2,8 +2,6 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "basemarker.h"
 #include "base.h"
 
diff --git a/tksao/frame/basemarker.h b/tksao/frame/basemarker.h
index 7155b30..e1a98bf 100644
--- a/tksao/frame/basemarker.h
+++ b/tksao/frame/basemarker.h
@@ -6,6 +6,7 @@
 #define __basemarker_h__
 
 #include "marker.h"
+#include "util.h"
 
 #define MAXANNULI 512
 #define MAXANGLES 720
diff --git a/tksao/frame/basepolygon.C b/tksao/frame/basepolygon.C
index 6288836..e3fac46 100644
--- a/tksao/frame/basepolygon.C
+++ b/tksao/frame/basepolygon.C
@@ -2,8 +2,6 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "basepolygon.h"
 #include "fitsimage.h"
 
diff --git a/tksao/frame/box.C b/tksao/frame/box.C
index ce760cc..c97a96c 100644
--- a/tksao/frame/box.C
+++ b/tksao/frame/box.C
@@ -2,8 +2,6 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "box.h"
 #include "fitsimage.h"
 
diff --git a/tksao/frame/boxannulus.C b/tksao/frame/boxannulus.C
index 2f85be2..015843b 100644
--- a/tksao/frame/boxannulus.C
+++ b/tksao/frame/boxannulus.C
@@ -2,8 +2,6 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "boxannulus.h"
 #include "fitsimage.h"
 
diff --git a/tksao/frame/bpanda.C b/tksao/frame/bpanda.C
index e700eb0..b21b288 100644
--- a/tksao/frame/bpanda.C
+++ b/tksao/frame/bpanda.C
@@ -2,8 +2,6 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "bpanda.h"
 #include "fitsimage.h"
 
diff --git a/tksao/frame/circle.C b/tksao/frame/circle.C
index b11e2da..e46b812 100644
--- a/tksao/frame/circle.C
+++ b/tksao/frame/circle.C
@@ -2,8 +2,6 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "circle.h"
 #include "fitsimage.h"
 
diff --git a/tksao/frame/compass.C b/tksao/frame/compass.C
index ba6b71d..31be7bf 100644
--- a/tksao/frame/compass.C
+++ b/tksao/frame/compass.C
@@ -2,10 +2,9 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "compass.h"
 #include "fitsimage.h"
+#include "util.h"
 
 Compass::Compass(const Compass& a) : Marker(a)
 {
diff --git a/tksao/frame/composite.C b/tksao/frame/composite.C
index 2407115..55c9271 100644
--- a/tksao/frame/composite.C
+++ b/tksao/frame/composite.C
@@ -2,8 +2,6 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "composite.h"
 #include "fitsimage.h"
 
diff --git a/tksao/frame/context.C b/tksao/frame/context.C
index 1c77c4f..288e06c 100644
--- a/tksao/frame/context.C
+++ b/tksao/frame/context.C
@@ -5,6 +5,8 @@
 #include "context.h"
 #include "fitsimage.h"
 #include "fvcontour.h"
+#include "convolve.h"
+#include "util.h"
 
 #include "alloc.h"
 #include "allocgz.h"
@@ -17,8 +19,6 @@
 #include "socket.h"
 #include "socketgz.h"
 #include "var.h"
-#include "convolve.h"
-
 #include "head.h"
 
 extern "C" {
diff --git a/tksao/frame/contour.C b/tksao/frame/contour.C
index 0279cd3..445236c 100644
--- a/tksao/frame/contour.C
+++ b/tksao/frame/contour.C
@@ -5,6 +5,7 @@
 #include "contour.h"
 #include "base.h"
 #include "context.h"
+#include "util.h"
 
 // ContourLevel
 ContourLevel::ContourLevel(Base* pp, double lev,
diff --git a/tksao/frame/contourparser.C b/tksao/frame/contourparser.C
index c99dc35..40f5e73 100644
--- a/tksao/frame/contourparser.C
+++ b/tksao/frame/contourparser.C
@@ -229,6 +229,7 @@
 #include "context.h"
 #include "fitsimage.h"
 #include "contour.h"
+#include "util.h"
 
 #undef yyFlexLexer
 #define yyFlexLexer ctFlexLexer
@@ -280,7 +281,7 @@ static Coord::SkyFrame checkWCSSky();
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 55 "frame/contourparser.Y"
+#line 56 "frame/contourparser.Y"
 {
 #define CTBUFSIZE 2048
   double real;
@@ -289,7 +290,7 @@ typedef union YYSTYPE
   double vector[3];
 }
 /* Line 193 of yacc.c.  */
-#line 293 "frame/contourparser.C"
+#line 294 "frame/contourparser.C"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -302,7 +303,7 @@ typedef union YYSTYPE
 
 
 /* Line 216 of yacc.c.  */
-#line 306 "frame/contourparser.C"
+#line 307 "frame/contourparser.C"
 
 #ifdef short
 # undef short
@@ -630,18 +631,18 @@ static const yytype_int8 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   147,   147,   150,   151,   155,   161,   162,   164,   165,
-     169,   174,   179,   180,   180,   181,   181,   182,   187,   188,
-     195,   195,   198,   199,   203,   210,   211,   214,   228,   229,
-     229,   232,   233,   234,   244,   245,   248,   249,   252,   254,
-     255,   256,   257,   259,   260,   261,   262,   265,   266,   269,
-     272,   275,   278,   292,   301,   302,   303,   304,   305,   308,
-     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
-     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
-     329,   330,   331,   332,   333,   334,   337,   338,   339,   340,
-     341,   342,   343,   346,   347,   350,   351,   352,   353,   354,
-     357,   358,   361,   362,   363,   364,   367,   380,   388,   396,
-     403,   411,   418
+       0,   148,   148,   151,   152,   156,   162,   163,   165,   166,
+     170,   175,   180,   181,   181,   182,   182,   183,   188,   189,
+     196,   196,   199,   200,   204,   211,   212,   215,   229,   230,
+     230,   233,   234,   235,   245,   246,   249,   250,   253,   255,
+     256,   257,   258,   260,   261,   262,   263,   266,   267,   270,
+     273,   276,   279,   293,   302,   303,   304,   305,   306,   309,
+     310,   311,   312,   313,   314,   315,   316,   317,   318,   319,
+     320,   321,   322,   323,   324,   325,   326,   327,   328,   329,
+     330,   331,   332,   333,   334,   335,   338,   339,   340,   341,
+     342,   343,   344,   347,   348,   351,   352,   353,   354,   355,
+     358,   359,   362,   363,   364,   365,   368,   381,   389,   397,
+     404,   412,   419
 };
 #endif
 
@@ -1706,7 +1707,7 @@ yyreduce:
   switch (yyn)
     {
         case 5:
-#line 155 "frame/contourparser.Y"
+#line 156 "frame/contourparser.Y"
     {
 	  if (cc && cl) {
 	    cl->lcontour().append(cc);
@@ -1716,19 +1717,19 @@ yyreduce:
     break;
 
   case 7:
-#line 162 "frame/contourparser.Y"
+#line 163 "frame/contourparser.Y"
     {cerr << "DS9 Contour File 7.5" << endl;;}
     break;
 
   case 9:
-#line 166 "frame/contourparser.Y"
+#line 167 "frame/contourparser.Y"
     {
 	  globalSystem=(Coord::CoordSystem)(yyvsp[(1) - (2)].integer);
 	;}
     break;
 
   case 10:
-#line 170 "frame/contourparser.Y"
+#line 171 "frame/contourparser.Y"
     {
 	  globalSystem=globalWCS;
 	  globalSky=(Coord::SkyFrame)(yyvsp[(1) - (2)].integer);
@@ -1736,7 +1737,7 @@ yyreduce:
     break;
 
   case 11:
-#line 175 "frame/contourparser.Y"
+#line 176 "frame/contourparser.Y"
     {
 	  globalSystem=globalWCS;
 	  globalSky=Coord::FK5;
@@ -1744,17 +1745,17 @@ yyreduce:
     break;
 
   case 13:
-#line 180 "frame/contourparser.Y"
+#line 181 "frame/contourparser.Y"
     {localLevel = (yyvsp[(3) - (3)].real);}
     break;
 
   case 15:
-#line 181 "frame/contourparser.Y"
+#line 182 "frame/contourparser.Y"
     {localLevel = (yyvsp[(3) - (3)].real);}
     break;
 
   case 17:
-#line 183 "frame/contourparser.Y"
+#line 184 "frame/contourparser.Y"
     {
 	  if (cl)
 	    cc = new Contour(cl);
@@ -1762,7 +1763,7 @@ yyreduce:
     break;
 
   case 19:
-#line 189 "frame/contourparser.Y"
+#line 190 "frame/contourparser.Y"
     {
 	  if (cc && cl) {
 	    cl->lcontour().append(cc);
@@ -1772,12 +1773,12 @@ yyreduce:
     break;
 
   case 20:
-#line 195 "frame/contourparser.Y"
+#line 196 "frame/contourparser.Y"
     {DISCARD_(1);;}
     break;
 
   case 24:
-#line 203 "frame/contourparser.Y"
+#line 204 "frame/contourparser.Y"
     {
 	  if (cl)
 	    ct->contourAppendAux(cl);
@@ -1786,7 +1787,7 @@ yyreduce:
     break;
 
   case 27:
-#line 215 "frame/contourparser.Y"
+#line 216 "frame/contourparser.Y"
     {
 	  if (cc)
 	    cc->lvertex().append(new Vertex((yyvsp[(1) - (2)].vector)));
@@ -1801,12 +1802,12 @@ yyreduce:
     break;
 
   case 29:
-#line 229 "frame/contourparser.Y"
+#line 230 "frame/contourparser.Y"
     {DISCARD_(1);;}
     break;
 
   case 33:
-#line 235 "frame/contourparser.Y"
+#line 236 "frame/contourparser.Y"
     {
 	  if (cl) {
 	    ct->contourAppendAux(cl);
@@ -1817,87 +1818,87 @@ yyreduce:
     break;
 
   case 34:
-#line 244 "frame/contourparser.Y"
+#line 245 "frame/contourparser.Y"
     {(yyval.real)=(yyvsp[(1) - (1)].real);;}
     break;
 
   case 35:
-#line 245 "frame/contourparser.Y"
+#line 246 "frame/contourparser.Y"
     {(yyval.real)=(yyvsp[(1) - (1)].integer);;}
     break;
 
   case 36:
-#line 248 "frame/contourparser.Y"
+#line 249 "frame/contourparser.Y"
     {yydebug=1;;}
     break;
 
   case 37:
-#line 249 "frame/contourparser.Y"
+#line 250 "frame/contourparser.Y"
     {yydebug=0;;}
     break;
 
   case 38:
-#line 252 "frame/contourparser.Y"
+#line 253 "frame/contourparser.Y"
     {(yyval.integer)=((yyvsp[(1) - (1)].integer) ? 1 : 0);;}
     break;
 
   case 39:
-#line 254 "frame/contourparser.Y"
+#line 255 "frame/contourparser.Y"
     {(yyval.integer)=1;;}
     break;
 
   case 40:
-#line 255 "frame/contourparser.Y"
+#line 256 "frame/contourparser.Y"
     {(yyval.integer)=1;;}
     break;
 
   case 41:
-#line 256 "frame/contourparser.Y"
+#line 257 "frame/contourparser.Y"
     {(yyval.integer)=1;;}
     break;
 
   case 42:
-#line 257 "frame/contourparser.Y"
+#line 258 "frame/contourparser.Y"
     {(yyval.integer)=1;;}
     break;
 
   case 43:
-#line 259 "frame/contourparser.Y"
+#line 260 "frame/contourparser.Y"
     {(yyval.integer)=0;;}
     break;
 
   case 44:
-#line 260 "frame/contourparser.Y"
+#line 261 "frame/contourparser.Y"
     {(yyval.integer)=0;;}
     break;
 
   case 45:
-#line 261 "frame/contourparser.Y"
+#line 262 "frame/contourparser.Y"
     {(yyval.integer)=0;;}
     break;
 
   case 46:
-#line 262 "frame/contourparser.Y"
+#line 263 "frame/contourparser.Y"
     {(yyval.integer)=0;;}
     break;
 
   case 49:
-#line 269 "frame/contourparser.Y"
+#line 270 "frame/contourparser.Y"
     {(yyval.real) = parseSEXStr((yyvsp[(1) - (1)].str));;}
     break;
 
   case 50:
-#line 272 "frame/contourparser.Y"
+#line 273 "frame/contourparser.Y"
     {(yyval.real) = parseHMSStr((yyvsp[(1) - (1)].str));;}
     break;
 
   case 51:
-#line 275 "frame/contourparser.Y"
+#line 276 "frame/contourparser.Y"
     {(yyval.real) = parseDMSStr((yyvsp[(1) - (1)].str));;}
     break;
 
   case 52:
-#line 278 "frame/contourparser.Y"
+#line 279 "frame/contourparser.Y"
     {
           cl = NULL;
 	  cc = NULL;
@@ -1913,7 +1914,7 @@ yyreduce:
     break;
 
   case 53:
-#line 292 "frame/contourparser.Y"
+#line 293 "frame/contourparser.Y"
     {
 	  strcpy(localColor,globalColor);
 	  localDash = globalDash;
@@ -1924,247 +1925,247 @@ yyreduce:
     break;
 
   case 54:
-#line 301 "frame/contourparser.Y"
+#line 302 "frame/contourparser.Y"
     {(yyval.integer) = Coord::IMAGE;;}
     break;
 
   case 55:
-#line 302 "frame/contourparser.Y"
+#line 303 "frame/contourparser.Y"
     {(yyval.integer) = Coord::PHYSICAL;;}
     break;
 
   case 56:
-#line 303 "frame/contourparser.Y"
+#line 304 "frame/contourparser.Y"
     {(yyval.integer) = Coord::DETECTOR;;}
     break;
 
   case 57:
-#line 304 "frame/contourparser.Y"
+#line 305 "frame/contourparser.Y"
     {(yyval.integer) = Coord::AMPLIFIER;;}
     break;
 
   case 58:
-#line 305 "frame/contourparser.Y"
+#line 306 "frame/contourparser.Y"
     {(yyval.integer) = (yyvsp[(1) - (1)].integer); globalWCS = (Coord::CoordSystem)(yyvsp[(1) - (1)].integer);;}
     break;
 
   case 59:
-#line 308 "frame/contourparser.Y"
+#line 309 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCS;;}
     break;
 
   case 60:
-#line 309 "frame/contourparser.Y"
+#line 310 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSA;;}
     break;
 
   case 61:
-#line 310 "frame/contourparser.Y"
+#line 311 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSB;;}
     break;
 
   case 62:
-#line 311 "frame/contourparser.Y"
+#line 312 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSC;;}
     break;
 
   case 63:
-#line 312 "frame/contourparser.Y"
+#line 313 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSD;;}
     break;
 
   case 64:
-#line 313 "frame/contourparser.Y"
+#line 314 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSE;;}
     break;
 
   case 65:
-#line 314 "frame/contourparser.Y"
+#line 315 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSF;;}
     break;
 
   case 66:
-#line 315 "frame/contourparser.Y"
+#line 316 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSG;;}
     break;
 
   case 67:
-#line 316 "frame/contourparser.Y"
+#line 317 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSH;;}
     break;
 
   case 68:
-#line 317 "frame/contourparser.Y"
+#line 318 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSI;;}
     break;
 
   case 69:
-#line 318 "frame/contourparser.Y"
+#line 319 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSJ;;}
     break;
 
   case 70:
-#line 319 "frame/contourparser.Y"
+#line 320 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSK;;}
     break;
 
   case 71:
-#line 320 "frame/contourparser.Y"
+#line 321 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSL;;}
     break;
 
   case 72:
-#line 321 "frame/contourparser.Y"
+#line 322 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSM;;}
     break;
 
   case 73:
-#line 322 "frame/contourparser.Y"
+#line 323 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSN;;}
     break;
 
   case 74:
-#line 323 "frame/contourparser.Y"
+#line 324 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSO;;}
     break;
 
   case 75:
-#line 324 "frame/contourparser.Y"
+#line 325 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSP;;}
     break;
 
   case 76:
-#line 325 "frame/contourparser.Y"
+#line 326 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSQ;;}
     break;
 
   case 77:
-#line 326 "frame/contourparser.Y"
+#line 327 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSR;;}
     break;
 
   case 78:
-#line 327 "frame/contourparser.Y"
+#line 328 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSS;;}
     break;
 
   case 79:
-#line 328 "frame/contourparser.Y"
+#line 329 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCST;;}
     break;
 
   case 80:
-#line 329 "frame/contourparser.Y"
+#line 330 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSU;;}
     break;
 
   case 81:
-#line 330 "frame/contourparser.Y"
+#line 331 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSV;;}
     break;
 
   case 82:
-#line 331 "frame/contourparser.Y"
+#line 332 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSW;;}
     break;
 
   case 83:
-#line 332 "frame/contourparser.Y"
+#line 333 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSX;;}
     break;
 
   case 84:
-#line 333 "frame/contourparser.Y"
+#line 334 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSY;;}
     break;
 
   case 85:
-#line 334 "frame/contourparser.Y"
+#line 335 "frame/contourparser.Y"
     {(yyval.integer) = Coord::WCSZ;;}
     break;
 
   case 86:
-#line 337 "frame/contourparser.Y"
+#line 338 "frame/contourparser.Y"
     {(yyval.integer) = Coord::FK4;;}
     break;
 
   case 87:
-#line 338 "frame/contourparser.Y"
+#line 339 "frame/contourparser.Y"
     {(yyval.integer) = Coord::FK4;;}
     break;
 
   case 88:
-#line 339 "frame/contourparser.Y"
+#line 340 "frame/contourparser.Y"
     {(yyval.integer) = Coord::FK5;;}
     break;
 
   case 89:
-#line 340 "frame/contourparser.Y"
+#line 341 "frame/contourparser.Y"
     {(yyval.integer) = Coord::FK5;;}
     break;
 
   case 90:
-#line 341 "frame/contourparser.Y"
+#line 342 "frame/contourparser.Y"
     {(yyval.integer) = Coord::ICRS;;}
     break;
 
   case 91:
-#line 342 "frame/contourparser.Y"
+#line 343 "frame/contourparser.Y"
     {(yyval.integer) = Coord::GALACTIC;;}
     break;
 
   case 92:
-#line 343 "frame/contourparser.Y"
+#line 344 "frame/contourparser.Y"
     {(yyval.integer) = Coord::ECLIPTIC;;}
     break;
 
   case 95:
-#line 350 "frame/contourparser.Y"
+#line 351 "frame/contourparser.Y"
     {strncpy(globalColor,(yyvsp[(3) - (3)].str),16);;}
     break;
 
   case 96:
-#line 351 "frame/contourparser.Y"
+#line 352 "frame/contourparser.Y"
     {globalDash = (yyvsp[(3) - (3)].integer);;}
     break;
 
   case 97:
-#line 352 "frame/contourparser.Y"
+#line 353 "frame/contourparser.Y"
     {globalDashList[0] =(yyvsp[(3) - (4)].integer); globalDashList[1] =(yyvsp[(4) - (4)].integer);;}
     break;
 
   case 98:
-#line 353 "frame/contourparser.Y"
+#line 354 "frame/contourparser.Y"
     {globalWCS = (Coord::CoordSystem)(yyvsp[(3) - (3)].integer);;}
     break;
 
   case 99:
-#line 354 "frame/contourparser.Y"
+#line 355 "frame/contourparser.Y"
     {globalWidth = (yyvsp[(3) - (3)].integer);;}
     break;
 
   case 102:
-#line 361 "frame/contourparser.Y"
+#line 362 "frame/contourparser.Y"
     {strncpy(localColor,(yyvsp[(3) - (3)].str),16);;}
     break;
 
   case 103:
-#line 362 "frame/contourparser.Y"
+#line 363 "frame/contourparser.Y"
     {localDash = (yyvsp[(3) - (3)].integer);;}
     break;
 
   case 104:
-#line 363 "frame/contourparser.Y"
+#line 364 "frame/contourparser.Y"
     {localDashList[0] =(yyvsp[(3) - (4)].integer); localDashList[1] =(yyvsp[(4) - (4)].integer);;}
     break;
 
   case 105:
-#line 364 "frame/contourparser.Y"
+#line 365 "frame/contourparser.Y"
     {localWidth = (yyvsp[(3) - (3)].integer);;}
     break;
 
   case 106:
-#line 368 "frame/contourparser.Y"
+#line 369 "frame/contourparser.Y"
     {
 	  Vector r;
 	  Coord::CoordSystem sys = checkWCSSystem();
@@ -2180,7 +2181,7 @@ yyreduce:
     break;
 
   case 107:
-#line 381 "frame/contourparser.Y"
+#line 382 "frame/contourparser.Y"
     {
 	  Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)),
 	  checkWCSSystem(), checkWCSSky());
@@ -2191,7 +2192,7 @@ yyreduce:
     break;
 
   case 108:
-#line 389 "frame/contourparser.Y"
+#line 390 "frame/contourparser.Y"
     {
 	  Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)),
 	  checkWCSSystem(), checkWCSSky());
@@ -2202,7 +2203,7 @@ yyreduce:
     break;
 
   case 109:
-#line 397 "frame/contourparser.Y"
+#line 398 "frame/contourparser.Y"
     {
 	  Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), globalSystem, globalSky);
 	  (yyval.vector)[0] = r[0];
@@ -2212,7 +2213,7 @@ yyreduce:
     break;
 
   case 110:
-#line 404 "frame/contourparser.Y"
+#line 405 "frame/contourparser.Y"
     {
 	  Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), 
 	    checkWCSSystem(), checkWCSSky());
@@ -2223,7 +2224,7 @@ yyreduce:
     break;
 
   case 111:
-#line 412 "frame/contourparser.Y"
+#line 413 "frame/contourparser.Y"
     {
 	  Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::IMAGE);
 	  (yyval.vector)[0] = r[0];
@@ -2233,7 +2234,7 @@ yyreduce:
     break;
 
   case 112:
-#line 419 "frame/contourparser.Y"
+#line 420 "frame/contourparser.Y"
     {
 	  Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::PHYSICAL);
 	  (yyval.vector)[0] = r[0];
@@ -2243,7 +2244,7 @@ yyreduce:
 
 
 /* Line 1267 of yacc.c.  */
-#line 2247 "frame/contourparser.C"
+#line 2248 "frame/contourparser.C"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2457,7 +2458,7 @@ yyreturn:
 }
 
 
-#line 425 "frame/contourparser.Y"
+#line 426 "frame/contourparser.Y"
 
 
 static Coord::CoordSystem checkWCSSystem()
diff --git a/tksao/frame/contourparser.H b/tksao/frame/contourparser.H
index 8a19b95..a5df146 100644
--- a/tksao/frame/contourparser.H
+++ b/tksao/frame/contourparser.H
@@ -180,7 +180,7 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 55 "frame/contourparser.Y"
+#line 56 "frame/contourparser.Y"
 {
 #define CTBUFSIZE 2048
   double real;
diff --git a/tksao/frame/contourparser.Y b/tksao/frame/contourparser.Y
index 3983767..1cda1ca 100644
--- a/tksao/frame/contourparser.Y
+++ b/tksao/frame/contourparser.Y
@@ -21,6 +21,7 @@
 #include "context.h"
 #include "fitsimage.h"
 #include "contour.h"
+#include "util.h"
 
 #undef yyFlexLexer
 #define yyFlexLexer ctFlexLexer
diff --git a/tksao/frame/coord.C b/tksao/frame/coord.C
index 339e203..c01858b 100644
--- a/tksao/frame/coord.C
+++ b/tksao/frame/coord.C
@@ -4,6 +4,7 @@
 
 #include "coord.h"
 #include "fitsimage.h"
+#include "util.h"
 
 Coord coord;
 
diff --git a/tksao/frame/cpanda.C b/tksao/frame/cpanda.C
index fff5c93..69f330f 100644
--- a/tksao/frame/cpanda.C
+++ b/tksao/frame/cpanda.C
@@ -2,8 +2,6 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "cpanda.h"
 #include "fitsimage.h"
 
diff --git a/tksao/frame/ellipse.C b/tksao/frame/ellipse.C
index 242a29a..28012ed 100644
--- a/tksao/frame/ellipse.C
+++ b/tksao/frame/ellipse.C
@@ -2,8 +2,6 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "ellipse.h"
 #include "fitsimage.h"
 
diff --git a/tksao/frame/ellipseannulus.C b/tksao/frame/ellipseannulus.C
index dbd3504..6102cc0 100644
--- a/tksao/frame/ellipseannulus.C
+++ b/tksao/frame/ellipseannulus.C
@@ -2,8 +2,6 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "ellipseannulus.h"
 #include "fitsimage.h"
 
diff --git a/tksao/frame/epanda.C b/tksao/frame/epanda.C
index 0971951..55fa6d2 100644
--- a/tksao/frame/epanda.C
+++ b/tksao/frame/epanda.C
@@ -2,8 +2,6 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "epanda.h"
 #include "fitsimage.h"
 
diff --git a/tksao/frame/fitsanalysis.C b/tksao/frame/fitsanalysis.C
index 13a2aed..db489cc 100644
--- a/tksao/frame/fitsanalysis.C
+++ b/tksao/frame/fitsanalysis.C
@@ -8,6 +8,7 @@
 #include "fitsimage.h"
 #include "context.h"
 #include "convolve.h"
+#include "util.h"
 
 void FitsImage::analysis(int which, pthread_t* thread, void* targ)
 {
diff --git a/tksao/frame/fitsbin.C b/tksao/frame/fitsbin.C
index 176c919..ca14267 100644
--- a/tksao/frame/fitsbin.C
+++ b/tksao/frame/fitsbin.C
@@ -4,6 +4,7 @@
 
 #include "fitsimage.h"
 #include "context.h"
+#include "util.h"
 
 Matrix FitsImage::bin(const Vector& vv)
 {
diff --git a/tksao/frame/fitsblock.C b/tksao/frame/fitsblock.C
index 1261cc9..2c49281 100644
--- a/tksao/frame/fitsblock.C
+++ b/tksao/frame/fitsblock.C
@@ -6,6 +6,7 @@
 #include "block.h"
 #include "context.h"
 #include "wcsast.h"
+#include "util.h"
 
 void* blockproc(void* tt);
 
diff --git a/tksao/frame/fitsimage.C b/tksao/frame/fitsimage.C
index 925be24..96e2043 100644
--- a/tksao/frame/fitsimage.C
+++ b/tksao/frame/fitsimage.C
@@ -6,6 +6,7 @@
 
 #include "fitsimage.h"
 #include "framebase.h"
+#include "util.h"
 
 #include "context.h"
 #include "mmap.h"
diff --git a/tksao/frame/fitsmap.C b/tksao/frame/fitsmap.C
index b71bb06..4631bab 100644
--- a/tksao/frame/fitsmap.C
+++ b/tksao/frame/fitsmap.C
@@ -4,6 +4,7 @@
 
 #include "fitsimage.h"
 #include "context.h"
+#include "util.h"
 
 // Map Point
 
diff --git a/tksao/frame/fitsmask.C b/tksao/frame/fitsmask.C
index 95b7ce9..ea8da13 100644
--- a/tksao/frame/fitsmask.C
+++ b/tksao/frame/fitsmask.C
@@ -2,11 +2,10 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "fitsmask.h"
 #include "base.h"
 #include "context.h"
+#include "util.h"
 
 FitsMask::FitsMask(Base* pp, char* clr, MaskType mm, double ll, double hh)
   : mark_(mm), low_(ll), high_(hh)
diff --git a/tksao/frame/fr3dcommand.C b/tksao/frame/fr3dcommand.C
index 3304a45..23ff192 100644
--- a/tksao/frame/fr3dcommand.C
+++ b/tksao/frame/fr3dcommand.C
@@ -6,6 +6,7 @@
 #include "fitsimage.h"
 #include "context.h"
 #include "marker.h"
+#include "util.h"
 
 void Frame3dBase::binToFitCmd()
 {
diff --git a/tksao/frame/frame.C b/tksao/frame/frame.C
index b101eb0..3e5411a 100644
--- a/tksao/frame/frame.C
+++ b/tksao/frame/frame.C
@@ -6,8 +6,9 @@
 
 #include "frame.h"
 #include "fitsimage.h"
-#include "ps.h"
 #include "analysis.h"
+#include "ps.h"
+#include "util.h"
 
 #include "sigbus.h"
 
diff --git a/tksao/frame/frame3d.C b/tksao/frame/frame3d.C
index 1c37865..06c7457 100644
--- a/tksao/frame/frame3d.C
+++ b/tksao/frame/frame3d.C
@@ -5,6 +5,7 @@
 #include "frame3d.h"
 #include "fitsimage.h"
 #include "ps.h"
+#include "util.h"
 #include "sigbus.h"
 
 #include <pthread.h>
diff --git a/tksao/frame/frame3dbase.C b/tksao/frame/frame3dbase.C
index 10192aa..c1f612e 100644
--- a/tksao/frame/frame3dbase.C
+++ b/tksao/frame/frame3dbase.C
@@ -9,6 +9,7 @@
 #include "marker.h"
 #include "context.h"
 #include "ps.h"
+#include "util.h"
 #include "sigbus.h"
 
 Frame3dBase::Frame3dBase(Tcl_Interp* i, Tk_Canvas c, Tk_Item* item) 
diff --git a/tksao/frame/framergb.C b/tksao/frame/framergb.C
index d170282..0e9501b 100644
--- a/tksao/frame/framergb.C
+++ b/tksao/frame/framergb.C
@@ -6,10 +6,11 @@
 
 #include "framergb.h"
 #include "fitsimage.h"
-#include "ps.h"
 #include "outfile.h"
 #include "outchannel.h"
 #include "outsocket.h"
+#include "ps.h"
+#include "util.h"
 
 #include "sigbus.h"
 
diff --git a/tksao/frame/frcommand.C b/tksao/frame/frcommand.C
index 665243e..bd6cbc1 100644
--- a/tksao/frame/frcommand.C
+++ b/tksao/frame/frcommand.C
@@ -5,8 +5,6 @@
 #include <fstream>
 #include "fdstream.hpp"
 
-#include <tk.h>
-
 #include "framebase.h"
 #include "fitsimage.h"
 #include "context.h"
diff --git a/tksao/frame/frmap.C b/tksao/frame/frmap.C
index 72ed4f4..f856603 100644
--- a/tksao/frame/frmap.C
+++ b/tksao/frame/frmap.C
@@ -5,6 +5,7 @@
 #include "context.h"
 #include "framebase.h"
 #include "fitsimage.h"
+#include "util.h"
 
 double Base::mapAngleFromRef(double angle, Coord::CoordSystem sys, 
 			     Coord::SkyFrame sky)
diff --git a/tksao/frame/frmarker.C b/tksao/frame/frmarker.C
index c2028c2..bac3ff5 100644
--- a/tksao/frame/frmarker.C
+++ b/tksao/frame/frmarker.C
@@ -11,6 +11,7 @@
 #include "fvcontour.h"
 #include "marker.h"
 #include "basemarker.h"
+#include "util.h"
 #include "sigbus.h"
 
 #include "circle.h"
diff --git a/tksao/frame/frmarkerxml.C b/tksao/frame/frmarkerxml.C
index c1074e3..b4f17ab 100644
--- a/tksao/frame/frmarkerxml.C
+++ b/tksao/frame/frmarkerxml.C
@@ -9,6 +9,7 @@
 #include "context.h"
 #include "framebase.h"
 #include "fitsimage.h"
+#include "util.h"
 
 static int xmlRead (void * context, char * buffer, int len)
 {
diff --git a/tksao/frame/frsave.C b/tksao/frame/frsave.C
index 467239b..1ca46e3 100644
--- a/tksao/frame/frsave.C
+++ b/tksao/frame/frsave.C
@@ -9,6 +9,7 @@
 #include "outfile.h"
 #include "outchannel.h"
 #include "outsocket.h"
+#include "util.h"
 #include "sigbus.h"
 #include "wcsast.h"
 
diff --git a/tksao/frame/fvcontour.C b/tksao/frame/fvcontour.C
index c042ee2..4402cf1 100644
--- a/tksao/frame/fvcontour.C
+++ b/tksao/frame/fvcontour.C
@@ -7,6 +7,7 @@
 #include "base.h"
 #include "fitsimage.h"
 #include "convolve.h"
+#include "util.h"
 
 #include "sigbus.h"
 
diff --git a/tksao/frame/grid.C b/tksao/frame/grid.C
index b07b973..e18c0c8 100644
--- a/tksao/frame/grid.C
+++ b/tksao/frame/grid.C
@@ -5,6 +5,7 @@
 #include "grid.h"
 #include "context.h"
 #include "fitsimage.h"
+#include "util.h"
 
 extern "C" {
   #include "ast.h"
diff --git a/tksao/frame/line.C b/tksao/frame/line.C
index 1d069e2..2fb5dce 100644
--- a/tksao/frame/line.C
+++ b/tksao/frame/line.C
@@ -2,8 +2,6 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "line.h"
 #include "fitsimage.h"
 
diff --git a/tksao/frame/marker.C b/tksao/frame/marker.C
index 375846f..d4bf50b 100644
--- a/tksao/frame/marker.C
+++ b/tksao/frame/marker.C
@@ -2,12 +2,11 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "marker.h"
 #include "framebase.h"
 #include "frame3dbase.h"
 #include "fitsimage.h"
+#include "util.h"
 
 extern "C" {
 #include "tkbltVector.h"
diff --git a/tksao/frame/point.C b/tksao/frame/point.C
index e8784e2..6ba5a42 100644
--- a/tksao/frame/point.C
+++ b/tksao/frame/point.C
@@ -2,10 +2,9 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "point.h"
 #include "fitsimage.h"
+#include "util.h"
 
 #define NUMSEG 16
 
diff --git a/tksao/frame/polygon.C b/tksao/frame/polygon.C
index 46ff671..0197765 100644
--- a/tksao/frame/polygon.C
+++ b/tksao/frame/polygon.C
@@ -2,8 +2,6 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "polygon.h"
 #include "fitsimage.h"
 
diff --git a/tksao/frame/projection.C b/tksao/frame/projection.C
index 5bfbaf3..c46985d 100644
--- a/tksao/frame/projection.C
+++ b/tksao/frame/projection.C
@@ -2,8 +2,6 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "projection.h"
 #include "fitsimage.h"
 
diff --git a/tksao/frame/ruler.C b/tksao/frame/ruler.C
index 0813274..227fa52 100644
--- a/tksao/frame/ruler.C
+++ b/tksao/frame/ruler.C
@@ -2,10 +2,9 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "ruler.h"
 #include "fitsimage.h"
+#include "util.h"
 
 Ruler::Ruler(const Ruler& a) : BaseLine(a)
 {
diff --git a/tksao/frame/segment.C b/tksao/frame/segment.C
index f67d37c..ec6b2cb 100644
--- a/tksao/frame/segment.C
+++ b/tksao/frame/segment.C
@@ -2,8 +2,6 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "segment.h"
 #include "fitsimage.h"
 
diff --git a/tksao/frame/text.C b/tksao/frame/text.C
index a4de348..ae2a902 100644
--- a/tksao/frame/text.C
+++ b/tksao/frame/text.C
@@ -2,10 +2,9 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "text.h"
 #include "fitsimage.h"
+#include "util.h"
 
 EXTERN void TkDrawAngledChars(Display *display,
 			      Drawable drawable, GC gc, Tk_Font tkfont,
diff --git a/tksao/frame/vect.C b/tksao/frame/vect.C
index 8957560..dd00986 100644
--- a/tksao/frame/vect.C
+++ b/tksao/frame/vect.C
@@ -2,8 +2,6 @@
 // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
 // For conditions of distribution and use, see copyright notice in "copyright"
 
-#include <tk.h>
-
 #include "vect.h"
 #include "fitsimage.h"