diff --git a/checkin_notes b/checkin_notes
index 725e36f1ac..c2f96ceeb3 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -4039,9 +4039,11 @@ David  Apr 3 2003
 David  Apr 7 2003
     - changed names of DB interface routines to get rid of conflict
         with SETI@home DB interface
+    - changed name of "db.h" to "boinc_db.h" to remove conflict w/ SETI@home
 
     db/
-        db.h
+        db.h (removed)
+        boinc_db.h (new)
         db_mysql.C
     sched/
         *.C
diff --git a/db/db.h b/db/boinc_db.h
old mode 100644
new mode 100755
similarity index 100%
rename from db/db.h
rename to db/boinc_db.h
diff --git a/db/db_mysql.C b/db/db_mysql.C
index f273e5adeb..11e744b1b6 100644
--- a/db/db_mysql.C
+++ b/db/db_mysql.C
@@ -23,7 +23,7 @@
 
 #include "mysql_util.h"
 
-#include "db.h"
+#include "boinc_db.h"
 
 #define TYPE_PROJECT            1
 #define TYPE_PLATFORM           2
diff --git a/sched/assimilate_handler.C b/sched/assimilate_handler.C
index c14e2fda89..74977bf332 100644
--- a/sched/assimilate_handler.C
+++ b/sched/assimilate_handler.C
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-#include "db.h"
+#include "boinc_db.h"
 #include "assimilate_handler.h"
 
 void assimilate_handler(
diff --git a/sched/assimilate_handler.h b/sched/assimilate_handler.h
index f969d96ee9..262e834356 100644
--- a/sched/assimilate_handler.h
+++ b/sched/assimilate_handler.h
@@ -1,5 +1,5 @@
 #include <vector>
-#include "db.h"
+#include "boinc_db.h"
 using namespace std;
 
 extern void assimilate_handler(WORKUNIT&, vector<RESULT>&, RESULT&);
diff --git a/sched/assimilator.C b/sched/assimilator.C
index d9f492fcb9..b812e7acf6 100644
--- a/sched/assimilator.C
+++ b/sched/assimilator.C
@@ -23,7 +23,7 @@
 #include <time.h>
 #include <vector>
 
-#include "db.h"
+#include "boinc_db.h"
 #include "parse.h"
 #include "util.h"
 #include "config.h"
diff --git a/sched/db_dump.C b/sched/db_dump.C
index 6626de6041..258495bbb4 100644
--- a/sched/db_dump.C
+++ b/sched/db_dump.C
@@ -58,7 +58,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "db.h"
+#include "boinc_db.h"
 #include "util.h"
 #include "config.h"
 #include "sched_util.h"
diff --git a/sched/feeder.C b/sched/feeder.C
index 8c4fb5fa0f..d9cb18acf4 100644
--- a/sched/feeder.C
+++ b/sched/feeder.C
@@ -52,7 +52,7 @@
 #include <unistd.h>
 #endif
 
-#include "db.h"
+#include "boinc_db.h"
 #include "shmem.h"
 #include "util.h"
 #include "config.h"
diff --git a/sched/file_deleter.C b/sched/file_deleter.C
index 6bd20e0f1b..5f027fe414 100644
--- a/sched/file_deleter.C
+++ b/sched/file_deleter.C
@@ -25,7 +25,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "db.h"
+#include "boinc_db.h"
 #include "parse.h"
 #include "util.h"
 #include "config.h"
diff --git a/sched/handle_request.C b/sched/handle_request.C
index 841feb3c21..d3f64561bc 100644
--- a/sched/handle_request.C
+++ b/sched/handle_request.C
@@ -31,7 +31,7 @@ using namespace std;
 #include <assert.h>
 #include <math.h>
 
-#include "db.h"
+#include "boinc_db.h"
 #include "backend_lib.h"
 #include "parse.h"
 #include "util.h"
diff --git a/sched/main.C b/sched/main.C
index fa04773e8d..5c8c3cc06a 100644
--- a/sched/main.C
+++ b/sched/main.C
@@ -30,7 +30,7 @@ using namespace std;
 #include <unistd.h>
 #include <assert.h>
 
-#include "db.h"
+#include "boinc_db.h"
 #include "parse.h"
 #include "shmem.h"
 #include "util.h"
diff --git a/sched/main.h b/sched/main.h
index b570fcbe22..2559d840d5 100644
--- a/sched/main.h
+++ b/sched/main.h
@@ -17,7 +17,7 @@
 // Contributor(s):
 //
 
-#include "db.h"
+#include "boinc_db.h"
 #include "config.h"
 
 extern PROJECT gproject;
diff --git a/sched/make_work.C b/sched/make_work.C
index c44ebf429f..07f8810477 100644
--- a/sched/make_work.C
+++ b/sched/make_work.C
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <time.h>
 
-#include "db.h"
+#include "boinc_db.h"
 #include "crypt.h"
 #include "util.h"
 #include "backend_lib.h"
diff --git a/sched/sched_shmem.C b/sched/sched_shmem.C
index 940c8aa97f..c32f42d612 100644
--- a/sched/sched_shmem.C
+++ b/sched/sched_shmem.C
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "db.h"
+#include "boinc_db.h"
 
 #include "sched_shmem.h"
 
diff --git a/sched/sched_shmem.h b/sched/sched_shmem.h
index 708750666a..f73e71ef41 100644
--- a/sched/sched_shmem.h
+++ b/sched/sched_shmem.h
@@ -17,7 +17,7 @@
 // Contributor(s):
 //
 
-#include "db.h"
+#include "boinc_db.h"
 
 // the following must be at least as large as DB tables
 // Increase as needed
diff --git a/sched/server_types.h b/sched/server_types.h
index 433185849c..29b49e7d2a 100644
--- a/sched/server_types.h
+++ b/sched/server_types.h
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <vector>
 
-#include "db.h"
+#include "boinc_db.h"
 
 //The following are the states that the client is in according to the result. 
 #define RESULT_NEW              0
diff --git a/sched/timeout_check.C b/sched/timeout_check.C
index a2faf91349..58d946e301 100644
--- a/sched/timeout_check.C
+++ b/sched/timeout_check.C
@@ -35,7 +35,7 @@ using namespace std;
 #include <unistd.h>
 #include <sys/time.h>
 
-#include "db.h"
+#include "boinc_db.h"
 #include "util.h"
 #include "backend_lib.h"
 #include "config.h"
diff --git a/sched/update_stats.C b/sched/update_stats.C
index af32a3aef1..01eacd6da4 100644
--- a/sched/update_stats.C
+++ b/sched/update_stats.C
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "db.h"
+#include "boinc_db.h"
 #include "util.h"
 #include "config.h"
 #include "sched_util.h"
diff --git a/sched/validate.C b/sched/validate.C
index 53253b5e3c..7e561b1359 100644
--- a/sched/validate.C
+++ b/sched/validate.C
@@ -45,7 +45,7 @@ using namespace std;
 #include <math.h>
 #include <vector>
 
-#include "db.h"
+#include "boinc_db.h"
 #include "util.h"
 #include "config.h"
 #include "sched_util.h"
diff --git a/sched/validate_test.C b/sched/validate_test.C
index 884d6d3cab..176b940c0b 100644
--- a/sched/validate_test.C
+++ b/sched/validate_test.C
@@ -20,7 +20,7 @@
 using namespace std;
 #include <vector>
 
-#include "db.h"
+#include "boinc_db.h"
 #include "config.h"
 #include "parse.h"
 
diff --git a/tools/add.C b/tools/add.C
index 97b67daa1b..d91266d14d 100644
--- a/tools/add.C
+++ b/tools/add.C
@@ -42,7 +42,7 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include "db.h"
+#include "boinc_db.h"
 #include "backend_lib.h"
 #include "md5_file.h"
 #include "crypt.h"
diff --git a/tools/backend_lib.C b/tools/backend_lib.C
index 04a96169c2..cc4401c86a 100644
--- a/tools/backend_lib.C
+++ b/tools/backend_lib.C
@@ -21,7 +21,7 @@
 #include <time.h>
 #include <assert.h>
 
-#include "db.h"
+#include "boinc_db.h"
 #include "crypt.h"
 #include "md5_file.h"
 #include "parse.h"
diff --git a/tools/create_work.C b/tools/create_work.C
index d5883c8768..70b36cc4db 100644
--- a/tools/create_work.C
+++ b/tools/create_work.C
@@ -49,7 +49,7 @@
 #include <string.h>
 #include <time.h>
 
-#include "db.h"
+#include "boinc_db.h"
 #include "crypt.h"
 #include "backend_lib.h"
 
diff --git a/tools/process_result_template.C b/tools/process_result_template.C
index 37516fd50e..35b2d53e80 100644
--- a/tools/process_result_template.C
+++ b/tools/process_result_template.C
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "db.h"
+#include "boinc_db.h"
 #include "error_numbers.h"
 #include "parse.h"
 #include "crypt.h"