47 files changed, 578 insertions, 215 deletions

diff --git a/src/clef/edible.c b/src/clef/edible.c
index 100f5a43..918d354b 100644
--- a/src/clef/edible.c
+++ b/src/clef/edible.c
@@ -51,11 +51,11 @@
 #include "com.h"
 #include "bsdsignal.h"
 
-#include "openpty.H1"
-#include "prt.H1"
-#include "edin.H1"
-#include "wct.H1"
-#include "fnct_key.H1"
+#include "openpty.h"
+#include "prt.h"
+#include "edin.h"
+#include "wct.h"
+#include "fnct_key.h"
 #include "cfuns.h"
 
 #ifdef AXIOM_UNLIKELY
diff --git a/src/graph/view2D/control2d.c b/src/graph/view2D/control2d.c
index eb9249b9..b3031697 100644
--- a/src/graph/view2D/control2d.c
+++ b/src/graph/view2D/control2d.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
 #include "buttons2d.H1"
 #include "all_2d.H1"
 #include "Gfun.H1"
-#include "XSpadFill.H1"
+#include "XSpadFill.h"
 #include "util.H1"
 #include "cfuns.h"
 
diff --git a/src/graph/view2D/main2d.c b/src/graph/view2D/main2d.c
index c5fe7070..5df59398 100644
--- a/src/graph/view2D/main2d.c
+++ b/src/graph/view2D/main2d.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
 #include "all_2d.H1"
 #include "Gfun.H1"
 #include "util.H1"
-#include "XSpadFill.H1"
+#include "XSpadFill.h"
 #include "cfuns.h"
 
 
diff --git a/src/graph/view2D/process2d.c b/src/graph/view2D/process2d.c
index ee21886f..eb711bc9 100644
--- a/src/graph/view2D/process2d.c
+++ b/src/graph/view2D/process2d.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,7 @@
 #include "all_2d.H1"
 #include "util.H1"
 #include "Gfun.H1"
-#include "XSpadFill.H1"
+#include "XSpadFill.h"
 #include "cfuns.h"
 
 
diff --git a/src/graph/view2D/viewport2D.c b/src/graph/view2D/viewport2D.c
index 2f499307..ec1f7083 100644
--- a/src/graph/view2D/viewport2D.c
+++ b/src/graph/view2D/viewport2D.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -55,7 +55,7 @@
 #include "all_2d.H1"
 #include "Gfun.H1"
 #include "util.H1"
-#include "XSpadFill.H1"
+#include "XSpadFill.h"
 
 #include "spadBitmap.bitmap"
 #include "spadMask.mask"
