diff --git a/api/Makefile.am b/api/Makefile.am
index 05cbc955c0..55b314ca75 100644
--- a/api/Makefile.am
+++ b/api/Makefile.am
@@ -8,23 +8,23 @@ AM_LDFLAGS = @GLUT_LIBS@
 
 # stuff linked into both main app and graphics app
 api_files= \
-	boinc_api.C \
-	reduce_main.C \
-    graphics2_util.C
+	boinc_api.cpp \
+	reduce_main.cpp \
+    graphics2_util.cpp
 
 # stuff linked into graphics app
 graphics2_files = \
-	gutil.C	            \
-	gutil_text.C	    \
-	reduce_lib.C		\
-    texfont.C           \
-    texture.C           \
-    txf_util.C          \
-    graphics2.C \
-    graphics2_unix.C
+	gutil.cpp	            \
+	gutil_text.cpp	    \
+	reduce_lib.cpp		\
+    texfont.cpp           \
+    texture.cpp           \
+    txf_util.cpp          \
+    graphics2.cpp \
+    graphics2_unix.cpp
 
 if OS_DARWIN
-    graphics2_files += mac_icon.C
+    graphics2_files += mac_icon.cpp
     graphics2_files += macglutfix.m
 endif
 
@@ -55,6 +55,6 @@ pkginclude_HEADERS = 	\
 
 EXTRA_PROGRAMS = api_app api_test
 
-api_app_SOURCES = api_app.C boinc_api.C ../lib/parse.C
-api_test_SOURCES = boinc_api.C api_test.C ../lib/parse.C
+api_app_SOURCES = api_app.cpp boinc_api.cpp ../lib/parse.cpp
+api_test_SOURCES = boinc_api.cpp api_test.cpp ../lib/parse.cpp
 
diff --git a/api/Makefile.mingw b/api/Makefile.mingw
index 3440e6710a..954f7b482a 100644
--- a/api/Makefile.mingw
+++ b/api/Makefile.mingw
@@ -23,10 +23,10 @@ $(BIN): $(LINKOBJ)
 	$(AR) rc $@ $(LINKOBJ)
 	ranlib $@
 
-%.o: $(BOINCDIR)/api/%.C
+%.o: $(BOINCDIR)/api/%.cpp
 	$(CXX) -c $< -o $@ $(CXXFLAGS)
 
-%.o: $(BOINCDIR)/lib/%.C
+%.o: $(BOINCDIR)/lib/%.cpp
 	$(CXX) -c $< -o $@ $(CXXFLAGS)
 
 md5.o: $(BOINCDIR)/lib/md5.c
diff --git a/api/bmplib.C b/api/bmplib.cpp
similarity index 100%
rename from api/bmplib.C
rename to api/bmplib.cpp
diff --git a/api/boinc_api.C b/api/boinc_api.cpp
similarity index 100%
rename from api/boinc_api.C
rename to api/boinc_api.cpp
diff --git a/api/boinc_api_fortran.C b/api/boinc_api_fortran.cpp
similarity index 100%
rename from api/boinc_api_fortran.C
rename to api/boinc_api_fortran.cpp
diff --git a/api/graphics2.C b/api/graphics2.cpp
similarity index 100%
rename from api/graphics2.C
rename to api/graphics2.cpp
diff --git a/api/graphics2_unix.C b/api/graphics2_unix.cpp
similarity index 100%
rename from api/graphics2_unix.C
rename to api/graphics2_unix.cpp
diff --git a/api/graphics2_util.C b/api/graphics2_util.cpp
similarity index 100%
rename from api/graphics2_util.C
rename to api/graphics2_util.cpp
diff --git a/api/graphics2_win.C b/api/graphics2_win.cpp
similarity index 100%
rename from api/graphics2_win.C
rename to api/graphics2_win.cpp
diff --git a/api/graphics_api.C b/api/graphics_api.cpp
similarity index 100%
rename from api/graphics_api.C
rename to api/graphics_api.cpp
diff --git a/api/graphics_data.C b/api/graphics_data.cpp
similarity index 100%
rename from api/graphics_data.C
rename to api/graphics_data.cpp
diff --git a/api/graphics_impl.C b/api/graphics_impl.cpp
similarity index 100%
rename from api/graphics_impl.C
rename to api/graphics_impl.cpp
diff --git a/api/graphics_impl_lib.C b/api/graphics_impl_lib.cpp
similarity index 100%
rename from api/graphics_impl_lib.C
rename to api/graphics_impl_lib.cpp
diff --git a/api/graphics_lib.C b/api/graphics_lib.cpp
similarity index 100%
rename from api/graphics_lib.C
rename to api/graphics_lib.cpp
diff --git a/api/gutil.C b/api/gutil.cpp
similarity index 100%
rename from api/gutil.C
rename to api/gutil.cpp
diff --git a/api/gutil_text.C b/api/gutil_text.cpp
similarity index 100%
rename from api/gutil_text.C
rename to api/gutil_text.cpp
diff --git a/api/mac_icon.C b/api/mac_icon.cpp
similarity index 100%
rename from api/mac_icon.C
rename to api/mac_icon.cpp
diff --git a/api/make_app_icon_h.C b/api/make_app_icon_h.cpp
similarity index 100%
rename from api/make_app_icon_h.C
rename to api/make_app_icon_h.cpp
diff --git a/api/reduce_lib.C b/api/reduce_lib.cpp
similarity index 100%
rename from api/reduce_lib.C
rename to api/reduce_lib.cpp
diff --git a/api/reduce_main.C b/api/reduce_main.cpp
similarity index 100%
rename from api/reduce_main.C
rename to api/reduce_main.cpp
diff --git a/api/static_graphics.C b/api/static_graphics.cpp
similarity index 100%
rename from api/static_graphics.C
rename to api/static_graphics.cpp
diff --git a/api/texfont.C b/api/texfont.cpp
similarity index 100%
rename from api/texfont.C
rename to api/texfont.cpp
diff --git a/api/texture.C b/api/texture.cpp
similarity index 100%
rename from api/texture.C
rename to api/texture.cpp
diff --git a/api/tgalib.C b/api/tgalib.cpp
similarity index 100%
rename from api/tgalib.C
rename to api/tgalib.cpp
diff --git a/api/txf_util.C b/api/txf_util.cpp
similarity index 100%
rename from api/txf_util.C
rename to api/txf_util.cpp
diff --git a/api/windows_opengl.C b/api/windows_opengl.cpp
similarity index 100%
rename from api/windows_opengl.C
rename to api/windows_opengl.cpp
diff --git a/api/x_opengl.C b/api/x_opengl.cpp
similarity index 100%
rename from api/x_opengl.C
rename to api/x_opengl.cpp
diff --git a/checkin_notes b/checkin_notes
index 5a6df3ae56..f302522857 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -7777,3 +7777,6 @@ David  25 Sept 2008
     lib/
         gui_rpc_client_print.C
         boinc_cmd.C
