diff --git a/setup.py b/setup.py
index 95997ef2c..5e770c76b 100644
--- a/setup.py
+++ b/setup.py
@@ -124,15 +124,11 @@ else:
 # Ubuntu possible.
 if boosttype == "nomt":
 	librariestype = ['boost_filesystem', 'boost_date_time',
-			'boost_regex', 'boost_serialization',
-			'boost_thread', 
-			'z', 'pthread']
+			'boost_thread', 'z', 'pthread']
 	print 'Libraries nomt' 
 elif boosttype == "mt":
 	librariestype = ['boost_filesystem-mt', 'boost_date_time-mt',
-			'boost_regex-mt', 'boost_serialization-mt',
-			'boost_thread-mt', 
-			'z', 'pthread']
+			'boost_thread-mt', 'z', 'pthread']
 	print 'Libraries mt'
 
 deluge_core = Extension('deluge_core',
diff --git a/src/deluge_core.cpp b/src/deluge_core.cpp
index 663a71f7d..13d93fc23 100644
--- a/src/deluge_core.cpp
+++ b/src/deluge_core.cpp
@@ -27,17 +27,10 @@
 // open, just like the normal TCP port for bittorrent.
 //
 //-----------------
-#include <iostream>
-#include <fstream>
-#include <exception>
-#include <iterator>
-#include <iomanip>
-
 #include <Python.h>
 
+#include <boost/filesystem/exception.hpp>
 #include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/path.hpp>
-#include <boost/filesystem/fstream.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 
 #include "libtorrent/entry.hpp"
@@ -48,10 +41,8 @@
 #include "libtorrent/storage.hpp"
 #include "libtorrent/hasher.hpp"
 #include "libtorrent/ip_filter.hpp"
-#include "libtorrent/file_pool.hpp"
-#include "libtorrent/file.hpp"
-#include "libtorrent/torrent_info.hpp"
 #include "libtorrent/upnp.hpp"
+#include "libtorrent/file_pool.hpp"
 #include "libtorrent/natpmp.hpp"
 #include "libtorrent/extensions/metadata_transfer.hpp"
 #include "libtorrent/extensions/ut_pex.hpp"