diff --git a/src/ChangeLog b/src/ChangeLog
index 0c1cd1dd..64c3eff7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-06  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* utils.c: Unconditionally include <setjmp.h>.
+
 2005-07-06  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* utils.c (fnmatch_nocase): New function.
diff --git a/src/utils.c b/src/utils.c
index e77549f1..6c94d710 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -68,11 +68,9 @@ so, delete this exception statement from your version.  */
 # include <termios.h>
 #endif
 
-/* Needed for run_with_timeout. */
+/* Needed for Unix version of run_with_timeout. */
 #include <signal.h>
-#ifdef HAVE_SETJMP_H
-# include <setjmp.h>
-#endif
+#include <setjmp.h>
 
 #ifndef HAVE_SIGSETJMP
 /* If sigsetjmp is a macro, configure won't pick it up. */