diff --git a/src/game_defs.h b/src/game_defs.h
index 89cfa9ad..d8136cef 100644
--- a/src/game_defs.h
+++ b/src/game_defs.h
@@ -35,6 +35,14 @@
 #define POKERTH_BETA_REVISION	1
 #define POKERTH_BETA_RELEASE_STRING	"0.8-beta1"
 
+#define RANKING_GAME_START_CASH 10000
+#ifdef POKERTH_IS_08BETA
+	#define RANKING_GAME_NUMBER_OF_PLAYERS 5
+#else
+	#define RANKING_GAME_NUMBER_OF_PLAYERS 10
+#endif
+#define RANKING_GAME_START_SBLIND 50
+#define RANKING_GAME_RAISE_EVERY_HAND 11
 
 enum ServerMode {
     SERVER_MODE_LAN,
diff --git a/src/gamedata.h b/src/gamedata.h
index 1d8fc4a5..0c8b8bf4 100644
--- a/src/gamedata.h
+++ b/src/gamedata.h
@@ -25,8 +25,6 @@
 #include <string>
 #include <third_party/boost/timers.hpp>
 
-#define SERVER_COMPUTER_PLAYER_NAME			"Computer"
-#define SERVER_GUEST_PLAYER_NAME			"Guest"
 
 typedef std::list<unsigned> PlayerIdList;
 
diff --git a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp
index 5dd9c1b6..da741b66 100644
--- a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp
+++ b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp
@@ -24,18 +24,6 @@
 #include "changecompleteblindsdialogimpl.h"
 
 
-#define RANKING_GAME_START_CASH 10000
-
-#ifdef POKERTH_IS_08BETA
-    #define RANKING_GAME_NUMBER_OF_PLAYERS 5
-#else
-    #define RANKING_GAME_NUMBER_OF_PLAYERS 10
-#endif
-
-#define RANKING_GAME_START_SBLIND 50
-#define RANKING_GAME_RAISE_EVERY_HAND 11
-
-
 createInternetGameDialogImpl::createInternetGameDialogImpl(QWidget *parent, ConfigFile *c)
       : QDialog(parent), myConfig(c), currentGuestMode(false), currentPlayerName("")
 {
diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp
index 62c36941..9495cd39 100644
--- a/src/net/common/clientthread.cpp
+++ b/src/net/common/clientthread.cpp
@@ -27,6 +27,7 @@
 #include <net/downloaderthread.h>
 #include <net/clientexception.h>
 #include <net/socket_msg.h>
+#include <net/net_helper.h>
 #include <core/avatarmanager.h>
 #include <core/loghelper.h>
 #include <clientenginefactory.h>
diff --git a/src/net/common/servergamestate.cpp b/src/net/common/servergamestate.cpp
index 19a327d7..a623432e 100644
--- a/src/net/common/servergamestate.cpp
+++ b/src/net/common/servergamestate.cpp
@@ -25,6 +25,7 @@
 #include <net/netpacket.h>
 #include <net/socket_msg.h>
 #include <net/serverexception.h>
+#include <net/net_helper.h>
 #include <db/serverdbinterface.h>
 #include <core/loghelper.h>
 #include <gamedata.h>
diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp
index 48330c06..dcd12012 100644
--- a/src/net/common/serverlobbythread.cpp
+++ b/src/net/common/serverlobbythread.cpp
@@ -27,6 +27,7 @@
 #include <net/receiverhelper.h>
 #include <net/socket_msg.h>
 #include <net/chatcleanermanager.h>
+#include <net/net_helper.h>
 #include <db/serverdbinterface.h>
 #ifdef POKERTH_OFFICIAL_SERVER
 	#include <dbclosed/serverdbfactoryinternal.h>
diff --git a/src/net/net_helper.h b/src/net/net_helper.h
index 28cd1571..65ac947f 100644
--- a/src/net/net_helper.h
+++ b/src/net/net_helper.h
@@ -20,6 +20,9 @@
 #ifndef _NET_HELPER_H_
 #define _NET_HELPER_H_
 
+#define SERVER_COMPUTER_PLAYER_NAME			"Computer"
+#define SERVER_GUEST_PLAYER_NAME			"Guest"
+
 unsigned GetMaxNumberOfAvatarFiles();
 unsigned GetMaxAvatarCacheAgeSec();