Reduce inclusion of <string> header

src/openrct2-ui/WindowManager.h

@@ -14,7 +14,6 @@
 *****************************************************************************/
 #pragma endregion
 
-#include <string>
 #include <openrct2/common.h>
 
 namespace OpenRCT2 { namespace Ui

src/openrct2/Context.cpp

@@ -35,6 +35,7 @@
 #include "core/Path.hpp"
 #include "core/String.hpp"
 #include "FileClassifier.h"
+#include "HandleParkLoad.h"
 #include "network/network.h"
 #include "object/ObjectManager.h"
 #include "object/ObjectRepository.h"

src/openrct2/Game.cpp

@@ -25,6 +25,7 @@
 #include "Editor.h"
 #include "FileClassifier.h"
 #include "Game.h"
+#include "HandleParkLoad.h"
 #include "Input.h"
 #include "interface/Screenshot.h"
 #include "interface/Viewport.h"

src/openrct2/Game.h

@@ -16,9 +16,6 @@
 
 #pragma once
 
-// TODO: only used by handle_park_load_failure, extract to separate header
-#include <string>
-
 #include "common.h"
 
 struct ParkLoadResult;
@@ -184,8 +181,6 @@ bool game_is_not_paused();
 void save_game();
 void * create_save_game_as_intent();
 void save_game_as();
-void handle_park_load_failure_with_title_opt(const ParkLoadResult * result, const std::string & path, bool loadTitleFirst);
-void handle_park_load_failure(const ParkLoadResult * result, const std::string & path);
 void game_autosave();
 void game_convert_strings_to_utf8();
 void game_convert_news_items_to_utf8();

src/openrct2/HandleParkLoad.h

@@ -0,0 +1,26 @@
+#pragma region Copyright (c) 2014-2018 OpenRCT2 Developers
+/*****************************************************************************
+ * OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
+ *
+ * OpenRCT2 is the work of many authors, a full list can be found in contributors.md
+ * For more information, visit https://github.com/OpenRCT2/OpenRCT2
+ *
+ * OpenRCT2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * A full copy of the GNU General Public License can be found in licence.txt
+ *****************************************************************************/
+#pragma endregion
+
+#pragma once
+
+#include <string>
+
+#include "common.h"
+
+struct ParkLoadResult;
+
+void handle_park_load_failure_with_title_opt(const ParkLoadResult * result, const std::string & path, bool loadTitleFirst);
+void handle_park_load_failure(const ParkLoadResult * result, const std::string & path);

src/openrct2/network/network.h

@@ -16,6 +16,8 @@
 
 #pragma once
 
+#include <string>
+
 enum {
     NETWORK_MODE_NONE,
     NETWORK_MODE_CLIENT,
@@ -53,7 +55,6 @@ struct LocationXYZ16;
 #include <list>
 #include <set>
 #include <memory>
-#include <string>
 #include <vector>
 #include <functional>
 #include <fstream>

src/openrct2/rct2/S6Exporter.h

@@ -16,7 +16,6 @@
 
 #pragma once
 
-#include <string>
 #include <vector>
 #include "../common.h"
 #include "../object/ObjectList.h"