* Added missing header include guards in md5.h and sha1.h.

* Some header cleanup on the pacman side of things - we had alpm.h instead
  alpm_list.h in a few headers.
* removed an extra slash in path-building snprintf in server.c.

11 files changed, 13 insertions, 8 deletions

diff --git a/src/pacman/add.h b/src/pacman/add.h
index cdcadc0e..61a956c5 100644
--- a/src/pacman/add.h
+++ b/src/pacman/add.h
@@ -21,7 +21,7 @@
 #ifndef _PM_ADD_H
 #define _PM_ADD_H
 
-#include <alpm.h>
+#include <alpm_list.h>
 
 int pacman_add(alpm_list_t *targets);
 
diff --git a/src/pacman/conf.h b/src/pacman/conf.h
index df04a22b..05ef0b4c 100644
--- a/src/pacman/conf.h
+++ b/src/pacman/conf.h
@@ -51,7 +51,7 @@ typedef struct __config_t {
 	unsigned short op_s_search;
 	unsigned short op_s_upgrade;
 	unsigned short group;
-	unsigned int flags;
+	pmtransflag_t flags;
 	unsigned short noask;
 	unsigned int ask;
 } config_t;
diff --git a/src/pacman/deptest.h b/src/pacman/deptest.h
index 3a9ca3f5..ee30e437 100644
--- a/src/pacman/deptest.h
+++ b/src/pacman/deptest.h
@@ -21,7 +21,7 @@
 #ifndef _PM_DEPTEST_H
 #define _PM_DEPTEST_H
 
-#include <alpm.h>
+#include <alpm_list.h>
 
 int pacman_deptest(alpm_list_t *targets);
 
diff --git a/src/pacman/log.h b/src/pacman/log.h
index 3317709e..1205e8e6 100644
--- a/src/pacman/log.h
+++ b/src/pacman/log.h
@@ -21,6 +21,8 @@
 #ifndef _PM_LOG_H
 #define _PM_LOG_H
 
+#include <stdio.h>
+
 /* TODO these are illegal in ISO C, thus the reason -pedantic was never used
  * as a compile flag for the pacman side of things (named variadic macros) */
 #define MSG(line, fmt, args...) pm_fprintf(stdout, line, fmt, ##args)
diff --git a/src/pacman/package.h b/src/pacman/package.h
index f6aab756..965ecee5 100644
--- a/src/pacman/package.h
+++ b/src/pacman/package.h
@@ -21,6 +21,8 @@
 #ifndef _PM_PACKAGE_H
 #define _PM_PACKAGE_H
 
+#include <alpm.h>
+
 void dump_pkg_full(pmpkg_t *pkg, int level);
 void dump_pkg_sync(pmpkg_t *pkg, const char *treename);
 
diff --git a/src/pacman/query.h b/src/pacman/query.h
index ef8de807..fa55c732 100644
--- a/src/pacman/query.h
+++ b/src/pacman/query.h
@@ -21,7 +21,7 @@
 #ifndef _PM_QUERY_H
 #define _PM_QUERY_H
 
-#include <alpm.h>
+#include <alpm_list.h>
 
 int pacman_query(alpm_list_t *targets);
 
diff --git a/src/pacman/remove.h b/src/pacman/remove.h
index 9365dc2e..33a2d20d 100644
--- a/src/pacman/remove.h
+++ b/src/pacman/remove.h
@@ -21,7 +21,7 @@
 #ifndef _PM_REMOVE_H
 #define _PM_REMOVE_H
 
-#include <alpm.h>
+#include <alpm_list.h>
 
 int pacman_remove(alpm_list_t *targets);
 
diff --git a/src/pacman/sync.h b/src/pacman/sync.h
index ca8f6300..7175577f 100644
--- a/src/pacman/sync.h
+++ b/src/pacman/sync.h
@@ -21,7 +21,7 @@
 #ifndef _PM_SYNC_H
 #define _PM_SYNC_H
 
-#include <alpm.h>
+#include <alpm_list.h>
 
 int pacman_sync(alpm_list_t *targets);
 
diff --git a/src/pacman/trans.h b/src/pacman/trans.h
index 85e122c4..0c0f9e01 100644
--- a/src/pacman/trans.h
+++ b/src/pacman/trans.h
@@ -21,6 +21,8 @@
 #ifndef _PM_TRANS_H
 #define _PM_TRANS_H
 
+#include <alpm.h>
+
 /* callback to handle messages/notifications from pacman transactions */
 void cb_trans_evt(pmtransevt_t event, void *data1, void *data2);
 
diff --git a/src/pacman/upgrade.h b/src/pacman/upgrade.h
index e21ac357..d26930f0 100644
--- a/src/pacman/upgrade.h
+++ b/src/pacman/upgrade.h
@@ -21,7 +21,7 @@
 #ifndef _PM_UPGRADE_H
 #define _PM_UPGRADE_H
 
-#include <alpm.h>
+#include <alpm_list.h>
 
 int pacman_upgrade(alpm_list_t *targets);
 
diff --git a/src/pacman/util.h b/src/pacman/util.h
index 45759310..5ff08212 100644
--- a/src/pacman/util.h
+++ b/src/pacman/util.h
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <libintl.h>
 
-#include <alpm.h>
 #include <alpm_list.h>
 
 #define MALLOC(p, b) do { \