diff --git a/src/data/data.cpp b/src/data/data.cpp
index d7252dc5..529c8712 100644
--- a/src/data/data.cpp
+++ b/src/data/data.cpp
@@ -14,8 +14,8 @@
 #include "slfparser.h"
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #include "geojsonparser.h"
-#include "exifparser.h"
 #endif // QT 5
+#include "exifparser.h"
 #include "dem.h"
 #include "data.h"
 
diff --git a/src/data/exifparser.cpp b/src/data/exifparser.cpp
index fba27824..cebe7713 100644
--- a/src/data/exifparser.cpp
+++ b/src/data/exifparser.cpp
@@ -127,7 +127,7 @@ bool EXIFParser::parseTIFF(QDataStream &stream, QVector<Waypoint> &waypoints)
 	gpsTags.insert(GPSAltitude);
 	gpsTags.insert(GPSAltitudeRef);
 	QMap<quint16, IFDEntry> gpsEntries;
-	for (quint32 ifd = exifEntries.first().offset; ifd; ) {
+	for (quint32 ifd = exifEntries.value(GPSIFDTag).offset; ifd; ) {
 		if (!readIFD(tiff, offset + ifd, gpsTags, gpsEntries)
 		  || !tiff.readValue(ifd)) {
 			_errorString = "Invalid GPS IFD";
diff --git a/src/map/geotiff.cpp b/src/map/geotiff.cpp
index 9db45ae1..4fcc333b 100644
--- a/src/map/geotiff.cpp
+++ b/src/map/geotiff.cpp
@@ -1,3 +1,4 @@
+#include <QFile>
 #include "common/tifffile.h"
 #include "pcs.h"
 #include "geotiff.h"