[balsa] address-book and subclasses: Clean up #includes

[Peter Bloomfield <peterb src gnome org>]

commit 9e139c3c9fa7c0c97f0f4dacd0d0d2576069ca9f
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Thu May 21 15:58:30 2020 -0400

    address-book and subclasses: Clean up #includes
    
    * libbalsa/address-book-extern.c:
    * libbalsa/address-book-extern.h:
    * libbalsa/address-book-gpe.c:
    * libbalsa/address-book-gpe.h:
    * libbalsa/address-book-ldap.c:
    * libbalsa/address-book-ldap.h:
    * libbalsa/address-book-ldif.c:
    * libbalsa/address-book-osmo.c:
    * libbalsa/address-book-osmo.h:
    * libbalsa/address-book-rubrica.c:
    * libbalsa/address-book-text.c:
    * libbalsa/address-book-text.h:
    * libbalsa/address-book-vcard.c:
    * libbalsa/address-book.c:

 ChangeLog                       | 19 +++++++++++++++++++
 libbalsa/address-book-extern.c  |  6 ------
 libbalsa/address-book-extern.h  |  1 -
 libbalsa/address-book-gpe.c     | 14 ++++++--------
 libbalsa/address-book-gpe.h     |  6 ------
 libbalsa/address-book-ldap.c    |  4 ----
 libbalsa/address-book-ldap.h    |  3 ---
 libbalsa/address-book-ldif.c    |  3 ---
 libbalsa/address-book-osmo.c    |  7 +------
 libbalsa/address-book-osmo.h    |  3 +--
 libbalsa/address-book-rubrica.c |  6 ------
 libbalsa/address-book-text.c    |  3 ---
 libbalsa/address-book-text.h    |  2 --
 libbalsa/address-book-vcard.c   |  1 -
 libbalsa/address-book.c         |  2 +-
 15 files changed, 28 insertions(+), 52 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d78b54663..71fe042fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2020-05-21  Peter Bloomfield  <pbloomfield bellsouth net>
+
+       address-book and subclasses: Clean up #includes
+
+       * libbalsa/address-book-extern.c:
+       * libbalsa/address-book-extern.h:
+       * libbalsa/address-book-gpe.c:
+       * libbalsa/address-book-gpe.h:
+       * libbalsa/address-book-ldap.c:
+       * libbalsa/address-book-ldap.h:
+       * libbalsa/address-book-ldif.c:
+       * libbalsa/address-book-osmo.c:
+       * libbalsa/address-book-osmo.h:
+       * libbalsa/address-book-rubrica.c:
+       * libbalsa/address-book-text.c:
+       * libbalsa/address-book-text.h:
+       * libbalsa/address-book-vcard.c:
+       * libbalsa/address-book.c:
+
 2020-05-20  Peter Bloomfield  <pbloomfield bellsouth net>
 
        compose window: BalsaSendmsg:ident may be destroyed while the
diff --git a/libbalsa/address-book-extern.c b/libbalsa/address-book-extern.c
index 1fd19ed20..b0fe4bc55 100644
--- a/libbalsa/address-book-extern.c
+++ b/libbalsa/address-book-extern.c
@@ -42,13 +42,7 @@
 #define _POSIX_C_SOURCE 2
 #include "address-book-extern.h"
 
-#include <stdio.h>
-#include <sys/stat.h>
-
-#include "address-book.h"
 #include "libbalsa-conf.h"
-#include "information.h"
-#include "abook-completion.h"
 #include <glib/gi18n.h>
 
 /* FIXME: Arbitrary constant */
diff --git a/libbalsa/address-book-extern.h b/libbalsa/address-book-extern.h
index 35e2ae434..4c8212bb9 100644
--- a/libbalsa/address-book-extern.h
+++ b/libbalsa/address-book-extern.h
@@ -26,7 +26,6 @@
 #define __LIBBALSA_ADDRESS_BOOK_EXTERN_H__
 
 #include "address-book.h"
