9 files changed, 44 insertions, 43 deletions
diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c
index 26042ee25b..e6ccf0a64d 100644
--- a/addressbook/contact-editor/e-contact-editor.c
+++ b/addressbook/contact-editor/e-contact-editor.c
@@ -21,16 +21,16 @@
  */
 
 #include <config.h>
+
 #include <time.h>
 #include <gtk/gtkcheckbutton.h>
 #include <gtk/gtkcheckmenuitem.h>
 #include <gtk/gtkcombo.h>
 #include <gtk/gtktext.h>
-#include <gtk/gtktogglebutton.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-dateedit.h>
 #include <libgnomeui/gnome-popup-menu.h>
+#include <libgnomeui/gnome-dateedit.h>
+#include <libgnome/gnome-i18n.h>
+
 #include <bonobo/bonobo-ui-container.h>
 #include <bonobo/bonobo-ui-util.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
@@ -38,13 +38,14 @@
 #include <gal/widgets/e-categories.h>
 #include <gal/widgets/e-gui-utils.h>
 #include <gal/widgets/e-unicode.h>
-#include <addressbook/printing/e-contact-print.h>
-#include <addressbook/printing/e-contact-print-envelope.h>
-#include <e-util/e-gui-utils.h>
+
+#include "addressbook/printing/e-contact-print.h"
+#include "addressbook/printing/e-contact-print-envelope.h"
+#include "e-util/e-gui-utils.h"
 
 #include "e-contact-editor.h"
-#include "e-contact-editor-fullname.h"
 #include "e-contact-editor-address.h"
+#include "e-contact-editor-fullname.h"
 #include "e-contact-save-as.h"
 
 /* Signal IDs */
diff --git a/addressbook/contact-editor/e-contact-editor.h b/addressbook/contact-editor/e-contact-editor.h
index a2f166741f..bc54dd02b0 100644
--- a/addressbook/contact-editor/e-contact-editor.h
+++ b/addressbook/contact-editor/e-contact-editor.h
@@ -25,8 +25,9 @@
 #include <libgnomeui/gnome-app-helper.h>
 #include <bonobo/bonobo-ui-component.h>
 #include <glade/glade.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-card-simple.h>
+
+#include "addressbook/backend/ebook/e-card.h"
+#include "addressbook/backend/ebook/e-card-simple.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/addressbook/gui/component/addressbook-storage.c b/addressbook/gui/component/addressbook-storage.c
index 640217173d..5fcebee68d 100644
--- a/addressbook/gui/component/addressbook-storage.c
+++ b/addressbook/gui/component/addressbook-storage.c
@@ -65,6 +65,7 @@
 
 #include <gal/util/e-util.h>
 #include <gal/util/e-xml-utils.h>
+#include <libgnome/gnome-i18n.h>
 
 #include "evolution-shell-component.h"
 #include "evolution-storage.h"
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 26042ee25b..e6ccf0a64d 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -21,16 +21,16 @@
  */
 
 #include <config.h>
+
 #include <time.h>
 #include <gtk/gtkcheckbutton.h>
 #include <gtk/gtkcheckmenuitem.h>
 #include <gtk/gtkcombo.h>
 #include <gtk/gtktext.h>
-#include <gtk/gtktogglebutton.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-dateedit.h>
 #include <libgnomeui/gnome-popup-menu.h>
+#include <libgnomeui/gnome-dateedit.h>
+#include <libgnome/gnome-i18n.h>
+
 #include <bonobo/bonobo-ui-container.h>
 #include <bonobo/bonobo-ui-util.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
@@ -38,13 +38,14 @@
 #include <gal/widgets/e-categories.h>
 #include <gal/widgets/e-gui-utils.h>
 #include <gal/widgets/e-unicode.h>
-#include <addressbook/printing/e-contact-print.h>
-#include <addressbook/printing/e-contact-print-envelope.h>
-#include <e-util/e-gui-utils.h>
+
+#include "addressbook/printing/e-contact-print.h"
+#include "addressbook/printing/e-contact-print-envelope.h"
+#include "e-util/e-gui-utils.h"
 
 #include "e-contact-editor.h"