+
+David  25 Sept 2008
+    - rename .C files to .cpp so that Doxygen will work
diff --git a/client/Makefile.am b/client/Makefile.am
index fdd335bedf..e152e51c5e 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -18,47 +18,47 @@ endif
 bin_PROGRAMS = boinc_client switcher
 
 boinc_client_SOURCES = \
-    acct_mgr.C \
-    acct_setup.C \
-    app.C \
-    app_control.C \
-    app_graphics.C \
-    app_start.C \
-    auto_update.C \
-    check_state.C \
-    client_msgs.C \
-    client_state.C \
-    client_types.C \
-    cpu_sched.C \
-    cs_account.C \
-    cs_apps.C \
-    cs_benchmark.C \
-    cs_cmdline.C \
-    cs_files.C \
-    cs_platforms.C \
-    cs_prefs.C \
-    cs_scheduler.C \
-    cs_statefile.C \
-    cs_trickle.C \
-    dhrystone.C \
-    dhrystone2.C \
-    file_names.C \
-    file_xfer.C \
-    gui_http.C \
-    gui_rpc_server.C \
-    gui_rpc_server_ops.C \
-    hostinfo_network.C \
-    hostinfo_unix.C \
-    http_curl.C \
-    log_flags.C \
-    main.C \
-    net_stats.C \
-    pers_file_xfer.C \
-    sandbox.C \
-    scheduler_op.C \
-    time_stats.C \
-    whetstone.C \
-    work_fetch.C
+    acct_mgr.cpp \
+    acct_setup.cpp \
+    app.cpp \
+    app_control.cpp \
+    app_graphics.cpp \
+    app_start.cpp \
+    auto_update.cpp \
+    check_state.cpp \
+    client_msgs.cpp \
+    client_state.cpp \
+    client_types.cpp \
+    cpu_sched.cpp \
+    cs_account.cpp \
+    cs_apps.cpp \
+    cs_benchmark.cpp \
+    cs_cmdline.cpp \
+    cs_files.cpp \
+    cs_platforms.cpp \
+    cs_prefs.cpp \
+    cs_scheduler.cpp \
+    cs_statefile.cpp \
+    cs_trickle.cpp \
+    dhrystone.cpp \
+    dhrystone2.cpp \
+    file_names.cpp \
+    file_xfer.cpp \
+    gui_http.cpp \
+    gui_rpc_server.cpp \
+    gui_rpc_server_ops.cpp \
+    hostinfo_network.cpp \
+    hostinfo_unix.cpp \
+    http_curl.cpp \
+    log_flags.cpp \
+    main.cpp \
+    net_stats.cpp \
+    pers_file_xfer.cpp \
+    sandbox.cpp \
+    scheduler_op.cpp \
+    time_stats.cpp \
+    whetstone.cpp \
+    work_fetch.cpp
 
 boinc_client_DEPENDENCIES =
 boinc_client_CPPFLAGS = -O3 -fomit-frame-pointer -fforce-addr -ffast-math $(AM_CPPFLAGS)
@@ -68,7 +68,7 @@ boinc_client_LDADD = $(LIBBOINC) $(PTHREAD_LIBS)
 boinc_clientdir = $(bindir)
 boinc_client_DATA = ../curl/ca-bundle.crt
 
-switcher_SOURCES = switcher.C
+switcher_SOURCES = switcher.cpp
 
 all-local: client-bin
 
diff --git a/client/Makefile.curl.am b/client/Makefile.curl.am
index 09787f40c4..a96d3a6e01 100644
--- a/client/Makefile.curl.am
+++ b/client/Makefile.curl.am
@@ -16,44 +16,44 @@ bin_PROGRAMS = boinc_client
 EXTRA_PROGRAMS = cpu_benchmark
 
 boinc_client_SOURCES = \
-    acct_mgr.C \
-    acct_setup.C \
-    app.C \
-    app_control.C \
-    app_graphics.C \
-    app_start.C \
-    check_state.C \
-    client_msgs.C \
-    client_state.C \
-    client_types.C \
-    cs_account.C \
-    cs_apps.C \
-    cs_benchmark.C \
-    cs_cmdline.C \
-    cs_data.C \
-    cs_files.C \
-    cs_prefs.C \
-    cs_scheduler.C \
-    cs_statefile.C \
-    cs_trickle.C \
-    dhrystone.C \
-    dhrystone2.C \
-    file_names.C \
-    file_xfer.C \
-    gui_http.C \
-    gui_rpc_server.C \
-    gui_rpc_server_ops.C \
-    hostinfo_network.C \
-    hostinfo_unix.C \
-    http_curl.C \
-    log_flags.C \
-    main.C \
-    net_stats.C \
-    net_xfer_curl.C \
-    pers_file_xfer.C \
-    scheduler_op.C \
-    time_stats.C \
-    whetstone.C
+    acct_mgr.cpp \
+    acct_setup.cpp \
+    app.cpp \
+    app_control.cpp \
+    app_graphics.cpp \
+    app_start.cpp \
+    check_state.cpp \
+    client_msgs.cpp \
+    client_state.cpp \
+    client_types.cpp \
+    cs_account.cpp \
+    cs_apps.cpp \
+    cs_benchmark.cpp \
+    cs_cmdline.cpp \
+    cs_data.cpp \
+    cs_files.cpp \
+    cs_prefs.cpp \
+    cs_scheduler.cpp \
+    cs_statefile.cpp \
+    cs_trickle.cpp \
+    dhrystone.cpp \
+    dhrystone2.cpp \
+    file_names.cpp \
+    file_xfer.cpp \
+    gui_http.cpp \
+    gui_rpc_server.cpp \
+    gui_rpc_server_ops.cpp \
+    hostinfo_network.cpp \
+    hostinfo_unix.cpp \
+    http_curl.cpp \
+    log_flags.cpp \
+    main.cpp \
+    net_stats.cpp \
+    net_xfer_curl.cpp \
+    pers_file_xfer.cpp \
+    scheduler_op.cpp \
+    time_stats.cpp \
+    whetstone.cpp
 
 boinc_client_DEPENDENCIES = $(LIBRSA)
 boinc_client_CPPFLAGS = -D_USE_CURL -I../../curl-7.14.0/include -I $(srcdir)/win $(AM_CPPFLAGS) -O3
@@ -62,7 +62,7 @@ boinc_client_LDADD = -L/usr/local/ssl/lib -lssl -L../../curl-7.14.0/lib -lcurl -
 #boinc_client_LDFLAGS = $(STATIC_FLAGS)
 
 # the following don't do anything
-cpu_benchmark_SOURCES = whetstone.C dhrystone.C
+cpu_benchmark_SOURCES = whetstone.cpp dhrystone.cpp
 cpu_benchmark_CFLAGS = -O3 $(AM_CFLAGS)
 
 all-local: client-bin
