diff --git a/backend/position_manual/geoclue_position_server_manual.h b/backend/position_manual/geoclue_position_server_manual.h
index ed1bd9e3643e34fb60a03f22e350f33722acc7df..71e6537a702f542061bacc1f472f71d94dd01d96 100644
--- a/backend/position_manual/geoclue_position_server_manual.h
+++ b/backend/position_manual/geoclue_position_server_manual.h
@@ -25,6 +25,8 @@
 
 #include <dbus/dbus-glib.h>
 #include <glib.h>
+#include <config.h>
+
 #define GEOCLUE_POSITION_DBUS_SERVICE     "org.freedesktop.geoclue.position.manual"
 #define GEOCLUE_POSITION_DBUS_PATH        "/org/freedesktop/geoclue/position/manual"
 #define GEOCLUE_POSITION_DBUS_INTERFACE   "org.freedesktop.geoclue.position"
diff --git a/configure.ac b/configure.ac
index e3a8cde85f23e01fd307bad1dba7672d137420b3..ce418bcd617ca3fb3d3cd620acdc78bcf03c13b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_INIT(geoclue/position.c)
 
 PACKAGE=geoclue
 
-VERSION=0.7
+VERSION=0.8
 
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 
diff --git a/geoclue/Makefile.am b/geoclue/Makefile.am
index 14745234b1732a7e7cddc64d14f401bdad3494cf..2faa63b0d24bf64c3741cac5def335d8e333dcab 100644
--- a/geoclue/Makefile.am
+++ b/geoclue/Makefile.am
@@ -48,7 +48,8 @@ libgeoclue_la_SOURCES = 	position.c \
 				map_gtk.c \
 				map_gtk_layout.c \
 				map_signal_marshal.c \
-				geocode.c 
+				geocode.c \
+				geoclue.c
  
 libgeoclue_la_CFLAGS = $(DEPS_CFLAGS) -I$(top_srcdir)
 libgeoclue_la_LIBADD = $(DEPS_LIBS)
diff --git a/geoclue/find.c b/geoclue/find.c
index 2dab44f0e7f7755694ac79dc45d5ab3c1809298f..361e52539c3e1da2c06204c0c53a1ba0d3ea037a 100644
--- a/geoclue/find.c
+++ b/geoclue/find.c
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <find_signal_marshal.h>
 #include <geoclue_master_client_glue.h>
+#include <config.h>
 
 #define GEOCLUE_FIND_DBUS_INTERFACE   "org.freedesktop.geoclue.find"   
  
diff --git a/geoclue/find.h b/geoclue/find.h
index 025b684806e5de34ec09cde1789c51d0543b92b1..9b0a3ef009d218d04a7bdaeac6d1960ad0b80285 100644
--- a/geoclue/find.h
+++ b/geoclue/find.h
@@ -20,7 +20,6 @@
 #define __ORG_FREEDESKTOP_GEOCLUE_FIND_GEOCLUE_FIND_H__
 
 #include <dbus/dbus-glib.h>
-#include <config.h>
 
 G_BEGIN_DECLS
 
diff --git a/geoclue/geoclue.c b/geoclue/geoclue.c
new file mode 100644
index 0000000000000000000000000000000000000000..ecd28477be32f6730fa0939c12eadcaea1dfef2f
--- /dev/null
+++ b/geoclue/geoclue.c
@@ -0,0 +1,27 @@
+/* Geoclue - A DBus api and wrapper for geography information
+ * Copyright (C) 2006-2007 by Garmin Ltd. or its subsidiaries
+ * 
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2 as published by the Free Software Foundation; 
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <geoclue.h>
+#include <config.h>
+
+DBusBusType
+geoclue_get_dbus_bus_type ()
+{
+	return GEOCLUE_DBUS_BUS;
+}
\ No newline at end of file
diff --git a/geoclue/geoclue.h b/geoclue/geoclue.h
index 2eb914ead50d0d8c15cc1d88c14e0e08ca4af3c3..022a905dff4d472c1dcd4238cc5af9ea552126d2 100644
--- a/geoclue/geoclue.h
+++ b/geoclue/geoclue.h
@@ -50,13 +50,15 @@
 **/
 
 
