345 files changed, 51 insertions, 51 deletions

diff --git a/Makefile.am b/Makefile.am
index 5b5012226..2a28cb58b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
 include $(top_srcdir)/Makefile.inc
-SUBDIRS=src po intl
+SUBDIRS=navit po intl
 pkgdoc_DATA = README
 EXTRA_DIST = README COPYRIGHT
diff --git a/configure.in b/configure.in
index 317b2b691..89f955358 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 AC_INIT(navit, 0.1.0)
 AM_INIT_AUTOMAKE
-AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER(navit/config.h)
 AM_MAINTAINER_MODE
 
 
@@ -464,40 +464,40 @@ AC_SUBST(VERSION)
 
 AC_CONFIG_FILES([
 Makefile
-src/Makefile
-src/binding/Makefile
-src/binding/python/Makefile
-src/binding/dbus/Makefile
-src/data/Makefile
-src/data/mg/Makefile
-src/data/textfile/Makefile
-src/data/binfile/Makefile
-src/data/garmin/Makefile
-src/data/poi_geodownload/Makefile
-src/data/poi_geodownload/libmdb/Makefile
-src/data/poi_geodownload/libmdb/include/Makefile
-src/fib-1.1/Makefile
-src/graphics/Makefile
-src/graphics/gtk_drawing_area/Makefile
-src/graphics/opengl/Makefile
-src/graphics/null/Makefile
-src/graphics/qt_qpainter/Makefile
-src/gui/Makefile
-src/gui/gtk/Makefile
-src/gui/internal/Makefile
-src/gui/sdl/Makefile
-src/gui/sdl/datafiles/Makefile
-src/osd/Makefile
-src/osd/core/Makefile
-src/speech/Makefile
-src/speech/cmdline/Makefile
-src/speech/speech_dispatcher/Makefile
-src/vehicle/Makefile
-src/vehicle/file/Makefile
-src/vehicle/gpsd/Makefile
-src/vehicle/demo/Makefile
-src/xpm/Makefile
-src/maps/Makefile
+navit/Makefile
+navit/binding/Makefile
+navit/binding/python/Makefile
+navit/binding/dbus/Makefile
+navit/data/Makefile
+navit/data/mg/Makefile
+navit/data/textfile/Makefile
+navit/data/binfile/Makefile
+navit/data/garmin/Makefile
+navit/data/poi_geodownload/Makefile
+navit/data/poi_geodownload/libmdb/Makefile
+navit/data/poi_geodownload/libmdb/include/Makefile
+navit/fib-1.1/Makefile
+navit/graphics/Makefile
+navit/graphics/gtk_drawing_area/Makefile
+navit/graphics/opengl/Makefile
+navit/graphics/null/Makefile
+navit/graphics/qt_qpainter/Makefile
+navit/gui/Makefile
+navit/gui/gtk/Makefile
+navit/gui/internal/Makefile
+navit/gui/sdl/Makefile
+navit/gui/sdl/datafiles/Makefile
+navit/osd/Makefile
+navit/osd/core/Makefile
+navit/speech/Makefile
+navit/speech/cmdline/Makefile
+navit/speech/speech_dispatcher/Makefile
+navit/vehicle/Makefile
+navit/vehicle/file/Makefile
+navit/vehicle/gpsd/Makefile
+navit/vehicle/demo/Makefile
+navit/xpm/Makefile
+navit/maps/Makefile
 intl/Makefile
 po/Makefile
 ])
diff --git a/src/Doxyfile b/navit/Doxyfile
index e21675546..e21675546 100644
--- a/src/Doxyfile
+++ b/navit/Doxyfile
diff --git a/src/Makefile.am b/navit/Makefile.am
index 7b85d3284..56fff1551 100644
--- a/src/Makefile.am
+++ b/navit/Makefile.am
@@ -5,7 +5,7 @@ if BUILD_SAMPLEMAP
   SUBDIRS += maps
 endif
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/fib-1.1 @NAVIT_CFLAGS@ -DPREFIX=\"@prefix@\" -DMODULE=navit
+AM_CPPFLAGS = -I$(top_srcdir)/navit/fib-1.1 @NAVIT_CFLAGS@ -DPREFIX=\"@prefix@\" -DMODULE=navit
 BUILT_SOURCES=osm2navit
 bin_PROGRAMS = navit osm2navit
 
@@ -30,14 +30,14 @@ navit_LDADD = @NAVIT_LIBS@ @ZLIB_LIBS@ -Lfib-1.1 -lfib
 
 if !PLUGINS
   navit_SOURCES += builtin.c
-  navit_LDADD += $(wildcard $(top_builddir)/src/*/*/*.la)
+  navit_LDADD += $(wildcard $(top_builddir)/navit/*/*/*.la)
 endif
 
 builtin.c:
-	ls $(top_builddir)/src/*/*/*.la | sed -e "s/.la/_init(void);/" -e "s/.*lib/extern void module_/" >builtin.c
+	ls $(top_builddir)/navit/*/*/*.la | sed -e "s/.la/_init(void);/" -e "s/.*lib/extern void module_/" >builtin.c
 	echo "extern void builtin_init(void);" >>builtin.c
 	echo "void builtin_init(void) {" >>builtin.c
-	ls $(top_builddir)/src/*/*/*.la | sed -e "s/.la/_init();/" -e "s/.*lib/	module_/" >>builtin.c
+	ls $(top_builddir)/navit/*/*/*.la | sed -e "s/.la/_init();/" -e "s/.*lib/	module_/" >>builtin.c
 	echo "}" >>builtin.c
 
 osm2navit_LDADD = @NAVIT_LIBS@  @ZLIB_LIBS@
diff --git a/src/attr.c b/navit/attr.c
index be0c8f2f0..be0c8f2f0 100644
--- a/src/attr.c
+++ b/navit/attr.c
diff --git a/src/attr.h b/navit/attr.h
index dda3116d7..dda3116d7 100644
--- a/src/attr.h
+++ b/navit/attr.h
diff --git a/src/attr_def.h b/navit/attr_def.h
index f9c025567..f9c025567 100644
--- a/src/attr_def.h
+++ b/navit/attr_def.h
diff --git a/src/binding/Makefile.am b/navit/binding/Makefile.am
index 540a233cd..540a233cd 100644
--- a/src/binding/Makefile.am
+++ b/navit/binding/Makefile.am
diff --git a/src/binding/dbus/Makefile.am b/navit/binding/dbus/Makefile.am
index 55b7b2908..55b7b2908 100644
--- a/src/binding/dbus/Makefile.am
+++ b/navit/binding/dbus/Makefile.am
diff --git a/src/binding/dbus/binding_dbus.c b/navit/binding/dbus/binding_dbus.c
index 5f682180c..5f682180c 100644
--- a/src/binding/dbus/binding_dbus.c
+++ b/navit/binding/dbus/binding_dbus.c
diff --git a/src/binding/dbus/navit.introspect b/navit/binding/dbus/navit.introspect
index 8afea2d6f..8afea2d6f 100644
--- a/src/binding/dbus/navit.introspect
+++ b/navit/binding/dbus/navit.introspect
diff --git a/src/binding/dbus/test.py b/navit/binding/dbus/test.py
index 5f69fddbf..5f69fddbf 100755
--- a/src/binding/dbus/test.py
+++ b/navit/binding/dbus/test.py
diff --git a/src/binding/python/Makefile.am b/navit/binding/python/Makefile.am
index 637492080..637492080 100644
--- a/src/binding/python/Makefile.am
+++ b/navit/binding/python/Makefile.am
diff --git a/src/binding/python/binding_python.c b/navit/binding/python/binding_python.c
index cb33f83b3..cb33f83b3 100644
--- a/src/binding/python/binding_python.c
+++ b/navit/binding/python/binding_python.c
diff --git a/src/callback.c b/navit/callback.c
index b8c386aa6..b8c386aa6 100644
--- a/src/callback.c
+++ b/navit/callback.c
diff --git a/src/callback.h b/navit/callback.h
index ebdaf047a..ebdaf047a 100644
--- a/src/callback.h
+++ b/navit/callback.h
diff --git a/src/color.h b/navit/color.h
index 17d3d9c80..17d3d9c80 100644
--- a/src/color.h
+++ b/navit/color.h
diff --git a/src/compass.c b/navit/compass.c
index 7bb9ee812..7bb9ee812 100644
--- a/src/compass.c
+++ b/navit/compass.c
diff --git a/src/compass.h b/navit/compass.h
index cb864170a..cb864170a 100644
--- a/src/compass.h
+++ b/navit/compass.h
diff --git a/src/coord.c b/navit/coord.c
index 74b6a1041..74b6a1041 100644
--- a/src/coord.c
+++ b/navit/coord.c
diff --git a/src/coord.h b/navit/coord.h
index 62c45f5a9..62c45f5a9 100644
--- a/src/coord.h
+++ b/navit/coord.h
diff --git a/src/country.c b/navit/country.c
index 0fa7a084b..0fa7a084b 100644
--- a/src/country.c
+++ b/navit/country.c
diff --git a/src/country.h b/navit/country.h
index 8e435f3a1..8e435f3a1 100644
--- a/src/country.h
+++ b/navit/country.h
diff --git a/src/cursor.c b/navit/cursor.c
index cf706c24b..cf706c24b 100644
--- a/src/cursor.c
+++ b/navit/cursor.c
diff --git a/src/cursor.h b/navit/cursor.h
index 203ef0801..203ef0801 100644
--- a/src/cursor.h
+++ b/navit/cursor.h
diff --git a/src/data.h b/navit/data.h
index 451742673..451742673 100644
--- a/src/data.h
+++ b/navit/data.h
diff --git a/src/data/Makefile.am b/navit/data/Makefile.am
index e82f9dae4..e82f9dae4 100644
--- a/src/data/Makefile.am
+++ b/navit/data/Makefile.am
diff --git a/src/data/binfile/Makefile.am b/navit/data/binfile/Makefile.am
index 69e26f542..69e26f542 100644
--- a/src/data/binfile/Makefile.am
+++ b/navit/data/binfile/Makefile.am
diff --git a/src/data/binfile/binfile.c b/navit/data/binfile/binfile.c
index 51508cc65..51508cc65 100644
--- a/src/data/binfile/binfile.c
+++ b/navit/data/binfile/binfile.c
diff --git a/src/data/garmin/Makefile.am b/navit/data/garmin/Makefile.am
index e177ba5b4..800e6dfd7 100644
--- a/src/data/garmin/Makefile.am
+++ b/navit/data/garmin/Makefile.am
@@ -19,7 +19,7 @@ noinst_PROGRAMS=gentypes
 gentypes_SOURCES=gentypes.c
 
 g2nbuiltin.h: gentypes garmintypes.txt
-	./gentypes $(top_srcdir)/src/data/garmin/garmintypes.txt $@
+	./gentypes garmintypes.txt $@
 
 EXTRA_DIST = garmintypes.txt
 
