diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c
index 3e92490cc..9b865f682 100644
--- a/daemons/clvmd/clvmd.c
+++ b/daemons/clvmd/clvmd.c
@@ -19,10 +19,6 @@
 
 #include "clvmd-common.h"
 
-#include <pthread.h>
-#include <getopt.h>
-#include <ctype.h>
-
 #include "clvmd-comms.h"
 #include "clvm.h"
 #include "clvmd.h"
@@ -34,6 +30,11 @@
 #include <corosync/confdb.h>
 #endif
 
+#include <pthread.h>
+#include <getopt.h>
+#include <ctype.h>
+#include <stdarg.h>
+
 #include <fcntl.h>
 #include <netinet/in.h>
 #include <signal.h>
diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c
index 906f7317c..32610ec10 100644
--- a/daemons/dmeventd/dmeventd.c
+++ b/daemons/dmeventd/dmeventd.c
@@ -26,6 +26,7 @@
 //#include "libmultilog.h"
 #include "dm-logging.h"
 
+#include <stdarg.h>
 #include <dlfcn.h>
 #include <errno.h>
 #include <pthread.h>
diff --git a/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c b/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
index c4b69e249..bbee93ab5 100644
--- a/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
+++ b/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
@@ -20,6 +20,7 @@
 
 #include <sys/wait.h>
 #include <syslog.h> /* FIXME Replace syslog with multilog */
+#include <stdarg.h>
 /* FIXME Missing openlog? */
 
 /* First warning when snapshot is 80% full. */
diff --git a/daemons/dmeventd/plugins/thin/dmeventd_thin.c b/daemons/dmeventd/plugins/thin/dmeventd_thin.c
index b700b8d84..f0d3f246c 100644
--- a/daemons/dmeventd/plugins/thin/dmeventd_thin.c
+++ b/daemons/dmeventd/plugins/thin/dmeventd_thin.c
@@ -20,6 +20,7 @@
 
 #include <sys/wait.h>
 #include <syslog.h> /* FIXME Replace syslog with multilog */
+#include <stdarg.h>
 /* FIXME Missing openlog? */
 
 /* First warning when thin is 80% full. */
diff --git a/lib/display/display.c b/lib/display/display.c
index 3bcf439c8..b7fbf1a82 100644
--- a/lib/display/display.c
+++ b/lib/display/display.c
@@ -22,6 +22,7 @@
 #include "defaults.h"
 #include <math.h>  /* fabs() */
 #include <float.h> /* DBL_EPSILON */
+#include <stdarg.h>
 
 #define SIZE_BUF 128
 
diff --git a/lib/misc/lvm-string.c b/lib/misc/lvm-string.c
index 537752831..cdee02b75 100644
--- a/lib/misc/lvm-string.c
+++ b/lib/misc/lvm-string.c
@@ -18,6 +18,7 @@
 #include "metadata-exported.h"
 
 #include <ctype.h>
+#include <stdarg.h>
 
 int emit_to_buffer(char **buffer, size_t *size, const char *fmt, ...)
 {
diff --git a/libdm/libdm-config.c b/libdm/libdm-config.c
index ea1af2f90..f8d6b1b00 100644
--- a/libdm/libdm-config.c
+++ b/libdm/libdm-config.c
@@ -20,6 +20,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <ctype.h>
+#include <stdarg.h>
 
 #define SECTION_B_CHAR '{'
 #define SECTION_E_CHAR '}'
diff --git a/libdm/libdm-string.c b/libdm/libdm-string.c
index 9d667bb83..64a9792e5 100644
--- a/libdm/libdm-string.c
+++ b/libdm/libdm-string.c
@@ -15,6 +15,7 @@
 #include "dmlib.h"
 
 #include <ctype.h>
+#include <stdarg.h>
 
 /*
  * consume characters while they match the predicate function.