diff --git a/daemon/aux.c b/daemon/aux.c
index 34ed8d862..c09d0c918 100644
--- a/daemon/aux.c
+++ b/daemon/aux.c
@@ -1,3 +1,4 @@
+#include "aux.h"
 #include <string.h>
 #include <stdio.h>
 #include <glib.h>
@@ -5,8 +6,6 @@
 #include <stdlib.h>
 #include <pthread.h>
 
-#include "aux.h"
-
 
 
 #if 0
diff --git a/daemon/bencode.c b/daemon/bencode.c
index 23c1493b1..f97d40582 100644
--- a/daemon/bencode.c
+++ b/daemon/bencode.c
@@ -1,3 +1,4 @@
+#include "bencode.h"
 #include <stdio.h>
 #include <sys/uio.h>
 #include <unistd.h>
@@ -5,7 +6,6 @@
 #include <assert.h>
 #include <string.h>
 
-#include "bencode.h"
 
 /* set to 0 for alloc debugging, e.g. through valgrind */
 #define BENCODE_MIN_BUFFER_PIECE_LEN	512
diff --git a/daemon/call.c b/daemon/call.c
index bbfecb7b0..09f20fca5 100644
--- a/daemon/call.c
+++ b/daemon/call.c
@@ -1,3 +1,5 @@
+#include "call.h"
+
 #include <stdio.h>
 #include <unistd.h>
 #include <glib.h>
@@ -13,7 +15,6 @@
 #include <xmlrpc_client.h>
 #include <sys/wait.h>
 
-#include "call.h"
 #include "poller.h"
 #include "aux.h"
 #include "log.h"
diff --git a/daemon/control_ng.c b/daemon/control_ng.c
index 8c46af77c..469247153 100644
--- a/daemon/control_ng.c
+++ b/daemon/control_ng.c
@@ -1,6 +1,8 @@
+#include "control_ng.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
-#include "control_ng.h"
+
 #include "obj.h"
 #include "poller.h"
 #include "bencode.h"
diff --git a/daemon/control_tcp.c b/daemon/control_tcp.c
index 29ca16f06..0908aebcb 100644
--- a/daemon/control_tcp.c
+++ b/daemon/control_tcp.c
@@ -1,3 +1,5 @@
+#include "control_tcp.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <unistd.h>
@@ -8,7 +10,6 @@
 #include <stdarg.h>
 #include <errno.h>
 
-#include "control_tcp.h"
 #include "poller.h"
 #include "aux.h"
 #include "streambuf.h"
diff --git a/daemon/control_udp.c b/daemon/control_udp.c
index e10213e2c..fd14d0a52 100644
--- a/daemon/control_udp.c
+++ b/daemon/control_udp.c
@@ -1,3 +1,5 @@
+#include "control_udp.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <unistd.h>
@@ -9,7 +11,6 @@
 #include <netinet/in.h>
 #include <errno.h>
 
-#include "control_udp.h"
 #include "poller.h"
 #include "aux.h"
 #include "log.h"
diff --git a/daemon/cookie_cache.c b/daemon/cookie_cache.c
index 49f13b909..f6ccb7303 100644
--- a/daemon/cookie_cache.c
+++ b/daemon/cookie_cache.c
@@ -1,6 +1,8 @@
+#include "cookie_cache.h"
+
 #include <time.h>
 #include <glib.h>
-#include "cookie_cache.h"
+
 #include "aux.h"
 #include "poller.h"
 #include "str.h"
diff --git a/daemon/kernel.c b/daemon/kernel.c
index 708bae24d..565d4dc24 100644
--- a/daemon/kernel.c
+++ b/daemon/kernel.c
@@ -1,3 +1,5 @@
+#include "kernel.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
@@ -9,7 +11,6 @@
 #include "xt_MEDIAPROXY.h"
 
 #include "aux.h"
-#include "kernel.h"
 
 
 
diff --git a/daemon/kernel.h b/daemon/kernel.h
index fef3ab19c..00427969b 100644
--- a/daemon/kernel.h
+++ b/daemon/kernel.h
@@ -5,6 +5,7 @@
 
 #include <sys/types.h>
 #include <glib.h>
+#include <netinet/in.h>
 
 
 
diff --git a/daemon/poller.c b/daemon/poller.c
index 20276ffdd..5c33473d8 100644
--- a/daemon/poller.c
+++ b/daemon/poller.c
@@ -1,3 +1,5 @@
+#include "poller.h"
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -11,7 +13,6 @@
 #include <glib.h>
 #include <sys/time.h>
 
-#include "poller.h"
 #include "aux.h"
 #include "obj.h"
 
diff --git a/daemon/sdp.c b/daemon/sdp.c
index e754f2304..5496b3138 100644
--- a/daemon/sdp.c
+++ b/daemon/sdp.c
@@ -1,9 +1,10 @@
+#include "sdp.h"
+
 #include <glib.h>
 #include <netinet/in.h> 
 #include <netinet/ip.h> 
 #include <arpa/inet.h>
 
-#include "sdp.h"
 #include "call.h"
 #include "log.h"
 #include "str.h"
diff --git a/daemon/str.c b/daemon/str.c
index 52b78eaf0..4f4034fff 100644
--- a/daemon/str.c
+++ b/daemon/str.c
@@ -1,5 +1,5 @@
-#include <assert.h>
 #include "str.h"
+#include <assert.h>
 
 guint str_hash(gconstpointer ss) {
 	const str *s = ss;
diff --git a/daemon/streambuf.c b/daemon/streambuf.c
index 40e8506c2..4b78b5613 100644
--- a/daemon/streambuf.c
+++ b/daemon/streambuf.c
@@ -1,3 +1,5 @@
+#include "streambuf.h"
+
 #include <stdio.h>
 #include <glib.h>
 #include <stdlib.h>
@@ -6,7 +8,6 @@
 #include <stdarg.h>
 #include <time.h>
 
-#include "streambuf.h"
 #include "poller.h"
 #include "aux.h"
 
diff --git a/daemon/udp_listener.c b/daemon/udp_listener.c
index cb107b1b4..fbcca56c3 100644
--- a/daemon/udp_listener.c
+++ b/daemon/udp_listener.c
@@ -1,3 +1,5 @@
+#include "udp_listener.h"
+
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
@@ -5,7 +7,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "udp_listener.h"
 #include "poller.h"
 #include "aux.h"
 #include "str.h"
diff --git a/daemon/udp_listener.h b/daemon/udp_listener.h
index 792daac07..f0b85b6a8 100644
--- a/daemon/udp_listener.h
+++ b/daemon/udp_listener.h
@@ -1,6 +1,7 @@
 #ifndef _UDP_LISTENER_H_
 #define _UDP_LISTENER_H_
 
+#include <netinet/in.h>
 #include "poller.h"
 #include "str.h"