diff --git a/proj/xc4/BoE.xcodeproj/project.pbxproj b/proj/xc4/BoE.xcodeproj/project.pbxproj
index dd8f9794..32fa5806 100755
--- a/proj/xc4/BoE.xcodeproj/project.pbxproj
+++ b/proj/xc4/BoE.xcodeproj/project.pbxproj
@@ -618,6 +618,7 @@
 		914CA49F190C4E9200B6ADD1 /* scenedit.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = scenedit.xib; path = menus/scenedit.xib; sourceTree = "<group>"; };
 		915325161A2E1DA8000A9A1C /* oldstructs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = oldstructs.cpp; sourceTree = "<group>"; };
 		915325181A2E37EE000A9A1C /* special_parse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = special_parse.cpp; sourceTree = "<group>"; };
+		91574CC323CB97C5004766F8 /* enum_map.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = enum_map.hpp; sourceTree = "<group>"; };
 		91597A6C1A3BED2D00BE7BF9 /* spell.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = spell.hpp; sourceTree = "<group>"; };
 		91597A6E1A3BEDC700BE7BF9 /* spell.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = spell.cpp; sourceTree = "<group>"; };
 		915AF9E91BC04171008AEF49 /* dlogevt.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = dlogevt.hpp; sourceTree = "<group>"; };
@@ -1142,6 +1143,7 @@
 				912283C80FD0E16C00B21642 /* undo.cpp */,
 				919145FF18E63B70005CF3A4 /* winutil.mac.mm */,
 				91C688E60FD702B9000F6D01 /* cursors.hpp */,
+				91574CC323CB97C5004766F8 /* enum_map.hpp */,
 				91C2A6E21B8244F700346948 /* gitrev.hpp */,
 				91EC480E18FBAA8700BB1E86 /* prefs.hpp */,
 				917B573F100B956C0096C978 /* undo.hpp */,
diff --git a/src/game/boe.actions.cpp b/src/game/boe.actions.cpp
index 8d3a0f65..492859d8 100644
--- a/src/game/boe.actions.cpp
+++ b/src/game/boe.actions.cpp
@@ -35,7 +35,7 @@
 #include "shop.hpp"
 #include "prefs.hpp"
 #include "render_shapes.hpp"
-#include "tools/enum_map.hpp"
+#include "enum_map.hpp"
 
 rectangle bottom_buttons[14];
 rectangle item_screen_button_rects[9] = {
diff --git a/src/game/boe.dlgutil.cpp b/src/game/boe.dlgutil.cpp
index e90d830f..3c925bbb 100644
--- a/src/game/boe.dlgutil.cpp
+++ b/src/game/boe.dlgutil.cpp
@@ -34,7 +34,7 @@
 #include "prefs.hpp"
 #include "shop.hpp"
 #include "cursors.hpp"
-#include "tools/enum_map.hpp"
+#include "enum_map.hpp"
 
 extern eItemWinMode stat_window;
 extern eGameMode overall_mode;
diff --git a/src/game/boe.graphics.cpp b/src/game/boe.graphics.cpp
index 2a8125ae..140ada2d 100644
--- a/src/game/boe.graphics.cpp
+++ b/src/game/boe.graphics.cpp
@@ -18,7 +18,7 @@
 #include "sounds.hpp"
 #include "mathutil.hpp"
 #include "button.hpp"
-#include "tools/enum_map.hpp"
+#include "enum_map.hpp"
 
 #include "boe.party.hpp"
 #include "boe.town.hpp"
diff --git a/src/game/boe.main.cpp b/src/game/boe.main.cpp
index 0ef7823f..41c009f2 100644
--- a/src/game/boe.main.cpp
+++ b/src/game/boe.main.cpp
@@ -30,7 +30,7 @@
 #include "cursors.hpp"
 #include "prefs.hpp"
 #include "button.hpp"
-#include "tools/enum_map.hpp"
+#include "enum_map.hpp"
 
 bool All_Done = false;
 sf::Event event;
diff --git a/src/game/boe.newgraph.cpp b/src/game/boe.newgraph.cpp
index 766d2333..463d65fb 100644
--- a/src/game/boe.newgraph.cpp
+++ b/src/game/boe.newgraph.cpp
@@ -27,7 +27,7 @@
 #include "button.hpp"
 #include "res_image.hpp"
 #include "prefs.hpp"
-#include "tools/enum_map.hpp"
+#include "enum_map.hpp"
 
 short monsters_faces[190] = {
 	0,1,2,3,4,5,6,7,8,9,
diff --git a/src/game/boe.startup.cpp b/src/game/boe.startup.cpp
index fd4b51eb..b98f6392 100644
--- a/src/game/boe.startup.cpp
+++ b/src/game/boe.startup.cpp
@@ -22,7 +22,7 @@
 #include "prefs.hpp"
 #include "cursors.hpp"
 #include "render_image.hpp"
-#include "tools/enum_map.hpp"
+#include "enum_map.hpp"
 
 #include <vector>
 using std::vector;
diff --git a/src/game/boe.text.cpp b/src/game/boe.text.cpp
index 27ffea45..a144567c 100644
--- a/src/game/boe.text.cpp
+++ b/src/game/boe.text.cpp
@@ -20,7 +20,7 @@ const int TEXT_BUF_LEN = 70;
 #include "res_image.hpp"
 #include "res_font.hpp"
 #include "spell.hpp"
-#include "tools/enum_map.hpp"
+#include "enum_map.hpp"
 
 typedef struct {
 	char line[50];