* src/hildon-*.c * src/hildon-*.h: Ensure a consistent include order, include <gtk...

diff --git a/ChangeLog b/ChangeLog
index 4a0f97b..a6dca0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-08-12  Christian Dywan  <christian@imendio.com>
 
+       * src/hildon-*.c
+       * src/hildon-*.h: Ensure a consistent include order,
+       include <gtk/gtk.h> instead of particular files and
+       only include the topmost header in the gtk stack. See NB #39857
+
+2008-08-12  Christian Dywan  <christian@imendio.com>
+
        * src/hildon-picker-dialog.c
        * src/hildon-touch-selector.c: Fix warnings about unused and
        uninitialized variables.

diff --git a/src/hildon-app-menu.c b/src/hildon-app-menu.c
index 255311a..e1c1bc5 100644 (file)
--- a/src/hildon-app-menu.c
+++ b/src/hildon-app-menu.c
@@ -66,14 +66,13 @@
  *
  */
 
+#include                                        <string.h>
+#include                                        <X11/Xatom.h>
+#include                                        <gdk/gdkx.h>
+
 #include                                        "hildon-app-menu.h"
 #include                                        "hildon-app-menu-private.h"
 
-#include                                        <gdk/gdkx.h>
-#include                                        <X11/X.h>
-#include                                        <X11/Xatom.h>
-#include                                        <string.h>
-
 static GdkWindow *
 grab_transfer_window_get                        (GtkWidget *widget);
 

diff --git a/src/hildon-banner.c b/src/hildon-banner.c
index c7463b4..8751108 100644 (file)
--- a/src/hildon-banner.c
+++ b/src/hildon-banner.c
@@ -38,15 +38,14 @@
 #include                                        <config.h>
 #endif
 
-#include                                        "hildon-banner.h"
-#include                                        <gtk/gtkhbox.h>
-#include                                        <gtk/gtkimage.h>
-#include                                        <gtk/gtkicontheme.h>
 #include                                        <string.h>
-#include                                        <X11/X.h>
 #include                                        <X11/Xatom.h>
-#include                                        "hildon-defines.h"
+#include                                        <X11/X.h>
+#include                                        <gdk/gdkx.h>
+
+#include                                        "hildon-banner.h"
 #include                                        "hildon-banner-private.h"
+#include                                        "hildon-defines.h"
 
 /* position relative to the screen */
 

diff --git a/src/hildon-banner.h b/src/hildon-banner.h
index 9096d47..5d8d212 100644 (file)
--- a/src/hildon-banner.h
+++ b/src/hildon-banner.h
@@ -25,10 +25,7 @@
 #ifndef                                         __HILDON_BANNER_H__
 #define                                         __HILDON_BANNER_H__
 
-#include                                        <gtk/gtkwindow.h>
-#include                                        <gtk/gtkprogressbar.h>
-#include                                        <gtk/gtklabel.h>
-#include                                        <gdk/gdkx.h>
+#include                                        <gtk/gtk.h>
 
 G_BEGIN_DECLS 
 

diff --git a/src/hildon-bread-crumb-trail.c b/src/hildon-bread-crumb-trail.c
index cf95c52..1ab736d 100644 (file)
--- a/src/hildon-bread-crumb-trail.c
+++ b/src/hildon-bread-crumb-trail.c
@@ -38,6 +38,7 @@
  */
 
 #include <gdk/gdkkeysyms.h>
+
 #include "hildon-marshalers.h"
 #include "hildon-bread-crumb-trail.h"
 #include "hildon-bread-crumb-widget.h"

diff --git a/src/hildon-bread-crumb-trail.h b/src/hildon-bread-crumb-trail.h
index a6daf13..9978599 100644 (file)
--- a/src/hildon-bread-crumb-trail.h
+++ b/src/hildon-bread-crumb-trail.h
@@ -27,6 +27,7 @@
 #define __HILDON_BREAD_CRUMB_TRAIL_H__
 
 #include <gtk/gtk.h>
+
 #include "hildon-bread-crumb.h"
 
 G_BEGIN_DECLS

diff --git a/src/hildon-bread-crumb-widget.h b/src/hildon-bread-crumb-widget.h
index 537521a..d795e7d 100644 (file)
--- a/src/hildon-bread-crumb-widget.h
+++ b/src/hildon-bread-crumb-widget.h
@@ -26,10 +26,10 @@
 #ifndef __HILDON_BREAD_CRUMB_WIDGET_H__
 #define __HILDON_BREAD_CRUMB_WIDGET_H__
 
-#include "hildon-bread-crumb.h"
-
 #include <gtk/gtk.h>
 
+#include "hildon-bread-crumb.h"
+
 G_BEGIN_DECLS
 
 typedef struct _HildonBreadCrumbWidget        HildonBreadCrumbWidget;

diff --git a/src/hildon-bread-crumb.h b/src/hildon-bread-crumb.h
index 47414c7..f4e0a4d 100644 (file)
--- a/src/hildon-bread-crumb.h
+++ b/src/hildon-bread-crumb.h
@@ -26,7 +26,7 @@
 #ifndef __HILDON_BREAD_CRUMB_H__
 #define __HILDON_BREAD_CRUMB_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/hildon-button.c b/src/hildon-button.c
index f8438f7..b8cf0a5 100644 (file)
--- a/src/hildon-button.c
+++ b/src/hildon-button.c
@@ -36,6 +36,7 @@
 
 #include                                        "hildon-button.h"
 #include                                        "hildon-enum-types.h"
+#include                                        "hildon-gtk.h"
 
 G_DEFINE_TYPE                                   (HildonButton, hildon_button, GTK_TYPE_BUTTON);
 

diff --git a/src/hildon-calendar-popup.c b/src/hildon-calendar-popup.c
index 990e5ef..e039a32 100644 (file)
--- a/src/hildon-calendar-popup.c
+++ b/src/hildon-calendar-popup.c
@@ -64,15 +64,16 @@
 #include                                        <config.h>
 #endif
 
-#include                                        "hildon-calendar-popup.h"
-#include                                        "hildon-calendar.h"
-#include                                        <gtk/gtk.h>
-#include                                        <gdk/gdk.h>
-#include                                        <gdk/gdkkeysyms.h>
 #include                                        <langinfo.h>
 #include                                        <time.h>
 #include                                        <libintl.h>
+
+#include                                        <gtk/gtk.h>
+#include                                        <gdk/gdkkeysyms.h>
+
+#include                                        "hildon-calendar-popup.h"
 #include                                        "hildon-calendar-popup-private.h"
+#include                                        "hildon-calendar.h"
 
 #define                                         _(String)\
                                                 dgettext("hildon-libs", String)

diff --git a/src/hildon-calendar.c b/src/hildon-calendar.c
index f2d67f4..de5ea10 100644 (file)
--- a/src/hildon-calendar.c
+++ b/src/hildon-calendar.c
@@ -45,7 +45,7 @@
  * standard #GtkCalendar or use #HildonDateEditor for more higher-level date setting
  * operations.
  *
- */    
+ */
 
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
@@ -53,6 +53,8 @@
 
 #define                                         _GNU_SOURCE /* needed for GNU nl_langinfo_l */
 
+#include                                        <locale.h>
+
 #ifdef                                          HAVE_SYS_TIME_H
 #include                                        <sys/time.h>
 #endif
@@ -61,15 +63,13 @@
 #include                                        <stdlib.h>
 #include                                        <time.h>
 #include                                        <langinfo.h>
-#include                                        <locale.h>
+
 #include                                        <glib/gprintf.h>
+#include                                        <gdk/gdkkeysyms.h>
+#include                                        <gtk/gtkprivate.h>
 
 #include                                        "hildon-calendar.h"
 #include                                        "hildon-marshalers.h"
