The EExtension framework is now in libebackend.

The EModule, EExtensible and EExtension classes as well as the
e_type_traverse() function have been moved to Evolution-Data-Server's
libebackend library to replace e-data-server-module.c.

Now Evolution-Data-Server modules use the same framework as Evolution.

63 files changed, 245 insertions, 1229 deletions

diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index d5190ba8ba..42b8acef63 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -35,10 +35,10 @@
 #include <glib/gi18n-lib.h>
 #include <glib/gstdio.h>
 #include <gdk/gdkkeysyms.h>
+#include <libebackend/e-extensible.h>
 #include <e-util/e-util.h>
 #include <e-util/e-alert-sink.h>
 #include <e-util/e-dialog-utils.h>
-#include <e-util/e-extensible.h>
 #include <e-util/e-util-private.h>
 #include <e-util/gconf-bridge.h>
 #include <shell/e-shell.h>
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 1ab56926cd..637d0f504e 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -28,6 +28,7 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
+#include <libebackend/e-extensible.h>
 #include <libedataserver/e-flag.h>
 #include <libedataserver/e-time-utils.h>
 #include <libecal/e-cal-client-view.h>
@@ -38,7 +39,6 @@
 #include "misc.h"
 #include "e-util/e-util.h"
 #include "e-util/e-account-utils.h"
