diff --git a/checkin_notes b/checkin_notes
index 78fbdd9d28..2e4b287f96 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -5173,3 +5173,14 @@ Charlie 2 Aug 2012
         make_CharityEngine.sh
         make_GridRepublic.sh
         make_ProgThruProc.sh
+
+David  2 Aug 2012
+    - scheduler: compile fixes for FCGI
+
+    sched/
+        hr_info.cpp
+    html/inc/
+        forum.inc
+    lib/
+        util.cpp
+        filesys.cpp
diff --git a/html/inc/forum.inc b/html/inc/forum.inc
index 78cb281c31..ea60fa0178 100644
--- a/html/inc/forum.inc
+++ b/html/inc/forum.inc
@@ -318,7 +318,7 @@ function show_posts(
     $thread, $forum, $start, $postid, $sort_style, $filter, $logged_in_user
 ) {
     $n = 1;
-    
+
     $num_to_show = 20;
     if ($logged_in_user && $logged_in_user->prefs->display_wrap_postcount > 0) {
         $num_to_show = $logged_in_user->prefs->display_wrap_postcount;
diff --git a/lib/filesys.cpp b/lib/filesys.cpp
index d557d681e3..b153c4174d 100644
--- a/lib/filesys.cpp
+++ b/lib/filesys.cpp
@@ -15,8 +15,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "filesys.h"
-
 #if   defined(_WIN32) && !defined(__STDWX_H__)
 #include "boinc_win.h"
 #elif defined(_WIN32) && defined(__STDWX_H__)
@@ -63,7 +61,7 @@
 #if HAVE_SYS_STATVFS_H
 #include <sys/statvfs.h>
 #define STATFS statvfs
-#elif defined(HAVE_SYS_STATFS_H)
+#elif HAVE_SYS_STATFS_H
 #include <sys/statfs.h>
 #define STATFS statfs
 #else
@@ -75,6 +73,7 @@
 #include "str_util.h"
 #include "str_replace.h"
 #include "error_numbers.h"
+#include "filesys.h"
 
 #ifdef _WIN32
 typedef BOOL (CALLBACK* FreeFn)(LPCSTR, PULARGE_INTEGER, PULARGE_INTEGER, PULARGE_INTEGER);
diff --git a/lib/util.cpp b/lib/util.cpp
index 397177d2c6..b2a531a51d 100644
--- a/lib/util.cpp
+++ b/lib/util.cpp
@@ -15,6 +15,10 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
+#ifdef _USING_FCGI_
+#include "boinc_fcgi.h"
+#endif
+
 #include "util.h"
 
 #if   defined(_WIN32) && !defined(__STDWX_H__)
@@ -55,11 +59,6 @@ extern "C" {
 #endif
 #endif
 
-#ifdef _USING_FCGI_
-#include "boinc_fcgi.h"
-#define perror FCGI::perror
-#endif
-
 #include "error_numbers.h"
 #include "common_defs.h"
 #include "filesys.h"
@@ -439,7 +438,11 @@ int run_program(
             if (retval) return retval;
         }
         execv(file, argv);
+#ifdef _USING_FCGI_
+        FCGI::perror("execv");
+#else
         perror("execv");
+#endif
         exit(errno);
     }
 
diff --git a/sched/hr_info.cpp b/sched/hr_info.cpp
index 8c27cebafb..480702f3a6 100644
--- a/sched/hr_info.cpp
+++ b/sched/hr_info.cpp
@@ -14,6 +14,9 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "hr_info.h"
+
 #ifndef _USING_FCGI_
 #include <cstdio>
 #else
@@ -27,8 +30,6 @@
 #include "error_numbers.h"
 #include "sched_msgs.h"
 
-#include "hr_info.h"
-
 int HR_INFO::write_file() {
     int i, j;