Index: Makefile
--- Makefile.orig	2008-04-10 18:24:40 +0200
+++ Makefile	2008-04-14 07:57:01 +0200
@@ -101,19 +101,19 @@
 
 linestack-cmd$(EXEEXT): src/linestack-cmd.o $(objs) $(LIBIRC)
 	@echo Linking $@
-	@$(LD) $(LIBS) -lreadline -rdynamic -o $@ $^
+	@$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 ctrlproxy$(EXEEXT): src/main.o $(objs) $(LIBIRC)
 	@echo Linking $@
-	@$(LD) $(LDFLAGS) -rdynamic -o $@ $^ $(LIBS)
+	@$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 ctrlproxyd$(EXEEXT): daemon/main.o $(objs) $(LIBIRC)
 	@echo Linking $@
-	@$(LD) $(LDFLAGS) -rdynamic -o $@ $^ $(LIBS)
+	@$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 ctrlproxy-admin$(EXEEXT): src/admin-cmd.o
 	@echo Linking $@
-	@$(LD) $(LDFLAGS) -rdynamic -o $@ $^ $(LIBS)
+	@$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 %.o: %.c
 	@echo Compiling $<
Index: Makefile.settings.in
--- Makefile.settings.in.orig	2008-04-10 18:24:40 +0200
+++ Makefile.settings.in	2008-04-14 07:56:03 +0200
@@ -9,12 +9,12 @@
 localedir = @datadir@/locale
 INSTALL = @INSTALL@
 bindir = @bindir@
-docdir = @prefix@/share/doc/ctrlproxy
+docdir = @prefix@/share/ctrlproxy
 modulesdir = @libdir@/ctrlproxy
 libdir = @libdir@
 includedir = @includedir@
 mandir = @mandir@
-destincludedir = $(includedir)/ctrlproxy-3.0
+destincludedir = $(includedir)/ctrlproxy
 cdatadir = @datadir@/ctrlproxy
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
Index: src/internals.h
--- src/internals.h.orig	2008-04-10 18:24:41 +0200
+++ src/internals.h	2008-04-14 07:56:03 +0200
@@ -28,9 +28,10 @@
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
+#include <sys/types.h>
 #include <netdb.h>
+#include <netinet/in.h>
 #include <sys/socket.h>
-#include <sys/types.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>