18 files changed, 505 insertions, 144 deletions

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 */