From c8384113e4f6506922bd803f6b9acf2c9bb15799 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 27 Feb 2008 23:26:38 +0000
Subject: [PATCH]  - changes to many files to fix gcc4.3 compile

svn path=/trunk/boinc/; revision=14811
---
 api/boinc_api.C                  |  1 +
 api/graphics2_unix.C             |  1 +
 api/graphics2_util.C             |  1 +
 api/graphics_api.C               |  1 +
 api/graphics_impl_lib.C          |  1 +
 api/graphics_lib.C               |  1 +
 api/txf_util.C                   |  1 +
 api/x_opengl.C                   | 11 ++++++-----
 checkin_notes                    |  3 +++
 client/acct_mgr.C                |  1 +
 client/acct_setup.C              |  1 +
 client/auto_update.C             |  1 +
 client/client_state.C            |  1 +
 client/client_types.C            |  1 +
 client/cpp.h                     |  1 +
 client/cpu_sched.C               | 13 ++++++++-----
 client/cs_account.C              |  2 ++
 client/cs_statefile.C            |  1 +
 client/cs_trickle.C              |  1 +
 client/gui_http.C                |  1 +
 client/main.C                    |  1 +
 client/time_stats.C              |  1 +
 lib/boinc_cmd.C                  |  1 +
 lib/diagnostics.C                |  1 +
 lib/proxy_info.C                 |  1 +
 sched/delete_file.C              |  2 +-
 sched/edf_sim.C                  |  1 +
 sched/feeder.C                   |  1 +
 sched/file_deleter.C             |  1 +
 sched/get_file.C                 |  2 +-
 sched/handle_request.C           |  2 ++
 sched/main.C                     |  2 ++
 sched/message_handler.C          |  2 ++
 sched/request_file_list.C        |  2 +-
 sched/sample_assimilator.C       |  1 +
 sched/sample_dummy_assimilator.C |  2 ++
 sched/sample_trivial_validator.C |  1 +
 sched/sample_work_generator.C    |  3 +++
 sched/sched_array.C              |  3 +++
 sched/sched_hr.C                 |  2 ++
 sched/sched_locality.C           |  1 +
 sched/sched_resend.C             |  4 ++++
 sched/sched_send.C               |  1 +
 sched/sched_shmem.C              |  2 ++
 sched/sched_timezone.C           |  1 +
 sched/send_file.C                |  2 +-
 sched/server_types.C             |  1 +
 sched/show_shmem.C               |  1 +
 sched/transitioner.C             |  3 +++
 sched/update_stats.C             |  1 +
 sched/validate_util.C            |  1 +
 sched/validate_util2.C           |  2 ++
 sched/validator.C                |  2 ++
 sched/wu_check.C                 |  3 +++
 tools/backend_lib.C              |  1 +
 tools/create_work.C              |  1 +
 tools/process_result_template.C  |  1 +
 tools/sign_executable.C          |  4 ++++
 58 files changed, 95 insertions(+), 14 deletions(-)

diff --git a/api/boinc_api.C b/api/boinc_api.C
index 2e3ba92725..4b172f4117 100644
--- a/api/boinc_api.C
+++ b/api/boinc_api.C
@@ -26,6 +26,7 @@
 #else
 #include "config.h"
 #include <cstdlib>
+#include <cstring>
 #include <cstdio>
 #include <cstdarg>
 #include <sys/types.h>
diff --git a/api/graphics2_unix.C b/api/graphics2_unix.C
index 7f132c6076..27c6870946 100644
--- a/api/graphics2_unix.C
+++ b/api/graphics2_unix.C
@@ -26,6 +26,7 @@
 #include <unistd.h> 
 #include <pthread.h> 
 #include <signal.h>
+#include <cstring>
 #include "x_opengl.h"
 
 #include "app_ipc.h"