-#include                                        <gtk/gtkdnd.h>
-#include                                        <gtk/gtkmain.h>
-#include                                        <gdk/gdkkeysyms.h>
-#include                                        <gtk/gtkprivate.h>
 #include                                        "hildon-calendar-private.h"
 
 /***************************************************************************/

diff --git a/src/hildon-calendar.h b/src/hildon-calendar.h
index 77d5a78..d504b2c 100644 (file)
--- a/src/hildon-calendar.h
+++ b/src/hildon-calendar.h
@@ -36,11 +36,7 @@
 #ifndef                                         __HILDON_CALENDAR_H__
 #define                                         __HILDON_CALENDAR_H__
 
-#include                                        <gdk/gdk.h>
-#include                                        <gtk/gtkwidget.h>
-
-/* Not needed, retained for compatibility -Yosh */
-#include                                        <gtk/gtksignal.h>
+#include                                        <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/hildon-caption.c b/src/hildon-caption.c
index 7bcef07..1b08134 100644 (file)
--- a/src/hildon-caption.c
+++ b/src/hildon-caption.c
@@ -37,22 +37,11 @@
 #include                                        <config.h>
 #endif
 
-#include                                        "hildon-caption.h"
-#include                                        <gtk/gtkhbox.h>
-#include                                        <gtk/gtklabel.h>
-#include                                        <gtk/gtkimage.h>
-#include                                        <gtk/gtkentry.h>
-#include                                        <gtk/gtkcombo.h>
-#include                                        <gtk/gtkcombobox.h>
-#include                                        <gtk/gtkcomboboxentry.h>
-#include                                        <gtk/gtkoptionmenu.h>
-#include                                        <gtk/gtkmarshal.h>
-#include                                        <gtk/gtkalignment.h>
-#include                                        <gtk/gtkcheckbutton.h>
-#include                                        <stdio.h>
-#include                                        <string.h>
-#include                                        "hildon-defines.h"
 #include                                        <libintl.h>
+#include                                        <gtk/gtk.h>
+
+#include                                        "hildon-defines.h"
+#include                                        "hildon-caption.h"
 #include                                        "hildon-caption-private.h"
 
 #define                                         _(String)\

diff --git a/src/hildon-caption.h b/src/hildon-caption.h
index 30da851..9670b4f 100644 (file)
--- a/src/hildon-caption.h
+++ b/src/hildon-caption.h
@@ -25,10 +25,8 @@
 #ifndef                                         __HILDON_CAPTION_H__
 #define                                         __HILDON_CAPTION_H__
 
-#include                                        <glib.h>
-#include                                        <glib-object.h>
-#include                                        <gtk/gtkeventbox.h>
-#include                                        <gtk/gtksizegroup.h>
+#include                                        <gtk/gtk.h>
+
 #include                                        "hildon-enum-types.h"
 
 G_BEGIN_DECLS

diff --git a/src/hildon-code-dialog.c b/src/hildon-code-dialog.c
index 16d90d2..13c0a2b 100644 (file)
--- a/src/hildon-code-dialog.c
+++ b/src/hildon-code-dialog.c
@@ -38,21 +38,12 @@
 #include                                        <config.h>
 #endif
 
+#include                                        <libintl.h>
+#include                                        <gdk/gdkkeysyms.h>
+
 #include                                        "hildon-code-dialog.h"
 #include                                        "hildon-defines.h"
 #include                                        "hildon-banner.h"
-
-#include                                        <gdk/gdkkeysyms.h>
-#include                                        <gtk/gtkbutton.h>
-#include                                        <gtk/gtkentry.h>
-#include                                        <gtk/gtkicontheme.h>
-#include                                        <gtk/gtktable.h>
-#include                                        <gtk/gtkvbox.h>
-#include                                        <gtk/gtkbbox.h>
-#include                                        <gtk/gtklabel.h>
-#include                                        <gtk/gtkalignment.h>
-#include                                        <gtk/gtkversion.h>
-#include                                        <libintl.h>
 #include                                        "hildon-code-dialog-private.h"
 
 #define                                         HEIGHT (48-HILDON_MARGIN_DEFAULT)

diff --git a/src/hildon-code-dialog.h b/src/hildon-code-dialog.h
index 727c71f..8ea15c0 100644 (file)
--- a/src/hildon-code-dialog.h
+++ b/src/hildon-code-dialog.h
@@ -25,7 +25,7 @@
 #ifndef                                         __HILDON_CODE_DIALOG_H__
 #define                                         __HILDON_CODE_DIALOG_H__
 
-#include                                        <gtk/gtkdialog.h>
+#include                                        <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/hildon-color-button.c b/src/hildon-color-button.c
index 0a57a1e..8f66a11 100644 (file)
--- a/src/hildon-color-button.c
+++ b/src/hildon-color-button.c
@@ -49,12 +49,9 @@
 #include                                        <config.h>
 #endif
 
-#include                                        "hildon-color-button.h"
-#include                                        <gtk/gtkbutton.h>
-#include                                        <gtk/gtkalignment.h>
-#include                                        <gtk/gtkdrawingarea.h>
-#include                                        <gtk/gtksignal.h>
 #include                                        <gdk/gdkkeysyms.h>
+
+#include                                        "hildon-color-button.h"
 #include                                        "hildon-defines.h"
 #include                                        "hildon-color-chooser-dialog.h"
 #include                                        "hildon-color-button-private.h"

diff --git a/src/hildon-color-button.h b/src/hildon-color-button.h
index 6046d08..cc07fe4 100644 (file)
--- a/src/hildon-color-button.h
+++ b/src/hildon-color-button.h
@@ -25,7 +25,7 @@
 #ifndef                                         __HILDON_COLOR_BUTTON_H__
 #define                                         __HILDON_COLOR_BUTTON_H__
 
-#include                                        <gtk/gtkbutton.h>
+#include                                        <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/hildon-color-chooser-dialog-private.h b/src/hildon-color-chooser-dialog-private.h
index 8a408cc..f7dde5e 100644 (file)
--- a/src/hildon-color-chooser-dialog-private.h
+++ b/src/hildon-color-chooser-dialog-private.h
@@ -26,6 +26,8 @@
 #ifndef                                         __HILDON_COLOR_CHOOSER_DIALOG_PRIVATE_H__
 #define                                         __HILDON_COLOR_CHOOSER_DIALOG_PRIVATE_H__
 
+#include                                        <gconf/gconf-client.h>
+
 typedef struct                                  _HildonColorChooserDialogPrivate HildonColorChooserDialogPrivate;
 
 #define                                         HILDON_COLOR_CHOOSER_DIALOG_GET_PRIVATE(obj) \

diff --git a/src/hildon-color-chooser-dialog.c b/src/hildon-color-chooser-dialog.c
index 3b681d7..e4ee755 100644 (file)
--- a/src/hildon-color-chooser-dialog.c
+++ b/src/hildon-color-chooser-dialog.c
@@ -45,10 +45,8 @@
 #include                                        <memory.h>
 #include                                        <string.h>
 #include                                        <libintl.h>
-#include                                        <gdk/gdk.h>
 #include                                        <gdk/gdkkeysyms.h>
-#include                                        <gtk/gtk.h>
-#include                                        <gconf/gconf-client.h>
+
 #include                                        "hildon-color-chooser-dialog.h"
 #include                                        "hildon-color-chooser.h"
 #include                                        "hildon-defines.h"

