Organize game-client includes

2024-11-10 01:58:19 +00:00 · 2022-05-29 18:33:38 +02:00 · 2022-05-29 18:33:38 +02:00 · 91d2ba1865
parent 06cd4e9ab3
commit 91d2ba1865
71 changed files with 74 additions and 166 deletions
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@ -48,6 +48,7 @@

 #include <base/system.h>

+#include <game/localization.h>
 #include <game/version.h>

 #include <engine/client/demoedit.h>
--- a/src/game/client/animstate.cpp
+++ b/src/game/client/animstate.cpp
@ -3,7 +3,6 @@

 #include <base/math.h>
 #include <game/generated/client_data.h>
-#include <game/generated/protocol.h>

 #include "animstate.h"

--- a/src/game/client/component.h
+++ b/src/game/client/component.h
@ -7,15 +7,8 @@
 #include <engine/shared/video.h>
 #endif

-#include <base/color.h>
 #include <engine/input.h>

-#include <engine/client.h>
-#include <engine/console.h>
-#include <game/localization.h>
-
-#include <engine/config.h>
-
 class CGameClient;

 /**
--- a/src/game/client/components/background.cpp
+++ b/src/game/client/components/background.cpp
@ -1,10 +1,8 @@
 #include <base/system.h>

-#include <engine/graphics.h>
 #include <engine/map.h>
 #include <engine/shared/config.h>

-#include <game/client/components/camera.h>
 #include <game/client/components/mapimages.h>
 #include <game/client/components/maplayers.h>

--- a/src/game/client/components/binds.h
+++ b/src/game/client/components/binds.h
@ -2,10 +2,11 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #ifndef GAME_CLIENT_COMPONENTS_BINDS_H
 #define GAME_CLIENT_COMPONENTS_BINDS_H
-#include <engine/keys.h>
-#include <game/client/component.h>

-#include "console.h"
+#include <engine/console.h>
+#include <engine/keys.h>
+
+#include <game/client/component.h>

 class IConfigManager;

--- a/src/game/client/components/broadcast.cpp
+++ b/src/game/client/components/broadcast.cpp
@ -3,7 +3,7 @@
 #include <engine/graphics.h>
 #include <engine/shared/config.h>
 #include <engine/textrender.h>
-#include <game/generated/client_data.h>
+
 #include <game/generated/protocol.h>

 #include <game/client/gameclient.h>
--- a/src/game/client/components/camera.cpp
+++ b/src/game/client/components/camera.cpp
@ -4,14 +4,12 @@
 #include <engine/shared/config.h>

 #include <base/math.h>
-#include <game/client/component.h>
 #include <game/client/gameclient.h>
 #include <game/collision.h>

 #include "camera.h"
 #include "controls.h"

-#include <engine/serverbrowser.h>
 #include <limits>

 const float ZoomStep = 0.866025f;
--- a/src/game/client/components/camera.h
+++ b/src/game/client/components/camera.h
@ -3,6 +3,10 @@
 #ifndef GAME_CLIENT_COMPONENTS_CAMERA_H
 #define GAME_CLIENT_COMPONENTS_CAMERA_H
 #include <base/vmath.h>
+
+#include <engine/client.h>
+#include <engine/console.h>
+
 #include <game/bezier.h>
 #include <game/client/component.h>

--- a/src/game/client/components/chat.cpp
+++ b/src/game/client/components/chat.cpp
@ -2,14 +2,12 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */

 #include <engine/editor.h>
-#include <engine/engine.h>
 #include <engine/graphics.h>
 #include <engine/keys.h>
 #include <engine/shared/config.h>
 #include <engine/shared/csv.h>
 #include <engine/textrender.h>

-#include <game/generated/client_data.h>
 #include <game/generated/protocol.h>

 #include <game/client/animstate.h>
--- a/src/game/client/components/chat.h
+++ b/src/game/client/components/chat.h
@ -4,6 +4,7 @@
 #define GAME_CLIENT_COMPONENTS_CHAT_H
 #include <vector>

+#include <engine/console.h>
 #include <engine/shared/config.h>
 #include <engine/shared/ringbuffer.h>

