diff --git a/include/aio.h b/include/aio.h
index c2a4145a86..c441606794 100644
--- a/include/aio.h
+++ b/include/aio.h
@@ -1 +1,6 @@
+#ifndef _AIO_H
 #include <rt/aio.h>
+
+/* Now define the internal interfaces.  */ 
+extern void __aio_init __P ((__const struct aioinit *__init));
+#endif
diff --git a/rt/aio.h b/rt/aio.h
index 04328317ae..51effccc7e 100644
--- a/rt/aio.h
+++ b/rt/aio.h
@@ -132,7 +132,6 @@ enum
 
 /* Allow user to specify optimization.  */
 #ifdef __USE_GNU
-extern void __aio_init __P ((__const struct aioinit *__init));
 extern void aio_init __P ((__const struct aioinit *__init));
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/alpha/pathconf.c b/sysdeps/unix/sysv/linux/alpha/pathconf.c
index 15910be9a1..24d6880523 100644
--- a/sysdeps/unix/sysv/linux/alpha/pathconf.c
+++ b/sysdeps/unix/sysv/linux/alpha/pathconf.c
@@ -51,7 +51,7 @@ __pathconf (const char *path, int name)
       struct statfs fsbuf;
 
       /* Determine the filesystem type.  */
-      if (__statfs (fd, &fsbuf) < 0)
+      if (__statfs (path, &fsbuf) < 0)
 	/* not possible, return the default value.  */
 	return LINK_MAX;
 
diff --git a/sysdeps/unix/sysv/linux/mips/bits/fcntl.h b/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
index a01dcaec32..027347053b 100644
--- a/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
@@ -49,9 +49,6 @@
 
 #define O_NDELAY	O_NONBLOCK
 
-/* XXX missing */
-#define O_LARGEFILE	0
-
 /* Values for the second argument to `fcntl'.  */
 #define F_DUPFD		0	/* Duplicate file descriptor.  */
 #define F_GETFD		1	/* Get file descriptor flags.  */