diff --git a/src/hildon-color-chooser-dialog.h b/src/hildon-color-chooser-dialog.h
index 6b804ed..9edaf80 100644 (file)
--- a/src/hildon-color-chooser-dialog.h
+++ b/src/hildon-color-chooser-dialog.h
@@ -26,8 +26,7 @@
 #ifndef                                         __HILDON_COLOR_CHOOSER_DIALOG_H__
 #define                                         __HILDON_COLOR_CHOOSER_DIALOG_H__
 
-#include                                        <gdk/gdkcolor.h>
-#include                                        <gtk/gtkdialog.h>
+#include                                        <gtk/gtk.h>
 
 #define                                         HILDON_TYPE_COLOR_CHOOSER_DIALOG \
                                                 (hildon_color_chooser_dialog_get_type())

diff --git a/src/hildon-color-chooser.c b/src/hildon-color-chooser.c
index 708cd87..ff9464d 100644 (file)
--- a/src/hildon-color-chooser.c
+++ b/src/hildon-color-chooser.c
@@ -37,7 +37,6 @@
  * 
  */
 
-#include                                        <gtk/gtk.h>
 #include                                        "hildon-color-chooser.h"
 #include                                        "hildon-color-chooser-private.h"
 

diff --git a/src/hildon-color-chooser.h b/src/hildon-color-chooser.h
index b947665..b583e56 100644 (file)
--- a/src/hildon-color-chooser.h
+++ b/src/hildon-color-chooser.h
@@ -27,8 +27,7 @@
 #ifndef                                         __HILDON_COLOR_CHOOSER_H__
 #define                                         __HILDON_COLOR_CHOOSER_H__
 
-#include                                        <gdk/gdkcolor.h>
-#include                                        <gtk/gtkwidget.h>
+#include                                        <gtk/gtk.h>
 
 #define                                         HILDON_TYPE_COLOR_CHOOSER \
                                                 (hildon_color_chooser_get_type())

diff --git a/src/hildon-controlbar.c b/src/hildon-controlbar.c
index 4fc5686..c80f3ae 100644 (file)
--- a/src/hildon-controlbar.c
+++ b/src/hildon-controlbar.c
@@ -46,12 +46,12 @@
 #include                                        <config.h>
 #endif
 
-#include                                        "hildon-controlbar.h"
 #include                                        <math.h>
+#include                                        <libintl.h>
 #include                                        <gdk/gdk.h>
 #include                                        <gdk/gdkkeysyms.h>
-#include                                        <gtk/gtk.h>
-#include                                        <libintl.h>
+
+#include                                        "hildon-controlbar.h"
 #include                                        "hildon-controlbar-private.h"
 
 #define                                         _(string)\

diff --git a/src/hildon-controlbar.h b/src/hildon-controlbar.h
index 6be1f2e..a42c04b 100644 (file)
--- a/src/hildon-controlbar.h
+++ b/src/hildon-controlbar.h
@@ -25,7 +25,7 @@
 #ifndef                                         __HILDON_CONTROLBAR_H__
 #define                                         __HILDON_CONTROLBAR_H__
 
-#include                                        <gtk/gtkscale.h>
+#include                                        <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/hildon-date-button.c b/src/hildon-date-button.c
index 10a9488..7ff14ad 100644 (file)
--- a/src/hildon-date-button.c
+++ b/src/hildon-date-button.c
@@ -14,6 +14,10 @@
  *
  */
 
+#include "hildon-date-button.h"
+#include "hildon-date-selector.h"
+#include "hildon-touch-selector.h"
+
 /**
  * SECTION:hildon-date-button
  * @Short_Description: Button displaying and allowing selection of a date.
@@ -25,11 +29,6 @@
  * a different date from the selector, this will be shown in the button.
  */
 
-#include "hildon-date-selector.h"
-#include "hildon-touch-selector.h"
-#include "hildon-picker-button.h"
-#include "hildon-date-button.h"
-
 G_DEFINE_TYPE (HildonDateButton, hildon_date_button, HILDON_TYPE_PICKER_BUTTON)
 
 #if 0

diff --git a/src/hildon-date-button.h b/src/hildon-date-button.h
index 6070707..39fdda5 100644 (file)
--- a/src/hildon-date-button.h
+++ b/src/hildon-date-button.h
@@ -17,7 +17,9 @@
 #ifndef _HILDON_DATE_BUTTON
 #define _HILDON_DATE_BUTTON
 
-#include <glib-object.h>
+#include <gtk/gtk.h>
+
+#include "hildon-picker-button.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/hildon-date-editor.c b/src/hildon-date-editor.c
index 6a5182e..8bd4732 100644 (file)
--- a/src/hildon-date-editor.c
+++ b/src/hildon-date-editor.c
@@ -61,24 +61,22 @@
 #include                                        <config.h>
 #endif
 
-#include                                        "hildon-date-editor.h"
-#include                                        <glib.h>
-#include                                        <gtk/gtk.h>
-#include                                        <gtk/gtkenums.h>
-#include                                        <gdk/gdkkeysyms.h>
 #include                                        <time.h>
 #include                                        <stdlib.h>
 #include                                        <stdio.h>
 #include                                        <string.h>
+#include                                        <libintl.h>
+#include                                        <gdk/gdkkeysyms.h>
+
+#include                                        "hildon-date-editor.h"
 #include                                        "hildon-calendar-popup.h"
 #include                                        "hildon-defines.h"
-#include                                        "hildon-private.h"
 #include                                        "hildon-marshalers.h"
 #include                                        "hildon-enum-types.h"
 #include                                        "hildon-time-editor.h"
 #include                                        "hildon-banner.h"
-#include                                        <libintl.h>
 #include                                        "hildon-date-editor-private.h"
+#include                                        "hildon-private.h"
 
 #define                                         _(string) dgettext("hildon-libs", string)
 

diff --git a/src/hildon-date-editor.h b/src/hildon-date-editor.h
index 402f183..2763a64 100644 (file)
--- a/src/hildon-date-editor.h
+++ b/src/hildon-date-editor.h
@@ -25,7 +25,8 @@
 #ifndef                                         __HILDON_DATE_EDITOR_H__
 #define                                         __HILDON_DATE_EDITOR_H__
 
-#include                                        <gtk/gtkcontainer.h>
+#include                                        <gtk/gtk.h>
+
 #include                                        "hildon-time-editor.h"
 
 G_BEGIN_DECLS

diff --git a/src/hildon-date-selector.c b/src/hildon-date-selector.c
index 0666846..0a4c0e3 100644 (file)
--- a/src/hildon-date-selector.c
+++ b/src/hildon-date-selector.c
@@ -27,12 +27,11 @@
  *
  */
 
-
-#include "hildon-date-selector.h"
-
 #define _GNU_SOURCE     /* needed for GNU nl_langinfo_l */
 #define __USE_GNU       /* needed for locale */
 
+#include <locale.h>
+
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
@@ -43,7 +42,8 @@
 #include <libintl.h>
 #include <time.h>
 #include <langinfo.h>
-#include <locale.h>
+
+#include "hildon-date-selector.h"
 
 #define HILDON_DATE_SELECTOR_GET_PRIVATE(obj)                           \
   (G_TYPE_INSTANCE_GET_PRIVATE ((obj), HILDON_TYPE_DATE_SELECTOR, HildonDateSelectorPrivate))

diff --git a/src/hildon-defines.c b/src/hildon-defines.c
index 2e96db2..048dd94 100644 (file)
--- a/src/hildon-defines.c
+++ b/src/hildon-defines.c
@@ -32,7 +32,6 @@
 #include                                        <config.h>
 #endif
 
