8 files changed, 18 insertions, 8 deletions
diff --git a/src/hyper/extent2.c b/src/hyper/extent2.c
index a315fd11..4cac2fe8 100644
--- a/src/hyper/extent2.c
+++ b/src/hyper/extent2.c
@@ -54,6 +54,7 @@
 
 #include "all_hyper_proto.H1"
 #include "pixmap.H1"
+#include "cfuns.h"
 
 
 static int cur_height = 0;
diff --git a/src/hyper/hthits.c b/src/hyper/hthits.c
index f7162f51..00b571f8 100644
--- a/src/hyper/hthits.c
+++ b/src/hyper/hthits.c
@@ -61,6 +61,8 @@
 #include <sys/stat.h>
 #include <regex.h>
 
+#include "cfuns.h"
+
 /*
  * For fixed-size arrays.
  */
diff --git a/src/hyper/htinp.c b/src/hyper/htinp.c
index c1970572..c78d52bf 100644
--- a/src/hyper/htinp.c
+++ b/src/hyper/htinp.c
@@ -48,6 +48,7 @@
 #include "group.h"
 #include "parse.h"
 #include "bsdsignal.h"
+#include "cfuns.h"
 
 #include "all_hyper_proto.H1"
 #include "sockio.h"
diff --git a/src/hyper/initx.c b/src/hyper/initx.c
index 2a4eef9a..cff60806 100644
--- a/src/hyper/initx.c
+++ b/src/hyper/initx.c
@@ -46,10 +46,6 @@
 #define _INITX_C
 #include "openaxiom-c-macros.h"
 
-#include "debug.h"
-#include "sockio.h"
-#include "initx.h"
-
 #include <unistd.h>
 #include <sys/signal.h>
 #include <setjmp.h>
@@ -57,6 +53,10 @@
 #include <X11/Xresource.h>
 #include <X11/Xatom.h>
 
+#include "debug.h"
+#include "sockio.h"
+#include "initx.h"
+
 #ifdef SUN4OS5platform
 extern int gethostname(char *, int );
 #endif
@@ -70,6 +70,7 @@ extern int gethostname(char *, int );
 
 #include "all_hyper_proto.H1"
 #include "util.H1"
+#include "cfuns.h"
 
 #include "spadcolors.h"
 #include "spadcolors.H1"
diff --git a/src/hyper/lex.c b/src/hyper/lex.c
index 0142fd25..3f703f4e 100644
--- a/src/hyper/lex.c
+++ b/src/hyper/lex.c
@@ -59,6 +59,10 @@
 #define _LEX_C
 #include "openaxiom-c-macros.h"
 
+#include <ctype.h>
+#include <setjmp.h>
+#include <stdlib.h>
+
 #include "debug.h"
 #include "sockio.h"
 
@@ -69,10 +73,7 @@ int useAscii;
 #include "halloc.h"
 #include "lex.h"
 #include "node.h"
-
-#include <ctype.h>
-#include <setjmp.h>
-#include <stdlib.h>
+#include "cfuns.h"
 
 static int get_char1(void );
 static void spad_error_handler(void );
diff --git a/src/hyper/parse-types.c b/src/hyper/parse-types.c
index 44227441..ec19f66f 100644
--- a/src/hyper/parse-types.c
+++ b/src/hyper/parse-types.c
@@ -51,6 +51,7 @@
 #include "hyper.h"
 #include "lex.h"
 #include "extent.h"
+#include "cfuns.h"
 
 #include "all_hyper_proto.H1"
 
diff --git a/src/hyper/spadint.c b/src/hyper/spadint.c
index fb1189ab..fe8219a1 100644
--- a/src/hyper/spadint.c
+++ b/src/hyper/spadint.c
@@ -50,6 +50,7 @@
 
 #include "all_hyper_proto.H1"
 #include "sockio.h"
+#include "cfuns.h"
 
 
 typedef struct sock_list {      /* linked list of openaxiom_sio */
diff --git a/src/hyper/titlebar.c b/src/hyper/titlebar.c
index 2da6716e..f1601345 100644
--- a/src/hyper/titlebar.c
+++ b/src/hyper/titlebar.c
@@ -46,6 +46,7 @@
 #include "debug.h"
 
 #include <stdlib.h>
+
 #include "halloc.h"
 #include "sockio.h"
 #include "titlebar.h"
@@ -53,6 +54,7 @@
 #include "group.h"
 #include "initx.h"
 #include "parse.h"
+#include "cfuns.h"
 
 #include "all_hyper_proto.H1"