diff --git a/src/GUI/pathitem.cpp b/src/GUI/pathitem.cpp
index 0be6ffe5..86738e85 100644
--- a/src/GUI/pathitem.cpp
+++ b/src/GUI/pathitem.cpp
@@ -7,6 +7,7 @@
 #include "pathtickitem.h"
 #include "popup.h"
 #include "graphitem.h"
+#include "markeritem.h"
 #include "pathitem.h"
 
 
diff --git a/src/GUI/pathitem.h b/src/GUI/pathitem.h
index d8bed204..9a589803 100644
--- a/src/GUI/pathitem.h
+++ b/src/GUI/pathitem.h
@@ -5,13 +5,13 @@
 #include <QPen>
 #include <QTimeZone>
 #include "data/path.h"
-#include "markeritem.h"
-#include "units.h"
 #include "graphicsscene.h"
+#include "units.h"
 
 class Map;
 class PathTickItem;
 class GraphItem;
+class MarkerItem;
 
 class PathItem : public QObject, public GraphicsItem
 {
diff --git a/src/GUI/routeitem.cpp b/src/GUI/routeitem.cpp
index a18e4da2..112aaa61 100644
--- a/src/GUI/routeitem.cpp
+++ b/src/GUI/routeitem.cpp
@@ -1,5 +1,6 @@
 #include <QPainter>
 #include "data/waypoint.h"
+#include "data/route.h"
 #include "map/map.h"
 #include "format.h"
 #include "waypointitem.h"
diff --git a/src/GUI/routeitem.h b/src/GUI/routeitem.h
index e6b20285..28f91409 100644
--- a/src/GUI/routeitem.h
+++ b/src/GUI/routeitem.h
@@ -1,13 +1,11 @@
 #ifndef ROUTEITEM_H
 #define ROUTEITEM_H
 
-#include "data/route.h"
+#include "data/link.h"
 #include "pathitem.h"
-#include "units.h"
-#include "format.h"
-#include "graphicsscene.h"
 
 class Map;
+class Route;
 class WaypointItem;
 
 class RouteItem : public PathItem
diff --git a/src/GUI/trackitem.cpp b/src/GUI/trackitem.cpp
index 3d62b61d..95f6ac89 100644
--- a/src/GUI/trackitem.cpp
+++ b/src/GUI/trackitem.cpp
@@ -1,5 +1,6 @@
 #include <QPainter>
 #include "map/map.h"
+#include "data/track.h"
 #include "format.h"
 #include "tooltip.h"
 #include "trackitem.h"
diff --git a/src/GUI/trackitem.h b/src/GUI/trackitem.h
index 0edd1049..3c4219c0 100644
--- a/src/GUI/trackitem.h
+++ b/src/GUI/trackitem.h
@@ -2,13 +2,11 @@
 #define TRACKITEM_H
 
 #include <QDateTime>
-#include <QPen>
-#include "data/track.h"
+#include "data/link.h"
 #include "pathitem.h"
-#include "units.h"
-#include "graphicsscene.h"
 
 class Map;
+class Track;
 
 class TrackItem : public PathItem
 {