-#include                                        <gtk/gtk.h>
 #include                                        "hildon-defines.h"
 
 /**

diff --git a/src/hildon-dialog.h b/src/hildon-dialog.h
index ef41a87..e9b09c8 100644 (file)
--- a/src/hildon-dialog.h
+++ b/src/hildon-dialog.h
@@ -25,9 +25,7 @@
 #ifndef                                         __HILDON_DIALOG_H__
 #define                                         __HILDON_DIALOG_H__
 
-#include                                        <glib.h>
-#include                                        <glib-object.h>
-#include                                        <gtk/gtkdialog.h>
+#include                                        <gtk/gtk.h>
 
 #include                                        "hildon-defines.h"
 

diff --git a/src/hildon-find-toolbar.c b/src/hildon-find-toolbar.c
index 213b425..b8deb4e 100644 (file)
--- a/src/hildon-find-toolbar.c
+++ b/src/hildon-find-toolbar.c
@@ -32,24 +32,18 @@
  * #GtkListStore and can be accesed using a property 'list'. Entries are added
  * automatically to the list when the search button is pressed.
  *
- */    
+ */
 
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif
 
-#include                                        "hildon-find-toolbar.h"
-#include                                        "hildon-defines.h"
-#include                                        <gdk/gdkkeysyms.h>
-#include                                        <gtk/gtklabel.h>
-#include                                        <gtk/gtkentry.h>
-#include                                        <gtk/gtkbutton.h>
-#include                                        <gtk/gtktoolbutton.h>
-#include                                        <gtk/gtktoolitem.h>
-#include                                        <gtk/gtkcomboboxentry.h>
-#include                                        <gtk/gtkseparatortoolitem.h>
 #include                                        <string.h>
 #include                                        <libintl.h>
+#include                                        <gdk/gdkkeysyms.h>
+
+#include                                        "hildon-find-toolbar.h"
+#include                                        "hildon-defines.h"
 #include                                        "hildon-find-toolbar-private.h"
 
 #define                                         _(String) \

diff --git a/src/hildon-find-toolbar.h b/src/hildon-find-toolbar.h
index b8345b0..108b9f0 100644 (file)
--- a/src/hildon-find-toolbar.h
+++ b/src/hildon-find-toolbar.h
@@ -25,8 +25,7 @@
 #ifndef                                         __HILDON_FIND_TOOLBAR_H__
 #define                                         __HILDON_FIND_TOOLBAR_H__
 
-#include                                        <gtk/gtktoolbar.h>
-#include                                        <gtk/gtkliststore.h>
+#include                                        <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/hildon-font-selection-dialog.c b/src/hildon-font-selection-dialog.c
index d257c54..33910f4 100644 (file)
--- a/src/hildon-font-selection-dialog.c
+++ b/src/hildon-font-selection-dialog.c
@@ -35,23 +35,16 @@
 #include                                        <config.h>
 #endif
 
+#include                                        <libintl.h>
 #include                                        <stdlib.h>
 #include                                        <string.h>
-#include                                        <gtk/gtkstock.h>
-#include                                        <gtk/gtkcombobox.h>
-#include                                        <gtk/gtktogglebutton.h>
-#include                                        <gtk/gtkcheckbutton.h>
-#include                                        <gtk/gtklabel.h>
-#include                                        <gtk/gtkvbox.h>
-#include                                        <gtk/gtkliststore.h>
-#include                                        <gtk/gtknotebook.h>
-#include                                        <gtk/gtk.h>
+
 #include                                        <glib.h>
 #include                                        <gdk/gdkkeysyms.h>
+
 #include                                        "hildon-font-selection-dialog.h"
 #include                                        "hildon-caption.h"
 #include                                        "hildon-color-button.h"
-#include                                        <libintl.h>
 #include                                        "hildon-font-selection-dialog-private.h"
 
 /* These are what we use as the standard font sizes, for the size list */

diff --git a/src/hildon-font-selection-dialog.h b/src/hildon-font-selection-dialog.h
index c8aaf78..a3ce73d 100644 (file)
--- a/src/hildon-font-selection-dialog.h
+++ b/src/hildon-font-selection-dialog.h
@@ -24,8 +24,7 @@
 #ifndef                                         __HILDON_FONT_SELECTION_DIALOG_H__
 #define                                         __HILDON_FONT_SELECTION_DIALOG_H__
 
-#include                                        <gtk/gtkdialog.h>
-#include                                        <gtk/gtktextbuffer.h>
+#include                                        <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/hildon-get-password-dialog.c b/src/hildon-get-password-dialog.c
index f0c99d8..836e2aa 100644 (file)
--- a/src/hildon-get-password-dialog.c
+++ b/src/hildon-get-password-dialog.c
@@ -71,17 +71,16 @@
 #include                                        <config.h>
 #endif
 
-#include                                        "hildon-get-password-dialog.h"
-#include                                        <glib.h>
 #include                                        <errno.h>
 #include                                        <string.h>
 #include                                        <strings.h>
 #include                                        <unistd.h>
 #include                                        <stdio.h>
-#include                                        <gtk/gtk.h>
+#include                                        <libintl.h>
+
+#include                                        "hildon-get-password-dialog.h"
 #include                                        "hildon-caption.h"
 #include                                        "hildon-banner.h"
-#include                                        <libintl.h>
 #include                                        "hildon-get-password-dialog-private.h"
 
 #define                                         _(String) dgettext("hildon-libs", String)

diff --git a/src/hildon-get-password-dialog.h b/src/hildon-get-password-dialog.h
index b411be9..d61a60f 100644 (file)
--- a/src/hildon-get-password-dialog.h
+++ b/src/hildon-get-password-dialog.h
@@ -25,7 +25,7 @@
 #ifndef                                         __HILDON_GET_PASSWORD_DIALOG_H__
 #define                                         __HILDON_GET_PASSWORD_DIALOG_H__
 
-#include                                        <gtk/gtkdialog.h>
+#include                                        <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/hildon-helper.c b/src/hildon-helper.c
index 3074f36..49b7dc3 100644 (file)
--- a/src/hildon-helper.c
+++ b/src/hildon-helper.c
@@ -35,7 +35,6 @@
 #include                                        <config.h>
 #endif
 
-#include                                        <gtk/gtk.h>
 #include                                        "hildon-helper.h"
 #include                                        "hildon-banner.h"
 

diff --git a/src/hildon-helper.h b/src/hildon-helper.h
index 90a15d3..3a54f39 100644 (file)
--- a/src/hildon-helper.h
+++ b/src/hildon-helper.h
@@ -25,9 +25,9 @@
 #ifndef                                         __HILDON_HELPER_H__
 #define                                         __HILDON_HELPER_H__
 
-#include                                        <gtk/gtkwindow.h>
 #include                                        <gdk/gdkkeysyms.h>
-#include                                        <gdk/gdkevents.h>
+#include                                        <gtk/gtk.h>
+
 #include                                        "hildon-defines.h"
 
 G_BEGIN_DECLS

diff --git a/src/hildon-hvolumebar.c b/src/hildon-hvolumebar.c
index 32d42aa..be08357 100644 (file)
--- a/src/hildon-hvolumebar.c
+++ b/src/hildon-hvolumebar.c
@@ -45,7 +45,6 @@
 #include                                        "hildon-volumebar.h"
 #include                                        "hildon-volumebar-range.h"
 #include                                        "hildon-volumebar-private.h"
-#include                                        <gtk/gtktoolbar.h>
 
 /* Defines for normal version of HVolumebar */
 /* Toggle button */

diff --git a/src/hildon-login-dialog.c b/src/hildon-login-dialog.c
index 931c91a..4e6ea11 100644 (file)
--- a/src/hildon-login-dialog.c
+++ b/src/hildon-login-dialog.c
@@ -38,16 +38,16 @@
 #include                                        <config.h>
 #endif
 
