diff --git a/src/net/clientthread.h b/src/net/clientthread.h
index 4950c243..7173228c 100644
--- a/src/net/clientthread.h
+++ b/src/net/clientthread.h
@@ -26,7 +26,6 @@
 #include <playerdata.h>
 #include <gamedata.h>
 #include <string>
-#include <memory>
 #include <boost/shared_ptr.hpp>
 
 class ClientContext;
@@ -151,14 +150,14 @@ private:
 	NetPacketList m_outPacketList;
 	mutable boost::mutex m_outPacketListMutex;
 
-	std::auto_ptr<ClientContext> m_context;
-	std::auto_ptr<ClientSenderCallback> m_senderCallback;
+	boost::shared_ptr<ClientContext> m_context;
+	boost::shared_ptr<ClientSenderCallback> m_senderCallback;
 	ClientState *m_curState;
 	GuiInterface &m_gui;
 	AvatarManager &m_avatarManager;
 
-	std::auto_ptr<SenderThread> m_sender;
-	std::auto_ptr<ReceiverHelper> m_receiver;
+	boost::shared_ptr<SenderThread> m_sender;
+	boost::shared_ptr<ReceiverHelper> m_receiver;
 
 	GameData m_gameData;
 	StartData m_startData;
diff --git a/src/net/resolverthread.h b/src/net/resolverthread.h
index 6aa1b5ec..85a95663 100644
--- a/src/net/resolverthread.h
+++ b/src/net/resolverthread.h
@@ -23,7 +23,7 @@
 
 #include <core/thread.h>
 #include <string>
-#include <memory>
+#include <boost/shared_ptr.hpp>
 
 class ClientContext;
 
@@ -53,7 +53,7 @@ protected:
 
 private:
 
-	std::auto_ptr<ClientContext> m_context;
+	boost::shared_ptr<ClientContext> m_context;
 	bool m_retVal;
 };
 
diff --git a/src/net/serveracceptthread.h b/src/net/serveracceptthread.h
index c6b80fd0..3087a3dc 100644
--- a/src/net/serveracceptthread.h
+++ b/src/net/serveracceptthread.h
@@ -25,7 +25,6 @@
 #include <core/thread.h>
 #include <gui/guiinterface.h>
 #include <string>
-#include <memory>
 
 class ServerContext;
 class ServerLobbyThread;
@@ -61,8 +60,8 @@ protected:
 	ServerLobbyThread &GetLobbyThread();
 
 private:
-	std::auto_ptr<ServerContext> m_context;
-	std::auto_ptr<ServerLobbyThread> m_lobbyThread;
+	boost::shared_ptr<ServerContext> m_context;
+	boost::shared_ptr<ServerLobbyThread> m_lobbyThread;
 
 	GuiInterface &m_gui;
 };
diff --git a/src/net/servergamethread.h b/src/net/servergamethread.h
index 37de7932..f06b96e1 100644
--- a/src/net/servergamethread.h
+++ b/src/net/servergamethread.h
@@ -133,8 +133,8 @@ private:
 	mutable boost::mutex m_adminPlayerIdMutex;
 
 	ServerLobbyThread &m_lobbyThread;
-	std::auto_ptr<ReceiverHelper> m_receiver;
-	std::auto_ptr<SenderThread> m_sender;
+	boost::shared_ptr<ReceiverHelper> m_receiver;
+	boost::shared_ptr<SenderThread> m_sender;
 	boost::shared_ptr<GameSenderCallback> m_senderCallback;
 	GuiInterface &m_gui;
 
diff --git a/src/net/serverlobbythread.h b/src/net/serverlobbythread.h
index a2bdbf47..b1670120 100644
--- a/src/net/serverlobbythread.h
+++ b/src/net/serverlobbythread.h
@@ -164,8 +164,8 @@ private:
 
 	GameMap m_gameMap;
 
-	std::auto_ptr<ReceiverHelper> m_receiver;
-	std::auto_ptr<SenderThread> m_sender;
+	boost::shared_ptr<ReceiverHelper> m_receiver;
+	boost::shared_ptr<SenderThread> m_sender;
 	boost::shared_ptr<ServerSenderCallback> m_senderCallback;
 	GuiInterface &m_gui;
 	AvatarManager &m_avatarManager;