diff --git a/api/boinc_api.cpp b/api/boinc_api.cpp
index a59cbb1736..4652b88561 100644
--- a/api/boinc_api.cpp
+++ b/api/boinc_api.cpp
@@ -100,6 +100,7 @@
 #include "parse.h"
 #include "proc_control.h"
 #include "shmem.h"
+#include "str_replace.h"
 #include "str_util.h"
 #include "util.h"
 
diff --git a/client/app_control.cpp b/client/app_control.cpp
index a9fc6ff0db..15e86d39b0 100644
--- a/client/app_control.cpp
+++ b/client/app_control.cpp
@@ -64,6 +64,7 @@ using std::vector;
 #include "filesys.h"
 #include "parse.h"
 #include "shmem.h"
+#include "str_replace.h"
 #include "str_util.h"
 #include "util.h"
 
diff --git a/client/async_file.cpp b/client/async_file.cpp
index 4624bc1875..b0acecb233 100644
--- a/client/async_file.cpp
+++ b/client/async_file.cpp
@@ -25,6 +25,7 @@
 #include "error_numbers.h"
 #include "filesys.h"
 #include "md5_file.h"
+#include "str_replace.h"
 
 #include "app.h"
 #include "client_msgs.h"
diff --git a/client/cs_notice.cpp b/client/cs_notice.cpp
index 8f58fa9f8a..b9b9c2500c 100644
--- a/client/cs_notice.cpp
+++ b/client/cs_notice.cpp
@@ -27,6 +27,7 @@
 #include "parse.h"
 #include "url.h"
 #include "filesys.h"
+#include "str_replace.h"
 
 #include "client_state.h"
 #include "client_msgs.h"
diff --git a/client/cs_statefile.cpp b/client/cs_statefile.cpp
index 208f351575..a82d51b66a 100644
--- a/client/cs_statefile.cpp
+++ b/client/cs_statefile.cpp
@@ -28,6 +28,7 @@
 #include "filesys.h"
 #include "md5_file.h"
 #include "parse.h"
+#include "str_replace.h"
 #include "str_util.h"
 #include "util.h"
 
diff --git a/client/cs_trickle.cpp b/client/cs_trickle.cpp
index 3d7f248f9a..24be21df3e 100644
--- a/client/cs_trickle.cpp
+++ b/client/cs_trickle.cpp
@@ -32,6 +32,7 @@
 #include "filesys.h"
 #include "parse.h"
 #include "util.h"
+#include "str_replace.h"
 #include "str_util.h"
 
 #include "client_msgs.h"
diff --git a/client/current_version.cpp b/client/current_version.cpp
index a991683f20..b37b02cf1b 100644
--- a/client/current_version.cpp
+++ b/client/current_version.cpp
@@ -20,6 +20,7 @@
 // every so often to see if there's a newer client version
 
 #include "filesys.h"
+#include "str_replace.h"
 
 #include "client_msgs.h"
 #include "client_state.h"
diff --git a/client/gpu_amd.cpp b/client/gpu_amd.cpp
index 5b087e37bb..128246da34 100644
--- a/client/gpu_amd.cpp
+++ b/client/gpu_amd.cpp
@@ -40,6 +40,7 @@ using std::vector;
 using std::string;
 
 #include "coproc.h"
+#include "str_replace.h"
 #include "util.h"
 
 #include "client_msgs.h"
diff --git a/client/gui_rpc_server_ops.cpp b/client/gui_rpc_server_ops.cpp
index db62a80f8e..6c3136c077 100644
--- a/client/gui_rpc_server_ops.cpp
+++ b/client/gui_rpc_server_ops.cpp
@@ -54,6 +54,7 @@
 #include "filesys.h"
 #include "network.h"
 #include "parse.h"
+#include "str_replace.h"
 #include "str_util.h"
 #include "url.h"
 #include "util.h"
diff --git a/client/log_flags.cpp b/client/log_flags.cpp
index de62ddd227..493efcb478 100644
--- a/client/log_flags.cpp
+++ b/client/log_flags.cpp
@@ -34,6 +34,7 @@
 #include "error_numbers.h"
 #include "filesys.h"
 #include "parse.h"
+#include "str_replace.h"
 #include "str_util.h"
 
 #include "client_state.h"