diff --git a/api/graphics2_util.C b/api/graphics2_util.C
index 9fb5be2677..923202192f 100644
--- a/api/graphics2_util.C
+++ b/api/graphics2_util.C
@@ -26,6 +26,7 @@
 #include <sys/stat.h>
 #endif
 
+#include <cstring>
 #include "shmem.h"
 #include "filesys.h"
 #include "app_ipc.h"
diff --git a/api/graphics_api.C b/api/graphics_api.C
index 7f0f819bbe..22075afa82 100644
--- a/api/graphics_api.C
+++ b/api/graphics_api.C
@@ -25,6 +25,7 @@
 #include "config.h"
 #endif
 
+#include <cstring>
 #include "diagnostics.h"
 #include "boinc_api.h"
 #include "graphics_impl.h"
diff --git a/api/graphics_impl_lib.C b/api/graphics_impl_lib.C
index de46484dd9..991ab4072b 100644
--- a/api/graphics_impl_lib.C
+++ b/api/graphics_impl_lib.C
@@ -24,6 +24,7 @@
 #include "boinc_win.h"
 #endif
 
+#include <cstring>
 #include "config.h"
 #include "app_ipc.h"
 #include "graphics_impl.h"
diff --git a/api/graphics_lib.C b/api/graphics_lib.C
index 3a58b23408..46d184ecbf 100644
--- a/api/graphics_lib.C
+++ b/api/graphics_lib.C
@@ -29,6 +29,7 @@
 #endif
 
 #include "config.h"
+#include <cstring>
 #include <dlfcn.h>
 
 #include "boinc_api.h"  
diff --git a/api/txf_util.C b/api/txf_util.C
index 710e997d7a..1f5ea7bd96 100644
--- a/api/txf_util.C
+++ b/api/txf_util.C
@@ -24,6 +24,7 @@
 #include "boinc_win.h"
 #endif
 
+#include <cstring>
 #include "filesys.h"
 #include "boinc_api.h"
 
diff --git a/api/x_opengl.C b/api/x_opengl.C
index b743be6e68..bf5d662824 100644
--- a/api/x_opengl.C
+++ b/api/x_opengl.C
@@ -22,7 +22,8 @@
 #include <stdio.h>    
 #include <setjmp.h>    
 #include <unistd.h> 
-#include <pthread.h> 
+#include <pthread.h>
+#include <cstring>
 #include <signal.h>
 #include "x_opengl.h"
 
@@ -69,13 +70,13 @@ static bool suspend_render = false;
 
 // glutGet(GLUT_INIT_STATE) returns freegluts state.  Determines
 // when to call glutInit again to reinitialize it.
-// 
+//
 #ifndef GLUT_INIT_STATE
 #define GLUT_INIT_STATE 0x007C
 #endif
 
 // Simple defines for checking freeglut states
-// 
+//
 
 // Check whether freeglut is initialized.  Necessary
 // since it deinitializes itself when the window is
@@ -89,7 +90,7 @@ static bool suspend_render = false;
 // causes SIGABRT, so we hide and reshow windows instead
 // of creating and deleting them.  (Talking freeglut here)
 // note - make sure glutInit is called before checking,
-// otherwise freeglut will SIGABRT. 
+// otherwise freeglut will SIGABRT.
 //
 #define GLUT_HAVE_WINDOW ((bool)(glutGetWindow()!=0))
 
@@ -98,7 +99,7 @@ static bool suspend_render = false;
 // and avoid SIGABRTs.  Initialize the flag to 'true' and the
 // init code in boinc_glut_init() will check whether we have
 // openglut or freeglut, resetting the variable as necessary.
-// 
+//
 // Linux systems ship with freeglut, so default is 'true' and
 // its checked.
 //
diff --git a/checkin_notes b/checkin_notes
index 93a7fe5c7d..6193910dff 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -1708,3 +1708,6 @@ David  Feb 27 2008
         sched_send.C
     tools/
         create_work.C
