6 files changed, 7 insertions, 5 deletions
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index dd08665fa2..7932d40bac 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -26,7 +26,7 @@
 #include "e-canvas-vbox.h"
 #include "e-canvas-utils.h"
 #include "e-canvas.h"
-#include "util/e-util.h"
+#include "gal/util/e-util.h"
 
 static void e_canvas_vbox_init		(ECanvasVbox		 *CanvasVbox);
 static void e_canvas_vbox_class_init	(ECanvasVboxClass	 *klass);
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index 83f276e1f6..78961ae530 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -22,6 +22,7 @@
 
 #include <gnome.h>
 #include "e-canvas.h"
+
 static void e_canvas_init           (ECanvas         *card);
 static void e_canvas_destroy        (GtkObject        *object);
 static void e_canvas_class_init	    (ECanvasClass    *klass);
diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c
index cde82d9f78..14ab11c565 100644
--- a/widgets/misc/e-gui-utils.c
+++ b/widgets/misc/e-gui-utils.c
@@ -13,9 +13,9 @@
 #include <libgnomeui/gnome-messagebox.h>
 #include <libgnomeui/gnome-stock.h>
 #include <gnome.h>
-#include "e-gui-utils.h"
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk-pixbuf/gnome-canvas-pixbuf.h>
+#include "e-gui-utils.h"
 
 void
 e_notice (GtkWindow *window, const char *type, const char *format, ...)
diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c
index 8c1f58908b..f029e88573 100644
--- a/widgets/misc/e-printable.c
+++ b/widgets/misc/e-printable.c
@@ -9,7 +9,7 @@
  */
 #include <config.h>
 #include <gtk/gtksignal.h>
-#include "util/e-util.h"
+#include "gal/util/e-util.h"
 #include "e-printable.h"
 
 #define EP_CLASS(e) ((EPrintableClass *)((GtkObject *)e)->klass)
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index 622e3fb9f9..bbfd37fa10 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -24,10 +24,10 @@
 #include <gnome.h>
 #include <math.h>
 #include "e-reflow.h"
-#include "e-text/e-text.h"
+#include "gal/e-text/e-text.h"
 #include "e-canvas-utils.h"
 #include "e-canvas.h"
-#include <util/e-util.h>
+#include "gal/util/e-util.h"
 
 static void e_reflow_init		(EReflow		 *reflow);
 static void e_reflow_class_init	(EReflowClass	 *klass);
diff --git a/widgets/misc/test-color.c b/widgets/misc/test-color.c
index 0b01682d8f..ed622201c8 100644
--- a/widgets/misc/test-color.c
+++ b/widgets/misc/test-color.c
@@ -3,6 +3,7 @@
 #include "pixmaps/font.xpm"
 #include "widget-color-combo.h"
 #include "color-palette.h"
+
 /* To compile (from src/widgets):
 
 gcc -I..  -I../.. -L. -Wall -o tester tester.c ../color.c `gnome-config --cflags --libs gnome gnomeui` -lwidgets