aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/calendar/e-cal-config-calendar-item.c3
-rw-r--r--modules/calendar/e-cal-config-comp-editor.c3
-rw-r--r--modules/calendar/e-cal-config-date-edit.c3
-rw-r--r--modules/calendar/e-cal-config-meeting-store.c3
-rw-r--r--modules/calendar/e-cal-config-meeting-time-selector.c3
-rw-r--r--modules/calendar/e-cal-config-model.c3
-rw-r--r--modules/calendar/e-cal-config-view.c3
-rw-r--r--modules/composer-autosave/e-composer-autosave.c3
-rw-r--r--modules/composer-autosave/e-composer-registry.c3
-rw-r--r--modules/connman/evolution-connman.c2
-rw-r--r--modules/mail/e-mail-config-format-html.c3
-rw-r--r--modules/mail/e-mail-config-reader.c3
-rw-r--r--modules/mail/e-mail-config-web-view.c3
-rw-r--r--modules/mailto-handler/evolution-mailto-handler.c2
-rw-r--r--modules/network-manager/evolution-network-manager.c2
-rw-r--r--modules/offline-alert/evolution-offline-alert.c3
-rw-r--r--modules/plugin-manager/evolution-plugin-manager.c5
-rw-r--r--modules/startup-wizard/evolution-startup-wizard.c2
-rw-r--r--modules/windows-sens/evolution-windows-sens.c3
19 files changed, 34 insertions, 21 deletions
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);