6 files changed, 26 insertions, 15 deletions
diff --git a/doc/reference/evolution-mail-formatter/evolution-mail-formatter-sections.txt b/doc/reference/evolution-mail-formatter/evolution-mail-formatter-sections.txt
index 0ade252502..5c53d0dd4b 100644
--- a/doc/reference/evolution-mail-formatter/evolution-mail-formatter-sections.txt
+++ b/doc/reference/evolution-mail-formatter/evolution-mail-formatter-sections.txt
@@ -60,6 +60,7 @@ EMailFormatterColor
 e_mail_formatter_get_color
 e_mail_formatter_set_color
 e_mail_formatter_update_style
+EMailImageLoadingPolicy
 e_mail_formatter_get_image_loading_policy
 e_mail_formatter_set_image_loading_policy
 e_mail_formatter_get_mark_citations
diff --git a/em-format/e-mail-formatter-enums.h b/em-format/e-mail-formatter-enums.h
index e1b41d6cf6..c7922acf95 100644
--- a/em-format/e-mail-formatter-enums.h
+++ b/em-format/e-mail-formatter-enums.h
@@ -62,6 +62,24 @@ typedef enum { /*< flags >*/
 } EMailFormatterQuoteFlags;
 
 /**
+ * EMailImageLoadingPolicy:
+ * @E_MAIL_IMAGE_LOADING_POLICY_NEVER:
+ *   Never load images from a remote server.
+ * @E_MAIL_IMAGE_LOADING_POLICY_SOMETIMES:
+ *   Only load images from a remote server if the sender is a known contact.
+ * @E_MAIL_IMAGE_LOADING_POLICY_ALWAYS:
+ *   Always load images from a remote server.
+ *
+ * Policy for loading remote image URLs in email.  Allowing images to be
+ * loaded from a remote server may have privacy implications.
+ **/
+typedef enum {
+	E_MAIL_IMAGE_LOADING_POLICY_NEVER,
+	E_MAIL_IMAGE_LOADING_POLICY_SOMETIMES,
+	E_MAIL_IMAGE_LOADING_POLICY_ALWAYS
+} EMailImageLoadingPolicy;
+
+/**
  * EMailParserExtensionFlags:
  * @E_MAIL_PARSER_EXTENSION_INLINE:
  *    Don't parse as attachment.
diff --git a/em-format/e-mail-formatter.c b/em-format/e-mail-formatter.c
index 68313a2632..2f201dd07e 100644
--- a/em-format/e-mail-formatter.c
+++ b/em-format/e-mail-formatter.c
@@ -18,16 +18,15 @@
 
 #include "e-mail-formatter.h"
 
-#include "e-mail-formatter-extension.h"
-#include "e-mail-formatter-utils.h"
-#include "e-mail-part.h"
+#include <gdk/gdk.h>
+#include <libebackend/libebackend.h>
 
 #include <e-util/e-util.h>
-#include <libebackend/libebackend.h>
-#include <gdk/gdk.h>
-#include <glib/gi18n.h>
 
-#include "libemail-engine/e-mail-engine-enumtypes.h"
+#include "e-mail-formatter-enumtypes.h"
+#include "e-mail-formatter-extension.h"
+#include "e-mail-formatter-utils.h"
+#include "e-mail-part.h"
 
 #define d(x)
 
diff --git a/em-format/e-mail-formatter.h b/em-format/e-mail-formatter.h
index 734bcbe8db..4986c0956d 100644
--- a/em-format/e-mail-formatter.h
+++ b/em-format/e-mail-formatter.h
@@ -20,7 +20,6 @@
 #define E_MAIL_FORMATTER_H_
 
 #include <gdk/gdk.h>
-#include <libemail-engine/e-mail-engine-enums.h>
 
 #include <em-format/e-mail-extension-registry.h>
 #include <em-format/e-mail-formatter-enums.h>
diff --git a/libemail-engine/e-mail-engine-enums.h b/libemail-engine/e-mail-engine-enums.h
index aa59c07031..3b1d3bd127 100644
--- a/libemail-engine/e-mail-engine-enums.h
+++ b/libemail-engine/e-mail-engine-enums.h
@@ -23,12 +23,6 @@
 
 G_BEGIN_DECLS
 
-typedef enum {
-	E_MAIL_IMAGE_LOADING_POLICY_NEVER,
-	E_MAIL_IMAGE_LOADING_POLICY_SOMETIMES,
-	E_MAIL_IMAGE_LOADING_POLICY_ALWAYS
-} EMailImageLoadingPolicy;
-
 /* XXX E_MAIL_FOLDER_TEMPLATES is a prime example of why templates
  *     should be a core feature: the mailer now has to know about
  *     this specific plugin, which defeats the purpose of plugins. */
diff --git a/modules/settings/e-settings-deprecated.c b/modules/settings/e-settings-deprecated.c
index 63fbc3ee6e..4aea56f942 100644
--- a/modules/settings/e-settings-deprecated.c
+++ b/modules/settings/e-settings-deprecated.c
@@ -25,7 +25,7 @@
 
 #include <shell/e-shell.h>
 #include <mail/e-mail-enums.h>
-#include <libemail-engine/e-mail-engine-enums.h>
+#include <em-format/e-mail-formatter-enums.h>
 
 #define E_SETTINGS_DEPRECATED_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \