15 files changed, 9 insertions, 10 deletions
diff --git a/daemons/clvmd/clvmd-command.c b/daemons/clvmd/clvmd-command.c
index 0d3da6a6..b3deb48c 100644
--- a/daemons/clvmd/clvmd-command.c
+++ b/daemons/clvmd/clvmd-command.c
@@ -67,7 +67,6 @@
 #include <libdevmapper.h>
 #include <libdlm.h>
 
-#include "list.h"
 #include "locking.h"
 #include "log.h"
 #include "lvm-functions.h"
diff --git a/daemons/clvmd/clvmd-gulm.c b/daemons/clvmd/clvmd-gulm.c
index a2f21488..5fdf9b28 100644
--- a/daemons/clvmd/clvmd-gulm.c
+++ b/daemons/clvmd/clvmd-gulm.c
@@ -44,7 +44,6 @@
 #include <ccs.h>
 #include <libgulm.h>
 
-#include "list.h"
 #include "locking.h"
 #include "log.h"
 #include "clvm.h"
diff --git a/daemons/clvmd/clvmd-openais.c b/daemons/clvmd/clvmd-openais.c
index 253980ac..a830304a 100644
--- a/daemons/clvmd/clvmd-openais.c
+++ b/daemons/clvmd/clvmd-openais.c
@@ -39,7 +39,6 @@
 #include <openais/saLck.h>
 #include <openais/cpg.h>
 
-#include "list.h"
 #include "locking.h"
 #include "log.h"
 #include "clvm.h"
diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c
index c4264f51..3a227276 100644
--- a/daemons/clvmd/clvmd.c
+++ b/daemons/clvmd/clvmd.c
@@ -46,7 +46,6 @@
 #include "version.h"
 #include "clvmd.h"
 #include "refresh_clvmd.h"
-#include "list.h"
 #include "log.h"
 
 #ifndef TRUE
diff --git a/daemons/clvmd/lvm-functions.c b/daemons/clvmd/lvm-functions.c
index 50f1f1de..2e727518 100644
--- a/daemons/clvmd/lvm-functions.c
+++ b/daemons/clvmd/lvm-functions.c
@@ -33,7 +33,6 @@
 #include <libdevmapper.h>
 #include <libdlm.h>
 
-#include "list.h"
 #include "lvm-types.h"
 #include "clvm.h"
 #include "clvmd-comms.h"
diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c
index 349d5ee7..7eb3b6b1 100644
--- a/daemons/dmeventd/dmeventd.c
+++ b/daemons/dmeventd/dmeventd.c
@@ -22,7 +22,6 @@
 #include "configure.h"
 #include "libdevmapper.h"
 #include "libdevmapper-event.h"
-#include "list.h"
 #include "dmeventd.h"
 //#include "libmultilog.h"
 #include "dm-logging.h"
diff --git a/lib/format_pool/disk_rep.c b/lib/format_pool/disk_rep.c
index c745d8fd..802bf525 100644
--- a/lib/format_pool/disk_rep.c
+++ b/lib/format_pool/disk_rep.c
@@ -19,9 +19,10 @@
 #include "lvmcache.h"
 #include "filter.h"
 #include "xlate.h"
-
 #include "disk_rep.h"
 
+#include <assert.h>
+
 /* FIXME: memcpy might not be portable */
 #define CPIN_8(x, y, z) {memcpy((x), (y), (z));}
 #define CPOUT_8(x, y, z) {memcpy((y), (x), (z));}
diff --git a/lib/locking/cluster_locking.c b/lib/locking/cluster_locking.c
index 94b39de5..f230dda4 100644
--- a/lib/locking/cluster_locking.c
+++ b/lib/locking/cluster_locking.c
@@ -25,6 +25,7 @@
 #include "locking.h"
 #include "locking_types.h"
 
+#include <assert.h>
 #include <stddef.h>
 #include <sys/socket.h>
 #include <sys/un.h>
diff --git a/lib/locking/locking.c b/lib/locking/locking.c
index e65a2c1c..aa008ff0 100644
--- a/lib/locking/locking.c
+++ b/lib/locking/locking.c
@@ -23,6 +23,7 @@
 #include "defaults.h"
 #include "lvmcache.h"
 
+#include <assert.h>
 #include <signal.h>
 #include <sys/stat.h>
 #include <limits.h>
diff --git a/lib/metadata/pv_map.c b/lib/metadata/pv_map.c
index 6b1f4208..6c8bc348 100644
--- a/lib/metadata/pv_map.c
+++ b/lib/metadata/pv_map.c
@@ -17,6 +17,8 @@
 #include "pv_map.h"
 #include "pv_alloc.h"
 
+#include <assert.h>
+
 /*
  * Areas are maintained in size order, largest first.
  *
diff --git a/lib/uuid/uuid.c b/lib/uuid/uuid.c
index f96c9f7c..39252c0e 100644
--- a/lib/uuid/uuid.c
+++ b/lib/uuid/uuid.c
@@ -16,6 +16,7 @@
 #include "lib.h"
 #include "uuid.h"
 
+#include <assert.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/libdm/datastruct/list.c b/libdm/datastruct/list.c
index cacebdac..3d9ca8b3 100644
--- a/libdm/datastruct/list.c
+++ b/libdm/datastruct/list.c
@@ -14,6 +14,7 @@
  */
 
 #include "lib.h"
+#include <assert.h>
 
 /*
  * Initialise a list before use.
diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h
index 7f668871..93aecbbd 100644
--- a/libdm/libdevmapper.h
+++ b/libdm/libdevmapper.h
@@ -799,7 +799,7 @@ struct dm_list *dm_list_next(const struct dm_list *head, const struct dm_list *e
  * The containing structure should be the same type as 'v'.
  * The list should be 'struct dm_list list' within the containing structure.
  */
-#define dm_list_iterate_back_items(v, head) list_iterate_back_items_gen(v, (head), list)
+#define dm_list_iterate_back_items(v, head) dm_list_iterate_back_items_gen(v, (head), list)
 
 /*
  * Return the number of elements in a list by walking it.
diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c
index f97df6e4..26fc0437 100644
--- a/libdm/libdm-common.c
+++ b/libdm/libdm-common.c
@@ -16,7 +16,6 @@
 #include "dmlib.h"
 #include "libdm-targets.h"
 #include "libdm-common.h"
-#include "list.h"
 #include "kdev_t.h"
 #include "dm-ioctl.h"
 
diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index b0c1d58e..a101007c 100644
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -15,7 +15,6 @@
 #include "dmlib.h"
 #include "libdm-targets.h"
 #include "libdm-common.h"
-#include "list.h"
 #include "kdev_t.h"
 #include "dm-ioctl.h"