diff --git a/CCallback.cpp b/CCallback.cpp
index 4e4e3eeee..6805cb936 100644
--- a/CCallback.cpp
+++ b/CCallback.cpp
@@ -11,7 +11,6 @@
 #include "CCallback.h"
 
 #include "lib/CCreatureHandler.h"
-#include "client/CGameInfo.h"
 #include "lib/CGameState.h"
 #include "client/CPlayerInterface.h"
 #include "client/Client.h"
diff --git a/client/render/IFont.h b/client/render/IFont.h
index 933b85db5..4a1b92863 100644
--- a/client/render/IFont.h
+++ b/client/render/IFont.h
@@ -10,9 +10,7 @@
 #pragma once
 
 VCMI_LIB_NAMESPACE_BEGIN
-
 class Point;
-
 VCMI_LIB_NAMESPACE_END
 
 struct SDL_Surface;
diff --git a/client/render/IImageLoader.h b/client/render/IImageLoader.h
index fd3a72045..966a5be26 100644
--- a/client/render/IImageLoader.h
+++ b/client/render/IImageLoader.h
@@ -10,8 +10,11 @@
 
 #pragma once
 
-class SDLImage;
+VCMI_LIB_NAMESPACE_BEGIN
 class Point;
+VCMI_LIB_NAMESPACE_END
+
+class SDLImage;
 
 struct SDL_Color;
 
diff --git a/client/renderSDL/SDL_Extensions.cpp b/client/renderSDL/SDL_Extensions.cpp
index 2e66eb4bd..0e0753bee 100644
--- a/client/renderSDL/SDL_Extensions.cpp
+++ b/client/renderSDL/SDL_Extensions.cpp
@@ -11,24 +11,20 @@
 #include "SDL_Extensions.h"
 
 #include "SDL_PixelAccess.h"
-//
-//#include "../CGameInfo.h"
-//#include "../CMessage.h"
+
 #include "../render/Graphics.h"
-//#include "../CMT.h"
-//
-//#include <SDL_version.h>
+
 #include <SDL_render.h>
 #include <SDL_video.h>
 #include <SDL_events.h>
-//
-//#ifdef VCMI_APPLE
-//#include <dispatch/dispatch.h>
-//#endif
-//
-//#ifdef VCMI_IOS
-//#include "ios/utils.h"
-//#endif
+
+#ifdef VCMI_APPLE
+#include <dispatch/dispatch.h>
+#endif
+
+#ifdef VCMI_IOS
+#include "ios/utils.h"
+#endif
 
 const SDL_Color Colors::YELLOW = { 229, 215, 123, SDL_ALPHA_OPAQUE };
 const SDL_Color Colors::WHITE = { 255, 243, 222, SDL_ALPHA_OPAQUE };
diff --git a/lib/mapObjects/CObjectHandler.h b/lib/mapObjects/CObjectHandler.h
index 387020f72..07df7e3d5 100644
--- a/lib/mapObjects/CObjectHandler.h
+++ b/lib/mapObjects/CObjectHandler.h
@@ -11,7 +11,6 @@
 
 #include "ObjectTemplate.h"
 
-//#include "../IGameCallback.h"
 #include "../int3.h"
 #include "../HeroBonus.h"