diff --git a/ChangeLog b/ChangeLog
index e73a05ad61..2a30d4890f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-18  Jakub Jelinek  <jakub@redhat.com>
+
+	* io/bug-ftw4.c: Include string.h.
+	* posix/fnmatch.c (mbsinit): Remove define.
+
 2003-11-17  Jakub Jelinek  <jakub@redhat.com>
 
 	* posix/regcomp.c (optimize_utf8): Optimize multi-byte chars as
diff --git a/io/bug-ftw4.c b/io/bug-ftw4.c
index 0a652d3531..16aecf6ce2 100644
--- a/io/bug-ftw4.c
+++ b/io/bug-ftw4.c
@@ -22,6 +22,7 @@
 #include <ftw.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/posix/fnmatch.c b/posix/fnmatch.c
index c521a25b70..e409ed7300 100644
--- a/posix/fnmatch.c
+++ b/posix/fnmatch.c
@@ -59,7 +59,6 @@
 # include <shlib-compat.h>
 
 # define CONCAT(a,b) __CONCAT(a,b)
-# define mbsinit __mbsinit
 # define mbsrtowcs __mbsrtowcs
 # define fnmatch __fnmatch
 extern int fnmatch (const char *pattern, const char *string, int flags);