diff --git a/client/Makefile.linux b/client/Makefile.linux
index fc6b7b9350..74474409f2 100644
--- a/client/Makefile.linux
+++ b/client/Makefile.linux
@@ -53,13 +53,13 @@ LIBS = -L ../lib \
     -lssl \
     -L /usr/local/lib/ -lcurl
 
-.C.o:
+.cpp.o:
 	$(CC) -c -o $*.o $<
 
 boinc_client: $(OBJ)
 	$(CC) $(OBJ) $(LIBS) -o boinc_client
 
-dependencies: *.C
-	$(CC) -M *.C > dependencies
+dependencies: *.cpp
+	$(CC) -M *.cpp > dependencies
 
 include dependencies
diff --git a/client/acct_mgr.C b/client/acct_mgr.cpp
similarity index 100%
rename from client/acct_mgr.C
rename to client/acct_mgr.cpp
diff --git a/client/acct_setup.C b/client/acct_setup.cpp
similarity index 100%
rename from client/acct_setup.C
rename to client/acct_setup.cpp
diff --git a/client/app.C b/client/app.cpp
similarity index 100%
rename from client/app.C
rename to client/app.cpp
diff --git a/client/app_control.C b/client/app_control.cpp
similarity index 100%
rename from client/app_control.C
rename to client/app_control.cpp
diff --git a/client/app_graphics.C b/client/app_graphics.cpp
similarity index 100%
rename from client/app_graphics.C
rename to client/app_graphics.cpp
diff --git a/client/app_start.C b/client/app_start.cpp
similarity index 100%
rename from client/app_start.C
rename to client/app_start.cpp
diff --git a/client/app_stats_mac.C b/client/app_stats_mac.cpp
similarity index 100%
rename from client/app_stats_mac.C
rename to client/app_stats_mac.cpp
diff --git a/client/auto_update.C b/client/auto_update.cpp
similarity index 100%
rename from client/auto_update.C
rename to client/auto_update.cpp
diff --git a/client/check_security.C b/client/check_security.cpp
similarity index 100%
rename from client/check_security.C
rename to client/check_security.cpp
diff --git a/client/check_state.C b/client/check_state.cpp
similarity index 100%
rename from client/check_state.C
rename to client/check_state.cpp
diff --git a/client/client_msgs.C b/client/client_msgs.cpp
similarity index 100%
rename from client/client_msgs.C
rename to client/client_msgs.cpp
diff --git a/client/client_state.C b/client/client_state.cpp
similarity index 100%
rename from client/client_state.C
rename to client/client_state.cpp
diff --git a/client/client_types.C b/client/client_types.cpp
similarity index 100%
rename from client/client_types.C
rename to client/client_types.cpp
diff --git a/client/cpu_sched.C b/client/cpu_sched.cpp
similarity index 100%
rename from client/cpu_sched.C
rename to client/cpu_sched.cpp
diff --git a/client/cs_account.C b/client/cs_account.cpp
similarity index 100%
rename from client/cs_account.C
rename to client/cs_account.cpp
diff --git a/client/cs_apps.C b/client/cs_apps.cpp
similarity index 100%
rename from client/cs_apps.C
rename to client/cs_apps.cpp
diff --git a/client/cs_benchmark.C b/client/cs_benchmark.cpp
similarity index 100%
rename from client/cs_benchmark.C
rename to client/cs_benchmark.cpp
diff --git a/client/cs_cmdline.C b/client/cs_cmdline.cpp
similarity index 100%
rename from client/cs_cmdline.C
rename to client/cs_cmdline.cpp
diff --git a/client/cs_files.C b/client/cs_files.cpp
similarity index 100%
rename from client/cs_files.C
rename to client/cs_files.cpp
diff --git a/client/cs_platforms.C b/client/cs_platforms.cpp
similarity index 100%
rename from client/cs_platforms.C
rename to client/cs_platforms.cpp
diff --git a/client/cs_prefs.C b/client/cs_prefs.cpp
similarity index 100%
rename from client/cs_prefs.C
rename to client/cs_prefs.cpp
diff --git a/client/cs_scheduler.C b/client/cs_scheduler.cpp
similarity index 100%
rename from client/cs_scheduler.C
rename to client/cs_scheduler.cpp
diff --git a/client/cs_statefile.C b/client/cs_statefile.cpp
similarity index 100%
rename from client/cs_statefile.C
rename to client/cs_statefile.cpp
diff --git a/client/cs_trickle.C b/client/cs_trickle.cpp
similarity index 100%
rename from client/cs_trickle.C
rename to client/cs_trickle.cpp
diff --git a/client/dhrystone.C b/client/dhrystone.cpp
similarity index 100%
rename from client/dhrystone.C
rename to client/dhrystone.cpp
diff --git a/client/dhrystone2.C b/client/dhrystone2.cpp
similarity index 100%
rename from client/dhrystone2.C
rename to client/dhrystone2.cpp
diff --git a/client/file_names.C b/client/file_names.cpp
similarity index 100%
rename from client/file_names.C
rename to client/file_names.cpp
diff --git a/client/file_xfer.C b/client/file_xfer.cpp
similarity index 100%
rename from client/file_xfer.C
rename to client/file_xfer.cpp
diff --git a/client/gui_http.C b/client/gui_http.cpp
similarity index 100%
rename from client/gui_http.C
rename to client/gui_http.cpp
diff --git a/client/gui_rpc_server.C b/client/gui_rpc_server.cpp
similarity index 100%
rename from client/gui_rpc_server.C
rename to client/gui_rpc_server.cpp
diff --git a/client/gui_rpc_server_ops.C b/client/gui_rpc_server_ops.cpp
similarity index 100%
rename from client/gui_rpc_server_ops.C
rename to client/gui_rpc_server_ops.cpp
diff --git a/client/hostinfo_network.C b/client/hostinfo_network.cpp
similarity index 100%
rename from client/hostinfo_network.C
rename to client/hostinfo_network.cpp
diff --git a/client/hostinfo_unix.C b/client/hostinfo_unix.cpp
similarity index 100%
rename from client/hostinfo_unix.C
rename to client/hostinfo_unix.cpp
diff --git a/client/hostinfo_unix_test.C b/client/hostinfo_unix_test.cpp
similarity index 100%
rename from client/hostinfo_unix_test.C
rename to client/hostinfo_unix_test.cpp
diff --git a/client/hostinfo_win.C b/client/hostinfo_win.cpp
similarity index 100%
rename from client/hostinfo_win.C
rename to client/hostinfo_win.cpp
diff --git a/client/http_curl.C b/client/http_curl.cpp
similarity index 100%
rename from client/http_curl.C
rename to client/http_curl.cpp
diff --git a/client/log_flags.C b/client/log_flags.cpp
similarity index 100%
rename from client/log_flags.C
rename to client/log_flags.cpp
diff --git a/client/main.C b/client/main.cpp
similarity index 100%
rename from client/main.C
rename to client/main.cpp
diff --git a/client/net_stats.C b/client/net_stats.cpp
similarity index 100%
rename from client/net_stats.C
rename to client/net_stats.cpp
diff --git a/client/pers_file_xfer.C b/client/pers_file_xfer.cpp
similarity index 100%
rename from client/pers_file_xfer.C
rename to client/pers_file_xfer.cpp
diff --git a/client/rrsim_test.C b/client/rrsim_test.cpp
similarity index 100%
rename from client/rrsim_test.C
rename to client/rrsim_test.cpp
diff --git a/client/sandbox.C b/client/sandbox.cpp
similarity index 100%
rename from client/sandbox.C
rename to client/sandbox.cpp
diff --git a/client/scheduler_op.C b/client/scheduler_op.cpp
similarity index 100%
rename from client/scheduler_op.C
rename to client/scheduler_op.cpp
diff --git a/client/setprojectgrp.C b/client/setprojectgrp.cpp
similarity index 100%
rename from client/setprojectgrp.C
rename to client/setprojectgrp.cpp
diff --git a/client/sim.C b/client/sim.cpp
similarity index 100%
rename from client/sim.C
rename to client/sim.cpp
diff --git a/client/sim_util.C b/client/sim_util.cpp
similarity index 100%
rename from client/sim_util.C
rename to client/sim_util.cpp
diff --git a/client/stream.C b/client/stream.cpp
similarity index 100%
rename from client/stream.C
rename to client/stream.cpp
diff --git a/client/switcher.C b/client/switcher.cpp
similarity index 100%
rename from client/switcher.C
rename to client/switcher.cpp
diff --git a/client/time_stats.C b/client/time_stats.cpp
similarity index 100%
rename from client/time_stats.C
rename to client/time_stats.cpp
diff --git a/client/whetstone.C b/client/whetstone.cpp
similarity index 100%
rename from client/whetstone.C
rename to client/whetstone.cpp
diff --git a/client/work_fetch.C b/client/work_fetch.cpp
similarity index 100%
rename from client/work_fetch.C
rename to client/work_fetch.cpp
diff --git a/clientgui/mac/SetVersion.C b/clientgui/mac/SetVersion.cpp
similarity index 100%
rename from clientgui/mac/SetVersion.C
rename to clientgui/mac/SetVersion.cpp
diff --git a/clientscr/gfx_switcher.C b/clientscr/gfx_switcher.cpp
similarity index 100%
rename from clientscr/gfx_switcher.C
rename to clientscr/gfx_switcher.cpp
diff --git a/db/boinc_db.C b/db/boinc_db.cpp
similarity index 100%
rename from db/boinc_db.C
rename to db/boinc_db.cpp
diff --git a/db/db_base.C b/db/db_base.cpp
similarity index 100%
rename from db/db_base.C
rename to db/db_base.cpp
diff --git a/lib/Makefile.am b/lib/Makefile.am
index e119021d46..245abf9641 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -16,7 +16,7 @@ all-local: client-bin
 client-bin: @CLIENT_CMD_BIN_FILENAME@
 
 boinc_cmd_SOURCES = \
