6 files changed, 16 insertions, 32 deletions
diff --git a/newlib/libc/stdio64/fdopen64.c b/newlib/libc/stdio64/fdopen64.c
index aa5a9ce56..4f159e813 100644
--- a/newlib/libc/stdio64/fdopen64.c
+++ b/newlib/libc/stdio64/fdopen64.c
@@ -28,7 +28,7 @@ File pointer or <<NULL>>, as for <<fopen>>.
 
 #include <stdio.h>
 #include <errno.h>
-#include "local64.h"
+#include "local.h"
 #include <_syslist.h>
 #include <sys/lock.h>
 
diff --git a/newlib/libc/stdio64/fopen64.c b/newlib/libc/stdio64/fopen64.c
index 61c4e4f45..aa6775116 100644
--- a/newlib/libc/stdio64/fopen64.c
+++ b/newlib/libc/stdio64/fopen64.c
@@ -27,7 +27,7 @@ INDEX
 ANSI_SYNOPSIS
 	#include <stdio.h>
 	FILE *fopen64(const char *<[file]>, const char *<[mode]>);
-	FILE *_fopen64_r(void *<[reent]>, 
+	FILE *_fopen64_r(void *<[reent]>,
                        const char *<[file]>, const char *<[mode]>);
 
 TRAD_SYNOPSIS
@@ -66,7 +66,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 #include <stdio.h>
 #include <errno.h>
-#include "local64.h"
+#include "local.h"
 #ifdef __CYGWIN__
 #include <fcntl.h>
 #endif
@@ -91,12 +91,12 @@ _DEFUN (_fopen64_r, (ptr, file, mode),
 
   if ((f = _open64_r (ptr, file, oflags, 0666)) < 0)
     {
-      __sfp_lock_acquire (); 
+      __sfp_lock_acquire ();
       fp->_flags = 0;		/* release */
 #ifndef __SINGLE_THREAD__
       __lock_close_recursive (fp->_lock);
 #endif
-      __sfp_lock_release (); 
+      __sfp_lock_release ();
       return NULL;
     }
 
diff --git a/newlib/libc/stdio64/freopen64.c b/newlib/libc/stdio64/freopen64.c
index 4cc717261..10a45e4ed 100644
--- a/newlib/libc/stdio64/freopen64.c
+++ b/newlib/libc/stdio64/freopen64.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1990, 2006 The Regents of the University of California.
+ * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -28,7 +28,7 @@ ANSI_SYNOPSIS
 	#include <stdio.h>
 	FILE *freopen64(const char *<[file]>, const char *<[mode]>,
 		        FILE *<[fp]>);
-	FILE *_freopen64_r(struct _reent *<[ptr]>, const char *<[file]>, 
+	FILE *_freopen64_r(struct _reent *<[ptr]>, const char *<[file]>,
 		        const char *<[mode]>, FILE *<[fp]>);
 
 TRAD_SYNOPSIS
@@ -78,7 +78,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sys/lock.h>
-#include "local64.h"
+#include "local.h"
 
 /*
  * Re-direct an existing, open (probably) file to some other file.
diff --git a/newlib/libc/stdio64/fseeko64.c b/newlib/libc/stdio64/fseeko64.c
index 15f285f40..33e22dcc5 100644
--- a/newlib/libc/stdio64/fseeko64.c
+++ b/newlib/libc/stdio64/fseeko64.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1990, 2007 The Regents of the University of California.
+ * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -27,7 +27,7 @@ INDEX
 ANSI_SYNOPSIS
 	#include <stdio.h>
 	int fseeko64(FILE *<[fp]>, _off64_t <[offset]>, int <[whence]>)
-	int _fseeko64_r (struct _reent *<[ptr]>, FILE *<[fp]>, 
+	int _fseeko64_r (struct _reent *<[ptr]>, FILE *<[fp]>,
                          _off64_t <[offset]>, int <[whence]>)
 TRAD_SYNOPSIS
 	#include <stdio.h>
@@ -49,8 +49,8 @@ of the file your program has already read.  Many of the <<stdio>> functions
 depend on this position, and many change it as a side effect.
 
 You can use <<fseeko64>> to set the position for the file identified by
-<[fp]> that was opened via <<fopen64>>.  The value of <[offset]> determines 
-the new position, in one of three ways selected by the value of <[whence]> 
+<[fp]> that was opened via <<fopen64>>.  The value of <[offset]> determines
+the new position, in one of three ways selected by the value of <[whence]>
 (defined as macros in `<<stdio.h>>'):
 
 <<SEEK_SET>>---<[offset]> is the absolute file position (an offset
@@ -69,7 +69,7 @@ RETURNS
 <<fseeko64>> returns <<0>> when successful.  On failure, the
 result is <<EOF>>.  The reason for failure is indicated in <<errno>>:
 either <<ESPIPE>> (the stream identified by <[fp]> doesn't support
-repositioning or wasn't opened via <<fopen64>>) or <<EINVAL>> 
+repositioning or wasn't opened via <<fopen64>>) or <<EINVAL>>
 (invalid file position).
 
 PORTABILITY
@@ -86,7 +86,7 @@ Supporting OS subroutines required: <<close>>, <<fstat64>>, <<isatty>>,
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "local64.h"
+#include "local.h"
 
 #define	POS_ERR	(-(_fpos64_t)1)
 
diff --git a/newlib/libc/stdio64/ftello64.c b/newlib/libc/stdio64/ftello64.c
index 2a8d30925..cad175b87 100644
--- a/newlib/libc/stdio64/ftello64.c
+++ b/newlib/libc/stdio64/ftello64.c
@@ -60,7 +60,7 @@ An error occurs if the <[fp]> was not opened via <<fopen64>>.
 RETURNS
 <<ftello64>> returns the file position, if possible.  If it cannot do
 this, it returns <<-1>>.  Failure occurs on streams that do not support
-positioning or not opened via <<fopen64>>; the global <<errno>> indicates 
+positioning or not opened via <<fopen64>>; the global <<errno>> indicates
 this condition with the value <<ESPIPE>>.
 
 PORTABILITY
@@ -80,7 +80,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #include <stdio.h>
 #include <errno.h>
 
-#include "local64.h"
+#include "local.h"
 
 #ifdef __LARGE64_FILES
 
diff --git a/newlib/libc/stdio64/local64.h b/newlib/libc/stdio64/local64.h
deleted file mode 100644
index b86c95d03..000000000
--- a/newlib/libc/stdio64/local64.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Information local to this implementation of stdio64,
- * in particular, macros and private variables.
- */
-
-#include "local.h"
-
-#ifdef __LARGE64_FILES
-extern _fpos64_t _EXFUN(__sseek64,(void *, _fpos64_t, int));
-extern _fpos64_t _EXFUN(__sseek64_r,(struct _reent *, void *, _fpos64_t, int));
-extern _fpos64_t _EXFUN(__sseek64_error,(void *, _fpos64_t, int));
-extern _READ_WRITE_RETURN_TYPE _EXFUN(__swrite64,(void *, char const *, int));
-extern _READ_WRITE_RETURN_TYPE _EXFUN(__swrite64_r,(struct _reent *, void *, 
-                                      char const *, int));
-#endif
-