diff --git a/Makefile.in b/Makefile.in
index 3104bf4d..7714844d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,7 +46,7 @@ CFLAGS		= @CFLAGS@
 # the system one.
 #CFLAGS= -DNDEBUG -g -O2 -D"FD_SETSIZE=1024"
 SHELL=/bin/sh
-SUBDIRS=libratbox modules extensions libcharybdis src tools servlink doc help
+SUBDIRS=libratbox modules extensions src tools servlink doc help
 CLEANDIRS = ${SUBDIRS}
 RSA_FILES=rsa_respond/README rsa_respond/respond.c rsa_respond/Makefile
 
diff --git a/extensions/Makefile.in b/extensions/Makefile.in
index 7051ba8d..9005d955 100644
--- a/extensions/Makefile.in
+++ b/extensions/Makefile.in
@@ -23,7 +23,7 @@ SSL_INCLUDES	= @SSL_INCLUDES@
 
 IRCDLIBS	= @LIBS@ $(SSL_LIBS)
 
-INCLUDES	= -I. -I../include -I../libcharybdis -I../libratbox/include $(SSL_INCLUDES)
+INCLUDES	= -I. -I../include -I../libratbox/include $(SSL_INCLUDES)
 CPPFLAGS	= ${INCLUDES} @CPPFLAGS@
 
 SRCS =                          \
diff --git a/modules/Makefile.in b/modules/Makefile.in
index 5d840d75..ceb027a7 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -32,7 +32,7 @@ moduledir       = @moduledir@
 # Change this later! -- adrian
 automoduledir   = @moduledir@/autoload
 
-INCLUDES	= -I../include -I../libcharybdis -I../libratbox/include $(SSL_INCLUDES)
+INCLUDES	= -I../include -I../libratbox/include $(SSL_INCLUDES)
 CPPFLAGS	= ${INCLUDES} @CPPFLAGS@
 
 CORE_SRCS = \
diff --git a/src/Makefile.in b/src/Makefile.in
index 99823055..044e856c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -33,9 +33,9 @@ PROGS		= $(IRCD_EXE)
 SSL_LIBS	= @SSL_LIBS@
 SSL_INCLUDES	= @SSL_INCLUDES@
 
-IRCDLIBS	= @MODULES_LIBS@ -L../libcharybdis -lcharybdis -L../libratbox/src/.libs -lratbox @LIBS@ $(SSL_LIBS)
+IRCDLIBS	= @MODULES_LIBS@ -L../libratbox/src/.libs -lratbox @LIBS@ $(SSL_LIBS)
 
-INCLUDES	= -I../include -I../libcharybdis -I../libratbox/include $(SSL_INCLUDES)
+INCLUDES	= -I../include -I../libratbox/include $(SSL_INCLUDES)
 CPPFLAGS	= ${INCLUDES} @CPPFLAGS@
  
 default:	all