3 files changed, 19 insertions, 4 deletions
diff --git a/src/actormanager.cpp b/src/actormanager.cpp
index b5a683927..fe4892f4a 100644
--- a/src/actormanager.cpp
+++ b/src/actormanager.cpp
@@ -196,7 +196,20 @@ ActorManager::ActorManager() :
     mCyclePlayers(config.getBoolValue("cyclePlayers")),
     mCycleMonsters(config.getBoolValue("cycleMonsters")),
     mCycleNPC(config.getBoolValue("cycleNPC")),
-    mExtMouseTargeting(config.getBoolValue("extMouseTargeting"))
+    mExtMouseTargeting(config.getBoolValue("extMouseTargeting")),
+    mPriorityAttackMobs(),
+    mPriorityAttackMobsSet(),
+    mPriorityAttackMobsMap(),
+    mAttackMobs(),
+    mAttackMobsSet(),
+    mAttackMobsMap(),
+    mIgnoreAttackMobs(),
+    mIgnoreAttackMobsSet(),
+    mPickupItems(),
+    mPickupItemsSet(),
+    mPickupItemsMap(),
+    mIgnorePickupItems(),
+    mIgnorePickupItemsSet()
 {
     config.addListener("targetDeadPlayers", this);
     config.addListener("targetOnlyReachable", this);
diff --git a/src/enums/resources/map/mapitemtype.h b/src/enums/resources/map/mapitemtype.h
index 38677f479..13013e050 100644
--- a/src/enums/resources/map/mapitemtype.h
+++ b/src/enums/resources/map/mapitemtype.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ENUMS_RESOURCES_MAPITEMTYPE_H
-#define ENUMS_RESOURCES_MAPITEMTYPE_H
+#ifndef ENUMS_RESOURCES_MAP_MAPITEMTYPE_H
+#define ENUMS_RESOURCES_MAP_MAPITEMTYPE_H
 
 namespace MapItemType
 {
@@ -44,4 +44,4 @@ namespace MapItemType
     };
 }  // namespace MapItemType
 
-#endif  // ENUMS_RESOURCES_MAPITEMTYPE_H
+#endif  // ENUMS_RESOURCES_MAP_MAPITEMTYPE_H
diff --git a/src/navigationmanager.cpp b/src/navigationmanager.cpp
index de05c62db..4de840dde 100644
--- a/src/navigationmanager.cpp
+++ b/src/navigationmanager.cpp
@@ -29,6 +29,7 @@
 static const int blockWalkMask = (BlockMask::WALL | BlockMask::AIR
     | BlockMask::WATER);
 
+#ifndef DYECMD
 namespace
 {
     struct Cell final
@@ -43,6 +44,7 @@ namespace
         int y;
     };
 }  // namespace
+#endif
 
 NavigationManager::NavigationManager()
 {