diff --git a/src/elevationgraph.cpp b/src/elevationgraph.cpp
index 3870ca53..b3e282c5 100644
--- a/src/elevationgraph.cpp
+++ b/src/elevationgraph.cpp
@@ -1,5 +1,6 @@
 #include <float.h>
 #include "config.h"
+#include "gpx.h"
 #include "elevationgraph.h"
 
 
diff --git a/src/elevationgraph.h b/src/elevationgraph.h
index 52db1e02..edbf136f 100644
--- a/src/elevationgraph.h
+++ b/src/elevationgraph.h
@@ -2,9 +2,10 @@
 #define ELEVATIONGRAPH_H
 
 #include "graphview.h"
-#include "gpx.h"
 #include "units.h"
 
+class GPX;
+
 class ElevationGraph : public GraphView
 {
 	Q_OBJECT
diff --git a/src/speedgraph.cpp b/src/speedgraph.cpp
index 8c00ab4f..69e6a583 100644
--- a/src/speedgraph.cpp
+++ b/src/speedgraph.cpp
@@ -1,4 +1,5 @@
 #include "config.h"
+#include "gpx.h"
 #include "speedgraph.h"
 
 
diff --git a/src/speedgraph.h b/src/speedgraph.h
index ee74efea..78ca05a9 100644
--- a/src/speedgraph.h
+++ b/src/speedgraph.h
@@ -3,9 +3,10 @@
 
 #include <QList>
 #include "graphview.h"
-#include "gpx.h"
 #include "units.h"
 
+class GPX;
+
 class SpeedGraph : public GraphView
 {
 	Q_OBJECT
diff --git a/src/trackview.cpp b/src/trackview.cpp
index 10345299..3578a844 100644
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -3,6 +3,8 @@
 #include <QGraphicsScene>
 #include <QPainterPath>
 #include <QWheelEvent>
+#include "poi.h"
+#include "gpx.h"
 #include "map.h"
 #include "poiitem.h"
 #include "markeritem.h"
diff --git a/src/trackview.h b/src/trackview.h
index 0d69f673..7b10fc56 100644
--- a/src/trackview.h
+++ b/src/trackview.h
@@ -6,12 +6,12 @@
 #include <QHash>
 #include <QList>
 #include <QPrinter>
-#include "poi.h"
-#include "gpx.h"
 #include "units.h"
 #include "colorshop.h"
+#include "waypoint.h"
 
-
+class GPX;
+class POI;
 class Map;
 class POIItem;
 class MarkerItem;