diff --git a/ChangeLog b/ChangeLog
index 3200e87..7bd00df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
+2012-02-15 12:30:33 +0100 Georg Hopp 
+
+	* some more cleanups in the server code. Removing not needed header includes (HEAD, master)
+
+2012-02-15 12:17:39 +0100 Georg Hopp 
+
+	* Merge branch 'master' of 192.168.100.2:/var/lib/git/server (origin/master, origin/HEAD)
+
 2012-02-15 12:17:00 +0100 Georg Hopp 
 
-	* now the separated http worker works. Changed some size_t to ssize_t as i use -1 and -2 es error indicator in my server and fixed caculation of remainig buffer size in reader (HEAD, master)
+	* now the separated http worker works. Changed some size_t to ssize_t as i use -1 and -2 es error indicator in my server and fixed caculation of remainig buffer size in reader
 
 2012-02-15 09:38:32 +0100 Georg Hopp 
 
@@ -10,6 +18,10 @@
 
 	* add subject/observer interface
 
+2012-02-15 06:19:52 +0100 Georg Hopp 
+
+	* add subject/observer interface
+
 2012-02-15 04:55:46 +0100 Georg Hopp 
 
 	* fix infinite busy loop in run
diff --git a/src/server/handle_accept.c b/src/server/handle_accept.c
index faf6804..259fa24 100644
--- a/src/server/handle_accept.c
+++ b/src/server/handle_accept.c
@@ -1,3 +1,5 @@
+#include <errno.h>
+
 static
 int
 serverHandleAccept(Server this)
@@ -19,6 +21,20 @@ serverHandleAccept(Server this)
 		this->nfds++;
 	} else {
 		delete(&acc);
+
+		switch(errno) {
+			case EAGAIN:
+				loggerLog(this->logger,
+						LOGGER_DEBUG,
+						"server accept blocks");
+				break;
+
+			default:
+				loggerLog(this->logger,
+						LOGGER_DEBUG,
+						"server accept error");
+				break;
+		}
 	}
 
 	return (acc)? acc->handle : -1;
diff --git a/src/server/poll.c b/src/server/poll.c
index 1e39a37..d0f7b9e 100644
--- a/src/server/poll.c
+++ b/src/server/poll.c
@@ -1,3 +1,6 @@
+#include <poll.h>
+#include <errno.h>
+
 #define POLLFD(ptr)	((struct pollfd *)(ptr))
 #define SWAP(a, b)	((a)^=(b),(b)^=(a),(a)^=(b))
 
diff --git a/src/server/run.c b/src/server/run.c
index 4c95d30..d54cfe2 100644
--- a/src/server/run.c
+++ b/src/server/run.c
@@ -1,15 +1,3 @@
-#include <poll.h> /* for poll system call and related */
-#include <string.h>     /* for memset and stuff */
-#include <stdlib.h>     /* for exit */
-#include <errno.h>      /* for errno */
-#include <unistd.h>
-#include <ctype.h>
-#include <time.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
 #include "server.h"
 #include "socket.h"
 #include "logger.h"
@@ -64,20 +52,6 @@ serverRun(Server this)
 				if (this->sock->handle == (this->fds)[i].fd) {
 					while(-1 != serverHandleAccept(this) && 0 < naccs) {
 						naccs--;
-
-						switch(errno) {
-							case EAGAIN:
-								loggerLog(this->logger,
-										LOGGER_DEBUG,
-										"server accept blocks");
-								break;
-
-							default:
-								loggerLog(this->logger,
-										LOGGER_DEBUG,
-										"server accept error");
-								break;
-						}
 					}
 				}