diff --git a/checkin_notes b/checkin_notes
index d20ea0189b..49f4871a0c 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -10812,4 +10812,4 @@ Rom    Mar 24 2004
         makefile.am
     lib/
         diagnostics.c
-        exception.h
+        exception.c, .h
diff --git a/lib/diagnostics.C b/lib/diagnostics.C
index 28e60926ec..545c770587 100644
--- a/lib/diagnostics.C
+++ b/lib/diagnostics.C
@@ -32,6 +32,7 @@
 #endif
 
 #include "diagnostics.h"
+#include "error_numbers.h"
 #include "filesys.h"
 #include "util.h"
 
@@ -476,7 +477,7 @@ void boinc_set_signal_handler_force(int sig, RETSIGTYPE (*handler)(int)) {
     sigaction(sig, &temp, NULL);
 #else
     void (*temp)(int);
-    temp = signal(sig, boinc_catch_signal);
+    temp = signal(sig, handler);
     signal(sig, SIG_IGN);
 #endif /* HAVE_SIGACTION */
 }
@@ -499,10 +500,11 @@ RETSIGTYPE boinc_catch_signal(int signal) {
 }
 
 
+/*
 void boinc_quit(int sig) {
     signal(SIGQUIT, boinc_quit);    // reset signal
     time_to_quit = true;
 }
-
+*/
 
 #endif
diff --git a/lib/exception.C b/lib/exception.C
index 3bdc3d4d6c..9911414d24 100644
--- a/lib/exception.C
+++ b/lib/exception.C
@@ -21,6 +21,10 @@
 #include "stdafx.h"
 #endif
 
+#ifndef _WIN32
+#include "stdlib.h"
+#endif
+
 #include "exception.h"
 #include "error_numbers.h"