-#include "e-util/e-extensible.h"
 #include "e-util/e-util-enumtypes.h"
 
 typedef struct {
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 82bbea2f79..b70df8b019 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -30,11 +30,11 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gdk/gdkkeysyms.h>
+#include <libebackend/e-extensible.h>
 #include <libedataserver/e-time-utils.h>
 #include <libedataserverui/e-client-utils.h>
 #include <e-util/e-util.h>
 #include <e-util/e-alert-dialog.h>
-#include <e-util/e-extensible.h>
 #include <e-util/e-selection.h>
 #include <e-util/e-datetime-format.h>
 #include <e-util/e-dialog-utils.h>
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index 51ce798a8b..7e5fbf215e 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -31,10 +31,10 @@
 #include <libecal/e-cal-component.h>
 #include <libecal/e-cal-util.h>
 #include <libecal/e-cal-time-util.h>
+#include <libebackend/e-extensible.h>
 #include <libedataserver/e-data-server-util.h>
 #include <libedataserver/e-proxy.h>
 #include <libedataserverui/e-passwords.h>
-#include <e-util/e-extensible.h>
 #include <e-util/e-account-utils.h>
 #include <e-util/e-util-enumtypes.h>
 #include "itip-utils.h"
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 9afdfd7a22..36e7ad7d42 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -31,15 +31,15 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
-#include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
+#include <libebackend/e-extensible.h>
 #include <libgnomecanvas/libgnomecanvas.h>
 
 #include "misc/e-canvas.h"
 #include "misc/e-canvas-utils.h"
-
 #include "misc/e-dateedit.h"
-#include "e-util/e-extensible.h"
+
 #include "e-util/e-util.h"
 
 #include "e-meeting-utils.h"
diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
index 229897756f..35eb26696b 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -33,12 +33,13 @@
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 
+#include <libebackend/e-extensible.h>
+
 #include "e-composer-actions.h"
 #include "e-composer-activity.h"
 #include "e-composer-header-table.h"
 #include "e-util/e-alert-sink.h"
 #include "e-util/e-charset.h"
-#include "e-util/e-extensible.h"
 #include "e-util/e-marshal.h"
 #include "e-util/e-mktemp.h"
 #include "e-util/e-plugin-ui.h"
diff --git a/configure.ac b/configure.ac
index ac19503fc5..0368b16f07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1232,7 +1232,7 @@ AC_SUBST(CERT_UI_LIBS)
 dnl ************
 dnl E_UTIL Flags
 dnl ************
-EVO_SET_COMPILE_FLAGS(E_UTIL, libedataserverui-3.0 camel-provider-1.2 $mozilla_nspr, $MANUAL_NSPR_CFLAGS $MANUAL_NSPR_LIBS)
+EVO_SET_COMPILE_FLAGS(E_UTIL, libebackend-1.2 libedataserverui-3.0 camel-provider-1.2 $mozilla_nspr, $MANUAL_NSPR_CFLAGS $MANUAL_NSPR_LIBS)
 AC_SUBST(E_UTIL_CFLAGS)
 AC_SUBST(E_UTIL_LIBS)
 
diff --git a/doc/reference/shell/eshell-docs.sgml b/doc/reference/shell/eshell-docs.sgml
index 5451736723..666da0276e 100644
--- a/doc/reference/shell/eshell-docs.sgml
+++ b/doc/reference/shell/eshell-docs.sgml
@@ -47,13 +47,6 @@
   </chapter>
 
   <chapter>
-    <title>Extending Evolution</title>
-    <xi:include href="xml/e-module.xml"/>
-    <xi:include href="xml/e-extension.xml"/>
-    <xi:include href="xml/e-extensible.xml"/>
-  </chapter>
-
-  <chapter>
     <title>Actions</title>
     <xi:include href="xml/shell-actions.xml"/>
     <xi:include href="xml/action-groups.xml"/>
diff --git a/doc/reference/shell/eshell-sections.txt b/doc/reference/shell/eshell-sections.txt
index 6e23f58f15..131341980e 100644
--- a/doc/reference/shell/eshell-sections.txt
+++ b/doc/reference/shell/eshell-sections.txt
@@ -854,41 +854,6 @@ e_dialog_combo_box_get
 </SECTION>
 
 <SECTION>
-<FILE>e-extensible</FILE>
-<TITLE>EExtensible</TITLE>
-EExtensible
-e_extensible_load_extensions
-e_extensible_list_extensions
-<SUBSECTION Standard>
-E_EXTENSIBLE
-E_IS_EXTENSIBLE
-E_TYPE_EXTENSIBLE
-E_EXTENSIBLE_INTERFACE
-E_IS_EXTENSIBLE_INTERFACE
-E_EXTENSIBLE_GET_INTERFACE
-EExtensibleInterface
-e_extensible_get_type
-</SECTION>
-
-<SECTION>
-<FILE>e-extension</FILE>
-<TITLE>EExtension</TITLE>
-EExtension
-e_extension_get_extensible
-<SUBSECTION Standard>
-E_EXTENSION
-E_IS_EXTENSION
-E_TYPE_EXTENSION
-E_EXTENSION_CLASS
-E_IS_EXTENSION_CLASS
-E_EXTENSION_GET_CLASS
-EExtensionClass
-e_extension_get_type
-<SUBSECTION Private>
-EExtensionPrivate
-</SECTION>
-
-<SECTION>
 <FILE>e-html-utils</FILE>
 <TITLE>Text to HTML Conversion</TITLE>
 E_TEXT_TO_HTML_PRE
@@ -913,26 +878,6 @@ e_icon_factory_create_thumbnail
 </SECTION>
 
 <SECTION>
-<FILE>e-module</FILE>
-<TITLE>EModule</TITLE>
-EModule
-e_module_new
-e_module_get_filename
-e_module_load_all_in_directory
-<SUBSECTION Standard>
-E_MODULE
-E_IS_MODULE
-E_TYPE_MODULE
-E_MODULE_CLASS
-E_IS_MODULE_CLASS
-E_MODULE_GET_CLASS
-EModuleClass
-e_module_get_type
-<SUBSECTION Private>
-EModulePrivate
-</SECTION>
-
-<SECTION>
 <FILE>e-poolv</FILE>
 <TITLE>EPoolv</TITLE>
 EPoolv
@@ -1137,7 +1082,6 @@ e_action_compare_by_label
 e_action_group_remove_all_actions
 e_radio_action_get_current_action
 e_categories_add_change_hook
-e_type_traverse
 e_str_without_underscores
 e_str_compare
 e_str_case_compare
diff --git a/doc/reference/shell/eshell.types b/doc/reference/shell/eshell.types
index 51b7c7693e..4e01f342e8 100644
--- a/doc/reference/shell/eshell.types
+++ b/doc/reference/shell/eshell.types
@@ -1,7 +1,4 @@
 e_bit_array_get_type
-e_extensible_get_type
-e_extension_get_type
-e_module_get_type
 e_signature_get_type
 e_signature_list_get_type
 e_shell_get_type
diff --git a/doc/reference/shell/tmpl/e-extensible.sgml b/doc/reference/shell/tmpl/e-extensible.sgml
deleted file mode 100644
index 333d8238fc..0000000000
--- a/doc/reference/shell/tmpl/e-extensible.sgml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-EExtensible
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT EExtensible ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION e_extensible_load_extensions ##### -->
-<para>
-
-</para>
-
-@extensible: 
-
-
-<!-- ##### FUNCTION e_extensible_list_extensions ##### -->
-<para>
-
-</para>
-
-@extensible: 
-@extension_type: 
-@Returns: 
-
-
diff --git a/doc/reference/shell/tmpl/e-extension.sgml b/doc/reference/shell/tmpl/e-extension.sgml
deleted file mode 100644
index 49a3a13b70..0000000000
--- a/doc/reference/shell/tmpl/e-extension.sgml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-EExtension
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT EExtension ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG EExtension:extensible ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION e_extension_get_extensible ##### -->
-<para>
-
-</para>
-
-@extension: 
-@Returns: 
-
-
diff --git a/doc/reference/shell/tmpl/e-module.sgml b/doc/reference/shell/tmpl/e-module.sgml
deleted file mode 100644
index eedd4e4477..0000000000
--- a/doc/reference/shell/tmpl/e-module.sgml
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-EModule
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT EModule ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG EModule:filename ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION e_module_new ##### -->
-<para>
-
-</para>
-
-@filename: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_module_get_filename ##### -->
-<para>
-
-</para>
-
-@module: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_module_load_all_in_directory ##### -->
-<para>
-
-</para>
-
-@dirname: 
-@Returns: 
-
-
diff --git a/doc/reference/shell/tmpl/e-util.sgml b/doc/reference/shell/tmpl/e-util.sgml
index 2cddc59a1c..7adb70cb39 100644
--- a/doc/reference/shell/tmpl/e-util.sgml
+++ b/doc/reference/shell/tmpl/e-util.sgml
@@ -103,16 +103,6 @@ Miscellaneous Utilities
 @object: 
 
 
-<!-- ##### FUNCTION e_type_traverse ##### -->
-<para>
-
-</para>
-
-@parent_type: 
-@func: 
-@user_data: 
-
-
 <!-- ##### FUNCTION e_str_without_underscores ##### -->
 <para>
 
diff --git a/doc/reference/shell/tmpl/eshell-unused.sgml b/doc/reference/shell/tmpl/eshell-unused.sgml
index bc13bf3a87..21f8c4afcd 100644
--- a/doc/reference/shell/tmpl/eshell-unused.sgml
+++ b/doc/reference/shell/tmpl/eshell-unused.sgml
@@ -26,6 +26,62 @@
 GObject Property Bindings
 
 
+<!-- ##### SECTION ./tmpl/e-extensible.sgml:Image ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-extensible.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/e-extensible.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/e-extensible.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-extensible.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-extensible.sgml:Title ##### -->
+EExtensible
+
+
+<!-- ##### SECTION ./tmpl/e-extension.sgml:Image ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-extension.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/e-extension.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/e-extension.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-extension.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-extension.sgml:Title ##### -->
+EExtension
+
+
 <!-- ##### SECTION ./tmpl/e-logger.sgml:Image ##### -->
 
 
@@ -54,6 +110,34 @@ GObject Property Bindings
 Error Logging
 
 
+<!-- ##### SECTION ./tmpl/e-module.sgml:Image ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-module.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/e-module.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/e-module.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-module.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-module.sgml:Title ##### -->
+EModule
+
+
 <!-- ##### SECTION ./tmpl/e-shell-window.sgml.sgml.sgml.sgml:Image ##### -->
 
 
@@ -154,6 +238,24 @@ e-shell-window.sgml
 @user_data: 
 @Returns: 
 
+<!-- ##### STRUCT EExtensible ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT EExtension ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EExtension:extensible ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### USER_FUNCTION ELogFunction ##### -->
 <para>
 
@@ -183,6 +285,18 @@ e-shell-window.sgml
 </para>
 
 
+<!-- ##### STRUCT EModule ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EModule:filename ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### STRUCT EMutualBinding ##### -->
 <para>
 
@@ -437,6 +551,30 @@ e-shell-window.sgml
 
 @binding: 
 
+<!-- ##### FUNCTION e_extensible_list_extensions ##### -->
+<para>
+
+</para>
+
+@extensible: 
+@extension_type: 
+@Returns: 
+
+<!-- ##### FUNCTION e_extensible_load_extensions ##### -->
+<para>
+
+</para>
+
+@extensible: 
+
+<!-- ##### FUNCTION e_extension_get_extensible ##### -->
+<para>
+
+</para>
+
+@extension: 
+@Returns: 
+
 <!-- ##### FUNCTION e_get_gnome2_user_dir ##### -->
 <para>
 
@@ -488,6 +626,30 @@ e-shell-window.sgml
 @name: 
 @Returns: 
 
+<!-- ##### FUNCTION e_module_get_filename ##### -->
+<para>
+
+</para>
+
+@module: 
+@Returns: 
+
+<!-- ##### FUNCTION e_module_load_all_in_directory ##### -->
+<para>
+
+</para>
+
+@dirname: 
+@Returns: 
+
+<!-- ##### FUNCTION e_module_new ##### -->
+<para>
+
+</para>
+
+@filename: 
+@Returns: 
+
 <!-- ##### FUNCTION e_mutual_binding_new ##### -->
 <para>
 
@@ -582,6 +744,15 @@ e-shell-window.sgml
 @key: 
 @Returns: 
 
+<!-- ##### FUNCTION e_type_traverse ##### -->
+<para>
+
+</para>
+
+@parent_type: 
+@func: 
+@user_data: 
+
 <!-- ##### FUNCTION get_font_options ##### -->
 <para>
 
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 53614e3b06..42fda2d9dd 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -31,15 +31,12 @@ eutilinclude_HEADERS = 				\
 	e-dialog-utils.h			\
 	e-dialog-widgets.h			\
 	e-event.h				\
-	e-extensible.h				\
-	e-extension.h				\
 	e-file-utils.h				\
 	e-html-utils.h				\
 	e-icon-factory.h			\
 	e-import.h				\
 	e-marshal.h				\
 	e-mktemp.h				\
-	e-module.h				\
 	e-poolv.h				\
 	e-print.h				\
 	e-plugin.h				\
@@ -106,15 +103,12 @@ libeutil_la_SOURCES =				\
 	e-dialog-utils.c			\
 	e-dialog-widgets.c			\
 	e-event.c				\
-	e-extensible.c				\
-	e-extension.c				\
 	e-file-utils.c				\
 	e-html-utils.c				\
 	e-icon-factory.c			\
 	e-import.c				\
 	e-marshal.c				\
 	e-mktemp.c				\
-	e-module.c				\
 	e-poolv.c				\
 	e-plugin.c				\
 	e-plugin-ui.c				\
diff --git a/e-util/e-extensible.c b/e-util/e-extensible.c
deleted file mode 100644
index a7523deb21..0000000000
--- a/e-util/e-extensible.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * e-extensible.c
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- */
-
-/**
- * SECTION: e-extensible
- * @short_description: an interface for extending objects
- * @include: e-util/e-extensible.h
- *
- * #EExtension objects can be tacked on to any #GObject instance that
- * implements the #EExtensible interface.  A #GObject type can be made
- * extensible in two steps:
- *
- * 1. Add the #EExtensible interface when registering the #GType.
- *    There are no methods to implement.
- *
- * <informalexample>
- * <programlisting>
- * #include <e-util/e-extensible.h>
- *
- * G_DEFINE_TYPE_WITH_CODE (
- *         ECustomWidget, e_custom_widget, GTK_TYPE_WIDGET,
- *         G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL))
- * </programlisting>
- * </informalexample>
- *
- * 2. Load extensions for the class at some point during #GObject
- *    initialization.  Generally this should be done toward the end of
- *    the initialization code, so extensions get a fully initialized
- *    object to work with.
- *
- * <informalexample>
- * <programlisting>
- * static void
- * e_custom_widget_init (ECustomWidget *widget)
- * {
- *         Initialization code goes here...
- *
- *         e_extensible_load_extensions (E_EXTENSIBLE (widget));
- * }
- * </programlisting>
- * </informalexample>
- **/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-extensible.h"
-
-#include <e-util/e-util.h>
-#include <e-util/e-extension.h>
-
-#define IS_AN_EXTENSION_TYPE(type) \
-	(g_type_is_a ((type), E_TYPE_EXTENSION))
-
-static GQuark extensible_quark;
-
-G_DEFINE_INTERFACE (
-	EExtensible,
-	e_extensible,
-	G_TYPE_OBJECT)
-
-static GPtrArray *
-extensible_get_extensions (EExtensible *extensible)
-{
-	return g_object_get_qdata (G_OBJECT (extensible), extensible_quark);
-}
-
-static void
-extensible_load_extension (GType extension_type,
-                           EExtensible *extensible)
-{
-	EExtensionClass *extension_class;
-	GType extensible_type;
-	GPtrArray *extensions;
-	EExtension *extension;
-
-	extensible_type = G_OBJECT_TYPE (extensible);
-	extension_class = g_type_class_ref (extension_type);
-
-	/* Only load extensions that extend the given extensible object. */
-	if (!g_type_is_a (extensible_type, extension_class->extensible_type))
-		goto exit;
-
-	extension = g_object_new (
-		extension_type, "extensible", extensible, NULL);
-
-	extensions = extensible_get_extensions (extensible);
-	g_ptr_array_add (extensions, extension);
-
-exit:
-	g_type_class_unref (extension_class);
-}
-
-static void
-e_extensible_default_init (EExtensibleInterface *interface)
-{
-	extensible_quark = g_quark_from_static_string ("e-extensible-quark");
-}
-
-/**
- * e_extensible_load_extensions:
- * @extensible: an #EExtensible
- *
- * Creates an instance of all instantiable subtypes of #EExtension which
- * target the class of @extensible.  The lifetimes of these newly created
- * #EExtension objects are bound to @extensible such that they are finalized
- * when @extensible is finalized.
- **/
-void
-e_extensible_load_extensions (EExtensible *extensible)
-{
-	GPtrArray *extensions;
-
-	g_return_if_fail (E_IS_EXTENSIBLE (extensible));
-
-	if (extensible_get_extensions (extensible) != NULL)
-		return;
-
-	extensions = g_ptr_array_new_with_free_func (
-		(GDestroyNotify) g_object_unref);
-
-	g_object_set_qdata_full (
-		G_OBJECT (extensible), extensible_quark,
-		extensions, (GDestroyNotify) g_ptr_array_unref);
-
-	e_type_traverse (
-		E_TYPE_EXTENSION, (ETypeFunc)
-		extensible_load_extension, extensible);
-}
-
-/**
- * e_extensible_list_extensions:
- * @extensible: an #EExtensible
- * @extension_type: the type of extensions to list
- *
- * Returns a list of #EExtension objects bound to @extensible whose
- * types are ancestors of @extension_type.  For a complete list of
- * extension objects bound to @extensible, pass %E_TYPE_EXTENSION.
- *
- * The list itself should be freed with g_list_free().  The extension
- * objects are owned by @extensible and should not be unreferenced.
- *
- * Returns: a list of extension objects derived from @extension_type
- **/
-GList *
-e_extensible_list_extensions (EExtensible *extensible,
-                              GType extension_type)
-{
-	GPtrArray *extensions;
-	GList *list = NULL;
-	guint ii;
-
-	g_return_val_if_fail (E_IS_EXTENSIBLE (extensible), NULL);
-	g_return_val_if_fail (IS_AN_EXTENSION_TYPE (extension_type), NULL);
-
-	e_extensible_load_extensions (extensible);
-
-	extensions = extensible_get_extensions (extensible);
-	g_return_val_if_fail (extensions != NULL, NULL);
-
-	for (ii = 0; ii < extensions->len; ii++) {
-		GObject *object;
-
-		object = g_ptr_array_index (extensions, ii);
-		if (g_type_is_a (G_OBJECT_TYPE (object), extension_type))
-			list = g_list_prepend (list, object);
-	}
-
-	return g_list_reverse (list);
-}
diff --git a/e-util/e-extensible.h b/e-util/e-extensible.h
deleted file mode 100644
index 6dd6294212..0000000000
--- a/e-util/e-extensible.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * e-extensible.h
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#ifndef E_EXTENSIBLE_H
-#define E_EXTENSIBLE_H
-
-#include <glib-object.h>
-
-/* Standard GObject macros */
-#define E_TYPE_EXTENSIBLE \
-	(e_extensible_get_type ())
-#define E_EXTENSIBLE(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_TYPE_EXTENSIBLE, EExtensible))
-#define E_EXTENSIBLE_INTERFACE(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), E_TYPE_EXTENSIBLE, EExtensibleInterface))
-#define E_IS_EXTENSIBLE(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_TYPE_EXTENSIBLE))
-#define E_IS_EXTENSIBLE_INTERFACE(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_TYPE_EXTENSIBLE))
-#define E_EXTENSIBLE_GET_INTERFACE(obj) \
-	(G_TYPE_INSTANCE_GET_INTERFACE \
-	((obj), E_TYPE_EXTENSIBLE, EExtensibleInterface))
-
-G_BEGIN_DECLS
-
-typedef struct _EExtensible EExtensible;
-typedef struct _EExtensibleInterface EExtensibleInterface;
-
-struct _EExtensibleInterface {
-	GTypeInterface parent_interface;
-};
-
-GType		e_extensible_get_type		(void);
-void		e_extensible_load_extensions	(EExtensible *extensible);
-GList *		e_extensible_list_extensions	(EExtensible *extensible,
-						 GType extension_type);
-
-G_END_DECLS
-
-#endif /* E_EXTENSIBLE_H */
diff --git a/e-util/e-extension.c b/e-util/e-extension.c
deleted file mode 100644
index 88912bc8dd..0000000000
--- a/e-util/e-extension.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * e-extension.c
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- */
-
-/**
- * SECTION: e-extension
- * @short_description: abstract base class for extensions
- * @include: e-util/e-extension.h
- *
- * #EExtension provides a way to extend the functionality of objects
- * that implement the #EExtensible interface.  #EExtension subclasses
- * can target a particular extensible object type.  New instances of
- * an extensible object type get paired with a new instance of each
- * #EExtension subclass that targets the extensible object type.
- *
- * The first steps of writing a new extension are as follows:
- *
- * 1. Subclass #EExtension.
- *
- * 2. In the class initialization function, specify the #GType being
- *    extended.  The #GType must implement the #EExtensible interface.
- *
- * 3. Register the extension's own #GType.  If the extension is to
- *    be loaded dynamically using #GTypeModule, the type should be
- *    registered in the library module's e_module_load() function.
- **/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-extension.h"
-
-struct _EExtensionPrivate {
-	gpointer extensible;  /* weak pointer */
-};
-
-enum {
-	PROP_0,
-	PROP_EXTENSIBLE
-};
-
-G_DEFINE_ABSTRACT_TYPE (
-	EExtension,
-	e_extension,
-	G_TYPE_OBJECT)
-
-static void
-extension_set_extensible (EExtension *extension,
-                          EExtensible *extensible)
-{
-	EExtensionClass *class;
-	GType extensible_type;
-
-	g_return_if_fail (E_IS_EXTENSIBLE (extensible));
-	g_return_if_fail (extension->priv->extensible == NULL);
-
-	class = E_EXTENSION_GET_CLASS (extension);
-	extensible_type = G_OBJECT_TYPE (extensible);
-
-	/* Verify the EExtensible object is the type we want. */
-	if (!g_type_is_a (extensible_type, class->extensible_type)) {
-		g_warning ("%s is meant to extend %s but was given an %s",
-			G_OBJECT_TYPE_NAME (extension),
-			g_type_name (class->extensible_type),
-			g_type_name (extensible_type));
-		return;
-	}
-
-	extension->priv->extensible = extensible;
-
-	g_object_add_weak_pointer (
-		G_OBJECT (extensible), &extension->priv->extensible);
-}
-
-static void
-extension_set_property (GObject *object,
-                        guint property_id,
-                        const GValue *value,
-                        GParamSpec *pspec)
-{
-	switch (property_id) {
-		case PROP_EXTENSIBLE:
-			extension_set_extensible (
-				E_EXTENSION (object),
-				g_value_get_object (value));
-			return;
-	}
-
-	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-}
-
-static void
-extension_get_property (GObject *object,
-                        guint property_id,
-                        GValue *value,
-                        GParamSpec *pspec)
-{
-	switch (property_id) {
-		case PROP_EXTENSIBLE:
-			g_value_set_object (
-				value, e_extension_get_extensible (
-				E_EXTENSION (object)));
-			return;
-	}
-
-	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-}
-
-static void
-extension_dispose (GObject *object)
-{
-	EExtensionPrivate *priv;
-
-	priv = E_EXTENSION (object)->priv;
-
-	if (priv->extensible != NULL) {
-		g_object_remove_weak_pointer (
-			G_OBJECT (priv->extensible), &priv->extensible);
-		priv->extensible = NULL;
-	}
-
-	/* Chain up to parent's dispose() method. */
-	G_OBJECT_CLASS (e_extension_parent_class)->dispose (object);
-}
-
-static void
-e_extension_class_init (EExtensionClass *class)
-{
-	GObjectClass *object_class;
-
-	g_type_class_add_private (class, sizeof (EExtensionPrivate));
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->set_property = extension_set_property;
-	object_class->get_property = extension_get_property;
-	object_class->dispose = extension_dispose;
-
-	g_object_class_install_property (
-		object_class,
-		PROP_EXTENSIBLE,
-		g_param_spec_object (
-			"extensible",
-			"Extensible Object",
-			"The object being extended",
-			E_TYPE_EXTENSIBLE,
-			G_PARAM_READWRITE |
-			G_PARAM_CONSTRUCT_ONLY));
-}
-
-static void
-e_extension_init (EExtension *extension)
-{
-	extension->priv = G_TYPE_INSTANCE_GET_PRIVATE (
-		extension, E_TYPE_EXTENSION, EExtensionPrivate);
-}
-
-/**
- * e_extension_get_extensible:
- * @extension: an #EExtension
- *
- * Returns the object that @extension extends.
- *
- * Returns: the object being extended
- **/
-EExtensible *
-e_extension_get_extensible (EExtension *extension)
-{
-	g_return_val_if_fail (E_IS_EXTENSION (extension), NULL);
-
-	return E_EXTENSIBLE (extension->priv->extensible);
-}
diff --git a/e-util/e-extension.h b/e-util/e-extension.h
deleted file mode 100644
index bce2980e0e..0000000000
--- a/e-util/e-extension.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * e-extension.h
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#ifndef E_EXTENSION_H
-#define E_EXTENSION_H
-
-#include <e-util/e-extensible.h>
-
-/* Standard GObject macros */
-#define E_TYPE_EXTENSION \
-	(e_extension_get_type ())
-#define E_EXTENSION(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_TYPE_EXTENSION, EExtension))
-#define E_EXTENSION_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), E_TYPE_EXTENSION, EExtensionClass))
-#define E_IS_EXTENSION(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_TYPE_EXTENSION))
-#define E_IS_EXTENSION_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_TYPE_EXTENSION))
-#define E_EXTENSION_GET_CLASS(obj) \
-	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), E_TYPE_EXTENSION, EExtensionClass))
-
-G_BEGIN_DECLS
-
-typedef struct _EExtension EExtension;
-typedef struct _EExtensionClass EExtensionClass;
-typedef struct _EExtensionPrivate EExtensionPrivate;
-
-/**
- * EExtension:
- *
- * Contains only private data that should be read and manipulated using the
- * functions below.
- **/
-struct _EExtension {
-	GObject parent;
-	EExtensionPrivate *priv;
-};
-
-struct _EExtensionClass {
-	GObjectClass parent_class;
-
-	/* The type to extend. */
-	GType extensible_type;
-};
-
-GType		e_extension_get_type		(void);
-EExtensible *	e_extension_get_extensible	(EExtension *extension);
-
-G_END_DECLS
-
-#endif /* E_EXTENSION_H */
diff --git a/e-util/e-module.c b/e-util/e-module.c
deleted file mode 100644
index 46486080d6..0000000000
--- a/e-util/e-module.c
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * e-module.c
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-/**
- * SECTION: e-module
- * @short_description: a module loader
- * @include: e-util/e-module.h
- **/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-module.h"
-
-#include <glib/gi18n.h>
-
-/* This is the symbol we call when loading a module. */
-#define LOAD_SYMBOL	"e_module_load"
-
-/* This is the symbol we call when unloading a module. */
-#define UNLOAD_SYMBOL	"e_module_unload"
-
-struct _EModulePrivate {
-	GModule *module;
-	gchar *filename;
-
-	void (*load) (GTypeModule *type_module);
-	void (*unload) (GTypeModule *type_module);
-};
-
-enum {
-	PROP_0,
-	PROP_FILENAME
-};
-
-G_DEFINE_TYPE (
-	EModule,
-	e_module,
-	G_TYPE_TYPE_MODULE)
-
-static void
-module_set_filename (EModule *module,
-                     const gchar *filename)
-{
-	g_return_if_fail (module->priv->filename == NULL);
-
-	module->priv->filename = g_strdup (filename);
-}
-
-static void
-module_set_property (GObject *object,
-                     guint property_id,
-                     const GValue *value,
-                     GParamSpec *pspec)
-{
-	switch (property_id) {
-		case PROP_FILENAME:
-			module_set_filename (
-				E_MODULE (object),
-				g_value_get_string (value));
-			return;
-	}
-
-	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-}
-
-static void
-module_get_property (GObject *object,
-                     guint property_id,
-                     GValue *value,
-                     GParamSpec *pspec)
-{
-	switch (property_id) {
-		case PROP_FILENAME:
-			g_value_set_string (
-				value, e_module_get_filename (
-				E_MODULE (object)));
-			return;
-	}
-
-	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-}
-
-static void
-module_finalize (GObject *object)
-{
-	EModulePrivate *priv;
-
-	priv = E_MODULE (object)->priv;
-
-	g_free (priv->filename);
-
-	/* Chain up to parent's finalize() method. */
-	G_OBJECT_CLASS (e_module_parent_class)->finalize (object);
-}
-
-static gboolean
-module_load (GTypeModule *type_module)
-{
-	EModulePrivate *priv;
-	gpointer symbol;
-
-	priv = E_MODULE (type_module)->priv;
-
-	g_return_val_if_fail (priv->filename != NULL, FALSE);
-	priv->module = g_module_open (priv->filename, 0);
-
-	if (priv->module == NULL)
-		goto fail;
-
-	if (!g_module_symbol (priv->module, LOAD_SYMBOL, &symbol))
-		goto fail;
-
-	priv->load = symbol;
-
-	if (!g_module_symbol (priv->module, UNLOAD_SYMBOL, &symbol))
-		goto fail;
-
-	priv->unload = symbol;
-
-	priv->load (type_module);
-
-	/* XXX This is a Band-Aid for a design flaw in EExtension.  If the
-	 *     "extensible_type" member of EExtensionClass is set to a GType
-	 *     that hasn't already been registered, then when the extension's
-	 *     module is unloaded the GType registration that was triggered
-	 *     by setting "extensible_type" will be invalidated and cause
-	 *     Evolution to malfunction when the module is loaded again.
-	 *
-	 *     Extension modules get loaded and unloaded repeatedly by
-	 *     e_extensible_load_extensions(), which temporarily references
-	 *     all extension classes and picks out the ones it needs for a
-	 *     given EExtensible instance based on the "extensible_type"
-	 *     class member.
-	 *
-	 *     Making the module resident prevents the aforementioned GType
-	 *     registration from being invalidated when the extension class
-	 *     is unreferenced.
-	 */
-	g_module_make_resident (priv->module);
-
-	return TRUE;
-
-fail:
-	g_warning ("%s", g_module_error ());
-
-	if (priv->module != NULL)
-		g_module_close (priv->module);
-
-	return FALSE;
-}
-
-static void
-module_unload (GTypeModule *type_module)
-{
-	EModulePrivate *priv;
-
-	priv = E_MODULE (type_module)->priv;
-
-	priv->unload (type_module);
-
-	g_module_close (priv->module);
-	priv->module = NULL;
-
-	priv->load = NULL;
-	priv->unload = NULL;
-}
-
-static void
-e_module_class_init (EModuleClass *class)
-{
-	GObjectClass *object_class;
-	GTypeModuleClass *type_module_class;
-
-	g_type_class_add_private (class, sizeof (EModulePrivate));
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->set_property = module_set_property;
-	object_class->get_property = module_get_property;
-	object_class->finalize = module_finalize;
-
-	type_module_class = G_TYPE_MODULE_CLASS (class);
-	type_module_class->load = module_load;
-	type_module_class->unload = module_unload;
-
-	/**
-	 * EModule:filename
-	 *
-	 * The filename of the module.
-	 **/
-	g_object_class_install_property (
-		object_class,
-		PROP_FILENAME,
-		g_param_spec_string (
-			"filename",
-			"Filename",
-			"The filename of the module",
-			NULL,
-			G_PARAM_READWRITE |
-			G_PARAM_CONSTRUCT_ONLY));
-}
-
-static void
-e_module_init (EModule *module)
-{
-	module->priv = G_TYPE_INSTANCE_GET_PRIVATE (
-		module, E_TYPE_MODULE, EModulePrivate);
-}
-
-/**
- * e_module_new:
- * @filename: filename of the shared library module
- *
- * Creates a new #EModule that will load the specific shared library
- * when in use.
- *
- * Returns: a new #EModule for @filename
- **/
-EModule *
-e_module_new (const gchar *filename)
-{
-	g_return_val_if_fail (filename != NULL, NULL);
-
-	return g_object_new (E_TYPE_MODULE, "filename", filename, NULL);
-}
-
-/**
- * e_module_get_filename:
- * @module: an #EModule
- *
- * Returns the filename of the shared library for @module.  The
- * string is owned by @module and should not be modified or freed.
- *
- * Returns: the filename for @module
- **/
-const gchar *
-e_module_get_filename (EModule *module)
-{
-	g_return_val_if_fail (E_IS_MODULE (module), NULL);
-
-	return module->priv->filename;
-}
-
-/**
- * e_module_load_all_in_directory:
- * @dirname: pathname for a directory containing modules to load
- *
- * Loads all the modules in the specified directory into memory.  If
- * you want to unload them (enabling on-demand loading) you must call
- * g_type_module_unuse() on all the modules.  Free the returned list
- * with g_list_free().
- *
- * Returns: a list of #EModules loaded from @dirname
- **/
-GList *
-e_module_load_all_in_directory (const gchar *dirname)
-{
-	GDir *dir;
-	const gchar *basename;
-	GList *loaded_modules = NULL;
-	GError *error = NULL;
-
-	g_return_val_if_fail (dirname != NULL, NULL);
-
-	if (!g_module_supported ())
-		return NULL;
-
-	dir = g_dir_open (dirname, 0, &error);
-	if (dir == NULL) {
-		g_warning ("%s", error->message);
-		g_error_free (error);
-		return NULL;
-	}
-
-	while ((basename = g_dir_read_name (dir)) != NULL) {
-		EModule *module;
-		gchar *filename;
-
-		if (!g_str_has_suffix (basename, "." G_MODULE_SUFFIX))
-			continue;
-
-		filename = g_build_filename (dirname, basename, NULL);
-
-		module = e_module_new (filename);
-
-		if (!g_type_module_use (G_TYPE_MODULE (module))) {
-			g_printerr ("Failed to load module: %s\n", filename);
-			g_object_unref (module);
-			g_free (filename);
-			continue;
-		}
-
-		g_free (filename);
-
-		loaded_modules = g_list_prepend (loaded_modules, module);
-	}
-
-	g_dir_close (dir);
-
-	return loaded_modules;
-}
diff --git a/e-util/e-module.h b/e-util/e-module.h
deleted file mode 100644
index dc96bb34d9..0000000000
--- a/e-util/e-module.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * e-module.h
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef E_MODULE_H
-#define E_MODULE_H
-
-#include <gmodule.h>
-#include <glib-object.h>
-
-/* Standard GObject macros */
-#define E_TYPE_MODULE \
-	(e_module_get_type ())
-#define E_MODULE(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_TYPE_MODULE, EModule))
-#define E_MODULE_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), E_TYPE_MODULE, EModuleClass))
-#define E_IS_MODULE(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_TYPE_MODULE))
-#define E_IS_MODULE_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_TYPE_MODULE))
-#define E_MODULE_GET_CLASS(obj) \
-	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), E_TYPE_MODULE, EModuleClass))
-
-G_BEGIN_DECLS
-
-typedef struct _EModule EModule;
-typedef struct _EModuleClass EModuleClass;
-typedef struct _EModulePrivate EModulePrivate;
-
-/**
- * EModule:
- *
- * Contains only private data that should be read and manipulated using the
- * functions below.
- **/
-struct _EModule {
-	GTypeModule parent;
-	EModulePrivate *priv;
-};
-
-struct _EModuleClass {
-	GTypeModuleClass parent_class;
-};
-
-GType		e_module_get_type		(void);
-EModule *	e_module_new			(const gchar *filename);
-const gchar *	e_module_get_filename		(EModule *module);
-GList *		e_module_load_all_in_directory	(const gchar *dirname);
-
-G_END_DECLS
-
-#endif /* E_MODULE_H */
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index 17650f045a..a19dc879b3 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -27,12 +27,12 @@
 
 #include <gconf/gconf-client.h>
 
