diff --git a/src/openrct2-ui/UiContext.h b/src/openrct2-ui/UiContext.h index 831c80f686..530c84717d 100644 --- a/src/openrct2-ui/UiContext.h +++ b/src/openrct2-ui/UiContext.h @@ -24,9 +24,12 @@ namespace OpenRCT2 namespace OpenRCT2::Ui { struct FileDialogDesc; - class InGameConsole; struct IUiContext; + class InGameConsole; + class InputManager; + class ShortcutManager; + struct IPlatformUiContext { virtual ~IPlatformUiContext() = default; @@ -51,4 +54,6 @@ namespace OpenRCT2::Ui [[nodiscard]] std::unique_ptr CreatePlatformUiContext(); [[nodiscard]] InGameConsole& GetInGameConsole(); + [[nodiscard]] InputManager& GetInputManager(); + [[nodiscard]] ShortcutManager& GetShortcutManager(); } // namespace OpenRCT2::Ui diff --git a/src/openrct2-ui/WindowManager.cpp b/src/openrct2-ui/WindowManager.cpp index ff34e2358e..53cc1c5b06 100644 --- a/src/openrct2-ui/WindowManager.cpp +++ b/src/openrct2-ui/WindowManager.cpp @@ -13,6 +13,7 @@ #include "ride/VehicleSounds.h" #include "windows/Window.h" +#include #include #include #include diff --git a/src/openrct2-ui/input/ShortcutManager.h b/src/openrct2-ui/input/ShortcutManager.h index 6080bba589..ce248b2048 100644 --- a/src/openrct2-ui/input/ShortcutManager.h +++ b/src/openrct2-ui/input/ShortcutManager.h @@ -147,7 +147,4 @@ namespace OpenRCT2::Ui static std::string_view GetLegacyShortcutId(size_t index); }; - - InputManager& GetInputManager(); - ShortcutManager& GetShortcutManager(); } // namespace OpenRCT2::Ui diff --git a/src/openrct2-ui/scripting/CustomMenu.cpp b/src/openrct2-ui/scripting/CustomMenu.cpp index 12e80dc208..66ca49e3a8 100644 --- a/src/openrct2-ui/scripting/CustomMenu.cpp +++ b/src/openrct2-ui/scripting/CustomMenu.cpp @@ -13,6 +13,7 @@ # include "../interface/Viewport.h" +# include # include # include # include diff --git a/src/openrct2-ui/windows/ShortcutKeys.cpp b/src/openrct2-ui/windows/ShortcutKeys.cpp index 1593d8d2fc..a8720ab05a 100644 --- a/src/openrct2-ui/windows/ShortcutKeys.cpp +++ b/src/openrct2-ui/windows/ShortcutKeys.cpp @@ -7,10 +7,11 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "../input/ShortcutManager.h" #include "Window.h" #include +#include +#include #include #include #include