+
+David  Feb 27 2008
+    - changes to many files to fix gcc4.3 compile
diff --git a/client/acct_mgr.C b/client/acct_mgr.C
index d10507e4e1..0341c0a1dc 100644
--- a/client/acct_mgr.C
+++ b/client/acct_mgr.C
@@ -23,6 +23,7 @@
 #include "config.h"
 #endif
 
+#include <cstring>
 #include "parse.h"
 #include "error_numbers.h"
 #include "client_msgs.h"
diff --git a/client/acct_setup.C b/client/acct_setup.C
index 3ebe90912b..194266c50a 100644
--- a/client/acct_setup.C
+++ b/client/acct_setup.C
@@ -25,6 +25,7 @@
 #include "config.h"
 #endif
 
+#include <cstring>
 #include "client_state.h"
 #include "file_names.h"
 #include "parse.h"
diff --git a/client/auto_update.C b/client/auto_update.C
index 7f79f2ed58..9b0b9d28b3 100644
--- a/client/auto_update.C
+++ b/client/auto_update.C
@@ -17,6 +17,7 @@
 // or write to the Free Software Foundation, Inc.,
 // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
+#include <cstring>
 #include "parse.h"
 #include "error_numbers.h"
 #include "filesys.h"
diff --git a/client/client_state.C b/client/client_state.C
index 22a73f282f..e50674ba98 100644
--- a/client/client_state.C
+++ b/client/client_state.C
@@ -29,6 +29,7 @@
 #include <cstdlib>
 #include <ctime>
 #include <cstdarg>
+#include <cstring>
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
diff --git a/client/client_types.C b/client/client_types.C
index f8e26b9582..3e9517cb07 100644
--- a/client/client_types.C
+++ b/client/client_types.C
@@ -27,6 +27,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <zlib.h>
+#include <cstring>
 #endif
 
 #include "error_numbers.h"
diff --git a/client/cpp.h b/client/cpp.h
index a895176978..27d5c21cd5 100644
--- a/client/cpp.h
+++ b/client/cpp.h
@@ -34,4 +34,5 @@
 #include <iostream>
 #include <vector>
 #include <string>
+#include <cstring>
 #endif
diff --git a/client/cpu_sched.C b/client/cpu_sched.C
index 666e0e50b6..e70ca26a3a 100644
--- a/client/cpu_sched.C
+++ b/client/cpu_sched.C
@@ -41,17 +41,20 @@
 #include "boinc_win.h"
 #endif
 
-#ifdef SIM
-#include "sim.h"
-#else
-#include "client_state.h"
-#endif
+#include <string>
+#include <cstring>
 #include "client_msgs.h"
 #include "str_util.h"
 #include "util.h"
 #include "error_numbers.h"
 #include "log_flags.h"
 
+#ifdef SIM
+#include "sim.h"
+#else
+#include "client_state.h"
+#endif
+
 using std::vector;
 
 #define MAX_STD   (86400)
diff --git a/client/cs_account.C b/client/cs_account.C
index 42999f4b60..ec511b20f3 100644
--- a/client/cs_account.C
+++ b/client/cs_account.C
@@ -31,6 +31,8 @@
 #endif
 #endif
 
+#include <algorithm>
+#include <cstring>
 #include "filesys.h"
 #include "parse.h"
 #include "str_util.h"
diff --git a/client/cs_statefile.C b/client/cs_statefile.C
index f297f013ca..313e28df62 100644
--- a/client/cs_statefile.C
+++ b/client/cs_statefile.C
@@ -23,6 +23,7 @@
 #include "config.h"
 #endif
 
+#include <cstring>
 #include "parse.h"
 #include "str_util.h"
 #include "util.h"
diff --git a/client/cs_trickle.C b/client/cs_trickle.C
index 619697e897..322e8b8399 100644
--- a/client/cs_trickle.C
+++ b/client/cs_trickle.C
@@ -24,6 +24,7 @@
 #include "config.h"
 #endif
 
