Here goes my additional simple include fixes.

svn path=/trunk/; revision=9191

7 files changed, 46 insertions, 48 deletions

diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 0c8a9ea2e1..d31d252dfd 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -43,7 +43,7 @@
 #include <libgnomeui/gnome-dialog-util.h>
 #include <libgnomeui/gnome-messagebox.h>
 #include <libgnomeui/gnome-stock.h>
-#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-util.h>
 #include <libgnome/gnome-i18n.h>
 #include <bonobo/bonobo-ui-util.h>
 #include <cal-util/timeutil.h>
diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c
index 359a31239e..9f4f4b2217 100644
--- a/calendar/gui/calendar-model.c
+++ b/calendar/gui/calendar-model.c
@@ -22,7 +22,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
-
 #include <config.h>
 
 #include <math.h>
@@ -37,19 +36,16 @@
 #undef __USE_XOPEN
 
 #include <ctype.h>
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
+
 #include <libgnomeui/gnome-messagebox.h>
 #include <libgnomeui/gnome-stock.h>
+#include <libgnome/gnome-i18n.h>
 #include <gal/widgets/e-unicode.h>
-#include <e-util/e-time-utils.h>
-#include <cal-util/timeutil.h>
-#include "calendar-model.h"
-#include "calendar-commands.h"
-
 
-
+#include "e-util/e-time-utils.h"
+#include "cal-util/timeutil.h"
+#include "calendar-commands.h"
+#include "calendar-model.h"
 
 /* Private part of the ECalendarModel structure */
 struct _CalendarModelPrivate {
diff --git a/calendar/gui/dialogs/save-comp.h b/calendar/gui/dialogs/save-comp.h
index 2fb8e2c2a8..8b1db3c503 100644
--- a/calendar/gui/dialogs/save-comp.h
+++ b/calendar/gui/dialogs/save-comp.h
@@ -23,6 +23,8 @@
 #ifndef SAVE_COMP_H
 #define SAVE_COMP_H
 
+#include <gtk/gtkwindow.h>
+
 gint save_component_dialog (GtkWindow *parent);
 
 #endif
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index b3831a09ee..828eff3419 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -27,33 +27,33 @@
  */
 
 #include <config.h>
+
+#include "e-day-view.h"
+
 #include <math.h>
 #include <time.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtkdnd.h>
 #include <gtk/gtkmain.h>
-#include <gtk/gtkselection.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtkvscrollbar.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
+#include <gtk/gtkwindow.h>
+#include <gal/e-text/e-text.h>
+#include <gal/widgets/e-popup-menu.h>
+#include <gal/widgets/e-canvas-utils.h>
 #include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <cal-util/timeutil.h>
+#include <libgnome/gnome-i18n.h>
+
+#include "cal-util/timeutil.h"
 #include "dialogs/delete-comp.h"
 #include "comp-util.h"
-#include "e-day-view.h"
+#include "calendar-commands.h"
+#include "goto.h"
+#include "e-meeting-edit.h"
 #include "e-day-view-time-item.h"
 #include "e-day-view-top-item.h"
 #include "e-day-view-main-item.h"
-#include "calendar-commands.h"
-#include <gal/widgets/e-canvas.h>
-#include <gal/e-text/e-text.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-popup-menu.h>
-#include "e-meeting-edit.h"
-#include "goto.h"
 
 /* Images */
 #include "art/bell.xpm"
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index 8adfdd96ff..da17673518 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -30,9 +30,12 @@
  */
 
 #include <config.h>
-#include <gal/e-text/e-text.h>
+
 #include "e-week-view-event-item.h"
 
+#include <gtk/gtksignal.h>
+#include <gal/e-text/e-text.h>
+
 static void e_week_view_event_item_class_init	(EWeekViewEventItemClass *class);
 static void e_week_view_event_item_init		(EWeekViewEventItem *wveitem);
 
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 3d9fa65a97..90a7b2c695 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -28,35 +28,34 @@
  */
 
 #include <config.h>
+
+#include "e-week-view.h"
+
 #include <math.h>
-#include <glib.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtkvscrollbar.h>
+#include <gtk/gtkwindow.h>
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk-pixbuf/gnome-canvas-pixbuf.h>
+#include <gal/e-text/e-text.h>
+#include <gal/widgets/e-popup-menu.h>
+#include <gal/widgets/e-canvas-utils.h>
 #include "dialogs/delete-comp.h"
-#include "calendar-commands.h"
 #include "comp-util.h"
-#include "e-week-view.h"
+#include "cal-util/timeutil.h"
+#include "calendar-commands.h"
+#include "goto.h"
+#include "e-meeting-edit.h"
 #include "e-week-view-event-item.h"
 #include "e-week-view-main-item.h"
 #include "e-week-view-titles-item.h"
-#include <cal-util/timeutil.h>
-#include <gal/widgets/e-canvas.h>
-#include <gal/e-text/e-text.h>
-#include <gal/widgets/e-popup-menu.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include "e-meeting-edit.h"
-#include "goto.h"
 
 /* Images */
 #include "art/bell.xpm"
 #include "art/recur.xpm"
-
 #include "art/jump.xpm"
 
 #define E_WEEK_VIEW_SMALL_FONT	\
diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c
index 14eb6ea53a..314835c2c5 100644
--- a/calendar/gui/event-editor.c
+++ b/calendar/gui/event-editor.c
@@ -25,27 +25,25 @@
  */
 
 #include <config.h>
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-propertybox.h>
+#include <string.h>
 #include <glade/glade.h>
-#include <e-util/e-dialog-widgets.h>
-#include <widgets/misc/e-dateedit.h>
 #include <gal/widgets/e-unicode.h>
 #include <gal/widgets/e-categories.h>
-#include <cal-util/timeutil.h>
+#include <libgnomeui/gnome-propertybox.h>
+#include <libgnome/gnome-i18n.h>
+
+#include "calendar-config.h"
+#include "cal-util/timeutil.h"
 #include "dialogs/delete-comp.h"
 #include "dialogs/save-comp.h"
-#include "calendar-config.h"
-#include "event-editor.h"
 #include "e-meeting-edit.h"
-#include "calendar-config.h"
+#include "e-util/e-dialog-widgets.h"
+#include "event-editor.h"
 #include "tag-calendar.h"
 #include "weekday-picker.h"
+#include "widgets/misc/e-dateedit.h"
 #include "widget-util.h"
 
-
 enum {BEFORE, AFTER};
 enum {MINUTES, HOURS, DAYS};