diff --git a/checkin_notes b/checkin_notes
index 5ef49623db..d7afd934ae 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -4759,3 +4759,11 @@ Rom    9 June 2008
     lib/
         diagnostics.C
         diagnostics_win.C
+
+David  10 June 2008
+    - web: change order of includes
+
+    html/inc/
+        util.inc
+    sched/
+        sched_shmem.C
diff --git a/html/inc/util.inc b/html/inc/util.inc
index 6451f0f1c9..0728531317 100644
--- a/html/inc/util.inc
+++ b/html/inc/util.inc
@@ -1,5 +1,6 @@
 <?php
 
+require_once("../inc/util_basic.inc");
 require_once("../project/project.inc");
 require_once("../inc/countries.inc");
 require_once("../inc/db.inc");
@@ -7,7 +8,6 @@ require_once("../inc/boinc_db.inc");
 require_once("../inc/translation.inc");
 require_once("../inc/forum.inc");
 require_once("../inc/profile.inc");
-require_once("../inc/util_basic.inc");
 
 ini_set("memory_limit", "64M");
 date_default_timezone_set("UTC");
diff --git a/sched/sched_shmem.C b/sched/sched_shmem.C
index 14ef97a899..a46a7684b5 100644
--- a/sched/sched_shmem.C
+++ b/sched/sched_shmem.C
@@ -185,12 +185,9 @@ APP* SCHED_SHMEM::lookup_app(int id) {
 
 // find an app version for a given platform
 //
-APP_VERSION* SCHED_SHMEM::lookup_app_version(
-    int appid, int platformid
-) {
-    int i;
+APP_VERSION* SCHED_SHMEM::lookup_app_version(int appid, int platformid) {
     APP_VERSION* avp;
-    for (i=0; i<napp_versions; i++) {
+    for (int i=0; i<napp_versions; i++) {
         avp = &app_versions[i];
         if (avp->appid == appid && avp->platformid == platformid) {
             return avp;
@@ -206,10 +203,8 @@ APP_VERSION* SCHED_SHMEM::lookup_app_version(
 // of servers try to get a single work item)
 //
 bool SCHED_SHMEM::no_work(int pid) {
-    int i;
-
     if (!ready) return true;
-    for (i=0; i<max_wu_results; i++) {
+    for (int i=0; i<max_wu_results; i++) {
         if (wu_results[i].state == WR_STATE_PRESENT) {
             wu_results[i].state = pid;
             return false;
@@ -219,9 +214,7 @@ bool SCHED_SHMEM::no_work(int pid) {
 }
 
 void SCHED_SHMEM::restore_work(int pid) {
-    int i;
-
-    for (i=0; i<max_wu_results; i++) {
+    for (int i=0; i<max_wu_results; i++) {
         if (wu_results[i].state == pid) {
             wu_results[i].state = WR_STATE_PRESENT;
             return;