diff --git a/ChangeLog b/ChangeLog
index c3985586..c5bdda75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-22  Lars J. Aas  <somelarsa@sim.no>
+
+	* aclang.m4 (_AC_PROG_CXX_EXIT_DECLARATION): First try no declaration,
+	then '#include <stdlib.h>', before trying the explicit declarations.
+
 2001-01-22  Akim Demaille  <akim@epita.fr>
 
 	* acgeneral.m4 (_AC_COMPILE_IFELSE): Wrap the test -s in
diff --git a/aclang.m4 b/aclang.m4
index 52d6efcf..6ff59ff4 100644
--- a/aclang.m4
+++ b/aclang.m4
@@ -1129,12 +1129,13 @@ fi[]dnl
 # Find a valid prototype for exit and declare it in confdefs.h.
 m4_define([_AC_PROG_CXX_EXIT_DECLARATION],
 [for ac_declaration in \
+   ''\
+   '#include <stdlib.h>' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
    'extern "C" void exit (int);' \
-   'void exit (int);' \
-   ''
+   'void exit (int);'
 do
   _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@include <stdlib.h>
 $ac_declaration],
diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index 52d6efcf..6ff59ff4 100644
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -1129,12 +1129,13 @@ fi[]dnl
 # Find a valid prototype for exit and declare it in confdefs.h.
 m4_define([_AC_PROG_CXX_EXIT_DECLARATION],
 [for ac_declaration in \
+   ''\
+   '#include <stdlib.h>' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
    'extern "C" void exit (int);' \
-   'void exit (int);' \
-   ''
+   'void exit (int);'
 do
   _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@include <stdlib.h>
 $ac_declaration],
diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index 52d6efcf..6ff59ff4 100644
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -1129,12 +1129,13 @@ fi[]dnl
 # Find a valid prototype for exit and declare it in confdefs.h.
 m4_define([_AC_PROG_CXX_EXIT_DECLARATION],
 [for ac_declaration in \
+   ''\
+   '#include <stdlib.h>' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
    'extern "C" void exit (int);' \
-   'void exit (int);' \
-   ''
+   'void exit (int);'
 do
   _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@include <stdlib.h>
 $ac_declaration],
diff --git a/lib/autoconf/lang.m4 b/lib/autoconf/lang.m4
index 52d6efcf..6ff59ff4 100644
--- a/lib/autoconf/lang.m4
+++ b/lib/autoconf/lang.m4
@@ -1129,12 +1129,13 @@ fi[]dnl
 # Find a valid prototype for exit and declare it in confdefs.h.
 m4_define([_AC_PROG_CXX_EXIT_DECLARATION],
 [for ac_declaration in \
+   ''\
+   '#include <stdlib.h>' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
    'extern "C" void exit (int);' \
-   'void exit (int);' \
-   ''
+   'void exit (int);'
 do
   _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@include <stdlib.h>
 $ac_declaration],