diff --git a/src/graph/view3D/component3d.c b/src/graph/view3D/component3d.c
index 24985144..626790be 100644
--- a/src/graph/view3D/component3d.c
+++ b/src/graph/view3D/component3d.c
@@ -1,7 +1,7 @@
 /*
   Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
 
 #include "Gfun.H1"
 #include "util.H1"
-#include "XSpadFill.H1"
+#include "XSpadFill.h"
 
 #include "all_3d.H1"
 
diff --git a/src/graph/view3D/control3d.c b/src/graph/view3D/control3d.c
index 6178cd27..a7e45760 100644
--- a/src/graph/view3D/control3d.c
+++ b/src/graph/view3D/control3d.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -48,8 +48,8 @@
 #include "cpanel.h"
 
 #include "util.H1"
-#include "XShade.H1"
-#include "XSpadFill.H1"
+#include "XShade.h"
+#include "XSpadFill.h"
 #include "Gfun.H1"
 #include "all_3d.H1"
 
diff --git a/src/graph/view3D/lighting3d.c b/src/graph/view3D/lighting3d.c
index a6317f53..dc7f34ab 100644
--- a/src/graph/view3D/lighting3d.c
+++ b/src/graph/view3D/lighting3d.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,7 @@
 #include "volume.h"
 
 #include "Gfun.H1"
-#include "XSpadFill.H1"
+#include "XSpadFill.h"
 #include "all_3d.H1"
 
 #define lightMASK ExposureMask
diff --git a/src/graph/view3D/main3d.c b/src/graph/view3D/main3d.c
index f55cc257..60593094 100644
--- a/src/graph/view3D/main3d.c
+++ b/src/graph/view3D/main3d.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -49,8 +49,8 @@
 
 #include "util.H1"
 #include "Gfun.H1"
-#include "XSpadFill.H1"
-#include "XShade.H1"
+#include "XSpadFill.h"
+#include "XShade.h"
 #include "all_3d.H1"
 #include "cfuns.h"
 
diff --git a/src/graph/view3D/process3d.c b/src/graph/view3D/process3d.c
index f8f52bdd..5e56825d 100644
--- a/src/graph/view3D/process3d.c
+++ b/src/graph/view3D/process3d.c
@@ -57,8 +57,8 @@
 #include "util.H1"
 #include "Gfun.H1"
 #include "pixmap.h"
-#include "XShade.H1"
-#include "XSpadFill.H1"
+#include "XShade.h"
+#include "XSpadFill.h"
 #include "all_3d.H1"
 #include "cfuns.h"
 
diff --git a/src/graph/view3D/quit3d.c b/src/graph/view3D/quit3d.c
index bde9e329..0978e329 100644
--- a/src/graph/view3D/quit3d.c
+++ b/src/graph/view3D/quit3d.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,7 @@
 
 #include "util.H1"
 #include "Gfun.H1"
-#include "XSpadFill.H1"
+#include "XSpadFill.h"
 #include "all_3d.H1"
 
 #define quitMASK ExposureMask
diff --git a/src/graph/view3D/save3d.c b/src/graph/view3D/save3d.c
index 5263f2e3..94cccd32 100644
--- a/src/graph/view3D/save3d.c
+++ b/src/graph/view3D/save3d.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,7 @@
 #include "../include/purty/volume.mask"
 
 #include "Gfun.H1"
-#include "XSpadFill.H1"
+#include "XSpadFill.h"
 #include "all_3d.H1"
 
 #define saveMASK ExposureMask
diff --git a/src/graph/view3D/smoothShade3d.c b/src/graph/view3D/smoothShade3d.c
index b8896c57..5d09a4ed 100644
--- a/src/graph/view3D/smoothShade3d.c
+++ b/src/graph/view3D/smoothShade3d.c
@@ -48,7 +48,7 @@
 #include "spadcolors.h"
 #include "Gfun.H1"
 #include "util.H1"
-#include "XSpadFill.H1"
+#include "XSpadFill.h"
 #include "all_3d.H1"
 
 #define SAFE_VALUE 892347
diff --git a/src/graph/view3D/surface3d.c b/src/graph/view3D/surface3d.c
index be54efa7..b7a19cc5 100644
--- a/src/graph/view3D/surface3d.c
+++ b/src/graph/view3D/surface3d.c
@@ -1,7 +1,7 @@
 /*
   Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -46,8 +46,8 @@
 #include "sockio.h"
 #include "com.h"
 
-#include "XSpadFill.H1"
-#include "XShade.H1"
+#include "XSpadFill.h"
+#include "XShade.h"
 #include "util.H1"
 #include "Gfun.H1"
 #include "all_3d.H1"
diff --git a/src/graph/view3D/testcol.c b/src/graph/view3D/testcol.c
index b73337e0..4db2a7f9 100644
--- a/src/graph/view3D/testcol.c
+++ b/src/graph/view3D/testcol.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -49,8 +49,8 @@
 
 #include "util.H1"
 #include "Gfun.H1"
-#include "XSpadFill.H1"
-#include "XShade.H1"
+#include "XSpadFill.h"
+#include "XShade.h"
 #include "all_3d.H1"
 
 #include "spadBitmap.bitmap"
diff --git a/src/graph/view3D/viewport3d.c b/src/graph/view3D/viewport3d.c
index 67b19e34..d560f9e5 100644
--- a/src/graph/view3D/viewport3d.c
+++ b/src/graph/view3D/viewport3d.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -60,7 +60,7 @@
 
 #include "util.H1"
 #include "Gfun.H1"
-#include "XSpadFill.H1"
+#include "XSpadFill.h"
 #include "all_3d.H1"
 
 #define axesOffset  5
diff --git a/src/graph/view3D/volume3d.c b/src/graph/view3D/volume3d.c
index a94e518e..3fdfa3be 100644
--- a/src/graph/view3D/volume3d.c
+++ b/src/graph/view3D/volume3d.c
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
 
 
 
-#include "XSpadFill.H1"
+#include "XSpadFill.h"
 #include "Gfun.H1"
 #include "all_3d.H1"
 
diff --git a/src/graph/view3D/write3d.c b/src/graph/view3D/write3d.c
index 2007293c..d84f0c13 100644
--- a/src/graph/view3D/write3d.c
+++ b/src/graph/view3D/write3d.c
@@ -45,7 +45,7 @@
 
 
 #include "pixmap.h"
-#include "XShade.H1"
+#include "XShade.h"
 #include "Gfun.H1"
 
 #include "all_3d.H1"
diff --git a/src/hyper/spadbuf.c b/src/hyper/spadbuf.c
index f4da10fb..02f0ebad 100644
--- a/src/hyper/spadbuf.c
+++ b/src/hyper/spadbuf.c
@@ -1,7 +1,7 @@
 /*
    Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
    All rights reserved.
-   Copyright (C) 2007-2009, Gabriel Dos Reis.
+   Copyright (C) 2007-2010, Gabriel Dos Reis.
    All rights reserved.
 
    Redistribution and use in source and binary forms, with or without
@@ -54,11 +54,11 @@
 #include "com.h"
 
 #include "sockio.h"
-#include "edin.H1"
-#include "wct.H1"
-#include "prt.H1"
-#include "cursor.H1"
-#include "fnct_key.H1"
+#include "edin.h"
+#include "wct.h"
+#include "prt.h"
+#include "cursor.h"
+#include "fnct_key.h"
 
 static void spadbuf_inter_handler(int);
 static void spadbuf_function_chars(void);
diff --git a/src/include/XDither.H1 b/src/include/XDither.H1
deleted file mode 100644
index e14e1d63..00000000
--- a/src/include/XDither.H1
+++ /dev/null
@@ -1,8 +0,0 @@
-extern int dither_char_bitmap(void);
-extern int XInitDither(Display *  , int  , GC  , unsigned long  , unsigned long );
-extern int XChangeDither(Display *  , GC  , int );
-extern void XDitherRectangle(Display *  , Drawable  , GC  , int  , int  , unsigned int  , unsigned int );
-extern void XDitherRectangles(Display *  , Drawable  , GC  , XRectangle *  , int );
-extern void XDitherPolygon(Display *  , Drawable  , GC  , XPoint *  , int  , int  , int );
-extern void XDitherArc(Display *  , Drawable  , GC  , int  , int  , unsigned int  , unsigned int  , int  , int );
-extern void XDitherArcs(Display *  , Drawable  , GC  , XArc *  , int );
diff --git a/src/include/XDither.h b/src/include/XDither.h
new file mode 100644
index 00000000..5afee531
--- /dev/null
+++ b/src/include/XDither.h
@@ -0,0 +1,48 @@
+/*
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
+  All rights reserved.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+      - Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+      - Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in
+        the documentation and/or other materials provided with the
+        distribution.
+
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+  PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+  OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef OPENAXIOM_XDither_INCLUDED
+#define OPENAXIOM_XDither_INCLUDED
+
+extern int dither_char_bitmap(void);
+extern int XInitDither(Display *  , int  , GC  , unsigned long  , unsigned long );
+extern int XChangeDither(Display *  , GC  , int );
+extern void XDitherRectangle(Display *  , Drawable  , GC  , int  , int  , unsigned int  , unsigned int );
+extern void XDitherRectangles(Display *  , Drawable  , GC  , XRectangle *  , int );
+extern void XDitherPolygon(Display *  , Drawable  , GC  , XPoint *  , int  , int  , int );
+extern void XDitherArc(Display *  , Drawable  , GC  , int  , int  , unsigned int  , unsigned int  , int  , int );
+extern void XDitherArcs(Display *  , Drawable  , GC  , XArc *  , int );
+
+#endif  /* OPENAXIOM_XDither_INCLUDED */
diff --git a/src/include/XShade.H1 b/src/include/XShade.H1
deleted file mode 100644
index 7a91a767..00000000
--- a/src/include/XShade.H1
+++ /dev/null
@@ -1,9 +0,0 @@
-extern int char_bitmap(void);
-extern int XInitShades(Display *  , int );
-extern int XChangeShade(Display *  , int );
-extern int XQueryShades(unsigned int * );
-extern void XShadeRectangle(Display *  , Drawable  , int  , int  , unsigned int  , unsigned int );
-extern void XShadeRectangles(Display *  , Drawable  , XRectangle *  , int );
-extern void XShadePolygon(Display *  , Drawable  , XPoint *  , int  , int  , int );
-extern void XShadeArc(Display *  , Drawable  , int  , int  , unsigned int  , unsigned int  , int  , int );
-extern void XShadeArcs(Display *  , Drawable  , XArc *  , int );
diff --git a/src/include/XShade.h b/src/include/XShade.h
new file mode 100644
index 00000000..e64e1053
--- /dev/null
+++ b/src/include/XShade.h
@@ -0,0 +1,49 @@
+/*
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
+  All rights reserved.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+      - Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+      - Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in
+        the documentation and/or other materials provided with the
+        distribution.
+
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+  PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+  OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef OPENAXIOM_XShade_INCLUDED
+#define OPENAXIOM_XShade_INCLUDED
+
+extern int char_bitmap(void);
+extern int XInitShades(Display *  , int );
+extern int XChangeShade(Display *  , int );
+extern int XQueryShades(unsigned int * );
+extern void XShadeRectangle(Display *  , Drawable  , int  , int  , unsigned int  , unsigned int );
+extern void XShadeRectangles(Display *  , Drawable  , XRectangle *  , int );
+extern void XShadePolygon(Display *  , Drawable  , XPoint *  , int  , int  , int );
+extern void XShadeArc(Display *  , Drawable  , int  , int  , unsigned int  , unsigned int  , int  , int );
+extern void XShadeArcs(Display *  , Drawable  , XArc *  , int );
+
+#endif  /* OPENAXIOM_XShade_INCLUDED */
diff --git a/src/include/XSpadFill.H1 b/src/include/XSpadFill.H1
deleted file mode 100644
index 881a18d5..00000000
--- a/src/include/XSpadFill.H1
+++ /dev/null
@@ -1,9 +0,0 @@
-extern int XInitSpadFill(Display *  , int  , Colormap *  , int *  , int *  , int *  , int * );
-extern void XSpadFillSetArcMode(Display *  , int );
-extern GC SpadFillGC(Display *  , int  , int  , char * );
-extern unsigned long XSolidColor(int  , int );
-extern void XSpadFillRectangle(Display *  , Drawable  , int  , int  , unsigned int  , unsigned int  , int  , int );
-extern void XSpadFillRectangles(Display *  , Drawable  , XRectangle *  , int  , int  , int );
-extern void XSpadFillPolygon(Display *  , Drawable  , XPoint *  , int  , int  , int  , int  , int );
-extern void XSpadFillArc(Display *  , Drawable  , int  , int  , unsigned int  , unsigned int  , int  , int  , int  , int );
-extern void XSpadFillArcs(Display *  , Drawable  , XArc *  , int  , int  , int );
diff --git a/src/include/XSpadFill.h b/src/include/XSpadFill.h
new file mode 100644
index 00000000..33bf2d4e
--- /dev/null
+++ b/src/include/XSpadFill.h
@@ -0,0 +1,49 @@
+/*
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
+  All rights reserved.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+      - Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+      - Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in
+        the documentation and/or other materials provided with the
+        distribution.
+
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+  PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+  OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef OPENAXIOM_XSpadFill_INCLUDED
+#define OPENAXIOM_XSpadFill_INCLUDED
+
+extern int XInitSpadFill(Display *  , int  , Colormap *  , int *  , int *  , int *  , int * );
+extern void XSpadFillSetArcMode(Display *  , int );
+extern GC SpadFillGC(Display *  , int  , int  , char * );
+extern unsigned long XSolidColor(int  , int );
+extern void XSpadFillRectangle(Display *  , Drawable  , int  , int  , unsigned int  , unsigned int  , int  , int );
+extern void XSpadFillRectangles(Display *  , Drawable  , XRectangle *  , int  , int  , int );
+extern void XSpadFillPolygon(Display *  , Drawable  , XPoint *  , int  , int  , int  , int  , int );
+extern void XSpadFillArc(Display *  , Drawable  , int  , int  , unsigned int  , unsigned int  , int  , int  , int  , int );
+extern void XSpadFillArcs(Display *  , Drawable  , XArc *  , int  , int  , int );
+
+#endif /* OPENAXIOM_XSpadFill_INCLUDED */
diff --git a/src/include/cursor.H1 b/src/include/cursor.H1
deleted file mode 100644
index 6538a398..00000000
--- a/src/include/cursor.H1
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int Cursor_shape(int );
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/include/cursor.h b/src/include/cursor.h
new file mode 100644
index 00000000..7073786b
--- /dev/null
+++ b/src/include/cursor.h
@@ -0,0 +1,49 @@
+/*
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
+  All rights reserved.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+      - Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+      - Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in
+        the documentation and/or other materials provided with the
+        distribution.
+
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+  PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+  OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef OPENAXIOM_cursor_INCLUDED
+#define OPENAXIOM_cursor_INCLUDED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int Cursor_shape(int );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* OPENAXIOM_cursor_INCLUDED */
diff --git a/src/include/edin.H1 b/src/include/edin.H1
deleted file mode 100644
index 546b2951..00000000
--- a/src/include/edin.H1
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern void init_reader(void);
-extern void init_flag(int *  , int );
-extern void do_reading(void);
-extern void send_line_to_child(void);
-extern void insert_buff_nonprinting(int );
-extern void prev_buff(void);
-extern void next_buff(void);
-extern void insert_buff_printing(int );
-extern void insert_queue(void);
-extern int convert_buffer(char *  , char *  , int *  , int );
-extern void init_buff(char *  , int );
-extern void forwardcopy(char *  , char *  , int );
-extern void forwardflag_cpy(int *  ,int *  , int );
-extern void flagcpy(int *  , int * );
-extern void flagncpy(int *  , int *  , int );
-extern void send_function_to_child(void);
-extern void send_buff_to_child(int );
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/include/edin.h b/src/include/edin.h
new file mode 100644
index 00000000..73c02b2b
--- /dev/null
+++ b/src/include/edin.h
@@ -0,0 +1,65 @@
+/*
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
+  All rights reserved.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+      - Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+      - Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in
+        the documentation and/or other materials provided with the
+        distribution.
+
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+  PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+  OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef OPENAXIOM_edin_INCLUDED
+#define OPENAXIOM_edin_INCLUDED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void init_reader(void);
+extern void init_flag(int *  , int );
+extern void do_reading(void);
+extern void send_line_to_child(void);
+extern void insert_buff_nonprinting(int );
+extern void prev_buff(void);
+extern void next_buff(void);
+extern void insert_buff_printing(int );
+extern void insert_queue(void);
+extern int convert_buffer(char *  , char *  , int *  , int );
+extern void init_buff(char *  , int );
+extern void forwardcopy(char *  , char *  , int );
+extern void forwardflag_cpy(int *  ,int *  , int );
+extern void flagcpy(int *  , int * );
+extern void flagncpy(int *  , int *  , int );
+extern void send_function_to_child(void);
+extern void send_buff_to_child(int );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* OPENAXIOM_edin_INCLUDED */
diff --git a/src/include/fnct_key.H1 b/src/include/fnct_key.H1
deleted file mode 100644
index 60bdcac8..00000000
--- a/src/include/fnct_key.H1
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern void set_editor_key(void);
-extern void define_function_keys(void);
-extern int get_key(int  , char * );
-extern int get_str(int  , char * );
-extern void null_fnct(int );
-extern void handle_function_key(int  , int );
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/include/fnct_key.h b/src/include/fnct_key.h
new file mode 100644
index 00000000..e0223961
--- /dev/null
+++ b/src/include/fnct_key.h
@@ -0,0 +1,55 @@
+/*
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
+  All rights reserved.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+      - Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+      - Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in
+        the documentation and/or other materials provided with the
+        distribution.
+
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+  PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+  OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef OPENAXIOM_fnct_key_INCLUDED
+#define OPENAXIOM_fnct_key_INCLUDED
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void set_editor_key(void);
+extern void define_function_keys(void);
+extern int get_key(int  , char * );
+extern int get_str(int  , char * );
+extern void null_fnct(int );
+extern void handle_function_key(int  , int );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* OPENAXIOM_fnct_key_INCLUDED */
diff --git a/src/include/openpty.H1 b/src/include/openpty.H1
deleted file mode 100644
index e0658fc5..00000000
--- a/src/include/openpty.H1
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int ptyopen(int*, int*, char*);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/include/openpty.h b/src/include/openpty.h
new file mode 100644
index 00000000..24df8a0d
--- /dev/null
+++ b/src/include/openpty.h
@@ -0,0 +1,49 @@
+/*
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
+  All rights reserved.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+      - Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+      - Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in
+        the documentation and/or other materials provided with the
+        distribution.
+
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+  PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+  OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef OPENAXIOM_openpty_INCLUDED
+#define OPENAXIOM_openpty_INCLUDED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int ptyopen(int*, int*, char*);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* OPENAXIOM_openpty_INCLUDED */
diff --git a/src/include/prt.H1 b/src/include/prt.H1
deleted file mode 100644
index 061c11ba..00000000
--- a/src/include/prt.H1
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern void myputchar(char );
-extern void clear_buff(void);
-extern void move_end(void);
-extern void move_home(void);
-extern void move_fore_word(void);
-extern void move_back_word(void);
-extern void delete_current_char(void);
-extern void del_print(int  , int );
-extern void delete_to_end_of_line(void);
-extern void delete_line(void);
-extern void printbuff(int  , int );
-extern void ins_print(int  , int );
-extern void reprint(int );
-extern void back_up(int );
-extern void back_it_up(int );
-extern void print_whole_buff(void);
-extern void move_ahead(void);
-extern void move_back(void);
-extern void back_over_current_char(void);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/include/prt.h b/src/include/prt.h
new file mode 100644
index 00000000..5df67134
--- /dev/null
+++ b/src/include/prt.h
@@ -0,0 +1,67 @@
+/*
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
+  All rights reserved.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+      - Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+      - Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in
+        the documentation and/or other materials provided with the
+        distribution.
+
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+  PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+  OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef OPENAXIOM_ptr_INCLUDED
+#define OPENAXIOM_ptr_INCLUDED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void myputchar(char );
+extern void clear_buff(void);
+extern void move_end(void);
+extern void move_home(void);
+extern void move_fore_word(void);
+extern void move_back_word(void);
+extern void delete_current_char(void);
+extern void del_print(int  , int );
+extern void delete_to_end_of_line(void);
+extern void delete_line(void);
+extern void printbuff(int  , int );
+extern void ins_print(int  , int );
+extern void reprint(int );
+extern void back_up(int );
+extern void back_it_up(int );
+extern void print_whole_buff(void);
+extern void move_ahead(void);
+extern void move_back(void);
+extern void back_over_current_char(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* OPENAXIOM_ptr_INCLUDED */
diff --git a/src/include/wct.H1 b/src/include/wct.H1
deleted file mode 100644
index 1f403594..00000000
--- a/src/include/wct.H1
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern time_t ftime(char * );
-extern void fatal(char *  , char * );
-extern off_t fsize(char * );
-extern Wix * scanWct(Wct *  , char * );
-extern void reintern1Wct(Wct * );
-extern Wix * rescanWct(void);
-extern void skimWct(Wct * );
-extern void skim1Wct(Wct * );
-extern void printTime(long * );
-extern int skimString(char *  , int  , int  , int );
-extern int prChar(int );
-extern Wct * reread1Wct(Wct * );
-extern void sfatal(char * );
-extern Wct * read1Wct(char * );
-extern Wct * nconcWct(Wct *  , Wct * );
-extern void sortWct(Wct * );
-extern void sort1Wct(Wct * );
-extern int mystrcmp(const void  *  , const void * );
-extern void burstWct(Wct * );
-extern void burst1Wct(Wct * );
-extern Wct * intern1Wct(char * );
-extern void load_wct_file(char * );
-extern void  skim_wct(void);
-extern void  rescan_wct(void);
-extern void  find_wct(void);
-
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/include/wct.h b/src/include/wct.h
new file mode 100644
index 00000000..b61cd233
--- /dev/null
+++ b/src/include/wct.h
@@ -0,0 +1,74 @@
+/*
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
+  All rights reserved.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+      - Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+      - Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in
+        the documentation and/or other materials provided with the
+        distribution.
+
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+  PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+  OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef OPENAXIOM_wct_INCLUDED
+#define OPENAXIOM_wct_INCLUDED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern time_t ftime(char * );
+extern void fatal(char *  , char * );
+extern off_t fsize(char * );
+extern Wix * scanWct(Wct *  , char * );
+extern void reintern1Wct(Wct * );
+extern Wix * rescanWct(void);
+extern void skimWct(Wct * );
+extern void skim1Wct(Wct * );
+extern void printTime(long * );
+extern int skimString(char *  , int  , int  , int );
+extern int prChar(int );
+extern Wct * reread1Wct(Wct * );
+extern void sfatal(char * );
+extern Wct * read1Wct(char * );
+extern Wct * nconcWct(Wct *  , Wct * );
+extern void sortWct(Wct * );
+extern void sort1Wct(Wct * );
+extern int mystrcmp(const void  *  , const void * );
+extern void burstWct(Wct * );
+extern void burst1Wct(Wct * );
+extern Wct * intern1Wct(char * );
+extern void load_wct_file(char * );
+extern void  skim_wct(void);
+extern void  rescan_wct(void);
+extern void  find_wct(void);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* OPENAXIOM_wct_INCLUDED */
diff --git a/src/lib/XDither.c b/src/lib/XDither.c
index e3c15df0..d766633d 100644
--- a/src/lib/XDither.c
+++ b/src/lib/XDither.c
@@ -1,7 +1,7 @@
 /*
     Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
     All rights reserved.
-    Copyright (C) Gabriel Dos Reis.
+    Copyright (C) 2007-2010, Gabriel Dos Reis.
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
@@ -60,7 +60,7 @@ char XDitherBits[] = {
    0x05, 0x07, 0x07,
    0x07, 0x07, 0x07 };
 
-#include "XDither.H1"
+#include "XDither.h"
 
 Pixmap XDither[XDitherMax];
 unsigned int DITHERINIT = 0;
diff --git a/src/lib/XShade.c b/src/lib/XShade.c
index 4cc052c5..590f2d2f 100644
--- a/src/lib/XShade.c
+++ b/src/lib/XShade.c
@@ -1,7 +1,7 @@
 /*
     Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
     All rights reserved.
-    Copyright (C) Gabriel Dos Reis.
+    Copyright (C) 2007-2010, Gabriel Dos Reis.
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
@@ -67,7 +67,7 @@ char XShadeBits[] = {
    0x0f, 0x0f, 0x0f, 0x0e,
    0x0f, 0x0f, 0x0f, 0x0f};
 
-#include "XShade.H1"
+#include "XShade.h"
 
 Pixmap XShade[XShadeMax];
 GC  TileGC;
diff --git a/src/lib/XSpadFill.c b/src/lib/XSpadFill.c
index 6a332dba..fe805ff2 100644
--- a/src/lib/XSpadFill.c
+++ b/src/lib/XSpadFill.c
@@ -60,9 +60,9 @@
 
 #include "openaxiom-c-macros.h"
 #include "spadcolors.h"
-#include "XSpadFill.H1"
-#include "XShade.H1"
-#include "XDither.H1"
+#include "XSpadFill.h"
+#include "XShade.h"
+#include "XDither.h"
 
 extern unsigned long *spadColors;
 static GC  stippleGC, solidGC;
diff --git a/src/lib/cursor.c b/src/lib/cursor.c
index c63f738d..5413151d 100644
--- a/src/lib/cursor.c
+++ b/src/lib/cursor.c
@@ -1,6 +1,8 @@
 /*
    Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
    All rights reserved.
+   Copyright (C) 2007-2010, Gabriel Dos Reis.
+   All rights reserved.
 
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions are
@@ -34,7 +36,7 @@
 #include <stdlib.h>
 #include "openaxiom-c-macros.h"
 
-#include "cursor.H1"
+#include "cursor.h"
 
 /*
  * This routine changes the shape of the cursor. it is a modified version of
diff --git a/src/lib/edin.c b/src/lib/edin.c
index ae4a3c0d..508c701a 100644
--- a/src/lib/edin.c
+++ b/src/lib/edin.c
@@ -1,7 +1,7 @@
 /*
     Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
     All rights reserved.
-    Copyright (C) Gabriel Dos Reis.
+    Copyright (C) 2007-2010, Gabriel Dos Reis.
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
@@ -67,11 +67,11 @@ extern int buff_flag[1024];  /* flags for whether buff chars
 int buff_pntr;                     /* present length of  buff */
 
 
