diff --git a/Makefile b/Makefile
index 5258d3dbd..1e193eb22 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ XSLTFILES = xslt/*.xslt xslt/*.xsl
 
 EXTRA_FLAGS =  $(QTCXXFLAGS) $(GTKCFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) \
 	       $(LIBDIVECOMPUTERCFLAGS) \
-	       $(LIBSOUPCFLAGS) $(GCONF2CFLAGS) -I.
+	       $(LIBSOUPCFLAGS) $(GCONF2CFLAGS) -I. -DQT_NO_STL
 
 HEADERS = \
 	qt-ui/divelistview.h \
diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp
index 917863968..d183b4a15 100644
--- a/qt-ui/diveplanner.cpp
+++ b/qt-ui/diveplanner.cpp
@@ -23,6 +23,8 @@
 #include <QTableView>
 #include <QColor>
 
+#include <algorithm>
+
 #define TIME_INITIAL_MAX 30
 
 #define MAX_DEPTH M_OR_FT(150, 450)