diff --git a/monav/contractionhierarchies/binaryheap.h b/monav/contractionhierarchies/binaryheap.h
index 571d3ce..a7bbbb2 100644
--- a/monav/contractionhierarchies/binaryheap.h
+++ b/monav/contractionhierarchies/binaryheap.h
@@ -24,7 +24,7 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include <vector>
-#include <QHash>
+#include <QtCore/QHash>
 
 template< typename NodeID, typename Key >
 class ArrayStorage {
diff --git a/monav/contractionhierarchies/blockcache.h b/monav/contractionhierarchies/blockcache.h
index 2b94fc9..fc8f306 100644
--- a/monav/contractionhierarchies/blockcache.h
+++ b/monav/contractionhierarchies/blockcache.h
@@ -20,10 +20,10 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef BLOCKCACHE_H_INCLUDED
 #define BLOCKCACHE_H_INCLUDED
 
-#include <QFile>
-#include <QHash>
+#include <QtCore/QFile>
+#include <QtCore/QHash>
 #include <limits>
-#include <QtDebug>
+#include <QtCore/QtDebug>
 
 // Block must have member function / variables:
 // variable id => block id
diff --git a/monav/contractionhierarchies/compressedgraph.h b/monav/contractionhierarchies/compressedgraph.h
index 404acf9..04d57f9 100644
--- a/monav/contractionhierarchies/compressedgraph.h
+++ b/monav/contractionhierarchies/compressedgraph.h
@@ -24,8 +24,8 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #include "utils/coordinates.h"
 #include "utils/bithelpers.h"
 #include "blockcache.h"
-#include <QString>
-#include <QFile>
+#include <QtCore/QString>
+#include <QtCore/QFile>
 #include <algorithm>
 #include <vector>
 
diff --git a/monav/contractionhierarchies/contractionhierarchiesclient.cpp b/monav/contractionhierarchies/contractionhierarchiesclient.cpp
index 1ea16da..a4e6262 100644
--- a/monav/contractionhierarchies/contractionhierarchiesclient.cpp
+++ b/monav/contractionhierarchies/contractionhierarchiesclient.cpp
@@ -22,10 +22,10 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "contractionhierarchiesclient.h"
 #include "utils/qthelpers.h"
-#include <QtDebug>
+#include <QtCore/QtDebug>
 #include <stack>
 #ifndef NOGUI
-	#include <QMessageBox>
+	#include <QtGui/QMessageBox>
 #endif
 
 ContractionHierarchiesClient::ContractionHierarchiesClient()
diff --git a/monav/contractionhierarchies/contractionhierarchiesclient.h b/monav/contractionhierarchies/contractionhierarchiesclient.h
index d2c3ff1..998c962 100644
--- a/monav/contractionhierarchies/contractionhierarchiesclient.h
+++ b/monav/contractionhierarchies/contractionhierarchiesclient.h
@@ -20,8 +20,8 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef CONTRACTIONHIERARCHIESCLIENT_H
 #define CONTRACTIONHIERARCHIESCLIENT_H
 
-#include <QObject>
-#include <QStringList>
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
 #include "interfaces/irouter.h"
 #include "binaryheap.h"
 #include "compressedgraph.h"
diff --git a/monav/gpsgrid/gpsgridclient.cpp b/monav/gpsgrid/gpsgridclient.cpp
index fcbc02c..ad99d9a 100644
--- a/monav/gpsgrid/gpsgridclient.cpp
+++ b/monav/gpsgrid/gpsgridclient.cpp
@@ -18,14 +18,14 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "gpsgridclient.h"
-#include <QtDebug>
-#include <QHash>
+#include <QtCore/QtDebug>
+#include <QtCore/QHash>
 #include <algorithm>
 #include "utils/qthelpers.h"
 #ifndef NOGUI
-	#include <QInputDialog>
+	#include <QtGui/QInputDialog>
 #endif
-#include <QSettings>
+#include <QtCore/QSettings>
 
 GPSGridClient::GPSGridClient()
 {
diff --git a/monav/gpsgrid/gpsgridclient.h b/monav/gpsgrid/gpsgridclient.h
index 0f80cc0..7b5afa1 100644
--- a/monav/gpsgrid/gpsgridclient.h
+++ b/monav/gpsgrid/gpsgridclient.h
@@ -20,12 +20,12 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef GPSGRIDCLIENT_H
 #define GPSGRIDCLIENT_H
 
-#include <QObject>
-#include <QFile>
+#include <QtCore/QObject>
+#include <QtCore/QFile>
 #include "interfaces/igpslookup.h"
 #include "cell.h"
 #include "table.h"
-#include <QCache>
+#include <QtCore/QCache>
 
 class GPSGridClient : public QObject, public IGPSLookup
 {
diff --git a/monav/gpsgrid/table.h b/monav/gpsgrid/table.h
index 7850264..0d0f5a1 100644
--- a/monav/gpsgrid/table.h
+++ b/monav/gpsgrid/table.h
@@ -20,12 +20,12 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef TABLE_H
 #define TABLE_H
 
-#include <QtGlobal>
-#include <QCache>
-#include <QFile>
+#include <QtCore/QtGlobal>
+#include <QtCore/QCache>
+#include <QtCore/QFile>
 #include <string.h>
 #include <vector>
-#include <QtDebug>
+#include <QtCore/QtDebug>
 
 namespace gg {
 
diff --git a/monav/interfaces/iaddresslookup.h b/monav/interfaces/iaddresslookup.h
index f2c3b91..45643cc 100644
--- a/monav/interfaces/iaddresslookup.h
+++ b/monav/interfaces/iaddresslookup.h
@@ -21,8 +21,8 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #define IADDRESSLOOKUP_H
 
 #include "utils/coordinates.h"
-#include <QtPlugin>
-#include <QVector>
+#include <QtCore/QtPlugin>
+#include <QtCore/QVector>
 
 class IAddressLookup
 {
diff --git a/monav/interfaces/igpslookup.h b/monav/interfaces/igpslookup.h
index ad30761..036a850 100644
--- a/monav/interfaces/igpslookup.h
+++ b/monav/interfaces/igpslookup.h
@@ -22,8 +22,8 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "utils/config.h"
 #include "utils/coordinates.h"
-#include <QtPlugin>
-#include <QVector>
+#include <QtCore/QtPlugin>
+#include <QtCore/QVector>
 
 class IGPSLookup
 {
diff --git a/monav/interfaces/irouter.h b/monav/interfaces/irouter.h
index ba266a3..9e6631a 100644
--- a/monav/interfaces/irouter.h
+++ b/monav/interfaces/irouter.h
@@ -23,8 +23,8 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #include "utils/config.h"
 #include "utils/coordinates.h"
 #include "interfaces/igpslookup.h"
-#include <QtPlugin>
-#include <QVector>
+#include <QtCore/QtPlugin>
+#include <QtCore/QVector>
 
 class IRouter
 {
diff --git a/monav/unicodetournamenttrie/trie.h b/monav/unicodetournamenttrie/trie.h
index d3567f7..76be0f8 100644
--- a/monav/unicodetournamenttrie/trie.h
+++ b/monav/unicodetournamenttrie/trie.h
@@ -20,7 +20,7 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef TRIE_H
 #define TRIE_H
 
-#include <QString>
+#include <QtCore/QString>
 #include <vector>
 #include "utils/coordinates.h"
 #include "utils/bithelpers.h"
diff --git a/monav/unicodetournamenttrie/unicodetournamenttrieclient.cpp b/monav/unicodetournamenttrie/unicodetournamenttrieclient.cpp
index 9a5822a..0fe842a 100644
--- a/monav/unicodetournamenttrie/unicodetournamenttrieclient.cpp
+++ b/monav/unicodetournamenttrie/unicodetournamenttrieclient.cpp
@@ -23,10 +23,10 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "unicodetournamenttrieclient.h"
 #include "utils/qthelpers.h"
-#include <QtDebug>
+#include <QtCore/QtDebug>
 #include <algorithm>
 #ifndef NOGUI
- #include <QMessageBox>
+ #include <QtGui/QMessageBox>
 #endif
 
 UnicodeTournamentTrieClient::UnicodeTournamentTrieClient()
diff --git a/monav/unicodetournamenttrie/unicodetournamenttrieclient.h b/monav/unicodetournamenttrie/unicodetournamenttrieclient.h
index e597044..e6fccf8 100644
--- a/monav/unicodetournamenttrie/unicodetournamenttrieclient.h
+++ b/monav/unicodetournamenttrie/unicodetournamenttrieclient.h
@@ -20,9 +20,9 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef UNICODETOURNAMENTTRIECLIENT_H
 #define UNICODETOURNAMENTTRIECLIENT_H
 
-#include <QObject>
-#include <QtPlugin>
-#include <QFile>
+#include <QtCore/QObject>
+#include <QtCore/QtPlugin>
+#include <QtCore/QFile>
 #include "interfaces/iaddresslookup.h"
 #include "trie.h"
 
diff --git a/monav/utils/edgeconnector.h b/monav/utils/edgeconnector.h
index 61aa4f2..33f91f0 100644
--- a/monav/utils/edgeconnector.h
+++ b/monav/utils/edgeconnector.h
@@ -22,7 +22,7 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "utils/coordinates.h"
 #include <vector>
-#include <QMultiHash>
+#include <QtCore/QMultiHash>
 #include <algorithm>
 
 static uint qHash( const UnsignedCoordinate& key )
diff --git a/monav/utils/qthelpers.h b/monav/utils/qthelpers.h
index 871b4c8..20e1445 100644
--- a/monav/utils/qthelpers.h
+++ b/monav/utils/qthelpers.h
@@ -20,11 +20,11 @@ along with MoNav.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef QTHELPERS_H
 #define QTHELPERS_H
 
-#include <QFile>
-#include <QtDebug>
-#include <QDataStream>
-#include <QTime>
-#include <QDir>
+#include <QtCore/QFile>
+#include <QtCore/QtDebug>
+#include <QtCore/QDataStream>
+#include <QtCore/QTime>
+#include <QtCore/QDir>
 
 static inline QString fileInDirectory( QString directory, QString filename )
 {