diff --git a/config.h.in b/config.h.in
index 8e30c5d2e..1582d5f94 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1154,12 +1154,6 @@
 /* name of YAP library */
 #undef YAP_YAPLIB
 
-/* Define if _FILE_OFFSET_BITS is needed */
-#undef _FILE_OFFSET_BITS
-
-/* Define if _ISOC99_SOURCE is needed */
-#undef _ISOC99_SOURCE
-
 /* HP-UX old socket stuff */
 #undef _XOPEN_SOURCE
 
diff --git a/configure b/configure
index 3932639a8..470963647 100755
--- a/configure
+++ b/configure
@@ -4294,121 +4294,9 @@ test -n "$target_alias" &&
   program_prefix=${target_alias}-
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking _XOPEN_SOURCE" >&5
-$as_echo_n "checking _XOPEN_SOURCE... " >&6; }
-
-if ${ac_cv_xopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-      #define _XOPEN_SOURCE 700
-      #include <unistd.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_xopen=true
-else
-  ac_cv_xopen=false
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-if test "$ac_cv_xopen" = true; then
-
-$as_echo "#define _XOPEN_SOURCE 700" >>confdefs.h
-
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking _FILE_OFFSET_BITS" >&5
-$as_echo_n "checking _FILE_OFFSET_BITS... " >&6; }
-if ${ac_cv_file_offset_bits+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-      #define _FILE_OFFSET_BITS
-      #include <unistd.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_file_offset_bits=true
-else
-  ac_cv_file_offset_bits=false
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-if test "$ac_cv_file_offset_bits" = true; then
-
-$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
-
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking _ISOC99_SOURCE" >&5
-$as_echo_n "checking _ISOC99_SOURCE... " >&6; }
-if ${ac_cv_isoc99_source+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-      #define _ISOC99_SOURCE
-      #include <unistd.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_isoc99_source=true
-else
-  ac_cv_isoc99_source=false
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-if test "$ac_cv_isoc99_source" = true; then
-
-$as_echo "#define _ISOC99_SOURCE 1" >>confdefs.h
-
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
 
 if test "$yap_cv_minisat" = no -a "$INSTALL_DLLS" = "no"
@@ -5039,6 +4927,7 @@ else
 fi
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if ${ac_cv_path_GREP+:} false; then :
@@ -5730,7 +5619,7 @@ $as_echo "no" >&6; }
 fi
 
 
-for ac_header in winsock.h winsock2.h windows.h
+for ac_header in winsock.h winsock2.h windows.h Shlobj.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -8285,7 +8174,7 @@ fi
 
 done
 
-for ac_header in stdint.h string.h stropts.h
+for ac_header in stdint.h string.h strings.h stropts.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -14202,7 +14091,7 @@ else
 JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 14205 "configure" */
+/* #line 14094 "configure" */
 public class Test {
 }
 EOF
@@ -14378,7 +14267,7 @@ EOF
 if uudecode$EXEEXT Test.uue; then
         ac_cv_prog_uudecode_base64=yes
 else
-        echo "configure: 14381: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+        echo "configure: 14270: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
         echo "configure: failed file was:" >&5
         cat Test.uue >&5
         ac_cv_prog_uudecode_base64=no
@@ -14509,7 +14398,7 @@ else
 JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 14512 "configure" */
+/* #line 14401 "configure" */
 public class Test {
 }
 EOF
@@ -14544,7 +14433,7 @@ JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 TEST=Test
 cat << \EOF > $JAVA_TEST