+#include <libebackend/e-module.h>
 #include <libedataserver/e-data-server-util.h>
 #include <libedataserver/e-xml-utils.h>
 
 #include "e-plugin.h"
 #include "e-util-private.h"
-#include "e-util.h"
 
 /* plugin debug */
 #define pd(x)
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 8ededeeb9d..cd489849e4 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -489,47 +489,6 @@ e_categories_add_change_hook (GHookFunc func,
 }
 
 /**
- * e_type_traverse:
- * @parent_type: the root #GType to traverse from
- * @func: the function to call for each visited #GType
- * @user_data: user data to pass to the function
- *
- * Calls @func for all instantiable subtypes of @parent_type.
- *
- * This is often useful for extending functionality by way of #EModule.
- * A module may register a subtype of @parent_type in its e_module_load()
- * function.  Then later on the application will call e_type_traverse()
- * to instantiate all registered subtypes of @parent_type.
- **/
-void
-e_type_traverse (GType parent_type,
-                 ETypeFunc func,
-                 gpointer user_data)
-{
-	GType *children;
-	guint n_children, ii;
-
-	g_return_if_fail (func != NULL);
-
-	children = g_type_children (parent_type, &n_children);
-
-	for (ii = 0; ii < n_children; ii++) {
-		GType type = children[ii];
-
-		/* Recurse over the child's children. */
-		e_type_traverse (type, func, user_data);
-
-		/* Skip abstract types. */
-		if (G_TYPE_IS_ABSTRACT (type))
-			continue;
-
-		func (type, user_data);
-	}
-
-	g_free (children);
-}
-
-/**
  * e_str_without_underscores:
  * @string: the string to strip underscores from
  *
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 8463fd4a7b..cb88a90644 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -69,9 +69,6 @@ GtkRadioAction *e_radio_action_get_current_action
 						(GtkRadioAction *radio_action);
 void		e_categories_add_change_hook	(GHookFunc func,
 						 gpointer object);
-void		e_type_traverse			(GType parent_type,
-						 ETypeFunc func,
-						 gpointer user_data);
 
 gchar *		e_str_without_underscores	(const gchar *string);
 gint		e_str_compare			(gconstpointer x,
diff --git a/mail/e-mail-junk-filter.h b/mail/e-mail-junk-filter.h
index 34d95e56c7..74a7840c2d 100644
--- a/mail/e-mail-junk-filter.h
+++ b/mail/e-mail-junk-filter.h
@@ -20,7 +20,7 @@
 #define E_MAIL_JUNK_FILTER_H
 
 #include <gtk/gtk.h>
-#include <e-util/e-extension.h>
+#include <libebackend/e-extension.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_JUNK_FILTER \
diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c
index e1820501af..333ee74477 100644
--- a/mail/e-mail-session.c
+++ b/mail/e-mail-session.c
@@ -44,13 +44,13 @@
 #include <canberra-gtk.h>
 #endif
 
-#include <libedataserverui/e-passwords.h>
 #include <libedataserver/e-flag.h>
+#include <libebackend/e-extensible.h>
+#include <libedataserverui/e-passwords.h>
 
 #include "e-util/e-util.h"
 #include "e-util/e-account-utils.h"
 #include "e-util/e-alert-dialog.h"
-#include "e-util/e-extensible.h"
 #include "e-util/e-util-private.h"
 #include "e-util/gconf-bridge.h"
 
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index e41455e294..f3209b8b89 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -40,13 +40,14 @@
 #undef interface
 #endif
 
-#include <libedataserver/e-data-server-util.h>	/* for e_utf8_strftime, what about e_time_format_time? */
+#include <libebackend/e-extensible.h>
 #include <libedataserver/e-time-utils.h>
