diff --git a/ChangeLog b/ChangeLog
index 9a14c2e74..7692b86e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -113,6 +113,7 @@
 	* fixed issue with disk read cache not being cleared when removing torrents
 	* made the DHT socket bind to the same interface as the session
 	* fixed issue where an http proxy would not be used on redirects
+	* Solaris build fixes
 
 release 0.14.9
 
diff --git a/include/libtorrent/aux_/session_impl.hpp b/include/libtorrent/aux_/session_impl.hpp
index 73feceb89..8b89edc53 100644
--- a/include/libtorrent/aux_/session_impl.hpp
+++ b/include/libtorrent/aux_/session_impl.hpp
@@ -87,6 +87,10 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <fstream>
 #endif
 
+#if TORRENT_COMPLETE_TYPES_REQUIRED
+#include "libtorrent/peer_connection.hpp"
+#endif
+
 namespace libtorrent
 {
 
diff --git a/include/libtorrent/config.hpp b/include/libtorrent/config.hpp
index cb6392ccf..52f13ade9 100644
--- a/include/libtorrent/config.hpp
+++ b/include/libtorrent/config.hpp
@@ -151,6 +151,7 @@ POSSIBILITY OF SUCH DAMAGE.
 // ==== SOLARIS ===
 #elif defined sun || defined __sun 
 #define TORRENT_SOLARIS
+#define TORRENT_COMPLETE_TYPES_REQUIRED 1
 
 // ==== BEOS ===
 #elif defined __BEOS__ || defined __HAIKU__
@@ -256,6 +257,10 @@ inline int snprintf(char* buf, int len, char const* fmt, ...)
 #define TORRENT_DEPRECATED
 #endif
 
+#ifndef TORRENT_COMPLETE_TYPES_REQUIRED
+#define TORRENT_COMPLETE_TYPES_REQUIRED 0
+#endif
+
 #ifndef TORRENT_USE_RLIMIT
 #define TORRENT_USE_RLIMIT 1
 #endif
diff --git a/include/libtorrent/entry.hpp b/include/libtorrent/entry.hpp
index 3efd2ceaa..8f8eaa596 100644
--- a/include/libtorrent/entry.hpp
+++ b/include/libtorrent/entry.hpp
@@ -163,7 +163,7 @@ namespace libtorrent
 
 		data_type m_type;
 
-#if defined(_MSC_VER) && _MSC_VER < 1310
+#if (defined(_MSC_VER) && _MSC_VER < 1310) || TORRENT_COMPLETE_TYPES_REQUIRED
 		// workaround for msvc-bug.
 		// assumes sizeof(map<string, char>) == sizeof(map<string, entry>)
 		// and sizeof(list<char>) == sizeof(list<entry>)
diff --git a/include/libtorrent/torrent.hpp b/include/libtorrent/torrent.hpp
index 1f28fd0b9..8b34176c4 100644
--- a/include/libtorrent/torrent.hpp
+++ b/include/libtorrent/torrent.hpp
@@ -74,6 +74,10 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/deadline_timer.hpp"
 #include "libtorrent/union_endpoint.hpp"
 
+#if TORRENT_COMPLETE_TYPES_REQUIRED
+#include "libtorrent/peer_connection.hpp"
+#endif
+
 namespace libtorrent
 {
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING