diff --git a/src/Makefile.am b/src/Makefile.am
index 8d00358d..f653cbfc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,15 +37,16 @@ bin_PROGRAMS = wget
 wget_SOURCES = cmpt.c connect.c convert.c cookies.c ftp.c ftp-basic.c	\
 	       ftp-ls.c hash.c host.c html-parse.c html-url.c http.c	\
 	       init.c log.c main.c netrc.c progress.c ptimer.c recur.c	\
-	       res.c retr.c safe-ctype.c snprintf.c spider.c url.c	\
+	       res.c retr.c snprintf.c spider.c url.c	\
 	       utils.c version.c xmalloc.c				\
 	       config-post.h connect.h convert.h cookies.h 		\
 	       ftp.h gen-md5.h gnu-md5.h hash.h host.h html-parse.h \
 	       http.h http-ntlm.h init.h log.h mswindows.h netrc.h \
-	       options.h progress.h ptimer.h recur.h res.h retr.h safe-ctype.h \
+	       options.h progress.h ptimer.h recur.h res.h retr.h \
 	       spider.h ssl.h sysdep.h url.h utils.h wget.h xmalloc.h
 EXTRA_wget_SOURCES = mswindows.c
 LDADD = $(ALLOCA) $(LIBOBJS) ../lib/libgnu.a
+AM_CPPFLAGS = -I$(top_srcdir)/lib
 
 version.c: hg-id
 	printf '%s' 'const char *version_string = "@VERSION@' > $@