-    boinc_cmd.C \
+    boinc_cmd.cpp \
     gui_rpc_client.h
 
 boinc_cmd_LDADD = $(lib_LIBRARIES) $(PTHREAD_LIBS)
@@ -30,12 +30,12 @@ boinc_cmd_LDADD = $(lib_LIBRARIES) $(PTHREAD_LIBS)
 	@STRIP@ $@
 
 lib_LIBRARIES = libboinc.a 
-EXTRA_DIST = *.h *.C
+EXTRA_DIST = *.h *.cpp
 
 if OS_DARWIN
 mac_sources = \
 	mac/dyld_gdb.h \
-	mac/mac_backtrace.C \
+	mac/mac_backtrace.cpp \
 	mac/mac_backtrace.h \
 	mac/QBacktrace.c \
 	mac/QBacktrace.h \
@@ -54,32 +54,32 @@ mac_sources =
 endif
 
 libboinc_a_SOURCES = \
-    app_ipc.C \
-    base64.C \
-	cert_sig.C \
-    coproc.C \
-    crypt.C \
-    diagnostics.C \
-    filesys.C \
-    gui_rpc_client.C \
-    gui_rpc_client_ops.C \
-    gui_rpc_client_print.C \
-    hostinfo.C \
+    app_ipc.cpp \
+    base64.cpp \
+	cert_sig.cpp \
+    coproc.cpp \
+    crypt.cpp \
+    diagnostics.cpp \
+    filesys.cpp \
+    gui_rpc_client.cpp \
+    gui_rpc_client_ops.cpp \
+    gui_rpc_client_print.cpp \
+    hostinfo.cpp \
     md5.c \
-    md5_file.C \
-    mem_usage.C \
-    mfile.C \
-    miofile.C \
-    msg_log.C \
-    network.C \
-    parse.C \
-    prefs.C \
-    procinfo_unix.C \
-    proxy_info.C \
-    shmem.C \
-    str_util.C \
-    util.C	\
-    unix_util.C \
+    md5_file.cpp \
+    mem_usage.cpp \
+    mfile.cpp \
+    miofile.cpp \
+    msg_log.cpp \
+    network.cpp \
+    parse.cpp \
+    prefs.cpp \
+    procinfo_unix.cpp \
+    proxy_info.cpp \
+    shmem.cpp \
+    str_util.cpp \
+    util.cpp	\
+    unix_util.cpp \
 	$(mac_sources)
 
 pkginclude_HEADERS = \
@@ -104,10 +104,10 @@ pkginclude_HEADERS = \
     str_util.h \
     util.h
 
-md5_test_SOURCES = md5_test.C md5.c md5_file.C
-shmem_test_SOURCES = shmem_test.C shmem.C
-msg_test_SOURCES = msg_test.C msg_queue.C
-crypt_prog_SOURCES = crypt_prog.C crypt.C md5.c md5_file.C filesys.C
+md5_test_SOURCES = md5_test.cpp md5.c md5_file.cpp
+shmem_test_SOURCES = shmem_test.cpp shmem.cpp
+msg_test_SOURCES = msg_test.cpp msg_queue.cpp
+crypt_prog_SOURCES = crypt_prog.cpp crypt.cpp md5.c md5_file.cpp filesys.cpp
 crypt_prog_DEPENDENCIES =
 crypt_prog_LDADD = $(lib_LIBRARIES) $(RSA_LIBS) $(PTHREAD_LIBS)
 
