Fix forward declarations for ios single-app build

client/battle/CBattleActionsController.h

@@ -11,7 +11,12 @@
 
 #include "../../lib/battle/CBattleInfoCallback.h"
 
+VCMI_LIB_NAMESPACE_BEGIN
+
 class BattleAction;
+
+VCMI_LIB_NAMESPACE_END
+
 class CBattleInterface;
 
 enum class MouseHoveredHexContext

client/battle/CBattleControlPanel.h

@@ -11,7 +11,11 @@
 
 #include "../gui/CIntObject.h"
 
+VCMI_LIB_NAMESPACE_BEGIN
 class CStack;
+
+VCMI_LIB_NAMESPACE_END
+
 class CButton;
 class CBattleInterface;
 class CBattleConsole;

client/battle/CBattleEffectsController.h

@@ -11,14 +11,18 @@
 
 #include "../../lib/battle/BattleHex.h"
 
-struct SDL_Surface;
+VCMI_LIB_NAMESPACE_BEGIN
+
 class BattleAction;
+struct CustomEffectInfo;
+struct BattleTriggerEffect;
+
+VCMI_LIB_NAMESPACE_END
+
+struct SDL_Surface;
 class CAnimation;
 class CCanvas;
 class CBattleInterface;
-struct BattleObjectsByHex;
-struct CustomEffectInfo;
-struct BattleTriggerEffect;
 class CEffectAnimation;
 
 namespace EBattleEffect

client/battle/CBattleFieldController.h

@@ -12,13 +12,18 @@
 #include "../../lib/battle/BattleHex.h"
 #include "../gui/CIntObject.h"
 
+VCMI_LIB_NAMESPACE_BEGIN
+
+class CStack;
+
+VCMI_LIB_NAMESPACE_END
+
 struct SDL_Surface;
 struct Rect;
 struct Point;
 
 class CClickableHex;
 class CCanvas;
-class CStack;
 class IImage;
 class CBattleInterface;
 

client/battle/CBattleObstacleController.h

@@ -9,14 +9,18 @@
  */
 #pragma once
 
-struct SDL_Surface;
-struct BattleObjectsByHex;
+VCMI_LIB_NAMESPACE_BEGIN
+
 struct BattleHex;
+struct CObstacleInstance;
+
+VCMI_LIB_NAMESPACE_END
+
+struct SDL_Surface;
 class IImage;
 class CCanvas;
 class CAnimation;
 class CBattleInterface;
-struct CObstacleInstance;
 struct Point;
 
 class CBattleObstacleController

client/battle/CBattleProjectileController.h

@@ -12,11 +12,16 @@
 #include "../../lib/CCreatureHandler.h"
 #include "../gui/Geometries.h"
 
+VCMI_LIB_NAMESPACE_BEGIN
+
+class CStack;
+
+VCMI_LIB_NAMESPACE_END
+
 struct Point;
 struct SDL_Surface;
 class CAnimation;
 class CCanvas;
-class CStack;
 class CBattleInterface;
 
 /// Small struct which contains information about the position and the velocity of a projectile

client/battle/CBattleSiegeController.h

@@ -12,13 +12,18 @@
 #include "../../lib/GameConstants.h"
 #include "../../lib/battle/BattleHex.h"
 
+VCMI_LIB_NAMESPACE_BEGIN
+
 struct CatapultAttack;
+class CCreature;
+class CGTownInstance;
+
+VCMI_LIB_NAMESPACE_END
+
 struct Point;
 struct SDL_Surface;
 class CCanvas;
-class CGTownInstance;
 class CBattleInterface;
-class CCreature;
 class IImage;
 
 namespace EWallVisual

client/battle/CBattleStacksController.h

@@ -11,18 +11,22 @@
 
 #include "../gui/Geometries.h"
 
-struct BattleObjectsByHex;
-struct SDL_Surface;
+VCMI_LIB_NAMESPACE_BEGIN
+
 struct BattleHex;
+class BattleAction;
+class CStack;
+class SpellID;
+
+VCMI_LIB_NAMESPACE_END
+
+struct SDL_Surface;
 struct StackAttackedInfo;
 
-class BattleAction;
 class CCanvas;
-class SpellID;
 class CBattleInterface;
 class CBattleAnimation;
 class CCreatureAnimation;
-class CStack;
 class CBattleAnimation;
 class IImage;