diff --git a/src/Makefile.am b/src/Makefile.am
index e39d8e7..6dc89eb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,7 @@ cacaplay_SOURCES = cacaplay.c
 cacaplay_LDADD = ../caca/libcaca.la ../cucul/libcucul.la
 
 cacaserver_SOURCES = cacaserver.c
-cacaserver_LDADD = ../caca/libcaca.la ../cucul/libcucul.la
+cacaserver_LDADD = ../cucul/libcucul.la
 
 img2irc_SOURCES = img2irc.c common-image.c common-image.h
 img2irc_LDADD = ../cucul/libcucul.la
diff --git a/src/cacaserver.c b/src/cacaserver.c
index f9a8dd3..4059cd4 100644
--- a/src/cacaserver.c
+++ b/src/cacaserver.c
@@ -26,24 +26,16 @@
 #   include <winsock2.h>
 #   include <ws2tcpip.h>
 #endif
+#if defined(HAVE_UNISTD_H)
+#   include <unistd.h>
+#endif
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <errno.h>
-
-#include "cucul.h"
-#include "caca.h"
-
-#include "config.h"
-
-#if defined(HAVE_UNISTD_H)
-#   include <unistd.h>
-#endif
-
 #include <stdarg.h>
 
-#include "caca.h"
 #include "cucul.h"
 
 #define BACKLOG 1337     /* Number of pending connections */