-/* [#]line 14547 "configure" */
+/* [#]line 14436 "configure" */
 public class Test {
 public static void main (String args[]) {
         System.exit (0);
diff --git a/configure.in b/configure.in
index dc6b065ba..384402855 100755
--- a/configure.in
+++ b/configure.in
@@ -77,55 +77,55 @@ AC_LANG(C)
 
 AC_CANONICAL_SYSTEM
 
-dnl includes _POSIX_C_SOURCE=200809
-AC_MSG_CHECKING(_XOPEN_SOURCE)
-AC_CACHE_VAL(ac_cv_xopen,
-      [AC_TRY_COMPILE([
-      #define _XOPEN_SOURCE 700
-      #include <unistd.h>
-],
-[],
-                   [ac_cv_xopen=true],
-                   [ac_cv_xopen=false])])
-if test "$ac_cv_xopen" = true; then
-   AC_DEFINE(_XOPEN_SOURCE, 700, [Define if _XOPEN_SOURCE is needed])
-     AC_MSG_RESULT(yes)	       
-else
-    AC_MSG_RESULT(no)
-fi
+dnl dnl includes _POSIX_C_SOURCE=200809
+dnl AC_MSG_CHECKING(_XOPEN_SOURCE)
+dnl AC_CACHE_VAL(ac_cv_xopen,
+dnl       [AC_TRY_COMPILE([
+dnl       #define _XOPEN_SOURCE 700
+dnl       #include <unistd.h>
+dnl ],
+dnl [],
+dnl                    [ac_cv_xopen=true],
+dnl                    [ac_cv_xopen=false])])
+dnl if test "$ac_cv_xopen" = true; then
+dnl    AC_DEFINE(_XOPEN_SOURCE, 700, [Define if _XOPEN_SOURCE is needed])
+dnl      AC_MSG_RESULT(yes)	       
+dnl else
+dnl     AC_MSG_RESULT(no)
+dnl fi
 
 
-AC_MSG_CHECKING(_FILE_OFFSET_BITS)
-AC_CACHE_VAL(ac_cv_file_offset_bits,
-      [AC_TRY_COMPILE([
-      #define _FILE_OFFSET_BITS
-      #include <unistd.h>
-],
-[],
-                   [ac_cv_file_offset_bits=true],
-                   [ac_cv_file_offset_bits=false])])
-if test "$ac_cv_file_offset_bits" = true; then
-   AC_DEFINE(_FILE_OFFSET_BITS, 64, [Define if _FILE_OFFSET_BITS is needed])
-     AC_MSG_RESULT(yes)	       
-else
-    AC_MSG_RESULT(no)
-fi
+dnl AC_MSG_CHECKING(_FILE_OFFSET_BITS)
+dnl AC_CACHE_VAL(ac_cv_file_offset_bits,
+dnl       [AC_TRY_COMPILE([
+dnl       #define _FILE_OFFSET_BITS
+dnl       #include <unistd.h>
+dnl ],
+dnl [],
+dnl                    [ac_cv_file_offset_bits=true],
+dnl                    [ac_cv_file_offset_bits=false])])
+dnl if test "$ac_cv_file_offset_bits" = true; then
+dnl    AC_DEFINE(_FILE_OFFSET_BITS, 64, [Define if _FILE_OFFSET_BITS is needed])
+dnl      AC_MSG_RESULT(yes)	       
+dnl else
+dnl     AC_MSG_RESULT(no)
+dnl fi
 
-AC_MSG_CHECKING(_ISOC99_SOURCE)
-AC_CACHE_VAL(ac_cv_isoc99_source,
-      [AC_TRY_COMPILE([
-      #define _ISOC99_SOURCE
-      #include <unistd.h>
-],
-[],
-                   [ac_cv_isoc99_source=true],
-                   [ac_cv_isoc99_source=false])])
-if test "$ac_cv_isoc99_source" = true; then
-   AC_DEFINE(_ISOC99_SOURCE, 1, [Define if _ISOC99_SOURCE is needed])
-     AC_MSG_RESULT(yes)	       
-else
-    AC_MSG_RESULT(no)
-fi
+dnl AC_MSG_CHECKING(_ISOC99_SOURCE)
+dnl AC_CACHE_VAL(ac_cv_isoc99_source,
+dnl       [AC_TRY_COMPILE([
+dnl       #define _ISOC99_SOURCE
+dnl       #include <unistd.h>
+dnl ],
+dnl [],
+dnl                    [ac_cv_isoc99_source=true],
+dnl                    [ac_cv_isoc99_source=false])])
+dnl if test "$ac_cv_isoc99_source" = true; then
+dnl    AC_DEFINE(_ISOC99_SOURCE, 1, [Define if _ISOC99_SOURCE is needed])
+dnl      AC_MSG_RESULT(yes)	       
+dnl else
+dnl     AC_MSG_RESULT(no)
+dnl fi
 
 dnl AC_MSG_CHECKING(_ISOC11_SOURCE)
 dnl AC_CACHE_VAL(ac_cv_isoc11_source,
@@ -1312,7 +1312,7 @@ AC_CHECK_HEADERS(float.h fpu_control.h ieeefp.h inttypes.h io.h limits.h)
 AC_CHECK_HEADERS(malloc.h math.h memory.h)
 AC_CHECK_HEADERS(netdb.h netinet/in.h netinet/tcp.h pwd.h regex.h shlobj.h)
 AC_CHECK_HEADERS(siginfo.h signal.h stdarg.h  stdbool.h)
-AC_CHECK_HEADERS(stdint.h string.h stropts.h)
+AC_CHECK_HEADERS(stdint.h string.h strings.h stropts.h)
 AC_CHECK_HEADERS(sys/conf.h sys/dir.h sys/file.h)
 AC_CHECK_HEADERS(sys/mman.h sys/ndir.h sys/param.h)
 AC_CHECK_HEADERS(sys/resource.h sys/select.h)