4 files changed, 7 insertions, 5 deletions
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index 8eaa0ce9f..a8cd1422c 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -37,7 +37,6 @@
 
 #include "utils/delete2.h"
 #include "utils/dtor.h"
-#include "utils/gettext.h"
 
 #include "utils/translation/podict.h"
 
diff --git a/src/resources/itemtypemap.h b/src/resources/itemtypemap.h
index 789d9211b..7852347c1 100644
--- a/src/resources/itemtypemap.h
+++ b/src/resources/itemtypemap.h
@@ -23,6 +23,8 @@
 
 #include "resources/itemtype.h"
 
+#include <string>
+
 #include "localconsts.h"
 
 struct ItemTypeMap final
diff --git a/src/resources/itemtypemapdata.h b/src/resources/itemtypemapdata.h
index 8cd7437e9..8707127fe 100644
--- a/src/resources/itemtypemapdata.h
+++ b/src/resources/itemtypemapdata.h
@@ -21,12 +21,14 @@
 #ifndef RESOURCES_ITEMTYPEMAPDATA_H
 #define RESOURCES_ITEMTYPEMAPDATA_H
 
-#include "localconsts.h"
-
 #include "utils/gettext.h"
 
 #include "resources/itemtypemap.h"
 
+#include <string>
+
+#include "localconsts.h"
+
 ItemTypeMap itemTypeMap[] =
 {
     {"generic", ItemType::UNUSABLE,
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp
index 18a220f01..6187764e9 100644
--- a/src/resources/openglimagehelper.cpp
+++ b/src/resources/openglimagehelper.cpp
@@ -169,14 +169,13 @@ SDL_Surface *OpenGLImageHelper::convertSurface(SDL_Surface *tmpImage,
     amask = 0xff000000;
 #endif
 
-    SDL_Surface *oldImage = nullptr;
     if (tmpImage->format->BitsPerPixel != 32
         || realWidth != width || realHeight != height
         || rmask != tmpImage->format->Rmask
         || gmask != tmpImage->format->Gmask
         || amask != tmpImage->format->Amask)
     {
-        oldImage = tmpImage;
+        SDL_Surface *oldImage = tmpImage;
 #ifdef USE_SDL2
         SDL_SetSurfaceBlendMode(oldImage, SDL_BLENDMODE_NONE);
 #endif