diff --git a/src/client/Client-gl.cc b/src/client/Client-gl.cc
index a575d13..e92dc45 100644
--- a/src/client/Client-gl.cc
+++ b/src/client/Client-gl.cc
@@ -7,6 +7,7 @@
 #include "Client.h"
 #include "ccfs.h"
 #include "HexTile.h"
+#include "GameParams.h"
 
 using namespace std;
 
diff --git a/src/client/Client.cc b/src/client/Client.cc
index 2f97d0b..553728b 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -7,14 +7,10 @@
 #include <math.h>
 #include "Client.h"
 #include "Types.h"
+#include "GameParams.h"
 
 using namespace std;
 
-/* TODO: this should be moved to common somewhere */
-#define MAX_SHOT_DISTANCE 250.0
-#define SHOT_EXPAND_SPEED 75.0
-#define DEFAULT_PORT 59243
-
 Client::Client(const string & exe_path)
 {
     m_client_has_focus = true;
diff --git a/src/client/Client.h b/src/client/Client.h
index 9b8b625..19dcc75 100644
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -17,8 +17,6 @@
 #include "Network.h"
 #include <SFGUI/SFGUI.hpp>
 
-#define SHOT_RING_WIDTH 10.0f
-
 enum
 {
     MAIN_MENU_NONE,
diff --git a/src/common/GameParams.h b/src/common/GameParams.h
new file mode 100644
index 0000000..9c6545c
--- /dev/null
+++ b/src/common/GameParams.h
@@ -0,0 +1,9 @@
+#ifndef GAMEPARAMS_H
+#define GAMEPARAMS_H
+
+#define DEFAULT_PORT 59243
+#define MAX_SHOT_DISTANCE 250.0
+#define SHOT_EXPAND_SPEED 75.0
+#define SHOT_RING_WIDTH 10.0f
+
+#endif
diff --git a/src/server/main.cc b/src/server/main.cc
index 71e6dbe..457dd17 100644
--- a/src/server/main.cc
+++ b/src/server/main.cc
@@ -1,10 +1,11 @@
 #include <getopt.h>
 #include <stdlib.h>
 #include "Server.h"
+#include "GameParams.h"
 
 int main(int argc, char *argv[])
 {
-    int port = 59243;
+    int port = DEFAULT_PORT;
     for (;;)
     {
         static struct option long_options[] = {