7 files changed, 8 insertions, 32 deletions
diff --git a/src/net/adminhandler.h b/src/net/adminhandler.h
index 2ac462834..fd69d8abb 100644
--- a/src/net/adminhandler.h
+++ b/src/net/adminhandler.h
@@ -24,6 +24,7 @@
 #define ADMINHANDLER_H
 
 #include <iosfwd>
+#include <string>
 
 namespace Net
 {
diff --git a/src/net/charhandler.h b/src/net/charhandler.h
index cee319719..092e0f135 100644
--- a/src/net/charhandler.h
+++ b/src/net/charhandler.h
@@ -27,6 +27,7 @@
 #include "playerinfo.h"
 
 #include <iosfwd>
+#include <string>
 #include <vector>
 
 class CharCreateDialog;
diff --git a/src/net/chathandler.h b/src/net/chathandler.h
index f8a9e4ccf..7859df80e 100644
--- a/src/net/chathandler.h
+++ b/src/net/chathandler.h
@@ -24,6 +24,7 @@
 #define CHATHANDLER_H
 
 #include <iosfwd>
+#include <string>
 
 namespace Net
 {
diff --git a/src/net/messageout.h b/src/net/messageout.h
index b3347bc3f..793fe04b9 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -27,6 +27,8 @@
 
 #include <iosfwd>
 
+#include <string>
+
 namespace Net
 {
 
diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h
index 8603fa119..94e5f2d01 100644
--- a/src/resources/imagewriter.h
+++ b/src/resources/imagewriter.h
@@ -22,6 +22,8 @@
 
 #include <iosfwd>
 
+#include <string>
+
 #include "localconsts.h"
 
 struct SDL_Surface;
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index c7d8ecc0e..eb85e5c9e 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -34,37 +34,6 @@
 
 extern int serverVersion;
 
-/*
-ItemInfo::ItemInfo(ItemInfo &info)
-{
-    mMissileParticleFile = info.mMissileParticleFile;
-    mDisplay = info.mDisplay;
-    mName = info.mName;
-    mDescription = info.mDescription;
-    mEffect = info.mEffect;
-    mType = info.mType;
-    mParticle = info.mParticle;
-    mWeight = info.mWeight;
-    mView = info.mView;
-    mId = info.mId;
-    mIsRemoveSprites = info.mIsRemoveSprites;
-    mAttackAction = info.mAttackAction;
-    mAttackRange = info.mAttackRange;
-    mMissileParticle = info.mMissileParticle;
-    mColors = info.mColors;
-    mColorList = info.mColorList;
-    mHitEffectId = info.mHitEffectId;
-    mCriticalHitEffectId = info.mCriticalHitEffectId;
-    for (int f = 0; f < 9; f ++)
-    {
-        mSpriteToItemReplaceMap[f] = 0;
-        mDrawBefore[f] = info.mDrawBefore[f];
-        mDrawAfter[f] = info.mDrawAfter[f];
-        mDrawPriority[f] = info.mDrawPriority[f];
-    }
-}
-*/
-
 ItemInfo::ItemInfo() :
     mMissileParticleFile(""),
     mName(""),
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index ba429341d..704ad79eb 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -105,7 +105,7 @@ class ItemInfo final
          */
         ItemInfo();
 
-//        ItemInfo(ItemInfo &info);
+        A_DELETE_COPY(ItemInfo);
 
         ~ItemInfo();