--- a/src/game/client/components/console.cpp
+++ b/src/game/client/components/console.cpp
@ -14,21 +14,16 @@
 #include <engine/console.h>
 #include <engine/graphics.h>
 #include <engine/keys.h>
-#include <engine/serverbrowser.h>
 #include <engine/shared/config.h>
 #include <engine/shared/ringbuffer.h>
 #include <engine/storage.h>
 #include <engine/textrender.h>

-#include <cstdio>
-#include <cstring>
-
 #include <game/client/ui.h>

+#include <game/localization.h>
 #include <game/version.h>

-#include <game/client/components/controls.h>
-#include <game/client/components/menus.h>
 #include <game/client/lineinput.h>
 #include <game/client/render.h>

--- a/src/game/client/components/controls.cpp
+++ b/src/game/client/components/controls.cpp
@ -4,10 +4,8 @@

 #include <SDL.h>

-#include <engine/serverbrowser.h>
 #include <engine/shared/config.h>

-#include <game/client/component.h>
 #include <game/client/components/camera.h>
 #include <game/client/components/chat.h>
 #include <game/client/components/menus.h>
--- a/src/game/client/components/controls.h
+++ b/src/game/client/components/controls.h
@ -2,11 +2,14 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #ifndef GAME_CLIENT_COMPONENTS_CONTROLS_H
 #define GAME_CLIENT_COMPONENTS_CONTROLS_H
-#include <SDL_joystick.h>
-#include <base/system.h>
-#include <base/vmath.h>
-#include <game/client/component.h>

+#include <SDL_joystick.h>
+
+#include <base/vmath.h>
+
+#include <engine/client.h>
+
+#include <game/client/component.h>
 #include <game/generated/protocol.h>

 class CControls : public CComponent
--- a/src/game/client/components/countryflags.cpp
+++ b/src/game/client/components/countryflags.cpp
@ -8,7 +8,6 @@
 #include <engine/shared/config.h>
 #include <engine/shared/linereader.h>
 #include <engine/storage.h>
-#include <engine/textrender.h>

 #include "countryflags.h"

--- a/src/game/client/components/countryflags.h
+++ b/src/game/client/components/countryflags.h
@ -2,7 +2,7 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #ifndef GAME_CLIENT_COMPONENTS_COUNTRYFLAGS_H
 #define GAME_CLIENT_COMPONENTS_COUNTRYFLAGS_H
-#include <base/vmath.h>
+
 #include <game/client/component.h>
 #include <vector>

--- a/src/game/client/components/damageind.cpp
+++ b/src/game/client/components/damageind.cpp
@ -7,7 +7,6 @@

 #include "damageind.h"
 #include <game/client/render.h>
-#include <game/client/ui.h>

 #include <game/client/gameclient.h>

--- a/src/game/client/components/debughud.cpp
+++ b/src/game/client/components/debughud.cpp
@ -4,17 +4,12 @@
 #include <engine/shared/config.h>
 #include <engine/textrender.h>

-#include <game/generated/client_data.h>
 #include <game/generated/protocol.h>

-#include <game/layers.h>
-
-#include <game/client/animstate.h>
 #include <game/client/gameclient.h>
-#include <game/client/render.h>
+#include <game/client/prediction/entities/character.h>
+#include <game/localization.h>

-//#include "controls.h"
-//#include "camera.h"
 #include "debughud.h"

 void CDebugHud::RenderNetCorrections()
--- a/src/game/client/components/effects.cpp
+++ b/src/game/client/components/effects.cpp
@ -2,7 +2,6 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */

 #include <engine/demo.h>
-#include <engine/engine.h>

 #include <engine/shared/config.h>

@ -11,7 +10,6 @@
 #include <game/client/components/damageind.h>
 #include <game/client/components/flow.h>
 #include <game/client/components/particles.h>
-#include <game/client/components/skins.h>
 #include <game/client/components/sounds.h>
 #include <game/client/gameclient.h>

--- a/src/game/client/components/emoticon.cpp
+++ b/src/game/client/components/emoticon.cpp
@ -1,9 +1,7 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include <engine/graphics.h>
-#include <engine/serverbrowser.h>
 #include <engine/shared/config.h>
-#include <game/generated/client_data.h>
 #include <game/generated/protocol.h>

 #include "chat.h"
