More Chinook preparation

diff --git a/src/bt-maemo.c b/src/bt-maemo.c
index 54f5398f4c679fe9ef1b6abbd5266f0b630c24bf..35477697d20333ebfdf0e79798934b094cb91f10 100644 (file)
--- a/src/bt-maemo.c
+++ b/src/bt-maemo.c
@@ -7,10 +7,7 @@
 #include <fcntl.h>
 
 #include <libosso.h>
-#include <osso-helplib.h>
-#include <osso-ic-dbus.h>
-#include <osso-ic.h>
-#include <hildon-widgets/hildon-banner.h>
+#include <hildon/hildon-banner.h>
 
 #include <bt-dbus.h>
 

diff --git a/src/hildon-mapper.h b/src/hildon-mapper.h
index 6f64303036292cde8b01d7a8b03a05765414154e..819043660fe61a017db428c011c13a4490991b90 100644 (file)
--- a/src/hildon-mapper.h
+++ b/src/hildon-mapper.h
@@ -29,7 +29,6 @@
 
 #ifdef WITH_DEVICE_770
 #include <device_symbols.h>
-#include <hildon/hildon-input-mode-hint.h>
 #endif
 
 #else

diff --git a/src/mapper.c b/src/mapper.c
index 82efa050159b372934bfef632621f5e27c151087..7c7cbd3bfeee0ff421025765f31e5a5d331772c6 100644 (file)
--- a/src/mapper.c
+++ b/src/mapper.c
@@ -50,6 +50,10 @@
 #include <libintl.h>
 #include <locale.h>
 
+#ifdef WITH_HILDON_DBUS_BT
+#include <bt-dbus.h>
+#endif
+
 #include "hildon-mapper.h"
 
 #include "utils.h"