diff --git a/src/map/atlas.cpp b/src/map/atlas.cpp
index 6a370a15..e81799b9 100644
--- a/src/map/atlas.cpp
+++ b/src/map/atlas.cpp
@@ -2,6 +2,7 @@
 #include <QtAlgorithms>
 #include <QPainter>
 #include "common/rectc.h"
+#include "offlinemap.h"
 #include "tar.h"
 #include "atlas.h"
 
diff --git a/src/map/atlas.h b/src/map/atlas.h
index ed99f07b..04f4483e 100644
--- a/src/map/atlas.h
+++ b/src/map/atlas.h
@@ -1,10 +1,9 @@
 #ifndef ATLAS_H
 #define ATLAS_H
 
-#include <QFileInfoList>
 #include "map.h"
-#include "offlinemap.h"
 
+class OfflineMap;
 
 class Atlas : public Map
 {
diff --git a/src/map/emptymap.h b/src/map/emptymap.h
index 55e7e271..093fe5c9 100644
--- a/src/map/emptymap.h
+++ b/src/map/emptymap.h
@@ -1,7 +1,6 @@
 #ifndef EMPTYMAP_H
 #define EMPTYMAP_H
 
-#include "common/coordinates.h"
 #include "map.h"
 
 class EmptyMap : public Map
diff --git a/src/map/geotiff.cpp b/src/map/geotiff.cpp
index 66d527dc..7afbd39c 100644
--- a/src/map/geotiff.cpp
+++ b/src/map/geotiff.cpp
@@ -1,7 +1,7 @@
 #include <QFileInfo>
 #include <QtEndian>
 #include "pcs.h"
-#include "latlon.h"
+#include "tifffile.h"
 #include "geotiff.h"
 
 
diff --git a/src/map/geotiff.h b/src/map/geotiff.h
index 06d3b136..2d663814 100644
--- a/src/map/geotiff.h
+++ b/src/map/geotiff.h
@@ -1,14 +1,14 @@
 #ifndef GEOTIFF_H
 #define GEOTIFF_H
 
-#include <QTransform>
-#include <QFile>
 #include <QMap>
-#include "gcs.h"
-#include "projection.h"
-#include "tifffile.h"
+#include <QList>
+#include <QTransform>
 #include "transform.h"
-#include "linearunits.h"
+#include "projection.h"
+
+class TIFFFile;
+class GCS;
 
 class GeoTIFF
 {
diff --git a/src/map/map.h b/src/map/map.h
index 1c88adc7..22c04f0a 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -5,9 +5,9 @@
 #include <QString>
 #include <QRectF>
 #include <QColor>
+#include "common/coordinates.h"
 
 class QPainter;
-class Coordinates;
 class RectC;
 
 class Map : public QObject
@@ -15,7 +15,7 @@ class Map : public QObject
 	Q_OBJECT
 
 public:
-	Map(QObject *parent = 0) : QObject(parent) {_backgroundColor = Qt::white;}
+	Map(QObject *parent = 0) : QObject(parent), _backgroundColor(Qt::white) {}
 
 	virtual const QString &name() const = 0;
 
diff --git a/src/map/offlinemap.h b/src/map/offlinemap.h
index ef0b2f1a..4c5533b1 100644
--- a/src/map/offlinemap.h
+++ b/src/map/offlinemap.h
@@ -3,13 +3,10 @@
 
 #include <QTransform>
 #include "projection.h"
-#include "transform.h"
-#include "linearunits.h"
 #include "map.h"
 #include "tar.h"
 #include "ozf.h"
 
-class QIODevice;
 class QImage;
 
 class OfflineMap : public Map
diff --git a/src/map/onlinemap.h b/src/map/onlinemap.h
index ae5ab967..abf2c512 100644
--- a/src/map/onlinemap.h
+++ b/src/map/onlinemap.h
@@ -1,7 +1,6 @@
 #ifndef ONLINEMAP_H
 #define ONLINEMAP_H
 
-#include "common/coordinates.h"
 #include "common/range.h"
 #include "common/rectc.h"
 #include "map.h"
diff --git a/src/map/pcs.h b/src/map/pcs.h
index 5a5bec7f..f82557ee 100644
--- a/src/map/pcs.h
+++ b/src/map/pcs.h
@@ -40,7 +40,6 @@ private:
 	LinearUnits _units;
 
 	static QList<Entry> _pcss;
-	static GCS _nullGCS;
 };
 
 #ifndef QT_NO_DEBUG
diff --git a/src/map/tifffile.h b/src/map/tifffile.h
index 26f84129..a6e2dd9f 100644
--- a/src/map/tifffile.h
+++ b/src/map/tifffile.h
@@ -7,7 +7,7 @@
 class TIFFFile : public QFile
 {
 public:
-	TIFFFile() : QFile(), _be(false) {}
+	TIFFFile() : _be(false) {}
 	TIFFFile(const QString &path) : QFile(path), _be(false) {}
 
 	bool readHeader(quint32 &ifd);