diff --git a/lib/app_ipc.C b/lib/app_ipc.cpp
similarity index 100%
rename from lib/app_ipc.C
rename to lib/app_ipc.cpp
diff --git a/lib/base64.C b/lib/base64.cpp
similarity index 100%
rename from lib/base64.C
rename to lib/base64.cpp
diff --git a/lib/boinc_cmd.C b/lib/boinc_cmd.cpp
similarity index 100%
rename from lib/boinc_cmd.C
rename to lib/boinc_cmd.cpp
diff --git a/lib/boinc_fcgi.C b/lib/boinc_fcgi.cpp
similarity index 100%
rename from lib/boinc_fcgi.C
rename to lib/boinc_fcgi.cpp
diff --git a/lib/cert_sig.C b/lib/cert_sig.cpp
similarity index 100%
rename from lib/cert_sig.C
rename to lib/cert_sig.cpp
diff --git a/lib/coproc.C b/lib/coproc.cpp
similarity index 100%
rename from lib/coproc.C
rename to lib/coproc.cpp
diff --git a/lib/crypt.C b/lib/crypt.cpp
similarity index 100%
rename from lib/crypt.C
rename to lib/crypt.cpp
diff --git a/lib/crypt_prog.C b/lib/crypt_prog.cpp
similarity index 100%
rename from lib/crypt_prog.C
rename to lib/crypt_prog.cpp
diff --git a/lib/diagnostics.C b/lib/diagnostics.cpp
similarity index 100%
rename from lib/diagnostics.C
rename to lib/diagnostics.cpp
diff --git a/lib/diagnostics_win.C b/lib/diagnostics_win.cpp
similarity index 100%
rename from lib/diagnostics_win.C
rename to lib/diagnostics_win.cpp
diff --git a/lib/filesys.C b/lib/filesys.cpp
similarity index 100%
rename from lib/filesys.C
rename to lib/filesys.cpp
diff --git a/lib/gui_rpc_client.C b/lib/gui_rpc_client.cpp
similarity index 100%
rename from lib/gui_rpc_client.C
rename to lib/gui_rpc_client.cpp
diff --git a/lib/gui_rpc_client_ops.C b/lib/gui_rpc_client_ops.cpp
similarity index 100%
rename from lib/gui_rpc_client_ops.C
rename to lib/gui_rpc_client_ops.cpp
diff --git a/lib/gui_rpc_client_print.C b/lib/gui_rpc_client_print.cpp
similarity index 100%
rename from lib/gui_rpc_client_print.C
rename to lib/gui_rpc_client_print.cpp
diff --git a/lib/hostinfo.C b/lib/hostinfo.cpp
similarity index 100%
rename from lib/hostinfo.C
rename to lib/hostinfo.cpp
diff --git a/lib/md5_file.C b/lib/md5_file.cpp
similarity index 100%
rename from lib/md5_file.C
rename to lib/md5_file.cpp
diff --git a/lib/md5_test.C b/lib/md5_test.cpp
similarity index 100%
rename from lib/md5_test.C
rename to lib/md5_test.cpp
diff --git a/lib/mem_usage.C b/lib/mem_usage.cpp
similarity index 100%
rename from lib/mem_usage.C
rename to lib/mem_usage.cpp
diff --git a/lib/mfile.C b/lib/mfile.cpp
similarity index 100%
rename from lib/mfile.C
rename to lib/mfile.cpp
diff --git a/lib/miofile.C b/lib/miofile.cpp
similarity index 100%
rename from lib/miofile.C
rename to lib/miofile.cpp
diff --git a/lib/msg_log.C b/lib/msg_log.cpp
similarity index 100%
rename from lib/msg_log.C
rename to lib/msg_log.cpp
diff --git a/lib/msg_queue.C b/lib/msg_queue.cpp
similarity index 100%
rename from lib/msg_queue.C
rename to lib/msg_queue.cpp
diff --git a/lib/msg_test.C b/lib/msg_test.cpp
similarity index 100%
rename from lib/msg_test.C
rename to lib/msg_test.cpp
diff --git a/lib/network.C b/lib/network.cpp
similarity index 100%
rename from lib/network.C
rename to lib/network.cpp
diff --git a/lib/parse.C b/lib/parse.cpp
similarity index 100%
rename from lib/parse.C
rename to lib/parse.cpp
diff --git a/lib/prefs.C b/lib/prefs.cpp
similarity index 100%
rename from lib/prefs.C
rename to lib/prefs.cpp
diff --git a/lib/proc_control.C b/lib/proc_control.cpp
similarity index 100%
rename from lib/proc_control.C
rename to lib/proc_control.cpp
diff --git a/lib/procinfo_mac.C b/lib/procinfo_mac.cpp
similarity index 100%
rename from lib/procinfo_mac.C
rename to lib/procinfo_mac.cpp
diff --git a/lib/procinfo_unix.C b/lib/procinfo_unix.cpp
similarity index 100%
rename from lib/procinfo_unix.C
rename to lib/procinfo_unix.cpp
diff --git a/lib/procinfo_win.C b/lib/procinfo_win.cpp
similarity index 100%
rename from lib/procinfo_win.C
rename to lib/procinfo_win.cpp
diff --git a/lib/proxy_info.C b/lib/proxy_info.cpp
similarity index 100%
rename from lib/proxy_info.C
rename to lib/proxy_info.cpp
diff --git a/lib/shmem.C b/lib/shmem.cpp
similarity index 100%
rename from lib/shmem.C
rename to lib/shmem.cpp
diff --git a/lib/shmem_test.C b/lib/shmem_test.cpp
similarity index 100%
rename from lib/shmem_test.C
rename to lib/shmem_test.cpp
diff --git a/lib/str_util.C b/lib/str_util.cpp
similarity index 100%
rename from lib/str_util.C
rename to lib/str_util.cpp
diff --git a/lib/susp.C b/lib/susp.cpp
similarity index 100%
rename from lib/susp.C
rename to lib/susp.cpp
diff --git a/lib/synch.C b/lib/synch.cpp
similarity index 100%
rename from lib/synch.C
rename to lib/synch.cpp
diff --git a/lib/synch_test.C b/lib/synch_test.cpp
similarity index 100%
rename from lib/synch_test.C
rename to lib/synch_test.cpp
diff --git a/lib/unix_util.C b/lib/unix_util.cpp
similarity index 100%
rename from lib/unix_util.C
rename to lib/unix_util.cpp
diff --git a/lib/util.C b/lib/util.cpp
similarity index 100%
rename from lib/util.C
rename to lib/util.cpp
diff --git a/lib/win_util.C b/lib/win_util.cpp
similarity index 100%
rename from lib/win_util.C
rename to lib/win_util.cpp
diff --git a/samples/multi_thread/multi_thread.C b/samples/multi_thread/multi_thread.cpp
similarity index 100%
rename from samples/multi_thread/multi_thread.C
rename to samples/multi_thread/multi_thread.cpp
diff --git a/samples/sleeper/sleeper.C b/samples/sleeper/sleeper.cpp
similarity index 100%
rename from samples/sleeper/sleeper.C
rename to samples/sleeper/sleeper.cpp
diff --git a/samples/worker/worker.C b/samples/worker/worker.cpp
similarity index 100%
rename from samples/worker/worker.C
rename to samples/worker/worker.cpp
diff --git a/samples/wrapper/wrapper.C b/samples/wrapper/wrapper.cpp
similarity index 100%
rename from samples/wrapper/wrapper.C
rename to samples/wrapper/wrapper.cpp
diff --git a/sched/Makefile.am b/sched/Makefile.am
index a75ebc0fb5..fdac72a7bc 100644
--- a/sched/Makefile.am
+++ b/sched/Makefile.am
@@ -43,15 +43,15 @@ LDADD = $(LIBSCHED) $(LIBBOINC) $(MYSQL_LIBS) $(PTHREAD_LIBS) $(RSA_LIBS)
 AM_CXXFLAGS = $(MYSQL_CFLAGS)
 
 libsched_a_SOURCES = \