diff --git a/src/data/garmin/gar2navit.c b/navit/data/garmin/gar2navit.c
index 687217d24..687217d24 100644
--- a/src/data/garmin/gar2navit.c
+++ b/navit/data/garmin/gar2navit.c
diff --git a/src/data/garmin/gar2navit.h b/navit/data/garmin/gar2navit.h
index de68298ad..de68298ad 100644
--- a/src/data/garmin/gar2navit.h
+++ b/navit/data/garmin/gar2navit.h
diff --git a/src/data/garmin/garmin.c b/navit/data/garmin/garmin.c
index d6d39d490..d6d39d490 100644
--- a/src/data/garmin/garmin.c
+++ b/navit/data/garmin/garmin.c
diff --git a/src/data/garmin/garmin.h b/navit/data/garmin/garmin.h
index 50935b052..50935b052 100644
--- a/src/data/garmin/garmin.h
+++ b/navit/data/garmin/garmin.h
diff --git a/src/data/garmin/garmintypes.txt b/navit/data/garmin/garmintypes.txt
index fd73d3724..fd73d3724 100644
--- a/src/data/garmin/garmintypes.txt
+++ b/navit/data/garmin/garmintypes.txt
diff --git a/src/data/garmin/gentypes.c b/navit/data/garmin/gentypes.c
index 0792bc055..0792bc055 100644
--- a/src/data/garmin/gentypes.c
+++ b/navit/data/garmin/gentypes.c
diff --git a/src/data/garmin_img/Makefile.am b/navit/data/garmin_img/Makefile.am
index c48ea390c..c48ea390c 100644
--- a/src/data/garmin_img/Makefile.am
+++ b/navit/data/garmin_img/Makefile.am
diff --git a/src/data/garmin_img/garmin_img.c b/navit/data/garmin_img/garmin_img.c
index d735b027d..d735b027d 100644
--- a/src/data/garmin_img/garmin_img.c
+++ b/navit/data/garmin_img/garmin_img.c
diff --git a/src/data/mg/Makefile.am b/navit/data/mg/Makefile.am
index 04d92b056..04d92b056 100644
--- a/src/data/mg/Makefile.am
+++ b/navit/data/mg/Makefile.am
diff --git a/src/data/mg/block.c b/navit/data/mg/block.c
index 08e9410e0..08e9410e0 100644
--- a/src/data/mg/block.c
+++ b/navit/data/mg/block.c
diff --git a/src/data/mg/map.c b/navit/data/mg/map.c
index 843516d8c..843516d8c 100644
--- a/src/data/mg/map.c
+++ b/navit/data/mg/map.c
diff --git a/src/data/mg/mg.h b/navit/data/mg/mg.h
index 2600e3ce5..2600e3ce5 100644
--- a/src/data/mg/mg.h
+++ b/navit/data/mg/mg.h
diff --git a/src/data/mg/poly.c b/navit/data/mg/poly.c
index bc9af2011..bc9af2011 100644
--- a/src/data/mg/poly.c
+++ b/navit/data/mg/poly.c
diff --git a/src/data/mg/street.c b/navit/data/mg/street.c
index 019adb77f..019adb77f 100644
--- a/src/data/mg/street.c
+++ b/navit/data/mg/street.c
diff --git a/src/data/mg/town.c b/navit/data/mg/town.c
index 92bd0e742..92bd0e742 100644
--- a/src/data/mg/town.c
+++ b/navit/data/mg/town.c
diff --git a/src/data/mg/tree.c b/navit/data/mg/tree.c
index 077649e96..077649e96 100644
--- a/src/data/mg/tree.c
+++ b/navit/data/mg/tree.c
diff --git a/src/data/poi_geodownload/Makefile.am b/navit/data/poi_geodownload/Makefile.am
index 6c329b8ea..6c329b8ea 100644
--- a/src/data/poi_geodownload/Makefile.am
+++ b/navit/data/poi_geodownload/Makefile.am
diff --git a/src/data/poi_geodownload/libmdb/Makefile.am b/navit/data/poi_geodownload/libmdb/Makefile.am
index e2e440ba9..e2e440ba9 100644
--- a/src/data/poi_geodownload/libmdb/Makefile.am
+++ b/navit/data/poi_geodownload/libmdb/Makefile.am
diff --git a/src/data/poi_geodownload/libmdb/backend.c b/navit/data/poi_geodownload/libmdb/backend.c
index 902805c3e..902805c3e 100644
--- a/src/data/poi_geodownload/libmdb/backend.c
+++ b/navit/data/poi_geodownload/libmdb/backend.c
diff --git a/src/data/poi_geodownload/libmdb/catalog.c b/navit/data/poi_geodownload/libmdb/catalog.c
index dc08abdd2..dc08abdd2 100644
--- a/src/data/poi_geodownload/libmdb/catalog.c
+++ b/navit/data/poi_geodownload/libmdb/catalog.c
diff --git a/src/data/poi_geodownload/libmdb/data.c b/navit/data/poi_geodownload/libmdb/data.c
index e50e57dbc..e50e57dbc 100644
--- a/src/data/poi_geodownload/libmdb/data.c
+++ b/navit/data/poi_geodownload/libmdb/data.c
diff --git a/src/data/poi_geodownload/libmdb/dump.c b/navit/data/poi_geodownload/libmdb/dump.c
index 7ee17f9a6..7ee17f9a6 100644
--- a/src/data/poi_geodownload/libmdb/dump.c
+++ b/navit/data/poi_geodownload/libmdb/dump.c
diff --git a/src/data/poi_geodownload/libmdb/file.c b/navit/data/poi_geodownload/libmdb/file.c
index 941830c54..941830c54 100644
--- a/src/data/poi_geodownload/libmdb/file.c
+++ b/navit/data/poi_geodownload/libmdb/file.c
diff --git a/src/data/poi_geodownload/libmdb/iconv.c b/navit/data/poi_geodownload/libmdb/iconv.c
index 9f41afe3c..9f41afe3c 100644
--- a/src/data/poi_geodownload/libmdb/iconv.c
+++ b/navit/data/poi_geodownload/libmdb/iconv.c
diff --git a/src/data/poi_geodownload/libmdb/include/Makefile.am b/navit/data/poi_geodownload/libmdb/include/Makefile.am
index 084a7542f..084a7542f 100644
--- a/src/data/poi_geodownload/libmdb/include/Makefile.am
+++ b/navit/data/poi_geodownload/libmdb/include/Makefile.am
diff --git a/src/data/poi_geodownload/libmdb/include/mdbtools.h b/navit/data/poi_geodownload/libmdb/include/mdbtools.h
index b17df280f..b17df280f 100644
--- a/src/data/poi_geodownload/libmdb/include/mdbtools.h
+++ b/navit/data/poi_geodownload/libmdb/include/mdbtools.h
diff --git a/src/data/poi_geodownload/libmdb/index.c b/navit/data/poi_geodownload/libmdb/index.c
index e840536eb..e840536eb 100644
--- a/src/data/poi_geodownload/libmdb/index.c
+++ b/navit/data/poi_geodownload/libmdb/index.c
diff --git a/src/data/poi_geodownload/libmdb/kkd.c b/navit/data/poi_geodownload/libmdb/kkd.c
index ea72887c4..ea72887c4 100644
--- a/src/data/poi_geodownload/libmdb/kkd.c
+++ b/navit/data/poi_geodownload/libmdb/kkd.c
diff --git a/src/data/poi_geodownload/libmdb/like.c b/navit/data/poi_geodownload/libmdb/like.c
index 0a23d45cd..0a23d45cd 100644
--- a/src/data/poi_geodownload/libmdb/like.c
+++ b/navit/data/poi_geodownload/libmdb/like.c
diff --git a/src/data/poi_geodownload/libmdb/map.c b/navit/data/poi_geodownload/libmdb/map.c
index 1164b7bed..1164b7bed 100644
--- a/src/data/poi_geodownload/libmdb/map.c
+++ b/navit/data/poi_geodownload/libmdb/map.c
diff --git a/src/data/poi_geodownload/libmdb/mem.c b/navit/data/poi_geodownload/libmdb/mem.c
index 208757e72..208757e72 100644
--- a/src/data/poi_geodownload/libmdb/mem.c
+++ b/navit/data/poi_geodownload/libmdb/mem.c
diff --git a/src/data/poi_geodownload/libmdb/money.c b/navit/data/poi_geodownload/libmdb/money.c
index 7f2cf6577..7f2cf6577 100644
--- a/src/data/poi_geodownload/libmdb/money.c
+++ b/navit/data/poi_geodownload/libmdb/money.c
diff --git a/src/data/poi_geodownload/libmdb/options.c b/navit/data/poi_geodownload/libmdb/options.c
index cdbbc6627..cdbbc6627 100644
--- a/src/data/poi_geodownload/libmdb/options.c
+++ b/navit/data/poi_geodownload/libmdb/options.c
diff --git a/src/data/poi_geodownload/libmdb/props.c b/navit/data/poi_geodownload/libmdb/props.c
index 61db9f543..61db9f543 100644
--- a/src/data/poi_geodownload/libmdb/props.c
+++ b/navit/data/poi_geodownload/libmdb/props.c
diff --git a/src/data/poi_geodownload/libmdb/sargs.c b/navit/data/poi_geodownload/libmdb/sargs.c
index b14aaa946..b14aaa946 100644
--- a/src/data/poi_geodownload/libmdb/sargs.c
+++ b/navit/data/poi_geodownload/libmdb/sargs.c
diff --git a/src/data/poi_geodownload/libmdb/stats.c b/navit/data/poi_geodownload/libmdb/stats.c
index 1abf2857a..1abf2857a 100644
--- a/src/data/poi_geodownload/libmdb/stats.c
+++ b/navit/data/poi_geodownload/libmdb/stats.c
diff --git a/src/data/poi_geodownload/libmdb/table.c b/navit/data/poi_geodownload/libmdb/table.c
index 52238ecd9..52238ecd9 100644
--- a/src/data/poi_geodownload/libmdb/table.c
+++ b/navit/data/poi_geodownload/libmdb/table.c
diff --git a/src/data/poi_geodownload/libmdb/worktable.c b/navit/data/poi_geodownload/libmdb/worktable.c
index 6f893dcfd..6f893dcfd 100644
--- a/src/data/poi_geodownload/libmdb/worktable.c
+++ b/navit/data/poi_geodownload/libmdb/worktable.c
diff --git a/src/data/poi_geodownload/libmdb/write.c b/navit/data/poi_geodownload/libmdb/write.c
index 1cff96a4b..1cff96a4b 100644
--- a/src/data/poi_geodownload/libmdb/write.c
+++ b/navit/data/poi_geodownload/libmdb/write.c
diff --git a/src/data/poi_geodownload/poi_geodownload.c b/navit/data/poi_geodownload/poi_geodownload.c
index 229457b68..229457b68 100644
--- a/src/data/poi_geodownload/poi_geodownload.c
+++ b/navit/data/poi_geodownload/poi_geodownload.c
diff --git a/src/data/textfile/Makefile.am b/navit/data/textfile/Makefile.am
index afbc47d29..afbc47d29 100644
--- a/src/data/textfile/Makefile.am
+++ b/navit/data/textfile/Makefile.am
diff --git a/src/data/textfile/textfile.c b/navit/data/textfile/textfile.c
index da0ead4ad..da0ead4ad 100644
--- a/src/data/textfile/textfile.c
+++ b/navit/data/textfile/textfile.c
diff --git a/src/data/textfile/textfile.h b/navit/data/textfile/textfile.h
index 3167e8bf3..3167e8bf3 100644
--- a/src/data/textfile/textfile.h
+++ b/navit/data/textfile/textfile.h
diff --git a/src/data_window.c b/navit/data_window.c
index fa67710f1..fa67710f1 100644
--- a/src/data_window.c
+++ b/navit/data_window.c
diff --git a/src/data_window.h b/navit/data_window.h
index 103697dbe..103697dbe 100644
--- a/src/data_window.h
+++ b/navit/data_window.h
diff --git a/src/data_window_int.h b/navit/data_window_int.h
index f455a3a35..f455a3a35 100644
--- a/src/data_window_int.h
+++ b/navit/data_window_int.h
diff --git a/src/debug.c b/navit/debug.c
index 401c4a516..401c4a516 100644
--- a/src/debug.c
+++ b/navit/debug.c
diff --git a/src/debug.h b/navit/debug.h
index 7e8971291..7e8971291 100644
--- a/src/debug.h
+++ b/navit/debug.h
diff --git a/src/destination.h b/navit/destination.h
index b019fc066..b019fc066 100644
--- a/src/destination.h
+++ b/navit/destination.h
diff --git a/src/draw_info.h b/navit/draw_info.h
index 863b00175..863b00175 100644
--- a/src/draw_info.h
+++ b/navit/draw_info.h
diff --git a/src/endianess.h b/navit/endianess.h
index 5cd58b8d1..5cd58b8d1 100644
--- a/src/endianess.h
+++ b/navit/endianess.h
diff --git a/src/event.c b/navit/event.c
index 8fe594905..8fe594905 100644
--- a/src/event.c
+++ b/navit/event.c
diff --git a/src/event.h b/navit/event.h
index 23c07ebff..23c07ebff 100644
--- a/src/event.h
+++ b/navit/event.h
diff --git a/src/fib-1.1/Makefile.am b/navit/fib-1.1/Makefile.am
index 7c7b2a130..7c7b2a130 100644
--- a/src/fib-1.1/Makefile.am
+++ b/navit/fib-1.1/Makefile.am
diff --git a/src/fib-1.1/README b/navit/fib-1.1/README
index eabcd5f86..eabcd5f86 100644
--- a/src/fib-1.1/README
+++ b/navit/fib-1.1/README
diff --git a/src/fib-1.1/configure b/navit/fib-1.1/configure
index 62eaa3d01..62eaa3d01 100755
--- a/src/fib-1.1/configure
+++ b/navit/fib-1.1/configure
diff --git a/src/fib-1.1/configure.in b/navit/fib-1.1/configure.in
index 827015270..827015270 100644
--- a/src/fib-1.1/configure.in
+++ b/navit/fib-1.1/configure.in
diff --git a/src/fib-1.1/fh_extractmin.3 b/navit/fib-1.1/fh_extractmin.3
index e1492b400..e1492b400 100644
--- a/src/fib-1.1/fh_extractmin.3
+++ b/navit/fib-1.1/fh_extractmin.3
diff --git a/src/fib-1.1/fh_makeheap.3 b/navit/fib-1.1/fh_makeheap.3
index bd867cd09..bd867cd09 100644
--- a/src/fib-1.1/fh_makeheap.3
+++ b/navit/fib-1.1/fh_makeheap.3
diff --git a/src/fib-1.1/fh_makekeyheap.3 b/navit/fib-1.1/fh_makekeyheap.3
index f55d43072..f55d43072 100644
--- a/src/fib-1.1/fh_makekeyheap.3
+++ b/navit/fib-1.1/fh_makekeyheap.3
diff --git a/src/fib-1.1/fib.c b/navit/fib-1.1/fib.c
index 276b6bd37..276b6bd37 100644
--- a/src/fib-1.1/fib.c
+++ b/navit/fib-1.1/fib.c
diff --git a/src/fib-1.1/fib.h b/navit/fib-1.1/fib.h
index d8564d3c7..d8564d3c7 100644
--- a/src/fib-1.1/fib.h
+++ b/navit/fib-1.1/fib.h
diff --git a/src/fib-1.1/fibpriv.h b/navit/fib-1.1/fibpriv.h
index 3984b261e..3984b261e 100644
--- a/src/fib-1.1/fibpriv.h
+++ b/navit/fib-1.1/fibpriv.h
diff --git a/src/fib-1.1/fibtest.c b/navit/fib-1.1/fibtest.c
index c7be1e9c0..c7be1e9c0 100644
--- a/src/fib-1.1/fibtest.c
+++ b/navit/fib-1.1/fibtest.c
diff --git a/src/fib-1.1/fibtest.out b/navit/fib-1.1/fibtest.out
index 285bd26bb..285bd26bb 100644
--- a/src/fib-1.1/fibtest.out
+++ b/navit/fib-1.1/fibtest.out
diff --git a/src/fib-1.1/fibtest2.c b/navit/fib-1.1/fibtest2.c
index 8a623b634..8a623b634 100644
--- a/src/fib-1.1/fibtest2.c
+++ b/navit/fib-1.1/fibtest2.c
diff --git a/src/fib-1.1/fibtest2.out b/navit/fib-1.1/fibtest2.out
index e9d1704f8..e9d1704f8 100644
--- a/src/fib-1.1/fibtest2.out
+++ b/navit/fib-1.1/fibtest2.out
diff --git a/src/fib-1.1/tt.c b/navit/fib-1.1/tt.c
index 26db1d2c3..26db1d2c3 100644
--- a/src/fib-1.1/tt.c
+++ b/navit/fib-1.1/tt.c
diff --git a/src/fib-1.1/tt.out b/navit/fib-1.1/tt.out
index 37a8a47c1..37a8a47c1 100644
--- a/src/fib-1.1/tt.out
+++ b/navit/fib-1.1/tt.out
diff --git a/src/fib-1.1/use.c b/navit/fib-1.1/use.c
index e8db32792..e8db32792 100644
--- a/src/fib-1.1/use.c
+++ b/navit/fib-1.1/use.c
diff --git a/src/file.c b/navit/file.c
index 9fadf4555..9fadf4555 100644
--- a/src/file.c
+++ b/navit/file.c
diff --git a/src/file.h b/navit/file.h
index 475777b08..475777b08 100644
--- a/src/file.h
+++ b/navit/file.h
diff --git a/src/graphics.c b/navit/graphics.c
index 75a1f9465..75a1f9465 100644
--- a/src/graphics.c
+++ b/navit/graphics.c
diff --git a/src/graphics.h b/navit/graphics.h
index 7983c4b87..7983c4b87 100644
--- a/src/graphics.h
+++ b/navit/graphics.h
diff --git a/src/graphics/Makefile.am b/navit/graphics/Makefile.am
index 22bbc6ef2..22bbc6ef2 100644
--- a/src/graphics/Makefile.am
+++ b/navit/graphics/Makefile.am
diff --git a/src/graphics/gtk_drawing_area/Makefile.am b/navit/graphics/gtk_drawing_area/Makefile.am
index bb0ef0972..bb0ef0972 100644
--- a/src/graphics/gtk_drawing_area/Makefile.am
+++ b/navit/graphics/gtk_drawing_area/Makefile.am
diff --git a/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c b/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
index 90d7ddd6c..90d7ddd6c 100644
--- a/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
+++ b/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
diff --git a/src/graphics/gtk_gl_ext/graphics_gtk_gl_ext.c b/navit/graphics/gtk_gl_ext/graphics_gtk_gl_ext.c
index c91e94c63..c91e94c63 100644
--- a/src/graphics/gtk_gl_ext/graphics_gtk_gl_ext.c
+++ b/navit/graphics/gtk_gl_ext/graphics_gtk_gl_ext.c
diff --git a/src/graphics/null/Makefile.am b/navit/graphics/null/Makefile.am
index c1e93de0a..c1e93de0a 100644
--- a/src/graphics/null/Makefile.am
+++ b/navit/graphics/null/Makefile.am
diff --git a/src/graphics/null/graphics_null.c b/navit/graphics/null/graphics_null.c
index 8b87e22c3..8b87e22c3 100644
--- a/src/graphics/null/graphics_null.c
+++ b/navit/graphics/null/graphics_null.c
diff --git a/src/graphics/opengl/Makefile.am b/navit/graphics/opengl/Makefile.am
index a44535703..a44535703 100644
--- a/src/graphics/opengl/Makefile.am
+++ b/navit/graphics/opengl/Makefile.am
diff --git a/src/graphics/opengl/graphics_opengl.c b/navit/graphics/opengl/graphics_opengl.c
index fce72f491..fce72f491 100644
--- a/src/graphics/opengl/graphics_opengl.c
+++ b/navit/graphics/opengl/graphics_opengl.c
diff --git a/src/graphics/qt_qpainter/Makefile.am b/navit/graphics/qt_qpainter/Makefile.am
index 228236d58..228236d58 100644
--- a/src/graphics/qt_qpainter/Makefile.am
+++ b/navit/graphics/qt_qpainter/Makefile.am
diff --git a/src/graphics/qt_qpainter/graphics_qt_qpainter.cpp b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
index c0f59bc23..c0f59bc23 100644
--- a/src/graphics/qt_qpainter/graphics_qt_qpainter.cpp
+++ b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
diff --git a/src/gtkext.h b/navit/gtkext.h
index 572057bab..572057bab 100644
--- a/src/gtkext.h
+++ b/navit/gtkext.h
diff --git a/src/gui.c b/navit/gui.c
index cc854e2bd..cc854e2bd 100644
--- a/src/gui.c
+++ b/navit/gui.c
diff --git a/src/gui.h b/navit/gui.h
index 9f170f760..9f170f760 100644
--- a/src/gui.h
+++ b/navit/gui.h
diff --git a/src/gui/Makefile.am b/navit/gui/Makefile.am
index 1f368df61..1f368df61 100644
--- a/src/gui/Makefile.am
+++ b/navit/gui/Makefile.am
diff --git a/src/gui/gtk/Makefile.am b/navit/gui/gtk/Makefile.am
index 128a3fb79..128a3fb79 100644
--- a/src/gui/gtk/Makefile.am
+++ b/navit/gui/gtk/Makefile.am
diff --git a/src/gui/gtk/datawindow.c b/navit/gui/gtk/datawindow.c
index d9452ac48..d9452ac48 100644
--- a/src/gui/gtk/datawindow.c
+++ b/navit/gui/gtk/datawindow.c
diff --git a/src/gui/gtk/destination.c b/navit/gui/gtk/destination.c
index 05f178e8f..05f178e8f 100644
--- a/src/gui/gtk/destination.c
+++ b/navit/gui/gtk/destination.c
diff --git a/src/gui/gtk/gui_gtk.h b/navit/gui/gtk/gui_gtk.h
index ddf8e7f2e..ddf8e7f2e 100644
--- a/src/gui/gtk/gui_gtk.h
+++ b/navit/gui/gtk/gui_gtk.h
diff --git a/src/gui/gtk/gui_gtk_action.c b/navit/gui/gtk/gui_gtk_action.c
index 3feb08cae..3feb08cae 100644
--- a/src/gui/gtk/gui_gtk_action.c
+++ b/navit/gui/gtk/gui_gtk_action.c
diff --git a/src/gui/gtk/gui_gtk_statusbar.c b/navit/gui/gtk/gui_gtk_statusbar.c
index f029e0848..f029e0848 100644
--- a/src/gui/gtk/gui_gtk_statusbar.c
+++ b/navit/gui/gtk/gui_gtk_statusbar.c
diff --git a/src/gui/gtk/gui_gtk_window.c b/navit/gui/gtk/gui_gtk_window.c
index 2cda180f5..2cda180f5 100644
--- a/src/gui/gtk/gui_gtk_window.c
+++ b/navit/gui/gtk/gui_gtk_window.c
diff --git a/src/gui/internal/Makefile.am b/navit/gui/internal/Makefile.am
index 3108056d3..3108056d3 100644
--- a/src/gui/internal/Makefile.am
+++ b/navit/gui/internal/Makefile.am
diff --git a/src/gui/internal/gui_internal.c b/navit/gui/internal/gui_internal.c
index c08a5ebd0..c08a5ebd0 100644
--- a/src/gui/internal/gui_internal.c
+++ b/navit/gui/internal/gui_internal.c
diff --git a/src/gui/sdl/Makefile.am b/navit/gui/sdl/Makefile.am
index 795e35ef3..795e35ef3 100644
--- a/src/gui/sdl/Makefile.am
+++ b/navit/gui/sdl/Makefile.am
diff --git a/src/gui/sdl/cegui_keyboard.cpp b/navit/gui/sdl/cegui_keyboard.cpp
index 3bf0888fd..3bf0888fd 100644
--- a/src/gui/sdl/cegui_keyboard.cpp
+++ b/navit/gui/sdl/cegui_keyboard.cpp
diff --git a/src/gui/sdl/cegui_keyboard.h b/navit/gui/sdl/cegui_keyboard.h
index bb329499c..bb329499c 100644
--- a/src/gui/sdl/cegui_keyboard.h
+++ b/navit/gui/sdl/cegui_keyboard.h
diff --git a/src/gui/sdl/datafiles/Makefile.am b/navit/gui/sdl/datafiles/Makefile.am
index 0a1e19bfd..0a1e19bfd 100644
--- a/src/gui/sdl/datafiles/Makefile.am
+++ b/navit/gui/sdl/datafiles/Makefile.am
diff --git a/src/gui/sdl/datafiles/fonts/DejaVuSans-10.font b/navit/gui/sdl/datafiles/fonts/DejaVuSans-10.font
index 25e51b2cf..25e51b2cf 100755
--- a/src/gui/sdl/datafiles/fonts/DejaVuSans-10.font
+++ b/navit/gui/sdl/datafiles/fonts/DejaVuSans-10.font
diff --git a/src/gui/sdl/datafiles/fonts/DejaVuSans-12.font b/navit/gui/sdl/datafiles/fonts/DejaVuSans-12.font
index 56f65a24e..56f65a24e 100755
--- a/src/gui/sdl/datafiles/fonts/DejaVuSans-12.font
+++ b/navit/gui/sdl/datafiles/fonts/DejaVuSans-12.font
diff --git a/src/gui/sdl/datafiles/fonts/DejaVuSans-14.font b/navit/gui/sdl/datafiles/fonts/DejaVuSans-14.font
index ddddd46db..ddddd46db 100755
--- a/src/gui/sdl/datafiles/fonts/DejaVuSans-14.font
+++ b/navit/gui/sdl/datafiles/fonts/DejaVuSans-14.font
diff --git a/src/gui/sdl/datafiles/fonts/DejaVuSans.ttf b/navit/gui/sdl/datafiles/fonts/DejaVuSans.ttf
index 7e96e8ec9..7e96e8ec9 100755
--- a/src/gui/sdl/datafiles/fonts/DejaVuSans.ttf
+++ b/navit/gui/sdl/datafiles/fonts/DejaVuSans.ttf
diff --git a/src/gui/sdl/datafiles/fonts/Font.xsd b/navit/gui/sdl/datafiles/fonts/Font.xsd
index 5ab529cd7..5ab529cd7 100644
--- a/src/gui/sdl/datafiles/fonts/Font.xsd
+++ b/navit/gui/sdl/datafiles/fonts/Font.xsd
diff --git a/src/gui/sdl/datafiles/imagesets/Imageset.xsd b/navit/gui/sdl/datafiles/imagesets/Imageset.xsd
index 49ced132a..49ced132a 100644
--- a/src/gui/sdl/datafiles/imagesets/Imageset.xsd
+++ b/navit/gui/sdl/datafiles/imagesets/Imageset.xsd
diff --git a/src/gui/sdl/datafiles/imagesets/Mineque-Black.imageset b/navit/gui/sdl/datafiles/imagesets/Mineque-Black.imageset
index ef19947e1..ef19947e1 100644
--- a/src/gui/sdl/datafiles/imagesets/Mineque-Black.imageset
+++ b/navit/gui/sdl/datafiles/imagesets/Mineque-Black.imageset
diff --git a/src/gui/sdl/datafiles/imagesets/TaharezLook.imageset b/navit/gui/sdl/datafiles/imagesets/TaharezLook.imageset
index e5aef9813..e5aef9813 100755
--- a/src/gui/sdl/datafiles/imagesets/TaharezLook.imageset
+++ b/navit/gui/sdl/datafiles/imagesets/TaharezLook.imageset
diff --git a/src/gui/sdl/datafiles/imagesets/TaharezLook.tga b/navit/gui/sdl/datafiles/imagesets/TaharezLook.tga
index 9659b7fba..9659b7fba 100755
--- a/src/gui/sdl/datafiles/imagesets/TaharezLook.tga
+++ b/navit/gui/sdl/datafiles/imagesets/TaharezLook.tga
diff --git a/src/gui/sdl/datafiles/imagesets/navit-skin-black-imageset.tga b/navit/gui/sdl/datafiles/imagesets/navit-skin-black-imageset.tga
index f617b78d9..f617b78d9 100644
--- a/src/gui/sdl/datafiles/imagesets/navit-skin-black-imageset.tga
+++ b/navit/gui/sdl/datafiles/imagesets/navit-skin-black-imageset.tga
diff --git a/src/gui/sdl/datafiles/layouts/GUILayout.xsd b/navit/gui/sdl/datafiles/layouts/GUILayout.xsd
index 0a3a5b9cf..0a3a5b9cf 100644
--- a/src/gui/sdl/datafiles/layouts/GUILayout.xsd
+++ b/navit/gui/sdl/datafiles/layouts/GUILayout.xsd
diff --git a/src/gui/sdl/datafiles/layouts/Mineque.layout b/navit/gui/sdl/datafiles/layouts/Mineque.layout
index 58f6e0739..58f6e0739 100644
--- a/src/gui/sdl/datafiles/layouts/Mineque.layout
+++ b/navit/gui/sdl/datafiles/layouts/Mineque.layout
diff --git a/src/gui/sdl/datafiles/layouts/TaharezLook.layout b/navit/gui/sdl/datafiles/layouts/TaharezLook.layout
index 351dfbed0..351dfbed0 100755
--- a/src/gui/sdl/datafiles/layouts/TaharezLook.layout
+++ b/navit/gui/sdl/datafiles/layouts/TaharezLook.layout
diff --git a/src/gui/sdl/datafiles/looknfeel/Falagard.xsd b/navit/gui/sdl/datafiles/looknfeel/Falagard.xsd
index 590de6bc9..590de6bc9 100644
--- a/src/gui/sdl/datafiles/looknfeel/Falagard.xsd
+++ b/navit/gui/sdl/datafiles/looknfeel/Falagard.xsd
diff --git a/src/gui/sdl/datafiles/looknfeel/Mineque.looknfeel b/navit/gui/sdl/datafiles/looknfeel/Mineque.looknfeel
index dc649600d..dc649600d 100755
--- a/src/gui/sdl/datafiles/looknfeel/Mineque.looknfeel
+++ b/navit/gui/sdl/datafiles/looknfeel/Mineque.looknfeel
diff --git a/src/gui/sdl/datafiles/looknfeel/TaharezLook.looknfeel b/navit/gui/sdl/datafiles/looknfeel/TaharezLook.looknfeel
index 795aed437..795aed437 100755
--- a/src/gui/sdl/datafiles/looknfeel/TaharezLook.looknfeel
+++ b/navit/gui/sdl/datafiles/looknfeel/TaharezLook.looknfeel
diff --git a/src/gui/sdl/datafiles/schemes/GUIScheme.xsd b/navit/gui/sdl/datafiles/schemes/GUIScheme.xsd
index 24dba2073..24dba2073 100644
--- a/src/gui/sdl/datafiles/schemes/GUIScheme.xsd
+++ b/navit/gui/sdl/datafiles/schemes/GUIScheme.xsd
diff --git a/src/gui/sdl/datafiles/schemes/Mineque.scheme b/navit/gui/sdl/datafiles/schemes/Mineque.scheme
index 34101892b..34101892b 100755
--- a/src/gui/sdl/datafiles/schemes/Mineque.scheme
+++ b/navit/gui/sdl/datafiles/schemes/Mineque.scheme
diff --git a/src/gui/sdl/datafiles/schemes/TaharezLook.scheme b/navit/gui/sdl/datafiles/schemes/TaharezLook.scheme
index e48ad4cc5..e48ad4cc5 100755
--- a/src/gui/sdl/datafiles/schemes/TaharezLook.scheme
+++ b/navit/gui/sdl/datafiles/schemes/TaharezLook.scheme
diff --git a/src/gui/sdl/gui_sdl.h b/navit/gui/sdl/gui_sdl.h
index 877d69e1b..877d69e1b 100644
--- a/src/gui/sdl/gui_sdl.h
+++ b/navit/gui/sdl/gui_sdl.h
diff --git a/src/gui/sdl/gui_sdl_window.cpp b/navit/gui/sdl/gui_sdl_window.cpp
index 4afac7a3d..4afac7a3d 100644
--- a/src/gui/sdl/gui_sdl_window.cpp
+++ b/navit/gui/sdl/gui_sdl_window.cpp
diff --git a/src/gui/sdl/sdl_events.cpp b/navit/gui/sdl/sdl_events.cpp
index 7a121753f..7a121753f 100644
--- a/src/gui/sdl/sdl_events.cpp
+++ b/navit/gui/sdl/sdl_events.cpp
diff --git a/src/gui/sdl/sdl_events.h b/navit/gui/sdl/sdl_events.h
index b4d6e60ae..b4d6e60ae 100644
--- a/src/gui/sdl/sdl_events.h
+++ b/navit/gui/sdl/sdl_events.h
diff --git a/src/gui/sdl/wmcontrol.c b/navit/gui/sdl/wmcontrol.c
index 0337ce2dc..0337ce2dc 100644
--- a/src/gui/sdl/wmcontrol.c
+++ b/navit/gui/sdl/wmcontrol.c
diff --git a/src/gui/sdl/wmcontrol.h b/navit/gui/sdl/wmcontrol.h
index 224dae56e..224dae56e 100644
--- a/src/gui/sdl/wmcontrol.h
+++ b/navit/gui/sdl/wmcontrol.h
diff --git a/src/item.c b/navit/item.c
index 52b6a2389..52b6a2389 100644
--- a/src/item.c
+++ b/navit/item.c
diff --git a/src/item.h b/navit/item.h
index 448df2ecf..448df2ecf 100644
--- a/src/item.h
+++ b/navit/item.h
diff --git a/src/item_def.h b/navit/item_def.h
index add503407..add503407 100644
--- a/src/item_def.h
+++ b/navit/item_def.h
diff --git a/src/layer.h b/navit/layer.h
index 4d602126f..4d602126f 100644
--- a/src/layer.h
+++ b/navit/layer.h
diff --git a/src/layout.c b/navit/layout.c
index 4b3d85cd8..4b3d85cd8 100644
--- a/src/layout.c
+++ b/navit/layout.c
diff --git a/src/layout.h b/navit/layout.h
index 87831004c..87831004c 100644
--- a/src/layout.h
+++ b/navit/layout.h
diff --git a/src/locations.txt b/navit/locations.txt
index 739f93b26..739f93b26 100644
--- a/src/locations.txt
+++ b/navit/locations.txt
diff --git a/src/log.c b/navit/log.c
index 03d7f5981..03d7f5981 100644
--- a/src/log.c
+++ b/navit/log.c
diff --git a/src/log.h b/navit/log.h
index e9dabf300..e9dabf300 100644
--- a/src/log.h
+++ b/navit/log.h
diff --git a/src/main.c b/navit/main.c
index f320ae67e..f320ae67e 100644
--- a/src/main.c
+++ b/navit/main.c
diff --git a/src/main.h b/navit/main.h
index 4629888d3..4629888d3 100644
--- a/src/main.h
+++ b/navit/main.h
diff --git a/src/map-share.h b/navit/map-share.h
index 2b534a633..2b534a633 100644
--- a/src/map-share.h
+++ b/navit/map-share.h
diff --git a/src/map.c b/navit/map.c
index a5198df3a..a5198df3a 100644
--- a/src/map.c
+++ b/navit/map.c
diff --git a/src/map.h b/navit/map.h
index 1dcc28b17..1dcc28b17 100644
--- a/src/map.h
+++ b/navit/map.h
diff --git a/src/map_data.h b/navit/map_data.h
index bb2aab9cd..bb2aab9cd 100644
--- a/src/map_data.h
+++ b/navit/map_data.h
diff --git a/src/maps/Makefile.am b/navit/maps/Makefile.am
index 06b3d4171..6480eddf4 100644
--- a/src/maps/Makefile.am
+++ b/navit/maps/Makefile.am
@@ -11,9 +11,9 @@ $(SAMPLE_MAP).osm.bz2:
 	wget -O $(SAMPLE_MAP).osm.bz2.tmp http://navit.sourceforge.net/maps/$(SAMPLE_MAP).osm.bz2
 	mv $(SAMPLE_MAP).osm.bz2.tmp $(SAMPLE_MAP).osm.bz2
 