+#include <cstring>
 #include "error_numbers.h"
 #include "file_names.h"
 #include "filesys.h"
diff --git a/client/gui_http.C b/client/gui_http.C
index 44a7280e9b..c93d417524 100644
--- a/client/gui_http.C
+++ b/client/gui_http.C
@@ -23,6 +23,7 @@
 #include "config.h"
 #endif
 
+#include <cstring>
 #include "client_state.h"
 #include "filesys.h"
 #include "error_numbers.h"
diff --git a/client/main.C b/client/main.C
index 4a7132cfa8..a887e955aa 100644
--- a/client/main.C
+++ b/client/main.C
@@ -47,6 +47,7 @@ typedef void (CALLBACK* ClientLibraryShutdown)();
 #endif
 #include <sys/stat.h>
 #include <syslog.h>
+#include <cstdlib>
 #include <unistd.h>
 #include <csignal>
 #endif
diff --git a/client/time_stats.C b/client/time_stats.C
index c6cdb2ef68..a6a7817769 100644
--- a/client/time_stats.C
+++ b/client/time_stats.C
@@ -32,6 +32,7 @@
 #include <sys/socket.h>
 #endif
 
+#include <cstring>
 #include "parse.h"
 #include "util.h"
 #include "filesys.h"
diff --git a/lib/boinc_cmd.C b/lib/boinc_cmd.C
index e2fed4ace4..80807ab9ee 100644
--- a/lib/boinc_cmd.C
+++ b/lib/boinc_cmd.C
@@ -31,6 +31,7 @@
 #ifndef _WIN32
 #include "config.h"
 #include <cstdio>
+#include <cstring>
 #include <unistd.h>
 #endif
 
diff --git a/lib/diagnostics.C b/lib/diagnostics.C
index bf7d49990f..294dbb8ed2 100644
--- a/lib/diagnostics.C
+++ b/lib/diagnostics.C
@@ -30,6 +30,7 @@
 
 #ifndef _WIN32
 #include "config.h"
+#include <cstring>
 #include <cstdio>
 #include <cstdarg>
 #include <cstdlib>
diff --git a/lib/proxy_info.C b/lib/proxy_info.C
index 2201c036f7..cf18df54db 100644
--- a/lib/proxy_info.C
+++ b/lib/proxy_info.C
@@ -23,6 +23,7 @@
 
 #ifndef _WIN32
 #include "config.h"
+#include <cstring>
 #include <string>
 #endif
 
diff --git a/sched/delete_file.C b/sched/delete_file.C
index 1ae401e4a3..07416eef0a 100644
--- a/sched/delete_file.C
+++ b/sched/delete_file.C
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #endif
 #include <stdlib.h>
-#include <string.h>
+#include <string>
 
 #include "boinc_db.h"
 #include "str_util.h"
diff --git a/sched/edf_sim.C b/sched/edf_sim.C
index 7e266770fa..37c739ffd6 100644
--- a/sched/edf_sim.C
+++ b/sched/edf_sim.C
@@ -19,6 +19,7 @@
 
 #include <vector>
 #include <algorithm>
+#include <cstring>
 #include <cstdio>
 
 #ifdef _USING_FCGI_
diff --git a/sched/feeder.C b/sched/feeder.C
index 5168c79972..9bf36764b2 100644
--- a/sched/feeder.C
+++ b/sched/feeder.C
@@ -94,6 +94,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <string>
 #include <ctime>
 #include <csignal>
 #include <unistd.h>
diff --git a/sched/file_deleter.C b/sched/file_deleter.C
index 9599757d4d..4e79105245 100644
--- a/sched/file_deleter.C
+++ b/sched/file_deleter.C
@@ -73,6 +73,7 @@
 #include "config.h"
 #include <list>
 #include <cstring>
+#include <string>
 #include <cstdlib>
 #include <ctime>
 #include <unistd.h>
