diff --git a/configure b/configure
index 97f16d82878..6f49fc4ca8c 100755
--- a/configure
+++ b/configure
@@ -7603,12 +7603,6 @@ if test "x$ac_cv_header_elf_h" = xyes
 then :
   printf "%s\n" "#define HAVE_ELF_H 1" >>confdefs.h
 
-fi
-ac_fn_c_check_header_compile "$LINENO" "float.h" "ac_cv_header_float_h" "$ac_includes_default"
-if test "x$ac_cv_header_float_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_FLOAT_H 1" >>confdefs.h
-
 fi
 ac_fn_c_check_header_compile "$LINENO" "gettext-po.h" "ac_cv_header_gettext_po_h" "$ac_includes_default"
 if test "x$ac_cv_header_gettext_po_h" = xyes
@@ -7801,12 +7795,6 @@ if test "x$ac_cv_header_scsi_sg_h" = xyes
 then :
   printf "%s\n" "#define HAVE_SCSI_SG_H 1" >>confdefs.h
 
-fi
-ac_fn_c_check_header_compile "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdint_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_STDINT_H 1" >>confdefs.h
-
 fi
 ac_fn_c_check_header_compile "$LINENO" "sys/attr.h" "ac_cv_header_sys_attr_h" "$ac_includes_default"
 if test "x$ac_cv_header_sys_attr_h" = xyes
diff --git a/configure.ac b/configure.ac
index 6167a2b1594..997e6a52c40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -370,7 +370,6 @@ AC_CHECK_HEADERS(\
 	asm/types.h \
 	asm/user.h \
 	elf.h \
-	float.h \
 	gettext-po.h \
 	link.h \
 	linux/cdrom.h \
@@ -403,7 +402,6 @@ AC_CHECK_HEADERS(\
 	scsi/scsi.h \
 	scsi/scsi_ioctl.h \
 	scsi/sg.h \
-	stdint.h \
 	sys/attr.h \
 	sys/auxv.h \
 	sys/cdio.h \
diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index ca95dd347eb..adf92f25ec8 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -61,9 +61,6 @@
 # include <sys/sysmacros.h>
 #endif
 #ifdef HAVE_SYS_VNODE_H
-# ifdef HAVE_STDINT_H
-# include <stdint.h>  /* needed for kfreebsd */
-# endif
 /* Work around a conflict with Solaris' system list defined in sys/list.h. */
 #define list SYSLIST
 #define list_next SYSLIST_NEXT
diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c
index 4a0564392bd..d2d32e53de9 100644
--- a/dlls/winex11.drv/graphics.c
+++ b/dlls/winex11.drv/graphics.c
@@ -32,9 +32,7 @@
 
 #include <stdarg.h>
 #include <math.h>
-#ifdef HAVE_FLOAT_H
-# include <float.h>
-#endif
+#include <float.h>
 #include <stdlib.h>
 #ifndef PI
 #define PI M_PI
diff --git a/include/config.h.in b/include/config.h.in
index 00cde5cfc05..5f3398e3896 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -54,9 +54,6 @@
 /* Define to 1 if you have the FFmpeg libraries. */
 #undef HAVE_FFMPEG
 
-/* Define to 1 if you have the <float.h> header file. */
-#undef HAVE_FLOAT_H
-
 /* Define if FreeType 2 is installed */
 #undef HAVE_FREETYPE
 
diff --git a/server/fd.c b/server/fd.c
index bed6575ab4c..04688c5eb0d 100644
--- a/server/fd.c
+++ b/server/fd.c
@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <poll.h>
 #ifdef HAVE_LINUX_MAJOR_H
 #include <linux/major.h>
@@ -73,9 +74,6 @@
 #undef LIST_INIT
 #undef LIST_ENTRY
 #endif
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
 #include <sys/stat.h>
 #include <sys/time.h>
 #ifdef MAJOR_IN_MKDEV