-#include                                        "hildon-login-dialog.h"
-#include                                        <glib.h>
-#include                                        <gtk/gtk.h>
 #include                                        <errno.h>
 #include                                        <string.h>
 #include                                        <strings.h>
 #include                                        <unistd.h>
 #include                                        <stdio.h>
-#include                                        "hildon-caption.h"
 #include                                        <libintl.h>
+#include                                        <glib.h>
+
+#include                                        "hildon-login-dialog.h"
+#include                                        "hildon-caption.h"
 #include                                        "hildon-login-dialog-private.h"
 
 enum

diff --git a/src/hildon-login-dialog.h b/src/hildon-login-dialog.h
index 2a36dcb..6fc2333 100644 (file)
--- a/src/hildon-login-dialog.h
+++ b/src/hildon-login-dialog.h
@@ -25,7 +25,7 @@
 #ifndef                                         __HILDON_NAME_PASSWORD_DIALOG_H__
 #define                                         __HILDON_NAME_PASSWORD_DIALOG_H__
 
-#include                                        <gtk/gtkdialog.h>
+#include                                        <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/hildon-note.c b/src/hildon-note.c
index 1d7df3f..e82217f 100644 (file)
--- a/src/hildon-note.c
+++ b/src/hildon-note.c
@@ -60,24 +60,21 @@
 #include                                        <config.h>
 #endif
 
-#include                                        "hildon-note.h"
-#include                                        <gtk/gtklabel.h>
-#include                                        <gtk/gtkimage.h>
-#include                                        <gtk/gtkhbox.h>
-#include                                        <gtk/gtkalignment.h>
-#include                                        <gtk/gtkvbox.h>
-#include                                        <gtk/gtkbutton.h>
+#include                                        <stdio.h>
+#include                                        <string.h>
 #include                                        <libintl.h>
+#include                                        <X11/X.h>
+#include                                        <X11/Xatom.h>
+#include                                        <gdk/gdkx.h>
+
+#include                                        "hildon-note.h"
 #include                                        "hildon-defines.h"
 #include                                        "hildon-sound.h"
 #include                                        "hildon-banner.h" 
 #include                                        "hildon-enum-types.h"
-#include                                        <stdio.h>
-#include                                        <string.h>
-#include                                        <X11/X.h>
-#include                                        <X11/Xatom.h>
 #include                                        "hildon-note-private.h"
 
+
 #define                                         CONFIRMATION_SOUND_PATH \
                                                 "/usr/share/sounds/ui-confirmation_note.wav"
 

diff --git a/src/hildon-note.h b/src/hildon-note.h
index b70a64d..98339c1 100644 (file)
--- a/src/hildon-note.h
+++ b/src/hildon-note.h
@@ -25,8 +25,7 @@
 #ifndef                                         __HILDON_NOTE_H__
 #define                                         __HILDON_NOTE_H__
 
-#include                                        <gtk/gtkdialog.h>
-#include                                        <gtk/gtkprogressbar.h>
+#include                                        <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/hildon-number-editor.c b/src/hildon-number-editor.c
index 161eccc..28d039e 100644 (file)
--- a/src/hildon-number-editor.c
+++ b/src/hildon-number-editor.c
@@ -43,19 +43,19 @@
 #include                                        <config.h>
 #endif
 
-#include                                        "hildon-number-editor.h"
-#include                                        <gdk/gdkkeysyms.h>
-#include                                        <gtk/gtk.h>
 #include                                        <string.h>
 #include                                        <stdio.h>
 #include                                        <stdlib.h>
+#include                                        <libintl.h>
+#include                                        <gdk/gdkkeysyms.h>
+
+#include                                        "hildon-number-editor.h"
 #include                                        "hildon-marshalers.h"
-#include                                        "hildon-private.h"
 #include                                        "hildon-defines.h"
 #include                                        "hildon-enum-types.h"
 #include                                        "hildon-banner.h"
-#include                                        <libintl.h>
 #include                                        "hildon-number-editor-private.h"
+#include                                        "hildon-private.h"
 
 #define                                         _(String) dgettext("hildon-libs", String)
 

diff --git a/src/hildon-number-editor.h b/src/hildon-number-editor.h
index ae4c5a6..3cf2648 100644 (file)
--- a/src/hildon-number-editor.h
+++ b/src/hildon-number-editor.h
@@ -25,7 +25,7 @@
 #ifndef                                         __HILDON_NUMBER_EDITOR_H__
 #define                                         __HILDON_NUMBER_EDITOR_H__
 
-#include                                        <gtk/gtkcontainer.h>
+#include                                        <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/hildon-pannable-area.c b/src/hildon-pannable-area.c
index f92a9dd..febc97c 100644 (file)
--- a/src/hildon-pannable-area.c
+++ b/src/hildon-pannable-area.c
@@ -32,9 +32,10 @@
  *
  */
 
-#include <gdk/gdkx.h>
-#include <cairo.h>
 #include <math.h>
+#include <cairo.h>
+#include <gdk/gdkx.h>
+
 #include "hildon-pannable-area.h"
 #include "hildon-marshalers.h"
 #include "hildon-enum-types.h"

diff --git a/src/hildon-pannable-area.h b/src/hildon-pannable-area.h
index 1f14154..437736a 100644 (file)
--- a/src/hildon-pannable-area.h
+++ b/src/hildon-pannable-area.h
@@ -24,7 +24,6 @@
 #ifndef _HILDON_PANNABLE_AREA
 #define _HILDON_PANNABLE_AREA
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS

diff --git a/src/hildon-picker-button.c b/src/hildon-picker-button.c
index cf17695..9fb25c4 100644 (file)
--- a/src/hildon-picker-button.c
+++ b/src/hildon-picker-button.c
@@ -31,6 +31,7 @@
  * and #HildonTimeButton.
  *
  */
+
 #include "hildon-picker-button.h"
 #include "hildon-picker-dialog.h"
 

diff --git a/src/hildon-picker-button.h b/src/hildon-picker-button.h
index 6ad37f4..678504e 100644 (file)
--- a/src/hildon-picker-button.h
+++ b/src/hildon-picker-button.h
@@ -18,6 +18,7 @@
 #define _HILDON_PICKER_BUTTON
 
 #include <glib-object.h>
+
 #include "hildon-button.h"
 #include "hildon-touch-selector.h"
 

diff --git a/src/hildon-picker-dialog.c b/src/hildon-picker-dialog.c
index 4c70eaf..1f0a41c 100644 (file)
--- a/src/hildon-picker-dialog.c
+++ b/src/hildon-picker-dialog.c
@@ -33,9 +33,7 @@
 
 #include <string.h>
 #include <stdlib.h>
-
 #include <libintl.h>
-#include <gtk/gtkmarshal.h>
 
 #include "hildon-touch-selector.h"
 #include "hildon-picker-dialog.h"

diff --git a/src/hildon-private.c b/src/hildon-private.c
index e91d9d9..98930d3 100644 (file)
--- a/src/hildon-private.c
+++ b/src/hildon-private.c
@@ -27,8 +27,6 @@
 #endif
 
 #include                                        "hildon-private.h"
-#include                                        <gtk/gtkwidget.h>
-#include                                        <gtk/gtkwindow.h>
 #include                                        "hildon-date-editor.h"
 #include                                        "hildon-time-editor.h"
 

diff --git a/src/hildon-program-private.h b/src/hildon-program-private.h
index b1bdc87..e6cf30a 100644 (file)
--- a/src/hildon-program-private.h
+++ b/src/hildon-program-private.h
@@ -25,7 +25,8 @@
 #ifndef                                         __HILDON_PROGRAM_PRIVATE_H__
 #define                                         __HILDON_PROGRAM_PRIVATE_H__
 
