From 350b777fe94431387505e97cc8fbafe7b9d1ba34 Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Tue, 1 May 2018 19:12:54 +0200
Subject: [PATCH] Fix includes

---
 src/openrct2/object/LargeSceneryObject.cpp | 1 +
 src/openrct2/object/LargeSceneryObject.h   | 1 +
 src/openrct2/title/TitleSequencePlayer.cpp | 1 +
 src/openrct2/world/Banner.h                | 2 +-
 src/openrct2/world/LargeScenery.cpp        | 4 +---
 src/openrct2/world/Scenery.h               | 3 ++-
 src/openrct2/world/Surface.h               | 2 +-
 src/openrct2/world/Wall.h                  | 2 +-
 8 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/openrct2/object/LargeSceneryObject.cpp b/src/openrct2/object/LargeSceneryObject.cpp
index 2c1aa6fcd0..d1cf4c79fd 100644
--- a/src/openrct2/object/LargeSceneryObject.cpp
+++ b/src/openrct2/object/LargeSceneryObject.cpp
@@ -23,6 +23,7 @@
 #include "../drawing/Drawing.h"
 #include "../interface/Cursors.h"
 #include "../localisation/Language.h"
+#include "../world/Location.hpp"
 #include "LargeSceneryObject.h"
 #include "ObjectJsonHelpers.h"
 
diff --git a/src/openrct2/object/LargeSceneryObject.h b/src/openrct2/object/LargeSceneryObject.h
index 27d6a232df..4a7af55aad 100644
--- a/src/openrct2/object/LargeSceneryObject.h
+++ b/src/openrct2/object/LargeSceneryObject.h
@@ -18,6 +18,7 @@
 
 #include <memory>
 #include <vector>
+#include "../world/Location.hpp"
 #include "../world/Scenery.h"
 #include "SceneryObject.h"
 
diff --git a/src/openrct2/title/TitleSequencePlayer.cpp b/src/openrct2/title/TitleSequencePlayer.cpp
index 06c75481c5..ca586cada8 100644
--- a/src/openrct2/title/TitleSequencePlayer.cpp
+++ b/src/openrct2/title/TitleSequencePlayer.cpp
@@ -37,6 +37,7 @@
 #include "../interface/Window_internal.h"
 #include "../management/NewsItem.h"
 #include "../windows/Intent.h"
+#include "../world/Map.h"
 #include "../world/Scenery.h"
 #include "../world/Sprite.h"
 
diff --git a/src/openrct2/world/Banner.h b/src/openrct2/world/Banner.h
index 296ae9629d..abda6f3215 100644
--- a/src/openrct2/world/Banner.h
+++ b/src/openrct2/world/Banner.h
@@ -18,7 +18,7 @@
 #define _BANNER_H_
 
 #include "../common.h"
-#include "Map.h"
+#include "TileElement.h"
 
 #define BANNER_NULL 255
 #define MAX_BANNERS 250
diff --git a/src/openrct2/world/LargeScenery.cpp b/src/openrct2/world/LargeScenery.cpp
index fef35e1bae..81eb4b25b4 100644
--- a/src/openrct2/world/LargeScenery.cpp
+++ b/src/openrct2/world/LargeScenery.cpp
@@ -16,7 +16,7 @@
 
 #include "../common.h"
 #include "LargeScenery.h"
-#include "Map.h"
+#include "TileElement.h"
 
 colour_t scenery_large_get_primary_colour(const rct_tile_element * tileElement)
 {
@@ -77,5 +77,3 @@ void scenery_large_set_sequence(rct_tile_element * tileElement, uint16 sequence)
     tileElement->properties.scenerymultiple.type &= TILE_ELEMENT_LARGE_TYPE_MASK;
     tileElement->properties.scenerymultiple.type |= (sequence << 10);
 }
-
-
diff --git a/src/openrct2/world/Scenery.h b/src/openrct2/world/Scenery.h
index afd723e395..c976f7edbc 100644
--- a/src/openrct2/world/Scenery.h
+++ b/src/openrct2/world/Scenery.h
@@ -19,7 +19,8 @@
 
 #include "../common.h"
 #include "../object/Object.h"
-#include "Map.h"
+#include "../world/Location.hpp"
+#include "TileElement.h"
 
 #define SCENERY_SMALL_SCENERY_ID_MIN    0x0
 #define SCENERY_SMALL_SCENERY_ID_MAX    0xFC
diff --git a/src/openrct2/world/Surface.h b/src/openrct2/world/Surface.h
index 79aa4b1d38..aa11cb9c0c 100644
--- a/src/openrct2/world/Surface.h
+++ b/src/openrct2/world/Surface.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "../common.h"
-#include "Map.h"
+#include "TileElement.h"
 
 enum {
     TERRAIN_GRASS,
diff --git a/src/openrct2/world/Wall.h b/src/openrct2/world/Wall.h
index e6b85703c2..cf1cf99333 100644
--- a/src/openrct2/world/Wall.h
+++ b/src/openrct2/world/Wall.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "../common.h"
-#include "Map.h"
+#include "TileElement.h"
 
 colour_t wall_get_primary_colour(const rct_tile_element * tileElement);
 colour_t wall_get_secondary_colour(const rct_tile_element * wallElement);