diff --git a/src/capmt.c b/src/capmt.c
index 16a774c..b858ad1 100644
--- a/src/capmt.c
+++ b/src/capmt.c
@@ -77,9 +77,6 @@
 
 #ifdef __GNUC__
 #include <features.h>
-#if __GNUC_PREREQ(4, 3)
-#pragma GCC diagnostic ignored "-Warray-bounds"
-#endif
 #endif
 
 #define MAX_CA  4
diff --git a/src/muxer/tvh/mkmux.c b/src/muxer/tvh/mkmux.c
index c42ca26..c46888f 100644
--- a/src/muxer/tvh/mkmux.c
+++ b/src/muxer/tvh/mkmux.c
@@ -24,6 +24,7 @@
 #include <unistd.h>
 #include <assert.h>
 #include <string.h>
+#include <sys/uio.h>
 
 #include "tvheadend.h"
 #include "streaming.h"
diff --git a/src/trap.c b/src/trap.c
index b0fe543..adfd7b7 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -165,7 +165,7 @@ traphandler(int sig, siginfo_t *si, void *UC)
 	       si->si_addr, reason ?: "N/A");
 
   tvhlog_spawn(LOG_ALERT, "CRASH", "Loaded libraries: %s ", libs);
-  snprintf(tmpbuf, sizeof(tmpbuf), "Register dump [%d]: ", NGREG);
+  snprintf(tmpbuf, sizeof(tmpbuf), "Register dump [%d]: ", (int) NGREG);
 
   for(i = 0; i < NGREG; i++) {
 #if __WORDSIZE == 64
diff --git a/src/tvheadend.h b/src/tvheadend.h
index f2f2378..d9837d9 100644
--- a/src/tvheadend.h
+++ b/src/tvheadend.h
@@ -27,6 +27,7 @@
 #include <netinet/in.h>
 #include <sys/time.h>
 #include <libgen.h>
+#include <sys/stat.h>
 
 #include "queue.h"
 #include "avg.h"