-    sched_shmem.C \
-    sched_util.C \
-    sched_config.C \
-	sched_msgs.C \
-    ../db/boinc_db.C \
-    ../db/db_base.C \
-	../lib/msg_log.C \
-    ../tools/process_result_template.C \
-    ../tools/backend_lib.C
+    sched_shmem.cpp \
+    sched_util.cpp \
+    sched_config.cpp \
+	sched_msgs.cpp \
+    ../db/boinc_db.cpp \
+    ../db/db_base.cpp \
+	../lib/msg_log.cpp \
+    ../tools/process_result_template.cpp \
+    ../tools/backend_lib.cpp
 
 EXTRA_DIST = \
     assimilate_handler.h \
@@ -66,28 +66,28 @@ EXTRA_DIST = \
 
 
 cgi_SOURCES = \
-    edf_sim.C \
-    handle_request.C \
-    hr.C \
-    hr_info.C \
-    main.C \
-    sched_array.C \
-    sched_assign.C \
-    sched_hr.C \
-    sched_resend.C \
-    sched_locality.C \
-    sched_result.C \
-    sched_plan.C \
-    sched_send.C \
-    sched_timezone.C \
-    server_types.C \
-    time_stats_log.C \
-    ../lib/synch.C
+    edf_sim.cpp \
+    handle_request.cpp \
+    hr.cpp \
+    hr_info.cpp \
+    main.cpp \
+    sched_array.cpp \
+    sched_assign.cpp \
+    sched_hr.cpp \
+    sched_resend.cpp \
+    sched_locality.cpp \
+    sched_result.cpp \
+    sched_plan.cpp \
+    sched_send.cpp \
+    sched_timezone.cpp \
+    server_types.cpp \
+    time_stats_log.cpp \
+    ../lib/synch.cpp
 
 census_SOURCES = \
-    census.C \
-    hr.C \
-    hr_info.C
+    census.cpp \
+    hr.cpp \
+    hr_info.cpp
 
 ## install only headers that are meant for exporting the API !!
 pkginclude_HEADERS = \
@@ -99,113 +99,113 @@ pkginclude_HEADERS = \
 
 
 feeder_SOURCES = \
-    feeder.C \
-    hr.C \
-    hr_info.C \
-    ../lib/synch.C
+    feeder.cpp \
+    hr.cpp \
+    hr_info.cpp \
+    ../lib/synch.cpp
 
-wu_check_SOURCES = wu_check.C
+wu_check_SOURCES = wu_check.cpp
 
-show_shmem_SOURCES = show_shmem.C
+show_shmem_SOURCES = show_shmem.cpp
 
-file_deleter_SOURCES = file_deleter.C
+file_deleter_SOURCES = file_deleter.cpp
 
-sample_bitwise_validator_SOURCES = validator.C sample_bitwise_validator.C validate_util.C validate_util.h validate_util2.C
+sample_bitwise_validator_SOURCES = validator.cpp sample_bitwise_validator.cpp validate_util.cpp validate_util.h validate_util2.cpp
 
-sample_trivial_validator_SOURCES = validator.C sample_trivial_validator.C validate_util.C validate_util.h validate_util2.C
+sample_trivial_validator_SOURCES = validator.cpp sample_trivial_validator.cpp validate_util.cpp validate_util.h validate_util2.cpp
 
-sample_dummy_assimilator_SOURCES = assimilator.C sample_dummy_assimilator.C validate_util.C validate_util.h
+sample_dummy_assimilator_SOURCES = assimilator.cpp sample_dummy_assimilator.cpp validate_util.cpp validate_util.h
 
-sample_assimilator_SOURCES = assimilator.C sample_assimilator.C validate_util.C validate_util.h
+sample_assimilator_SOURCES = assimilator.cpp sample_assimilator.cpp validate_util.cpp validate_util.h
 
-pymw_assimilator_SOURCES = assimilator.C pymw_assimilator.C validate_util.C validate_util.h 
+pymw_assimilator_SOURCES = assimilator.cpp pymw_assimilator.cpp validate_util.cpp validate_util.h 
 pymw_assimilator_DEPENDENCIES = $(LIB_SCHED) 
 
-single_job_assimilator_SOURCES = assimilator.C single_job_assimilator.C validate_util.C validate_util.h
+single_job_assimilator_SOURCES = assimilator.cpp single_job_assimilator.cpp validate_util.cpp validate_util.h
 
-sample_work_generator_SOURCES = sample_work_generator.C
+sample_work_generator_SOURCES = sample_work_generator.cpp
 
-db_dump_SOURCES = db_dump.C
+db_dump_SOURCES = db_dump.cpp
 
-db_purge_SOURCES = db_purge.C
+db_purge_SOURCES = db_purge.cpp
 
-trickle_handler_SOURCES = trickle_handler.C
+trickle_handler_SOURCES = trickle_handler.cpp
 
-update_stats_SOURCES = update_stats.C
+update_stats_SOURCES = update_stats.cpp
 
-file_upload_handler_SOURCES = file_upload_handler.C
+file_upload_handler_SOURCES = file_upload_handler.cpp
 
-make_work_SOURCES = make_work.C
+make_work_SOURCES = make_work.cpp
 
-transitioner_SOURCES = transitioner.C
+transitioner_SOURCES = transitioner.cpp
 
-message_handler_SOURCES = message_handler.C
+message_handler_SOURCES = message_handler.cpp
 
-request_file_list_SOURCES = request_file_list.C
+request_file_list_SOURCES = request_file_list.cpp
 
-get_file_SOURCES = get_file.C
+get_file_SOURCES = get_file.cpp
 
-send_file_SOURCES = send_file.C
+send_file_SOURCES = send_file.cpp
 
-delete_file_SOURCES = delete_file.C
+delete_file_SOURCES = delete_file.cpp
 
-sched_driver_SOURCES = sched_driver.C
+sched_driver_SOURCES = sched_driver.cpp
 
 # N.B.: the FCGI scheduler can't use lib/libboinc.a;
 # it needs to have specially compiled versions of everything
 # because its stdio is different
 fcgi_SOURCES = \
