Added widgets in INCLUDES.

2005-06-23  Kaushal Kumar  <kakumar@novell.com>

        * e-util/Makefile.am, widgets/e-timezone-dialog/Makefile.am,
        addressbook/gui/search/Makefile.am,
        plugins/groupwise-features/Makefile.am: Added widgets in INCLUDES.

        Updated the include paths to use misc instead of widgets/misc.

svn path=/trunk/; revision=29574

127 files changed, 208 insertions, 178 deletions

diff --git a/ChangeLog b/ChangeLog
index ce89310ad2..6b242408cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-23  Kaushal Kumar  <kakumar@novell.com>
+
+	* e-util/Makefile.am, widgets/e-timezone-dialog/Makefile.am,
+	addressbook/gui/search/Makefile.am, 
+	plugins/groupwise-features/Makefile.am: Added widgets in INCLUDES.
+
+	Updated the include paths to use misc instead of widgets/misc.
+ 
 2005-06-23  Not Zed  <NotZed@Ximian.com>
 
 	* configure.in: fix the --enable-profiler not to disable otherwise
diff --git a/a11y/e-table/gal-a11y-e-table-item.c b/a11y/e-table/gal-a11y-e-table-item.c
index a5ed0c331e..b4882d71bb 100644
--- a/a11y/e-table/gal-a11y-e-table-item.c
+++ b/a11y/e-table/gal-a11y-e-table-item.c
@@ -18,8 +18,8 @@
 #include "table/e-table-subset.h"
 #include "table/e-table.h"
 #include "table/e-tree.h"
-#include "widgets/misc/e-canvas.h"
-#include "widgets/misc/e-selection-model.h"
+#include "misc/e-canvas.h"
+#include "misc/e-selection-model.h"
 
 #include "gal-a11y-e-table-item.h"
 #include "gal-a11y-e-table-item-factory.h"
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index eaf289ae2d..d9ef3f6340 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -36,8 +36,8 @@
 #include "addressbook/gui/widgets/eab-menu.h"
 #include "addressbook/gui/widgets/eab-config.h"
 
-#include "widgets/misc/e-task-bar.h"
-#include "widgets/misc/e-info-label.h"
+#include "misc/e-task-bar.h"
+#include "misc/e-info-label.h"
 
 #include <string.h>
 #include <bonobo/bonobo-i18n.h>
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index 7ce078ff17..c9892a91c7 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -43,8 +43,8 @@
 #include <libedataserverui/e-passwords.h>
 
 #include "e-util/e-error.h"
-#include "widgets/misc/e-task-bar.h"
-#include "widgets/misc/e-info-label.h"
+#include "misc/e-task-bar.h"
+#include "misc/e-info-label.h"
 
 
 #include "e-util/e-icon-factory.h"
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c
index de2f7eccc8..1200511c30 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-address.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-address.c
@@ -27,7 +27,7 @@
 #include <glib.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
-#include <widgets/misc/e-gui-utils.h>
+#include <misc/e-gui-utils.h>
 #include <gtk/gtkcombo.h>
 #include <gtk/gtkentry.h>
 #include <gtk/gtkstock.h>
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 145437bf33..04b5be12ee 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -41,7 +41,7 @@
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libedataserverui/e-categories-dialog.h>
-#include <widgets/misc/e-gui-utils.h>
+#include <misc/e-gui-utils.h>
 #include <text/e-entry.h>
 
 #include <libebook/e-address-western.h>
@@ -55,9 +55,9 @@
 #include "addressbook/gui/widgets/eab-gui-util.h"
 #include "e-util/e-gui-utils.h"
 #include "e-util/e-error.h"
-#include "widgets/misc/e-dateedit.h"
-#include "widgets/misc/e-image-chooser.h"
-#include "widgets/misc/e-url-entry.h"
+#include "misc/e-dateedit.h"
+#include "misc/e-image-chooser.h"
+#include "misc/e-url-entry.h"
 #include "shell/evolution-shell-component-utils.h"
 #include "e-util/e-icon-factory.h"
 
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index 357c9d8ebf..fd48e53af7 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -38,7 +38,7 @@
 
 #include "shell/evolution-shell-component-utils.h"
 
-#include "widgets/misc/e-image-chooser.h"
+#include "misc/e-image-chooser.h"
 
 #include "addressbook/gui/component/addressbook.h"
 #include "addressbook/gui/widgets/eab-gui-util.h"
diff --git a/addressbook/gui/search/Makefile.am b/addressbook/gui/search/Makefile.am
index 4148a8145c..f667e0345c 100644
--- a/addressbook/gui/search/Makefile.am
+++ b/addressbook/gui/search/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST = addresstypes.xml
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"e-addressbook-search\"		\
 	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets				\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 noinst_LTLIBRARIES =				\
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
index 36bebc2cbc..387f467158 100644
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ b/addressbook/gui/widgets/e-addressbook-model.c
@@ -14,7 +14,7 @@
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
 #include <gnome.h>
-#include <widgets/misc/e-gui-utils.h>
+#include <misc/e-gui-utils.h>
 #include "eab-gui-util.h"
 
 #define PARENT_TYPE G_TYPE_OBJECT
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index 0eb5d92a3e..df4c6a2c36 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -12,7 +12,7 @@
 #include "eab-gui-util.h"
 
 #include "e-minicard.h"
-#include <widgets/misc/e-gui-utils.h>
+#include <misc/e-gui-utils.h>
 #include "addressbook/printing/e-contact-print.h"
 #include "addressbook/printing/e-contact-print-envelope.h"
 
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
index 2eda094e60..b237b2fbb8 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
@@ -2,7 +2,7 @@
 #ifndef _E_ADDRESSBOOK_REFLOW_ADAPTER_H_
 #define _E_ADDRESSBOOK_REFLOW_ADAPTER_H_
 
-#include <widgets/misc/e-reflow-model.h>
+#include <misc/e-reflow-model.h>
 #include <libebook/e-contact.h>
 #include "e-addressbook-model.h"
 
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index c7798d5176..feaabbb53b 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -29,7 +29,7 @@
 #include <gtk/gtkscrolledwindow.h>
 #include <table/e-table-scrolled.h>
 #include <table/e-table-model.h>
-#include <widgets/misc/e-gui-utils.h>
+#include <misc/e-gui-utils.h>
 #include <widgets/menus/gal-view-factory-etable.h>
 #include <widgets/menus/gal-view-etable.h>
 #include <e-util/e-xml-utils.h>
@@ -51,7 +51,7 @@
 #include <libedataserver/e-categories.h>
 
 #ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
-#include <widgets/misc/e-treeview-selection-model.h>
+#include <misc/e-treeview-selection-model.h>
 #include "gal-view-factory-treeview.h"
 #include "gal-view-treeview.h"
 #endif
diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
index cbea110b5e..737605a80f 100644
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ b/addressbook/gui/widgets/e-addressbook-view.h
@@ -27,8 +27,8 @@
 #include "e-addressbook-model.h"
 #include "eab-contact-display.h"
 #include "widgets/menus/gal-view-menus.h"
-#include "widgets/misc/e-search-bar.h"
-#include "widgets/misc/e-filter-bar.h"
+#include "misc/e-search-bar.h"
+#include "misc/e-filter-bar.h"
 
 G_BEGIN_DECLS
 
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 3071e3737e..23021c31e1 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -29,8 +29,8 @@
 #include <libgnome/gnome-i18n.h>
 #include <e-util/e-util.h>
 #include <text/e-text.h>
-#include <widgets/misc/e-canvas.h>
-#include <widgets/misc/e-canvas-utils.h>
+#include <misc/e-canvas.h>
+#include <misc/e-canvas-utils.h>
 #include <gdk/gdkkeysyms.h>
 
 static void e_minicard_label_init		(EMinicardLabel		 *card);
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index c5bb37b81f..af59205eb8 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -22,8 +22,8 @@
 #include <config.h>
 
 #include <gtk/gtksignal.h>
