diff --git a/client/app.C b/client/app.C
index eb2822d24d..ac31720699 100644
--- a/client/app.C
+++ b/client/app.C
@@ -331,7 +331,7 @@ int ACTIVE_TASK::start(bool first_time) {
             0,
             NULL
         );
-	fprintf(stdout, "CreateProcess: %s\n", (LPCTSTR)lpMsgBuf);
+        fprintf(stdout, "CreateProcess: %s\n", (LPCTSTR)lpMsgBuf);
     }
     pid_handle = process_info.hProcess;
 
diff --git a/client/client_state.C b/client/client_state.C
index 528fef2a5d..e5dd992ddf 100644
--- a/client/client_state.C
+++ b/client/client_state.C
@@ -837,3 +837,7 @@ bool CLIENT_STATE::time_to_exit() {
     }
     return false;
 }
+
+void CLIENT_STATE::set_client_state_dirty() {
+    client_state_dirty = true;
+}
diff --git a/client/client_state.h b/client/client_state.h
index 99238739f1..b9b423cdda 100644
--- a/client/client_state.h
+++ b/client/client_state.h
@@ -51,7 +51,6 @@ public:
     void update_net_stats(bool is_upload, double nbytes, double nsecs);
     int insert_file_xfer( FILE_XFER *fxp );
     unsigned int giveup_after;
-    bool client_state_dirty;
 
     vector<PROJECT*> projects;
     vector<APP*> apps;
@@ -68,6 +67,7 @@ public:
     HOST_INFO host_info;
     PREFS* prefs;
 private:
+    bool client_state_dirty;
     TIME_STATS time_stats;
     NET_STATS net_stats;
     int version;
@@ -114,6 +114,7 @@ public:
     double work_needed_secs();
     int make_scheduler_request(PROJECT*, double);
     void handle_scheduler_reply(PROJECT*, char* scheduler_url);
+    void set_client_state_dirty();
 private:
     PROJECT* find_project_with_overdue_results();
     bool some_project_rpc_ok();
diff --git a/client/cs_apps.C b/client/cs_apps.C
index c078a3c15a..9016cf9542 100644
--- a/client/cs_apps.C
+++ b/client/cs_apps.C
@@ -73,7 +73,7 @@ bool CLIENT_STATE::handle_running_apps() {
             app_finished(*atp);
             active_tasks.remove(atp);
             delete atp;
-            client_state_dirty = true;
+            set_client_state_dirty();
             action = true;
         }
     }
@@ -132,7 +132,7 @@ bool CLIENT_STATE::start_apps() {
             atp->init(rp);
             active_tasks.insert(atp);
             action = true;
-            client_state_dirty = true;
+            set_client_state_dirty();
 	    app_started = time(0);
         }
     }
diff --git a/client/cs_scheduler.C b/client/cs_scheduler.C
index 6b30971524..3f3fb22643 100644
--- a/client/cs_scheduler.C
+++ b/client/cs_scheduler.C
@@ -361,7 +361,7 @@ bool CLIENT_STATE::get_work() {
                     break;
                 } else {
                     handle_scheduler_reply(*scheduler_op);
-                    client_state_dirty = true;
+                    set_client_state_dirty();
                 }
             }
             break;
diff --git a/client/pers_file_xfer.C b/client/pers_file_xfer.C
index bfe6e8ed28..ce536fcc5e 100644
--- a/client/pers_file_xfer.C
+++ b/client/pers_file_xfer.C
@@ -258,7 +258,7 @@ bool PERS_FILE_XFER_SET::poll() {
         action |= pers_file_xfers[i]->poll(now);
     }
 
-    if (action) gstate.client_state_dirty = true;
+    if (action) gstate.set_client_state_dirty();
 
     return action;
 }