#ifdef WITH_OSSO
#include <libosso.h>
+
+#ifdef WITH_OSSO_HELP
#include <osso-helplib.h>
-#include <osso-ic-dbus.h>
+#endif
+
+#ifdef WITH_OSSO_IC
#include <osso-ic.h>
+#include <osso-ic-dbus.h>
+#endif
+
#include <bt-dbus.h>
#include "maemo-osso.h"
#include "iap.h"
#ifdef WITH_HILDON_NEW
#include <hildon/hildon-program.h>
-#include <hildon/hildon-program.h>
#include <hildon/hildon-controlbar.h>
#include <hildon/hildon-note.h>
#include <hildon/hildon-color-button.h>
#include <hildon/hildon-number-editor.h>
#include <hildon/hildon-banner.h>
+
#ifdef WITH_HILDONFM
#include <hildon/hildon-file-chooser-dialog.h>
#endif
+#ifdef WITH_HILDON_HELP
+#include <hildon/hildon-help.h>
+#endif
+
#ifdef WITH_DEVICE_770
#include <device_symbols.h>
-#include <hildon/hildon-input-mode-hint.h>
#endif
#else
-#include <hildon-widgets/hildon-program.h>
#include <hildon-widgets/hildon-program.h>
#include <hildon-widgets/hildon-controlbar.h>
#include <hildon-widgets/hildon-note.h>