diff --git a/src/graphview.cpp b/src/graphview.cpp
index 44060780..ceba952d 100644
--- a/src/graphview.cpp
+++ b/src/graphview.cpp
@@ -4,6 +4,7 @@
 #include <QEvent>
 #include <QGraphicsSimpleTextItem>
 #include "config.h"
+#include "axisitem.h"
 #include "slideritem.h"
 #include "sliderinfoitem.h"
 #include "infoitem.h"
diff --git a/src/graphview.h b/src/graphview.h
index 65ab7d08..2913cf0d 100644
--- a/src/graphview.h
+++ b/src/graphview.h
@@ -6,12 +6,12 @@
 #include <QVector>
 #include <QList>
 #include <QPointF>
-#include "axisitem.h"
 #include "colorshop.h"
 
 
 #define THIN_SPACE     QString::fromUtf8("\xE2\x80\x89")
 
+class AxisItem;
 class SliderItem;
 class SliderInfoItem;
 class InfoItem;
diff --git a/src/map.h b/src/map.h
index 69b53f43..2436ffb8 100644
--- a/src/map.h
+++ b/src/map.h
@@ -2,8 +2,6 @@
 #define MAP_H
 
 #include <QPixmap>
-#include "downloader.h"
-
 
 class Tile
 {
diff --git a/src/maplist.cpp b/src/maplist.cpp
index 63b821a6..d35631ff 100644
--- a/src/maplist.cpp
+++ b/src/maplist.cpp
@@ -1,5 +1,6 @@
 #include <QFile>
 #include <QFileInfo>
+#include "map.h"
 #include "maplist.h"
 
 
diff --git a/src/maplist.h b/src/maplist.h
index 03a6e428..eb864023 100644
--- a/src/maplist.h
+++ b/src/maplist.h
@@ -2,8 +2,9 @@
 #define MAPLIST_H
 
 #include <QList>
-#include "map.h"
+#include <QString>
 
+class Map;
 
 class MapList
 {
diff --git a/src/poiitem.h b/src/poiitem.h
index a5ac41f0..f9685466 100644
--- a/src/poiitem.h
+++ b/src/poiitem.h
@@ -2,7 +2,7 @@
 #define POIITEM_H
 
 #include <QGraphicsItem>
-#include "poi.h"
+#include "waypoint.h"
 
 class POIItem : public QGraphicsItem
 {
diff --git a/src/trackview.cpp b/src/trackview.cpp
index 751d830a..10345299 100644
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -3,6 +3,7 @@
 #include <QGraphicsScene>
 #include <QPainterPath>
 #include <QWheelEvent>
+#include "map.h"
 #include "poiitem.h"
 #include "markeritem.h"
 #include "scaleitem.h"
diff --git a/src/trackview.h b/src/trackview.h
index 7e04a203..0d69f673 100644
--- a/src/trackview.h
+++ b/src/trackview.h
@@ -8,11 +8,11 @@
 #include <QPrinter>
 #include "poi.h"
 #include "gpx.h"
-#include "map.h"
 #include "units.h"
 #include "colorshop.h"
 
 
+class Map;
 class POIItem;
 class MarkerItem;
 class ScaleItem;