diff --git a/sched/Makefile.am b/sched/Makefile.am
index 492ce61efb..8e8241632a 100644
--- a/sched/Makefile.am
+++ b/sched/Makefile.am
@@ -128,7 +128,7 @@ noinst_HEADERS = \
     sched_send.h \
     sched_shmem.h \
     sched_version.h \
-    server_types.h
+    sched_types.h
 
 EXTRA_DIST = \
     start
@@ -151,7 +151,7 @@ cgi_sources = \
     sched_send.cpp \
     sched_timezone.cpp \
     sched_version.cpp \
-    server_types.cpp \
+    sched_types.cpp \
     time_stats_log.cpp
 
 cgi_SOURCES = $(cgi_sources)
diff --git a/sched/handle_request.h b/sched/handle_request.h
index 5c946afa57..11553b6f58 100644
--- a/sched/handle_request.h
+++ b/sched/handle_request.h
@@ -17,9 +17,6 @@
 
 #include <cstdio>
 
-#include "sched_shmem.h"
-#include "server_types.h"
-
 extern void handle_request(
     FILE* fin, FILE* fout, char* code_sign_key
 );
diff --git a/sched/sched_customize.h b/sched/sched_customize.h
index 0d4d539149..70245e9962 100644
--- a/sched/sched_customize.h
+++ b/sched/sched_customize.h
@@ -16,7 +16,7 @@
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "boinc_db.h"
-#include "server_types.h"
+#include "sched_types.h"
 
 // reasons for the planning function to reject a host
 
diff --git a/sched/sched_main.h b/sched/sched_main.h
index 969c4baa98..66dd158c76 100644
--- a/sched/sched_main.h
+++ b/sched/sched_main.h
@@ -18,7 +18,7 @@
 #include "boinc_db.h"
 #include "sched_config.h"
 #include "synch.h"
-#include "server_types.h"
+#include "sched_types.h"
 #include "sched_shmem.h"
 
 // various delay params.
diff --git a/sched/sched_send.h b/sched/sched_send.h
index 5c87aa5bd1..8d0a7c0abf 100644
--- a/sched/sched_send.h
+++ b/sched/sched_send.h
@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include "boinc_db.h"
-#include "server_types.h"
+#include "sched_types.h"
 
 extern void send_work();
 
diff --git a/sched/server_types.cpp b/sched/sched_types.cpp
similarity index 99%
rename from sched/server_types.cpp
rename to sched/sched_types.cpp
index 09a811b6c2..460a3bf631 100644
--- a/sched/server_types.cpp
+++ b/sched/sched_types.cpp
@@ -26,11 +26,12 @@
 #include "error_numbers.h"
 #include "str_util.h"
 #include "util.h"
+
 #include "sched_main.h"
 #include "sched_util.h"
 #include "sched_msgs.h"
 #include "time_stats_log.h"
-#include "server_types.h"
+#include "sched_types.h"
 
 #ifdef _USING_FCGI_
 #include "boinc_fcgi.h"
diff --git a/sched/server_types.h b/sched/sched_types.h
similarity index 100%
rename from sched/server_types.h
rename to sched/sched_types.h
diff --git a/sched/time_stats_log.cpp b/sched/time_stats_log.cpp
index e54257d50f..cebbb3a9a7 100644
--- a/sched/time_stats_log.cpp
+++ b/sched/time_stats_log.cpp
@@ -23,6 +23,7 @@
 
 #include "sched_msgs.h"
 #include "sched_config.h"
+#include "sched_types.h"
 
 #include "time_stats_log.h"
 
diff --git a/sched/time_stats_log.h b/sched/time_stats_log.h
index 6292962d43..6e6f0e7a28 100644
--- a/sched/time_stats_log.h
+++ b/sched/time_stats_log.h
@@ -16,7 +16,6 @@
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cstdio>
-#include "server_types.h"
 
 extern void handle_time_stats_log(FILE* fin);
 extern void write_time_stats_log();