@ -11,7 +9,6 @@
 #include <game/client/animstate.h>
 #include <game/client/render.h>
 #include <game/client/ui.h>
-#include <game/gamecore.h> // get_angle

 #include <game/client/gameclient.h>

--- a/src/game/client/components/ghost.cpp
+++ b/src/game/client/components/ghost.cpp
@ -1,7 +1,6 @@
 /* (c) Rajh, Redix and Sushi. */

 #include <engine/ghost.h>
-#include <engine/serverbrowser.h>
 #include <engine/shared/config.h>
 #include <engine/storage.h>

--- a/src/game/client/components/hud.cpp
+++ b/src/game/client/components/hud.cpp
@ -1,7 +1,6 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include <engine/graphics.h>
-#include <engine/serverbrowser.h>
 #include <engine/shared/config.h>
 #include <engine/textrender.h>

@ -10,9 +9,10 @@
 #include <game/client/gameclient.h>
 #include <game/client/render.h>
 #include <game/generated/client_data.h>
-#include <game/generated/client_data7.h>
 #include <game/generated/protocol.h>
+
 #include <game/layers.h>
+#include <game/localization.h>

 #include <cmath>

--- a/src/game/client/components/items.cpp
+++ b/src/game/client/components/items.cpp
@ -4,16 +4,17 @@
 #include <engine/graphics.h>
 #include <engine/shared/config.h>
 #include <game/generated/client_data.h>
-#include <game/generated/client_data7.h>
 #include <game/generated/protocol.h>

 #include <game/client/gameclient.h>
 #include <game/client/projectile_data.h>
 #include <game/client/render.h>
-#include <game/client/ui.h>
+
+#include <game/client/prediction/entities/laser.h>
+#include <game/client/prediction/entities/pickup.h>
+#include <game/client/prediction/entities/projectile.h>

 #include <game/client/components/effects.h>
-#include <game/client/components/flow.h>

 #include "items.h"

--- a/src/game/client/components/mapimages.cpp
+++ b/src/game/client/components/mapimages.cpp
@ -2,10 +2,9 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include <engine/graphics.h>
 #include <engine/map.h>
-#include <engine/serverbrowser.h>
 #include <engine/storage.h>
 #include <engine/textrender.h>
-#include <game/client/component.h>
+#include <game/generated/client_data.h>
 #include <game/mapitems.h>

 #include <game/layers.h>
--- a/src/game/client/components/mapimages.h
+++ b/src/game/client/components/mapimages.h
@ -2,6 +2,9 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #ifndef GAME_CLIENT_COMPONENTS_MAPIMAGES_H
 #define GAME_CLIENT_COMPONENTS_MAPIMAGES_H
+
+#include <engine/graphics.h>
+
 #include <game/client/component.h>

 enum EMapImageEntityLayerType
--- a/src/game/client/components/maplayers.cpp
+++ b/src/game/client/components/maplayers.cpp
@ -7,7 +7,6 @@
 #include <engine/shared/config.h>
 #include <engine/storage.h>

-#include <game/client/component.h>
 #include <game/client/gameclient.h>
 #include <game/client/render.h>
 #include <game/layers.h>
@ -15,8 +14,6 @@
 #include <game/client/components/camera.h>
 #include <game/client/components/mapimages.h>

-#include <game/generated/client_data.h>
-
 #include "maplayers.h"

 #include <chrono>
--- a/src/game/client/components/mapsounds.cpp
+++ b/src/game/client/components/mapsounds.cpp
@ -1,5 +1,4 @@
 #include <engine/demo.h>
-#include <engine/engine.h>
 #include <engine/sound.h>

 #include <game/client/components/camera.h>
--- a/src/game/client/components/menu_background.cpp
+++ b/src/game/client/components/menu_background.cpp
@ -12,8 +12,6 @@

 #include <game/layers.h>

-#include <game/client/render.h>
-
 #include "menu_background.h"

 #include <chrono>
--- a/src/game/client/components/menus.cpp
+++ b/src/game/client/components/menus.cpp
@ -1,17 +1,15 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */

-#include <vector>
-
+#include <chrono>
 #include <cmath>
+#include <vector>

 #include <base/math.h>
 #include <base/system.h>
 #include <base/vmath.h>