+#include <libedataserver/e-data-server-util.h>	/* for e_utf8_strftime, what about e_time_format_time? */
+
 #include "e-util/e-datetime-format.h"
 #include "e-util/e-icon-factory.h"
 #include "e-util/e-util-private.h"
 #include "e-util/e-util.h"
-#include "e-util/e-extensible.h"
 #include "misc/e-web-view.h"
 
 #include <shell/e-shell.h>
diff --git a/modules/calendar/e-cal-config-calendar-item.c b/modules/calendar/e-cal-config-calendar-item.c
index 09895c0a0e..d0d6e11b90 100644
--- a/modules/calendar/e-cal-config-calendar-item.c
+++ b/modules/calendar/e-cal-config-calendar-item.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-calendar-item.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <misc/e-calendar-item.h>
 
 static gpointer parent_class;
diff --git a/modules/calendar/e-cal-config-comp-editor.c b/modules/calendar/e-cal-config-comp-editor.c
index b522975bac..dc37c748c3 100644
--- a/modules/calendar/e-cal-config-comp-editor.c
+++ b/modules/calendar/e-cal-config-comp-editor.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-comp-editor.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <calendar/gui/dialogs/comp-editor.h>
 
 static gpointer parent_class;
diff --git a/modules/calendar/e-cal-config-date-edit.c b/modules/calendar/e-cal-config-date-edit.c
index d59549764b..48a5848f73 100644
--- a/modules/calendar/e-cal-config-date-edit.c
+++ b/modules/calendar/e-cal-config-date-edit.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-date-edit.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <misc/e-dateedit.h>
 
 static gpointer parent_class;
