diff --git a/client/sysmon_win.cpp b/client/sysmon_win.cpp
index 1e6e12e7da..61664cb069 100644
--- a/client/sysmon_win.cpp
+++ b/client/sysmon_win.cpp
@@ -18,12 +18,13 @@
#include "boinc_win.h"
#include "diagnostics.h"
#include "error_numbers.h"
-#include "str_util.h"
+#include "url.h"
#include "util.h"
#include "win_util.h"
#include "prefs.h"
#include "filesys.h"
#include "network.h"
+
#include "client_state.h"
#include "log_flags.h"
#include "client_msgs.h"
diff --git a/clientgui/ProjectInfoPage.cpp b/clientgui/ProjectInfoPage.cpp
index 6e7e26e424..4e957c7608 100644
--- a/clientgui/ProjectInfoPage.cpp
+++ b/clientgui/ProjectInfoPage.cpp
@@ -25,8 +25,9 @@
#include "mfile.h"
#include "miofile.h"
#include "parse.h"
-#include "str_util.h"
+#include "url.h"
#include "error_numbers.h"
+
#include "wizardex.h"
#include "error_numbers.h"
#include "BOINCGUIApp.h"
diff --git a/clientgui/ValidateURL.cpp b/clientgui/ValidateURL.cpp
index ecb32770bc..683038db0c 100644
--- a/clientgui/ValidateURL.cpp
+++ b/clientgui/ValidateURL.cpp
@@ -22,7 +22,7 @@
#include "stdwx.h"
#include "ValidateURL.h"
#include "BOINCGUIApp.h"
-#include "str_util.h"
+#include "url.h"
IMPLEMENT_DYNAMIC_CLASS(CValidateURL, wxValidator)
diff --git a/win_build/boincmgr.vcproj b/win_build/boincmgr.vcproj
index 737bc764b4..613b59fb60 100644
--- a/win_build/boincmgr.vcproj
+++ b/win_build/boincmgr.vcproj
@@ -1375,6 +1375,10 @@
RelativePath="..\lib\str_util.h"
>
+
+
diff --git a/win_build/libboinc.vcproj b/win_build/libboinc.vcproj
index 1f1429e46a..bd97d1da1c 100644
--- a/win_build/libboinc.vcproj
+++ b/win_build/libboinc.vcproj
@@ -718,6 +718,10 @@
RelativePath="..\lib\str_util.h"
>
+
+
@@ -1362,6 +1366,10 @@
RelativePath="..\lib\str_util.cpp"
>
+
+
diff --git a/win_build/libboinc_staticcrt.vcproj b/win_build/libboinc_staticcrt.vcproj
index f0532b0ff3..3c6b90bd4f 100644
--- a/win_build/libboinc_staticcrt.vcproj
+++ b/win_build/libboinc_staticcrt.vcproj
@@ -1226,6 +1226,10 @@
RelativePath="..\lib\str_util.cpp"
>
+
+