-$(SAMPLE_MAP).bin $(SAMPLE_MAP).xml: $(SAMPLE_MAP).osm.bz2 $(top_builddir)/src/osm2navit
+$(SAMPLE_MAP).bin $(SAMPLE_MAP).xml: $(SAMPLE_MAP).osm.bz2 $(top_builddir)/navit/osm2navit
 	echo "Converting osm sample map"
-	bzcat $(SAMPLE_MAP).osm.bz2 | $(top_builddir)/src/osm2navit --attr-debug-level=5 $(SAMPLE_MAP).bin.tmp
+	bzcat $(SAMPLE_MAP).osm.bz2 | $(top_builddir)/navit/osm2navit --attr-debug-level=5 $(SAMPLE_MAP).bin.tmp
 	mv $(SAMPLE_MAP).bin.tmp $(SAMPLE_MAP).bin
 	echo '<map type="binfile" enabled="yes" data="$$NAVIT_SHAREDIR/maps/osm_bbox_11.3,47.9,11.7,48.2.bin"/>' >$(SAMPLE_MAP).xml
 
diff --git a/src/mapset.c b/navit/mapset.c
index 5c805cbb4..5c805cbb4 100644
--- a/src/mapset.c
+++ b/navit/mapset.c
diff --git a/src/mapset.h b/navit/mapset.h
index 894dee123..894dee123 100644
--- a/src/mapset.h
+++ b/navit/mapset.h
diff --git a/src/maptype.c b/navit/maptype.c
index 0c0a26bca..0c0a26bca 100644
--- a/src/maptype.c
+++ b/navit/maptype.c
diff --git a/src/maptype.h b/navit/maptype.h
index bfaf4e298..bfaf4e298 100644
--- a/src/maptype.h
+++ b/navit/maptype.h
diff --git a/src/menu.c b/navit/menu.c
index a2f0581fc..a2f0581fc 100644
--- a/src/menu.c
+++ b/navit/menu.c
diff --git a/src/menu.h b/navit/menu.h
index a3841943f..a3841943f 100644
--- a/src/menu.h
+++ b/navit/menu.h
diff --git a/src/navigation.c b/navit/navigation.c
index 8f3b33031..8f3b33031 100644
--- a/src/navigation.c
+++ b/navit/navigation.c
diff --git a/src/navigation.h b/navit/navigation.h
index fb873ebf3..fb873ebf3 100644
--- a/src/navigation.h
+++ b/navit/navigation.h
diff --git a/src/navit.c b/navit/navit.c
index f3efa04d9..f3efa04d9 100644
--- a/src/navit.c
+++ b/navit/navit.c
diff --git a/src/navit.dtd b/navit/navit.dtd
index 3102dcf5f..3102dcf5f 100644
--- a/src/navit.dtd
+++ b/navit/navit.dtd
diff --git a/src/navit.h b/navit/navit.h
index ec76eeee4..ec76eeee4 100644
--- a/src/navit.h
+++ b/navit/navit.h
diff --git a/src/navit.xml b/navit/navit.xml
index dddcfd2ad..dddcfd2ad 100644
--- a/src/navit.xml
+++ b/navit/navit.xml
diff --git a/src/osd.c b/navit/osd.c
index d078ff273..d078ff273 100644
--- a/src/osd.c
+++ b/navit/osd.c
diff --git a/src/osd.h b/navit/osd.h
index 9a50e99b6..9a50e99b6 100644
--- a/src/osd.h
+++ b/navit/osd.h
diff --git a/src/osd/Makefile.am b/navit/osd/Makefile.am
index eabd69101..eabd69101 100644
--- a/src/osd/Makefile.am
+++ b/navit/osd/Makefile.am
diff --git a/src/osd/core/Makefile.am b/navit/osd/core/Makefile.am
index cacb41747..cacb41747 100644
--- a/src/osd/core/Makefile.am
+++ b/navit/osd/core/Makefile.am
diff --git a/src/osd/core/osd_core.c b/navit/osd/core/osd_core.c
index 588bedaec..588bedaec 100644
--- a/src/osd/core/osd_core.c
+++ b/navit/osd/core/osd_core.c
diff --git a/src/osm2navit.c b/navit/osm2navit.c
index ace673556..ace673556 100644
--- a/src/osm2navit.c
+++ b/navit/osm2navit.c
diff --git a/src/param.c b/navit/param.c
index 94157a587..94157a587 100644
--- a/src/param.c
+++ b/navit/param.c
diff --git a/src/param.h b/navit/param.h
index e450cc725..e450cc725 100644
--- a/src/param.h
+++ b/navit/param.h
diff --git a/src/phrase.c b/navit/phrase.c
index dcdbad2e4..dcdbad2e4 100644
--- a/src/phrase.c
+++ b/navit/phrase.c
diff --git a/src/phrase.h b/navit/phrase.h
index 5fd1af261..5fd1af261 100644
--- a/src/phrase.h
+++ b/navit/phrase.h
diff --git a/src/plugin.c b/navit/plugin.c
index 7f5230164..7f5230164 100644
--- a/src/plugin.c
+++ b/navit/plugin.c
diff --git a/src/plugin.h b/navit/plugin.h
index bdd0e5d4f..bdd0e5d4f 100644
--- a/src/plugin.h
+++ b/navit/plugin.h
diff --git a/src/plugin_def.h b/navit/plugin_def.h
index 3d82b5b25..3d82b5b25 100644
--- a/src/plugin_def.h
+++ b/navit/plugin_def.h
diff --git a/src/point.h b/navit/point.h
index 7f75dd134..7f75dd134 100644
--- a/src/point.h
+++ b/navit/point.h
diff --git a/src/popup.c b/navit/popup.c
index a9fe71294..a9fe71294 100644
--- a/src/popup.c
+++ b/navit/popup.c
diff --git a/src/popup.h b/navit/popup.h
index 3738c35db..3738c35db 100644
--- a/src/popup.h
+++ b/navit/popup.h
diff --git a/src/profile.c b/navit/profile.c
index 677af4bab..677af4bab 100644
--- a/src/profile.c
+++ b/navit/profile.c
diff --git a/src/profile.h b/navit/profile.h
index 4afa16aee..4afa16aee 100644
--- a/src/profile.h
+++ b/navit/profile.h
diff --git a/src/projection.c b/navit/projection.c
index 614a9c0f3..614a9c0f3 100644
--- a/src/projection.c
+++ b/navit/projection.c
diff --git a/src/projection.h b/navit/projection.h
index bad3a4837..bad3a4837 100644
--- a/src/projection.h
+++ b/navit/projection.h
diff --git a/src/route.c b/navit/route.c
index f8082b98d..f8082b98d 100644
--- a/src/route.c
+++ b/navit/route.c
diff --git a/src/route.h b/navit/route.h
index 9fb4268e2..9fb4268e2 100644
--- a/src/route.h
+++ b/navit/route.h
diff --git a/src/script/check_itemdef b/navit/script/check_itemdef
index 361f87be3..361f87be3 100755
--- a/src/script/check_itemdef
+++ b/navit/script/check_itemdef
diff --git a/src/script/download_index.html b/navit/script/download_index.html
index 51ca2cf66..51ca2cf66 100644
--- a/src/script/download_index.html
+++ b/navit/script/download_index.html
diff --git a/src/script/geotag b/navit/script/geotag
index e025cbc61..e025cbc61 100755
--- a/src/script/geotag
+++ b/navit/script/geotag
diff --git a/src/script/get_map b/navit/script/get_map
index 7c8ef970f..7c8ef970f 100755
--- a/src/script/get_map
+++ b/navit/script/get_map
diff --git a/src/script/gps_emu b/navit/script/gps_emu
index f2eef3e50..f2eef3e50 100755
--- a/src/script/gps_emu
+++ b/navit/script/gps_emu
diff --git a/src/script/gps_emu2 b/navit/script/gps_emu2
index e9e79b42a..e9e79b42a 100755
--- a/src/script/gps_emu2
+++ b/navit/script/gps_emu2
diff --git a/src/script/gps_emu3 b/navit/script/gps_emu3
index 5c0ecf256..5c0ecf256 100755
--- a/src/script/gps_emu3
+++ b/navit/script/gps_emu3
diff --git a/src/script/mapExtract.class.php b/navit/script/mapExtract.class.php
index f5c4bbbc3..f5c4bbbc3 100644
--- a/src/script/mapExtract.class.php
+++ b/navit/script/mapExtract.class.php
diff --git a/src/script/map_index.php b/navit/script/map_index.php
index b71dbac6a..b71dbac6a 100644
--- a/src/script/map_index.php
+++ b/navit/script/map_index.php
diff --git a/src/script/mapextract.php b/navit/script/mapextract.php
index 004b63caf..004b63caf 100644
--- a/src/script/mapextract.php
+++ b/navit/script/mapextract.php
diff --git a/src/script/wiki2def b/navit/script/wiki2def
index ab8349358..ab8349358 100755
--- a/src/script/wiki2def
+++ b/navit/script/wiki2def
diff --git a/src/search.c b/navit/search.c
index f4db7736b..f4db7736b 100644
--- a/src/search.c
+++ b/navit/search.c
diff --git a/src/search.h b/navit/search.h
index 494e89c73..494e89c73 100644
--- a/src/search.h
+++ b/navit/search.h
diff --git a/src/speech.c b/navit/speech.c
index 0e49cd753..0e49cd753 100644
--- a/src/speech.c
+++ b/navit/speech.c
diff --git a/src/speech.h b/navit/speech.h
index 46f199ef6..46f199ef6 100644
--- a/src/speech.h
+++ b/navit/speech.h
diff --git a/src/speech/Makefile.am b/navit/speech/Makefile.am
index b0ee9f5d0..b0ee9f5d0 100644
--- a/src/speech/Makefile.am
+++ b/navit/speech/Makefile.am
diff --git a/src/speech/cmdline/Makefile.am b/navit/speech/cmdline/Makefile.am
index 592990c28..592990c28 100644
--- a/src/speech/cmdline/Makefile.am
+++ b/navit/speech/cmdline/Makefile.am
diff --git a/src/speech/cmdline/speech_cmdline.c b/navit/speech/cmdline/speech_cmdline.c
index df3b9f127..df3b9f127 100644
--- a/src/speech/cmdline/speech_cmdline.c
+++ b/navit/speech/cmdline/speech_cmdline.c
diff --git a/src/speech/speech_dispatcher/Makefile.am b/navit/speech/speech_dispatcher/Makefile.am
index 3980e90f1..3980e90f1 100644
--- a/src/speech/speech_dispatcher/Makefile.am
+++ b/navit/speech/speech_dispatcher/Makefile.am
diff --git a/src/speech/speech_dispatcher/speech_speech_dispatcher.c b/navit/speech/speech_dispatcher/speech_speech_dispatcher.c
index 87f5032f6..87f5032f6 100644
--- a/src/speech/speech_dispatcher/speech_speech_dispatcher.c
+++ b/navit/speech/speech_dispatcher/speech_speech_dispatcher.c
diff --git a/src/tools/gpx2navit_txt/AUTHORS b/navit/tools/gpx2navit_txt/AUTHORS
index 06a46c26d..06a46c26d 100644
--- a/src/tools/gpx2navit_txt/AUTHORS
+++ b/navit/tools/gpx2navit_txt/AUTHORS
diff --git a/src/tools/gpx2navit_txt/COPYING b/navit/tools/gpx2navit_txt/COPYING
index 514d6c73f..514d6c73f 100644
--- a/src/tools/gpx2navit_txt/COPYING
+++ b/navit/tools/gpx2navit_txt/COPYING
diff --git a/src/tools/gpx2navit_txt/ChangeLog b/navit/tools/gpx2navit_txt/ChangeLog
index 431aa18be..431aa18be 100644
--- a/src/tools/gpx2navit_txt/ChangeLog
+++ b/navit/tools/gpx2navit_txt/ChangeLog
diff --git a/src/tools/gpx2navit_txt/INSTALL b/navit/tools/gpx2navit_txt/INSTALL
index b5dbb9e31..b5dbb9e31 100644
--- a/src/tools/gpx2navit_txt/INSTALL
+++ b/navit/tools/gpx2navit_txt/INSTALL
diff --git a/src/tools/gpx2navit_txt/Makefile.am b/navit/tools/gpx2navit_txt/Makefile.am
index 05f1ce1a0..05f1ce1a0 100644
--- a/src/tools/gpx2navit_txt/Makefile.am
+++ b/navit/tools/gpx2navit_txt/Makefile.am
diff --git a/src/tools/gpx2navit_txt/NEWS b/navit/tools/gpx2navit_txt/NEWS
index 7bd167323..7bd167323 100644
--- a/src/tools/gpx2navit_txt/NEWS
+++ b/navit/tools/gpx2navit_txt/NEWS
diff --git a/src/tools/gpx2navit_txt/README b/navit/tools/gpx2navit_txt/README
index afa985313..afa985313 100644
--- a/src/tools/gpx2navit_txt/README
+++ b/navit/tools/gpx2navit_txt/README
diff --git a/src/tools/gpx2navit_txt/TODO b/navit/tools/gpx2navit_txt/TODO
index de50135f8..de50135f8 100644
--- a/src/tools/gpx2navit_txt/TODO
+++ b/navit/tools/gpx2navit_txt/TODO
diff --git a/src/tools/gpx2navit_txt/config.guess b/navit/tools/gpx2navit_txt/config.guess
index 822947132..822947132 100644
--- a/src/tools/gpx2navit_txt/config.guess
+++ b/navit/tools/gpx2navit_txt/config.guess
diff --git a/src/tools/gpx2navit_txt/config.sub b/navit/tools/gpx2navit_txt/config.sub
index 0f84ac2c5..0f84ac2c5 100644
--- a/src/tools/gpx2navit_txt/config.sub
+++ b/navit/tools/gpx2navit_txt/config.sub
diff --git a/src/tools/gpx2navit_txt/configure.ac b/navit/tools/gpx2navit_txt/configure.ac
index c34753222..c34753222 100644
--- a/src/tools/gpx2navit_txt/configure.ac
+++ b/navit/tools/gpx2navit_txt/configure.ac
diff --git a/src/tools/gpx2navit_txt/depcomp b/navit/tools/gpx2navit_txt/depcomp
index 807b991f4..807b991f4 100755
--- a/src/tools/gpx2navit_txt/depcomp
+++ b/navit/tools/gpx2navit_txt/depcomp
diff --git a/src/tools/gpx2navit_txt/develop/structures.gif b/navit/tools/gpx2navit_txt/develop/structures.gif
index ba0c18aba..ba0c18aba 100644
--- a/src/tools/gpx2navit_txt/develop/structures.gif
+++ b/navit/tools/gpx2navit_txt/develop/structures.gif
diff --git a/src/tools/gpx2navit_txt/install-sh b/navit/tools/gpx2navit_txt/install-sh
index 11870f1b0..11870f1b0 100755
--- a/src/tools/gpx2navit_txt/install-sh
+++ b/navit/tools/gpx2navit_txt/install-sh
diff --git a/src/tools/gpx2navit_txt/man/Makefile.am b/navit/tools/gpx2navit_txt/man/Makefile.am
index 71f0f055d..71f0f055d 100644
--- a/src/tools/gpx2navit_txt/man/Makefile.am
+++ b/navit/tools/gpx2navit_txt/man/Makefile.am
diff --git a/src/tools/gpx2navit_txt/man/gpx2navit_txt.1 b/navit/tools/gpx2navit_txt/man/gpx2navit_txt.1
index 26edd281f..26edd281f 100644
--- a/src/tools/gpx2navit_txt/man/gpx2navit_txt.1
+++ b/navit/tools/gpx2navit_txt/man/gpx2navit_txt.1
diff --git a/src/tools/gpx2navit_txt/missing b/navit/tools/gpx2navit_txt/missing
index 6a37006e8..6a37006e8 100755
--- a/src/tools/gpx2navit_txt/missing
+++ b/navit/tools/gpx2navit_txt/missing
diff --git a/src/tools/gpx2navit_txt/mkinstalldirs b/navit/tools/gpx2navit_txt/mkinstalldirs
index 8ab885ec9..8ab885ec9 100755
--- a/src/tools/gpx2navit_txt/mkinstalldirs
+++ b/navit/tools/gpx2navit_txt/mkinstalldirs
diff --git a/src/tools/gpx2navit_txt/pinatest2.gpx b/navit/tools/gpx2navit_txt/pinatest2.gpx
index 3d99f4064..3d99f4064 100644
--- a/src/tools/gpx2navit_txt/pinatest2.gpx
+++ b/navit/tools/gpx2navit_txt/pinatest2.gpx
diff --git a/src/tools/gpx2navit_txt/src/Makefile.am b/navit/tools/gpx2navit_txt/src/Makefile.am
index 5cce6fa3c..5cce6fa3c 100644
--- a/src/tools/gpx2navit_txt/src/Makefile.am
+++ b/navit/tools/gpx2navit_txt/src/Makefile.am
diff --git a/src/tools/gpx2navit_txt/src/config.h.in b/navit/tools/gpx2navit_txt/src/config.h.in
index 724d6f656..724d6f656 100644
--- a/src/tools/gpx2navit_txt/src/config.h.in
+++ b/navit/tools/gpx2navit_txt/src/config.h.in
diff --git a/src/tools/gpx2navit_txt/src/elementControl.c b/navit/tools/gpx2navit_txt/src/elementControl.c
index 40bbe44c2..40bbe44c2 100644
--- a/src/tools/gpx2navit_txt/src/elementControl.c
+++ b/navit/tools/gpx2navit_txt/src/elementControl.c
diff --git a/src/tools/gpx2navit_txt/src/emess.h b/navit/tools/gpx2navit_txt/src/emess.h
index b35bc2502..b35bc2502 100644
--- a/src/tools/gpx2navit_txt/src/emess.h
+++ b/navit/tools/gpx2navit_txt/src/emess.h
diff --git a/src/tools/gpx2navit_txt/src/errorcode.h b/navit/tools/gpx2navit_txt/src/errorcode.h
index efaf88d89..efaf88d89 100644
--- a/src/tools/gpx2navit_txt/src/errorcode.h
+++ b/navit/tools/gpx2navit_txt/src/errorcode.h
diff --git a/src/tools/gpx2navit_txt/src/geod_for.c b/navit/tools/gpx2navit_txt/src/geod_for.c
index 4466a1d24..4466a1d24 100644
--- a/src/tools/gpx2navit_txt/src/geod_for.c
+++ b/navit/tools/gpx2navit_txt/src/geod_for.c
diff --git a/src/tools/gpx2navit_txt/src/geod_inv.c b/navit/tools/gpx2navit_txt/src/geod_inv.c
index d938da8a3..d938da8a3 100644
--- a/src/tools/gpx2navit_txt/src/geod_inv.c
+++ b/navit/tools/gpx2navit_txt/src/geod_inv.c
diff --git a/src/tools/gpx2navit_txt/src/geod_set.c b/navit/tools/gpx2navit_txt/src/geod_set.c
index 1ba2ef42f..1ba2ef42f 100644
--- a/src/tools/gpx2navit_txt/src/geod_set.c
+++ b/navit/tools/gpx2navit_txt/src/geod_set.c
diff --git a/src/tools/gpx2navit_txt/src/geodesic.h b/navit/tools/gpx2navit_txt/src/geodesic.h
index b9aa853d4..b9aa853d4 100644
--- a/src/tools/gpx2navit_txt/src/geodesic.h
+++ b/navit/tools/gpx2navit_txt/src/geodesic.h
diff --git a/src/tools/gpx2navit_txt/src/gpx2navit_txt.h b/navit/tools/gpx2navit_txt/src/gpx2navit_txt.h
index cd4b5e495..cd4b5e495 100644
--- a/src/tools/gpx2navit_txt/src/gpx2navit_txt.h
+++ b/navit/tools/gpx2navit_txt/src/gpx2navit_txt.h
diff --git a/src/tools/gpx2navit_txt/src/main.c b/navit/tools/gpx2navit_txt/src/main.c
index af8df875c..af8df875c 100644
--- a/src/tools/gpx2navit_txt/src/main.c
+++ b/navit/tools/gpx2navit_txt/src/main.c
diff --git a/src/tools/gpx2navit_txt/src/misc.c b/navit/tools/gpx2navit_txt/src/misc.c
index b5fddd347..b5fddd347 100644
--- a/src/tools/gpx2navit_txt/src/misc.c
+++ b/navit/tools/gpx2navit_txt/src/misc.c
diff --git a/src/tools/gpx2navit_txt/src/parser.c b/navit/tools/gpx2navit_txt/src/parser.c
index 70104dafe..70104dafe 100644
--- a/src/tools/gpx2navit_txt/src/parser.c
+++ b/navit/tools/gpx2navit_txt/src/parser.c
diff --git a/src/tools/gpx2navit_txt/src/setmeta.c b/navit/tools/gpx2navit_txt/src/setmeta.c
index 9d23ffd1c..9d23ffd1c 100644
--- a/src/tools/gpx2navit_txt/src/setmeta.c
+++ b/navit/tools/gpx2navit_txt/src/setmeta.c
diff --git a/src/tools/gpx2navit_txt/src/setpath.c b/navit/tools/gpx2navit_txt/src/setpath.c
index 5402e4ea6..5402e4ea6 100644
--- a/src/tools/gpx2navit_txt/src/setpath.c
+++ b/navit/tools/gpx2navit_txt/src/setpath.c
diff --git a/src/tools/gpx2navit_txt/src/setwpt.c b/navit/tools/gpx2navit_txt/src/setwpt.c
index 9af217f0a..9af217f0a 100644
--- a/src/tools/gpx2navit_txt/src/setwpt.c
+++ b/navit/tools/gpx2navit_txt/src/setwpt.c
diff --git a/src/tools/gpx2navit_txt/src/utils.c b/navit/tools/gpx2navit_txt/src/utils.c
index b9b724791..b9b724791 100644
--- a/src/tools/gpx2navit_txt/src/utils.c
+++ b/navit/tools/gpx2navit_txt/src/utils.c
diff --git a/src/track.c b/navit/track.c
index 3f08b9a08..3f08b9a08 100644
--- a/src/track.c
+++ b/navit/track.c
diff --git a/src/track.h b/navit/track.h
index 69024ef1c..69024ef1c 100644
--- a/src/track.h
+++ b/navit/track.h
diff --git a/src/transform.c b/navit/transform.c
index 0abe6fbd3..0abe6fbd3 100644
--- a/src/transform.c
+++ b/navit/transform.c
diff --git a/src/transform.h b/navit/transform.h
index b47a268c1..b47a268c1 100644
--- a/src/transform.h
+++ b/navit/transform.h
diff --git a/src/types.h b/navit/types.h
index 0fa5b5a92..0fa5b5a92 100644
--- a/src/types.h
+++ b/navit/types.h
diff --git a/src/util.c b/navit/util.c
index 44643d4f2..44643d4f2 100644
--- a/src/util.c
+++ b/navit/util.c
diff --git a/src/util.h b/navit/util.h
index 8e9690a14..8e9690a14 100644
--- a/src/util.h
+++ b/navit/util.h
diff --git a/src/vehicle.c b/navit/vehicle.c
index 5d93142d4..5d93142d4 100644
--- a/src/vehicle.c
+++ b/navit/vehicle.c
diff --git a/src/vehicle.h b/navit/vehicle.h
index 971bd3f20..971bd3f20 100644
--- a/src/vehicle.h
+++ b/navit/vehicle.h
diff --git a/src/vehicle/Makefile.am b/navit/vehicle/Makefile.am
index 8901833f8..8901833f8 100644
--- a/src/vehicle/Makefile.am
+++ b/navit/vehicle/Makefile.am
diff --git a/src/vehicle/demo/Makefile.am b/navit/vehicle/demo/Makefile.am
index 3f2f4f369..3f2f4f369 100644
--- a/src/vehicle/demo/Makefile.am
+++ b/navit/vehicle/demo/Makefile.am
diff --git a/src/vehicle/demo/vehicle_demo.c b/navit/vehicle/demo/vehicle_demo.c
index 46b9c68de..46b9c68de 100644
--- a/src/vehicle/demo/vehicle_demo.c
+++ b/navit/vehicle/demo/vehicle_demo.c
diff --git a/src/vehicle/file/Makefile.am b/navit/vehicle/file/Makefile.am
index f46da8480..f46da8480 100644
--- a/src/vehicle/file/Makefile.am
+++ b/navit/vehicle/file/Makefile.am
diff --git a/src/vehicle/file/vehicle_file.c b/navit/vehicle/file/vehicle_file.c
index 6b20cf6c2..6b20cf6c2 100644
--- a/src/vehicle/file/vehicle_file.c
+++ b/navit/vehicle/file/vehicle_file.c
diff --git a/src/vehicle/gpsd/Makefile.am b/navit/vehicle/gpsd/Makefile.am
index db7a686d9..db7a686d9 100644
--- a/src/vehicle/gpsd/Makefile.am
+++ b/navit/vehicle/gpsd/Makefile.am
diff --git a/src/vehicle/gpsd/vehicle_gpsd.c b/navit/vehicle/gpsd/vehicle_gpsd.c
index ac7f0c0d9..ac7f0c0d9 100644
--- a/src/vehicle/gpsd/vehicle_gpsd.c
+++ b/navit/vehicle/gpsd/vehicle_gpsd.c
diff --git a/src/xmlconfig.c b/navit/xmlconfig.c
index 726b43e07..726b43e07 100644
--- a/src/xmlconfig.c
+++ b/navit/xmlconfig.c
diff --git a/src/xmlconfig.h b/navit/xmlconfig.h
index 2e03aa62e..2e03aa62e 100644
--- a/src/xmlconfig.h
+++ b/navit/xmlconfig.h
diff --git a/src/xpm/Makefile.am b/navit/xpm/Makefile.am
index 82569dd57..82569dd57 100644
--- a/src/xpm/Makefile.am
+++ b/navit/xpm/Makefile.am
diff --git a/src/xpm/airport.xpm b/navit/xpm/airport.xpm
index ea40e00d6..ea40e00d6 100644
--- a/src/xpm/airport.xpm
+++ b/navit/xpm/airport.xpm
diff --git a/src/xpm/attraction.xpm b/navit/xpm/attraction.xpm
index f5771b022..f5771b022 100644
--- a/src/xpm/attraction.xpm
+++ b/navit/xpm/attraction.xpm
diff --git a/src/xpm/bank.xpm b/navit/xpm/bank.xpm
index cb21ffdb0..cb21ffdb0 100644
--- a/src/xpm/bank.xpm
+++ b/navit/xpm/bank.xpm
diff --git a/src/xpm/bar.xpm b/navit/xpm/bar.xpm
index c4da0cc26..c4da0cc26 100644
--- a/src/xpm/bar.xpm
+++ b/navit/xpm/bar.xpm
diff --git a/src/xpm/bus.xpm b/navit/xpm/bus.xpm
index ec7460d41..ec7460d41 100644
--- a/src/xpm/bus.xpm
+++ b/navit/xpm/bus.xpm
diff --git a/src/xpm/cafe.xpm b/navit/xpm/cafe.xpm
index a61aebc14..a61aebc14 100644
--- a/src/xpm/cafe.xpm
+++ b/navit/xpm/cafe.xpm
diff --git a/src/xpm/camping.xpm b/navit/xpm/camping.xpm
index 86ff7d466..86ff7d466 100644
--- a/src/xpm/camping.xpm
+++ b/navit/xpm/camping.xpm
diff --git a/src/xpm/car_dealer.xpm b/navit/xpm/car_dealer.xpm
index 892f10b26..892f10b26 100644
--- a/src/xpm/car_dealer.xpm
+++ b/navit/xpm/car_dealer.xpm
diff --git a/src/xpm/church.xpm b/navit/xpm/church.xpm
index 6f6b609be..6f6b609be 100644
--- a/src/xpm/church.xpm
+++ b/navit/xpm/church.xpm
diff --git a/src/xpm/cinema.xpm b/navit/xpm/cinema.xpm
index f926d155d..f926d155d 100644
--- a/src/xpm/cinema.xpm
+++ b/navit/xpm/cinema.xpm
diff --git a/src/xpm/cursor.xpm b/navit/xpm/cursor.xpm
index efa2690b1..efa2690b1 100644
--- a/src/xpm/cursor.xpm
+++ b/navit/xpm/cursor.xpm
diff --git a/src/xpm/dumping-station.xpm b/navit/xpm/dumping-station.xpm
index c58d14247..c58d14247 100644
--- a/src/xpm/dumping-station.xpm
+++ b/navit/xpm/dumping-station.xpm
diff --git a/src/xpm/exit.xpm b/navit/xpm/exit.xpm
index 81491a0f3..81491a0f3 100644
--- a/src/xpm/exit.xpm
+++ b/navit/xpm/exit.xpm
diff --git a/src/xpm/fastfood.xpm b/navit/xpm/fastfood.xpm
index 033e6c9dc..033e6c9dc 100644
--- a/src/xpm/fastfood.xpm
+++ b/navit/xpm/fastfood.xpm
diff --git a/src/xpm/firebrigade.xpm b/navit/xpm/firebrigade.xpm
index 482f86c6f..482f86c6f 100644
--- a/src/xpm/firebrigade.xpm
+++ b/navit/xpm/firebrigade.xpm
diff --git a/src/xpm/flag_bk_tr.xpm b/navit/xpm/flag_bk_tr.xpm
index a115ecd3e..a115ecd3e 100644
--- a/src/xpm/flag_bk_tr.xpm
+++ b/navit/xpm/flag_bk_tr.xpm
diff --git a/src/xpm/flag_bk_wh.xpm b/navit/xpm/flag_bk_wh.xpm
index 6b87fa8d0..6b87fa8d0 100644
--- a/src/xpm/flag_bk_wh.xpm
+++ b/navit/xpm/flag_bk_wh.xpm
diff --git a/src/xpm/flag_bl_wh.xpm b/navit/xpm/flag_bl_wh.xpm
index 7fa9856f7..7fa9856f7 100644
--- a/src/xpm/flag_bl_wh.xpm
+++ b/navit/xpm/flag_bl_wh.xpm
diff --git a/src/xpm/flag_wh_bk.xpm b/navit/xpm/flag_wh_bk.xpm
index 4564f8ffb..4564f8ffb 100644
--- a/src/xpm/flag_wh_bk.xpm
+++ b/navit/xpm/flag_wh_bk.xpm
diff --git a/src/xpm/fuel.xpm b/navit/xpm/fuel.xpm
index 7b9f5f842..7b9f5f842 100644
--- a/src/xpm/fuel.xpm
+++ b/navit/xpm/fuel.xpm
diff --git a/src/xpm/gc_event.xpm b/navit/xpm/gc_event.xpm
index cdcb2daa9..cdcb2daa9 100644
--- a/src/xpm/gc_event.xpm
+++ b/navit/xpm/gc_event.xpm
diff --git a/src/xpm/gc_multi.xpm b/navit/xpm/gc_multi.xpm
index e81a8c472..e81a8c472 100644
--- a/src/xpm/gc_multi.xpm
+++ b/navit/xpm/gc_multi.xpm
diff --git a/src/xpm/gc_mystery.xpm b/navit/xpm/gc_mystery.xpm
index 7857292ae..7857292ae 100644
--- a/src/xpm/gc_mystery.xpm
+++ b/navit/xpm/gc_mystery.xpm
diff --git a/src/xpm/gc_question.xpm b/navit/xpm/gc_question.xpm
index 14186d50f..14186d50f 100644
--- a/src/xpm/gc_question.xpm
+++ b/navit/xpm/gc_question.xpm
diff --git a/src/xpm/gc_reference.xpm b/navit/xpm/gc_reference.xpm
index 8f559a3bd..8f559a3bd 100644
--- a/src/xpm/gc_reference.xpm
+++ b/navit/xpm/gc_reference.xpm
diff --git a/src/xpm/gc_stages.xpm b/navit/xpm/gc_stages.xpm
index a9b14e93b..a9b14e93b 100644
--- a/src/xpm/gc_stages.xpm
+++ b/navit/xpm/gc_stages.xpm
diff --git a/src/xpm/gc_tradi.xpm b/navit/xpm/gc_tradi.xpm
index ee4ced7a7..ee4ced7a7 100644
--- a/src/xpm/gc_tradi.xpm
+++ b/navit/xpm/gc_tradi.xpm
diff --git a/src/xpm/gc_webcam.xpm b/navit/xpm/gc_webcam.xpm
index 3f7441d5b..3f7441d5b 100644
--- a/src/xpm/gc_webcam.xpm
+++ b/navit/xpm/gc_webcam.xpm
diff --git a/src/xpm/golf.xpm b/navit/xpm/golf.xpm
index 637387cc3..637387cc3 100644
--- a/src/xpm/golf.xpm
+++ b/navit/xpm/golf.xpm
diff --git a/src/xpm/heliport.xpm b/navit/xpm/heliport.xpm
index ef350c08c..ef350c08c 100644
--- a/src/xpm/heliport.xpm
+++ b/navit/xpm/heliport.xpm
diff --git a/src/xpm/highway_exit.xpm b/navit/xpm/highway_exit.xpm
index 7d433052f..7d433052f 100644
--- a/src/xpm/highway_exit.xpm
+++ b/navit/xpm/highway_exit.xpm
diff --git a/src/xpm/hospital.xpm b/navit/xpm/hospital.xpm
index 44ac27407..44ac27407 100644
--- a/src/xpm/hospital.xpm
+++ b/navit/xpm/hospital.xpm
diff --git a/src/xpm/hotel.xpm b/navit/xpm/hotel.xpm
index c371b95a1..c371b95a1 100644
--- a/src/xpm/hotel.xpm
+++ b/navit/xpm/hotel.xpm
diff --git a/src/xpm/information.xpm b/navit/xpm/information.xpm
index 08ea57982..08ea57982 100644
--- a/src/xpm/information.xpm
+++ b/navit/xpm/information.xpm
diff --git a/src/xpm/level_crossing.xpm b/navit/xpm/level_crossing.xpm
index 83b2d7161..83b2d7161 100644
--- a/src/xpm/level_crossing.xpm
+++ b/navit/xpm/level_crossing.xpm
diff --git a/src/xpm/library.xpm b/navit/xpm/library.xpm
index c91306312..c91306312 100644
--- a/src/xpm/library.xpm
+++ b/navit/xpm/library.xpm
diff --git a/src/xpm/mini_roundabout.xpm b/navit/xpm/mini_roundabout.xpm
index 562b5e1dd..562b5e1dd 100644
--- a/src/xpm/mini_roundabout.xpm
+++ b/navit/xpm/mini_roundabout.xpm
diff --git a/src/xpm/museum.xpm b/navit/xpm/museum.xpm
index bf5b84cb3..bf5b84cb3 100644
--- a/src/xpm/museum.xpm
+++ b/navit/xpm/museum.xpm
diff --git a/src/xpm/nav_left_1.xpm b/navit/xpm/nav_left_1.xpm
index 18b9a7716..18b9a7716 100644
--- a/src/xpm/nav_left_1.xpm
+++ b/navit/xpm/nav_left_1.xpm
diff --git a/src/xpm/nav_left_2.xpm b/navit/xpm/nav_left_2.xpm
index b5012f47c..b5012f47c 100644
--- a/src/xpm/nav_left_2.xpm
+++ b/navit/xpm/nav_left_2.xpm
diff --git a/src/xpm/nav_right_1.xpm b/navit/xpm/nav_right_1.xpm
index bcf16278a..bcf16278a 100644
--- a/src/xpm/nav_right_1.xpm
+++ b/navit/xpm/nav_right_1.xpm
diff --git a/src/xpm/nav_right_2.xpm b/navit/xpm/nav_right_2.xpm
index 5d3088a79..5d3088a79 100644
--- a/src/xpm/nav_right_2.xpm
+++ b/navit/xpm/nav_right_2.xpm
diff --git a/src/xpm/nav_straight.xpm b/navit/xpm/nav_straight.xpm
index dbbfc0c2a..dbbfc0c2a 100644
--- a/src/xpm/nav_straight.xpm
+++ b/navit/xpm/nav_straight.xpm
diff --git a/src/xpm/parking.xpm b/navit/xpm/parking.xpm
index 505ac6815..505ac6815 100644
--- a/src/xpm/parking.xpm
+++ b/navit/xpm/parking.xpm
diff --git a/src/xpm/peak.xpm b/navit/xpm/peak.xpm
index a95b6ffb3..a95b6ffb3 100644
--- a/src/xpm/peak.xpm
+++ b/navit/xpm/peak.xpm
diff --git a/src/xpm/pharmacy.xpm b/navit/xpm/pharmacy.xpm
index b5b1aa57a..b5b1aa57a 100644
--- a/src/xpm/pharmacy.xpm
+++ b/navit/xpm/pharmacy.xpm
diff --git a/src/xpm/picnic.xpm b/navit/xpm/picnic.xpm
index b27299662..b27299662 100644
--- a/src/xpm/picnic.xpm
+++ b/navit/xpm/picnic.xpm
diff --git a/src/xpm/police.xpm b/navit/xpm/police.xpm
index c2ffb2634..c2ffb2634 100644
--- a/src/xpm/police.xpm
+++ b/navit/xpm/police.xpm
diff --git a/src/xpm/post.xpm b/navit/xpm/post.xpm
index 399e73ef5..399e73ef5 100644
--- a/src/xpm/post.xpm
+++ b/navit/xpm/post.xpm
diff --git a/src/xpm/restaurant.xpm b/navit/xpm/restaurant.xpm
index 730fcc941..730fcc941 100644
--- a/src/xpm/restaurant.xpm
+++ b/navit/xpm/restaurant.xpm
diff --git a/src/xpm/restroom.xpm b/navit/xpm/restroom.xpm
index 597c0d615..597c0d615 100644
--- a/src/xpm/restroom.xpm
+++ b/navit/xpm/restroom.xpm
diff --git a/src/xpm/shopping.xpm b/navit/xpm/shopping.xpm
index 7a892d36d..7a892d36d 100644
--- a/src/xpm/shopping.xpm
+++ b/navit/xpm/shopping.xpm
diff --git a/src/xpm/skiing.xpm b/navit/xpm/skiing.xpm
index e62bbd5b0..e62bbd5b0 100644
--- a/src/xpm/skiing.xpm
+++ b/navit/xpm/skiing.xpm
diff --git a/src/xpm/sports.xpm b/navit/xpm/sports.xpm
index 567f8bb92..567f8bb92 100644
--- a/src/xpm/sports.xpm
+++ b/navit/xpm/sports.xpm
diff --git a/src/xpm/swimming.xpm b/navit/xpm/swimming.xpm
index 72f371591..72f371591 100644
--- a/src/xpm/swimming.xpm
+++ b/navit/xpm/swimming.xpm
diff --git a/src/xpm/telephone.xpm b/navit/xpm/telephone.xpm
index c788ef8c2..c788ef8c2 100644
--- a/src/xpm/telephone.xpm
+++ b/navit/xpm/telephone.xpm
diff --git a/src/xpm/theater.xpm b/navit/xpm/theater.xpm
index 9581bc701..9581bc701 100644
--- a/src/xpm/theater.xpm
+++ b/navit/xpm/theater.xpm
diff --git a/src/xpm/tower.xpm b/navit/xpm/tower.xpm
index 2bf27687d..2bf27687d 100644
--- a/src/xpm/tower.xpm
+++ b/navit/xpm/tower.xpm
diff --git a/src/xpm/townhall.xpm b/navit/xpm/townhall.xpm
index 150b26f96..150b26f96 100644
--- a/src/xpm/townhall.xpm
+++ b/navit/xpm/townhall.xpm
diff --git a/src/xpm/traffic_signals.xpm b/navit/xpm/traffic_signals.xpm
index e98567951..e98567951 100644
--- a/src/xpm/traffic_signals.xpm
+++ b/navit/xpm/traffic_signals.xpm
diff --git a/src/xpm/trailerpark.xpm b/navit/xpm/trailerpark.xpm
index 6864ea8f4..6864ea8f4 100644
--- a/src/xpm/trailerpark.xpm
+++ b/navit/xpm/trailerpark.xpm
diff --git a/src/xpm/unknown.xpm b/navit/xpm/unknown.xpm
index 8f6835f22..8f6835f22 100644
--- a/src/xpm/unknown.xpm
+++ b/navit/xpm/unknown.xpm
diff --git a/src/zipfile.h b/navit/zipfile.h
index 695576d35..695576d35 100644
--- a/src/zipfile.h
+++ b/navit/zipfile.h
diff --git a/po/Makefile.am b/po/Makefile.am
index 13e67d5af..a3c7d741a 100644
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -6,14 +6,14 @@ CLEANFILES = $(CATALOGS) navit.pot
 EXTRA_DIST = @POFILES@
 
 POTFILES  = \
-	$(top_srcdir)/src/main.c \
-	$(top_srcdir)/src/navigation.c \
-	$(top_srcdir)/src/navit.c \
-	$(top_srcdir)/src/popup.c \
-	$(top_srcdir)/src/country.c \
-	$(top_srcdir)/src/gui/gtk/destination.c \
-	$(top_srcdir)/src/gui/gtk/gui_gtk_action.c \
-	$(top_srcdir)/src/gui/gtk/gui_gtk_statusbar.c
+	$(top_srcdir)/navit/main.c \
+	$(top_srcdir)/navit/navigation.c \
+	$(top_srcdir)/navit/navit.c \
+	$(top_srcdir)/navit/popup.c \
+	$(top_srcdir)/navit/country.c \
+	$(top_srcdir)/navit/gui/gtk/destination.c \
+	$(top_srcdir)/navit/gui/gtk/gui_gtk_action.c \
+	$(top_srcdir)/navit/gui/gtk/gui_gtk_statusbar.c
 
 
 SUFFIXES = .po .mo