diff --git a/client/switcher.cpp b/client/switcher.cpp
index 0fdc69e1d3..157c55ab20 100644
--- a/client/switcher.cpp
+++ b/client/switcher.cpp
@@ -32,6 +32,7 @@
 
 #include "app_ipc.h"
 #include "filesys.h"
+#include "str_replace.h"
 
 using std::strcpy;
 
diff --git a/clientgui/NoticeListCtrl.cpp b/clientgui/NoticeListCtrl.cpp
index 1580ba9e2d..a633b421a4 100644
--- a/clientgui/NoticeListCtrl.cpp
+++ b/clientgui/NoticeListCtrl.cpp
@@ -21,6 +21,9 @@
 
 #include "stdwx.h"
 #include "Events.h"
+
+#include "str_replace.h"
+
 #include "BOINCGUIApp.h"
 #include "MainDocument.h"
 #include "NoticeListCtrl.h"
diff --git a/lib/diagnostics.cpp b/lib/diagnostics.cpp
index 1c6fd761d5..2f691fd563 100644
--- a/lib/diagnostics.cpp
+++ b/lib/diagnostics.cpp
@@ -59,6 +59,7 @@
 #include "error_numbers.h"
 #include "filesys.h"
 #include "util.h"
+#include "str_replace.h"
 #include "parse.h"
 
 #include "diagnostics.h"
diff --git a/lib/str_replace.h b/lib/str_replace.h
index 76828eee00..1f6f4558f6 100644
--- a/lib/str_replace.h
+++ b/lib/str_replace.h
@@ -22,6 +22,7 @@
 
 #ifndef _WIN32
 #include "config.h"
+#include <sys/types.h>
 #endif
 
 #ifdef __APPLE__
@@ -52,4 +53,7 @@ inline int strcasecmp(const char* s1, const char* s2) {
 }
 #endif
 
+#define safe_strcpy(x, y) strlcpy(x, y, sizeof(x))
+#define safe_strcat(x, y) strlcat(x, y, sizeof(x))
+
 #endif
diff --git a/lib/str_util.h b/lib/str_util.h
index 2d698eaaf2..57ee41d4f1 100644
--- a/lib/str_util.h
+++ b/lib/str_util.h
@@ -21,8 +21,6 @@
 #include <string>
 #include <string.h>
 
-#include "str_replace.h"
-
 extern void strcpy_overlap(char*, const char*);
 extern int ndays_to_string(double x, int smallest_timescale, char *buf);
 extern void nbytes_to_string(double nbytes, double total_bytes, char* str, int len);
@@ -30,8 +28,6 @@ extern int parse_command_line(char*, char**);
 extern void c2x(char *what);
 extern void strip_whitespace(char *str);
 extern void strip_whitespace(std::string&);
-#define safe_strcpy(x, y) strlcpy(x, y, sizeof(x))
-#define safe_strcat(x, y) if (strlen(x)+strlen(y)<sizeof(x)) strcat(x, y)
 extern char* time_to_string(double);
 extern char* precision_time_to_string(double);
 extern void secs_to_hmsf(double, char*);
diff --git a/sched/assimilator.cpp b/sched/assimilator.cpp
index 8b75a62178..27c8a0a7e3 100644
--- a/sched/assimilator.cpp
+++ b/sched/assimilator.cpp
@@ -32,6 +32,7 @@
 #include "parse.h"
 #include "util.h"
 #include "error_numbers.h"
+#include "str_replace.h"
 #include "str_util.h"
 #include "svn_version.h"
 
diff --git a/sched/db_purge.cpp b/sched/db_purge.cpp
index 74106dfdc1..e3672f893c 100644
--- a/sched/db_purge.cpp
+++ b/sched/db_purge.cpp
@@ -41,9 +41,11 @@
 #include <errno.h>
 
 #include "boinc_db.h"
-#include "util.h"
 #include "filesys.h"
 #include "parse.h"
+#include "str_replace.h"
+#include "util.h"
+
 #include "sched_config.h"
 #include "sched_util.h"
 #include "sched_msgs.h"
diff --git a/sched/delete_file.cpp b/sched/delete_file.cpp
index 0383599e4b..1749621636 100644
--- a/sched/delete_file.cpp
+++ b/sched/delete_file.cpp
@@ -35,6 +35,7 @@
 
 #include "backend_lib.h"
 #include "boinc_db.h"