-DBusBusType
-geoclue_get_dbus_bus_type ()
-{
-	return GEOCLUE_DBUS_BUS;
-}
 
+#include <glib/gmacros.h>
+#include <dbus/dbus-shared.h>
+
+G_BEGIN_DECLS
 
+DBusBusType
+geoclue_get_dbus_bus_type ();
 
+G_END_DECLS
 
-#endif
\ No newline at end of file
+#endif /* __ORG_FREEDESKTOP_GEOCLUE_GEOCLUE_H__ */
\ No newline at end of file
diff --git a/geoclue/geocode.c b/geoclue/geocode.c
index 48a3f9d9cb2903f58135dcc86386a324111f8ecb..500e363a9945bca3501ccd0ca55a21409bdac747 100644
--- a/geoclue/geocode.c
+++ b/geoclue/geocode.c
@@ -27,6 +27,7 @@
 #include <geocode_client_glue.h>
 #include <stdio.h>
 #include <geoclue_master_client_glue.h>
+#include <config.h>
 
 #define GEOCLUE_GEOCODE_DBUS_SERVICE     "org.freedesktop.geoclue.geocode.yahoo"
 #define GEOCLUE_GEOCODE_DBUS_PATH        "/org/freedesktop/geoclue/geocode/yahoo"
diff --git a/geoclue/geocode.h b/geoclue/geocode.h
index 49ae3f305edf77ad4c98d0643156d1937c43538a..6fd0e41edf59752dbbb84a332afb5a8852761e8d 100644
--- a/geoclue/geocode.h
+++ b/geoclue/geocode.h
@@ -20,7 +20,6 @@
 #define __ORG_FREEDESKTOP_GEOCLUE_GEOCODE_GEOCLUE_GEOCODE_H__
 
 #include <dbus/dbus-glib.h>
-#include <config.h>
 
 G_BEGIN_DECLS
 
diff --git a/geoclue/map.c b/geoclue/map.c
index ae34160f8016585891a35aed6143318078595692..dbe4a9189737b0dcbcb1114784f5b9359efd8ead 100644
--- a/geoclue/map.c
+++ b/geoclue/map.c
@@ -29,7 +29,7 @@
 #include <map_signal_marshal.h>
 
 #include <geoclue_master_client_glue.h>
-
+#include <config.h>
 
 #define GEOCLUE_MAP_DBUS_INTERFACE   "org.freedesktop.geoclue.map"   
  
diff --git a/geoclue/map.h b/geoclue/map.h
index bb1a8fb1ee6bef3baa0c368b7255349d1e0d7e20..14a96212ed7fc63fd1ac2ce26a91979f953f66b8 100644
--- a/geoclue/map.h
+++ b/geoclue/map.h
@@ -20,7 +20,6 @@
 #define __ORG_FREEDESKTOP_GEOCLUE_GEOCLUE_MAP_H__
 
 #include <dbus/dbus-glib.h>
-#include <config.h>
 
 G_BEGIN_DECLS
 
diff --git a/geoclue/position.c b/geoclue/position.c
index af3cfbdb8d0cdd1e957176bf8199e9a69d4b938a..33b81b9ee13222f70c821672e58f541ac6d2086d 100644
--- a/geoclue/position.c
+++ b/geoclue/position.c
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <position_signal_marshal.h>
 #include <string.h>
+#include <config.h>
 
 #define GEOCLUE_POSITION_DBUS_INTERFACE   "org.freedesktop.geoclue.position"   
 #define GEOCLUE_MASTER_DBUS_SERVICE     "org.freedesktop.geoclue.master"
diff --git a/geoclue/position.h b/geoclue/position.h
index 17770b3b6115d24deb3410f8bcfdfc23fc957f60..d5ce55335c6fde0751bbe8ca7693e1ddece56b15 100644
--- a/geoclue/position.h
+++ b/geoclue/position.h
@@ -20,7 +20,7 @@
 #define __ORG_FREEDESKTOP_GEOCLUE_POSITION_GEOCLUE_POSITION_H__
 
 #include <dbus/dbus-glib.h>
-#include <config.h>
+
 
 /** \page Position
  *