--- util-linux-2.12/disk-utils/elvtune.c.orig	Sun Feb  8 18:37:01 2004
+++ util-linux-2.12/disk-utils/elvtune.c	Sun Feb  8 18:39:03 2004
@@ -27,6 +27,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include "nls.h"
+#include <linux/version.h>
 
 /* this has to match with the kernel structure */
 /* current version for ac19 and 2.2.16 */
@@ -37,8 +38,13 @@
 	int max_bomb_segments;
 } blkelv_ioctl_arg_t;
 
+#ifdef LIBC_HEADERS_VERSION 
+/* Fixed headers detected */
+#include <linux/fs.h>
+#else
 #define BLKELVGET   _IOR(0x12,106,sizeof(blkelv_ioctl_arg_t))
 #define BLKELVSET   _IOW(0x12,107,sizeof(blkelv_ioctl_arg_t))
+#endif
 
 static void
 usage(void) {
--- util-linux-2.12/disk-utils/blockdev.c.orig	Sun Feb  8 18:39:35 2004
+++ util-linux-2.12/disk-utils/blockdev.c	Sun Feb  8 18:47:44 2004
@@ -9,12 +9,14 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
+#include <linux/version.h>
 
 #include "nls.h"
 
-/* Since it is impossible to include <linux/fs.h>, let us
-   give the ioctls explicitly. */
-
+#ifdef LIBC_HEADERS_VERSION
+/* Fixed headers detected */
+#include <linux/fs.h>
+#else
 #ifndef BLKROSET
 #define BLKROSET   _IO(0x12,93)
 #define BLKROGET   _IO(0x12,94)
@@ -27,6 +29,7 @@
 #define BLKBSZGET  _IOR(0x12,112,sizeof(int))
 #define BLKBSZSET  _IOW(0x12,113,sizeof(int))
 #endif
+#endif
 
 /* Maybe <linux/hdreg.h> could be included */
 #ifndef HDIO_GETGEO
--- util-linux-2.12/fdisk/common.h.orig	Sun Feb  8 18:48:00 2004
+++ util-linux-2.12/fdisk/common.h	Sun Feb  8 18:51:04 2004
@@ -1,12 +1,18 @@
 /* common stuff for fdisk, cfdisk, sfdisk */
 
-/* including <linux/fs.h> fails */
 #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,8)	/* 8 = sizeof(u64) */
+#endif
 
 /* including <linux/hdreg.h> also fails */
 struct hd_geometry {