diff --git a/sched/get_file.C b/sched/get_file.C
index e3c0992e95..8476f3c7bf 100644
--- a/sched/get_file.C
+++ b/sched/get_file.C
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #endif
 #include <stdlib.h>
-#include <string.h>
+#include <string>
 #include <time.h>
 
 #include "boinc_db.h"
diff --git a/sched/handle_request.C b/sched/handle_request.C
index 3e73db9f9e..ae1fb08965 100644
--- a/sched/handle_request.C
+++ b/sched/handle_request.C
@@ -22,8 +22,10 @@
 #include "config.h"
 #include <cassert>
 #include <cstdio>
+#include <cstdlib>
 #include <vector>
 #include <string>
+#include <cstring>
 #include <ctime>
 #include <cmath>
 using namespace std;
diff --git a/sched/main.C b/sched/main.C
index 098550d0d0..c6496c8374 100644
--- a/sched/main.C
+++ b/sched/main.C
@@ -30,8 +30,10 @@
 #include "config.h"
 #include <cassert>
 #include <cstdio>
+#include <cstdlib>
 #include <vector>
 #include <string>
+#include <cstring>
 using namespace std;
 
 #include <unistd.h>
diff --git a/sched/message_handler.C b/sched/message_handler.C
index 4c9ca090dc..1e21bb5d54 100644
--- a/sched/message_handler.C
+++ b/sched/message_handler.C
@@ -31,6 +31,8 @@ using namespace std;
 
 #include "config.h"
 #include <unistd.h>
+#include <cstdlib>
+#include <string>
 
 #include "boinc_db.h"
 #include "util.h"
diff --git a/sched/request_file_list.C b/sched/request_file_list.C
index 658ca09c31..929ee2f8fe 100644
--- a/sched/request_file_list.C
+++ b/sched/request_file_list.C
@@ -29,7 +29,7 @@
 #include "config.h"
 #include <unistd.h>
 #include <stdlib.h>
-#include <string.h>
+#include <string>
 #include <time.h>
 
 #include "boinc_db.h"
diff --git a/sched/sample_assimilator.C b/sched/sample_assimilator.C
index c89fff7153..d1da100a38 100644
--- a/sched/sample_assimilator.C
+++ b/sched/sample_assimilator.C
@@ -23,6 +23,7 @@
 
 #include <vector>
 #include <string>
+#include <cstdlib>
 
 #include "boinc_db.h"
 #include "error_numbers.h"
diff --git a/sched/sample_dummy_assimilator.C b/sched/sample_dummy_assimilator.C
index 714cd25242..85943c1024 100644
--- a/sched/sample_dummy_assimilator.C
+++ b/sched/sample_dummy_assimilator.C
@@ -21,6 +21,8 @@
 
 #include "config.h"
 #include <cstdio>
+#include <cstdlib>
+#include <string>
 
 #include "boinc_db.h"
 #include "sched_msgs.h"
diff --git a/sched/sample_trivial_validator.C b/sched/sample_trivial_validator.C
index 1d56e89514..9527f4b198 100644
--- a/sched/sample_trivial_validator.C
+++ b/sched/sample_trivial_validator.C
@@ -20,6 +20,7 @@
 // A sample validator that grants credit to any result whose CPU time is above
 // a certain minimum
 
+#include <cstdlib>
 #include "config.h"
 #include "validate_util.h"
 
diff --git a/sched/sample_work_generator.C b/sched/sample_work_generator.C
index a7eb12a80c..26d317a531 100644
--- a/sched/sample_work_generator.C
+++ b/sched/sample_work_generator.C
@@ -30,6 +30,9 @@
 //   and sequence number, so that they're unique.
 
 #include <unistd.h>
+#include <cstdlib>
+#include <string>
+#include <cstring>
 
 #include "boinc_db.h"
 #include "error_numbers.h"
