Header inclusion cleanup

This does touch a lot of things, and hopefully doesn't break things on
other platforms, but allows us to also clean up a bunch of crud that no
longer needs to be there.

Signed-off-by: Dan McGee <dan@archlinux.org>

lib/libalpm/add.c

@@ -44,8 +44,6 @@
 #include "backup.h"
 #include "package.h"
 #include "db.h"
-#include "conflict.h"
-#include "deps.h"
 #include "remove.h"
 #include "handle.h"
 

lib/libalpm/alpm_list.c

@@ -20,7 +20,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 
 /* libalpm */
 #include "alpm_list.h"

lib/libalpm/be_local.c

@@ -31,10 +31,6 @@
 #include <time.h>
 #include <limits.h> /* PATH_MAX */
 
-/* libarchive */
-#include <archive.h>
-#include <archive_entry.h>
-
 /* libalpm */
 #include "db.h"
 #include "alpm_list.h"
@@ -43,9 +39,7 @@
 #include "alpm.h"
 #include "handle.h"
 #include "package.h"
-#include "group.h"
 #include "deps.h"
-#include "dload.h"
 
 
 #define LAZY_LOAD(info, errret) \

lib/libalpm/be_package.c

@@ -20,10 +20,8 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <limits.h>
 #include <errno.h>
 
 /* libarchive */

lib/libalpm/be_sync.c

@@ -20,8 +20,7 @@
 
 #include "config.h"
 
-#include <errno.h>
-#include <limits.h>
+#include <sys/stat.h>
 
 /* libarchive */
 #include <archive.h>

lib/libalpm/db.c

@@ -26,11 +26,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <string.h>
-#include <sys/stat.h>
 #include <regex.h>
-#include <time.h>
 
 /* libalpm */
 #include "db.h"

lib/libalpm/group.c

@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 
 /* libalpm */

lib/libalpm/handle.c

@@ -27,9 +27,7 @@
 #include <limits.h>
 #include <sys/types.h>
 #include <syslog.h>
-#include <time.h>
 #include <sys/stat.h>
-#include <errno.h>
 
 /* libalpm */
 #include "handle.h"

lib/libalpm/log.c

@@ -22,10 +22,7 @@
 
 #include <stdio.h>
 #include <stdarg.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <errno.h>
-#include <time.h>
 
 /* libalpm */
 #include "log.h"

lib/libalpm/package.c

@@ -23,13 +23,9 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
-#include <errno.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 
 /* libalpm */
 #include "package.h"

lib/libalpm/remove.c

@@ -26,8 +26,6 @@
 
 #include <stdlib.h>
 #include <errno.h>
-#include <time.h>
-#include <fcntl.h>
 #include <string.h>
 #include <limits.h>
 #include <unistd.h>
@@ -36,6 +34,7 @@
 /* libalpm */
 #include "remove.h"
 #include "alpm_list.h"
+#include "alpm.h"
 #include "trans.h"
 #include "util.h"
 #include "log.h"
@@ -44,7 +43,6 @@
 #include "db.h"
 #include "deps.h"
 #include "handle.h"
-#include "alpm.h"
 
 int SYMEXPORT alpm_remove_pkg(pmpkg_t *pkg)
 {

lib/libalpm/sync.c

@@ -26,11 +26,9 @@
 #include <sys/types.h> /* off_t */
 #include <stdlib.h>
 #include <stdio.h>
-#include <fcntl.h>
 #include <string.h>
 #include <stdint.h> /* intmax_t */
 #include <unistd.h>
-#include <time.h>
 #include <limits.h>
 
 /* libalpm */

lib/libalpm/trans.c

@@ -28,8 +28,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/statvfs.h>
 #include <errno.h>
 #include <limits.h>
 #include <fcntl.h>
@@ -41,11 +39,9 @@
 #include "util.h"
 #include "log.h"
 #include "handle.h"
-#include "add.h"
 #include "remove.h"
 #include "sync.h"
 #include "alpm.h"
-#include "deps.h"
 
 /** \addtogroup alpm_trans Transaction Functions
  * @brief Functions to manipulate libalpm transactions

lib/libalpm/util.c

@@ -53,7 +53,6 @@
 /* libalpm */
 #include "util.h"
 #include "log.h"
-#include "package.h"
 #include "alpm.h"
 #include "alpm_list.h"
 #include "handle.h"

src/pacman/database.c

@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-#include <stdlib.h>
 #include <stdio.h>
 
 #include <alpm.h>

src/pacman/deptest.c

@@ -20,17 +20,13 @@
 
 #include "config.h"
 
-#include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 
 #include <alpm.h>
 #include <alpm_list.h>
 
 /* pacman */
 #include "pacman.h"
-#include "util.h"
-#include "conf.h"
 
 int pacman_deptest(alpm_list_t *targets)
 {

src/pacman/package.c

@@ -26,7 +26,6 @@
 #include <unistd.h>
 #include <limits.h>
 #include <errno.h>
-#include <wchar.h>
 
 #include <alpm.h>
 #include <alpm_list.h>

src/pacman/pacman.c

@@ -39,7 +39,6 @@
 #include <sys/stat.h>
 #include <sys/utsname.h> /* uname */
 #include <locale.h> /* setlocale */
-#include <time.h> /* time_t */
 #include <errno.h>
 #include <glob.h>
 #if defined(PACMAN_DEBUG) && defined(HAVE_MCHECK_H)
@@ -55,7 +54,6 @@
 #include "util.h"
 #include "callback.h"
 #include "conf.h"
-#include "package.h"
 
 /* list of targets specified on command line */
 static alpm_list_t *pm_targets;

src/pacman/query.c

@@ -26,7 +26,6 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <unistd.h>
 
 #include <alpm.h>
 #include <alpm_list.h>

src/pacman/util.c

@@ -31,7 +31,6 @@
 #include <stdint.h> /* intmax_t */
 #include <string.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <ctype.h>
 #include <dirent.h>
 #include <unistd.h>

test/pacman/pmpkg.py

@@ -27,7 +27,7 @@
 class pmpkg(object):
     """Package object.
     
-    Object holding data from an ArchLinux package.
+    Object holding data from an Arch Linux package.
     """
 
     def __init__(self, name, version = "1.0-1"):
@@ -89,7 +89,7 @@ def filename(self):
         return "%s%s" % (self.fullname(), util.PM_EXT_PKG)
 
     def makepkg(self, path):
-        """Creates an ArchLinux package archive.
+        """Creates an Arch Linux package archive.
         
         A package archive is generated in the location 'path', based on the data
         from the object.