From 5bd9da8700390429ef30aaebab1d8da694ce77c7 Mon Sep 17 00:00:00 2001
From: Kaj-Michael Lang <milang@tori.tal.org>
Date: Thu, 18 Oct 2007 00:47:15 +0300
Subject: [PATCH] More Chinook preparation

---
 src/bt-maemo.c      | 5 +----
 src/hildon-mapper.h | 1 -
 src/mapper.c        | 4 ++++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bt-maemo.c b/src/bt-maemo.c
index 54f5398..3547769 100644
--- 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 6f64303..8190436 100644
--- 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 82efa05..7c7cbd3 100644
--- 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"
-- 
2.39.5