From 7b390808bcdb385b7a83d2231729b9cf37b75480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20M=C3=BCller?= <robytemueller@gmail.com>
Date: Fri, 8 Jul 2022 18:28:30 +0200
Subject: [PATCH] Replace `ui.h` include with `ui_rect.h`, organize other
 includes

---
 src/game/client/components/tooltips.cpp | 1 +
 src/game/client/components/tooltips.h   | 5 +++--
 src/game/client/render.h                | 3 +--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/game/client/components/tooltips.cpp b/src/game/client/components/tooltips.cpp
index 3f3821c06..3e4a3caf0 100644
--- a/src/game/client/components/tooltips.cpp
+++ b/src/game/client/components/tooltips.cpp
@@ -1,6 +1,7 @@
 #include "tooltips.h"
 
 #include <game/client/render.h>
+#include <game/client/ui.h>
 
 CTooltips::CTooltips()
 {
diff --git a/src/game/client/components/tooltips.h b/src/game/client/components/tooltips.h
index 400eb5f5c..a56ab42d2 100644
--- a/src/game/client/components/tooltips.h
+++ b/src/game/client/components/tooltips.h
@@ -1,10 +1,11 @@
 #ifndef GAME_CLIENT_COMPONENTS_TOOLTIPS_H
 #define GAME_CLIENT_COMPONENTS_TOOLTIPS_H
 
-#include <cstdint>
 #include <game/client/component.h>
-#include <game/client/ui.h>
+#include <game/client/ui_rect.h>
 
+#include <cstdint>
+#include <functional>
 #include <optional>
 #include <unordered_map>
 
diff --git a/src/game/client/render.h b/src/game/client/render.h
index 1fef91abc..66060cf1e 100644
--- a/src/game/client/render.h
+++ b/src/game/client/render.h
@@ -3,12 +3,11 @@
 #ifndef GAME_CLIENT_RENDER_H
 #define GAME_CLIENT_RENDER_H
 
-#include "ui.h"
-
 #include <base/color.h>
 #include <base/vmath.h>
 
 #include <game/client/skin.h>
+#include <game/client/ui_rect.h>
 
 class CSpeedupTile;
 class CSwitchTile;