Index: lib/rtapelib.c
--- lib/rtapelib.c.orig	2009-03-19 12:47:19 +0100
+++ lib/rtapelib.c	2009-06-20 17:36:22 +0200
@@ -628,7 +628,7 @@
 {
   char command_buffer[COMMAND_BUFFER_SIZE];
   char operand_buffer[UINTMAX_STRSIZE_BOUND];
-  uintmax_t u = offset < 0 ? - (uintmax_t) offset : (uintmax_t) offset;
+  unsigned long u = offset < 0 ? - (unsigned long) offset : (unsigned long) offset;
   char *p = operand_buffer + sizeof operand_buffer;
 
   *--p = 0;
@@ -670,9 +670,9 @@
       {
 	char command_buffer[COMMAND_BUFFER_SIZE];
 	char operand_buffer[UINTMAX_STRSIZE_BOUND];
-	uintmax_t u = (((struct mtop *) argument)->mt_count < 0
-		       ? - (uintmax_t) ((struct mtop *) argument)->mt_count
-		       : (uintmax_t) ((struct mtop *) argument)->mt_count);
+	unsigned long u = (((struct mtop *) argument)->mt_count < 0
+		       ? - (unsigned long) ((struct mtop *) argument)->mt_count
+		       : (unsigned long) ((struct mtop *) argument)->mt_count);
 	char *p = operand_buffer + sizeof operand_buffer;
 
         *--p = 0;
Index: lib/system.h
--- lib/system.h.orig	2009-06-20 10:29:22 +0200
+++ lib/system.h	2009-06-20 17:36:22 +0200
@@ -425,7 +425,7 @@
 
 #include <intprops.h>
 
-#define UINTMAX_STRSIZE_BOUND INT_BUFSIZE_BOUND (uintmax_t)
+#define UINTMAX_STRSIZE_BOUND INT_BUFSIZE_BOUND (unsigned long)
 
 /* Prototypes for external functions.  */
 
Index: src/userspec.c
--- src/userspec.c.orig	2009-02-14 19:15:50 +0100
+++ src/userspec.c	2009-06-20 17:41:54 +0200
@@ -20,7 +20,6 @@
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
 #include <system.h>
-#include <alloca.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <sys/types.h>