From c81fcfe43e95c00d595b3d4ece9e7c3d0fe89147 Mon Sep 17 00:00:00 2001
From: Lwmte <initiator@nm.ru>
Date: Thu, 9 Sep 2021 11:25:03 +0300
Subject: [PATCH] Fix merge conflicts

---
 TR5Main/Game/collide.cpp                       | 1 +
 TR5Main/Game/items.cpp                         | 1 +
 TR5Main/Game/items.h                           | 2 --
 TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp | 1 +
 TR5Main/Objects/TR4/Entity/tr4_baboon.cpp      | 1 +
 TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp  | 2 ++
 TR5Main/Objects/TR4/Entity/tr4_setha.cpp       | 1 -
 7 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/TR5Main/Game/collide.cpp b/TR5Main/Game/collide.cpp
index 4c033a3a0..5ecef8081 100644
--- a/TR5Main/Game/collide.cpp
+++ b/TR5Main/Game/collide.cpp
@@ -12,6 +12,7 @@
 #include "Specific\trmath.h"
 #include "Specific\prng.h"
 #include "room.h"
+#include "Renderer11.h""
 
 using std::vector;
 using namespace TEN::Math::Random;
diff --git a/TR5Main/Game/items.cpp b/TR5Main/Game/items.cpp
index e307d9f11..faf3d2214 100644
--- a/TR5Main/Game/items.cpp
+++ b/TR5Main/Game/items.cpp
@@ -5,6 +5,7 @@
 #include "lara.h"
 #include "control.h"
 #include "effects\effects.h"
+#include "Game\box.h"
 
 void ClearItem(short itemNum)
 {
diff --git a/TR5Main/Game/items.h b/TR5Main/Game/items.h
index 276a2cef7..09bc594c9 100644
--- a/TR5Main/Game/items.h
+++ b/TR5Main/Game/items.h
@@ -3,8 +3,6 @@
 #include "item.h"
 #include <vector>
 
-enum GAME_OBJECT_ID : short;
-
 enum AIObjectType
 {
 	NO_AI = 0x0000,
diff --git a/TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp b/TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp
index e03f940bd..a9aeaf339 100644
--- a/TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp
+++ b/TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp
@@ -5,6 +5,7 @@
 #include "lara.h"
 #include "fish.h"
 #include "control.h"
+#include "effects\effects.h"
 
 #define PIRAHNA_DAMAGE 4
 #define X 0
diff --git a/TR5Main/Objects/TR4/Entity/tr4_baboon.cpp b/TR5Main/Objects/TR4/Entity/tr4_baboon.cpp
index c138f749b..98ed86d7c 100644
--- a/TR5Main/Objects/TR4/Entity/tr4_baboon.cpp
+++ b/TR5Main/Objects/TR4/Entity/tr4_baboon.cpp
@@ -6,6 +6,7 @@
 #include "control.h"
 #include "misc.h"
 #include "Lara.h"
+#include "effects\effects.h"
 #include "effects\tomb4fx.h"
 #include "creature_info.h"
 
diff --git a/TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp b/TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp
index 9e64d7ed4..a705cdd6c 100644
--- a/TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp
+++ b/TR5Main/Objects/TR4/Entity/tr4_enemy_jeep.cpp
@@ -13,6 +13,8 @@
 #include "creature_info.h"
 #include "setup.h"
 #include "control/trigger.h"
+#include "effects/effects.h"
+#include "effects/tomb4fx.h"
 
 ITEM_INFO jeepDummyTarget;
 
diff --git a/TR5Main/Objects/TR4/Entity/tr4_setha.cpp b/TR5Main/Objects/TR4/Entity/tr4_setha.cpp
index 78a1eddc9..130acbb8a 100644
--- a/TR5Main/Objects/TR4/Entity/tr4_setha.cpp
+++ b/TR5Main/Objects/TR4/Entity/tr4_setha.cpp
@@ -11,7 +11,6 @@
 #include <sphere.h>
 #include <people.h>
 #include "creature_info.h"
-#include "effect2.h"
 
 BITE_INFO SethaBite1 = { 0,220,50,17 };
 BITE_INFO SethaBite2 = { 0,220,50,13 };