-    handle_request.C \
-    hr.C \
-    hr_info.C \
-    main.C \
-    sched_array.C \
-    sched_assign.C \
-    sched_config.C \
-    sched_hr.C \
-    sched_locality.C \
-    sched_msgs.C \
-    sched_resend.C \
-    sched_result.C \
-    sched_plan.C \
-    sched_send.C \
-    sched_shmem.C \
-    sched_timezone.C \
-    sched_util.C \
-    server_types.C \
-	time_stats_log.C \
-    edf_sim.C \
-    ../db/boinc_db.C \
-    ../db/db_base.C \
-    ../lib/base64.C \
-    ../lib/boinc_fcgi.C \
-    ../lib/coproc.C \
-    ../lib/crypt.C \
-    ../lib/filesys.C \
+    handle_request.cpp \
+    hr.cpp \
+    hr_info.cpp \
+    main.cpp \
+    sched_array.cpp \
+    sched_assign.cpp \
+    sched_config.cpp \
+    sched_hr.cpp \
+    sched_locality.cpp \
+    sched_msgs.cpp \
+    sched_resend.cpp \
+    sched_result.cpp \
+    sched_plan.cpp \
+    sched_send.cpp \
+    sched_shmem.cpp \
+    sched_timezone.cpp \
+    sched_util.cpp \
+    server_types.cpp \
+	time_stats_log.cpp \
+    edf_sim.cpp \
+    ../db/boinc_db.cpp \
+    ../db/db_base.cpp \
+    ../lib/base64.cpp \
+    ../lib/boinc_fcgi.cpp \
+    ../lib/coproc.cpp \
+    ../lib/crypt.cpp \
+    ../lib/filesys.cpp \
     ../lib/md5.c \
-    ../lib/md5_file.C \
-    ../lib/miofile.C \
-    ../lib/msg_log.C \
-    ../lib/parse.C \
-    ../lib/shmem.C \
-    ../lib/synch.C \
-    ../lib/str_util.C \
-    ../lib/util.C \
-    ../tools/process_result_template.C \
-    ../tools/backend_lib.C
+    ../lib/md5_file.cpp \
+    ../lib/miofile.cpp \
+    ../lib/msg_log.cpp \
+    ../lib/parse.cpp \
+    ../lib/shmem.cpp \
+    ../lib/synch.cpp \
+    ../lib/str_util.cpp \
+    ../lib/util.cpp \
+    ../tools/process_result_template.cpp \
+    ../tools/backend_lib.cpp
 
 fcgi_CPPFLAGS = -D_USING_FCGI_ -include boinc_fcgi.h $(AM_CPPFLAGS)
 fcgi_LDADD = -lfcgi $(MYSQL_LIBS)
 
 fcgi_file_upload_handler_SOURCES = \
-    file_upload_handler.C \
-    sched_config.C \
-    sched_msgs.C \
-    ../lib/boinc_fcgi.C \
-    ../lib/miofile.C \
-    ../lib/msg_log.C \
-    ../lib/parse.C \
-    ../lib/crypt.C
+    file_upload_handler.cpp \
+    sched_config.cpp \
+    sched_msgs.cpp \
+    ../lib/boinc_fcgi.cpp \
+    ../lib/miofile.cpp \
+    ../lib/msg_log.cpp \
+    ../lib/parse.cpp \
+    ../lib/crypt.cpp
 
 fcgi_file_upload_handler_CPPFLAGS = -D_USING_FCGI_ -include boinc_fcgi.h $(AM_CPPFLAGS)
 fcgi_file_upload_handler_LDADD = $(LDADD) -lfcgi
