diff --git a/src/ui/XbeeConfigurationWindow.h b/src/ui/XbeeConfigurationWindow.h
index e78531b6d7d5e259a28e5e7eb370a942790176dc..afcdf4779ad9c822539cb003d36bed156f41c85f 100644
--- a/src/ui/XbeeConfigurationWindow.h
+++ b/src/ui/XbeeConfigurationWindow.h
@@ -12,7 +12,7 @@
 #include <QLayout>
 #include <LinkInterface.h>
 #include"XbeeLinkInterface.h"
-#include "../comm/HexSpinBox.h"
+#include "HexSpinBox.h"
 
 
 class XbeeConfigurationWindow : public QWidget
diff --git a/src/ui/map/MAV2DIcon.h b/src/ui/map/MAV2DIcon.h
index 2ae33b3f5a8589cae6b36f920e2e731c3134b29e..be83312c314b656a6f1ea120e350827b7975271c 100644
--- a/src/ui/map/MAV2DIcon.h
+++ b/src/ui/map/MAV2DIcon.h
@@ -4,7 +4,7 @@
 #include <QGraphicsItem>
 
 #include "UASInterface.h"
-#include "../../libs/opmapcontrol/opmapcontrol.h"
+#include "opmapcontrol.h"
 
 class MAV2DIcon : public mapcontrol::UAVItem
 {
diff --git a/src/ui/map/QGCMapWidget.h b/src/ui/map/QGCMapWidget.h
index d290476a7b830267a80a7b8897118c1b1bb2f4a3..bddc19860d6dcedcc7dc9de691aeab6f972dde3a 100644
--- a/src/ui/map/QGCMapWidget.h
+++ b/src/ui/map/QGCMapWidget.h
@@ -3,7 +3,7 @@
 
 #include <QMap>
 #include <QTimer>
-#include "../../../libs/opmapcontrol/opmapcontrol.h"
+#include "opmapcontrol.h"
 
 // Choose one default map type
 //#define MAP_DEFAULT_TYPE_BING
diff --git a/src/ui/map3D/Pixhawk3DWidget.cc b/src/ui/map3D/Pixhawk3DWidget.cc
index 7d6ab3c411a93a5c5df73511b590803343af6bce..17e14052f4a227666c19b0676c6604210c05057b 100644
--- a/src/ui/map3D/Pixhawk3DWidget.cc
+++ b/src/ui/map3D/Pixhawk3DWidget.cc
@@ -40,7 +40,7 @@
 #include <osg/ShapeDrawable>
 #include <osgText/Text>
 
-#include "../MainWindow.h"
+#include "MainWindow.h"
 #include "PixhawkCheetahNode.h"
 #include "TerrainParamDialog.h"
 #include "UASManager.h"