This commit looks much more monumental than it is. Almost all just #include

reordering and adding ones that were forgotten (noticed when trying to
compile after reordering).

* Updated the HACKING file to include information on #include usage.
* print -> vprint in "making dir" function in pactest.

13 files changed, 46 insertions, 19 deletions

diff --git a/src/pacman/add.c b/src/pacman/add.c
index 40a4bc2d..2adf8681 100644
--- a/src/pacman/add.c
+++ b/src/pacman/add.c
@@ -19,6 +19,8 @@
  *  USA.
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -26,11 +28,12 @@
 
 #include <alpm.h>
 #include <alpm_list.h>
+
 /* pacman */
+#include "add.h"
 #include "log.h"
 #include "downloadprog.h"
 #include "trans.h"
-#include "add.h"
 #include "conf.h"
 #include "util.h"
 
diff --git a/src/pacman/conf.c b/src/pacman/conf.c
index 4c0381cf..a770fd47 100644
--- a/src/pacman/conf.c
+++ b/src/pacman/conf.c
@@ -19,6 +19,8 @@
  *  USA.
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -26,12 +28,13 @@
 #include <libintl.h>
 
 #include <alpm.h>
+
 /* pacman */
+#include "conf.h"
 #include "util.h"
 #include "log.h"
 #include "sync.h"
 #include "downloadprog.h"
-#include "conf.h"
 
 config_t *config_new()
 {
diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c
index f8bf513d..a7c913d9 100644
--- a/src/pacman/deptest.c
+++ b/src/pacman/deptest.c
@@ -25,14 +25,16 @@
 #include <stdio.h>
 #include <string.h>
 #include <libintl.h>
+
 #include <alpm.h>
 #include <alpm_list.h>
+
 /* pacman */
+#include "deptest.h"
 #include "util.h"
 #include "conf.h"
 #include "log.h"
 #include "sync.h"
-#include "deptest.h"
 
 extern config_t *config;
 
diff --git a/src/pacman/downloadprog.c b/src/pacman/downloadprog.c
index 0d5a9b22..6ce8e2f5 100644
--- a/src/pacman/downloadprog.c
+++ b/src/pacman/downloadprog.c
@@ -20,6 +20,7 @@
  */
 
 #include "config.h"
+
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -32,10 +33,11 @@
 #include <math.h>
 
 #include <alpm.h>
+
 /* pacman */
+#include "downloadprog.h"
 #include "util.h"
 #include "log.h"
-#include "downloadprog.h"
 #include "conf.h"
 
 /* progress bar */
diff --git a/src/pacman/log.c b/src/pacman/log.c
index 501f32d2..1b65e28d 100644
--- a/src/pacman/log.c
+++ b/src/pacman/log.c
@@ -20,6 +20,7 @@
  */
 
 #include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
@@ -28,6 +29,7 @@
 #include <libintl.h>
 
 #include <alpm.h>
+
 /* pacman */
 #include "log.h"
 #include "conf.h"
diff --git a/src/pacman/package.c b/src/pacman/package.c
index d5a3d04e..091ed9ed 100644
--- a/src/pacman/package.c
+++ b/src/pacman/package.c
@@ -19,6 +19,8 @@
  *  USA.
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -28,10 +30,11 @@
 
 #include <alpm.h>
 #include <alpm_list.h>
+
 /* pacman */
+#include "package.h"
 #include "log.h"
 #include "util.h"
-#include "package.h"
 
 /* Display the content of an installed package
  *
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index e2a5eec9..a26d34c7 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -20,6 +20,7 @@
  */
 
 #include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <limits.h>
@@ -44,6 +45,7 @@
 
 #include <alpm.h>
 #include <alpm_list.h>
+
 /* pacman */
 #include "util.h"
 #include "log.h"
diff --git a/src/pacman/query.c b/src/pacman/query.c
index 2ce36ac4..2964a7cb 100644
--- a/src/pacman/query.c
+++ b/src/pacman/query.c
@@ -19,6 +19,8 @@
  *  USA.
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <limits.h>
@@ -28,9 +30,10 @@
 
 #include <alpm.h>
 #include <alpm_list.h>
+
 /* pacman */
-#include "package.h"
 #include "query.h"
+#include "package.h"
 #include "log.h"
 #include "conf.h"
 #include "sync.h"
diff --git a/src/pacman/remove.c b/src/pacman/remove.c
index 0b48410c..9989f8e5 100644
--- a/src/pacman/remove.c
+++ b/src/pacman/remove.c
@@ -19,6 +19,8 @@
  *  USA.
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -26,11 +28,12 @@
 
 #include <alpm.h>
 #include <alpm_list.h>
+
 /* pacman */
+#include "remove.h"
 #include "util.h"
 #include "log.h"
 #include "trans.h"
-#include "remove.h"
 #include "conf.h"
 
 extern config_t *config;
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 8db1d9ac..4245b964 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -19,16 +19,15 @@
  *  USA.
  */
 
-#if defined(__APPLE__) || defined(__OpenBSD__)
-#include <sys/syslimits.h>
-#include <sys/stat.h>
-#endif
-
 #include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
+#if defined(__APPLE__) || defined(__OpenBSD__)
+#include <sys/syslimits.h>
+#endif
 #include <unistd.h>
 #include <dirent.h>
 #include <libintl.h>
@@ -41,13 +40,14 @@
 #include <download.h> /* downloadLastErrString */
 /* TODO remove above download.h inclusion once we abstract more, and also
  * remove it from Makefile.am on the pacman side */
+
 /* pacman */
+#include "sync.h"
 #include "util.h"
 #include "log.h"
 #include "downloadprog.h"
 #include "package.h"
 #include "trans.h"
-#include "sync.h"
 #include "conf.h"
 
 extern config_t *config;
diff --git a/src/pacman/trans.c b/src/pacman/trans.c
index 55b40413..23efadf6 100644
--- a/src/pacman/trans.c
+++ b/src/pacman/trans.c
@@ -20,6 +20,7 @@
  */
 
 #include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -30,10 +31,11 @@
 #include <wchar.h>
 
 #include <alpm.h>
+
 /* pacman */
+#include "trans.h"
 #include "util.h"
 #include "log.h"
-#include "trans.h"
 #include "conf.h"
 
 #define LOG_STR_LEN 256
diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c
index 5b803353..a4c94bb7 100644
--- a/src/pacman/upgrade.c
+++ b/src/pacman/upgrade.c
@@ -19,15 +19,16 @@
  *  USA.
  */
 
+#include "config.h"
+
 #include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 
 #include <alpm.h>
 #include <alpm_list.h>
+
 /* pacman */
-#include "add.h"
 #include "upgrade.h"
+#include "add.h"
 #include "conf.h"
 
 extern config_t *config;
diff --git a/src/pacman/util.c b/src/pacman/util.c
index 96eb621e..76bbc189 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -19,16 +19,16 @@
  *  USA.
  */
 
+#include "config.h"
+
 #if defined(__APPLE__) || defined(__OpenBSD__)
 #include <sys/syslimits.h>
 #include <sys/stat.h>
 #endif
-
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 
-#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -44,6 +44,7 @@
 
 #include <alpm.h>
 #include <alpm_list.h>
+
 /* pacman */
 #include "util.h"
 #include "conf.h"