diff --git a/ChangeLog b/ChangeLog
index 8141369bf..941b6f6fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@
 	* fix uTP edge case where udp socket buffer fills up
 	* fix nagle implementation in uTP
 
+	* GCC 4.8 fix
 	* fix proxy failure semantics with regards to anonymous mode
 	* fix round-robin seed-unchoke algorithm
 	* add bootstrap.sh to generage configure script and run configure
diff --git a/include/libtorrent/disk_buffer_pool.hpp b/include/libtorrent/disk_buffer_pool.hpp
index 63896bb5c..716b5ab72 100644
--- a/include/libtorrent/disk_buffer_pool.hpp
+++ b/include/libtorrent/disk_buffer_pool.hpp
@@ -33,6 +33,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_DISK_BUFFER_POOL
 #define TORRENT_DISK_BUFFER_POOL
 
+#include <boost/utility.hpp>
+
 #include "libtorrent/config.hpp"
 #include "libtorrent/thread.hpp"
 #include "libtorrent/session_settings.hpp"
diff --git a/include/libtorrent/error_code.hpp b/include/libtorrent/error_code.hpp
index d77477bd6..bcd43e58c 100644
--- a/include/libtorrent/error_code.hpp
+++ b/include/libtorrent/error_code.hpp
@@ -329,9 +329,9 @@ namespace libtorrent
 
 	struct TORRENT_EXPORT libtorrent_error_category : boost::system::error_category
 	{
-		virtual const char* name() const;
-		virtual std::string message(int ev) const;
-		virtual boost::system::error_condition default_error_condition(int ev) const
+		virtual const char* name() const throw();
+		virtual std::string message(int ev) const throw();
+		virtual boost::system::error_condition default_error_condition(int ev) const throw()
 		{ return boost::system::error_condition(ev, *this); }
 	};
 
@@ -343,9 +343,9 @@ namespace libtorrent
 
 	struct TORRENT_EXPORT http_error_category : boost::system::error_category
 	{
-		virtual const char* name() const;
-		virtual std::string message(int ev) const;
-		virtual boost::system::error_condition default_error_condition(int ev) const
+		virtual const char* name() const throw();
+		virtual std::string message(int ev) const throw();
+		virtual boost::system::error_condition default_error_condition(int ev) const throw()
 		{ return boost::system::error_condition(ev, *this); }
 	};
 
diff --git a/src/error_code.cpp b/src/error_code.cpp
index 09c6bf163..17cb14494 100644
--- a/src/error_code.cpp
+++ b/src/error_code.cpp
@@ -40,12 +40,12 @@ namespace libtorrent
 {
 #if BOOST_VERSION >= 103500
 
-	const char* libtorrent_error_category::name() const
+	const char* libtorrent_error_category::name() const throw()
 	{
 		return "libtorrent error";
 	}
 
-	std::string libtorrent_error_category::message(int ev) const
+	std::string libtorrent_error_category::message(int ev) const throw()
 	{
 		static char const* msgs[] =
 		{
@@ -263,12 +263,12 @@ namespace libtorrent
 		return msgs[ev];
 	}
 
-	const char* http_error_category::name() const
+	const char* http_error_category::name() const throw()
 	{
 		return "http error";
 	}
 
-	std::string http_error_category::message(int ev) const
+	std::string http_error_category::message(int ev) const throw()
 	{
 		std::string ret;
 		ret += to_string(ev).elems;