diff --git a/checkin_notes b/checkin_notes
index d70aba5854..45f4baa473 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -5809,3 +5809,10 @@ Bruce 10 June 2006
         validate_util2.C
         file_deleter.C
 
+David
+    - tweaks
+
+    sched/
+        make_work.C
+        validate_util.C,h
+        validate_util2.C
diff --git a/sched/make_work.C b/sched/make_work.C
index 677aedead9..7afdef297a 100644
--- a/sched/make_work.C
+++ b/sched/make_work.C
@@ -295,7 +295,6 @@ int main(int argc, char** argv) {
         } else if (!strcmp(argv[i], "-d")) {
             log_messages.set_debug_level(atoi(argv[++i]));
         } else if (!strcmp(argv[i], "-wu_name")) {
-            char wu_name[256];
             wu_names.push_back(string(argv[++i]));
         } else if (!strcmp(argv[i], "-max_wus")) {
             max_wus = atoi(argv[++i]);
diff --git a/sched/validate_util.C b/sched/validate_util.C
index d449d17551..9171dc18a4 100644
--- a/sched/validate_util.C
+++ b/sched/validate_util.C
@@ -32,13 +32,12 @@
 #include "sched_util.h"
 #include "sched_config.h"
 #include "sched_msgs.h"
+#include "validator.h"
 #include "validate_util.h"
 
 using std::vector;
 using std::string;
 
-extern SCHED_CONFIG config;
-
 // get the name of a result's (first) output file
 //
 int get_output_file_path(RESULT const& result, string& path_str) {
diff --git a/sched/validate_util.h b/sched/validate_util.h
index f63617fb92..15540569d8 100644
--- a/sched/validate_util.h
+++ b/sched/validate_util.h
@@ -20,10 +20,11 @@
 #ifndef H_VALIDATE_UTIL
 #define H_VALIDATE_UTIL
 
-#include "boinc_db.h"
 #include <vector>
 #include <string>
 
+#include "boinc_db.h"
+
 extern int get_output_file_path(RESULT const& result, std::string& path);
 extern double median_mean_credit(std::vector<RESULT>& results);
 
diff --git a/sched/validate_util2.C b/sched/validate_util2.C
index 7d3db2bd9d..f611e55972 100644
--- a/sched/validate_util2.C
+++ b/sched/validate_util2.C
@@ -30,13 +30,12 @@
 #include "sched_config.h"
 #include "sched_msgs.h"
 
+#include "validator.h"
 #include "validate_util.h"
 #include "validate_util2.h"
 
 using std::vector;
 
-extern SCHED_CONFIG config;
-
 int check_set(
     vector<RESULT>& results, WORKUNIT& wu, int& canonicalid, double& credit,
     bool& retry