diff -rupN shared.pri qcad-3.15.6.1-new/shared.pri
--- shared.pri	2016-12-01 10:40:01.000000000 +0100
+++ shared.pri	2016-12-18 21:03:22.059514509 +0100
@@ -164,10 +164,10 @@ QMAKE_TARGET_DESCRIPTION = QCAD Applicat
 QMAKE_TARGET_COPYRIGHT = 
 QMAKE_TARGET_PRODUCT = QCAD Application Framework
 
-DESTDIR = $$PWD/$$ROUTDIR
+DESTDIR = $$shadowed($$PWD)/$$ROUTDIR
 UI_DIR = .ui
 
-LIBS += -L$$PWD/$$ROUTDIR
+LIBS += -L$$shadowed($$PWD)/$$ROUTDIR
 
 CONFIG(debug, debug|release) {
     !win32 {
diff -rupN src/spatialindex/RSpatialIndexNavel.h qcad-3.15.6.1-new/src/spatialindex/RSpatialIndexNavel.h
--- src/spatialindex/RSpatialIndexNavel.h	2016-12-01 10:40:01.000000000 +0100
+++ src/spatialindex/RSpatialIndexNavel.h	2016-12-18 21:04:31.387312658 +0100
@@ -28,7 +28,7 @@
 
 #include "RSpatialIndex.h"
 
-#include "spatialindexnavel/include/spatialindex/SpatialIndex.h"
+#include "spatialindex/SpatialIndex.h"
 
 class RSiDataStream : public SpatialIndex::IDataStream
 {