+#include "str_replace.h"
 #include "str_util.h"
 #include "svn_version.h"
 
diff --git a/sched/edf_sim.h b/sched/edf_sim.h
index 59f10eba05..7c40f25edb 100644
--- a/sched/edf_sim.h
+++ b/sched/edf_sim.h
@@ -22,6 +22,7 @@
 #include <vector>
 
 #include "parse.h"
+#include "str_replace.h"
 
 struct IP_RESULT {
     char name[256];
diff --git a/sched/file_upload_handler.cpp b/sched/file_upload_handler.cpp
index 6c5e3a7d45..3d42d381ed 100644
--- a/sched/file_upload_handler.cpp
+++ b/sched/file_upload_handler.cpp
@@ -41,6 +41,7 @@
 #include "parse.h"
 #include "util.h"
 #include "error_numbers.h"
+#include "str_replace.h"
 #include "str_util.h"
 #include "filesys.h"
 #include "svn_version.h"
diff --git a/sched/get_file.cpp b/sched/get_file.cpp
index 1ac10d0ebd..e84f44bec0 100644
--- a/sched/get_file.cpp
+++ b/sched/get_file.cpp
@@ -37,6 +37,7 @@
 #include <time.h>
 
 #include "backend_lib.h"
+#include "str_replace.h"
 
 #include "sched_config.h"
 #include "sched_util.h"
diff --git a/sched/make_work.cpp b/sched/make_work.cpp
index a000867e47..b8d84c3450 100644
--- a/sched/make_work.cpp
+++ b/sched/make_work.cpp
@@ -49,6 +49,7 @@ using std::string;
 #include "parse.h"
 #include "sched_util.h"
 #include "sched_msgs.h"
+#include "str_replace.h"
 #include "str_util.h"
 #include "svn_version.h"
 
diff --git a/sched/message_handler.cpp b/sched/message_handler.cpp
index c6fcc5914a..be41de09b0 100644
--- a/sched/message_handler.cpp
+++ b/sched/message_handler.cpp
@@ -34,6 +34,7 @@
 #include "boinc_db.h"
 #include "util.h"
 #include "error_numbers.h"
+#include "str_replace.h"
 #include "str_util.h"
 #include "svn_version.h"
 
diff --git a/sched/put_file.cpp b/sched/put_file.cpp
index 090151beac..1c42a2a40a 100644
--- a/sched/put_file.cpp
+++ b/sched/put_file.cpp
@@ -29,8 +29,9 @@
 
 #include "backend_lib.h"
 #include "md5_file.h"
-#include "svn_version.h"
 #include "filesys.h"
+#include "str_replace.h"
+#include "svn_version.h"
 
 #include "sched_config.h"
 #include "sched_util.h"
diff --git a/sched/sample_work_generator.cpp b/sched/sample_work_generator.cpp
index 93d252b65d..ea3622503d 100644
--- a/sched/sample_work_generator.cpp
+++ b/sched/sample_work_generator.cpp
@@ -44,6 +44,7 @@
 #include "error_numbers.h"
 #include "backend_lib.h"
 #include "parse.h"
+#include "str_replace.h"
 #include "util.h"
 #include "svn_version.h"
 
diff --git a/sched/sched_driver.cpp b/sched/sched_driver.cpp
index cf615cf398..e999a01ccd 100644
--- a/sched/sched_driver.cpp
+++ b/sched/sched_driver.cpp
@@ -46,6 +46,7 @@
 #include <cstring>
 
 #include "util.h"
+#include "str_replace.h"
 #include "str_util.h"
 #include "svn_version.h"
 
diff --git a/sched/single_job_assimilator.cpp b/sched/single_job_assimilator.cpp
index cdd23ec9f9..33a86b3fb4 100644
--- a/sched/single_job_assimilator.cpp
+++ b/sched/single_job_assimilator.cpp
@@ -29,6 +29,8 @@
 #include "boinc_db.h"
 #include "error_numbers.h"
 #include "filesys.h"
+#include "str_replace.h"
+
 #include "sched_msgs.h"
 #include "validate_util.h"
 #include "sched_config.h"
diff --git a/sched/trickle_echo.cpp b/sched/trickle_echo.cpp
index 7bd4246482..fc48a35833 100644
--- a/sched/trickle_echo.cpp
+++ b/sched/trickle_echo.cpp
@@ -27,6 +27,7 @@
 // user.lookup_id(host.userid);
 
 #include "error_numbers.h"
+#include "str_replace.h"
 
 #include "trickle_handler.h"
 
diff --git a/sched/trickle_handler.cpp b/sched/trickle_handler.cpp
index bc6bdb0d5b..c365e483ef 100644
--- a/sched/trickle_handler.cpp
+++ b/sched/trickle_handler.cpp
@@ -35,6 +35,7 @@
 #include "boinc_db.h"
 #include "util.h"
 #include "error_numbers.h"
+#include "str_replace.h"
 #include "str_util.h"
 #include "svn_version.h"
 
diff --git a/sched/validate_util.cpp b/sched/validate_util.cpp
index d1a1249560..1794f05353 100644
--- a/sched/validate_util.cpp
+++ b/sched/validate_util.cpp
@@ -24,9 +24,10 @@
 #include "config.h"
 
 #include "error_numbers.h"
-#include "parse.h"
-#include "util.h"
 #include "filesys.h"
+#include "parse.h"
+#include "str_replace.h"
+#include "util.h"
 
 #include "sched_util.h"
 #include "sched_config.h"
diff --git a/sched/validator.cpp b/sched/validator.cpp
index cdab11d900..1887d8e85d 100644
--- a/sched/validator.cpp
+++ b/sched/validator.cpp
@@ -56,6 +56,7 @@
 
 #include "boinc_db.h"
 #include "util.h"
+#include "str_replace.h"
 #include "str_util.h"
 #include "error_numbers.h"
 #include "svn_version.h"
diff --git a/tools/create_work.cpp b/tools/create_work.cpp
index aaab8af4d8..4e27bdf297 100644
--- a/tools/create_work.cpp
+++ b/tools/create_work.cpp
@@ -35,6 +35,7 @@
 #include "common_defs.h"
 #include "crypt.h"
 #include "sched_config.h"
+#include "str_replace.h"
 #include "util.h"
 
 void usage() {
diff --git a/tools/process_input_template.cpp b/tools/process_input_template.cpp
index b102cbe4be..92efac98ec 100644
--- a/tools/process_input_template.cpp
+++ b/tools/process_input_template.cpp
@@ -23,6 +23,7 @@
 
 #include "filesys.h"
 #include "md5_file.h"
+#include "str_replace.h"
 
 #include "sched_config.h"
 #include "sched_util.h"
diff --git a/tools/project.xml b/tools/project.xml
index 2a82185d1d..5cd874b731 100644
--- a/tools/project.xml
+++ b/tools/project.xml
@@ -43,6 +43,10 @@
         <name>powerpc64-ps3-linux-gnu</name>
         <user_friendly_name>Sony Playstation 3 running Linux</user_friendly_name>
     </platform>
+    <platform>
+        <name>arm-android-linux-gnu</name>
+        <user_friendly_name>Android running on ARM</user_friendly_name>
+    </platform>
     <platform>
         <name>anonymous</name>
         <user_friendly_name>anonymous</user_friendly_name>
diff --git a/vda/stats.cpp b/vda/stats.cpp
index c78b850b78..831f7a3201 100644
--- a/vda/stats.cpp
+++ b/vda/stats.cpp
@@ -19,6 +19,8 @@
 #include <stdio.h>
 #include <limits.h>
 
+#include "str_replace.h"
+
 #include "vda_lib.h"
 #include "stats.h"
 
diff --git a/vda/vda.cpp b/vda/vda.cpp
index 310b4a090d..4db7017c85 100644
--- a/vda/vda.cpp
+++ b/vda/vda.cpp
@@ -28,6 +28,7 @@
 #include "filesys.h"
 #include "sched_config.h"
 #include "sched_util.h"
+#include "str_replace.h"
 #include "util.h"
 
 #include "vda_lib.h"
diff --git a/vda/vda_lib2.cpp b/vda/vda_lib2.cpp
index 3e4e894001..8156b9400c 100644
--- a/vda/vda_lib2.cpp
+++ b/vda/vda_lib2.cpp
@@ -28,6 +28,8 @@
 #include "error_numbers.h"
 #include "filesys.h"
 #include "md5_file.h"
+#include "str_replace.h"
+
 #include "sched_config.h"
 #include "sched_msgs.h"
 #include "sched_util.h"