diff --git a/modules/calendar/e-cal-config-meeting-store.c b/modules/calendar/e-cal-config-meeting-store.c
index f9a91dacd0..7b4f2dec30 100644
--- a/modules/calendar/e-cal-config-meeting-store.c
+++ b/modules/calendar/e-cal-config-meeting-store.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-meeting-store.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <calendar/gui/e-meeting-store.h>
 
 static gpointer parent_class;
diff --git a/modules/calendar/e-cal-config-meeting-time-selector.c b/modules/calendar/e-cal-config-meeting-time-selector.c
index 23eef11ef5..249d541274 100644
--- a/modules/calendar/e-cal-config-meeting-time-selector.c
+++ b/modules/calendar/e-cal-config-meeting-time-selector.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-meeting-time-selector.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <calendar/gui/e-meeting-time-sel.h>
 
 static gpointer parent_class;
diff --git a/modules/calendar/e-cal-config-model.c b/modules/calendar/e-cal-config-model.c
index f42e4a9b66..9898942bf9 100644
--- a/modules/calendar/e-cal-config-model.c
+++ b/modules/calendar/e-cal-config-model.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-model.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <calendar/gui/e-cal-model.h>
 #include <calendar/gui/e-cal-model-tasks.h>
 
diff --git a/modules/calendar/e-cal-config-view.c b/modules/calendar/e-cal-config-view.c
index ecc35871ca..afe747dd80 100644
--- a/modules/calendar/e-cal-config-view.c
+++ b/modules/calendar/e-cal-config-view.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-view.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <calendar/gui/e-day-view.h>
 #include <calendar/gui/e-week-view.h>
 