-#include "e-contact-editor-fullname.h"
 #include "e-contact-editor-address.h"
+#include "e-contact-editor-fullname.h"
 #include "e-contact-save-as.h"
 
 /* Signal IDs */
diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h
index a2f166741f..bc54dd02b0 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.h
+++ b/addressbook/gui/contact-editor/e-contact-editor.h
@@ -25,8 +25,9 @@
 #include <libgnomeui/gnome-app-helper.h>
 #include <bonobo/bonobo-ui-component.h>
 #include <glade/glade.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-card-simple.h>
+
+#include "addressbook/backend/ebook/e-card.h"
+#include "addressbook/backend/ebook/e-card-simple.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 46210ec07c..685ee0b79d 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -22,42 +22,35 @@
 
 #include <config.h>
 
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-paper.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
-#include <libgnome/gnome-paper.h>
 #include <gal/e-table/e-table-scrolled.h>
 #include <gal/e-table/e-table-model.h>
 #include <gal/widgets/e-scroll-frame.h>
 #include <gal/widgets/e-popup-menu.h>
-#include "widgets/menus/gal-view-menus.h"
-
 #include <gal/menus/gal-view-factory-etable.h>
 #include <gal/menus/gal-view-etable.h>
 
+#include <libgnomeprint/gnome-print.h>
+#include <libgnomeprint/gnome-print-dialog.h>
+#include <libgnomeprint/gnome-print-master.h>
+#include <libgnomeprint/gnome-print-master-preview.h>
+
+#include "widgets/menus/gal-view-menus.h"
+
+#include "addressbook/printing/e-contact-print.h"
+#include "addressbook/printing/e-contact-print-envelope.h"
+
 #include "gal-view-factory-minicard.h"
 #include "gal-view-minicard.h"
 
 #include "e-addressbook-view.h"
 #include "e-addressbook-model.h"
-
 #include "e-minicard-view-widget.h"
-
-#include "e-contact-editor.h"
 #include "e-contact-save-as.h"
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
-#include "e-card-simple.h"
-#include "e-card.h"
-#include "e-book.h"
 
-#include "glade/glade-xml.h"
-
-#include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-print-dialog.h>
-#include <libgnomeprint/gnome-print-master.h>
-#include <libgnomeprint/gnome-print-master-preview.h>
+#include "e-contact-editor.h"
 
 static void e_addressbook_view_init		(EAddressbookView		 *card);
 static void e_addressbook_view_class_init	(EAddressbookViewClass	 *klass);
diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
index e481efec65..0c282c013a 100644
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ b/addressbook/gui/widgets/e-addressbook-view.h
@@ -21,7 +21,7 @@
 #ifndef __E_ADDRESSBOOK_VIEW_H__
 #define __E_ADDRESSBOOK_VIEW_H__
 
-#include <gtk/gtkobject.h>
+#include <gtk/gtktable.h>
 #include <bonobo/bonobo-ui-component.h>
 #include "addressbook/backend/ebook/e-book.h"
 
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 7ad33894e4..639e41c2c7 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -22,10 +22,9 @@
 
 #include <config.h>
 
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
 #include <gal/widgets/e-canvas.h>
+#include <libgnome/gnome-i18n.h>
+
 #include "e-minicard-view.h"
 #include "e-minicard.h"
 #include "e-contact-editor.h"
diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c
index 0e54c57164..2c31adb69b 100644
--- a/addressbook/gui/widgets/test-reflow.c
+++ b/addressbook/gui/widgets/test-reflow.c
@@ -47,6 +47,10 @@
 
 #include "config.h"
 
+#include <gtk/gtkmain.h>
+#include <gtk/gtkvbox.h>
+#include <libgnomeui/gnome-canvas-rect-ellipse.h>
+#include <libgnomeui/gnome-init.h>
 #include <gal/widgets/e-canvas.h>
 #include <gal/widgets/e-reflow.h>
 #include <gal/widgets/e-scroll-frame.h>