-#include <widgets/misc/e-canvas-background.h>
-#include <widgets/misc/e-canvas.h>
+#include <misc/e-canvas-background.h>
+#include <misc/e-canvas.h>
 #include <libgnome/gnome-i18n.h>
 
 #include "eab-marshal.h"
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h
index daa23e769c..65e690e6e8 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.h
+++ b/addressbook/gui/widgets/e-minicard-view-widget.h
@@ -20,7 +20,7 @@
 #ifndef __E_MINICARD_VIEW_WIDGET_H__
 #define __E_MINICARD_VIEW_WIDGET_H__
 
-#include <widgets/misc/e-canvas.h>
+#include <misc/e-canvas.h>
 #include <libebook/e-book.h>
 #include "e-minicard-view.h"
 
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 3dce38ab49..b362cb1294 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -30,7 +30,7 @@
 #include <gtk/gtkselection.h>
 #include <gtk/gtkdnd.h>
 #include <gdk/gdkkeysyms.h>
-#include <widgets/misc/e-canvas.h>
+#include <misc/e-canvas.h>
 #include <libgnome/gnome-i18n.h>
 #include <string.h>
 
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
index 58987a4d99..e94e589dc1 100644
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ b/addressbook/gui/widgets/e-minicard-view.h
@@ -22,8 +22,8 @@
 
 #include "e-minicard.h"
 
-#include <widgets/misc/e-reflow.h>
-#include <widgets/misc/e-selection-model-simple.h>
+#include <misc/e-reflow.h>
+#include <misc/e-selection-model-simple.h>
 #include <libebook/e-book.h>
 #include "e-addressbook-reflow-adapter.h"
 
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 3b64ebf66c..a1f84c4423 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -30,8 +30,8 @@
 #include <libgnomecanvas/gnome-canvas-pixbuf.h>
 #include <text/e-text.h>
 #include <e-util/e-util.h>
-#include <widgets/misc/e-canvas-utils.h>
-#include <widgets/misc/e-canvas.h>
+#include <misc/e-canvas-utils.h>
+#include <misc/e-canvas.h>
 #include <libebook/e-book.h>
 #include "eab-marshal.h"
 #include "eab-gui-util.h"
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 0fab34effb..4a6ce2f470 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -32,7 +32,7 @@
 #include "util/eab-book-util.h"
 #include <libebook/e-destination.h>
 #include "e-util/e-error.h"
-#include "widgets/misc/e-image-chooser.h"
+#include "misc/e-image-chooser.h"
 #include <e-util/e-icon-factory.h>
 #include "eab-contact-merging.h"
 #include <gnome.h>
diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c
index ae3256b7b8..16a5add922 100644
--- a/addressbook/gui/widgets/test-reflow.c
+++ b/addressbook/gui/widgets/test-reflow.c
@@ -54,9 +54,9 @@
 #include <gtk/gtkvbox.h>
 #include <libgnomeui/gnome-canvas-rect-ellipse.h>
 #include <libgnomeui/gnome-init.h>
-#include <widgets/misc/e-canvas.h>
-#include <widgets/misc/e-reflow.h>
-#include <widgets/misc/e-scroll-frame.h>
+#include <misc/e-canvas.h>
+#include <misc/e-reflow.h>
+#include <misc/e-scroll-frame.h>
 
 #include "e-minicard.h"
 
diff --git a/calendar/gui/cal-search-bar.h b/calendar/gui/cal-search-bar.h
index 311dacd606..ed39e91d59 100644
--- a/calendar/gui/cal-search-bar.h
+++ b/calendar/gui/cal-search-bar.h
@@ -21,8 +21,8 @@
 #ifndef CAL_SEARCH_BAR_H
 #define CAL_SEARCH_BAR_H
 
-#include "widgets/misc/e-search-bar.h"
-#include "widgets/misc/e-filter-bar.h"
+#include "misc/e-search-bar.h"
+#include "misc/e-filter-bar.h"
 
 G_BEGIN_DECLS
 
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 03c0243581..3ec9537fcb 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -51,7 +51,7 @@
 #include "dialogs/comp-editor.h"
 #include "dialogs/copy-source-dialog.h"
 #include "dialogs/event-editor.h"
-#include "widgets/misc/e-info-label.h"
+#include "misc/e-info-label.h"
 #include "e-util/e-error.h"
 #include "e-util/e-icon-factory.h"
 #include "e-cal-menu.h"
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 750319a001..e22a6aac0a 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -47,7 +47,7 @@
 #include <libgnomeui/gnome-color-picker.h>
 #include <glade/glade.h>
 #include <e-util/e-dialog-widgets.h>
