diff --git a/pokerth_lib.pro b/pokerth_lib.pro
index 86918c2a..2e08eb58 100644
--- a/pokerth_lib.pro
+++ b/pokerth_lib.pro
@@ -80,7 +80,7 @@ HEADERS += \
 		src/net/servercontext.h \
 		src/net/serverexception.h \
 		src/net/serveraccepthelper.h \
-		src/net/servergamethread.h \
+		src/net/servergame.h \
 		src/net/servergamestate.h \
 		src/net/serverlobbythread.h \
 		src/net/servercallback.h \
@@ -182,7 +182,7 @@ SOURCES += \
 		src/net/common/servercontext.cpp \
 		src/net/common/serverexception.cpp \
 		src/net/common/serveraccepthelper.cpp \
-		src/net/common/servergamethread.cpp \
+		src/net/common/servergame.cpp \
 		src/net/common/servergamestate.cpp \
 		src/net/common/serverlobbythread.cpp \
 		src/net/common/servercallback.cpp \
diff --git a/src/net/common/servergamethread.cpp b/src/net/common/servergame.cpp
similarity index 99%
rename from src/net/common/servergamethread.cpp
rename to src/net/common/servergame.cpp
index 1e2ffdb0..7de4613e 100644
--- a/src/net/common/servergamethread.cpp
+++ b/src/net/common/servergame.cpp
@@ -17,7 +17,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <net/servergamethread.h>
+#include <net/servergame.h>
 #include <net/servergamestate.h>
 #include <net/serverlobbythread.h>
 #include <net/serverexception.h>
diff --git a/src/net/common/servergamestate.cpp b/src/net/common/servergamestate.cpp
index 294a101e..297e0446 100644
--- a/src/net/common/servergamestate.cpp
+++ b/src/net/common/servergamestate.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 #include <net/servergamestate.h>
-#include <net/servergamethread.h>
+#include <net/servergame.h>
 #include <net/serverlobbythread.h>
 #include <net/receiverhelper.h>
 #include <net/senderhelper.h>
diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp
index 6295f17e..116bf9a7 100644
--- a/src/net/common/serverlobbythread.cpp
+++ b/src/net/common/serverlobbythread.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 #include <net/serverlobbythread.h>
-#include <net/servergamethread.h>
+#include <net/servergame.h>
 #include <net/serverexception.h>
 #include <net/senderhelper.h>
 #include <net/sendercallback.h>
diff --git a/src/net/servergamethread.h b/src/net/servergame.h
similarity index 100%
rename from src/net/servergamethread.h
rename to src/net/servergame.h
diff --git a/src/net/servergamestate.h b/src/net/servergamestate.h
index 6d156164..c73038f7 100644
--- a/src/net/servergamestate.h
+++ b/src/net/servergamestate.h
@@ -21,8 +21,8 @@
 #ifndef _SERVERGAMESTATE_H_
 #define _SERVERGAMESTATE_H_
 
-#include <net/servergamethread.h>
 #include <playerdata.h>
+#include <net/sessionmanager.h>
 
 
 #ifdef _MSC_VER
@@ -33,6 +33,7 @@
 #define SERVER_INITIAL_STATE	ServerGameStateInit
 
 class Game;
+class ServerGameThread;
 class PlayerInterface;
 class ServerCallback;