9 files changed, 32 insertions, 13 deletions
diff --git a/AUTHORS b/AUTHORS
index a443f8b..11bbd1d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -28,10 +28,10 @@ version of rc presented here differs in some respects.
 
 Tim would like to thank these people for their contributions since he
 took over maintenance of rc.  Aharon Robbins, Arvid Requate, Bengt
-Kleberg, Brynjulv Hauksson, Byron Rakitzis, Chris Siebenmann, Dale
-Scheetz, David Luyer, David Swasey, Decklin Foster, Donn Cave, Gary
-Carvell, Gerry Tomlinson, Gert-Jan Vons, Ian Lance Taylor, Jeremy
-Fitzhardinge, Marc Moorcroft, Mark H Wilkinson, Mark K Gardner,
-Raymond Venneker, Rich $alz, Rob Savoye, Scott Schwartz, Stefan
-Dalibor, Steve Simon, Thomas Nordin, Tom Culliton, Tom Tromey, Vincent
-Broman, Wolfgang Zekoll.
+Kleberg, Brynjulv Hauksson, Byron Rakitzis, Callum Gibson, Chris
+Siebenmann, Dale Scheetz, David Luyer, David Swasey, Decklin Foster,
+Donn Cave, Gary Carvell, Gerry Tomlinson, Gert-Jan Vons, Ian Lance
+Taylor, Jeremy Fitzhardinge, Marc Moorcroft, Mark H Wilkinson, Mark K
+Gardner, Raymond Venneker, Rich $alz, Rob Savoye, Scott Schwartz,
+Stefan Dalibor, Steve Simon, Thomas Nordin, Tom Culliton, Tom Tromey,
+Vincent Broman, Wolfgang Zekoll.
diff --git a/ChangeLog b/ChangeLog
index 45fcb18..55ad726 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -739,3 +739,8 @@ Changes since rc-1.5b2
   Documentation: subscripted variables don't work in here documents.
 
   Release: rc-1.6c4.
+
+2001-11-01
+
+  Bug: more wrongly ordered header file includes (thanks Callum
+  Gibson).
diff --git a/except.c b/except.c
index af30e71..886ab50 100644
--- a/except.c
+++ b/except.c
@@ -1,6 +1,8 @@
+#include "rc.h"
+
 #include <setjmp.h>
 #include <signal.h>
-#include "rc.h"
+
 #include "jbwrap.h"
 
 /*
diff --git a/exec.c b/exec.c
index a0ba8d4..c9244c2 100644
--- a/exec.c
+++ b/exec.c
@@ -1,9 +1,12 @@
 /* exec.c */
+
+#include "rc.h"
+
 #include <errno.h>
 #include <signal.h>
 
-#include "rc.h"
 #include "wait.h"
+
 /*
    Takes an argument list and does the appropriate thing (calls a
    builtin, calls a function, etc.)
diff --git a/fn.c b/fn.c
index e82e832..734c071 100644
--- a/fn.c
+++ b/fn.c
@@ -3,9 +3,11 @@
    Support for signal handlers is also found here.
 */
 
+#include "rc.h"
+
 #include <signal.h>
 #include <errno.h>
-#include "rc.h"
+
 #include "sigmsgs.h"
 
 static void fn_handler(int), dud_handler(int);
diff --git a/parse.y b/parse.y
index f83e673..8be65bb 100644
--- a/parse.y
+++ b/parse.y
@@ -5,6 +5,8 @@
  */
 
 %{
+/* note that this actually needs to appear before any system header
+   files are included; byacc likes to throw in <stdlib.h> first. */
 #include "rc.h"
 
 static Node *star, *nolist;
diff --git a/signal.c b/signal.c
index ca34dfa..de06633 100644
--- a/signal.c
+++ b/signal.c
@@ -1,9 +1,10 @@
 /* signal.c: a Hugh-approved signal handler. */
 
+#include "rc.h"
+
 #include <signal.h>
 #include <setjmp.h>
 
-#include "rc.h"
 #include "sigmsgs.h"
 #include "jbwrap.h"
 
diff --git a/utils.c b/utils.c
index b36f5f6..14a55ff 100644
--- a/utils.c
+++ b/utils.c
@@ -1,8 +1,10 @@
 /* utils.c: functions of general utility */
 
+#include "rc.h"
+
 #include <errno.h>
 #include <setjmp.h>
-#include "rc.h"
+
 #include "jbwrap.h"
 
 /* print error with line number on noninteractive shells (i.e., scripts) */
diff --git a/walk.c b/walk.c
index 177e56e..984a68c 100644
--- a/walk.c
+++ b/walk.c
@@ -1,8 +1,10 @@
 /* walk.c: walks the parse tree. */
 
+#include "rc.h"
+
 #include <signal.h>
 #include <setjmp.h>
-#include "rc.h"
+
 #include "jbwrap.h"
 
 /*