-#include <widgets/misc/e-dateedit.h>
+#include <misc/e-dateedit.h>
 
 
 static const int week_start_day_map[] = {
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 3f4b33b5b0..3c23663ffc 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -59,7 +59,7 @@
 #include "comp-editor.h"
 
 #include "cal-attachment-bar.h"
-#include "widgets/misc/e-expander.h"
+#include "misc/e-expander.h"
 #include "e-util/e-error.h"
 
 
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
index cd0c768c63..565d87ad52 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ b/calendar/gui/dialogs/e-delegate-dialog.c
@@ -30,7 +30,7 @@
 #include <gnome.h>
 #include <libical/ical.h>
 #include <glade/glade.h>
-#include <widgets/misc/e-map.h>
+#include <misc/e-map.h>
 #include <libebook/e-destination.h>
 #include <libedataserverui/e-name-selector.h>
 #include "e-delegate-dialog.h"
diff --git a/calendar/gui/dialogs/e-send-options-utils.h b/calendar/gui/dialogs/e-send-options-utils.h
index ef35d66d95..bc1f7f761f 100644
--- a/calendar/gui/dialogs/e-send-options-utils.h
+++ b/calendar/gui/dialogs/e-send-options-utils.h
@@ -22,7 +22,7 @@
 #ifndef __E_SENDOPTIONS_UTILS_H__
 #define __E_SENDOPTIONS_UTILS_H__
 
-#include "widgets/misc/e-send-options.h"
+#include "misc/e-send-options.h"
 #include <libecal/e-cal-component.h>
 #include <libedataserver/e-source-list.h>
 
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 6566f7198c..8409b89047 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <glade/glade.h>
 #include <libgnome/gnome-i18n.h>
-#include <widgets/misc/e-dateedit.h>
+#include <misc/e-dateedit.h>
 #include <e-util/e-icon-factory.h>
 
 #include "event-page.h"
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 3406e52351..829739fd7b 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -36,8 +36,8 @@
 #include "common/authentication.h"
 #include "e-util/e-categories-config.h"
 #include "e-util/e-dialog-widgets.h"
-#include "widgets/misc/e-dateedit.h"
-#include "widgets/misc/e-send-options.h"
+#include "misc/e-dateedit.h"
+#include "misc/e-send-options.h"
 #include <libecal/e-cal-time-util.h>
 #include "../calendar-config.h"
 #include "../e-timezone-entry.h"
diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c
index 93ae8353b5..86a7df96de 100644
--- a/calendar/gui/dialogs/meeting-page.c
+++ b/calendar/gui/dialogs/meeting-page.c
@@ -35,8 +35,8 @@
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
 #include <libgnomeui/gnome-stock-icons.h>
-#include <widgets/misc/e-gui-utils.h>
-#include <widgets/misc/e-dateedit.h>
+#include <misc/e-gui-utils.h>
+#include <misc/e-dateedit.h>
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-dialog-widgets.h>
 
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 325b30fe2c..2c777e9edf 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -43,7 +43,7 @@
 #include <glade/glade.h>
 #include <e-util/e-dialog-widgets.h>
 #include <e-util/e-time-utils.h>
-#include <widgets/misc/e-dateedit.h>
+#include <misc/e-dateedit.h>
 #include <libecal/e-cal-recur.h>
 #include <libecal/e-cal-time-util.h>
 #include "../calendar-config.h"
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index 327770cecb..cec71cb815 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -34,7 +34,7 @@
 #include <libgnomeui/gnome-dialog-util.h>
 #include <glade/glade.h>
 #include <e-util/e-dialog-widgets.h>
-#include <widgets/misc/e-dateedit.h>
+#include <misc/e-dateedit.h>
 #include "../calendar-config.h"
 #include "../e-meeting-time-sel.h"
 #include "../itip-utils.h"
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index c030c97f31..649bdec1bf 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -29,8 +29,8 @@
 #include <gtk/gtktogglebutton.h>
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
-#include <widgets/misc/e-dateedit.h>
-#include <widgets/misc/e-url-entry.h>
+#include <misc/e-dateedit.h>
+#include <misc/e-url-entry.h>
 #include "e-util/e-dialog-widgets.h"
 #include "../calendar-config.h"
 #include "../e-timezone-entry.h"
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 17845dfaf6..8b72bb589f 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -35,7 +35,7 @@
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
 #include <libedataserverui/e-source-option-menu.h>
-#include <widgets/misc/e-dateedit.h>
+#include <misc/e-dateedit.h>
 #include "common/authentication.h"
 #include "e-util/e-dialog-widgets.h"
 #include "e-util/e-categories-config.h"
diff --git a/calendar/gui/dialogs/url-editor-dialog.c b/calendar/gui/dialogs/url-editor-dialog.c
index 1032c264ba..5e29af48de 100644
--- a/calendar/gui/dialogs/url-editor-dialog.c
+++ b/calendar/gui/dialogs/url-editor-dialog.c
@@ -43,7 +43,7 @@
 #include <glade/glade.h>
 #include <e-util/e-dialog-widgets.h>
 #include <e-util/e-icon-factory.h>
-#include <widgets/misc/e-dateedit.h>
+#include <misc/e-dateedit.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index f82c9320b5..c3bbfc6fb6 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -42,14 +42,14 @@
 #include <gtk/gtksignal.h>
 #include <gtk/gtkvscrollbar.h>
 #include <gtk/gtkwindow.h>
-#include <widgets/misc/e-gui-utils.h>
+#include <misc/e-gui-utils.h>
 #include <table/e-table-memory-store.h>
 #include <table/e-cell-checkbox.h>
 #include <table/e-cell-toggle.h>
 #include <table/e-cell-text.h>
 #include <table/e-cell-combo.h>
-#include <widgets/misc/e-popup-menu.h>
-#include <widgets/misc/e-cell-date-edit.h>
+#include <misc/e-popup-menu.h>
+#include <misc/e-cell-date-edit.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-exec.h>
 #include <libgnome/gnome-util.h>
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 675aac86f7..f68c3a317d 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -34,14 +34,14 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <gnome.h>
-#include <widgets/misc/e-gui-utils.h>
+#include <misc/e-gui-utils.h>
 #include <table/e-cell-checkbox.h>
 #include <table/e-cell-toggle.h>
 #include <table/e-cell-text.h>
 #include <table/e-cell-combo.h>
 #include <e-util/e-dialog-utils.h>
-#include <widgets/misc/e-cell-date-edit.h>
-#include <widgets/misc/e-cell-percent.h>
+#include <misc/e-cell-date-edit.h>
+#include <misc/e-cell-percent.h>
 
 #include "calendar-component.h"
 #include "calendar-config.h"
diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h
index e9fcb06af6..c7a391a7f6 100644
--- a/calendar/gui/e-calendar-table.h
+++ b/calendar/gui/e-calendar-table.h
@@ -26,7 +26,7 @@
 
 #include <gtk/gtktable.h>
 #include <table/e-table-scrolled.h>
-#include <widgets/misc/e-cell-date-edit.h>
+#include <misc/e-cell-date-edit.h>
 #include "e-activity-handler.h"
 #include "e-cal-model.h"
 
diff --git a/calendar/gui/e-cell-date-edit-config.h b/calendar/gui/e-cell-date-edit-config.h
index 889e6440e3..26149f53ca 100644
--- a/calendar/gui/e-cell-date-edit-config.h
+++ b/calendar/gui/e-cell-date-edit-config.h
@@ -23,7 +23,7 @@
 #ifndef _E_CELL_DATE_EDIT_CONFIG_H_
 #define _E_CELL_DATE_EDIT_CONFIG_H_
 
-#include <widgets/misc/e-cell-date-edit.h>
+#include <misc/e-cell-date-edit.h>
 #include "e-cell-date-edit-text.h"
 
 G_BEGIN_DECLS
diff --git a/calendar/gui/e-date-edit-config.h b/calendar/gui/e-date-edit-config.h
index 0707666bff..a110ad242e 100644
--- a/calendar/gui/e-date-edit-config.h
+++ b/calendar/gui/e-date-edit-config.h
@@ -23,7 +23,7 @@
 #ifndef _E_DATE_EDIT_CONFIG_H_
 #define _E_DATE_EDIT_CONFIG_H_
 
-#include <widgets/misc/e-dateedit.h>
+#include <misc/e-dateedit.h>
 
 G_BEGIN_DECLS
 
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index eefbeef5e5..a19b23dac8 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -37,7 +37,7 @@
 #include <gtk/gtkradiomenuitem.h>
 #include <gtk/gtkcheckmenuitem.h>
 #include <libgnome/gnome-i18n.h>
-#include <widgets/misc/e-gui-utils.h>
+#include <misc/e-gui-utils.h>
 #include "e-day-view-time-item.h"
 #include "calendar-config.h"
 #include <libecal/e-cal-time-util.h>
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 7a15196aac..251ea52979 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -43,10 +43,10 @@
 #include <gtk/gtkvscrollbar.h>
 #include <gtk/gtkwindow.h>
 #include <text/e-text.h>
-#include <widgets/misc/e-canvas-utils.h>
-#include <widgets/misc/e-popup-menu.h>
-#include <widgets/misc/e-gui-utils.h>
-#include <widgets/misc/e-unicode.h>
+#include <misc/e-canvas-utils.h>
+#include <misc/e-popup-menu.h>
+#include <misc/e-gui-utils.h>
+#include <misc/e-unicode.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-exec.h>
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 74b68d7153..1038999406 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -54,10 +54,10 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnomecanvas/gnome-canvas-widget.h>
 
-#include <widgets/misc/e-canvas.h>
-#include <widgets/misc/e-canvas-utils.h>
+#include <misc/e-canvas.h>
+#include <misc/e-canvas-utils.h>
 
-#include <widgets/misc/e-dateedit.h>
+#include <misc/e-dateedit.h>
 #include <e-util/e-gui-utils.h>
 
 #include "calendar-component.h"
diff --git a/calendar/gui/e-mini-calendar-config.h b/calendar/gui/e-mini-calendar-config.h
index 78b9cfd363..efb834f354 100644
--- a/calendar/gui/e-mini-calendar-config.h
+++ b/calendar/gui/e-mini-calendar-config.h
@@ -23,7 +23,7 @@
 #ifndef _E_MINI_CALENDAR_CONFIG_H_
 #define _E_MINI_CALENDAR_CONFIG_H_
 
-#include <widgets/misc/e-calendar.h>
+#include <misc/e-calendar.h>
 
 G_BEGIN_DECLS
 
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index e6d430d157..f41de4baba 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -47,9 +47,9 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libgnomecanvas/gnome-canvas-pixbuf.h>
 #include <text/e-text.h>
-#include <widgets/misc/e-canvas-utils.h>
-#include <widgets/misc/e-gui-utils.h>
-#include <widgets/misc/e-unicode.h>
+#include <misc/e-canvas-utils.h>
+#include <misc/e-gui-utils.h>
+#include <misc/e-unicode.h>
 #include <e-util/e-categories-config.h>
 #include <e-util/e-dialog-utils.h>
 #include "dialogs/delete-comp.h"
diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
index 756a9ade84..f7f6a7f3ae 100644
--- a/calendar/gui/gnome-cal.h
+++ b/calendar/gui/gnome-cal.h
@@ -28,7 +28,7 @@
 #include <time.h>
 #include <gtk/gtkvbox.h>
 #include <bonobo/bonobo-ui-component.h>
-#include <widgets/misc/e-calendar.h>
+#include <misc/e-calendar.h>
 #include <libecal/e-cal.h>
 
 #include "e-calendar-table.h"
diff --git a/calendar/gui/tag-calendar.h b/calendar/gui/tag-calendar.h
index d31d675543..e9b36bd2a8 100644
--- a/calendar/gui/tag-calendar.h
+++ b/calendar/gui/tag-calendar.h
@@ -22,7 +22,7 @@
 #ifndef TAG_CALENDAR_H
 #define TAG_CALENDAR_H
 
-#include <widgets/misc/e-calendar.h>
+#include <misc/e-calendar.h>
 #include <libecal/e-cal.h>
 
 void tag_calendar_by_client (ECalendar *ecal, ECal *client);
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 3472c31f24..702a0a730d 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -47,7 +47,7 @@
 #include "dialogs/comp-editor.h"
 #include "dialogs/copy-source-dialog.h"
 #include "dialogs/task-editor.h"
-#include "widgets/misc/e-info-label.h"
+#include "misc/e-info-label.h"
 #include "e-util/e-error.h"
 #include "e-util/e-icon-factory.h"
 
diff --git a/calendar/gui/tasks-component.h b/calendar/gui/tasks-component.h
index b5050f3840..a43b5dc8a2 100644
--- a/calendar/gui/tasks-component.h
+++ b/calendar/gui/tasks-component.h
@@ -25,7 +25,7 @@
 
 #include <bonobo/bonobo-object.h>
 #include <libedataserver/e-source-list.h>
-#include <widgets/misc/e-activity-handler.h>
+#include <misc/e-activity-handler.h>
 #include "Evolution.h"
 
 
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 5f7bd99f8d..8806a36fe2 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -89,8 +89,8 @@
 
 #include "e-util/e-dialog-utils.h"
 #include "e-util/e-signature-list.h"
-#include "widgets/misc/e-charset-picker.h"
-#include "widgets/misc/e-expander.h"
+#include "misc/e-charset-picker.h"
+#include "misc/e-expander.h"
 #include "e-util/e-error.h"
 
 #include <camel/camel-session.h>
diff --git a/composer/evolution-composer.c b/composer/evolution-composer.c
index cab5c4e2da..47a4e6bfbe 100644
--- a/composer/evolution-composer.c
+++ b/composer/evolution-composer.c
@@ -30,7 +30,7 @@
 #include <bonobo/bonobo-item-handler.h>
 #include <bonobo/bonobo-generic-factory.h>
 #include <e-util/e-util.h>
-#include <widgets/misc/e-gui-utils.h>
+#include <misc/e-gui-utils.h>
 #include "evolution-composer.h"
 #include "mail/mail-config.h"
 #include "e-util/e-account-list.h"
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 0dc3ed77ba..6e8656bb96 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -9,6 +9,7 @@ endif
 INCLUDES =								\
 	-I$(top_srcdir)							\
 	-I$(top_builddir)						\
+	-I$(top_srcdir)/widgets						\
 	-DEVOLUTION_PREFIX=\""$(prefix)"\"				\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"				\
 	-DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\"			\
@@ -74,11 +75,12 @@ eutilinclude_HEADERS = 				\
 	e-text-event-processor-types.h		\
 	e-text-event-processor.h		\
 	e-util.h				\
+	e-util-marshal.h			\
 	e-xml-utils.h
 
 libeutil_la_SOURCES =				\
-	$(MARSHAL_GENERATED)			\
 	$(eutilinclude_HEADERS)			\
+	e-util-marshal.c			\
 	e-account-list.c			\
 	e-account.c				\
 	e-bconf-map.c				\
diff --git a/e-util/e-categories-master-list-wombat.h b/e-util/e-categories-master-list-wombat.h
index f11763aed5..bf951f9150 100644
--- a/e-util/e-categories-master-list-wombat.h
+++ b/e-util/e-categories-master-list-wombat.h
@@ -2,7 +2,7 @@
 #ifndef _E_CATEGORIES_MASTER_LIST_WOMBAT_H_
 #define _E_CATEGORIES_MASTER_LIST_WOMBAT_H_
 
-#include <widgets/misc/e-categories-master-list-array.h>
+#include <misc/e-categories-master-list-array.h>
 
 G_BEGIN_DECLS
 
diff --git a/e-util/e-time-utils.c b/e-util/e-time-utils.c
index 541a8cd0df..1ff3ed0f78 100644
--- a/e-util/e-time-utils.c
+++ b/e-util/e-time-utils.c
@@ -17,7 +17,7 @@
 
 #include <time.h>
 #include <sys/time.h>
-#include <widgets/misc/e-unicode.h>
+#include <misc/e-unicode.h>
 
 #ifdef __linux__
 #undef _GNU_SOURCE
diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c
index 5106ca5529..2e8981016e 100644
--- a/mail/em-composer-prefs.c
+++ b/mail/em-composer-prefs.c
@@ -39,7 +39,7 @@
 #include <bonobo/bonobo-generic-factory.h>
 
 #include <libedataserver/e-iconv.h>
-#include <widgets/misc/e-gui-utils.h>
+#include <misc/e-gui-utils.h>
 
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtkliststore.h>
@@ -59,7 +59,7 @@
 
 #include <gtkhtml/gtkhtml.h>
 
-#include "widgets/misc/e-charset-picker.h"
+#include "misc/e-charset-picker.h"
 #include "e-util/e-error.h"
 
 #include <e-util/e-icon-factory.h>
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index 820fa27321..5f7fb96030 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -63,7 +63,7 @@
 #include <libedataserver/e-sexp.h>
 #include "mail-vfolder.h"
 #include "em-vfolder-rule.h"
-#include <widgets/misc/e-filter-bar.h>
+#include <misc/e-filter-bar.h>
 #include <camel/camel-search-private.h>
 
 #include "e-util/e-dialog-utils.h"
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index ffa0ff3bda..9aebc55385 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -30,7 +30,7 @@
 #include <libgnome/gnome-i18n.h>
 
 #include <e-util/e-util.h>
-#include <widgets/misc/e-gui-utils.h>
+#include <misc/e-gui-utils.h>
 
 #include <gtk/gtkentry.h>
 #include <gtk/gtkbox.h>
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 70c1037279..0526cc413b 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -63,7 +63,7 @@
 #include <bonobo/bonobo-ui-component.h>
 #include <bonobo/bonobo-ui-util.h>
 
-#include "widgets/misc/e-charset-picker.h"
+#include "misc/e-charset-picker.h"
 #include "e-util/e-error.h"
 
 #include <e-util/e-dialog-utils.h>
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c
index 0799d0b879..09a61e50cd 100644
--- a/mail/em-mailer-prefs.c
+++ b/mail/em-mailer-prefs.c
@@ -32,7 +32,7 @@
 #include <libedataserver/e-iconv.h>
 #include <gtkhtml/gtkhtml-properties.h>
 #include <libxml/tree.h>
-#include "widgets/misc/e-charset-picker.h"
+#include "misc/e-charset-picker.h"
 #include <bonobo/bonobo-generic-factory.h>
 
 #include <libgnomeui/gnome-color-picker.h>
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 8ad596cc2d..be881b1fa6 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -46,7 +46,7 @@
 #include "em-folder-utils.h"
 #include "em-migrate.h"
 
-#include "widgets/misc/e-info-label.h"
+#include "misc/e-info-label.h"
 #include "e-util/e-error.h"
 
 #include "em-search-context.h"
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 1ce5111cd4..72fa5c6695 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -52,7 +52,7 @@
 #include <bonobo/bonobo-exception.h>
 
 #include <e-util/e-util.h>
-#include <widgets/misc/e-gui-utils.h>
+#include <misc/e-gui-utils.h>
 
 #include <e-util/e-account-list.h>
 #include <e-util/e-signature-list.h>
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index dcf7723a23..b971496b0f 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -16,7 +16,7 @@
 #include <gtk/gtkstock.h>
 #include <gtk/gtkmessagedialog.h>
 #include <libgnome/gnome-i18n.h>
-#include <widgets/misc/e-gui-utils.h>
+#include <misc/e-gui-utils.h>
 
 #include "libedataserver/e-msgport.h"
 #include "e-util/e-error.h"
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 27422ad2a1..71d8337357 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -43,7 +43,7 @@
 #include "e-util/e-gtk-utils.h"
 #include "e-util/e-account-list.h"
 
-#include "widgets/misc/e-clipped-label.h"
+#include "misc/e-clipped-label.h"
 #include "em-filter-rule.h"
 #include "camel/camel-filter-driver.h"
 #include "camel/camel-folder.h"
diff --git a/mail/message-list.c b/mail/message-list.c
index cdb3963153..da1766c13c 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -43,7 +43,7 @@
 #include <atk/atkutil.h>
 
 #include <e-util/e-util.h>
-#include <widgets/misc/e-gui-utils.h>
+#include <misc/e-gui-utils.h>
 #include <table/e-cell-text.h>
 #include <table/e-cell-toggle.h>
 #include <table/e-cell-checkbox.h>
diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c
index 3c456e926e..9b94f14af9 100644
--- a/mail/message-tag-followup.c
+++ b/mail/message-tag-followup.c
@@ -59,7 +59,7 @@
 #include "message-tag-followup.h"
 #include "mail-config.h"
 #include <e-util/e-icon-factory.h>
-#include "widgets/misc/e-dateedit.h"
+#include "misc/e-dateedit.h"
 
 static void message_tag_followup_class_init (MessageTagFollowUpClass *class);
 static void message_tag_followup_init (MessageTagFollowUp *followup);
diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am
index ccda704a68..c1658cceb2 100644
--- a/plugins/groupwise-features/Makefile.am
+++ b/plugins/groupwise-features/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES =						\
 	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/camel                           \
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c
index 905e919ffe..23a80e16fe 100644
--- a/plugins/groupwise-features/mail-send-options.c
+++ b/plugins/groupwise-features/mail-send-options.c
@@ -37,7 +37,7 @@
 #include "composer/e-msg-composer.h"
 #include "e-util/e-account.h"
 
-#include "widgets/misc/e-send-options.h"
+#include "misc/e-send-options.h"
 
 static ESendOptionsDialog * dialog = NULL ;
 
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index f3df4a32e8..6f575032fc 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -28,7 +28,7 @@
 #include "mail/em-account-editor.h"
 #include "mail/em-config.h"
 #include "e-util/e-account.h"
-#include <widgets/misc/e-send-options.h>
+#include <misc/e-send-options.h>
 #include <mail/em-config.h>
 #include <e-gw-connection.h>
 #include <camel/camel-url.h>
diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c
index c0dd2f4e6a..7b87214a2d 100644
--- a/shell/e-shell-folder-title-bar.c
+++ b/shell/e-shell-folder-title-bar.c
@@ -34,7 +34,7 @@
 #include <libgnome/gnome-i18n.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include "widgets/misc/e-clipped-label.h"
+#include "misc/e-clipped-label.h"
 #include "e-shell-constants.h"
 #include "e-shell-marshal.h"
 #include "e-shell-folder-title-bar.h"
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index d02370dbf9..a11272f289 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -50,7 +50,7 @@
 #include "importer/evolution-importer-client.h"
 
 #include <glade/glade.h>
-#include <widgets/misc/e-gui-utils.h>
+#include <misc/e-gui-utils.h>
 
 #include <e-util/e-gtk-utils.h>
 #include <e-util/e-dialog-utils.h>
diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c
index a631304435..57779383dc 100644
--- a/shell/e-user-creatable-items-handler.c
+++ b/shell/e-user-creatable-items-handler.c
@@ -30,7 +30,7 @@
 #include "Evolution.h"
 
 #include "e-util/e-corba-utils.h"
-#include "widgets/misc/e-combo-button.h"
+#include "misc/e-combo-button.h"
 
 #include <bonobo/bonobo-ui-util.h>
 #include <bonobo/bonobo-exception.h>
diff --git a/shell/main.c b/shell/main.c
index 33066453b7..83ced9695a 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -73,7 +73,7 @@
 #include "e-config-upgrade.h"
 #include "Evolution-DataServer.h"
 
-#include <widgets/misc/e-cursors.h>
+#include <misc/e-cursors.h>
 #include "e-util/e-error.h"
 
 #include <fcntl.h>
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index e8807f9f7c..95f86c42cc 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-23  Kaushal Kumar  <kakumar@novell.com>
+
+	* text/Makefile.am: Set libetextincludedir to text to match 
+	source directory name.
+
 2005-06-21  Kaushal Kumar  <kakumar@novell.com>
 
 	* table/ChangeLog: Added from gal/gal/e-table as Gal is 
diff --git a/widgets/e-timezone-dialog/Makefile.am b/widgets/e-timezone-dialog/Makefile.am
index 38efcf6142..8862d05060 100644
--- a/widgets/e-timezone-dialog/Makefile.am
+++ b/widgets/e-timezone-dialog/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES =								\
 	-I$(top_srcdir)							\
+	-I$(top_srcdir)/widgets						\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"				\
 	-DG_LOG_DOMAIN=__FILE__						\
 	$(TZDIALOG_CFLAGS)
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c
index 10b1930b8d..7204d60079 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.c
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.c
@@ -30,7 +30,7 @@
 #include <gtk/gtklabel.h>
 #include <gnome.h>
 #include <glade/glade.h>
-#include <widgets/misc/e-map.h>
+#include <misc/e-map.h>
 
 #include "e-timezone-dialog.h"
 
diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c
index 9d31fafb2b..4e210ec3d2 100644
--- a/widgets/menus/gal-view-collection.c
+++ b/widgets/menus/gal-view-collection.c
@@ -34,7 +34,7 @@
 #include "e-util/e-i18n.h"
 #include "e-util/e-util.h"
 #include "e-util/e-xml-utils.h"
-#include "widgets/misc/e-unicode.h"
+#include "misc/e-unicode.h"
 
 #include "gal-view-collection.h"
 
diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c
index 44b4990925..2400d7b65c 100644
--- a/widgets/menus/gal-view-instance.c
+++ b/widgets/menus/gal-view-instance.c
@@ -37,7 +37,7 @@
 #include "e-util/e-i18n.h"
 #include "e-util/e-util.h"
 #include "e-util/e-xml-utils.h"
-#include "widgets/misc/e-unicode.h"
+#include "misc/e-unicode.h"
 
 #include "gal-define-views-dialog.h"
 #include "gal-view-instance.h"
diff --git a/widgets/menus/gal-view-instance.h b/widgets/menus/gal-view-instance.h
index 09bffc32b4..986ced2f27 100644
--- a/widgets/menus/gal-view-instance.h
+++ b/widgets/menus/gal-view-instance.h
@@ -26,7 +26,7 @@
 
 #include <gtk/gtkobject.h>
 #include <widgets/menus/gal-view-collection.h>
-#include <widgets/misc/e-popup-menu.h>
+#include <misc/e-popup-menu.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c
index 08a6841a25..d72fed6cc3 100644
--- a/widgets/menus/gal-view-new-dialog.c
+++ b/widgets/menus/gal-view-new-dialog.c
@@ -29,7 +29,7 @@
 #include "e-util/e-i18n.h"
 #include "e-util/e-util.h"
 #include "e-util/e-util-private.h"
-#include "widgets/misc/e-unicode.h"
+#include "misc/e-unicode.h"
 
 #include "gal-define-views-model.h"
 #include "gal-view-new-dialog.h"
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index abf787ea78..b259d2595d 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-23  Kaushal Kumar  <kakumar@novell.com>
+
+	* Makefile.am: Use 'misc' for widgetsincludedir, instead of 
+	'widgets', to match source directory name and fix 
+	evolution-exchange build.
+
 2005-05-31  Li Yuan  <li.yuan@sun.com>
 
 	* e-dateedit.c:(e_date_edit_update_date_entry):
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 73095b8432..042bdf5699 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -16,7 +16,7 @@ privlib_LTLIBRARIES =		\
 	libemiscwidgets.la	\
 	libefilterbar.la
 
-widgetsincludedir = $(privincludedir)/widgets
+widgetsincludedir = $(privincludedir)/misc
 
 if ENABLE_PILOT_CONDUITS
 pilot_sources = e-pilot-settings.c
diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c
index 8a5e129300..8274df5556 100644
--- a/widgets/misc/e-activity-handler.c
+++ b/widgets/misc/e-activity-handler.c
@@ -32,7 +32,7 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-popup-menu.h>
 
-#include <widgets/misc/e-popup-menu.h>
+#include <misc/e-popup-menu.h>
 
 #define ICON_SIZE 16
 
diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h
index a9a0cad6d0..6ad4df1150 100644
--- a/widgets/misc/e-calendar.h
+++ b/widgets/misc/e-calendar.h
@@ -24,7 +24,7 @@
 #define _E_CALENDAR_H_
 
 #include <gtk/gtkwidget.h>
-#include <widgets/misc/e-canvas.h>
+#include <misc/e-canvas.h>
 #include "e-calendar-item.h"
 
 #ifdef __cplusplus
diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index 569fe2b783..d0d1479e37 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -32,9 +32,9 @@
 
 #include "e-util/e-i18n.h"
 #include "e-util/e-util.h"
-#include "widgets/misc/e-canvas.h"
-#include "widgets/misc/e-canvas-utils.h"
-#include "widgets/misc/e-hsv-utils.h"
+#include "misc/e-canvas.h"
+#include "misc/e-canvas-utils.h"
+#include "misc/e-hsv-utils.h"
 
 #include "e-canvas-background.h"
 
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index 90eb9864a6..df36dd81be 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -33,7 +33,7 @@
 #include "e-util/e-i18n.h"
 #include "e-util-marshal.h"
 #include "e-util/e-util.h"
-#include "widgets/misc/e-unicode.h"
+#include "misc/e-unicode.h"
 
 #include "e-canvas.h"
 #include "e-canvas-utils.h"
diff --git a/widgets/misc/e-reflow.h b/widgets/misc/e-reflow.h
index f69abaf111..bbf012c511 100644
--- a/widgets/misc/e-reflow.h
+++ b/widgets/misc/e-reflow.h
@@ -25,8 +25,8 @@
 #define __E_REFLOW_H__
 
 #include <libgnomecanvas/gnome-canvas.h>
-#include <widgets/misc/e-reflow-model.h>
-#include <widgets/misc/e-selection-model.h>
+#include <misc/e-reflow-model.h>
+#include <misc/e-selection-model.h>
 #include <e-util/e-sorter-array.h>
 
 #ifdef __cplusplus
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 5a7bac4edc..d957da1d04 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -36,8 +36,8 @@
 #include <gtk/gtkoptionmenu.h>
 #include <gtk/gtkmain.h>
 
-#include <widgets/misc/e-unicode.h>
-#include <widgets/misc/e-gui-utils.h>
+#include <misc/e-unicode.h>
+#include <misc/e-gui-utils.h>
 
 #include <libgnome/gnome-i18n.h>
 
diff --git a/widgets/misc/e-selection-model-array.h b/widgets/misc/e-selection-model-array.h
index fd5255e308..98dd6a300d 100644
--- a/widgets/misc/e-selection-model-array.h
+++ b/widgets/misc/e-selection-model-array.h
@@ -25,7 +25,7 @@
 #define _E_SELECTION_MODEL_ARRAY_H_
 
 #include <gtk/gtkobject.h>
-#include <widgets/misc/e-selection-model.h>
+#include <misc/e-selection-model.h>
 #include <e-util/e-bit-array.h>
 
 #ifdef __cplusplus
diff --git a/widgets/misc/e-selection-model-simple.h b/widgets/misc/e-selection-model-simple.h
index 00b8c3a781..afd7858366 100644
--- a/widgets/misc/e-selection-model-simple.h
+++ b/widgets/misc/e-selection-model-simple.h
@@ -24,7 +24,7 @@
 #ifndef _E_SELECTION_MODEL_SIMPLE_H_
 #define _E_SELECTION_MODEL_SIMPLE_H_
 
-#include <widgets/misc/e-selection-model-array.h>
+#include <misc/e-selection-model-array.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/widgets/misc/e-task-bar.c b/widgets/misc/e-task-bar.c
index 3ed243e18f..2e28a6c76a 100644
--- a/widgets/misc/e-task-bar.c
+++ b/widgets/misc/e-task-bar.c
@@ -26,7 +26,7 @@
 
 #include "e-task-bar.h"
 
-#include "widgets/misc/e-clipped-label.h"
+#include "misc/e-clipped-label.h"
 
 struct _ETaskBarPrivate
 {
diff --git a/widgets/misc/gal-combo-text.h b/widgets/misc/gal-combo-text.h
index f53d924c5a..82580b6f6e 100644
--- a/widgets/misc/gal-combo-text.h
+++ b/widgets/misc/gal-combo-text.h
@@ -23,7 +23,7 @@
 #ifndef _GAL_COMBO_TEXT_H
 #define _GAL_COMBO_TEXT_H
 
-#include <widgets/misc/gal-combo-box.h>
+#include <misc/gal-combo-box.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog
index 1fe05eed8b..d490bff763 100644
--- a/widgets/table/ChangeLog
+++ b/widgets/table/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-23  Kaushal Kumar  <kakumar@novell.com>
+
+	* Makefile.am: Set libetableincludedir to table to match 
+	source directory name and fix evolution-exchange build 
+	without GAL.
+
 2005-06-01  Kaushal Kumar  <kakumar@novell.com>
 
 	* e-table-item.c (eti_dispose): Don't hide the tooltip if we don't
diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am
index 8f5d699544..943633b2e4 100644
--- a/widgets/table/Makefile.am
+++ b/widgets/table/Makefile.am
@@ -77,7 +77,7 @@ libetable_la_SOURCES = 				\
 	e-tree-table-adapter.c			\
 	e-tree.c
 
-libetableincludedir = $(privincludedir)/e-table
+libetableincludedir = $(privincludedir)/table
 
 libetableinclude_HEADERS = 			\
 	e-cell.h				\
diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index 4e3df61604..013574475c 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -61,7 +61,7 @@
 
 #include "e-util/e-i18n.h"
 #include "e-util/e-util.h"
-#include "widgets/misc/e-unicode.h"
+#include "misc/e-unicode.h"
 
 #include "e-table-item.h"
 #include "e-cell-combo.h"
diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c
index a2a4e58937..138868db12 100644
--- a/widgets/table/e-cell-date.c
+++ b/widgets/table/e-cell-date.c
@@ -29,7 +29,7 @@
 
 #include "e-util/e-i18n.h"
 #include "e-util/e-util.h"
-#include "widgets/misc/e-unicode.h"
+#include "misc/e-unicode.h"
 
 #include "e-cell-date.h"
 
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 63cf1bbff9..899457e3dc 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -53,8 +53,8 @@
 #include "e-util/e-text-event-processor.h"
 #include "e-util/e-text-event-processor-emacs-like.h"
 #include "e-util/e-util.h"
-#include "widgets/misc/e-canvas.h"
-#include "widgets/misc/e-unicode.h"
+#include "misc/e-canvas.h"
+#include "misc/e-unicode.h"
 
 #include "e-cell-text.h"
 #include "e-table-item.h"
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index 7ee55797b2..e90026399a 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -30,7 +30,7 @@
 #include "a11y/e-table/gal-a11y-e-cell-toggle.h"
 #include "a11y/e-table/gal-a11y-e-cell-registry.h"
 #include "e-util/e-util.h"
-#include "widgets/misc/e-hsv-utils.h"
+#include "misc/e-hsv-utils.h"
 
 #include "e-cell-toggle.h"
 #include "e-table-item.h"
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index 1295be52af..76e0155169 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -35,8 +35,8 @@
 #include "e-util/e-i18n.h"
 #include "e-util/e-util-marshal.h"
 #include "e-util/e-util.h"
-#include "widgets/misc/e-canvas-utils.h"
-#include "widgets/misc/e-canvas.h"
+#include "misc/e-canvas-utils.h"
+#include "misc/e-canvas.h"
 
 #include "e-table-click-to-add.h"
 #include "e-table-defines.h"
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index 025a5ce513..28e3eb0ec7 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -39,7 +39,7 @@
 #include "e-util/e-i18n.h"
 #include "e-util/e-util-private.h"
 #include "e-util/e-util.h"
-#include "widgets/misc/e-unicode.h"
+#include "misc/e-unicode.h"
 
 #include "e-table-config.h"
 #include "e-table-memory-store.h"
diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h
index 8c9b34832d..73fdcf4e01 100644
--- a/widgets/table/e-table-config.h
+++ b/widgets/table/e-table-config.h
@@ -27,7 +27,7 @@
 
 #include <table/e-table-sort-info.h>
 #include <table/e-table-specification.h>
-#include <widgets/misc/gal-combo-text.h>
+#include <misc/gal-combo-text.h>
 #include <table/e-table-without.h>
 #include <table/e-table-subset-variable.h>
 #include <table/e-table.h>
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 9241124bd6..c1c2e60400 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -35,7 +35,7 @@
 #include "e-util/e-i18n.h"
 #include "e-util/e-util.h"
 #include "e-util/e-xml-utils.h"
-#include "widgets/misc/e-canvas.h"
+#include "misc/e-canvas.h"
 
 #include "e-table-col-dnd.h"
 #include "e-table-defines.h"
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 897f2d5b41..eed9fe0d04 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -31,9 +31,9 @@
 #include "text/e-text.h"
 #include "e-util/e-i18n.h"
 #include "e-util/e-util.h"
-#include "widgets/misc/e-canvas-utils.h"
-#include "widgets/misc/e-canvas.h"
-#include "widgets/misc/e-unicode.h"
+#include "misc/e-canvas-utils.h"
+#include "misc/e-canvas.h"
+#include "misc/e-unicode.h"
 
 #include "e-table-defines.h"
 #include "e-table-group-container.h"
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index 966c1a0ef6..315ae0302a 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -28,7 +28,7 @@
 
 #include "e-util/e-i18n.h"
 #include "e-util/e-util.h"
-#include "widgets/misc/e-canvas.h"
+#include "misc/e-canvas.h"
 
 #include "e-table-item.h"
 #include "e-table-group-leaf.h"
diff --git a/widgets/table/e-table-group.h b/widgets/table/e-table-group.h
index 42d00462a5..ee0e89fc67 100644
--- a/widgets/table/e-table-group.h
+++ b/widgets/table/e-table-group.h
@@ -30,7 +30,7 @@
 #include <table/e-table-sort-info.h>
 #include <table/e-table-defines.h>
 #include <e-util/e-util.h>
-#include <widgets/misc/e-printable.h>
+#include <misc/e-printable.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 6a5a81caf9..2cb6d7db6a 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -38,10 +38,10 @@
 #include "e-util/e-util-marshal.h"
 #include "e-util/e-util.h"
 #include "e-util/e-xml-utils.h"
-#include "widgets/misc/e-canvas.h"
-#include "widgets/misc/e-cursors.h"
-#include "widgets/misc/e-gui-utils.h"
-#include "widgets/misc/e-popup-menu.h"
+#include "misc/e-canvas.h"
+#include "misc/e-cursors.h"
+#include "misc/e-gui-utils.h"
+#include "misc/e-popup-menu.h"
 
 #include "e-table.h"
 #include "e-table-col-dnd.h"
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index ad76a9eb5d..3a5fb64ff1 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -30,7 +30,7 @@
 
 #include <gtk/gtk.h>
 
-#include "widgets/misc/e-unicode.h"
+#include "misc/e-unicode.h"
 
 #include "e-table-defines.h"
 #include "e-table-header-utils.h"
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 5332a49720..881736e8bc 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -40,9 +40,9 @@
 #include "a11y/e-table/gal-a11y-e-table-item.h"
 #include "e-util/e-i18n.h"
 #include "e-util/e-util.h"
-#include "widgets/misc/e-canvas.h"
-#include "widgets/misc/e-canvas-utils.h"
-#include "widgets/misc/e-hsv-utils.h"
+#include "misc/e-canvas.h"
+#include "misc/e-canvas-utils.h"
+#include "misc/e-hsv-utils.h"
 
 #include "e-cell.h"
 #include "e-table-item.h"
diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h
index 92f367d78f..a0b3c29222 100644
--- a/widgets/table/e-table-item.h
+++ b/widgets/table/e-table-item.h
@@ -30,8 +30,8 @@
 #include <table/e-table-header.h>
 #include <table/e-table-defines.h>
 #include <table/e-table-tooltip.h>
-#include <widgets/misc/e-selection-model.h>
-#include <widgets/misc/e-printable.h>
+#include <misc/e-selection-model.h>
+#include <misc/e-printable.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h
index 39486f76cc..ad9cdce15a 100644
--- a/widgets/table/e-table-selection-model.h
+++ b/widgets/table/e-table-selection-model.h
@@ -25,7 +25,7 @@
 #define _E_TABLE_SELECTION_MODEL_H_
 
 #include <gtk/gtkobject.h>
-#include <widgets/misc/e-selection-model-array.h>
+#include <misc/e-selection-model-array.h>
 #include <table/e-table-model.h>
 #include <table/e-table-header.h>
 
diff --git a/widgets/table/e-table-specification.h b/widgets/table/e-table-specification.h
index 385c9a4fc2..dad5caca3c 100644
--- a/widgets/table/e-table-specification.h
+++ b/widgets/table/e-table-specification.h
@@ -26,7 +26,7 @@
 
 #include <glib-object.h>
 #include <libxml/tree.h>
-#include <widgets/misc/e-selection-model.h>
+#include <misc/e-selection-model.h>
 #include <table/e-table-state.h>
 #include <table/e-table-column-specification.h>
 #include <table/e-table-defines.h>
diff --git a/widgets/table/e-table-utils.c b/widgets/table/e-table-utils.c
index cede28c0db..fb05326573 100644
--- a/widgets/table/e-table-utils.c
+++ b/widgets/table/e-table-utils.c
@@ -26,7 +26,7 @@
 #include <libintl.h>		/* This file uses dgettext() but no _() */
 
 #include "e-util/e-util.h"
-#include "widgets/misc/e-unicode.h"
+#include "misc/e-unicode.h"
 
 #include "e-table-utils.h"
 #include "e-table-header-utils.h"
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 4a545c0c4a..50e98fa15b 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -38,10 +38,10 @@
 #include "a11y/e-table/gal-a11y-e-table.h"
 #include "e-util/e-i18n.h"
 #include "e-util/e-util.h"
-#include "widgets/misc/e-canvas.h"
-#include "widgets/misc/e-canvas-background.h"
-#include "widgets/misc/e-canvas-vbox.h"
-#include "widgets/misc/e-unicode.h"
+#include "misc/e-canvas.h"
+#include "misc/e-canvas-background.h"
+#include "misc/e-canvas-vbox.h"
+#include "misc/e-unicode.h"
 
 #include "e-table.h"
 #include "e-table-click-to-add.h"
diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h
index a314fb8915..9a2c9575fc 100644
--- a/widgets/table/e-table.h
+++ b/widgets/table/e-table.h
@@ -37,7 +37,7 @@
 #include <table/e-table-selection-model.h>
 #include <table/e-table-extras.h>
 #include <table/e-table-specification.h>
-#include <widgets/misc/e-printable.h>
+#include <misc/e-printable.h>
 #include <table/e-table-state.h>
 #include <table/e-table-sorter.h>
 #include <table/e-table-search.h>
diff --git a/widgets/table/e-tree-selection-model.h b/widgets/table/e-tree-selection-model.h
index 830b366b2a..957a72d953 100644
--- a/widgets/table/e-tree-selection-model.h
+++ b/widgets/table/e-tree-selection-model.h
@@ -27,7 +27,7 @@
 #include <gdk/gdktypes.h>
 #include <gtk/gtkobject.h>
 #include <e-util/e-sorter.h>
-#include <widgets/misc/e-selection-model.h>
+#include <misc/e-selection-model.h>
 #include <table/e-tree-model.h>
 
 #ifdef __cplusplus
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index c5ddbbc52c..023c0d1f44 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -35,8 +35,8 @@
 #include "e-util/e-i18n.h"
 #include "e-util/e-util.h"
 #include "e-util/e-util-marshal.h"
-#include "widgets/misc/e-canvas.h"
-#include "widgets/misc/e-canvas-background.h"
+#include "misc/e-canvas.h"
+#include "misc/e-canvas-background.h"
 
 #include "e-table-column-specification.h"
 #include "e-table-header-item.h"
diff --git a/widgets/table/e-tree.h b/widgets/table/e-tree.h
index 87846f025d..d4057b0ae6 100644
--- a/widgets/table/e-tree.h
+++ b/widgets/table/e-tree.h
@@ -28,7 +28,7 @@
 #include <gtk/gtktable.h>
 #include <libxml/tree.h>
 #include <libgnomecanvas/gnome-canvas.h>
-#include <widgets/misc/e-printable.h>
+#include <misc/e-printable.h>
 
 #include <table/e-table-extras.h>
 #include <table/e-table-specification.h>
diff --git a/widgets/table/table-test.c b/widgets/table/table-test.c
index 8a6cbf4d0c..30562bba5d 100644
--- a/widgets/table/table-test.c
+++ b/widgets/table/table-test.c
@@ -29,7 +29,7 @@
 
 #include <gnome.h>
 
-#include "widgets/misc/e-cursors.h"
+#include "misc/e-cursors.h"
 
 #include "table-test.h"
 
diff --git a/widgets/table/test-check.c b/widgets/table/test-check.c
index 98abc8ba08..8bba3af5a7 100644
--- a/widgets/table/test-check.c
+++ b/widgets/table/test-check.c
@@ -28,9 +28,9 @@
 
 #include <gnome.h>
 
-#include "widgets/misc/e-cursors.h"
-#include "widgets/misc/e-canvas-utils.h"
-#include "widgets/misc/e-canvas.h"
+#include "misc/e-cursors.h"
+#include "misc/e-canvas-utils.h"
+#include "misc/e-canvas.h"
 #include "e-util/e-util.h"
 
 #include "e-table-simple.h"
diff --git a/widgets/table/test-cols.c b/widgets/table/test-cols.c
index 75eee109fa..fa110f204c 100644
--- a/widgets/table/test-cols.c
+++ b/widgets/table/test-cols.c
@@ -28,9 +28,9 @@
 
 #include <gnome.h>
 
-#include "widgets/misc/e-canvas-utils.h"
-#include "widgets/misc/e-canvas.h"
-#include "widgets/misc/e-cursors.h"
+#include "misc/e-canvas-utils.h"
+#include "misc/e-canvas.h"
+#include "misc/e-cursors.h"
 #include "e-util/e-util.h"
 
 #include "e-table-simple.h"
diff --git a/widgets/table/test-table.c b/widgets/table/test-table.c
index 2c08410b49..7a5eb82da6 100644
--- a/widgets/table/test-table.c
+++ b/widgets/table/test-table.c
@@ -28,8 +28,8 @@
 
 #include <gnome.h>
 
-#include "widgets/misc/e-cursors.h"
-#include "widgets/misc/e-canvas.h"
+#include "misc/e-cursors.h"
+#include "misc/e-canvas.h"
 
 #include "e-table-simple.h"
 #include "e-table-header.h"
diff --git a/widgets/text/Makefile.am b/widgets/text/Makefile.am
index 7e1980e73a..e2c3c080ef 100644
--- a/widgets/text/Makefile.am
+++ b/widgets/text/Makefile.am
@@ -22,7 +22,7 @@ libetext_la_SOURCES =				\
 	e-text-model-uri.c                      \
 	e-text.c
 
-libetextincludedir = $(privincludedir)/e-text
+libetextincludedir = $(privincludedir)/text
 
 libetextinclude_HEADERS = 			\
 	e-entry.h				\
diff --git a/widgets/text/e-completion-match.c b/widgets/text/e-completion-match.c
index df64bc8bd2..b9f5d5ec31 100644
--- a/widgets/text/e-completion-match.c
+++ b/widgets/text/e-completion-match.c
@@ -25,7 +25,7 @@
 
 #include <string.h>
 
-#include "widgets/misc/e-unicode.h"
+#include "misc/e-unicode.h"
 
 #include "e-completion-match.h"
 
diff --git a/widgets/text/e-entry.c b/widgets/text/e-entry.c
index d00b2e1665..9b37664648 100644
--- a/widgets/text/e-entry.c
+++ b/widgets/text/e-entry.c
@@ -38,8 +38,8 @@
 
 #include "e-util/e-i18n.h"
 #include "e-util/e-util.h"
-#include "widgets/misc/e-canvas.h"
-#include "widgets/misc/e-canvas-utils.h"
+#include "misc/e-canvas.h"
+#include "misc/e-canvas-utils.h"
 
 #include "e-completion-view.h"
 #include "e-entry.h"
diff --git a/widgets/text/e-text-model-test.c b/widgets/text/e-text-model-test.c
index 9d55035376..b1d7621bfe 100644
--- a/widgets/text/e-text-model-test.c
+++ b/widgets/text/e-text-model-test.c
@@ -24,7 +24,7 @@
 #include <gnome.h>
 
 #include "e-util/e-util.h"
-#include "widgets/misc/e-canvas.h"
+#include "misc/e-canvas.h"
 
 #include "e-text-model.h"
 #include "e-text-model-uri.h"
diff --git a/widgets/text/e-text-test.c b/widgets/text/e-text-test.c
index f80f361768..56cd7a974c 100644
--- a/widgets/text/e-text-test.c
+++ b/widgets/text/e-text-test.c
@@ -23,8 +23,8 @@
 
 #include <gnome.h>
 
-#include "widgets/misc/e-canvas.h"
-#include "widgets/misc/e-unicode.h"
+#include "misc/e-canvas.h"
+#include "misc/e-unicode.h"
 
 #include "e-text.h"
 
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index d1bf3eb59e..8e39c7e5d2 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -49,9 +49,9 @@
 #include <libart_lgpl/art_rgb_bitmap_affine.h>
 
 #include "a11y/e-text/gal-a11y-e-text.h"
-#include "widgets/misc/e-canvas.h"
-#include "widgets/misc/e-canvas-utils.h"
-#include "widgets/misc/e-unicode.h"
+#include "misc/e-canvas.h"
+#include "misc/e-canvas-utils.h"
+#include "misc/e-unicode.h"
 #include "e-util/e-i18n.h"
 #include "e-util/e-text-event-processor-emacs-like.h"
 #include "e-util/e-util.h"
diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h
index 633db2c659..b72a299195 100644
--- a/widgets/text/e-text.h
+++ b/widgets/text/e-text.h
@@ -41,7 +41,7 @@
 
 #include <e-util/e-text-event-processor.h>
 #include <text/e-text-model.h>
-#include <widgets/misc/e-canvas.h>
+#include <misc/e-canvas.h>
 
 G_BEGIN_DECLS