diff -urN serf-0.3.0-dist\context.c serf-0.3.0\context.c
--- serf-0.3.0-dist\context.c	Thu Dec 18 03:34:42 2008
+++ serf-0.3.0\context.c	Wed Feb 03 18:20:44 2010
@@ -582,7 +582,8 @@
                             sizeof(struct iovec) * (conn->vec_len - i));
                     conn->vec_len -= i;
                 }
-                conn->vec[0].iov_base += conn->vec[0].iov_len - (len - written);
+                conn->vec[0].iov_base = (char *)conn->vec[0].iov_base 
+                                      + conn->vec[0].iov_len - (len - written);
                 conn->vec[0].iov_len = len - written;
                 break;
             }
@@ -1404,7 +1405,7 @@
 SERF_DECLARE(void) serf_request_set_handler(
     serf_request_t *request,
     const serf_response_handler_t handler,
-    const void **handler_baton)
+    void **handler_baton)
 {
     request->handler = handler;
     request->handler_baton = handler_baton;
diff -urN serf-0.3.0-dist\Makefile.win serf-0.3.0\Makefile.win
--- serf-0.3.0-dist\Makefile.win	Wed Dec 31 18:00:00 1969
+++ serf-0.3.0\Makefile.win	Thu Feb 04 13:03:42 2010
@@ -0,0 +1,304 @@
+#**** serf Win32 -*- Makefile -*- ********************************************
+#
+# Define DEBUG_BUILD to create a debug version of the library.
+# Define STATIC_BUILD to create and consume static .lib archives
+# or leave undefined to create and consume all dynamic .dlls.
+# MSVCRT .dll (/MD[d]) binding is always used, 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+CC=cl.exe /nologo /c
+# Exclude stuff we don't need from the Win32 headers
+CFLAGS = /Zi /W3 /EHsc /I "./" /D WIN32 /D WIN32_LEAN_AND_MEAN /D NOUSER /D NOGDI /D NONLS /D NOCRYPT
+LIB32=link.exe -lib -nologo
+LIB32_LDFLAGS=
+LINK32=link.exe -nologo
+LINK32_LIBS= 
+
+BINPATH=$(PATH)
+LIBPATH=
+LIBS=kernel32.lib ws2_32.lib wsock32.lib user32.lib advapi32.lib shell32.lib gdi32.lib
+
+!IF "$(DEBUG_BUILD)" == "" && "$(STATIC_BUILD)" == ""
+INTDIR = .\Release
+CFLAGS = /MD /O2 /D "NDEBUG" $(CFLAGS)
+LIB32_CFLAGS = /D "SERF_EXPORT" /Fd"$(INTDIR)\libserf_src"
+LIB32_LDFLAGS = /DLL /DEBUG /INCREMENTAL:NO /OPT:REF /OUT:"$(INTDIR)\libserf.dll" /BASE:0x53450000
+DYNAMIC_LIB = $(INTDIR)\libserf.lib
+BINPATH=$(INTDIR);$(BINPATH)
+!ELSEIF "$(DEBUG_BUILD)" == ""
+INTDIR = .\LibR
+CFLAGS = /MD /O2 /D "NDEBUG" /D "SERF_STATIC" $(CFLAGS)
+LIB32_CFLAGS = /Fd"$(INTDIR)\serf"
+STATIC_LIB = $(INTDIR)\serf.lib
+!ELSEIF "$(STATIC_BUILD)" == ""
+INTDIR = .\Debug
+CFLAGS = /MDd /Od /Gm /D "_DEBUG" /D "SERF_EXPORT" $(CFLAGS)
+LIB32_CFLAGS = /D "SERF_EXPORT" /Fd"$(INTDIR)\libserf_src"
+LIB32_LDFLAGS = /DLL /DEBUG /OUT:"$(INTDIR)\libserf.dll" /BASE:0x53450000
+DYNAMIC_LIB = $(INTDIR)\libserf.lib
+BINPATH=$(INTDIR);$(BINPATH)
+!ELSE
+INTDIR = .\LibD
+CFLAGS = /MDd /Od /Gm /D "_DEBUG" /D "SERF_STATIC" $(CFLAGS)
+LIB32_CFLAGS = /Fd"$(INTDIR)\serf"
+STATIC_LIB = $(INTDIR)\serf.lib
+!ENDIF
+
+!IF "$(HTTPD_SRC)" != ""
+!IF "$(APR_SRC)" == ""
+APR_SRC=$(HTTPD_SRC)\srclib\apr
+!ENDIF
+!IF "$(APRUTIL_SRC)" == ""
+APRUTIL_SRC=$(HTTPD_SRC)\srclib\apr-util
+!ENDIF
+!ENDIF
+
+########
+# APR
+!IF "$(APR_SRC)" == ""
+!ERROR APR is required. Please define APR_SRC or HTTPD_SRC.
+!ENDIF
+
+!IF EXIST("$(APR_SRC)\apr-2")
+CFLAGS = $(CFLAGS) /I "$(APR_SRC)\include\apr-2"
+!ELSEIF EXIST("$(APR_SRC)\apr-1")
+CFLAGS = $(CFLAGS) /I "$(APR_SRC)\include\apr-1"
+!ELSE
+CFLAGS = $(CFLAGS) /I "$(APR_SRC)\include"
+!ENDIF
+!IF "$(STATIC_BUILD)" == ""
+!IF EXIST("$(APR_SRC)\$(INTDIR)\libapr.lib") \
+	|| EXIST("$(APR_SRC)\$(INTDIR)\libapr-1.lib") \
+	|| EXIST("$(APR_SRC)\$(INTDIR)\libapr-2.lib")
+APR_LIBPATH=$(APR_SRC)\$(INTDIR)
+BINPATH=$(APR_LIBPATH);$(BINPATH)
+!ELSE
+APR_LIBPATH=$(APR_SRC)\lib
+BINPATH=$(APR_SRC)\bin;$(BINPATH)
+!ENDIF
+!IF EXIST("$(APR_LIBPATH)\libapr-2.lib")
+LINK32_LIBS = $(LINK32_LIBS) libapr-2.lib
+!ELSEIF EXIST("$(APR_LIBPATH)\libapr-1.lib")
+LINK32_LIBS = $(LINK32_LIBS) libapr-1.lib
+!ELSE
+LINK32_LIBS = $(LINK32_LIBS) libapr.lib
+!ENDIF
+!ELSE
+CFLAGS = $(CFLAGS) /D APR_DECLARE_STATIC
+!IF EXIST("$(APR_SRC)\$(INTDIR)\apr.lib") \
+	|| EXIST("$(APR_SRC)\$(INTDIR)\apr-1.lib") \
+	|| EXIST("$(APR_SRC)\$(INTDIR)\apr-2.lib")
+APR_LIBPATH=$(APR_SRC)\$(INTDIR)
+!ELSE
+APR_LIBPATH=$(APR_SRC)\lib
+!ENDIF
+!IF EXIST("$(APR_LIBPATH)\apr-2.lib")
+LINK32_LIBS = $(LINK32_LIBS) apr-2.lib
+!ELSEIF EXIST("$(APR_LIBPATH)\apr-1.lib")
+LINK32_LIBS = $(LINK32_LIBS) apr-1.lib
+!ELSE
+LINK32_LIBS = $(LINK32_LIBS) apr.lib
+!ENDIF
+!ENDIF
+
+LINK32_LDFLAGS=$(LINK32_LDFLAGS) /LIBPATH:"$(APR_LIBPATH)"
+
+########
+# APR Util
+#
+# For libapr-2 we skip the whole mess, 
+# for APR_SRC == APRUTIL_SRC we skip the whole path setup
+#
+!IF !EXIST("$(APR_LIBPATH)\libapr-2.lib")
+
+!IF "$(APRUTIL_SRC)" == ""
+!ERROR APR-Util is required. Please define APRUTIL_SRC or HTTPD_SRC.
+!ENDIF
+
+!IF "$(APRUTIL_SRC)" == "$(APR_SRC)"
+APRUTIL_LIBPATH=$(APR_LIBPATH)
+!ELSE
+!IF EXIST("$(APRUTIL_SRC)\include\apr-1")
+CFLAGS = $(CFLAGS) /I "$(APRUTIL_SRC)\include\apr-1"
+!ELSE
+CFLAGS = $(CFLAGS) /I "$(APRUTIL_SRC)\include"
+!ENDIF
+!IF "$(STATIC_BUILD)" == ""
+!IF EXIST("$(APRUTIL_SRC)\$(INTDIR)\libaprutil.lib") \
+	|| EXIST("$(APRUTIL_SRC)\$(INTDIR)\libaprutil-1.lib")
+APRUTIL_LIBPATH=$(APRUTIL_SRC)\$(INTDIR)
+BINPATH=$(APRUTIL_LIBPATH);$(BINPATH)
+!ELSE
+APRUTIL_LIBPATH=$(APRUTIL_SRC)\lib
+BINPATH=$(APRUTIL_SRC)\bin;$(BINPATH)
+!ENDIF
+!ELSE
+!IF EXIST("$(APRUTIL_SRC)\$(INTDIR)\aprutil.lib") \
+	|| EXIST("$(APRUTIL_SRC)\$(INTDIR)\aprutil-1.lib")
+APRUTIL_LIBPATH=$(APRUTIL_SRC)\$(INTDIR)
+BINPATH=$(APRUTIL_LIBPATH);$(BINPATH)
+!ELSE
+APRUTIL_LIBPATH=$(APRUTIL_SRC)\lib
+BINPATH=$(APRUTIL_SRC)\bin;$(BINPATH)
+!ENDIF
+!ENDIF
+LINK32_LDFLAGS=$(LINK32_LDFLAGS) /LIBPATH:"$(APRUTIL_LIBPATH)"
+!ENDIF
+
+!IF "$(STATIC_BUILD)" == ""
+!IF EXIST("$(APRUTIL_LIBPATH)\libaprutil-1.lib")
+LINK32_LIBS = $(LINK32_LIBS) libaprutil-1.lib
+!ELSE
+LINK32_LIBS = $(LINK32_LIBS) libaprutil.lib
+!ENDIF
+!ELSE
+CFLAGS = $(CFLAGS) /D APU_DECLARE_STATIC
+!IF EXIST("$(APRUTIL_LIBPATH)\aprutil-1.lib")
+LINK32_LIBS = $(LINK32_LIBS) aprutil-1.lib
+!ELSE
+LINK32_LIBS = $(LINK32_LIBS) aprutil.lib
+!ENDIF
+!ENDIF
+!ENDIF
+
+########
+# Support for zlib integration
+!IF "$(ZLIB_SRC)" == ""
+!ERROR ZLib is required. Please define ZLIB_SRC.
+!ENDIF
+
+!IF "$(STATIC_BUILD)" == ""
+# DLL default; modern openssl depends on zlib now
+LIB32_CFLAGS = $(LIB32_CFLAGS) /I "$(ZLIB_SRC)" /D ZLIB_DLL
+LIBS = $(LIBS) zdll.lib
+!ELSE
+LIB32_CFLAGS = $(LIB32_CFLAGS) /I "$(ZLIB_SRC)"
+LIBS = $(LIBS) zlib.lib
+BINPATH=$(ZLIB_SRC)\$(INTDIR);$(BINPATH)
+!ENDIF
+LIBPATH=$(LIBPATH) /LIBPATH:"$(ZLIB_SRC)"
+
+########
+# Support for OpenSSL integration
+!IF "$(OPENSSL_SRC)" == ""
+!ERROR OpenSSL is required. Please define OPENSSL_SRC.
+!ENDIF
+
+LIB32_CFLAGS = $(LIB32_CFLAGS) /I "$(OPENSSL_SRC)\inc32"
+LIBS = $(LIBS) libeay32.lib ssleay32.lib 
+!IF "$(STATIC_BUILD)" == ""
+LIB32_CFLAGS = $(LIB32_CFLAGS) /D "OPENSSL_OPT_WINDLL"
+LIBPATH=$(LIBPATH) /LIBPATH:"$(OPENSSL_SRC)\out32dll"
+BINPATH=$(OPENSSL_SRC)\out32dll;$(BINPATH)
+!ELSE
+LIBPATH=$(LIBPATH) /LIBPATH:"$(OPENSSL_SRC)\out32"
+!ENDIF
+
+LIB32_OBJS= \
+    "$(INTDIR)\aggregate_buckets.obj" \
+    "$(INTDIR)\context.obj" \
+    "$(INTDIR)\allocator.obj" \
+    "$(INTDIR)\barrier_buckets.obj" \
+    "$(INTDIR)\buckets.obj" \
+    "$(INTDIR)\chunk_buckets.obj" \
+    "$(INTDIR)\dechunk_buckets.obj" \
+    "$(INTDIR)\deflate_buckets.obj" \
+    "$(INTDIR)\file_buckets.obj" \
+    "$(INTDIR)\headers_buckets.obj" \
+    "$(INTDIR)\limit_buckets.obj" \
+    "$(INTDIR)\mmap_buckets.obj" \
+    "$(INTDIR)\request_buckets.obj" \
+    "$(INTDIR)\response_buckets.obj" \
+    "$(INTDIR)\simple_buckets.obj" \
+    "$(INTDIR)\socket_buckets.obj" \
+    "$(INTDIR)\ssl_buckets.obj" \
+
+!IF "$(STATIC_BUILD)" == ""
+
+"$(DYNAMIC_LIB)": $(LIB32_OBJS)
+	$(LINK32) $(LIB32_LDFLAGS) $(LINK32_LDFLAGS) $(LIBPATH) $(LIB32_OBJS) $(LIBS) $(LINK32_LIBS)
+
+!ELSE
+LINK32_LDFLAGS = $(LINK32_LDFLAGS) $(LIBPATH)
+LINK32_LIBS = $(LINK32_LIBS) $(LIBS) 
+
+"$(STATIC_LIB)": $(LIB32_OBJS)
+	$(LIB32) $(LIB32_LDFLAGS) /OUT:$@ $?
+
+!ENDIF
+
+TEST_OBJS = \
+    "$(INTDIR)\CuTest.obj" \
+    "$(INTDIR)\test_all.obj" \
+    "$(INTDIR)\test_util.obj" \
+    "$(INTDIR)\test_context.obj" \
+    "$(INTDIR)\test_buckets.obj" \
+    "$(INTDIR)\test_ssl.obj"
+
+TEST_BINS = \
+    "$(INTDIR)\serf_get.exe" \
+    "$(INTDIR)\serf_request.exe" \
+    "$(INTDIR)\serf_response.exe" \
+    "$(INTDIR)\test_all.exe"
+
+ALL: "$(INTDIR)" $(STATIC_LIB) $(DYNAMIC_LIB) TESTS
+
+TESTS: $(STATIC_LIB) $(DYNAMIC_LIB) $(TEST_BINS)
+
+CHECK: ALL
+	PATH $(BINDIR)
+	$(INTDIR)\serf_response.exe test\testcases\simple.response
+	$(INTDIR)\serf_response.exe test\testcases\chunked-empty.response
+	$(INTDIR)\serf_response.exe test\testcases\chunked.response
+	$(INTDIR)\serf_response.exe test\testcases\chunked-trailers.response
+	$(INTDIR)\serf_response.exe test\testcases\deflate.response
+	$(INTDIR)\test_all.exe
+
+CLEAN:
+	-@rd /s/q "Release"
+	-@rd /s/q "Debug"
+	-@rd /s/q "LibR"
+	-@rd /s/q "LibD"
+
+"$(INTDIR)":
+	@if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
+
+{buckets}.c{$(INTDIR)}.obj:
+	$(CC) $(CFLAGS) $(LIB32_CFLAGS) /Fo$@ $<
+
+.c{$(INTDIR)}.obj:
+	$(CC) $(CFLAGS) $(LIB32_CFLAGS) /Fo$@ $<
+
+{test}.c{$(INTDIR)}.obj:
+	$(CC) $(CFLAGS) /Fo$@ $<
+
+$(INTDIR)\serf_get.exe: $(INTDIR)\serf_get.obj $(STATIC_LIB) $(DYNAMIC_LIB)
+  $(LINK32) /OUT:$@ $** $(LINK32_LIBS) $(LINK32_LDFLAGS)
+
+$(INTDIR)\serf_request.exe: $(INTDIR)\serf_request.obj $(STATIC_LIB) $(DYNAMIC_LIB)
+  $(LINK32) /OUT:$@ $** $(LINK32_LIBS) $(LINK32_LDFLAGS)
+
+$(INTDIR)\serf_response.exe: $(INTDIR)\serf_response.obj $(STATIC_LIB) $(DYNAMIC_LIB)
+  $(LINK32) /OUT:$@ $** $(LINK32_LIBS) $(LINK32_LDFLAGS)
+
+$(INTDIR)\test_all.exe: $(TEST_OBJS) $(STATIC_LIB) $(DYNAMIC_LIB)
+  $(LINK32) /DEBUG /OUT:$@ $** $(LINK32_LIBS) $(LINK32_LDFLAGS)
+
+INSTALL:
+	@if NOT EXIST "$(PREFIX)\."		mkdir "$(PREFIX)"
+	@if NOT EXIST "$(PREFIX)\bin\."		mkdir "$(PREFIX)\bin"
+	@if NOT EXIST "$(PREFIX)\include\."	mkdir "$(PREFIX)\include"
+	@if NOT EXIST "$(PREFIX)\lib\."		mkdir "$(PREFIX)\lib"
+	copy CHANGES "$(PREFIX)\SERF-CHANGES.txt" <.y
+	copy LICENSE "$(PREFIX)\SERF-LICENSE.txt" <.y
+	copy NOTICE  "$(PREFIX)\SERF-NOTICE.txt"  <.y
+	copy /y $(LONG)\libserf.lib 		"$(PREFIX)\lib"
+	copy /y $(LONG)\libserf.exp 		"$(PREFIX)\lib"
+	copy /y $(LONG)\libserf.dll 		"$(PREFIX)\bin"
+	copy /y $(LONG)\libserf.pdb 		"$(PREFIX)\bin"
+	copy /y *.h 				"$(PREFIX)\include"
diff -urN serf-0.3.0-dist\serf.h serf-0.3.0\serf.h
--- serf-0.3.0-dist\serf.h	Wed Sep 24 16:59:41 2008
+++ serf-0.3.0\serf.h	Tue Jan 26 13:36:53 2010
@@ -485,7 +485,7 @@
 SERF_DECLARE(void) serf_request_set_handler(
     serf_request_t *request,
     const serf_response_handler_t handler,
-    const void **handler_baton);
+    void **handler_baton);
 
 /**
  * Configure proxy server settings, to be used by all connections associated
diff -ruN serf-0.3.0-dist\serf.mak serf-0.3.0\serf.mak
--- serf-0.3.0-dist\serf.mak	Fri Mar 21 13:26:39 2008
+++ serf-0.3.0\serf.mak	Wed Dec 31 18:00:00 1969
@@ -1,187 +0,0 @@
-#**** serf Win32 -*- Makefile -*- ********************************************
-#
-# Define DEBUG_BUILD to create a debug version of the library.
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE
-NULL=nul
-!ENDIF
-
-CFLAGS = /Zi /W3 /EHsc /I "./"
-
-!IF "$(DEBUG_BUILD)" == ""
-INTDIR = Release
-CFLAGS = /MD /O2 /D "NDEBUG" $(CFLAGS)
-STATIC_LIB = $(INTDIR)\serf.lib
-!ELSE
-INTDIR = Debug
-CFLAGS = /MDd /Od /W3 /Gm /D "_DEBUG" $(CFLAGS)
-STATIC_LIB = $(INTDIR)\serf.lib
-!ENDIF
-
-########
-# Support for OpenSSL integration
-!IF "$(OPENSSL_SRC)" == ""
-!ERROR OpenSSL is required. Please define OPENSSL_SRC.
-!ELSE
-OPENSSL_FLAGS = /I "$(OPENSSL_SRC)\inc32"
-!ENDIF
-
-!IF "$(HTTPD_SRC)" != ""
-!IF "$(APR_SRC)" == ""
-APR_SRC=$(HTTPD_SRC)\srclib\apr
-!ENDIF
-
-!IF "$(APRUTIL_SRC)" == ""
-APRUTIL_SRC=$(HTTPD_SRC)\srclib\apr-util
-!ENDIF
-
-!ENDIF
-
-########
-# APR
-!IF "$(APR_SRC)" == ""
-!ERROR APR is required. Please define APR_SRC or HTTPD_SRC.
-!ENDIF
-
-APR_FLAGS = /I "$(APR_SRC)\include"
-!IF [IF EXIST "$(APR_SRC)\$(INTDIR)\libapr-1.lib" exit 1] == 1
-APR_LIBS = "$(APR_SRC)\$(INTDIR)\libapr-1.lib"
-!ELSE
-APR_LIBS = "$(APR_SRC)\$(INTDIR)\libapr.lib"
-!ENDIF
-
-########
-# APR Util
-!IF "$(APRUTIL_SRC)" == ""
-!ERROR APR-Util is required. Please define APRUTIL_SRC or HTTPD_SRC.
-!ENDIF
-
-APRUTIL_FLAGS = /I "$(APRUTIL_SRC)\include"
-!IF [IF EXIST "$(APRUTIL_SRC)\$(INTDIR)\libaprutil-1.lib" exit 1] == 1
-APRUTIL_LIBS = "$(APRUTIL_SRC)\$(INTDIR)\libaprutil-1.lib"
-!ELSE
-APRUTIL_LIBS = "$(APRUTIL_SRC)\$(INTDIR)\libaprutil.lib"
-!ENDIF
-
-########
-# Support for zlib integration
-!IF "$(ZLIB_SRC)" == ""
-!ERROR ZLib is required. Please define ZLIB_SRC.
-!ELSE
-ZLIB_FLAGS = /I "$(ZLIB_SRC)"
-!IF "$(ZLIB_DLL)" == ""
-!IF "$(ZLIB_LIBDIR)" == ""
-!IF "$(DEBUG_BUILD)" == ""
-ZLIB_LIBS = "$(ZLIB_SRC)\zlibstat.lib"
-!ELSE
-ZLIB_LIBS = "$(ZLIB_SRC)\zlibstatD.lib"
-!ENDIF
-!ELSE
-ZLIB_LIBS = "$(ZLIB_LIBDIR)\x86\ZlibStat$(INTDIR)\zlibstat.lib"
-ZLIB_FLAGS = $(ZLIB_FLAGS) /D ZLIB_WINAPI
-!ENDIF
-!ELSE
-ZLIB_FLAGS = $(ZLIB_FLAGS) /D ZLIB_DLL
-ZLIB_LIBS = "$(ZLIB_SRC)\zlibdll.lib"
-!ENDIF
-!ENDIF
-
-
-# Exclude stuff we don't need from the Win32 headers
-WIN32_DEFS = /D WIN32 /D WIN32_LEAN_AND_MEAN /D NOUSER /D NOGDI /D NONLS /D NOCRYPT
-
-CPP=cl.exe
-CPP_PROJ = /c /nologo $(CFLAGS) $(WIN32_DEFS) $(EXPAT_FLAGS) $(APR_FLAGS) $(APRUTIL_FLAGS) $(OPENSSL_FLAGS) $(ZLIB_FLAGS) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"
-LIB32=link.exe
-LIB32_FLAGS=/nologo
-
-LIB32_OBJS= \
-    "$(INTDIR)\aggregate_buckets.obj" \
-    "$(INTDIR)\context.obj" \
-    "$(INTDIR)\allocator.obj" \
-    "$(INTDIR)\barrier_buckets.obj" \
-    "$(INTDIR)\buckets.obj" \
-    "$(INTDIR)\chunk_buckets.obj" \
-    "$(INTDIR)\dechunk_buckets.obj" \
-    "$(INTDIR)\deflate_buckets.obj" \
-    "$(INTDIR)\file_buckets.obj" \
-    "$(INTDIR)\headers_buckets.obj" \
-    "$(INTDIR)\limit_buckets.obj" \
-    "$(INTDIR)\mmap_buckets.obj" \
-    "$(INTDIR)\request_buckets.obj" \
-    "$(INTDIR)\response_buckets.obj" \
-    "$(INTDIR)\simple_buckets.obj" \
-    "$(INTDIR)\socket_buckets.obj" \
-    "$(INTDIR)\ssl_buckets.obj" \
-
-!IFDEF OPENSSL_STATIC
-LIB32_OBJS = $(LIB32_OBJS) "$(OPENSSL_SRC)\out32\libeay32.lib" \
-               "$(OPENSSL_SRC)\out32\ssleay32.lib"
-!ELSE
-LIB32_OBJS = $(LIB32_OBJS) "$(OPENSSL_SRC)\out32dll\libeay32.lib" \
-               "$(OPENSSL_SRC)\out32dll\ssleay32.lib"
-!ENDIF
-
-LIB32_OBJS = $(LIB32_OBJS) $(APR_LIBS) $(APRUTIL_LIBS) $(ZLIB_LIBS) 
-
-TEST_OBJS = \
-    "$(INTDIR)\CuTest.obj" \
-    "$(INTDIR)\test_all.obj" \
-    "$(INTDIR)\test_util.obj" \
-    "$(INTDIR)\test_context.obj" \
-    "$(INTDIR)\test_buckets.obj" \
-    "$(INTDIR)\test_ssl.obj" \
-
-ALL: INTDIR $(STATIC_LIB) TESTS
-
-CLEAN:
-  -@erase /q "$(INTDIR)" >nul
-
-INTDIR:
-  -@if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-TESTS: $(STATIC_LIB) $(INTDIR)\serf_response.exe $(INTDIR)\serf_get.exe \
-       $(INTDIR)\serf_request.exe $(INTDIR)\test_all.exe
-
-CHECK: INTDIR TESTS
-  $(INTDIR)\serf_response.exe test\testcases\simple.response
-  $(INTDIR)\serf_response.exe test\testcases\chunked-empty.response
-  $(INTDIR)\serf_response.exe test\testcases\chunked.response
-  $(INTDIR)\serf_response.exe test\testcases\chunked-trailers.response
-  $(INTDIR)\serf_response.exe test\testcases\deflate.response
-  $(INTDIR)\test_all.exe
-  
-"$(STATIC_LIB)": INTDIR $(LIB32_OBJS)
-  $(LIB32) -lib @<<
-    $(LIB32_FLAGS) $(LIB32_OBJS) /OUT:$@
-<<
-
-
-.c{$(INTDIR)}.obj:
-  $(CPP) @<<
-    $(CPP_PROJ) $<
-<<
-
-{buckets}.c{$(INTDIR)}.obj:
-  $(CPP) @<<
-    $(CPP_PROJ) $<
-<<
-
-{test}.c{$(INTDIR)}.obj: 
-  $(CPP) @<<
-    $(CPP_PROJ) $<
-<<
-
-$(INTDIR)\serf_response.exe: $(INTDIR)\serf_response.obj $(STATIC_LIB)
-  $(LIB32) /DEBUG /OUT:$@ $** $(LIB32_FLAGS)
-
-$(INTDIR)\serf_get.exe: $(INTDIR)\serf_get.obj $(STATIC_LIB)
-  $(LIB32) /OUT:$@ $** $(LIB32_FLAGS)
-
-$(INTDIR)\serf_request.exe: $(INTDIR)\serf_request.obj $(STATIC_LIB)
-  $(LIB32) /OUT:$@ $** $(LIB32_FLAGS)
-
-$(INTDIR)\test_all.exe: $(TEST_OBJS) $(STATIC_LIB)
-  $(LIB32) /DEBUG /OUT:$@ $** $(LIB32_FLAGS)
diff -urN serf-0.3.0-dist\serf_declare.h serf-0.3.0\serf_declare.h
--- serf-0.3.0-dist\serf_declare.h	Sun Aug 26 02:27:48 2007
+++ serf-0.3.0\serf_declare.h	Wed Feb 03 20:38:29 2010
@@ -25,9 +25,19 @@
 extern "C" {
 #endif
 
-/* ### improve this stuff some */
+/* On Win32, the bucket API is useless without a C-calling convention
+ * language, due to the callback schema.  Leave these as default 'cdecl'.
+ */
+#if defined(DOXYGEN) || !defined(WIN32) || defined(SERF_STATIC)
 #define SERF_DECLARE(type) type
 #define SERF_DECLARE_DATA
+#elif defined(SERF_EXPORT)
+#define SERF_DECLARE(type) __declspec(dllexport) type
+#define SERF_DECLARE_DATA __declspec(dllexport)
+#else
+#define SERF_DECLARE(type) __declspec(dllimport) type
+#define SERF_DECLARE_DATA __declspec(dllimport)
+#endif
 
 #ifdef __cplusplus
 }
Binary files serf-0.3.0-dist\vc60.pdb and serf-0.3.0\vc60.pdb differ