diff --git a/winsup/acinclude.m4 b/winsup/acinclude.m4
index 80c920e8c..865ef8b5d 100644
--- a/winsup/acinclude.m4
+++ b/winsup/acinclude.m4
@@ -50,8 +50,6 @@ if test -n "$with_windows_headers"; then
     else
 	AC_MSG_ERROR([cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers]);
     fi
-elif test -d "$winsup_srcdir/w32api/include/windef.h"; then
-    windows_headers="$winsup_srcdir/w32api/include"
 else
     windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd)
     if test -z "$windows_headers" -o ! -d "$windows_headers"; then
diff --git a/winsup/configure b/winsup/configure
index a66c34585..384403050 100755
--- a/winsup/configure
+++ b/winsup/configure
@@ -3430,8 +3430,6 @@ if test -n "$with_windows_headers"; then
     else
 	as_fn_error $? "cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers" "$LINENO" 5;
     fi
-elif test -d "$winsup_srcdir/w32api/include/windef.h"; then
-    windows_headers="$winsup_srcdir/w32api/include"
 else
     windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd)
     if test -z "$windows_headers" -o ! -d "$windows_headers"; then
diff --git a/winsup/cygserver/aclocal.m4 b/winsup/cygserver/aclocal.m4
index 5bf14e574..4c041613d 100644
--- a/winsup/cygserver/aclocal.m4
+++ b/winsup/cygserver/aclocal.m4
@@ -64,8 +64,6 @@ if test -n "$with_windows_headers"; then
     else
 	AC_MSG_ERROR([cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers]);
     fi
-elif test -d "$winsup_srcdir/w32api/include/windef.h"; then
-    windows_headers="$winsup_srcdir/w32api/include"
 else
     windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd)
     if test -z "$windows_headers" -o ! -d "$windows_headers"; then
diff --git a/winsup/cygserver/configure b/winsup/cygserver/configure
index 71d1592f4..6de9ed0d4 100755
--- a/winsup/cygserver/configure
+++ b/winsup/cygserver/configure
@@ -3431,8 +3431,6 @@ if test -n "$with_windows_headers"; then
     else
 	as_fn_error $? "cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers" "$LINENO" 5;
     fi
-elif test -d "$winsup_srcdir/w32api/include/windef.h"; then
-    windows_headers="$winsup_srcdir/w32api/include"
 else
     windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd)
     if test -z "$windows_headers" -o ! -d "$windows_headers"; then
diff --git a/winsup/cygwin/aclocal.m4 b/winsup/cygwin/aclocal.m4
index c48aad01d..4adb9c03d 100644
--- a/winsup/cygwin/aclocal.m4
+++ b/winsup/cygwin/aclocal.m4
@@ -63,8 +63,6 @@ if test -n "$with_windows_headers"; then
     else
 	AC_MSG_ERROR([cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers]);
     fi
-elif test -d "$winsup_srcdir/w32api/include/windef.h"; then
-    windows_headers="$winsup_srcdir/w32api/include"
 else
     windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd)
     if test -z "$windows_headers" -o ! -d "$windows_headers"; then
diff --git a/winsup/cygwin/configure b/winsup/cygwin/configure
index f655f5738..d89ed8a2f 100755
--- a/winsup/cygwin/configure
+++ b/winsup/cygwin/configure
@@ -3442,8 +3442,6 @@ if test -n "$with_windows_headers"; then
     else
 	as_fn_error $? "cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers" "$LINENO" 5;
     fi
-elif test -d "$winsup_srcdir/w32api/include/windef.h"; then
-    windows_headers="$winsup_srcdir/w32api/include"
 else
     windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd)
     if test -z "$windows_headers" -o ! -d "$windows_headers"; then
diff --git a/winsup/utils/aclocal.m4 b/winsup/utils/aclocal.m4
index c48aad01d..4adb9c03d 100644
--- a/winsup/utils/aclocal.m4
+++ b/winsup/utils/aclocal.m4
@@ -63,8 +63,6 @@ if test -n "$with_windows_headers"; then
     else
 	AC_MSG_ERROR([cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers]);
     fi
-elif test -d "$winsup_srcdir/w32api/include/windef.h"; then
-    windows_headers="$winsup_srcdir/w32api/include"
 else
     windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd)
     if test -z "$windows_headers" -o ! -d "$windows_headers"; then
diff --git a/winsup/utils/configure b/winsup/utils/configure
index 32f75d6e0..4408c9f91 100755
--- a/winsup/utils/configure
+++ b/winsup/utils/configure
@@ -3137,8 +3137,6 @@ if test -n "$with_windows_headers"; then
     else
 	as_fn_error $? "cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers" "$LINENO" 5;
     fi
-elif test -d "$winsup_srcdir/w32api/include/windef.h"; then
-    windows_headers="$winsup_srcdir/w32api/include"
 else
     windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd)
     if test -z "$windows_headers" -o ! -d "$windows_headers"; then