diff --git a/ChangeLog b/ChangeLog
index e7b08e4d6c..2c5d2107f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-01  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	* include/libc-symbols.h (HAVE_MBSTATE_T): Define macro.
+	(HAVE_MBSRTOWCS): Likewise.
+	* posix/fnmatch.c: Include string.h unconditionally.
+
 2014-08-01  Stefan Liebler  <stli@linux.vnet.ibm.com>
 
 	* NEWS: Explain the s390 jmp_buf / ucontext_t ABI change
diff --git a/include/libc-symbols.h b/include/libc-symbols.h
index 03061aed9d..d833eb7420 100644
--- a/include/libc-symbols.h
+++ b/include/libc-symbols.h
@@ -57,9 +57,11 @@
    so it's harmless.  */
 #define HAVE_CONFIG_H	0
 
-/* Define this for the benefit of portable GNU code that wants to check it.
-   Of course, it's never false when building libc!  */
+/* Define these macros for the benefit of portable GNU code that wants to check
+   them.  Of course, STDC_HEADERS is never false when building libc!  */
 #define STDC_HEADERS	1
+#define HAVE_MBSTATE_T	1
+#define HAVE_MBSRTOWCS	1
 
 /* The symbols in all the user (non-_) macros are C symbols.  */
 
diff --git a/posix/fnmatch.c b/posix/fnmatch.c
index ca95ab4df2..c330a122ab 100644
--- a/posix/fnmatch.c
+++ b/posix/fnmatch.c
@@ -28,12 +28,7 @@
 #include <errno.h>
 #include <fnmatch.h>
 #include <ctype.h>
-
-#if HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
 
 #if defined STDC_HEADERS || defined _LIBC
 # include <stdlib.h>