Include spring-cleaning

- put some consistency into include ordering
- everything (apart from bits missed ;) is now ordered like this
  1. "system.h"
  2. other system includes
  3. rpm public headers
  4. rpm private headers
  5. "debug.h"

18 files changed, 48 insertions, 34 deletions

diff --git a/rpmio/base64.c b/rpmio/base64.c
index 8daa16c12..6b006e166 100644
--- a/rpmio/base64.c
+++ b/rpmio/base64.c
@@ -3,8 +3,10 @@
 
 #include <arpa/inet.h>
 #include <stdlib.h>
+
 #include "rpmio/base64.h"
 
+
 static char base64_encode_value(char value_in)
 {
 	static const char encoding[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
diff --git a/rpmio/digest.c b/rpmio/digest.c
index f804fffba..c8739a759 100644
--- a/rpmio/digest.c
+++ b/rpmio/digest.c
@@ -3,7 +3,9 @@
  */
 
 #include "system.h"
+
 #include "rpmio/digest.h"
+
 #include "debug.h"
 
 #ifdef	SHA_DEBUG
diff --git a/rpmio/digest.h b/rpmio/digest.h
index c4dabb855..12fa4e322 100644
--- a/rpmio/digest.h
+++ b/rpmio/digest.h
@@ -1,14 +1,15 @@
 #ifndef _RPMDIGEST_H
 #define _RPMDIGEST_H
 
-#include "rpmio/base64.h"
-#include <rpm/rpmpgp.h>
-
 #include <nss.h>
 #include <sechash.h>
 #include <keyhi.h>
 #include <cryptohi.h>
 
+#include <rpm/rpmpgp.h>
+#include "rpmio/base64.h"
+
+
 /** \ingroup rpmio
  * Values parsed from OpenPGP signature/pubkey packet(s).
  */
diff --git a/rpmio/macro.c b/rpmio/macro.c
index ebf55c4a6..040b5a184 100644
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -17,13 +17,12 @@
 #include <rpm/rpmfileutil.h>
 #include <rpm/rpmurl.h>
 #include <rpm/rpmlog.h>
+#include <rpm/rpmmacro.h>
 
 #ifdef	WITH_LUA
 #include "rpmio/rpmlua.h"
 #endif
 
-#include <rpm/rpmmacro.h>
-
 #include "debug.h"
 
 /*! The structure used to store a macro. */
diff --git a/rpmio/rpmfileutil.c b/rpmio/rpmfileutil.c
index 9e141a524..d4cc5b629 100644
--- a/rpmio/rpmfileutil.c
+++ b/rpmio/rpmfileutil.c
@@ -13,13 +13,16 @@
 
 #endif
 
-#include "rpmio/rpmio_internal.h"
 #include <rpm/rpmfileutil.h>
 #include <rpm/rpmurl.h>
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmlog.h>
 #include <rpm/argv.h>
 
+#include "rpmio/rpmio_internal.h"
+
+#include "debug.h"
+
 static int open_dso(const char * path, pid_t * pidp, size_t *fsizep)
 {
     static const char * cmd = NULL;
diff --git a/rpmio/rpmhook.c b/rpmio/rpmhook.c
index 3d07d09e8..8e5f695a3 100644
--- a/rpmio/rpmhook.c
+++ b/rpmio/rpmhook.c
@@ -7,6 +7,8 @@
 
 #include "rpmio/rpmhook.h"
 
+#include "debug.h"
+
 #define RPMHOOK_TABLE_INITSIZE  256
 #define RPMHOOK_BUCKET_INITSIZE 5
 
diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
index 66aa6a8dc..6e30f89b6 100644
--- a/rpmio/rpmio.c
+++ b/rpmio/rpmio.c
@@ -21,14 +21,14 @@ extern int h_errno;
 #define	IPPORT_HTTP	80
 #endif
 
-#include "rpmio/rpmio_internal.h"
-
-#include "rpmio/ugid.h"
 #include <rpm/argv.h>
 #include <rpm/rpmlog.h>
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmfileutil.h>
 
+#include "rpmio/rpmio_internal.h"
+#include "rpmio/ugid.h"
+
 #include "debug.h"
 
 #define FDNREFS(fd)	(fd ? ((FD_t)fd)->nrefs : -9)
diff --git a/rpmio/rpmlua.c b/rpmio/rpmlua.c
index a13e698d3..3dc3ea38c 100644
--- a/rpmio/rpmlua.c
+++ b/rpmio/rpmlua.c
@@ -1,12 +1,6 @@
 #include "system.h"
 
 #ifdef	WITH_LUA
-#include <rpm/rpmio.h>
-#include <rpm/rpmmacro.h>
-#include <rpm/rpmlog.h>
-#include <rpm/rpmurl.h>
-#include "rpmio/rpmhook.h"
-
 #include <lua.h>
 #include <lualib.h>
 #include <lauxlib.h>
@@ -16,6 +10,12 @@
 #include <unistd.h>
 #include <assert.h>
 
+#include <rpm/rpmio.h>
+#include <rpm/rpmmacro.h>
+#include <rpm/rpmlog.h>
+#include <rpm/rpmurl.h>
+#include "rpmio/rpmhook.h"
+
 #define _RPMLUA_INTERNAL
 #include "rpmio/rpmlua.h"
 
diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
index 1a4abe4aa..d93ec6e71 100644
--- a/rpmio/rpmpgp.c
+++ b/rpmio/rpmpgp.c
@@ -4,11 +4,12 @@
  */
 
 #include "system.h"
-#include "rpmio/digest.h"
-#include "rpmio/rpmio_internal.h"	/* XXX rpmioSlurp */
 
 #include <rpm/rpmstring.h>
 
+#include "rpmio/digest.h"
+#include "rpmio/rpmio_internal.h"	/* XXX rpmioSlurp */
+
 #include "debug.h"
 
 
diff --git a/rpmio/tax.c b/rpmio/tax.c
index 5c2621492..aeac1756c 100644
--- a/rpmio/tax.c
+++ b/rpmio/tax.c
@@ -1,8 +1,9 @@
 #include "system.h"
                                                                                 
+#include <popt.h>
+
 #include <rpm/rpmpgp.h>
 #include "rpmio/base64.h"
-#include <popt.h>
 
 #include "debug.h"
 
diff --git a/rpmio/tdir.c b/rpmio/tdir.c
index 3e673b159..742225b1b 100644
--- a/rpmio/tdir.c
+++ b/rpmio/tdir.c
@@ -1,10 +1,11 @@
 #include "system.h"
 
-#include "rpmio/rpmio_internal.h"
+#include <popt.h>
+
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmlog.h>
-#include <popt.h>
 
+#include "rpmio/rpmio_internal.h"
 #include "debug.h"
 
 static int _debug = 0;
diff --git a/rpmio/tfts.c b/rpmio/tfts.c
index dbf141774..80c746cf4 100644
--- a/rpmio/tfts.c
+++ b/rpmio/tfts.c
@@ -1,11 +1,12 @@
 #include "system.h"
-#include "rpmio/fts.h"
 
-#include "rpmio/rpmio_internal.h"
+#include <popt.h>
+
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmlog.h>
-#include <popt.h>
 
+#include "rpmio/fts.h"
+#include "rpmio/rpmio_internal.h"
 #include "debug.h"
 
 static int _fts_debug = 0;
diff --git a/rpmio/tget.c b/rpmio/tget.c
index 18e5d14ba..3462bab67 100644
--- a/rpmio/tget.c
+++ b/rpmio/tget.c
@@ -1,9 +1,9 @@
 #include "system.h"
 
-#include "rpmio/rpmio_internal.h"
+#include <popt.h>
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmlog.h>
-#include <popt.h>
+#include "rpmio/rpmio_internal.h"
 
 #include "debug.h"
 
diff --git a/rpmio/tglob.c b/rpmio/tglob.c
index 213c4039d..94350d5f9 100644
--- a/rpmio/tglob.c
+++ b/rpmio/tglob.c
@@ -1,9 +1,9 @@
 #include "system.h"
 
-#include "rpmio/rpmio_internal.h"
+#include <popt.h>
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmlog.h>
-#include <popt.h>
+#include "rpmio/rpmio_internal.h"
 
 #include "debug.h"
 
diff --git a/rpmio/thkp.c b/rpmio/thkp.c
index 133d8413b..a459450dd 100644
--- a/rpmio/thkp.c
+++ b/rpmio/thkp.c
@@ -1,9 +1,9 @@
 #include "system.h"
 
-#include "rpmio/rpmio_internal.h"
+#include <popt.h>
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmlog.h>
-#include <popt.h>
+#include "rpmio/rpmio_internal.h"
 
 #include "debug.h"
 
diff --git a/rpmio/tput.c b/rpmio/tput.c
index 4814d0ddd..61ca42c67 100644
--- a/rpmio/tput.c
+++ b/rpmio/tput.c
@@ -1,9 +1,9 @@
 #include "system.h"
 
-#include "rpmio/rpmio_internal.h"
+#include <popt.h>
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmlog.h>
-#include <popt.h>
+#include "rpmio/rpmio_internal.h"
 
 #include "debug.h"
 
diff --git a/rpmio/tring.c b/rpmio/tring.c
index f9d6b0c3e..46f19e1ed 100644
--- a/rpmio/tring.c
+++ b/rpmio/tring.c
@@ -1,7 +1,7 @@
 #include "system.h"
+#include <popt.h>
 #include "rpmio/digest.h"
 #include "rpmio/rpmio_internal.h"	/* XX _*debug */
-#include <popt.h>
 #include "debug.h"
 
 static int printing = 1;
diff --git a/rpmio/tufdio.c b/rpmio/tufdio.c
index 3345bccbd..b88a7469d 100644
--- a/rpmio/tufdio.c
+++ b/rpmio/tufdio.c
@@ -4,11 +4,12 @@
 
 #include "system.h"
 
+#include <stdarg.h>
+#include <err.h>
+
 #include <rpm/rpmurl.h>
 #include "rpmio/rpmio_internal.h"
 
-#include <stdarg.h>
-#include <err.h>
 #include "debug.h"
 
 extern int _url_debug;