diff --git a/sched/sched_array.C b/sched/sched_array.C
index c0c73204da..b7bb0a55da 100644
--- a/sched/sched_array.C
+++ b/sched/sched_array.C
@@ -19,6 +19,9 @@
 
 // scheduler code related to sending work
 
+#include <cstdlib>
+#include <string>
+#include <cstring>
 
 #include "config.h"
 #include "main.h"
diff --git a/sched/sched_hr.C b/sched/sched_hr.C
index d4cdc6df16..d5e8c56a59 100644
--- a/sched/sched_hr.C
+++ b/sched/sched_hr.C
@@ -23,6 +23,8 @@
 #include <ctime>
 #include <cstdio>
 #include <stdlib.h>
+#include <cstring>
+#include <string>
 
 #include "error_numbers.h"
 
diff --git a/sched/sched_locality.C b/sched/sched_locality.C
index 8fef3f7d77..528c390400 100644
--- a/sched/sched_locality.C
+++ b/sched/sched_locality.C
@@ -22,6 +22,7 @@
 #include "config.h"
 #include <stdio.h>
 #include <unistd.h>
+#include <cstdlib>
 #include <strings.h>
 #include <glob.h>
 #include <sys/stat.h>
diff --git a/sched/sched_resend.C b/sched/sched_resend.C
index b879ab7355..78f64fe5f6 100644
--- a/sched/sched_resend.C
+++ b/sched/sched_resend.C
@@ -26,6 +26,10 @@
 //   this result may have been the cause of reset
 //   (need to pass last reset time from client)
 
+#include <cstdlib>
+#include <cstring>
+#include <string>
+
 #include "config.h"
 #include "error_numbers.h"
 
diff --git a/sched/sched_send.C b/sched/sched_send.C
index 93d7c67d4f..b304c4a8cb 100644
--- a/sched/sched_send.C
+++ b/sched/sched_send.C
@@ -26,6 +26,7 @@
 #include <string>
 #include <ctime>
 #include <cstdio>
+#include <cstring>
 #include <stdlib.h>
 
 using namespace std;
diff --git a/sched/sched_shmem.C b/sched/sched_shmem.C
index 77e45829bd..d2fd83e614 100644
--- a/sched/sched_shmem.C
+++ b/sched/sched_shmem.C
@@ -23,7 +23,9 @@
 
 #include "config.h"
 #include <cstdio>
+#include <cstdlib>
 #include <cstring>
+#include <string>
 
 #include "boinc_db.h"
 #include "error_numbers.h"
diff --git a/sched/sched_timezone.C b/sched/sched_timezone.C
index 260800332d..cd1bc06537 100644
--- a/sched/sched_timezone.C
+++ b/sched/sched_timezone.C
@@ -23,6 +23,7 @@
 #include "config.h"
 #include <string>
 #include <stdio.h>
+#include <cstring>
 
 #include "parse.h"
 
diff --git a/sched/send_file.C b/sched/send_file.C
index f012ba7d67..d67cbd4f61 100644
--- a/sched/send_file.C
+++ b/sched/send_file.C
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #endif
 #include <stdlib.h>
-#include <string.h>
+#include <string>
 #include <time.h>
 
 #include "boinc_db.h"
diff --git a/sched/server_types.C b/sched/server_types.C
index e7e1d61d9e..aa4be33120 100644
--- a/sched/server_types.C
+++ b/sched/server_types.C
@@ -20,6 +20,7 @@
 #include <cassert>
 #include <vector>
 #include <string>
+#include <cstring>
 using namespace std;
 
 #include "parse.h"
diff --git a/sched/show_shmem.C b/sched/show_shmem.C
index 825f843d2d..9d4f8f68e4 100644
--- a/sched/show_shmem.C
+++ b/sched/show_shmem.C
@@ -22,6 +22,7 @@
 #include "config.h"
 #include <cstdio>
 #include <cstdlib>
+#include <string>
 #include <unistd.h>
 
 #include "shmem.h"
