[balsa/gtk3] Clean up LibESMTP header includes

[Peter Bloomfield <PeterB src gnome org>]

commit c239edce333bd3da76353e9bf6791f25ff28df7c
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Tue Apr 23 21:17:16 2013 -0400

    Clean up LibESMTP header includes
    
        * libbalsa/message.h:
        * libbalsa/misc.h:
        * libbalsa/send.c:
        * libbalsa/send.h:
        * libbalsa/smtp-server.c:
        * libbalsa/smtp-server.h:

 ChangeLog              |   11 +++++++++++
 libbalsa/message.h     |    4 ----
 libbalsa/misc.h        |    4 ----
 libbalsa/send.c        |    2 ++
 libbalsa/send.h        |    1 -
 libbalsa/smtp-server.c |    1 +
 libbalsa/smtp-server.h |    2 +-
 7 files changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index da1161b..689f993 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2013-04-23  Peter Bloomfield
 
+       Clean up LibESMTP header includes
+
+       * libbalsa/message.h:
+       * libbalsa/misc.h:
+       * libbalsa/send.c:
+       * libbalsa/send.h:
+       * libbalsa/smtp-server.c:
+       * libbalsa/smtp-server.h:
+
+2013-04-23  Peter Bloomfield
+
        * configure.ac: fix URI for finding libesmtp.
 
 2013-04-23  Peter Bloomfield
diff --git a/libbalsa/message.h b/libbalsa/message.h
index 50e8b18..805f955 100644
--- a/libbalsa/message.h
+++ b/libbalsa/message.h
@@ -37,10 +37,6 @@
 #include "rfc3156.h"
 #endif
 
-#if ENABLE_ESMTP
-#include <auth-client.h>
-#endif
-
 #define MESSAGE_COPY_CONTENT 1
 #define LIBBALSA_TYPE_MESSAGE \
     (libbalsa_message_get_type())
diff --git a/libbalsa/misc.h b/libbalsa/misc.h
index 83a1c5b..4acd0e6 100644
--- a/libbalsa/misc.h
+++ b/libbalsa/misc.h
@@ -31,10 +31,6 @@
 #include <gtk/gtk.h>
 #include <gmime/gmime.h>
 
-#if ENABLE_ESMTP
-#include <auth-client.h>
-#endif
-
 #if !USE_GREGEX
 #  ifdef HAVE_PCRE
 #    include <pcreposix.h>
diff --git a/libbalsa/send.c b/libbalsa/send.c
index 811d804..abb630b 100644
--- a/libbalsa/send.c
+++ b/libbalsa/send.c
@@ -48,6 +48,8 @@
 #include "information.h"
 
 #if ENABLE_ESMTP
+#include <auth-client.h>
+#include <libesmtp.h>
 #include "smtp-server.h"
 #include <stdarg.h>
 
diff --git a/libbalsa/send.h b/libbalsa/send.h
index adae710..b45b171 100644
--- a/libbalsa/send.h
+++ b/libbalsa/send.h
@@ -54,7 +54,6 @@ gboolean libbalsa_message_postpone(LibBalsaMessage * message,
 
 
 #if ENABLE_ESMTP
-#include <libesmtp.h>
 
 LibBalsaMsgCreateResult libbalsa_message_queue(LibBalsaMessage* message, 
                                               LibBalsaMailbox* outbox,
diff --git a/libbalsa/smtp-server.c b/libbalsa/smtp-server.c
index 09b3d2f..85c277b 100644
--- a/libbalsa/smtp-server.c
+++ b/libbalsa/smtp-server.c
@@ -36,6 +36,7 @@
 #include "libbalsa-conf.h"
 #include "misc.h"
 #include <glib/gi18n.h>
+#include <libesmtp.h>
 
 #if HAVE_MACOSX_DESKTOP
 #  include "macosx-helpers.h"
diff --git a/libbalsa/smtp-server.h b/libbalsa/smtp-server.h
index 28085e1..0fb43bd 100644
--- a/libbalsa/smtp-server.h
+++ b/libbalsa/smtp-server.h
@@ -24,7 +24,7 @@
 #define __SMTP_SERVER_H__
 
 #include <gtk/gtk.h>
-#include <libesmtp.h>
+#include <auth-client.h>
 #include "libbalsa.h"
 
 #define LIBBALSA_TYPE_SMTP_SERVER                              \