From 476c2c60d7c219872f2e0534c01a3701bedb4845 Mon Sep 17 00:00:00 2001
From: Alexander Akulich <akulichalexander@gmail.com>
Date: Sat, 9 Jan 2021 16:40:30 +0300
Subject: [PATCH] Cleanup includes

See the upstream commit 24bda2faa0a2b621aa24f3b1e2f6c6d6d9eabd9b
---
 src/game/server/entities/character.cpp | 1 +
 src/game/server/entities/character.h   | 4 ----
 src/game/server/gamecontext.cpp        | 2 +-
 src/game/server/gamecontext.h          | 6 ++++--
 src/game/server/player.cpp             | 2 --
 src/game/server/player.h               | 4 ++--
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp
index a3f820f87..d006e3a0d 100644
--- a/src/game/server/entities/character.cpp
+++ b/src/game/server/entities/character.cpp
@@ -2,6 +2,7 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include <antibot/antibot_data.h>
 #include <engine/shared/config.h>
+#include <game/generated/server_data.h>
 #include <game/mapitems.h>
 #include <game/server/gamecontext.h>
 #include <game/server/player.h>
diff --git a/src/game/server/entities/character.h b/src/game/server/entities/character.h
index 6e6b75174..c61747c8b 100644
--- a/src/game/server/entities/character.h
+++ b/src/game/server/entities/character.h
@@ -4,13 +4,9 @@
 #define GAME_SERVER_ENTITIES_CHARACTER_H
 
 #include <engine/antibot.h>
-#include <game/generated/protocol.h>
-#include <game/generated/server_data.h>
 #include <game/server/entity.h>
 #include <game/server/save.h>
 
-#include <game/gamecore.h>
-
 class CAntibot;
 class CGameTeams;
 struct CAntibotCharacterData;
diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp
index 721c0f3c4..03993d968 100644
--- a/src/game/server/gamecontext.cpp
+++ b/src/game/server/gamecontext.cpp
@@ -13,11 +13,11 @@
 #include <engine/shared/config.h>
 #include <engine/shared/datafile.h>
 #include <engine/shared/linereader.h>
+#include <engine/shared/memheap.h>
 #include <engine/storage.h>
 #include <game/collision.h>
 #include <game/gamecore.h>
 #include <game/version.h>
-#include <new>
 #include <string.h>
 
 #include <game/generated/protocol7.h>
diff --git a/src/game/server/gamecontext.h b/src/game/server/gamecontext.h
index 97295d810..656285322 100644
--- a/src/game/server/gamecontext.h
+++ b/src/game/server/gamecontext.h
@@ -6,7 +6,6 @@
 #include <engine/antibot.h>
 #include <engine/console.h>
 #include <engine/server.h>
-#include <engine/shared/memheap.h>
 
 #include <game/layers.h>
 #include <game/mapbugs.h>
@@ -16,7 +15,7 @@
 #include <base/tl/string.h>
 
 #include "eventhandler.h"
-#include "gamecontroller.h"
+//#include "gamecontroller.h"
 #include "gameworld.h"
 #include "teehistorian.h"
 
@@ -57,8 +56,11 @@ enum
 	NUM_TUNEZONES = 256
 };
 
+class CHeap;
+class CPlayer;
 class CScore;
 class IConsole;
+class IGameController;
 class IEngine;
 class IStorage;
 struct CAntibotData;
diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp
index 2da2061c4..fdefe56f4 100644
--- a/src/game/server/player.cpp
+++ b/src/game/server/player.cpp
@@ -2,7 +2,6 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include "player.h"
 #include <engine/shared/config.h>
-#include <new>
 
 #include "entities/character.h"
 #include "gamecontext.h"
@@ -11,7 +10,6 @@
 #include <game/gamecore.h>
 #include <game/server/teams.h>
 #include <game/version.h>
-#include <time.h>
 
 MACRO_ALLOC_POOL_ID_IMPL(CPlayer, MAX_CLIENTS)
 
diff --git a/src/game/server/player.h b/src/game/server/player.h
index 61efac4b3..afc26d68f 100644
--- a/src/game/server/player.h
+++ b/src/game/server/player.h
@@ -3,11 +3,11 @@
 #ifndef GAME_SERVER_PLAYER_H
 #define GAME_SERVER_PLAYER_H
 
+#include "alloc.h"
+
 // this include should perhaps be removed
-#include "gamecontext.h"
 #include "score.h"
 #include "teeinfo.h"
-#include <memory>
 
 enum
 {