diff --git a/client/battle/BattleEffectsController.h b/client/battle/BattleEffectsController.h
index 7adf03554..598930ba9 100644
--- a/client/battle/BattleEffectsController.h
+++ b/client/battle/BattleEffectsController.h
@@ -19,7 +19,6 @@ struct BattleTriggerEffect;
 
 VCMI_LIB_NAMESPACE_END
 
-struct SDL_Surface;
 class CAnimation;
 class Canvas;
 class BattleInterface;
diff --git a/client/battle/BattleFieldController.h b/client/battle/BattleFieldController.h
index ca4b2e85e..09be64740 100644
--- a/client/battle/BattleFieldController.h
+++ b/client/battle/BattleFieldController.h
@@ -18,7 +18,6 @@ class CStack;
 
 VCMI_LIB_NAMESPACE_END
 
-struct SDL_Surface;
 struct Rect;
 struct Point;
 
diff --git a/client/battle/BattleInterfaceClasses.h b/client/battle/BattleInterfaceClasses.h
index 8cec60370..4a6747a06 100644
--- a/client/battle/BattleInterfaceClasses.h
+++ b/client/battle/BattleInterfaceClasses.h
@@ -18,7 +18,6 @@ VCMI_LIB_NAMESPACE_BEGIN
 class CGHeroInstance;
 struct BattleResult;
 class CStack;
-class Canvas;
 
 namespace battle
 {
@@ -27,6 +26,7 @@ class Unit;
 
 VCMI_LIB_NAMESPACE_END
 
+class Canvas;
 struct SDL_Surface;
 class BattleInterface;
 class CPicture;
diff --git a/client/battle/BattleObstacleController.h b/client/battle/BattleObstacleController.h
index 19f157ce0..48478192d 100644
--- a/client/battle/BattleObstacleController.h
+++ b/client/battle/BattleObstacleController.h
@@ -16,7 +16,6 @@ struct CObstacleInstance;
 
 VCMI_LIB_NAMESPACE_END
 
-struct SDL_Surface;
 class IImage;
 class Canvas;
 class CAnimation;
diff --git a/client/battle/BattleProjectileController.h b/client/battle/BattleProjectileController.h
index fbb8746ec..00ba75f47 100644
--- a/client/battle/BattleProjectileController.h
+++ b/client/battle/BattleProjectileController.h
@@ -20,7 +20,6 @@ class CSpell;
 VCMI_LIB_NAMESPACE_END
 
 struct Point;
-struct SDL_Surface;
 class CAnimation;
 class Canvas;
 class BattleInterface;
diff --git a/client/battle/BattleSiegeController.h b/client/battle/BattleSiegeController.h
index 939bf074e..b062590a6 100644
--- a/client/battle/BattleSiegeController.h
+++ b/client/battle/BattleSiegeController.h
@@ -22,7 +22,6 @@ class CGTownInstance;
 VCMI_LIB_NAMESPACE_END
 
 struct Point;
-struct SDL_Surface;
 class Canvas;
 class BattleInterface;
 class BattleRenderer;
diff --git a/client/battle/BattleStacksController.h b/client/battle/BattleStacksController.h
index b9451e3c1..5c368279c 100644
--- a/client/battle/BattleStacksController.h
+++ b/client/battle/BattleStacksController.h
@@ -20,7 +20,6 @@ class SpellID;
 
 VCMI_LIB_NAMESPACE_END
 
-struct SDL_Surface;
 struct StackAttackedInfo;
 
 class Canvas;