GDP-562: fix path issue with #include of navit files

26 files changed, 233 insertions, 230 deletions

diff --git a/src/navigation/CMakeLists.txt b/src/navigation/CMakeLists.txt
index 0cf27f5..3a8f9ea 100644
--- a/src/navigation/CMakeLists.txt
+++ b/src/navigation/CMakeLists.txt
@@ -60,11 +60,13 @@ set(API_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../api")
 set(NAVIGATION_COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/navigation-common")
 
 if(NOT ${YOCTO_CONFIG})
-    set(NAVIT_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/navit/cmake")
+    set(NAVIT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/navit")
+    set(NAVIT_CMAKE_DIR "${NAVIT_DIR}/cmake")
     set(DBUS_GENERATED_INCLUDE_DIR_POSITIONING "${CMAKE_BINARY_DIR}/enhanced-position-service/dbus/api") # this one is for positioning, NB: it uses CMAKE_BINARY_DIR
     set(NAVIT_CONFIG_H_DIR "${CMAKE_CURRENT_BINARY_DIR}/navit")
 else()
-    set(NAVIT_CMAKE_DIR "${STAGING_LIBDIR}/navit/cmake")
+    set(NAVIT_DIR "${STAGING_LIBDIR}/navit")
+    set(NAVIT_CMAKE_DIR "${NAVIT_DIR}/cmake")
     set(DBUS_GENERATED_INCLUDE_DIR_POSITIONING "${STAGING_INCDIR}/positioning") # this one is for positioning
     set(NAVIT_CONFIG_H_DIR "${STAGING_DATADIR}")
 endif()
diff --git a/src/navigation/map-viewer/CMakeLists.txt b/src/navigation/map-viewer/CMakeLists.txt
index fdf39ef..1c6611e 100644
--- a/src/navigation/map-viewer/CMakeLists.txt
+++ b/src/navigation/map-viewer/CMakeLists.txt
@@ -32,9 +32,8 @@ include_directories(${DBUS_CPP_GLIB_INCLUDE_DIRS})
 
 include(${PRELOAD_CACHE_FOR_PLUGINS})
 
-include_directories(${INCLUDE_DIRECTORIES})
+include_directories(${NAVIT_DIR})
 include_directories(.)
-include_directories(${navit_SOURCE_DIR}/navit)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 include_directories(${NAVIT_CONFIG_H_DIR}) # this one contains config.h that is generated
diff --git a/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx b/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx
index 9a426db..88bca33 100644
--- a/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx
+++ b/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx
@@ -31,11 +31,11 @@
 #include <stdlib.h>
 #include "genivi-mapviewer-constants.h"
 #include "genivi-mapviewer-configuration_adaptor.h"
-#include "config.h"
+#include <config.h>
 #define USE_PLUGINS 1
-#include "debug.h"
-#include "plugin.h"
-#include "event.h"
+#include <navit/debug.h>
+#include <navit/plugin.h>
+#include <navit/event.h>
 #include "navigation-common-dbus.h"
 
 #if (!DEBUG_ENABLED)
diff --git a/src/navigation/map-viewer/configuration-server-plugin/genivi_mapviewer_configuration.cxx b/src/navigation/map-viewer/configuration-server-plugin/genivi_mapviewer_configuration.cxx
index 7665f13..fe12b18 100644
--- a/src/navigation/map-viewer/configuration-server-plugin/genivi_mapviewer_configuration.cxx
+++ b/src/navigation/map-viewer/configuration-server-plugin/genivi_mapviewer_configuration.cxx
@@ -28,11 +28,11 @@
 */
 #include <locale.h>
 #include <stdlib.h>
-#include "config.h"
+#include <config.h>
 #define USE_PLUGINS 1
-#include "debug.h"
-#include "plugin.h"
-#include "event.h"
+#include <navit/debug.h>
+#include <navit/plugin.h>
+#include <navit/event.h>
 
 #include <CommonAPI/CommonAPI.hpp>
 #include <CommonTypes.hpp>
diff --git a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
index 14f8cf0..c637c82 100644
--- a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
+++ b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
@@ -44,25 +44,25 @@
 #include "genivi-navigationcore-mapmatchedposition_proxy.h"
 #include "genivi-navigationcore-constants.h"
 #include "genivi-mapviewer-constants.h"
-#include "config.h"
+#include <config.h>
 #define USE_PLUGINS 1
-#include "debug.h"
-#include "plugin.h"
-#include "item.h"
-#include "config_.h"
-#include "navit.h"
-#include "event.h"
-#include "point.h"
-#include "graphics.h"
-#include "coord.h"
-#include "transform.h"
-#include "map.h"
-#include "mapset.h"
-#include "callback.h"
-#include "vehicle.h"
-#include "attr.h"
-#include "xmlconfig.h"
-#include "layout.h"
+#include <navit/debug.h>
+#include <navit/plugin.h>
+#include <navit/item.h>
+#include <navit/config_.h>
+#include <navit/navit.h>
+#include <navit/event.h>
+#include <navit/point.h>
+#include <navit/graphics.h>
+#include <navit/coord.h>
+#include <navit/transform.h>
+#include <navit/map.h>
+#include <navit/mapset.h>
+#include <navit/callback.h>
+#include <navit/vehicle.h>
+#include <navit/attr.h>
+#include <navit/xmlconfig.h>
+#include <navit/layout.h>
 
 #include "navigation-common-dbus.h"
 
diff --git a/src/navigation/map-viewer/mapviewercontrol-server-plugin/genivi_mapviewer_mapviewercontrol.cxx b/src/navigation/map-viewer/mapviewercontrol-server-plugin/genivi_mapviewer_mapviewercontrol.cxx
index 4982206..e419331 100644
--- a/src/navigation/map-viewer/mapviewercontrol-server-plugin/genivi_mapviewer_mapviewercontrol.cxx
+++ b/src/navigation/map-viewer/mapviewercontrol-server-plugin/genivi_mapviewer_mapviewercontrol.cxx
@@ -37,25 +37,25 @@
 #endif
 #endif
 
-#include "config.h"
+#include <config.h>
 #define USE_PLUGINS 1
-#include "debug.h"
-#include "plugin.h"
-#include "item.h"
-#include "config_.h"
-#include "navit.h"
-#include "event.h"
-#include "point.h"
-#include "graphics.h"
-#include "coord.h"
-#include "transform.h"
-#include "map.h"
-#include "mapset.h"
-#include "callback.h"
-#include "vehicle.h"
-#include "attr.h"
-#include "xmlconfig.h"
-#include "layout.h"
+#include <navit/debug.h>
+#include <navit/plugin.h>
+#include <navit/item.h>
+#include <navit/config_.h>
+#include <navit/navit.h>
+#include <navit/event.h>
+#include <navit/point.h>
+#include <navit/graphics.h>
+#include <navit/coord.h>
+#include <navit/transform.h>
+#include <navit/map.h>
+#include <navit/mapset.h>
+#include <navit/callback.h>
+#include <navit/vehicle.h>
+#include <navit/attr.h>
+#include <navit/xmlconfig.h>
+#include <navit/layout.h>
 
 #include <CommonAPI/CommonAPI.hpp>
 #include <CommonTypes.hpp>
diff --git a/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx b/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx
index 832bc72..678f288 100644
--- a/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx
+++ b/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx
@@ -28,11 +28,11 @@
 #include <dbus-c++/glib-integration.h>
 #include "genivi-mapviewer-constants.h"
 #include "genivi-mapviewer-session_adaptor.h"
-#include "config.h"
+#include <config.h>
 #define USE_PLUGINS 1
-#include "debug.h"
-#include "plugin.h"
-#include "event.h"
+#include <navit/debug.h>
+#include <navit/plugin.h>
+#include <navit/event.h>
 
 #include "navigation-common-dbus.h"
 
diff --git a/src/navigation/map-viewer/session-server-plugin/genivi_mapviewer_session.cxx b/src/navigation/map-viewer/session-server-plugin/genivi_mapviewer_session.cxx
index 993d457..670e677 100644
--- a/src/navigation/map-viewer/session-server-plugin/genivi_mapviewer_session.cxx
+++ b/src/navigation/map-viewer/session-server-plugin/genivi_mapviewer_session.cxx
@@ -26,11 +26,11 @@
 * @licence end@
 */
 #include <dbus-c++/glib-integration.h>
-#include "config.h"
+#include <config.h>
 #define USE_PLUGINS 1
-#include "debug.h"
-#include "plugin.h"
-#include "event.h"
+#include <navit/debug.h>
+#include <navit/plugin.h>
+#include <navit/event.h>
 
 #include <CommonAPI/CommonAPI.hpp>
 #include <CommonTypes.hpp>
diff --git a/src/navigation/navigation-core/CMakeLists.txt b/src/navigation/navigation-core/CMakeLists.txt
index 4a0d362..d842366 100644
--- a/src/navigation/navigation-core/CMakeLists.txt
+++ b/src/navigation/navigation-core/CMakeLists.txt
@@ -32,9 +32,8 @@ include_directories(${DBUS_CPP_GLIB_INCLUDE_DIRS})
 
 include(${PRELOAD_CACHE_FOR_PLUGINS})
 
-include_directories(${INCLUDE_DIRECTORIES})
+include_directories(${NAVIT_DIR})
 include_directories(.)
-include_directories(${navit_SOURCE_DIR}/navit)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 include_directories(${NAVIT_CONFIG_H_DIR}) # this one contains config.h that is generated
diff --git a/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx b/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx
index 1c5418f..8e3a8c2 100644
--- a/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx
+++ b/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx
@@ -31,11 +31,11 @@
 #include <stdlib.h>
 #include "genivi-navigationcore-constants.h"
 #include "genivi-navigationcore-configuration_adaptor.h"
-#include "config.h"
+#include <config.h>
 #define USE_PLUGINS 1
-#include "debug.h"
-#include "plugin.h"
-#include "event.h"
+#include <navit/debug.h>
+#include <navit/plugin.h>
+#include <navit/event.h>
 
 #include "navigation-common-dbus.h"
 
diff --git a/src/navigation/navigation-core/configuration-server-plugin/genivi_navigationcore_configuration.cxx b/src/navigation/navigation-core/configuration-server-plugin/genivi_navigationcore_configuration.cxx
index 76b5aa3..76cc0bd 100644
--- a/src/navigation/navigation-core/configuration-server-plugin/genivi_navigationcore_configuration.cxx
+++ b/src/navigation/navigation-core/configuration-server-plugin/genivi_navigationcore_configuration.cxx
@@ -37,11 +37,11 @@
 #include <typeinfo>
 #include <glib.h>
 
-#include "config.h"
+#include <config.h>
 #define USE_PLUGINS 1
-#include "debug.h"
-#include "plugin.h"
-#include "event.h"
+#include <navit/debug.h>
+#include <navit/plugin.h>
+#include <navit/event.h>
 
 #include <CommonAPI/CommonAPI.hpp>
 #include <CommonTypes.hpp>
diff --git a/src/navigation/navigation-core/enhancedposition-client-plugin/genivi_positioning_enhancedposition.cxx b/src/navigation/navigation-core/enhancedposition-client-plugin/genivi_positioning_enhancedposition.cxx
index 2934800..44d7fbc 100644
--- a/src/navigation/navigation-core/enhancedposition-client-plugin/genivi_positioning_enhancedposition.cxx
+++ b/src/navigation/navigation-core/enhancedposition-client-plugin/genivi_positioning_enhancedposition.cxx
@@ -33,15 +33,16 @@
 #include <assert.h>
 #include <math.h>
 #define USE_PLUGINS 1
-#include "debug.h"
-#include "item.h"
-#include "navit.h"
-#include "map.h"
-#include "callback.h"
-#include "transform.h"
-#include "plugin.h"
-#include "event.h"
-#include "vehicle.h"
+#include <navit/debug.h>
+#include <navit/item.h>
+#include <navit/navit.h>
+#include <navit/map.h>
+#include <navit/callback.h>
+#include <navit/transform.h>
+#include <navit/plugin.h>
+#include <navit/event.h>
+#include <navit/vehicle.h>
+
 #include "time.h"
 #include <unistd.h>
 
diff --git a/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx b/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx
index 1572255..534fcb0 100644
--- a/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx
+++ b/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx
@@ -33,15 +33,15 @@
 #include <assert.h>
 #include <math.h>
 #define USE_PLUGINS 1
-#include "debug.h"
-#include "item.h"
-#include "navit.h"
-#include "map.h"
-#include "callback.h"
-#include "transform.h"
-#include "plugin.h"
-#include "event.h"
-#include "vehicle.h"
+#include <navit/debug.h>
+#include <navit/item.h>
+#include <navit/navit.h>
+#include <navit/map.h>
+#include <navit/callback.h>
+#include <navit/transform.h>
+#include <navit/plugin.h>
+#include <navit/event.h>
+#include <navit/vehicle.h>
 
 #include "time.h"
 
diff --git a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
index 2ac3e2b..664383b 100644
--- a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
+++ b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
@@ -35,20 +35,20 @@
 #include "genivi-speechservice-speechoutput_proxy.h"
 #endif
 
-#include "config.h"
+#include <config.h>
 #define USE_PLUGINS 1
-#include "debug.h"
-#include "plugin.h"
-#include "item.h"
-#include "config_.h"
-#include "navit.h"
-#include "callback.h"
-#include "navigation.h"
-#include "map.h"
-#include "transform.h"
-#include "track.h"
-#include "vehicle.h"
-#include "route.h"
+#include <navit/debug.h>
+#include <navit/plugin.h>
+#include <navit/item.h>
+#include <navit/config_.h>
+#include <navit/navit.h>
+#include <navit/callback.h>
+#include <navit/navigation.h>
+#include <navit/map.h>
+#include <navit/transform.h>
+#include <navit/track.h>
+#include <navit/vehicle.h>
+#include <navit/route.h>
 
 #include "navigation-common-dbus.h"
 
diff --git a/src/navigation/navigation-core/guidance-server-plugin/genivi_navigationcore_guidance.cxx b/src/navigation/navigation-core/guidance-server-plugin/genivi_navigationcore_guidance.cxx
index 564ee2e..90b7f39 100644
--- a/src/navigation/navigation-core/guidance-server-plugin/genivi_navigationcore_guidance.cxx
+++ b/src/navigation/navigation-core/guidance-server-plugin/genivi_navigationcore_guidance.cxx
@@ -33,20 +33,20 @@
 #include "genivi-speechservice-speechoutput_proxy.h"
 #endif
 
-#include "config.h"
+#include <config.h>
 #define USE_PLUGINS 1
-#include "debug.h"
-#include "plugin.h"
-#include "item.h"
-#include "config_.h"
-#include "navit.h"
-#include "callback.h"
-#include "navigation.h"
-#include "map.h"
-#include "transform.h"
-#include "track.h"
-#include "vehicle.h"
-#include "route.h"
+#include <navit/debug.h>
+#include <navit/plugin.h>
+#include <navit/item.h>
+#include <navit/config_.h>
+#include <navit/navit.h>
+#include <navit/callback.h>
+#include <navit/navigation.h>
+#include <navit/map.h>
+#include <navit/transform.h>
+#include <navit/track.h>
+#include <navit/vehicle.h>
+#include <navit/route.h>
 
 #include <CommonAPI/CommonAPI.hpp>
 #include <CommonTypes.hpp>
diff --git a/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx b/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx
index 4aead3d..0a098e0 100644
--- a/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx
+++ b/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx
@@ -28,18 +28,18 @@
 #include <dbus-c++/glib-integration.h>
 #include "genivi-navigationcore-constants.h"
 #include "genivi-navigationcore-locationinput_adaptor.h"
-#include "config.h"
+#include <config.h>
 #define USE_PLUGINS 1
-#include "debug.h"
-#include "plugin.h"
-#include "item.h"
-#include "config_.h"
-#include "navit.h"
-#include "search.h"
-#include "callback.h"
-#include "event.h"
-#include "coord.h"
-#include "transform.h"
+#include <navit/debug.h>
+#include <navit/plugin.h>
+#include <navit/item.h>
+#include <navit/config_.h>
+#include <navit/navit.h>
+#include <navit/search.h>
+#include <navit/callback.h>
+#include <navit/event.h>
+#include <navit/coord.h>
+#include <navit/transform.h>
 
 #include "navigation-common-dbus.h"
 
diff --git a/src/navigation/navigation-core/locationinput-server-plugin/genivi_navigationcore_locationinput.cxx b/src/navigation/navigation-core/locationinput-server-plugin/genivi_navigationcore_locationinput.cxx
index f0f675b..472b7de 100644
--- a/src/navigation/navigation-core/locationinput-server-plugin/genivi_navigationcore_locationinput.cxx
+++ b/src/navigation/navigation-core/locationinput-server-plugin/genivi_navigationcore_locationinput.cxx
@@ -26,18 +26,18 @@
 * @licence end@
 */
 #include <dbus-c++/glib-integration.h>
-#include "config.h"
+#include <config.h>
 #define USE_PLUGINS 1
-#include "debug.h"
-#include "plugin.h"
-#include "item.h"
-#include "config_.h"
-#include "navit.h"
-#include "search.h"
-#include "callback.h"
-#include "event.h"
-#include "coord.h"
-#include "transform.h"
+#include <navit/debug.h>
+#include <navit/plugin.h>
+#include <navit/item.h>
+#include <navit/config_.h>
+#include <navit/navit.h>
+#include <navit/search.h>
+#include <navit/callback.h>
+#include <navit/event.h>
+#include <navit/coord.h>
+#include <navit/transform.h>
 
 #include <CommonAPI/CommonAPI.hpp>
 #include <CommonTypes.hpp>
diff --git a/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx b/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx
index 76c97c7..88e19a1 100644
--- a/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx
+++ b/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx
@@ -28,21 +28,21 @@
 #include <dbus-c++/glib-integration.h>
 #include "genivi-navigationcore-constants.h"
 #include "genivi-navigationcore-mapmatchedposition_adaptor.h"
-#include "config.h"
+#include <config.h>
 #define USE_PLUGINS 1
-#include "debug.h"
-#include "plugin.h"
-#include "item.h"
-#include "config_.h"
-#include "navit.h"
-#include "callback.h"
-#include "navigation.h"
-#include "map.h"
-#include "transform.h"
-#include "track.h"
-#include "vehicle.h"
-#include "route.h"
-#include "config_.h"
+#include <navit/debug.h>
+#include <navit/plugin.h>
+#include <navit/item.h>
+#include <navit/config_.h>
+#include <navit/navit.h>
+#include <navit/callback.h>
+#include <navit/navigation.h>
+#include <navit/map.h>
+#include <navit/transform.h>
+#include <navit/track.h>
+#include <navit/vehicle.h>
+#include <navit/route.h>
+#include <navit/config_.h>
 
 #include "navigation-common-dbus.h"
 
diff --git a/src/navigation/navigation-core/mapmatchedposition-server-plugin/genivi_navigationcore_mapmatchedposition.cxx b/src/navigation/navigation-core/mapmatchedposition-server-plugin/genivi_navigationcore_mapmatchedposition.cxx
index 9288d68..120a877 100644
--- a/src/navigation/navigation-core/mapmatchedposition-server-plugin/genivi_navigationcore_mapmatchedposition.cxx
+++ b/src/navigation/navigation-core/mapmatchedposition-server-plugin/genivi_navigationcore_mapmatchedposition.cxx
@@ -26,21 +26,22 @@
 * @licence end@
 */
 #include <dbus-c++/glib-integration.h>
-#include "config.h"
+#include <config.h>
 #define USE_PLUGINS 1
-#include "debug.h"
-#include "plugin.h"
-#include "item.h"
-#include "config_.h"
-#include "navit.h"
-#include "callback.h"
-#include "navigation.h"
-#include "map.h"
-#include "transform.h"
-#include "track.h"
-#include "vehicle.h"
-#include "route.h"
-#include "config_.h"
+#include <navit/debug.h>
+#include <navit/plugin.h>
+#include <navit/item.h>
+#include <navit/config_.h>
+#include <navit/navit.h>
+#include <navit/callback.h>
+#include <navit/navigation.h>
+#include <navit/map.h>
+#include <navit/transform.h>
+#include <navit/track.h>
+#include <navit/vehicle.h>
+#include <navit/route.h>
+#include <navit/config_.h>
+
 #include <CommonAPI/CommonAPI.hpp>
 #include <CommonTypes.hpp>
 #include <NavigationTypes.hpp>
diff --git a/src/navigation/navigation-core/poicam-server-plugin/genivi_poiservice_cam_navit.cxx b/src/navigation/navigation-core/poicam-server-plugin/genivi_poiservice_cam_navit.cxx
index 11a4384..19c89b2 100644
--- a/src/navigation/navigation-core/poicam-server-plugin/genivi_poiservice_cam_navit.cxx
+++ b/src/navigation/navigation-core/poicam-server-plugin/genivi_poiservice_cam_navit.cxx
@@ -27,20 +27,21 @@
 * @licence end@
 */
 #include <dbus-c++/glib-integration.h>
-#include "config.h"
+#include <config.h>
 #define USE_PLUGINS 1
-#include "debug.h"
-#include "plugin.h"
-#include "item.h"
-#include "config_.h"
-#include "navit.h"
-#include "search.h"
-#include "callback.h"
-#include "event.h"
-#include "coord.h"
-#include "transform.h"
-#include "map.h"
-#include "mapset.h"
+#include <navit/debug.h>
+#include <navit/plugin.h>
+#include <navit/item.h>
+#include <navit/config_.h>
+#include <navit/navit.h>
+#include <navit/search.h>
+#include <navit/callback.h>
+#include <navit/event.h>
+#include <navit/coord.h>
+#include <navit/transform.h>
+#include <navit/map.h>
+#include <navit/mapset.h>
+
 #include <algorithm>
 #include <unistd.h>
 
diff --git a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
index b2ea8b4..a987ef8 100644
--- a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
+++ b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
@@ -29,24 +29,24 @@
 #include <dbus-c++/glib-integration.h>
 #include "genivi-navigationcore-constants.h"
 #include "genivi-navigationcore-routing_adaptor.h"
-#include "config.h"
+#include <config.h>
 #define USE_PLUGINS 1
-#include "debug.h"
-#include "plugin.h"
-#include "item.h"
-#include "coord.h"
-#include "config_.h"
-#include "navit.h"
-#include "route.h"
-#include "transform.h"
-#include "command.h"
-#include "callback.h"
-#include "vehicle.h"
-#include "xmlconfig.h"
-#include "vehicleprofile.h"
-#include "roadprofile.h"
-#include "map.h"
-#include "event.h"
+#include <navit/debug.h>
+#include <navit/plugin.h>
+#include <navit/item.h>
+#include <navit/coord.h>
+#include <navit/config_.h>
+#include <navit/navit.h>
+#include <navit/route.h>
+#include <navit/transform.h>
+#include <navit/command.h>
+#include <navit/callback.h>
+#include <navit/vehicle.h>
+#include <navit/xmlconfig.h>
+#include <navit/vehicleprofile.h>
+#include <navit/roadprofile.h>
+#include <navit/map.h>
+#include <navit/event.h>
 
 #include "navigation-common-dbus.h"
 
diff --git a/src/navigation/navigation-core/routing-server-plugin/genivi_navigationcore_routing.cxx b/src/navigation/navigation-core/routing-server-plugin/genivi_navigationcore_routing.cxx
index c81017e..a2189c8 100644
--- a/src/navigation/navigation-core/routing-server-plugin/genivi_navigationcore_routing.cxx
+++ b/src/navigation/navigation-core/routing-server-plugin/genivi_navigationcore_routing.cxx
@@ -27,24 +27,25 @@
 * @licence end@
 */
 #include <dbus-c++/glib-integration.h>
-#include "config.h"
+#include <config.h>
 #define USE_PLUGINS 1
-#include "debug.h"
-#include "plugin.h"
-#include "item.h"
-#include "coord.h"
-#include "config_.h"
-#include "navit.h"
-#include "route.h"
-#include "transform.h"
-#include "command.h"
-#include "callback.h"
-#include "vehicle.h"
-#include "xmlconfig.h"
-#include "vehicleprofile.h"
-#include "roadprofile.h"
-#include "map.h"
-#include "event.h"
+#include <navit/debug.h>
+#include <navit/plugin.h>
+#include <navit/item.h>
+#include <navit/coord.h>
+#include <navit/config_.h>
+#include <navit/navit.h>
+#include <navit/route.h>
+#include <navit/transform.h>
+#include <navit/command.h>
+#include <navit/callback.h>
+#include <navit/vehicle.h>
+#include <navit/xmlconfig.h>
+#include <navit/vehicleprofile.h>
+#include <navit/roadprofile.h>
+#include <navit/map.h>
+#include <navit/event.h>
+
 #include <unistd.h>
 
 #include <CommonAPI/CommonAPI.hpp>
diff --git a/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx b/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx
index 661ff88..f6fdb48 100644
--- a/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx
+++ b/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx
@@ -28,11 +28,11 @@
 #include <dbus-c++/glib-integration.h>
 #include "genivi-navigationcore-constants.h"
 #include "genivi-navigationcore-session_adaptor.h"
-#include "config.h"
+#include <config.h>
 #define USE_PLUGINS 1
-#include "debug.h"
-#include "plugin.h"
-#include "event.h"
+#include <navit/debug.h>
+#include <navit/plugin.h>
+#include <navit/event.h>
 
 #include "navigation-common-dbus.h"
 
diff --git a/src/navigation/navigation-core/session-server-plugin/genivi_navigationcore_session.cxx b/src/navigation/navigation-core/session-server-plugin/genivi_navigationcore_session.cxx
index 8bd3b48..53c742f 100644
--- a/src/navigation/navigation-core/session-server-plugin/genivi_navigationcore_session.cxx
+++ b/src/navigation/navigation-core/session-server-plugin/genivi_navigationcore_session.cxx
@@ -26,11 +26,11 @@
 * @licence end@
 */
 #include <dbus-c++/glib-integration.h>
-#include "config.h"
+#include <config.h>
 #define USE_PLUGINS 1
-#include "debug.h"
-#include "plugin.h"
-#include "event.h"
+#include <navit/debug.h>
+#include <navit/plugin.h>
+#include <navit/event.h>
 
 #include <CommonAPI/CommonAPI.hpp>
 #include <CommonTypes.hpp>
diff --git a/src/navigation/poi-cam/CMakeLists.txt b/src/navigation/poi-cam/CMakeLists.txt
index 06cd7f1..5a1fd45 100644
--- a/src/navigation/poi-cam/CMakeLists.txt
+++ b/src/navigation/poi-cam/CMakeLists.txt
@@ -42,9 +42,8 @@ include_directories(${DBUS_CPP_GLIB_INCLUDE_DIRS})
 
 include(${PRELOAD_CACHE_FOR_PLUGINS})
 
-include_directories(${INCLUDE_DIRECTORIES})
+include_directories(${NAVIT_DIR})
 include_directories(.)
-include_directories(${navit_SOURCE_DIR}/navit)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 include_directories(${NAVIT_CONFIG_H_DIR}) # this one contains config.h that is generated
diff --git a/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx b/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx
index 77e071e..59d916e 100644
--- a/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx
+++ b/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx
@@ -26,20 +26,20 @@
 * @licence end@
 */
 #include <dbus-c++/glib-integration.h>
-#include "config.h"
+#include <config.h>
 #define USE_PLUGINS 1
-#include "debug.h"
-#include "plugin.h"
-#include "item.h"
-#include "config_.h"
-#include "navit.h"
-#include "search.h"
-#include "callback.h"
-#include "event.h"
-#include "coord.h"
-#include "transform.h"
-#include "map.h"
-#include "mapset.h"
+#include <navit/debug.h>
+#include <navit/plugin.h>
+#include <navit/item.h>
+#include <navit/config_.h>
+#include <navit/navit.h>
+#include <navit/search.h>
+#include <navit/callback.h>
+#include <navit/event.h>
+#include <navit/coord.h>
+#include <navit/transform.h>
+#include <navit/map.h>
+#include <navit/mapset.h>
 #include "navigation-common-dbus.h"
 
 #if (!DEBUG_ENABLED)