diff --git a/configure.ac b/configure.ac
index 92b222545d5..62bf25ebbf0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -877,6 +877,9 @@ ac_func_list=$funcs
 AC_DEFUN([gt_TYPE_WINT_T],
   [GNULIB_OVERRIDES_WINT_T=0
    AC_SUBST([GNULIB_OVERRIDES_WINT_T])])
+AC_DEFUN([gt_TYPE_WINT_T],
+  [GNULIBHEADERS_OVERRIDE_WINT_T=0
+   AC_SUBST([GNULIBHEADERS_OVERRIDE_WINT_T])])
 
 # Initialize gnulib right after choosing the compiler.
 dnl Amongst other things, this sets AR and ARFLAGS.
diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index 584c7141d8f..bac27f3a68d 100644
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -545,7 +545,7 @@ GL_GNULIB__EXIT = @GL_GNULIB__EXIT@
 GMALLOC_OBJ = @GMALLOC_OBJ@
 GMP_H = @GMP_H@
 GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
-GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@
+GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@
 GNULIB_WARN_CFLAGS = @GNULIB_WARN_CFLAGS@
 GNUSTEP_CFLAGS = @GNUSTEP_CFLAGS@
 GNU_OBJC_CFLAGS = @GNU_OBJC_CFLAGS@