--- tools/Makefile.in.orig	2009-03-01 22:28:01.000000000 +1100
+++ tools/Makefile.in	2011-08-02 19:15:15.000000000 +1000
@@ -355,19 +355,19 @@
 	$(CXXLINK) $(cf2bmp_OBJECTS) $(cf2bmp_LDADD) $(LIBS)
 cfed$(EXEEXT): $(cfed_OBJECTS) $(cfed_DEPENDENCIES) 
 	@rm -f cfed$(EXEEXT)
-	$(CXXLINK) $(cfed_OBJECTS) $(cfed_LDADD) $(LIBS)
+	$(CXXLINK) $(cfed_OBJECTS) $(cfed_LDADD) -lSDL -lz
 mkdatafile$(EXEEXT): $(mkdatafile_OBJECTS) $(mkdatafile_DEPENDENCIES) 
 	@rm -f mkdatafile$(EXEEXT)
-	$(CXXLINK) $(mkdatafile_OBJECTS) $(mkdatafile_LDADD) $(LIBS)
+	$(CXXLINK) $(mkdatafile_OBJECTS) $(mkdatafile_LDADD) -lSDL -lz
 mklocale$(EXEEXT): $(mklocale_OBJECTS) $(mklocale_DEPENDENCIES) 
 	@rm -f mklocale$(EXEEXT)
-	$(CXXLINK) $(mklocale_OBJECTS) $(mklocale_LDADD) $(LIBS)
+	$(CXXLINK) $(mklocale_OBJECTS) $(mklocale_LDADD) -lSDL -lz
 mktileset$(EXEEXT): $(mktileset_OBJECTS) $(mktileset_DEPENDENCIES) 
 	@rm -f mktileset$(EXEEXT)
-	$(CXXLINK) $(mktileset_OBJECTS) $(mktileset_LDADD) $(LIBS)
+	$(CXXLINK) $(mktileset_OBJECTS) $(mktileset_LDADD) -lSDL -lz
 mkunitset$(EXEEXT): $(mkunitset_OBJECTS) $(mkunitset_DEPENDENCIES) 
 	@rm -f mkunitset$(EXEEXT)
-	$(CXXLINK) $(mkunitset_OBJECTS) $(mkunitset_LDADD) $(LIBS)
+	$(CXXLINK) $(mkunitset_OBJECTS) $(mkunitset_LDADD) -lSDL -lz
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
--- tools/cfed.cpp.orig	2011-08-02 18:46:57.000000000 +1000
+++ tools/cfed.cpp	2011-08-02 18:47:20.000000000 +1000
@@ -22,6 +22,7 @@
 #include <map>
 
 #include "SDL.h"
+#undef main
 
 #include "parser.h"
 #include "mission.h"
--- tools/mkdatafile.cpp.orig	2007-01-20 21:19:29.000000000 +1100
+++ tools/mkdatafile.cpp	2011-08-02 18:28:52.000000000 +1000
@@ -27,6 +27,7 @@
 using namespace std;
 
 #include "SDL.h"
+#undef main
 
 #include "fileio.h"
 #include "mksurface.h"
--- tools/mklocale.cpp.orig	2007-01-20 21:19:29.000000000 +1100
+++ tools/mklocale.cpp	2011-08-02 19:14:07.000000000 +1000
@@ -21,6 +21,7 @@
 #include <string.h>
 
 #include "SDL.h"
+#undef main
 
 #include "lang.h"
 #include "globals.h"
--- tools/mktileset.cpp.orig	2007-01-20 21:19:29.000000000 +1100
+++ tools/mktileset.cpp	2011-08-02 18:31:45.000000000 +1000
@@ -25,6 +25,7 @@
 */
 
 #include "SDL.h"
+#undef main
 
 #include "fileio.h"
 #include "parser.h"
--- tools/mkunitset.cpp.orig	2007-01-20 21:19:29.000000000 +1100
+++ tools/mkunitset.cpp	2011-08-02 18:44:26.000000000 +1000
@@ -26,6 +26,7 @@
 #include <algorithm>
 using namespace std;
 #include "SDL.h"
+#undef main
 
 #include "fileio.h"
 #include "parser.h"