diff --git a/modules/composer-autosave/e-composer-autosave.c b/modules/composer-autosave/e-composer-autosave.c
index f2578875fa..f2b39c4d68 100644
--- a/modules/composer-autosave/e-composer-autosave.c
+++ b/modules/composer-autosave/e-composer-autosave.c
@@ -20,7 +20,8 @@
 #include <config.h>
 #endif
 
-#include <e-util/e-extension.h>
+#include <libebackend/e-extension.h>
+
 #include <e-util/e-alert-dialog.h>
 #include <composer/e-msg-composer.h>
 
diff --git a/modules/composer-autosave/e-composer-registry.c b/modules/composer-autosave/e-composer-registry.c
index eef69f1286..9fcba43ff9 100644
--- a/modules/composer-autosave/e-composer-registry.c
+++ b/modules/composer-autosave/e-composer-registry.c
@@ -21,9 +21,10 @@
 #endif
 
 #include <glib/gstdio.h>
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
 #include <shell/e-shell-window.h>
-#include <e-util/e-extension.h>
 #include <e-util/e-alert-dialog.h>
 #include <composer/e-msg-composer.h>
 
diff --git a/modules/connman/evolution-connman.c b/modules/connman/evolution-connman.c
index f6225df46c..2c35c2412e 100644
--- a/modules/connman/evolution-connman.c
+++ b/modules/connman/evolution-connman.c
@@ -21,9 +21,9 @@
 #endif
 
 #include <gio/gio.h>
