Fix includes

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"
 

src/openrct2/object/LargeSceneryObject.h

@@ -18,6 +18,7 @@
 
 #include <memory>
 #include <vector>
+#include "../world/Location.hpp"
 #include "../world/Scenery.h"
 #include "SceneryObject.h"
 

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"
 

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

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);
 }
-
-

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

src/openrct2/world/Surface.h

@@ -17,7 +17,7 @@
 #pragma once
 
 #include "../common.h"
-#include "Map.h"
+#include "TileElement.h"
 
 enum {
     TERRAIN_GRASS,

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);