diff --git a/configure.ac b/configure.ac
index 0cb425a25..c4dde3a8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,9 +36,6 @@ LT_LIB_DLLOAD
 
 dnl Checks for libraries.
 
-dnl Checks for header files.
-AC_CHECK_HEADERS(gshadow.h)
-
 dnl shadow now uses the libc's shadow implementation
 AC_CHECK_HEADER([shadow.h],,[AC_MSG_ERROR([You need a libc with shadow.h])])
 
diff --git a/lib/gshadow.c b/lib/gshadow.c
index d1ca70706..2725e09eb 100644
--- a/lib/gshadow.c
+++ b/lib/gshadow.c
@@ -9,7 +9,7 @@
 
 #include <config.h>
 
-#if defined(SHADOWGRP) && !defined(HAVE_GSHADOW_H)
+#if defined(SHADOWGRP) && !__has_include(<gshadow.h>)
 
 #ident "$Id$"
 
diff --git a/lib/gshadow_.h b/lib/gshadow_.h
index be1f0f1c2..2b38cb338 100644
--- a/lib/gshadow_.h
+++ b/lib/gshadow_.h
@@ -9,7 +9,7 @@
 #define SHADOW_INCLUDE_LIB_GSHADOW__H_
 
 
-#if defined(HAVE_GSHADOW_H)
+#if __has_include(<gshadow.h>)
 # include <gshadow.h>
 #else
 
@@ -41,5 +41,5 @@ int putsgent (const struct sgrp *, FILE *);
 #define	GSHADOW	"/etc/gshadow"
 
 
-#endif  // !HAVE_GSHADOW_H
+#endif  // !__has_include(<gshadow.h>)
 #endif  // include guard