More cleanup on umount
-Erik
diff --git a/util-linux/umount.c b/util-linux/umount.c
index d790d68..4f6edc2 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -26,20 +26,32 @@
#include <stdio.h>
#include <mntent.h>
#include <errno.h>
-#include <sys/mount.h>
#include <linux/unistd.h>
-/* Include our own version of umount2 if we need it... */
+#ifndef MNT_FORCE
+#define MNT_FORCE 1
+#endif
+#ifndef MS_MGC_VAL
+#define MS_MGC_VAL 0xc0ed0000 /* Magic number indicatng "new" flags */
+#endif
+#ifndef MS_REMOUNT
+#define MS_REMOUNT 32 /* Alter flags of a mounted FS. */
+#endif
+#ifndef MS_RDONLY
+#define MS_RDONLY 1 /* Mount read-only. */
+#endif
#ifndef __NR_umount2
#define __NR_umount2 52
-#define MNT_FORCE 1
-#define MS_MGC_VAL 0xc0ed0000 /* Magic number indicatng "new" flags */
-#define MS_REMOUNT 32 /* Alter flags of a mounted FS. */
-#define MS_RDONLY 1 /* Mount read-only. */
-
#endif
+
+/* Include our own version of <sys/mount.h>, since libc5 doesn't
+ * know about umount2 */
+static _syscall1(int, umount, const char *, special_file);
static _syscall2(int, umount2, const char *, special_file, int, flags);
+static _syscall5(int, mount, const char *, special_file, const char *, dir,
+ const char *, fstype, unsigned long int, rwflag, const void *, data);
+
static const char umount_usage[] =