+#include <libebackend/e-extension.h>
 
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 
 #define CM_DBUS_SERVICE   "net.connman"
 #define CM_DBUS_INTERFACE "net.connman.Manager"
diff --git a/modules/mail/e-mail-config-format-html.c b/modules/mail/e-mail-config-format-html.c
index 23d448f7f0..83bc78f0b2 100644
--- a/modules/mail/e-mail-config-format-html.c
+++ b/modules/mail/e-mail-config-format-html.c
@@ -22,9 +22,10 @@
 
 #include "e-mail-config-format-html.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
 #include <e-util/e-util.h>
-#include <e-util/e-extension.h>
 #include <mail/em-format-html.h>
 
 static gpointer parent_class;
diff --git a/modules/mail/e-mail-config-reader.c b/modules/mail/e-mail-config-reader.c
index 3837581562..b284fbdd8d 100644
--- a/modules/mail/e-mail-config-reader.c
+++ b/modules/mail/e-mail-config-reader.c
@@ -22,8 +22,9 @@
 
 #include "e-mail-config-reader.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <mail/e-mail-reader.h>
 
 static gpointer parent_class;
diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c
index b8a755b46f..ebab286a2d 100644
--- a/modules/mail/e-mail-config-web-view.c
+++ b/modules/mail/e-mail-config-web-view.c
@@ -22,8 +22,9 @@
 
 #include "e-mail-config-web-view.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <misc/e-web-view.h>
 
 typedef struct _EMailConfigWebView EMailConfigWebView;
diff --git a/modules/mailto-handler/evolution-mailto-handler.c b/modules/mailto-handler/evolution-mailto-handler.c
index fdc3841f38..4846aaaa85 100644
--- a/modules/mailto-handler/evolution-mailto-handler.c
+++ b/modules/mailto-handler/evolution-mailto-handler.c
@@ -21,9 +21,9 @@
 #endif
 
 #include <glib/gi18n-lib.h>
+#include <libebackend/e-extension.h>
 
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAILTO_HANDLER \
diff --git a/modules/network-manager/evolution-network-manager.c b/modules/network-manager/evolution-network-manager.c
index 3168b9adf1..bb83ba8104 100644
--- a/modules/network-manager/evolution-network-manager.c
+++ b/modules/network-manager/evolution-network-manager.c
@@ -21,6 +21,7 @@
 #endif
 
 #include <gio/gio.h>
+#include <libebackend/e-extension.h>
 #include <NetworkManager/NetworkManager.h>
 
 #if !defined(NM_CHECK_VERSION)
@@ -28,7 +29,6 @@
 #endif
 
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 
 /* Standard GObject macros */
 #define E_TYPE_NETWORK_MANAGER \
diff --git a/modules/offline-alert/evolution-offline-alert.c b/modules/offline-alert/evolution-offline-alert.c
index 4c064ce472..9fb5d2a60c 100644
--- a/modules/offline-alert/evolution-offline-alert.c
+++ b/modules/offline-alert/evolution-offline-alert.c
@@ -20,10 +20,11 @@
 #include <config.h>
 #endif
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell-view.h>
 #include <shell/e-shell-window-actions.h>
 #include <e-util/e-alert-sink.h>
-#include <e-util/e-extension.h>
 
 /* Standard GObject macros */
 #define E_TYPE_OFFLINE_ALERT \
diff --git a/modules/plugin-manager/evolution-plugin-manager.c b/modules/plugin-manager/evolution-plugin-manager.c
index 29dba6c160..f95af37b23 100644
--- a/modules/plugin-manager/evolution-plugin-manager.c
+++ b/modules/plugin-manager/evolution-plugin-manager.c
@@ -20,13 +20,12 @@
 #include <config.h>
 #endif
 
-#include <glib/gi18n-lib.h>
-
 #include <string.h>
 #include <stdio.h>
+#include <glib/gi18n-lib.h>
+#include <libebackend/e-extension.h>
 
 #include <e-util/e-plugin.h>
-#include <e-util/e-extension.h>
 #include <shell/e-shell-window.h>
 #include <shell/e-shell-window-actions.h>
 
diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c
index 75ef5d8d99..1184948dd7 100644
--- a/modules/startup-wizard/evolution-startup-wizard.c
+++ b/modules/startup-wizard/evolution-startup-wizard.c
@@ -21,11 +21,11 @@
 #endif
 
 #include <glib/gi18n-lib.h>
+#include <libebackend/e-extension.h>
 
 #include <shell/e-shell.h>
 #include <e-util/e-account-utils.h>
 #include <e-util/e-alert-dialog.h>
-#include <e-util/e-extension.h>
 #include <e-util/e-import.h>
 
 #include <mail/e-mail-backend.h>
diff --git a/modules/windows-sens/evolution-windows-sens.c b/modules/windows-sens/evolution-windows-sens.c
index d2154590b1..f3110b2fcc 100644
--- a/modules/windows-sens/evolution-windows-sens.c
+++ b/modules/windows-sens/evolution-windows-sens.c
@@ -32,6 +32,8 @@
 #include <eventsys.h>
 #else
 
+#include <libebackend/e-extension.h>
+
 /* Extract relevant typedefs from mingw-w64 headers */
 
 typedef struct IEnumEventObject IEnumEventObject;
