diff --git a/.vimrc b/.vimrc
new file mode 100644
index 0000000000..bada988cab
--- /dev/null
+++ b/.vimrc
@@ -0,0 +1,9 @@
+set ai
+set ts=4
+set bs=1
+set cin
+set sts=4
+set sw=4
+set expandtab
+set smarttab
+syntax off
diff --git a/api/Makefile.am b/api/Makefile.am
index 789ff90704..f49568a8ca 100644
--- a/api/Makefile.am
+++ b/api/Makefile.am
@@ -4,14 +4,7 @@
 include $(top_srcdir)/Makefile.incl
 
 api_files= \
-	boinc_api.C                                 \
-	../lib/app_ipc.C                            \
-	../lib/base64.C                             \
-	../lib/diagnostics.C                        \
-	../lib/exception.C                          \
-	../lib/parse.C                              \
-	../lib/shmem.C                              \
-	../lib/util.C
+	boinc_api.C
 
 graphics_api_files = 		\
 	x_opengl.C 				\
diff --git a/apps/Makefile.am b/apps/Makefile.am
index 413fe0cdfd..357e5dc35b 100644
--- a/apps/Makefile.am
+++ b/apps/Makefile.am
@@ -8,7 +8,7 @@ bin_PROGRAMS = upper_case concat 1sec
 # when we are ready to build graphics apps on unix:
 # LDADD = -lm -lGL -lGLU -lpthread -L. -lapp
 
-LDADD = -L../lib -L../api -lboinc -lboinc_api $(PTHREAD_LIBS)
+LDADD = -L../lib -L../api -lboinc_api -lboinc $(PTHREAD_LIBS)
 
 # upper_case_x11_SOURCES = upper_case_x11.C ../api/x_opengl.C ../api/boinc_api.C ../api/graphics_api.C
 # upper_case_x11_CPPFLAGS = -DBOINC_APP_GRAPHICS
diff --git a/checkin_notes b/checkin_notes
index 832c2ddbdc..fa70a71346 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -20890,3 +20890,16 @@ David  7 Dec 2004
     html/inc/
         email.inc
 
+David  8 Dec 2004
+    - change makefiles so that libboinc, libboinc_api and libboinc_api_graphics
+        have disjoint contents
+    - change client makefile so it uses libboinc instead of separate .o files
+
+    api/
+        Makefile.am
+    apps/
+        Makefile.am
+    client/
+        Makefile.am
+    lib/
+        Makefile.am
diff --git a/client/Makefile.am b/client/Makefile.am
index 99e6680156..428758c955 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -49,29 +49,11 @@ boinc_client_SOURCES = \
     scheduler_op.C \
     ss_logic.C \
     time_stats.C \
-    whetstone.C \
-    ../lib/app_ipc.C \
-    ../lib/base64.C \
-    ../lib/crypt.C \
-    ../lib/diagnostics.C \
-    ../lib/exception.C \
-    ../lib/filesys.C \
-    ../lib/hostinfo.C \
-    ../lib/language.C \
-    ../lib/md5_file.C \
-    ../lib/md5.c \
-    ../lib/mfile.C \
-    ../lib/miofile.C \
-    ../lib/msg_log.C \
-    ../lib/parse.C \
-    ../lib/prefs.C \
-    ../lib/proxy_info.C \
-    ../lib/shmem.C \
-    ../lib/util.C
+    whetstone.C
 
 boinc_client_DEPENDENCIES = $(LIBRSA)
 boinc_client_CPPFLAGS = -I $(srcdir)/win $(AM_CPPFLAGS) -O3
-boinc_client_LDADD = $(RSA_LIBS) $(PTHREAD_LIBS)
+boinc_client_LDADD = -L../lib -lboinc $(RSA_LIBS) $(PTHREAD_LIBS)
 #boinc_client_LDFLAGS = $(STATIC_FLAGS)
 
 # the following don't do anything
diff --git a/lib/Makefile.am b/lib/Makefile.am
index b04aa350d6..a8beea463a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -22,24 +22,25 @@ lib_LIBRARIES = libboinc.a
 EXTRA_DIST = *.h *.C
 
 # libboinc.a is for use by applications (not core client or server)
-libboinc_a_SOURCES =                            \
-    ../api/boinc_api.C                          \
-    app_ipc.C                                   \
-	base64.C                                    \
-    diagnostics.C                               \
-    exception.C                                 \
-    filesys.C                                   \
-    hostinfo.C                                  \
-    language.C                                  \
-    md5.c                                       \
-    md5_file.C                                  \
-    mfile.C                                     \
-    miofile.C                                   \
-    parse.C                                     \
-    prefs.C                                     \
-    proxy_info.C                                \
-	shmem.C                                     \
-    util.C										\
+libboinc_a_SOURCES =        \
+    app_ipc.C               \
+	base64.C                \
+    crypt.C                 \
+    diagnostics.C           \
+    exception.C             \
+    filesys.C               \
+    hostinfo.C              \
+    language.C              \
+    md5.c                   \
+    md5_file.C              \
+    mfile.C                 \
+    miofile.C               \
+    msg_log.C               \
+    parse.C                 \
+    prefs.C                 \
+    proxy_info.C            \
+	shmem.C                 \
+    util.C					\
 	base64.h  				\
 	crypt.h  				\
 	error_numbers.h  		\