diff --git a/Makefile.am b/Makefile.am
index 27a0e2732..d49a559cb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,9 +43,9 @@ docs/pump.png \
 docs/bubba.png \
 docs/firetorrent.png \
 docs/read_disk_buffers.png \
-docs/read_disk_buffers.gaffle \
+docs/read_disk_buffers.graffle \
 docs/write_disk_buffers.png \
-docs/write_disk_buffers.gaffle \
+docs/write_disk_buffers.graffle \
 docs/storage.png \
 docs/disk_buffer.png \
 docs/disk_buffer_before_optimization.png \
diff --git a/configure.in b/configure.in
index faa8f965b..2adaeadeb 100644
--- a/configure.in
+++ b/configure.in
@@ -409,8 +409,6 @@ if [[ "x$enable_shared" == "xyes" ]]; then
 	COMPILETIME_OPTIONS+="-DTORRENT_LINKING_SHARED "
 fi
 
-AC_DEFINE(BOOST_MULTI_INDEX_DISABLE_SERIALIZATION,,[Don't depend on boost.serialization headers])
-COMPILETIME_OPTIONS+="-DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION "
 AC_DEFINE(BOOST_EXCEPTION_DISABLE,,[We don't need boost.exception features])
 COMPILETIME_OPTIONS+="-DBOOST_EXCEPTION_DISABLE "
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 66bc31567..4e20f97c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -93,7 +93,6 @@ $(top_srcdir)/include/libtorrent/session.hpp \
 $(top_srcdir)/include/libtorrent/size_type.hpp \
 $(top_srcdir)/include/libtorrent/socket.hpp \
 $(top_srcdir)/include/libtorrent/socket_type.hpp \
-$(top_srcdir)/include/libtorrent/socks4_stream.hpp \
 $(top_srcdir)/include/libtorrent/socks5_stream.hpp \
 $(top_srcdir)/include/libtorrent/stat.hpp \
 $(top_srcdir)/include/libtorrent/storage.hpp \
@@ -113,7 +112,7 @@ $(top_srcdir)/include/libtorrent/ConvertUTF.h
 libtorrent_rasterbar_la_LDFLAGS = $(LDFLAGS) -version-info $(INTERFACE_VERSION_INFO)
 libtorrent_rasterbar_la_LIBADD = @ZLIB@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LIBS@
 
-AM_CXXFLAGS= -ftemplate-depth-100 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @ZLIBINCL@ @DEBUGFLAGS@ @PTHREAD_CFLAGS@ -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION @SSL_CXXFLAGS@
+AM_CXXFLAGS= -ftemplate-depth-100 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @ZLIBINCL@ @DEBUGFLAGS@ @PTHREAD_CFLAGS@ @SSL_CXXFLAGS@
 AM_CFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @ZLIBINCL@ @DEBUGFLAGS@ @PTHREAD_CFLAGS@
 AM_LDFLAGS= $(LDFLAGS) @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LDFLAGS@ @SSL_LIBS@