-#include <time.h>
 
 #define LIBBALSA_TYPE_ADDRESS_BOOK_EXTERNQ (libbalsa_address_book_externq_get_type())
 G_DECLARE_FINAL_TYPE(LibBalsaAddressBookExternq, libbalsa_address_book_externq,
diff --git a/libbalsa/address-book-gpe.c b/libbalsa/address-book-gpe.c
index 8558c845d..b2f7c7afd 100644
--- a/libbalsa/address-book-gpe.c
+++ b/libbalsa/address-book-gpe.c
@@ -33,15 +33,13 @@
 
 #include "address-book-gpe.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <time.h>
+#ifdef HAVE_SQLITE3
+#include <sqlite3.h>
+#else                           /* HAVE_SQLITE3 */
+#include <sqlite.h>
+#endif                          /* HAVE_SQLITE3 */
 
-#include "address-book.h"
-#include "information.h"
+#include <sys/stat.h>
 
 #define ASSURE_GPE_DIR\
     do {gchar* dir = g_strconcat(g_get_home_dir(), "/.gpe", NULL);\
diff --git a/libbalsa/address-book-gpe.h b/libbalsa/address-book-gpe.h
index 92bca71b8..3b8beb8c7 100644
--- a/libbalsa/address-book-gpe.h
+++ b/libbalsa/address-book-gpe.h
@@ -31,12 +31,6 @@
 
 #ifdef HAVE_SQLITE
 
-#ifdef HAVE_SQLITE3
-#include <sqlite3.h>
-#else                           /* HAVE_SQLITE3 */
-#include <sqlite.h>
-#endif                          /* HAVE_SQLITE3 */
-
 #include "address-book.h"
 
 #define LIBBALSA_TYPE_ADDRESS_BOOK_GPE (libbalsa_address_book_gpe_get_type())
diff --git a/libbalsa/address-book-ldap.c b/libbalsa/address-book-ldap.c
index 19150b205..50990d606 100644
--- a/libbalsa/address-book-ldap.c
+++ b/libbalsa/address-book-ldap.c
@@ -39,16 +39,12 @@
 #include "address-book-ldap.h"
 
 #include <glib.h>
-#include <sys/time.h>
-#include <string.h>
-#include <lber.h>
 #include <ldap.h>
 
 #ifdef HAVE_CYRUS_SASL
 #include <sasl.h>
 #endif
 
-#include "address-book.h"
 #include "information.h"
 #include "libbalsa-conf.h"
 #include <glib/gi18n.h>
diff --git a/libbalsa/address-book-ldap.h b/libbalsa/address-book-ldap.h
index d017f1577..e2e2c42c4 100644
--- a/libbalsa/address-book-ldap.h
+++ b/libbalsa/address-book-ldap.h
@@ -25,9 +25,6 @@
 #ifndef __LIBBALSA_ADDRESS_BOOK_LDAP_H__
 #define __LIBBALSA_ADDRESS_BOOK_LDAP_H__
 
-#include <lber.h>
-#include <ldap.h>
-
 #include "address-book.h"
 
 #define LIBBALSA_TYPE_ADDRESS_BOOK_LDAP (libbalsa_address_book_ldap_get_type())
diff --git a/libbalsa/address-book-ldif.c b/libbalsa/address-book-ldif.c
index 4afd9d4b9..f8dc23376 100644
--- a/libbalsa/address-book-ldif.c
+++ b/libbalsa/address-book-ldif.c
@@ -27,9 +27,6 @@
 #endif                          /* HAVE_CONFIG_H */
 #include "address-book-ldif.h"
 
-#include <ctype.h>
-#include <string.h>
-
 #include <glib/gi18n.h>
 
 static LibBalsaABErr
diff --git a/libbalsa/address-book-osmo.c b/libbalsa/address-book-osmo.c
index 9501e851e..8c43dd076 100644
--- a/libbalsa/address-book-osmo.c
+++ b/libbalsa/address-book-osmo.c
@@ -31,15 +31,10 @@
 #endif                          /* HAVE_CONFIG_H */
 
 #if defined(HAVE_OSMO)
+#include "address-book-osmo.h"
 
-#include <string.h>
-#include <glib.h>
-#include <gio/gio.h>
 #include <glib/gi18n.h>
-
-#include "address-book.h"
 #include "rfc6350.h"
-#include "address-book-osmo.h"
 
 
 /* for the time being, osmo svn rev. 1099 accepts only reading via DBus, not writing new or modified records 
*/
diff --git a/libbalsa/address-book-osmo.h b/libbalsa/address-book-osmo.h
index 905d7fdfc..5104e8ee6 100644
--- a/libbalsa/address-book-osmo.h
+++ b/libbalsa/address-book-osmo.h
@@ -28,7 +28,6 @@
 #ifndef LIBBALSA_ADDRESS_BOOK_OSMO_H__
 #define LIBBALSA_ADDRESS_BOOK_OSMO_H__
 
-#include <gio/gio.h>
 #include "address-book.h"
 
 #define LIBBALSA_TYPE_ADDRESS_BOOK_OSMO (libbalsa_address_book_osmo_get_type())
@@ -42,4 +41,4 @@ G_DECLARE_FINAL_TYPE(LibBalsaAddressBookOsmo,
 LibBalsaAddressBook *libbalsa_address_book_osmo_new(const gchar *name);
 
 
-#endif              /* __LIBBALSA_ADDRESS_BOOK_LDAP_H__ */
+#endif              /* __LIBBALSA_ADDRESS_BOOK_OSMO_H__ */
diff --git a/libbalsa/address-book-rubrica.c b/libbalsa/address-book-rubrica.c
index 2870f91f8..792cc71a7 100644
--- a/libbalsa/address-book-rubrica.c
+++ b/libbalsa/address-book-rubrica.c
@@ -32,17 +32,11 @@
 
 #if HAVE_RUBRICA
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <string.h>
-#include <unistd.h>
-#include <libxml/parser.h>
 #include <libxml/tree.h>
-#include "libbalsa-conf.h"
 #include "abook-completion.h"
 #include "misc.h"
-#include <glib/gi18n.h>
 
 
 static LibBalsaABErr libbalsa_address_book_rubrica_load(LibBalsaAddressBook
diff --git a/libbalsa/address-book-text.c b/libbalsa/address-book-text.c
index 061c6dffa..955b1a8b9 100644
--- a/libbalsa/address-book-text.c
+++ b/libbalsa/address-book-text.c
@@ -31,13 +31,10 @@
 #include "address-book-text.h"
 
 #include <sys/stat.h>
-#include <string.h>
-#include <unistd.h>
 
 #include "abook-completion.h"
 #include "libbalsa-conf.h"
 #include "misc.h"
-#include <glib/gi18n.h>
 
 /* FIXME: Perhaps the whole thing could be rewritten to use a g_scanner ?? */
 
diff --git a/libbalsa/address-book-text.h b/libbalsa/address-book-text.h
index 605fe6508..dc53b6c12 100644
--- a/libbalsa/address-book-text.h
+++ b/libbalsa/address-book-text.h
@@ -28,8 +28,6 @@
 #ifndef __LIBBALSA_ADDRESS_BOOK_TEXT_H__
 #define __LIBBALSA_ADDRESS_BOOK_TEXT_H__
 
-#include <time.h>
-#include <stdio.h>
 #include "address-book.h"
 #include "completion.h"
 
diff --git a/libbalsa/address-book-vcard.c b/libbalsa/address-book-vcard.c
index 69b7dbf2a..2fd3a5a64 100644
--- a/libbalsa/address-book-vcard.c
+++ b/libbalsa/address-book-vcard.c
@@ -31,7 +31,6 @@
 #endif                          /* HAVE_CONFIG_H */
 #include "address-book-vcard.h"
 
-#include <string.h>
 #include <glib/gi18n.h>
 
 /* FIXME: Perhaps the whole thing could be rewritten to use a g_scanner ?? */
diff --git a/libbalsa/address-book.c b/libbalsa/address-book.c
index 1f8b10f15..9fd89666a 100644
--- a/libbalsa/address-book.c
+++ b/libbalsa/address-book.c
@@ -23,7 +23,7 @@
 #endif                          /* HAVE_CONFIG_H */
 #include "address-book.h"
 
-#include <gtk/gtk.h>
+#include <glib.h>
 #include <glib/gi18n.h>
 
 #include "libbalsa-conf.h"