-#include <engine/config.h>
 #include <engine/editor.h>
-#include <engine/engine.h>
 #include <engine/friends.h>
 #include <engine/graphics.h>
 #include <engine/keys.h>
@ -21,7 +19,6 @@
 #include <engine/textrender.h>

 #include <game/generated/protocol.h>
-#include <game/version.h>

 #include <engine/client/updater.h>

@ -30,18 +27,11 @@
 #include <game/client/components/menu_background.h>
 #include <game/client/components/sounds.h>
 #include <game/client/gameclient.h>
-#include <game/client/lineinput.h>
 #include <game/generated/client_data.h>
 #include <game/localization.h>

-#include "controls.h"
 #include "countryflags.h"
 #include "menus.h"
-#include "skins.h"
-
-#include <limits>
-
-#include <chrono>

 using namespace std::chrono_literals;

--- a/src/game/client/components/menus.h
+++ b/src/game/client/components/menus.h
@ -8,6 +8,7 @@
 #include <chrono>
 #include <vector>

+#include <engine/console.h>
 #include <engine/demo.h>
 #include <engine/friends.h>
 #include <engine/shared/config.h>
--- a/src/game/client/components/menus_browser.cpp
+++ b/src/game/client/components/menus_browser.cpp
@ -1,23 +1,16 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
-#include <engine/config.h>
 #include <engine/friends.h>
-#include <engine/graphics.h>
 #include <engine/keys.h>
 #include <engine/serverbrowser.h>
 #include <engine/shared/config.h>
 #include <engine/textrender.h>
-#include <engine/updater.h>
-
-#include <game/generated/client_data.h>
-#include <game/generated/protocol.h>

 #include <game/client/components/console.h>
 #include <game/client/components/countryflags.h>
 #include <game/client/render.h>
 #include <game/client/ui.h>
 #include <game/localization.h>
-#include <game/version.h>

 #include <game/client/gameclient.h>

--- a/src/game/client/components/menus_ingame.cpp
+++ b/src/game/client/components/menus_ingame.cpp
@ -3,7 +3,6 @@
 #include <base/math.h>
 #include <base/system.h>

-#include <engine/config.h>
 #include <engine/demo.h>
 #include <engine/friends.h>
 #include <engine/ghost.h>
--- a/src/game/client/components/menus_settings.cpp
+++ b/src/game/client/components/menus_settings.cpp
@ -3,7 +3,6 @@
 #include <base/math.h>
 #include <base/system.h>

-#include <engine/engine.h>
 #include <engine/graphics.h>
 #include <engine/shared/config.h>
 #include <engine/shared/linereader.h>
@ -11,7 +10,6 @@
 #include <engine/textrender.h>
 #include <engine/updater.h>

-#include <game/generated/client_data.h>
 #include <game/generated/protocol.h>

 #include <game/client/animstate.h>
@ -24,20 +22,16 @@
 #include <game/localization.h>

 #include "binds.h"
-#include "camera.h"
 #include "countryflags.h"
 #include "menus.h"
 #include "skins.h"

-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include <array>
-#include <numeric>
-
 #include <chrono>
+#include <memory>
+#include <numeric>
+#include <string>
+#include <vector>

 using namespace std::chrono_literals;

--- a/src/game/client/components/menus_settings_assets.cpp
+++ b/src/game/client/components/menus_settings_assets.cpp
@ -1,12 +1,10 @@
-#include "binds.h"
-
 #include <base/system.h>

-#include <engine/engine.h>
 #include <engine/shared/config.h>
 #include <engine/storage.h>
 #include <engine/textrender.h>
 #include <game/client/gameclient.h>
+#include <game/localization.h>

 #include "menus.h"

--- a/src/game/client/components/menus_start.cpp
+++ b/src/game/client/components/menus_start.cpp
@ -8,18 +8,18 @@
 #include <engine/client/updater.h>
 #include <engine/shared/config.h>

-#include <game/client/components/console.h>
-#include <game/client/render.h>
+#include <game/client/gameclient.h>
 #include <game/client/ui.h>
-#include <game/editor/editor.h>
-#include <game/version.h>

 #include <game/generated/client_data.h>
-
-#include <game/client/gameclient.h>
+#include <game/localization.h>

 #include "menus.h"