diff --git a/sched/transitioner.C b/sched/transitioner.C
index 0f59d8eeba..7f6ed5fd8a 100644
--- a/sched/transitioner.C
+++ b/sched/transitioner.C
@@ -31,7 +31,10 @@ using namespace std;
 #include "config.h"
 #include <vector>
 #include <unistd.h>
+#include <cstring>
 #include <climits>
+#include <cstdlib>
+#include <string>
 #include <sys/time.h>
 
 #include "boinc_db.h"
diff --git a/sched/update_stats.C b/sched/update_stats.C
index d2c7bc9891..a3657c3283 100644
--- a/sched/update_stats.C
+++ b/sched/update_stats.C
@@ -30,6 +30,7 @@
 #include "config.h"
 #include <cstdio>
 #include <cstring>
+#include <string>
 #include <cstdlib>
 #include <unistd.h>
 
diff --git a/sched/validate_util.C b/sched/validate_util.C
index cad0c217eb..2ce9ed4667 100644
--- a/sched/validate_util.C
+++ b/sched/validate_util.C
@@ -23,6 +23,7 @@
 // or that requires strict equality (see sample_bitwise_validator.C)
 // or that uses fuzzy comparison.
 
+#include <cstring>
 #include "config.h"
 
 #include "error_numbers.h"
diff --git a/sched/validate_util2.C b/sched/validate_util2.C
index d2c31bbecc..e792a347c0 100644
--- a/sched/validate_util2.C
+++ b/sched/validate_util2.C
@@ -24,6 +24,8 @@
 
 #include "config.h"
 #include <vector>
+#include <cstdlib>
+#include <string>
 
 #include "boinc_db.h"
 #include "error_numbers.h"
diff --git a/sched/validator.C b/sched/validator.C
index 5e83eabf43..d93d4b0d63 100644
--- a/sched/validator.C
+++ b/sched/validator.C
@@ -40,6 +40,8 @@ using namespace std;
 #include <climits>
 #include <cmath>
 #include <vector>
+#include <cstdlib>
+#include <string>
 
 #include "boinc_db.h"
 #include "util.h"
diff --git a/sched/wu_check.C b/sched/wu_check.C
index b8251d0289..c442a06005 100644
--- a/sched/wu_check.C
+++ b/sched/wu_check.C
@@ -23,6 +23,9 @@
 
 #include "config.h"
 #include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <string>
 
 #include "boinc_db.h"
 
diff --git a/tools/backend_lib.C b/tools/backend_lib.C
index a527ede152..706638a068 100644
--- a/tools/backend_lib.C
+++ b/tools/backend_lib.C
@@ -20,6 +20,7 @@
 #include "config.h"
 #include <cstdlib>
 #include <cstring>
+#include <string>
 #include <ctime>
 #include <cassert>
 #include <unistd.h>
diff --git a/tools/create_work.C b/tools/create_work.C
index ce3ad63b4b..74c23d7617 100644
--- a/tools/create_work.C
+++ b/tools/create_work.C
@@ -56,6 +56,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
+#include <string>
 
 #include "boinc_db.h"
 #include "crypt.h"
diff --git a/tools/process_result_template.C b/tools/process_result_template.C
index 6c00914ec5..b921b9ed0d 100644
--- a/tools/process_result_template.C
+++ b/tools/process_result_template.C
@@ -19,6 +19,7 @@
 
 #include "config.h"
 #include <cstring>
+#include <string>
 #include <cstdlib>
 #include <cassert>
 
diff --git a/tools/sign_executable.C b/tools/sign_executable.C
index 251e1659fb..a4707bc59f 100644
--- a/tools/sign_executable.C
+++ b/tools/sign_executable.C
@@ -19,6 +19,10 @@
 
 // syntax: sign_executable data_file private_key_file
 
+#include <cstdlib>
+#include <string>
+#include <cstring>
+
 #include "config.h"
 #include "crypt.h"
 #include "backend_lib.h"