From 28391eaf5dbccf41d43e7b14a1423ad294fb191c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= <janisozaur@gmail.com>
Date: Wed, 14 Mar 2018 12:44:16 +0100
Subject: [PATCH] Move cstring out of common.h

---
 src/openrct2/CmdlineSprite.cpp              | 1 +
 src/openrct2/cmdline/CommandLine.cpp        | 2 ++
 src/openrct2/common.h                       | 1 -
 src/openrct2/drawing/DrawingFast.cpp        | 2 ++
 src/openrct2/drawing/LightFX.cpp            | 1 +
 src/openrct2/drawing/X8DrawingEngine.cpp    | 1 +
 src/openrct2/localisation/Localisation.h    | 2 ++
 src/openrct2/network/Http.cpp               | 5 +++--
 src/openrct2/network/TcpSocket.cpp          | 1 +
 src/openrct2/object/ObjectList.cpp          | 2 ++
 src/openrct2/paint/tile_element/Surface.cpp | 2 ++
 src/openrct2/platform/Linux.cpp             | 1 +
 src/openrct2/platform/Posix.cpp             | 1 +
 src/openrct2/ride/thrill/RotoDrop.cpp       | 2 ++
 src/openrct2/util/SawyerCoding.cpp          | 2 ++
 src/openrct2/world/MapAnimation.cpp         | 2 ++
 src/openrct2/world/MapGen.cpp               | 1 +
 test/testpaint/Hook.cpp                     | 1 +
 test/testpaint/PaintIntercept.cpp           | 1 +
 test/testpaint/generate.cpp                 | 1 +
 test/testpaint/main.cpp                     | 1 +
 21 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/openrct2/CmdlineSprite.cpp b/src/openrct2/CmdlineSprite.cpp
index 642e75ad95..75ed8b8ea3 100644
--- a/src/openrct2/CmdlineSprite.cpp
+++ b/src/openrct2/CmdlineSprite.cpp
@@ -16,6 +16,7 @@
 
 #pragma warning(disable : 4706) // assignment within conditional expression
 
+#include <cstring>
 #include <jansson.h>
 #include "CmdlineSprite.h"
 #include "drawing/Drawing.h"
diff --git a/src/openrct2/cmdline/CommandLine.cpp b/src/openrct2/cmdline/CommandLine.cpp
index 2824015540..ed4d6d53e1 100644
--- a/src/openrct2/cmdline/CommandLine.cpp
+++ b/src/openrct2/cmdline/CommandLine.cpp
@@ -14,6 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
+#include <cstring>
+
 #include "../core/Console.hpp"
 #include "../core/Math.hpp"
 #include "../core/String.hpp"
diff --git a/src/openrct2/common.h b/src/openrct2/common.h
index 2532435eb1..89adfc83a8 100644
--- a/src/openrct2/common.h
+++ b/src/openrct2/common.h
@@ -30,7 +30,6 @@
 #include <cmath>
 #include <cstddef>
 #include <cstdint>
-#include <cstring>
 
 using sint8 = int8_t;
 using sint16 = int16_t;
diff --git a/src/openrct2/drawing/DrawingFast.cpp b/src/openrct2/drawing/DrawingFast.cpp
index f0f5dd4787..1669be8a1b 100644
--- a/src/openrct2/drawing/DrawingFast.cpp
+++ b/src/openrct2/drawing/DrawingFast.cpp
@@ -16,6 +16,8 @@
 
 #pragma warning(disable : 4127) // conditional expression is constant
 
+#include <cstring>
+
 #include "Drawing.h"
 
 template<sint32 image_type, sint32 zoom_level>
diff --git a/src/openrct2/drawing/LightFX.cpp b/src/openrct2/drawing/LightFX.cpp
index cce999bf2b..9f74f2f5ba 100644
--- a/src/openrct2/drawing/LightFX.cpp
+++ b/src/openrct2/drawing/LightFX.cpp
@@ -18,6 +18,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <cstring>
 #include "../common.h"
 #include "../config/Config.h"
 #include "../Game.h"
diff --git a/src/openrct2/drawing/X8DrawingEngine.cpp b/src/openrct2/drawing/X8DrawingEngine.cpp
index 191177f02b..3fc5d77361 100644
--- a/src/openrct2/drawing/X8DrawingEngine.cpp
+++ b/src/openrct2/drawing/X8DrawingEngine.cpp
@@ -15,6 +15,7 @@
 #pragma endregion
 
 #include <algorithm>
+#include <cstring>
 #include "../config/Config.h"
 #include "../Context.h"
 #include "../ui/UiContext.h"
diff --git a/src/openrct2/localisation/Localisation.h b/src/openrct2/localisation/Localisation.h
index 047b8e98b2..fad7229e22 100644
--- a/src/openrct2/localisation/Localisation.h
+++ b/src/openrct2/localisation/Localisation.h
@@ -17,6 +17,8 @@
 #ifndef LOCALISATION_H
 #define LOCALISATION_H
 
+#include <cstring>
+
 #include "Currency.h"
 #include "Date.h"
 #include "FormatCodes.h"
diff --git a/src/openrct2/network/Http.cpp b/src/openrct2/network/Http.cpp
index dd0ac10307..d250113aaa 100644
--- a/src/openrct2/network/Http.cpp
+++ b/src/openrct2/network/Http.cpp
@@ -14,8 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include <thread>
-
 #include "http.h"
 
 #ifdef DISABLE_HTTP
@@ -25,6 +23,9 @@ void http_dispose() { }
 
 #else
 
+#include <cstring>
+#include <thread>
+
 #include "../core/Console.hpp"
 #include "../core/Math.hpp"
 #include "../Version.h"