@@ -195,7 +197,6 @@ struct ISensNetwork {
 #endif
 
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 
 /* 4E14FB9F-2E22-11D1-9964-00C04FBBB345 */
 DEFINE_GUID (IID_IEventSystem, 0x4E14FB9F, 0x2E22, 0x11D1, 0x99, 0x64, 0x00, 0xC0, 0x4F, 0xBB, 0xB3, 0x45);
diff --git a/shell/e-shell-backend.h b/shell/e-shell-backend.h
index 3364b16589..ae600bac3d 100644
--- a/shell/e-shell-backend.h
+++ b/shell/e-shell-backend.h
@@ -22,9 +22,10 @@
 #ifndef E_SHELL_BACKEND_H
 #define E_SHELL_BACKEND_H
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell-common.h>
 #include <e-util/e-activity.h>
-#include <e-util/e-extension.h>
 
 /* Standard GObject macros */
 #define E_TYPE_SHELL_BACKEND \
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index a109ffb4a7..c7a41510f2 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -32,12 +32,11 @@
 #include "e-shell-content.h"
 
 #include <glib/gi18n.h>
+#include <libebackend/e-extensible.h>
 
-#include "e-util/e-alert-dialog.h"
-#include "e-util/e-alert-sink.h"
-#include "e-util/e-extensible.h"
 #include "e-util/e-util.h"
 #include "e-util/e-alert-dialog.h"
+#include "e-util/e-alert-sink.h"
 #include "filter/e-rule-editor.h"
 #include "widgets/misc/e-action-combo-box.h"
 #include "widgets/misc/e-alert-bar.h"
diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c
index e0c10c656a..13b0b49349 100644
--- a/shell/e-shell-searchbar.c
+++ b/shell/e-shell-searchbar.c
@@ -32,9 +32,9 @@
 #include "e-shell-searchbar.h"
 
 #include <glib/gi18n-lib.h>
+#include <libebackend/e-extensible.h>
 
 #include "e-util/e-util.h"
-#include "e-util/e-extensible.h"
 #include "widgets/misc/e-action-combo-box.h"
 #include "widgets/misc/e-hinted-entry.h"
 
diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c
index abe37b7cbd..62652dee1f 100644
--- a/shell/e-shell-sidebar.c
+++ b/shell/e-shell-sidebar.c
@@ -31,8 +31,9 @@
 
 #include "e-shell-sidebar.h"
 
+#include <libebackend/e-extensible.h>
+
 #include <e-util/e-alert-sink.h>
-#include <e-util/e-extensible.h>
 #include <e-util/e-unicode.h>
 #include <shell/e-shell-view.h>
 
diff --git a/shell/e-shell-switcher.c b/shell/e-shell-switcher.c
index 1bfe01ef25..77c1fd2929 100644
--- a/shell/e-shell-switcher.c
+++ b/shell/e-shell-switcher.c
@@ -32,7 +32,7 @@
 #include "e-shell-switcher.h"
 
 #include <glib/gi18n.h>
-#include <e-util/e-extensible.h>
+#include <libebackend/e-extensible.h>
 
 #define H_PADDING 6
 #define V_PADDING 6
diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c
index 1ddbd357e0..adc0d27980 100644
--- a/shell/e-shell-taskbar.c
+++ b/shell/e-shell-taskbar.c
@@ -31,9 +31,9 @@
 
 #include "e-shell-taskbar.h"
 
-#include <e-shell-view.h>
+#include <libebackend/e-extensible.h>
 
-#include <e-util/e-extensible.h>
+#include <e-shell-view.h>
 #include <misc/e-activity-proxy.h>
 
 struct _EShellTaskbarPrivate {
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 49e05baf36..370aa90403 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -33,8 +33,8 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
+#include <libebackend/e-extensible.h>
 
-#include "e-util/e-extensible.h"
 #include "e-util/e-file-utils.h"
 #include "e-util/e-plugin-ui.h"
 #include "e-util/e-ui-manager.h"
diff --git a/shell/e-shell-window-private.h b/shell/e-shell-window-private.h
index 6a9744d971..d36a3e64f6 100644
--- a/shell/e-shell-window-private.h
+++ b/shell/e-shell-window-private.h
@@ -28,12 +28,12 @@
 #include <glib/gi18n.h>
 
 #include <gconf/gconf-client.h>
+#include <libebackend/e-extensible.h>
 
 #include <e-util/e-util.h>
 #include <e-util/e-util-private.h>
 #include <e-util/e-alert-dialog.h>
 #include <e-util/e-alert-sink.h>
-#include <e-util/e-extensible.h>
 #include <e-util/e-plugin-ui.h>
 #include <e-util/gconf-bridge.h>
 #include <widgets/misc/e-alert-bar.h>
diff --git a/shell/e-shell.c b/shell/e-shell.c
index dbcb55b36a..2954765d15 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -32,12 +32,12 @@
 #include "e-shell.h"
 
 #include <glib/gi18n.h>
+#include <libebackend/e-module.h>
+#include <libebackend/e-extensible.h>
 #include <libedataserverui/e-passwords.h>
 
-#include "e-util/e-module.h"
-#include "e-util/e-extensible.h"
-#include "e-util/e-util-private.h"
 #include "e-util/e-util.h"
+#include "e-util/e-util-private.h"
 #include "smclient/eggsmclient.h"
 #include "widgets/misc/e-preferences-window.h"
 
diff --git a/widgets/misc/e-attachment-handler.h b/widgets/misc/e-attachment-handler.h
index e85cd9b2ee..81a883deeb 100644
--- a/widgets/misc/e-attachment-handler.h
+++ b/widgets/misc/e-attachment-handler.h
@@ -22,7 +22,7 @@
 #ifndef E_ATTACHMENT_HANDLER_H
 #define E_ATTACHMENT_HANDLER_H
 
-#include <e-util/e-extension.h>
+#include <libebackend/e-extension.h>
 #include <misc/e-attachment-view.h>
 
 /* Standard GObject macros */
diff --git a/widgets/misc/e-attachment-icon-view.c b/widgets/misc/e-attachment-icon-view.c
index 9dd782529b..cf14d97746 100644
--- a/widgets/misc/e-attachment-icon-view.c
+++ b/widgets/misc/e-attachment-icon-view.c
@@ -26,7 +26,7 @@
 #include "e-attachment-icon-view.h"
 
 #include <glib/gi18n.h>
-#include <e-util/e-extensible.h>
+#include <libebackend/e-extensible.h>
 
 #include "e-attachment.h"
 #include "e-attachment-store.h"
diff --git a/widgets/misc/e-attachment-tree-view.c b/widgets/misc/e-attachment-tree-view.c
index 529312006f..7c67fdb917 100644
--- a/widgets/misc/e-attachment-tree-view.c
+++ b/widgets/misc/e-attachment-tree-view.c
@@ -26,7 +26,7 @@
 #include "e-attachment-tree-view.h"
 
 #include <glib/gi18n.h>
-#include <e-util/e-extensible.h>
+#include <libebackend/e-extensible.h>
 
 #include "e-attachment.h"
 #include "e-attachment-store.h"
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index d3f42fd359..c7f2e049d9 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -25,6 +25,8 @@
 #include <config.h>
 #endif
 
+#include <libebackend/e-extensible.h>
+
 #include "e-calendar-item.h"
 #include "ea-widgets.h"
 
@@ -36,7 +38,6 @@
 #include <glib/gi18n.h>
 #include <libedataserver/e-data-server-util.h>
 #include <e-util/e-util.h>
-#include <e-util/e-extensible.h>
 
 static const gint e_calendar_item_days_in_month[12] = {
 	31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index 2a9eb7f457..970a06b402 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -37,10 +37,10 @@
 #include <atk/atkrelation.h>
 #include <atk/atkrelationset.h>
 #include <glib/gi18n.h>
+#include <libebackend/e-extensible.h>
 #include <libedataserver/e-time-utils.h>
 #include <libedataserver/e-data-server-util.h>
 #include <e-util/e-util.h>
-#include <e-util/e-extensible.h>
 #include "e-calendar.h"
 
 struct _EDateEditPrivate {
diff --git a/widgets/misc/e-import-assistant.c b/widgets/misc/e-import-assistant.c
index 06dff88e29..a2588cd075 100644
--- a/widgets/misc/e-import-assistant.c
+++ b/widgets/misc/e-import-assistant.c
@@ -32,9 +32,9 @@
 
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
+#include <libebackend/e-extensible.h>
 
 #include <e-util/e-import.h>
-#include <e-util/e-extensible.h>
 #include <e-util/e-util-private.h>
 
 typedef struct _ImportFilePage ImportFilePage;
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index 8e037ac66c..c35bbcc123 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -26,11 +26,11 @@
 #include <glib/gi18n-lib.h>
 
 #include <camel/camel.h>
+#include <libebackend/e-extensible.h>
 
 #include <e-util/e-util.h>
 #include <e-util/e-alert-dialog.h>
 #include <e-util/e-alert-sink.h>
-#include <e-util/e-extensible.h>
 #include <e-util/e-plugin-ui.h>
 
 #include "e-popup-action.h"