+#include <chrono>
+
+using namespace std::chrono_literals;
+
 void CMenus::RenderStartMenu(CUIRect MainView)
 {
 	// render logo
--- a/src/game/client/components/motd.cpp
+++ b/src/game/client/components/motd.cpp
@ -6,7 +6,6 @@
 #include <engine/textrender.h>

 #include <game/client/gameclient.h>
-#include <game/generated/client_data.h>
 #include <game/generated/protocol.h>

 #include "motd.h"
--- a/src/game/client/components/nameplates.cpp
+++ b/src/game/client/components/nameplates.cpp
@ -9,8 +9,8 @@
 #include "camera.h"
 #include "controls.h"
 #include "nameplates.h"
-#include <game/client/animstate.h>
 #include <game/client/gameclient.h>
+#include <game/client/prediction/entities/character.h>

 #include "players.h"

--- a/src/game/client/components/nameplates.h
+++ b/src/game/client/components/nameplates.h
@ -4,9 +4,7 @@
 #define GAME_CLIENT_COMPONENTS_NAMEPLATES_H
 #include <game/client/component.h>

-struct CNetObj_Character;
-struct CNetObj_PlayerInfo;
-struct CMapItemGroup;
+#include <game/generated/protocol.h>

 struct SPlayerNamePlate
 {
--- a/src/game/client/components/particles.cpp
+++ b/src/game/client/components/particles.cpp
@ -6,7 +6,6 @@

 #include "particles.h"
 #include <game/client/render.h>
-#include <game/gamecore.h>
 #include <game/generated/client_data.h>

 #include <game/client/gameclient.h>
--- a/src/game/client/components/players.cpp
+++ b/src/game/client/components/players.cpp
@ -2,9 +2,7 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */

 #include <engine/demo.h>
-#include <engine/engine.h>
 #include <engine/graphics.h>
-#include <engine/serverbrowser.h>
 #include <engine/shared/config.h>
 #include <game/generated/client_data.h>
 #include <game/generated/protocol.h>
@ -12,7 +10,6 @@
 #include <game/client/animstate.h>
 #include <game/client/gameclient.h>
 #include <game/client/render.h>
-#include <game/client/ui.h>

 #include <game/client/components/controls.h>
 #include <game/client/components/effects.h>
@ -20,8 +17,6 @@
 #include <game/client/components/skins.h>
 #include <game/client/components/sounds.h>

-#include <engine/textrender.h>
-
 #include "players.h"

 #include <base/color.h>
--- a/src/game/client/components/race_demo.cpp
+++ b/src/game/client/components/race_demo.cpp
@ -3,7 +3,6 @@
 #include <cctype>

 #include <base/system.h>
-#include <engine/serverbrowser.h>
 #include <engine/shared/config.h>
 #include <engine/storage.h>

--- a/src/game/client/components/scoreboard.cpp
+++ b/src/game/client/components/scoreboard.cpp
@ -5,13 +5,11 @@
 #include <engine/shared/config.h>
 #include <engine/textrender.h>

-#include <game/generated/client_data.h>
 #include <game/generated/protocol.h>

 #include <game/client/animstate.h>
 #include <game/client/components/countryflags.h>
 #include <game/client/components/motd.h>
-#include <game/client/components/skins.h>
 #include <game/client/components/statboard.h>
 #include <game/client/gameclient.h>
 #include <game/client/render.h>
@ -19,8 +17,6 @@

 #include "scoreboard.h"

-#include <engine/serverbrowser.h>
-
 CScoreboard::CScoreboard()
 {
 	OnReset();
--- a/src/game/client/components/scoreboard.h
+++ b/src/game/client/components/scoreboard.h
@ -2,6 +2,9 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #ifndef GAME_CLIENT_COMPONENTS_SCOREBOARD_H
 #define GAME_CLIENT_COMPONENTS_SCOREBOARD_H
+
+#include <engine/console.h>
+
 #include <game/client/component.h>

 class CScoreboard : public CComponent
--- a/src/game/client/components/skins.cpp
+++ b/src/game/client/components/skins.cpp
@ -1,6 +1,5 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
-#include <cmath>

 #include <base/math.h>
 #include <base/system.h>
--- a/src/game/client/components/skins.h
+++ b/src/game/client/components/skins.h
@ -2,8 +2,7 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #ifndef GAME_CLIENT_COMPONENTS_SKINS_H
 #define GAME_CLIENT_COMPONENTS_SKINS_H
-#include <base/color.h>
-#include <base/vmath.h>
+
 #include <engine/shared/http.h>
 #include <game/client/component.h>
 #include <game/client/skin.h>
--- a/src/game/client/components/sounds.h
+++ b/src/game/client/components/sounds.h
@ -2,7 +2,9 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #ifndef GAME_CLIENT_COMPONENTS_SOUNDS_H
 #define GAME_CLIENT_COMPONENTS_SOUNDS_H
-#include <engine/engine.h>
+
+#include <base/vmath.h>
+#include <engine/shared/jobs.h>
 #include <engine/sound.h>
 #include <game/client/component.h>

--- a/src/game/client/components/spectator.cpp
+++ b/src/game/client/components/spectator.cpp
@ -3,16 +3,15 @@

 #include <climits>

-#include <engine/demo.h>
 #include <engine/graphics.h>
 #include <engine/shared/config.h>
 #include <engine/textrender.h>

-#include <game/generated/client_data.h>
 #include <game/generated/protocol.h>

 #include <game/client/animstate.h>
 #include <game/client/render.h>
+#include <game/localization.h>

 #include "camera.h"
 #include "spectator.h"
--- a/src/game/client/components/statboard.cpp
+++ b/src/game/client/components/statboard.cpp
@ -8,6 +8,7 @@
 #include <game/client/components/statboard.h>
 #include <game/client/gameclient.h>
 #include <game/generated/client_data.h>
+#include <game/localization.h>

 CStatboard::CStatboard()
 {
--- a/src/game/client/components/statboard.h
+++ b/src/game/client/components/statboard.h
@ -1,6 +1,8 @@
 #ifndef GAME_CLIENT_COMPONENTS_STATBOARD_H
 #define GAME_CLIENT_COMPONENTS_STATBOARD_H

+#include <engine/console.h>
+
 #include <game/client/component.h>
 #include <string>

--- a/src/game/client/components/voting.cpp
+++ b/src/game/client/components/voting.cpp
@ -3,7 +3,6 @@
 #include <engine/shared/config.h>

 #include "voting.h"
-#include <base/vmath.h>
 #include <game/client/components/sounds.h>
 #include <game/client/render.h>
 #include <game/generated/protocol.h>
--- a/src/game/client/components/voting.h
+++ b/src/game/client/components/voting.h
@ -3,6 +3,7 @@
 #ifndef GAME_CLIENT_COMPONENTS_VOTING_H
 #define GAME_CLIENT_COMPONENTS_VOTING_H

+#include <engine/console.h>
 #include <engine/shared/memheap.h>

 #include <game/client/component.h>
--- a/src/game/client/gameclient.cpp
+++ b/src/game/client/gameclient.cpp
@ -13,7 +13,6 @@
 #include <engine/map.h>
 #include <engine/serverbrowser.h>
 #include <engine/shared/config.h>
-#include <engine/shared/demo.h>
 #include <engine/sound.h>
 #include <engine/storage.h>
 #include <engine/textrender.h>
@ -24,6 +23,7 @@
 #include <game/generated/protocol.h>

 #include <base/math.h>
+#include <base/system.h>
 #include <base/vmath.h>

 #include "race.h"
@ -45,8 +45,8 @@
 #include "components/debughud.h"
 #include "components/effects.h"
 #include "components/emoticon.h"
-#include "components/flow.h"
 #include "components/freezebars.h"
+#include "components/ghost.h"
 #include "components/hud.h"
 #include "components/items.h"
 #include "components/killmessages.h"
@ -59,16 +59,15 @@
 #include "components/nameplates.h"
 #include "components/particles.h"
 #include "components/players.h"
+#include "components/race_demo.h"
 #include "components/scoreboard.h"
 #include "components/skins.h"
 #include "components/sounds.h"
 #include "components/spectator.h"
 #include "components/statboard.h"
 #include "components/voting.h"
-
-#include "components/ghost.h"
-#include "components/race_demo.h"
-#include <base/system.h>
+#include "prediction/entities/character.h"
+#include "prediction/entities/projectile.h"

 using namespace std::chrono_literals;

--- a/src/game/client/gameclient.h
+++ b/src/game/client/gameclient.h
@ -11,13 +11,9 @@
 #include <engine/shared/config.h>
 #include <game/gamecore.h>
 #include <game/layers.h>
-#include <game/localization.h>

 #include <game/teamscore.h>

-#include <game/client/prediction/entities/character.h>
-#include <game/client/prediction/entities/laser.h>
-#include <game/client/prediction/entities/pickup.h>
 #include <game/client/prediction/gameworld.h>

 // components
--- a/src/game/client/prediction/entities/character.cpp
+++ b/src/game/client/prediction/entities/character.cpp
@ -1,8 +1,8 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include <engine/shared/config.h>
+#include <game/generated/client_data.h>
 #include <game/mapitems.h>
-#include <new>

 #include "character.h"
 #include "laser.h"
--- a/src/game/client/prediction/entities/character.h
+++ b/src/game/client/prediction/entities/character.h
@ -3,11 +3,9 @@
 #ifndef GAME_CLIENT_PREDICTION_ENTITIES_CHARACTER_H
 #define GAME_CLIENT_PREDICTION_ENTITIES_CHARACTER_H

-#include "projectile.h"
 #include <game/client/prediction/entity.h>

 #include <game/gamecore.h>
-#include <game/generated/client_data.h>

 enum
 {
--- a/src/game/client/prediction/entities/projectile.cpp
+++ b/src/game/client/prediction/entities/projectile.cpp
@ -1,11 +1,13 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
-#include "projectile.h"
+#include <engine/shared/config.h>
+
 #include <game/client/projectile_data.h>
 #include <game/generated/protocol.h>
 #include <game/mapitems.h>

-#include <engine/shared/config.h>
+#include "character.h"
+#include "projectile.h"

 CProjectile::CProjectile(
 	CGameWorld *pGameWorld,
--- a/src/game/client/prediction/entities/projectile.h
+++ b/src/game/client/prediction/entities/projectile.h
@ -3,7 +3,6 @@
 #ifndef GAME_CLIENT_PREDICTION_ENTITIES_PROJECTILE_H
 #define GAME_CLIENT_PREDICTION_ENTITIES_PROJECTILE_H

-#include "character.h"
 #include <game/client/prediction/entity.h>

 class CProjectileData;
--- a/src/game/client/prediction/entity.h
+++ b/src/game/client/prediction/entity.h
@ -5,7 +5,6 @@

 #include "gameworld.h"
 #include <base/vmath.h>
-#include <new>

 #define MACRO_ALLOC_HEAP() \
 public: \
--- a/src/game/client/projectile_data.cpp
+++ b/src/game/client/projectile_data.cpp
@ -3,7 +3,6 @@

 #include "projectile_data.h"

-#include <base/math.h>
 #include <engine/shared/snapshot.h>
 #include <game/client/prediction/gameworld.h>
 #include <game/generated/protocol.h>
--- a/src/game/client/race.cpp
+++ b/src/game/client/race.cpp
@ -1,8 +1,6 @@
 #include <cctype>
 #include <list>

-#include <base/math.h>
-#include <engine/serverbrowser.h>
 #include <game/client/gameclient.h>
 #include <game/mapitems.h>

--- a/src/game/client/race.h
+++ b/src/game/client/race.h
@ -1,7 +1,6 @@
 #ifndef GAME_CLIENT_RACE_H
 #define GAME_CLIENT_RACE_H

-#include <base/system.h>
 #include <base/vmath.h>

 class CRaceHelper
--- a/src/game/client/render.cpp
+++ b/src/game/client/render.cpp
@ -7,14 +7,10 @@
 #include "animstate.h"
 #include "render.h"
 #include <engine/graphics.h>
-#include <engine/map.h>
 #include <engine/shared/config.h>
-#include <game/client/components/skins.h>
-#include <game/client/gameclient.h>
 #include <game/generated/client_data.h>
 #include <game/generated/client_data7.h>
 #include <game/generated/protocol.h>
-#include <game/layers.h>

 static float gs_SpriteWScale;
 static float gs_SpriteHScale;
--- a/src/game/client/render_map.cpp
+++ b/src/game/client/render_map.cpp
@ -9,7 +9,6 @@
 #include <engine/shared/config.h>
 #include <engine/textrender.h>
 #include <game/generated/client_data.h>
-#include <game/generated/protocol.h>

 #include <chrono>

--- a/src/game/client/ui.h
+++ b/src/game/client/ui.h
@ -3,7 +3,6 @@
 #ifndef GAME_CLIENT_UI_H
 #define GAME_CLIENT_UI_H

-#include <base/system.h>
 #include <engine/textrender.h>

 #include <chrono>
--- a/src/game/client/ui_ex.cpp
+++ b/src/game/client/ui_ex.cpp
@ -5,7 +5,6 @@
 #include <base/math.h>
 #include <engine/textrender.h>

-#include <engine/client/input.h>
 #include <engine/keys.h>

 #include <game/client/lineinput.h>
--- a/src/game/client/ui_ex.h
+++ b/src/game/client/ui_ex.h
@ -1,7 +1,6 @@
 #ifndef GAME_CLIENT_UI_EX_H
 #define GAME_CLIENT_UI_EX_H

-#include <base/system.h>
 #include <engine/input.h>
 #include <engine/kernel.h>
 #include <game/client/ui.h>
--- a/src/game/editor/editor.cpp
+++ b/src/game/editor/editor.cpp
@ -16,16 +16,13 @@
 #include <engine/input.h>
 #include <engine/keys.h>
 #include <engine/shared/config.h>
-#include <engine/shared/datafile.h>
 #include <engine/storage.h>
 #include <engine/textrender.h>

 #include <game/client/components/camera.h>
 #include <game/client/gameclient.h>
-#include <game/client/lineinput.h>
 #include <game/client/render.h>
 #include <game/client/ui.h>
-#include <game/gamecore.h>
 #include <game/generated/client_data.h>
 #include <game/localization.h>

--- a/src/game/editor/editor.h
+++ b/src/game/editor/editor.h
@ -3,11 +3,9 @@
 #ifndef GAME_EDITOR_EDITOR_H
 #define GAME_EDITOR_EDITOR_H

-#include <math.h>
 #include <string>
 #include <vector>

-#include <base/math.h>
 #include <base/system.h>

 #include <game/client/render.h>
@ -17,10 +15,6 @@

 #include <engine/editor.h>
 #include <engine/graphics.h>
-#include <engine/shared/config.h>
-#include <engine/shared/datafile.h>
-#include <engine/sound.h>
-#include <engine/storage.h>

 #include "auto_map.h"

--- a/src/game/editor/io.cpp
+++ b/src/game/editor/io.cpp
@ -1,12 +1,14 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
-
 #include "editor.h"
 #include <engine/client.h>
 #include <engine/console.h>
 #include <engine/graphics.h>
 #include <engine/serverbrowser.h>
+#include <engine/shared/datafile.h>
+#include <engine/sound.h>
 #include <engine/storage.h>
+
 #include <game/gamecore.h>
 #include <game/mapitems_ex.h>

--- a/src/game/editor/layer_quads.cpp
+++ b/src/game/editor/layer_quads.cpp
@ -2,13 +2,10 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include <base/math.h>

-#include <engine/console.h>
 #include <engine/graphics.h>

 #include "editor.h"
 #include <game/client/render.h>
-#include <game/generated/client_data.h>
-#include <game/localization.h>

 CLayerQuads::CLayerQuads()
 {
--- a/src/game/editor/layer_tiles.cpp
+++ b/src/game/editor/layer_tiles.cpp
@ -8,9 +8,6 @@

 #include "editor.h"
 #include <game/client/render.h>
-#include <game/generated/client_data.h>
-
-#include <game/localization.h>

 #include <engine/input.h>
 #include <engine/keys.h>
--- a/src/game/editor/popups.cpp
+++ b/src/game/editor/popups.cpp
@ -7,6 +7,7 @@
 #include <engine/graphics.h>
 #include <engine/input.h>
 #include <engine/keys.h>
+#include <engine/shared/config.h>
 #include <engine/storage.h>

 #include "editor.h"