diff -Naur supermariowar-r16/Makefile supermariowar-r16.patched/Makefile
--- supermariowar-r16/Makefile	2014-04-08 14:07:20.000000000 -0400
+++ supermariowar-r16.patched/Makefile	2014-04-08 14:09:00.000000000 -0400
@@ -8,9 +8,9 @@
            build/savepng.o build/sfx.o
 SMW_OBJS:= build/HashTable.o build/ai.o build/gamemodes.o build/main.o \
            build/map.o build/menu.o build/object.o build/player.o \
-           build/splash.o build/uicontrol.o build/uimenu.o build/world.o
+           build/splash.o build/uicontrol.o build/uimenu.o build/world.o build/objecthazard.o build/objectgame.o build/modeoptionsmenu.o build/uicustomcontrol.o
 LEVELEDIT_OBJS:=build/leveleditor.o
-WORLDEDIT_OBJS:=build/sfx.o build/world.o build/worldeditor.o
+WORLDEDIT_OBJS:=build/dirlist.o build/eyecandy.o build/FileIO.o build/FileList.o build/global.o build/input.o build/map.o build/MapList.o build/modeoptionsmenu.o build/movingplatform.o build/object.o build/objecthazard.o build/path.o build/savepng.o build/TilesetManager.o build/uicontrol.o build/uimenu.o build/world.o build/worldeditor.o build/gfx.o build/SFont.o build/sfx.o build/linfunc.o
 
 include configuration
 #here because of one .c file among a .cpp project (o_O)
@@ -24,7 +24,7 @@
 leveledit : $(COMMON_OBJS) $(LEVELEDIT_OBJS)
 	$(CXX) $(CFLAGS) $^ $(LDFLAGS) -o $@
 
-worldedit : $(COMMON_OBJS) $(WORLDEDIT_OBJS)
+worldedit : $(WORLDEDIT_OBJS)
 	$(CXX) $(CFLAGS) $^ $(LDFLAGS) -o $@
 
 build/SFont.o : _src/SFont.c
diff -Naur supermariowar-r16/_src/FileList.cpp supermariowar-r16.patched/_src/FileList.cpp
--- supermariowar-r16/_src/FileList.cpp	2010-01-06 14:33:55.000000000 -0500
+++ supermariowar-r16.patched/_src/FileList.cpp	2014-03-27 15:06:03.000000000 -0400
@@ -16,6 +16,7 @@
 #include "dirlist.h"
 #include <ctype.h>
 #include <iostream>
+#include <algorithm>
 using std::cout;
 using std::endl;
 using std::string;
diff -Naur supermariowar-r16/_src/ai.cpp supermariowar-r16.patched/_src/ai.cpp
--- supermariowar-r16/_src/ai.cpp	2010-01-06 14:33:55.000000000 -0500
+++ supermariowar-r16.patched/_src/ai.cpp	2014-03-27 15:43:02.000000000 -0400
@@ -345,7 +345,8 @@
 			{
 				delete itr->second;
 			
-				itr = attentionObjects.erase(itr);
+				attentionObjects.erase(itr);
+				itr = attentionObjects.begin();
 				lim = attentionObjects.end();
 			}
 		}
diff -Naur supermariowar-r16/_src/path.cpp supermariowar-r16.patched/_src/path.cpp
--- supermariowar-r16/_src/path.cpp	2010-01-06 14:33:55.000000000 -0500
+++ supermariowar-r16.patched/_src/path.cpp	2014-03-27 15:07:56.000000000 -0400
@@ -1,3 +1,4 @@
+#include <string.h>
 #include <string>
 #include <iostream>
 #include <sys/stat.h>
diff -Naur supermariowar-r16/_src/uicontrol.cpp supermariowar-r16.patched/_src/uicontrol.cpp
--- supermariowar-r16/_src/uicontrol.cpp	2010-01-06 14:33:55.000000000 -0500
+++ supermariowar-r16.patched/_src/uicontrol.cpp	2014-03-27 15:45:58.000000000 -0400
@@ -2,6 +2,7 @@
 #include <math.h>
 
 extern void LoadCurrentMapBackground();
+extern void LoadMapHazards(bool fPreview);
 
 UI_Control::UI_Control(short x, short y)
 {