diff --git a/src/game/server/ddracechat.cpp b/src/game/server/ddracechat.cpp
index e771ad377..5c3c54a54 100644
--- a/src/game/server/ddracechat.cpp
+++ b/src/game/server/ddracechat.cpp
@@ -8,6 +8,7 @@
 #include <game/version.h>
 
 #include "entities/character.h"
+#include "player.h"
 
 bool CheckClientID(int ClientID);
 
diff --git a/src/game/server/ddracecommands.cpp b/src/game/server/ddracecommands.cpp
index e3a10cc8e..9f0986df5 100644
--- a/src/game/server/ddracecommands.cpp
+++ b/src/game/server/ddracecommands.cpp
@@ -3,6 +3,7 @@
 #include <engine/shared/config.h>
 #include <game/server/entities/character.h>
 #include <game/server/gamemodes/DDRace.h>
+#include <game/server/player.h>
 #include <game/server/save.h>
 #include <game/server/teams.h>
 #include <game/version.h>
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp
index 4fffa4337..a3f820f87 100644
--- a/src/game/server/entities/character.cpp
+++ b/src/game/server/entities/character.cpp
@@ -4,6 +4,7 @@
 #include <engine/shared/config.h>
 #include <game/mapitems.h>
 #include <game/server/gamecontext.h>
+#include <game/server/player.h>
 #include <new>
 
 #include "character.h"
diff --git a/src/game/server/entities/door.cpp b/src/game/server/entities/door.cpp
index 00f43c8b2..7a6289c49 100644
--- a/src/game/server/entities/door.cpp
+++ b/src/game/server/entities/door.cpp
@@ -3,6 +3,7 @@
 #include <game/generated/protocol.h>
 #include <game/server/gamecontext.h>
 #include <game/server/gamemodes/DDRace.h>
+#include <game/server/player.h>
 
 #include "character.h"
 #include "door.h"
diff --git a/src/game/server/entities/dragger.cpp b/src/game/server/entities/dragger.cpp
index 847d4151f..bfd029451 100644
--- a/src/game/server/entities/dragger.cpp
+++ b/src/game/server/entities/dragger.cpp
@@ -6,6 +6,7 @@
 #include <game/generated/protocol.h>
 #include <game/server/gamecontext.h>
 #include <game/server/gamemodes/DDRace.h>
+#include <game/server/player.h>
 #include <game/server/teams.h>
 
 #include "character.h"
diff --git a/src/game/server/entities/gun.cpp b/src/game/server/entities/gun.cpp
index 438eb2375..16968f741 100644
--- a/src/game/server/entities/gun.cpp
+++ b/src/game/server/entities/gun.cpp
@@ -3,6 +3,7 @@
 #include <engine/shared/config.h>
 #include <game/generated/protocol.h>
 #include <game/server/gamecontext.h>
+#include <game/server/player.h>
 #include <game/server/teams.h>
 
 #include "character.h"
diff --git a/src/game/server/entities/light.cpp b/src/game/server/entities/light.cpp
index 8d8c6b426..dba69583c 100644
--- a/src/game/server/entities/light.cpp
+++ b/src/game/server/entities/light.cpp
@@ -5,6 +5,7 @@
 #include <game/generated/protocol.h>
 #include <game/mapitems.h>
 #include <game/server/gamecontext.h>
+#include <game/server/player.h>
 
 #include "character.h"
 
diff --git a/src/game/server/entities/pickup.cpp b/src/game/server/entities/pickup.cpp
index 1bed75d6d..39304e87b 100644
--- a/src/game/server/entities/pickup.cpp
+++ b/src/game/server/entities/pickup.cpp
@@ -3,6 +3,7 @@
 #include "pickup.h"
 #include <game/generated/protocol.h>
 #include <game/server/gamecontext.h>
+#include <game/server/player.h>
 
 #include <game/server/teams.h>
 
diff --git a/src/game/server/entities/plasma.cpp b/src/game/server/entities/plasma.cpp
index c5e3b5417..72135002a 100644
--- a/src/game/server/entities/plasma.cpp
+++ b/src/game/server/entities/plasma.cpp
@@ -5,6 +5,7 @@
 #include <game/generated/protocol.h>
 #include <game/server/gamecontext.h>
 #include <game/server/gamemodes/DDRace.h>
+#include <game/server/player.h>
 #include <game/server/teams.h>
 
 #include "character.h"