-#include                                        <glib-object.h>
+#include                                        <gdk/gdkx.h>
+
 #include                                        "hildon-window.h"
 #include                                        "hildon-stackable-window.h"
 

diff --git a/src/hildon-program.c b/src/hildon-program.c
index e5d5c8d..6f50388 100644 (file)
--- a/src/hildon-program.c
+++ b/src/hildon-program.c
@@ -79,12 +79,12 @@
 #include                                        <config.h>
 #endif
 
+#include                                        <X11/Xatom.h>
+
 #include                                        "hildon-program.h"
 #include                                        "hildon-program-private.h"
 #include                                        "hildon-window-private.h"
-#include                                        "hildon-stackable-window.h"
 #include                                        "hildon-stackable-window-private.h"
-#include                                        <X11/Xatom.h>
 
 static void
 hildon_program_init                             (HildonProgram *self);

diff --git a/src/hildon-program.h b/src/hildon-program.h
index 8785dd6..26c0fa6 100644 (file)
--- a/src/hildon-program.h
+++ b/src/hildon-program.h
@@ -26,6 +26,7 @@
 #define                                         __HILDON_PROGRAM_H__
 
 #include                                        <glib-object.h>
+
 #include                                        "hildon-window.h"
 #include                                        "hildon-stackable-window.h"
 

diff --git a/src/hildon-range-editor.c b/src/hildon-range-editor.c
index b49c83a..0915007 100644 (file)
--- a/src/hildon-range-editor.c
+++ b/src/hildon-range-editor.c
@@ -43,17 +43,14 @@
 #include                                        <config.h>
 #endif
 
-#include                                        "hildon-range-editor.h"
-#include                                        <gtk/gtkbox.h>
-#include                                        <gtk/gtklabel.h>
-#include                                        <gtk/gtksignal.h>
-#include                                        <gtk/gtkentry.h>
-#include                                        <gdk/gdkkeysyms.h>
-#include                                        <glib/gprintf.h>
+#include                                        <libintl.h>
 #include                                        <string.h>
 #include                                        <stdlib.h>
+#include                                        <glib/gprintf.h>
+#include                                        <gdk/gdkkeysyms.h>
+
+#include                                        "hildon-range-editor.h"
 #include                                        "hildon-banner.h"
-#include                                        <libintl.h>
 #include                                        "hildon-range-editor-private.h"
 
 #define                                         _(string) \

diff --git a/src/hildon-range-editor.h b/src/hildon-range-editor.h
index ef40f10..17ac7f2 100644 (file)
--- a/src/hildon-range-editor.h
+++ b/src/hildon-range-editor.h
@@ -25,7 +25,7 @@
 #ifndef                                         __HILDON_RANGE_EDITOR_H__
 #define                                         __HILDON_RANGE_EDITOR_H__
 
-#include                                        <gtk/gtkcontainer.h>
+#include                                        <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/hildon-seekbar.c b/src/hildon-seekbar.c
index b4520e8..2a90653 100644 (file)
--- a/src/hildon-seekbar.c
+++ b/src/hildon-seekbar.c
@@ -38,17 +38,12 @@
 #include                                        <config.h>
 #endif
 
-#include                                        "hildon-seekbar.h"
 #include                                        <libintl.h>
 #include                                        <stdio.h>
 #include                                        <math.h>
-#include                                        <gtk/gtklabel.h>
-#include                                        <gtk/gtkframe.h>
-#include                                        <gtk/gtkalignment.h>
-#include                                        <gtk/gtkadjustment.h>
-#include                                        <gtk/gtktoolbar.h>
-#include                                        <gtk/gtkversion.h>
 #include                                        <gdk/gdkkeysyms.h>
+
+#include                                        "hildon-seekbar.h"
 #include                                        "hildon-seekbar-private.h"
 
 static GtkScaleClass*                           parent_class = NULL;

diff --git a/src/hildon-seekbar.h b/src/hildon-seekbar.h
index 649d0f2..16582d8 100644 (file)
--- a/src/hildon-seekbar.h
+++ b/src/hildon-seekbar.h
@@ -25,7 +25,7 @@
 #ifndef                                         __HILDON_SEEKBAR_H__
 #define                                         __HILDON_SEEKBAR_H__
 
-#include                                        <gtk/gtkscale.h>
+#include                                        <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/hildon-set-password-dialog.c b/src/hildon-set-password-dialog.c
index cc3c185..63cc9a0 100644 (file)
--- a/src/hildon-set-password-dialog.c
+++ b/src/hildon-set-password-dialog.c
@@ -43,20 +43,20 @@
 #include                                        <config.h>
 #endif
 
-#include                                        "hildon-set-password-dialog.h"
-#include                                        <gdk/gdkkeysyms.h>
-#include                                        <gtk/gtk.h>
-#include                                        <glib.h>
 #include                                        <errno.h>
 #include                                        <string.h>
 #include                                        <strings.h>
 #include                                        <unistd.h>
 #include                                        <stdio.h>
+#include                                        <libintl.h>
+#include                                        <glib.h>
+#include                                        <gdk/gdkkeysyms.h>
+
+#include                                        "hildon-set-password-dialog.h"
 #include                                        "hildon-caption.h"
 #include                                        "hildon-note.h"
 #include                                        "hildon-defines.h"
 #include                                        "hildon-banner.h"
-#include                                        <libintl.h>
 #include                                        "hildon-set-password-dialog-private.h"
 
 #define                                         HILDON_SET_PASSWORD_DIALOG_TITLE "ecdg_ti_set_password"

diff --git a/src/hildon-set-password-dialog.h b/src/hildon-set-password-dialog.h
index 2c24b3e..f5aa497 100644 (file)
--- a/src/hildon-set-password-dialog.h
+++ b/src/hildon-set-password-dialog.h
@@ -25,7 +25,7 @@
 #ifndef                                         __HILDON_SET_PASSWORD_DIALOG_H__
 #define                                         __HILDON_SET_PASSWORD_DIALOG_H__
 
-#include                                        <gtk/gtkdialog.h>
+#include                                        <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/hildon-sort-dialog.c b/src/hildon-sort-dialog.c
index ce8c1f4..b841eab 100644 (file)
--- a/src/hildon-sort-dialog.c
+++ b/src/hildon-sort-dialog.c
@@ -87,11 +87,10 @@
 #include                                        <config.h>
 #endif
 
-#include                                        "hildon-sort-dialog.h"
 #include                                        <stdio.h>
 #include                                        <libintl.h>
-#include                                        <gtk/gtkcombobox.h>
-#include                                        <gtk/gtkbox.h>
+
+#include                                        "hildon-sort-dialog.h"
 #include                                        "hildon-caption.h"
 #include                                        "hildon-sort-dialog-private.h"
 

diff --git a/src/hildon-sort-dialog.h b/src/hildon-sort-dialog.h
index f326051..0546db0 100644 (file)
--- a/src/hildon-sort-dialog.h
+++ b/src/hildon-sort-dialog.h
@@ -25,7 +25,7 @@
 #ifndef                                         __HILDON_SORT_DIALOG_H__
 #define                                         __HILDON_SORT_DIALOG_H__
 
-#include                                        <gtk/gtkdialog.h>
+#include                                        <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/hildon-sound.c b/src/hildon-sound.c
index a86a19d..86de034 100644 (file)
--- a/src/hildon-sound.c
+++ b/src/hildon-sound.c
@@ -28,10 +28,11 @@
  * 
  */
 
-#include "hildon-sound.h"
+#include <unistd.h>
 #include <gconf/gconf-client.h>
 #include <canberra.h>