-#include "edin.H1"
-#include "prt.H1"
-#include "wct.H1"
-#include "cursor.H1"
-#include "fnct_key.H1"
+#include "edin.h"
+#include "prt.h"
+#include "wct.h"
+#include "cursor.h"
+#include "fnct_key.h"
 
 
 
diff --git a/src/lib/fnct_key.c b/src/lib/fnct_key.c
index d880a133..3c36df2a 100644
--- a/src/lib/fnct_key.c
+++ b/src/lib/fnct_key.c
@@ -48,9 +48,9 @@
 #include "bsdsignal.h"
 
 
-#include "fnct_key.H1"
-#include "prt.H1"
-#include "edin.H1"
+#include "fnct_key.h"
+#include "prt.h"
+#include "edin.h"
 
 
 /** Some constants for functio key defs ****/
diff --git a/src/lib/openpty.c b/src/lib/openpty.c
index 2c410479..f737802a 100644
--- a/src/lib/openpty.c
+++ b/src/lib/openpty.c
@@ -58,7 +58,7 @@
 #endif
 
 
-#include "openpty.H1"
+#include "openpty.h"
 
 static void makeNextPtyNames(char *  , char * );
 
diff --git a/src/lib/prt.c b/src/lib/prt.c
index a044d3d1..f111e2d9 100644
--- a/src/lib/prt.c
+++ b/src/lib/prt.c
@@ -37,8 +37,8 @@
 #include <sys/types.h>
 #include "edible.h"
 
-#include "prt.H1"
-#include "edin.H1"
+#include "prt.h"
+#include "edin.h"
 
 void
 myputchar(char c)
diff --git a/src/lib/wct.c b/src/lib/wct.c
index 0466d84b..200d9a3d 100644
--- a/src/lib/wct.c
+++ b/src/lib/wct.c
@@ -64,9 +64,9 @@
 #define Delimiter(c) (! isalnum(c) && c != '%' && c != '!' && c != '?' && c != '_')
 
 
-#include "wct.H1"
-#include "prt.H1"
-#include "edin.H1"
+#include "wct.h"
+#include "prt.h"
+#include "edin.h"
 
 
 
diff --git a/src/sman/sman.c b/src/sman/sman.c
index 3a7093d0..e0ba9deb 100644
--- a/src/sman/sman.c
+++ b/src/sman/sman.c
@@ -53,7 +53,7 @@
 #include "sman.h"
 
 #include "sockio.h"
-#include "openpty.H1"
+#include "openpty.h"
 #include "cfuns.h"
 #include "utils.h"