diff --git a/src/openrct2/network/TcpSocket.cpp b/src/openrct2/network/TcpSocket.cpp
index f4d5be5ed9..9a133340d6 100644
--- a/src/openrct2/network/TcpSocket.cpp
+++ b/src/openrct2/network/TcpSocket.cpp
@@ -18,6 +18,7 @@
 
 #include <cmath>
 #include <chrono>
+#include <cstring>
 #include <future>
 #include <string>
 #include <thread>
diff --git a/src/openrct2/object/ObjectList.cpp b/src/openrct2/object/ObjectList.cpp
index c4e4329c69..aadda79c5b 100644
--- a/src/openrct2/object/ObjectList.cpp
+++ b/src/openrct2/object/ObjectList.cpp
@@ -14,6 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
+#include <cstring>
+
 #include "../core/Math.hpp"
 #include "../core/Util.hpp"
 #include "../Game.h"
diff --git a/src/openrct2/paint/tile_element/Surface.cpp b/src/openrct2/paint/tile_element/Surface.cpp
index f00ad50c56..dc674d9f1f 100644
--- a/src/openrct2/paint/tile_element/Surface.cpp
+++ b/src/openrct2/paint/tile_element/Surface.cpp
@@ -14,6 +14,8 @@
 *****************************************************************************/
 #pragma endregion
 
+#include <cstring>
+
 #include "../../OpenRCT2.h"
 #include "../../Cheats.h"
 #include "../../config/Config.h"
diff --git a/src/openrct2/platform/Linux.cpp b/src/openrct2/platform/Linux.cpp
index 4d751858c4..51662d6457 100644
--- a/src/openrct2/platform/Linux.cpp
+++ b/src/openrct2/platform/Linux.cpp
@@ -26,6 +26,7 @@
 
 #define OPENRCT2_MAX_COMMAND_LENGTH (2 * MAX_PATH)
 
+#include <cstring>
 #include <ctype.h>
 #include <dlfcn.h>
 #include <errno.h>
diff --git a/src/openrct2/platform/Posix.cpp b/src/openrct2/platform/Posix.cpp
index 8ff9cf8fc5..282f0d2c79 100644
--- a/src/openrct2/platform/Posix.cpp
+++ b/src/openrct2/platform/Posix.cpp
@@ -16,6 +16,7 @@
 
 #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD__)
 
+#include <cstring>
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
diff --git a/src/openrct2/ride/thrill/RotoDrop.cpp b/src/openrct2/ride/thrill/RotoDrop.cpp
index ec357038bd..6a128003c0 100644
--- a/src/openrct2/ride/thrill/RotoDrop.cpp
+++ b/src/openrct2/ride/thrill/RotoDrop.cpp
@@ -14,6 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
+#include <cstring>
+
 #include "../../common.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
diff --git a/src/openrct2/util/SawyerCoding.cpp b/src/openrct2/util/SawyerCoding.cpp
index ff2c1c560c..8774fbbd70 100644
--- a/src/openrct2/util/SawyerCoding.cpp
+++ b/src/openrct2/util/SawyerCoding.cpp
@@ -14,6 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
+#include <cstring>
+
 #include "../core/Math.hpp"
 #include "../platform/platform.h"
 #include "../scenario/Scenario.h"
diff --git a/src/openrct2/world/MapAnimation.cpp b/src/openrct2/world/MapAnimation.cpp
index 27e01afd63..41644d1a74 100644
--- a/src/openrct2/world/MapAnimation.cpp
+++ b/src/openrct2/world/MapAnimation.cpp
@@ -14,6 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
+#include <cstring>
+
 #include "../Game.h"
 #include "../ride/Ride.h"
 #include "../ride/RideData.h"
diff --git a/src/openrct2/world/MapGen.cpp b/src/openrct2/world/MapGen.cpp
index 47daef5bd2..3e4e034fbe 100644
--- a/src/openrct2/world/MapGen.cpp
+++ b/src/openrct2/world/MapGen.cpp
@@ -16,6 +16,7 @@
 
 #include "../common.h"
 #include <cmath>
+#include <cstring>
 #include <vector>
 
 #include "../Context.h"
diff --git a/test/testpaint/Hook.cpp b/test/testpaint/Hook.cpp
index 92490af19c..308ac1a008 100644
--- a/test/testpaint/Hook.cpp
+++ b/test/testpaint/Hook.cpp
@@ -16,6 +16,7 @@
 
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
 #include <openrct2/common.h>
 
 #ifndef NO_RCT2
diff --git a/test/testpaint/PaintIntercept.cpp b/test/testpaint/PaintIntercept.cpp
index 793dad02fe..a00a826064 100644
--- a/test/testpaint/PaintIntercept.cpp
+++ b/test/testpaint/PaintIntercept.cpp
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include <cstring>
 
 #include "Hook.h"
 #include "PaintIntercept.hpp"
diff --git a/test/testpaint/generate.cpp b/test/testpaint/generate.cpp
index 2badf94d1f..52105f03e3 100644
--- a/test/testpaint/generate.cpp
+++ b/test/testpaint/generate.cpp
@@ -16,6 +16,7 @@
 
 #include <algorithm>
 #include <cstdarg>
+#include <cstring>
 #include <string>
 #include <vector>
 
diff --git a/test/testpaint/main.cpp b/test/testpaint/main.cpp
index 410341035c..a88c0ec5d6 100644
--- a/test/testpaint/main.cpp
+++ b/test/testpaint/main.cpp
@@ -17,6 +17,7 @@
 #include <algorithm>
 #include <cstdio>
 #include <cstdarg>
+#include <cstring>
 #include <string>
 #include <vector>