Fixes to gstreamer element and caps handlings.

[mapper] / src / ui-maemo.h

diff --git a/src/ui-maemo.h b/src/ui-maemo.h
index 5f89336271027eb9e261b1837f61ccd2119ab271..32432f4e10105a277e7ee429ca7a34983e7a3768 100644 (file)
--- a/src/ui-maemo.h
+++ b/src/ui-maemo.h
@@ -1,32 +1,20 @@
 #ifndef _MAPPER_UI_MAEMO_H
 #define _MAPPER_UI_MAEMO_H
 
-#include <config.h>
+#include "config.h"
+
+#include "hildon-mapper.h"
 
 #ifdef WITH_HILDON
 
+#ifdef WITH_OSSO
 #include <libosso.h>
-#include <osso-helplib.h>
-#include <osso-ic-dbus.h>
-#include <osso-ic.h>
-#include <bt-dbus.h>
-#include <hildon-widgets/hildon-program.h>
-#include <hildon-widgets/hildon-controlbar.h>
-#include <hildon-widgets/hildon-note.h>
-#include <hildon-widgets/hildon-color-button.h>
-#include <hildon-fm/hildon-widgets/hildon-file-chooser-dialog.h>
-#include <hildon-widgets/hildon-number-editor.h>
-#include <hildon-widgets/hildon-banner.h>
-#include <hildon-widgets/hildon-system-sound.h>
-#include <hildon-widgets/hildon-input-mode-hint.h>
-#include <device_symbols.h>
+/** The main OSSO context of the application. */
+osso_context_t *_osso;
+#endif
 
 /** The main GtkWindow of the application. */
 HildonProgram *_program;
 
-/** The main OSSO context of the application. */
-osso_context_t *_osso;
-
 #endif
-
 #endif