-#include <unistd.h>
+
+#include "hildon-sound.h"
 
 #define ALARM_GCONF_PATH "/apps/osso/sound/system_alert_volume"
 

diff --git a/src/hildon-stackable-window.c b/src/hildon-stackable-window.c
index 7a83779..f96132c 100644 (file)
--- a/src/hildon-stackable-window.c
+++ b/src/hildon-stackable-window.c
@@ -67,6 +67,7 @@
 
 #include                                        <X11/X.h>
 #include                                        <X11/Xatom.h>
+
 #include                                        "hildon-stackable-window.h"
 #include                                        "hildon-stackable-window-private.h"
 #include                                        "hildon-program.h"

diff --git a/src/hildon-time-editor.c b/src/hildon-time-editor.c
index fe0297e..8a03c04 100644 (file)
--- a/src/hildon-time-editor.c
+++ b/src/hildon-time-editor.c
@@ -54,19 +54,14 @@
 #include                                        <config.h>
 #endif
 
-#include                                        "hildon-time-editor.h"
-#include                                        <gtk/gtkhbox.h>
-#include                                        <gtk/gtkentry.h>
-#include                                        <gtk/gtkbutton.h>
-#include                                        <gtk/gtklabel.h>
-#include                                        <gtk/gtkframe.h>
-#include                                        <gdk/gdkkeysyms.h>
-#include                                        <gtk/gtkenums.h>
 #include                                        <string.h>
 #include                                        <time.h>
 #include                                        <stdlib.h>
 #include                                        <langinfo.h>
 #include                                        <libintl.h>
+#include                                        <gdk/gdkkeysyms.h>
+
+#include                                        "hildon-time-editor.h"
 #include                                        "hildon-defines.h"
 #include                                        "hildon-time-picker.h"
 #include                                        "hildon-banner.h"

diff --git a/src/hildon-time-picker.c b/src/hildon-time-picker.c
index 3c9ea13..4ba4d84 100644 (file)
--- a/src/hildon-time-picker.c
+++ b/src/hildon-time-picker.c
@@ -64,17 +64,17 @@
 #include                                        <config.h>
 #endif
 
-#include                                        "hildon-time-picker.h"
-#include                                        "hildon-defines.h"
-#include                                        <gtk/gtk.h>
-#include                                        <gdk/gdkkeysyms.h>
-#include                                        <gdk/gdk.h>
 #include                                        <time.h>
 #include                                        <stdio.h>
 #include                                        <stdlib.h>
 #include                                        <string.h>
 #include                                        <langinfo.h>
 #include                                        <libintl.h>
+#include                                        <gtk/gtk.h>
+#include                                        <gdk/gdkkeysyms.h>
+
+#include                                        "hildon-time-picker.h"
+#include                                        "hildon-defines.h"
 #include                                        "hildon-time-picker-private.h"
 #include                                        "hildon-time-editor.h"
 

diff --git a/src/hildon-time-picker.h b/src/hildon-time-picker.h
index 7d88fc0..9add00b 100644 (file)
--- a/src/hildon-time-picker.h
+++ b/src/hildon-time-picker.h
@@ -25,7 +25,7 @@
 #ifndef                                         __HILDON_TIME_PICKER_H__
 #define                                         __HILDON_TIME_PICKER_H__
 
-#include                                        <gtk/gtkdialog.h>
+#include                                        <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/hildon-time-selector.c b/src/hildon-time-selector.c
index b638c21..2f48e57 100644 (file)
--- a/src/hildon-time-selector.c
+++ b/src/hildon-time-selector.c
@@ -27,9 +27,6 @@
  *
  */
 
-
-#include "hildon-time-selector.h"
-
 #define _GNU_SOURCE     /* needed for GNU nl_langinfo_l */
 #define __USE_GNU       /* needed for locale */
 
@@ -43,9 +40,10 @@
 #include <time.h>
 #include <langinfo.h>
 #include <locale.h>
-
 #include <gconf/gconf-client.h>
 
+#include "hildon-time-selector.h"
+
 #define HILDON_TIME_SELECTOR_GET_PRIVATE(obj)                           \
   (G_TYPE_INSTANCE_GET_PRIVATE ((obj), HILDON_TYPE_TIME_SELECTOR, HildonTimeSelectorPrivate))
 

diff --git a/src/hildon-touch-selector-entry.h b/src/hildon-touch-selector-entry.h
index 5a7a140..b7d3a67 100644 (file)
--- a/src/hildon-touch-selector-entry.h
+++ b/src/hildon-touch-selector-entry.h
@@ -21,7 +21,6 @@
 #ifndef _HILDON_TOUCH_SELECTOR_ENTRY
 #define _HILDON_TOUCH_SELECTOR_ENTRY
 
-#include <glib-object.h>
 #include "hildon-touch-selector.h"
 
 G_BEGIN_DECLS

diff --git a/src/hildon-touch-selector.c b/src/hildon-touch-selector.c
index 2966211..a978467 100644 (file)
--- a/src/hildon-touch-selector.c
+++ b/src/hildon-touch-selector.c
@@ -53,6 +53,7 @@
 
 #include <string.h>
 #include <stdlib.h>
+
 #include "hildon-pannable-area.h"
 #include "hildon-touch-selector.h"
 

diff --git a/src/hildon-volumebar-private.h b/src/hildon-volumebar-private.h
index 4061912..67830d6 100644 (file)
--- a/src/hildon-volumebar-private.h
+++ b/src/hildon-volumebar-private.h
@@ -26,6 +26,7 @@
 #define                                         __HILDON_VOLUMEBAR_PRIVATE__
 
 #include                                        <gtk/gtk.h>
+
 #include                                        "hildon-volumebar-range.h"
 
 G_BEGIN_DECLS

diff --git a/src/hildon-volumebar-range.c b/src/hildon-volumebar-range.c
index 0f8be71..9f9fa74 100644 (file)
--- a/src/hildon-volumebar-range.c
+++ b/src/hildon-volumebar-range.c
@@ -35,10 +35,10 @@
  * 
  */
 
-#include                                        "hildon-volumebar-range.h"
-#include                                        <gtk/gtkrange.h>
 #include                                        <gdk/gdkkeysyms.h>
 
+#include                                        "hildon-volumebar-range.h"
+
 #define                                         VOLUMEBAR_RANGE_INITIAL_VALUE 50.0
 
 #define                                         VOLUMEBAR_RANGE_MINIMUM_VALUE 0.0

diff --git a/src/hildon-volumebar-range.h b/src/hildon-volumebar-range.h
index dc5dda5..ab7add5 100644 (file)
--- a/src/hildon-volumebar-range.h
+++ b/src/hildon-volumebar-range.h
@@ -25,7 +25,7 @@
 #ifndef                                         __HILDON_VOLUMEBAR_RANGE_H__
 #define                                         __HILDON_VOLUMEBAR_RANGE_H__
 
-#include                                        <gtk/gtkscale.h>
+#include                                        <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/hildon-volumebar.c b/src/hildon-volumebar.c
index 078c6fc..5ce5fba 100644 (file)
--- a/src/hildon-volumebar.c
+++ b/src/hildon-volumebar.c
@@ -36,9 +36,9 @@
 #include                                        <config.h>
 #endif
 
-#include                                        "hildon-volumebar.h"
-#include                                        <gtk/gtk.h>
 #include                                        <gdk/gdkkeysyms.h>
+
+#include                                        "hildon-volumebar.h"
 #include                                        "hildon-volumebar-range.h"
 #include                                        "hildon-volumebar-private.h"
 