diff --git a/src/game/server/entities/projectile.cpp b/src/game/server/entities/projectile.cpp
index 12e89307c..f59fb1727 100644
--- a/src/game/server/entities/projectile.cpp
+++ b/src/game/server/entities/projectile.cpp
@@ -4,6 +4,7 @@
 #include <game/generated/protocol.h>
 #include <game/server/gamecontext.h>
 #include <game/server/gamemodes/DDRace.h>
+#include <game/server/player.h>
 
 #include <engine/shared/config.h>
 #include <game/server/teams.h>
diff --git a/src/game/server/entity.cpp b/src/game/server/entity.cpp
index ff6ad34df..3238c8ea3 100644
--- a/src/game/server/entity.cpp
+++ b/src/game/server/entity.cpp
@@ -3,6 +3,7 @@
 
 #include "entity.h"
 #include "gamecontext.h"
+#include "player.h"
 
 //////////////////////////////////////////////////
 // Entity
diff --git a/src/game/server/eventhandler.cpp b/src/game/server/eventhandler.cpp
index 5e68b2591..30e0e40e4 100644
--- a/src/game/server/eventhandler.cpp
+++ b/src/game/server/eventhandler.cpp
@@ -2,6 +2,7 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include "eventhandler.h"
 #include "gamecontext.h"
+#include "player.h"
 
 //////////////////////////////////////////////////
 // Event handler
diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp
index 1ef787007..721c0f3c4 100644
--- a/src/game/server/gamecontext.cpp
+++ b/src/game/server/gamecontext.cpp
@@ -25,6 +25,7 @@
 
 #include "entities/character.h"
 #include "gamemodes/DDRace.h"
+#include "player.h"
 #include "score.h"
 
 enum
diff --git a/src/game/server/gamecontext.h b/src/game/server/gamecontext.h
index 3ae76729c..97295d810 100644
--- a/src/game/server/gamecontext.h
+++ b/src/game/server/gamecontext.h
@@ -18,7 +18,6 @@
 #include "eventhandler.h"
 #include "gamecontroller.h"
 #include "gameworld.h"
-#include "player.h"
 #include "teehistorian.h"
 
 #include <memory>
diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp
index 1ab221529..05e8167d4 100644
--- a/src/game/server/gamecontroller.cpp
+++ b/src/game/server/gamecontroller.cpp
@@ -9,6 +9,7 @@
 #include "entities/pickup.h"
 #include "gamecontext.h"
 #include "gamecontroller.h"
+#include "player.h"
 
 #include "entities/door.h"
 #include "entities/dragger.h"
diff --git a/src/game/server/gameworld.cpp b/src/game/server/gameworld.cpp
index 2926c243b..f3d314332 100644
--- a/src/game/server/gameworld.cpp
+++ b/src/game/server/gameworld.cpp
@@ -5,6 +5,7 @@
 #include "entities/character.h"
 #include "entity.h"
 #include "gamecontext.h"
+#include "player.h"
 #include <algorithm>
 #include <engine/shared/config.h>
 #include <utility>
diff --git a/src/game/server/save.cpp b/src/game/server/save.cpp
index b862671b3..252d410d3 100644
--- a/src/game/server/save.cpp
+++ b/src/game/server/save.cpp
@@ -5,6 +5,7 @@
 
 #include "entities/character.h"
 #include "gamemodes/DDRace.h"
+#include "player.h"
 #include "teams.h"
 #include <engine/shared/config.h>
 
diff --git a/src/game/server/score.cpp b/src/game/server/score.cpp
index 128e99250..4640d78b1 100644
--- a/src/game/server/score.cpp
+++ b/src/game/server/score.cpp
@@ -1,6 +1,7 @@
 #include "score.h"
 #include "entities/character.h"
 #include "gamemodes/DDRace.h"
+#include "player.h"
 #include "save.h"
 
 #include <base/system.h>
diff --git a/src/game/server/teams.cpp b/src/game/server/teams.cpp
index 6a1b49ea1..79763eae0 100644
--- a/src/game/server/teams.cpp
+++ b/src/game/server/teams.cpp
@@ -5,6 +5,7 @@
 #include <engine/shared/config.h>
 
 #include "entities/character.h"
+#include "player.h"
 
 CGameTeams::CGameTeams(CGameContext *pGameContext) :
 	m_pGameContext(pGameContext)
diff --git a/src/game/server/teams.h b/src/game/server/teams.h
index 43c48ee5b..0ee347c96 100644
--- a/src/game/server/teams.h
+++ b/src/game/server/teams.h
@@ -4,6 +4,7 @@
 
 #include <engine/shared/config.h>
 #include <game/server/gamecontext.h>
+#include <game/server/score.h>
 #include <game/teamscore.h>
 
 #include <utility>