diff -urN util-linux-2.12q.org/disk-utils/blockdev.c util-linux-2.12q/disk-utils/blockdev.c
--- util-linux-2.12q.org/disk-utils/blockdev.c	2004-08-18 19:52:20.000000000 +0200
+++ util-linux-2.12q/disk-utils/blockdev.c	2005-02-27 19:35:19.000000000 +0100
@@ -9,9 +9,14 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
+#include <linux/version.h>
 
 #include "nls.h"
 
+#ifdef LIBC_HEADERS_VERSION
+/* Fixed headers detected */
+#include <linux/fs.h>
+#else
 /* Since it is impossible to include <linux/fs.h>, let us
    give the ioctls explicitly. */
 
@@ -28,6 +33,7 @@
 #define BLKBSZSET  _IOW(0x12,113,size_t)
 #define BLKGETSIZE64 _IOR(0x12,114,size_t)
 #endif
+#endif
 
 /* Maybe <linux/hdreg.h> could be included */
 #ifndef HDIO_GETGEO
diff -urN util-linux-2.12q.org/disk-utils/elvtune.c util-linux-2.12q/disk-utils/elvtune.c
--- util-linux-2.12q.org/disk-utils/elvtune.c	2004-09-19 15:57:09.000000000 +0200
+++ util-linux-2.12q/disk-utils/elvtune.c	2005-02-27 19:34:27.000000000 +0100
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/utsname.h>
+#include <linux/version.h>
 #include "nls.h"
 
 /* this has to match with the kernel structure */
@@ -40,9 +41,14 @@
 	int max_bomb_segments;
 } blkelv_ioctl_arg_t;
 
+#ifdef LIBC_HEADERS_VERSION
+/* Fixed headers detected */
+#include <linux/fs.h>
+#else
 /* ioctls introduced in 2.2.16, removed in 2.5.58 */
 #define BLKELVGET   _IOR(0x12,106,size_t)
 #define BLKELVSET   _IOW(0x12,107,size_t)
+#endif
 
 static void
 usage(void) {
diff -urN util-linux-2.12q.org/fdisk/common.h util-linux-2.12q/fdisk/common.h
--- util-linux-2.12q.org/fdisk/common.h	2004-09-06 20:07:11.000000000 +0200
+++ util-linux-2.12q/fdisk/common.h	2005-02-27 19:35:53.000000000 +0100
@@ -3,11 +3,18 @@
 /* including <linux/fs.h> fails */
 #include <sys/types.h>
 #include <sys/ioctl.h>
+#include <linux/version.h>
+
+#ifdef LIBC_HEADERS_VERSION
+/* Fixed headers detected */
+#include <linux/fs.h>
+#else
 #define BLKRRPART    _IO(0x12,95)    /* re-read partition table */
 #define BLKGETSIZE   _IO(0x12,96)    /* return device size */
 #define BLKFLSBUF    _IO(0x12,97)    /* flush buffer cache */
 #define BLKSSZGET    _IO(0x12,104)   /* get block device sector size */
 #define BLKGETSIZE64 _IOR(0x12,114,size_t)	/* size in bytes */
+#endif
 
 /* including <linux/hdreg.h> also fails */
 struct hd_geometry {