diff --git a/src/hildon-volumebar.h b/src/hildon-volumebar.h
index 35fe83e..70454b7 100644 (file)
--- a/src/hildon-volumebar.h
+++ b/src/hildon-volumebar.h
@@ -25,8 +25,8 @@
 #ifndef                                         __HILDON_VOLUMEBAR_H__
 #define                                         __HILDON_VOLUMEBAR_H__
 
-#include                                        <gtk/gtkcontainer.h>
-#include                                        <gtk/gtkadjustment.h>
+#include                                        <gtk/gtk.h>
+
 #include                                        "hildon-helper.h"
 
 G_BEGIN_DECLS

diff --git a/src/hildon-vvolumebar.c b/src/hildon-vvolumebar.c
index c271c2d..aca165a 100644 (file)
--- a/src/hildon-vvolumebar.c
+++ b/src/hildon-vvolumebar.c
@@ -48,7 +48,6 @@
 #endif
 
 #include                                        "hildon-vvolumebar.h"
-#include                                        <gtk/gtk.h>
 #include                                        "hildon-volumebar-range.h"
 #include                                        "hildon-volumebar-private.h"
 

diff --git a/src/hildon-weekday-picker.c b/src/hildon-weekday-picker.c
index e67ab5b..4c6860a 100644 (file)
--- a/src/hildon-weekday-picker.c
+++ b/src/hildon-weekday-picker.c
@@ -62,7 +62,6 @@
 #include                                        <config.h>
 #endif
 
-#include                                        "hildon-weekday-picker.h"
 #include                                        <stdio.h>
 #include                                        <stdarg.h>
 #include                                        <sys/types.h>
@@ -70,11 +69,9 @@
 #include                                        <libintl.h>
 #include                                        <langinfo.h>
 #include                                        <time.h>
-#include                                        <gtk/gtksignal.h>
 #include                                        <gdk/gdkkeysyms.h>
-#include                                        <gtk/gtktogglebutton.h>
-#include                                        <gtk/gtksizegroup.h>
-#include                                        <gtk/gtkwindow.h>
+
+#include                                        "hildon-weekday-picker.h"
 #include                                        "hildon-private.h"
 #include                                        "hildon-weekday-picker-private.h"
 

diff --git a/src/hildon-weekday-picker.h b/src/hildon-weekday-picker.h
index 3d0252a..d0a895c 100644 (file)
--- a/src/hildon-weekday-picker.h
+++ b/src/hildon-weekday-picker.h
@@ -25,7 +25,7 @@
 #ifndef                                         __HILDON_WEEKDAY_PICKER_H__
 #define                                         __HILDON_WEEKDAY_PICKER_H__
 
-#include                                        <gtk/gtkcontainer.h>
+#include                                        <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/hildon-window-private.h b/src/hildon-window-private.h
index 5dc7727..281c8b7 100644 (file)
--- a/src/hildon-window-private.h
+++ b/src/hildon-window-private.h
@@ -25,6 +25,10 @@
 #ifndef                                         __HILDON_WINDOW_PRIVATE_H__
 #define                                         __HILDON_WINDOW_PRIVATE_H__
 
+#include                                        "hildon-program.h"
+
+#include                                        <X11/Xlib.h>
+
 G_BEGIN_DECLS
 
 typedef struct                                  _HildonWindowPrivate HildonWindowPrivate;

diff --git a/src/hildon-window.c b/src/hildon-window.c
index 43d68c5..657201d 100644 (file)
--- a/src/hildon-window.c
+++ b/src/hildon-window.c
@@ -73,35 +73,21 @@
  *
  */
 
-#include                                        "hildon-window.h"
 #include                                        <memory.h>
 #include                                        <string.h>
 #include                                        <strings.h>
 #include                                        <stdio.h>
-#include                                        "hildon-program.h"
-#include                                        "hildon-window-private.h"
-#include                                        "hildon-find-toolbar.h"
-
-#include                                        <gtk/gtkmenu.h>
-#include                                        <gtk/gtkimcontext.h>
-#include                                        <gtk/gtkmenuitem.h>
-#include                                        <gtk/gtkcheckmenuitem.h>
-#include                                        <gtk/gtkmenushell.h>
-#include                                        <gtk/gtkwindow.h>
-#include                                        <gtk/gtkwidget.h>
-#include                                        <gtk/gtkvbox.h>
-#include                                        <gtk/gtklabel.h>
-#include                                        <gtk/gtkentry.h>
-#include                                        <gtk/gtktextview.h>
-#include                                        <gtk/gtkscrolledwindow.h>
-#include                                        <gtk/gtkmain.h>
-#include                                        <gdk/gdkkeysyms.h>
-#include                                        <gdk/gdk.h>
-#include                                        <gtk/gtkprivate.h>
+#include                                        <libintl.h>
 #include                                        <X11/X.h>
-#include                                        <X11/Xlib.h>
 #include                                        <X11/Xatom.h>
-#include                                        <libintl.h>
+#include                                        <gdk/gdkkeysyms.h>
+#include                                        <gdk/gdkx.h>
+#include                                        <gtk/gtkprivate.h>
+
+#include                                        "hildon-window.h"
+#include                                        "hildon-window-private.h"
+#include                                        "hildon-find-toolbar.h"
+#include                                        "hildon-defines.h"
 
 #define                                         _(String) gettext(String)
 

diff --git a/src/hildon-window.h b/src/hildon-window.h
index 3706187..c4a82b6 100644 (file)
--- a/src/hildon-window.h
+++ b/src/hildon-window.h
@@ -25,14 +25,7 @@
 #ifndef                                         __HILDON_WINDOW_H__
 #define                                         __HILDON_WINDOW_H__
 
-#include                                        <glib.h>
-#include                                        <glib-object.h>
-#include                                        <gtk/gtkwindow.h>
-#include                                        <gtk/gtkmenu.h>
-#include                                        <gtk/gtktoolbar.h>
-#include                                        <gdk/gdkx.h>
-
-#include                                        "hildon-defines.h"
+#include                                        <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/hildon-wizard-dialog.c b/src/hildon-wizard-dialog.c
index 510cfe5..3f3a383 100644 (file)
--- a/src/hildon-wizard-dialog.c
+++ b/src/hildon-wizard-dialog.c
@@ -46,16 +46,10 @@
 #include                                        <config.h>
 #endif
 
+#include                                        <libintl.h>
+
 #include                                        "hildon-wizard-dialog.h"
-#include                                        <gtk/gtkdialog.h>
-#include                                        <gtk/gtknotebook.h>
-#include                                        <gtk/gtkimage.h>
-#include                                        <gtk/gtkbox.h>
-#include                                        <gtk/gtkhbox.h>
-#include                                        <gtk/gtkvbox.h>
-#include                                        <gtk/gtkbutton.h>
 #include                                        "hildon-defines.h"
-#include                                        <libintl.h>
 #include                                        "hildon-wizard-dialog-private.h"
 
 #define                                         _(String) dgettext("hildon-libs", String)

diff --git a/src/hildon-wizard-dialog.h b/src/hildon-wizard-dialog.h
index 58e6f2d..19d961d 100644 (file)
--- a/src/hildon-wizard-dialog.h
+++ b/src/hildon-wizard-dialog.h
@@ -26,10 +26,7 @@
 #ifndef                                         __HILDON_WIZARD_DIALOG_H__
 #define                                         __HILDON_WIZARD_DIALOG_H__
 
-#include                                        <gtk/gtkwidget.h>
-#include                                        <gtk/gtkwindow.h>
-#include                                        <gtk/gtknotebook.h>
-#include                                        <gtk/gtkdialog.h>
+#include                                        <gtk/gtk.h>
 
 G_BEGIN_DECLS