diff --git a/sched/assimilator.C b/sched/assimilator.cpp
similarity index 100%
rename from sched/assimilator.C
rename to sched/assimilator.cpp
diff --git a/sched/census.C b/sched/census.cpp
similarity index 100%
rename from sched/census.C
rename to sched/census.cpp
diff --git a/sched/db_dump.C b/sched/db_dump.cpp
similarity index 100%
rename from sched/db_dump.C
rename to sched/db_dump.cpp
diff --git a/sched/db_purge.C b/sched/db_purge.cpp
similarity index 100%
rename from sched/db_purge.C
rename to sched/db_purge.cpp
diff --git a/sched/delete_file.C b/sched/delete_file.cpp
similarity index 100%
rename from sched/delete_file.C
rename to sched/delete_file.cpp
diff --git a/sched/edf_sim.C b/sched/edf_sim.cpp
similarity index 100%
rename from sched/edf_sim.C
rename to sched/edf_sim.cpp
diff --git a/sched/feeder.C b/sched/feeder.cpp
similarity index 100%
rename from sched/feeder.C
rename to sched/feeder.cpp
diff --git a/sched/file_deleter.C b/sched/file_deleter.cpp
similarity index 100%
rename from sched/file_deleter.C
rename to sched/file_deleter.cpp
diff --git a/sched/file_upload_handler.C b/sched/file_upload_handler.cpp
similarity index 100%
rename from sched/file_upload_handler.C
rename to sched/file_upload_handler.cpp
diff --git a/sched/get_file.C b/sched/get_file.cpp
similarity index 100%
rename from sched/get_file.C
rename to sched/get_file.cpp
diff --git a/sched/handle_request.C b/sched/handle_request.cpp
similarity index 100%
rename from sched/handle_request.C
rename to sched/handle_request.cpp
diff --git a/sched/hr.C b/sched/hr.cpp
similarity index 100%
rename from sched/hr.C
rename to sched/hr.cpp
diff --git a/sched/hr_info.C b/sched/hr_info.cpp
similarity index 100%
rename from sched/hr_info.C
rename to sched/hr_info.cpp
diff --git a/sched/main.C b/sched/main.cpp
similarity index 100%
rename from sched/main.C
rename to sched/main.cpp
diff --git a/sched/make_work.C b/sched/make_work.cpp
similarity index 100%
rename from sched/make_work.C
rename to sched/make_work.cpp
diff --git a/sched/message_handler.C b/sched/message_handler.cpp
similarity index 100%
rename from sched/message_handler.C
rename to sched/message_handler.cpp
diff --git a/sched/pymw_assimilator.C b/sched/pymw_assimilator.cpp
similarity index 100%
rename from sched/pymw_assimilator.C
rename to sched/pymw_assimilator.cpp
diff --git a/sched/request_file_list.C b/sched/request_file_list.cpp
similarity index 100%
rename from sched/request_file_list.C
rename to sched/request_file_list.cpp
diff --git a/sched/sample_assimilator.C b/sched/sample_assimilator.cpp
similarity index 100%
rename from sched/sample_assimilator.C
rename to sched/sample_assimilator.cpp
diff --git a/sched/sample_bitwise_validator.C b/sched/sample_bitwise_validator.cpp
similarity index 100%
rename from sched/sample_bitwise_validator.C
rename to sched/sample_bitwise_validator.cpp
diff --git a/sched/sample_dummy_assimilator.C b/sched/sample_dummy_assimilator.cpp
similarity index 100%
rename from sched/sample_dummy_assimilator.C
rename to sched/sample_dummy_assimilator.cpp
diff --git a/sched/sample_trivial_validator.C b/sched/sample_trivial_validator.cpp
similarity index 100%
rename from sched/sample_trivial_validator.C
rename to sched/sample_trivial_validator.cpp
diff --git a/sched/sample_work_generator.C b/sched/sample_work_generator.cpp
similarity index 100%
rename from sched/sample_work_generator.C
rename to sched/sample_work_generator.cpp
diff --git a/sched/sched_array.C b/sched/sched_array.cpp
similarity index 100%
rename from sched/sched_array.C
rename to sched/sched_array.cpp
diff --git a/sched/sched_assign.C b/sched/sched_assign.cpp
similarity index 100%
rename from sched/sched_assign.C
rename to sched/sched_assign.cpp
diff --git a/sched/sched_config.C b/sched/sched_config.cpp
similarity index 100%
rename from sched/sched_config.C
rename to sched/sched_config.cpp
diff --git a/sched/sched_driver.C b/sched/sched_driver.cpp
similarity index 100%
rename from sched/sched_driver.C
rename to sched/sched_driver.cpp
diff --git a/sched/sched_hr.C b/sched/sched_hr.cpp
similarity index 100%
rename from sched/sched_hr.C
rename to sched/sched_hr.cpp
diff --git a/sched/sched_locality.C b/sched/sched_locality.cpp
similarity index 100%
rename from sched/sched_locality.C
rename to sched/sched_locality.cpp
diff --git a/sched/sched_msgs.C b/sched/sched_msgs.cpp
similarity index 100%
rename from sched/sched_msgs.C
rename to sched/sched_msgs.cpp
diff --git a/sched/sched_plan.C b/sched/sched_plan.cpp
similarity index 100%
rename from sched/sched_plan.C
rename to sched/sched_plan.cpp
diff --git a/sched/sched_resend.C b/sched/sched_resend.cpp
similarity index 100%
rename from sched/sched_resend.C
rename to sched/sched_resend.cpp
diff --git a/sched/sched_result.C b/sched/sched_result.cpp
similarity index 100%
rename from sched/sched_result.C
rename to sched/sched_result.cpp
diff --git a/sched/sched_send.C b/sched/sched_send.cpp
similarity index 100%
rename from sched/sched_send.C
rename to sched/sched_send.cpp
diff --git a/sched/sched_shmem.C b/sched/sched_shmem.cpp
similarity index 100%
rename from sched/sched_shmem.C
rename to sched/sched_shmem.cpp
diff --git a/sched/sched_timezone.C b/sched/sched_timezone.cpp
similarity index 100%
rename from sched/sched_timezone.C
rename to sched/sched_timezone.cpp
diff --git a/sched/sched_util.C b/sched/sched_util.cpp
similarity index 100%
rename from sched/sched_util.C
rename to sched/sched_util.cpp
diff --git a/sched/send_file.C b/sched/send_file.cpp
similarity index 100%
rename from sched/send_file.C
rename to sched/send_file.cpp
diff --git a/sched/server_types.C b/sched/server_types.cpp
similarity index 100%
rename from sched/server_types.C
rename to sched/server_types.cpp
diff --git a/sched/show_shmem.C b/sched/show_shmem.cpp
similarity index 100%
rename from sched/show_shmem.C
rename to sched/show_shmem.cpp
diff --git a/sched/single_job_assimilator.C b/sched/single_job_assimilator.cpp
similarity index 100%
rename from sched/single_job_assimilator.C
rename to sched/single_job_assimilator.cpp
diff --git a/sched/time_stats_log.C b/sched/time_stats_log.cpp
similarity index 100%
rename from sched/time_stats_log.C
rename to sched/time_stats_log.cpp
diff --git a/sched/transitioner.C b/sched/transitioner.cpp
similarity index 100%
rename from sched/transitioner.C
rename to sched/transitioner.cpp
diff --git a/sched/trickle_handler.C b/sched/trickle_handler.cpp
similarity index 100%
rename from sched/trickle_handler.C
rename to sched/trickle_handler.cpp
diff --git a/sched/update_stats.C b/sched/update_stats.cpp
similarity index 100%
rename from sched/update_stats.C
rename to sched/update_stats.cpp
diff --git a/sched/validate_util.C b/sched/validate_util.cpp
similarity index 100%
rename from sched/validate_util.C
rename to sched/validate_util.cpp
diff --git a/sched/validate_util2.C b/sched/validate_util2.cpp
similarity index 100%
rename from sched/validate_util2.C
rename to sched/validate_util2.cpp
diff --git a/sched/validator.C b/sched/validator.cpp
similarity index 100%
rename from sched/validator.C
rename to sched/validator.cpp
diff --git a/sched/wu_check.C b/sched/wu_check.cpp
similarity index 100%
rename from sched/wu_check.C
rename to sched/wu_check.cpp
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 8fe30a9e83..2ccf2a91e1 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -9,13 +9,13 @@ LDADD = $(LIBSCHED) $(LIBBOINC) $(RSA_LIBS) $(MYSQL_LIBS)
 AM_CXXFLAGS = $(MYSQL_CFLAGS)
 
 create_work_SOURCES =           \
-    create_work.C
+    create_work.cpp
 
 sign_executable_SOURCES =	\
-    sign_executable.C
+    sign_executable.cpp
 
 dir_hier_path_SOURCES = \
-    dir_hier_path.C
+    dir_hier_path.cpp
 
 dir_hier_move_SOURCES = \
-    dir_hier_move.C
+    dir_hier_move.cpp
diff --git a/tools/backend_lib.C b/tools/backend_lib.cpp
similarity index 100%
rename from tools/backend_lib.C
rename to tools/backend_lib.cpp
diff --git a/tools/create_work.C b/tools/create_work.cpp
similarity index 100%
rename from tools/create_work.C
rename to tools/create_work.cpp
diff --git a/tools/dir_hier_move.C b/tools/dir_hier_move.cpp
similarity index 100%
rename from tools/dir_hier_move.C
rename to tools/dir_hier_move.cpp
diff --git a/tools/dir_hier_path.C b/tools/dir_hier_path.cpp
similarity index 100%
rename from tools/dir_hier_path.C
rename to tools/dir_hier_path.cpp
diff --git a/tools/hr_db_convert.C b/tools/hr_db_convert.cpp
similarity index 100%
rename from tools/hr_db_convert.C
rename to tools/hr_db_convert.cpp
diff --git a/tools/kill_wu.C b/tools/kill_wu.cpp
similarity index 100%
rename from tools/kill_wu.C
rename to tools/kill_wu.cpp
diff --git a/tools/poll_wu.C b/tools/poll_wu.cpp
similarity index 100%
rename from tools/poll_wu.C
rename to tools/poll_wu.cpp
diff --git a/tools/process_result_template.C b/tools/process_result_template.cpp
similarity index 100%
rename from tools/process_result_template.C
rename to tools/process_result_template.cpp
diff --git a/tools/sign_executable.C b/tools/sign_executable.cpp
similarity index 100%
rename from tools/sign_executable.C
rename to tools/sign_executable.cpp
diff --git a/tools/updater.C b/tools/updater.cpp
similarity index 100%
rename from tools/updater.C
rename to tools/updater.cpp