--- src/ff.c.orig	Sun Dec 12 22:56:48 2004
+++ src/ff.c	Sun Dec 12 22:59:17 2004
@@ -911,7 +911,7 @@
 	
 	strcpy (numbuf, oldexpand (title, gpage, page, file));
 	if (Needfls)
-		fls (file, numbuf, answer);
+		usfls (file, numbuf, answer);
 	else
 		strcpy (answer, numbuf);
 	return (answer);
--- src/fls.c.orig	Sun Dec 12 22:59:31 2004
+++ src/fls.c	Sun Dec 12 23:00:12 2004
@@ -183,7 +183,7 @@
 statstdin (statptr)
 struct	stat	*statptr;
 	{
-	long 	clock, time ();
+	long 	clock ;
 	clock = time (0);
 	statptr->st_atime = clock;
 	statptr->st_mtime = clock;
@@ -200,7 +200,7 @@
 
 /*FUNCTION fls: formated listing of file */
 Status
-fls (file, format, bptr) /* put formatted file listing in buffer */
+usfls (file, format, bptr) /* put formatted file listing in buffer */
 char	*file;           /* name of the file to print */
 char	*format;         /* print format control string, like printf */
 char	*bptr;           /* pointer to buffer in which to print stats */
--- src/calc.c.orig	Sun Dec 12 23:08:23 2004
+++ src/calc.c	Sun Dec 12 23:11:21 2004
@@ -1,4 +1,3 @@
-extern char *malloc(), *realloc();
 
 # line 2 "calc.y"
 /*  Copyright 1981 Gary Perlman */
@@ -79,7 +78,7 @@
 double	eval (), Answer;
 double	*Constant;
 char	*getline ();
-FILE	*Outfile = stdout;
+FILE	*Outfile;
 
 # line 83 "calc.y"
 typedef union 
@@ -222,6 +221,7 @@
 	{
 	int 	i;
 	signal (SIGINT, SIG_IGN);
+	Outfile = stdout;
 	if (isatty (fileno (stdin)))
 		{
 		Interactive = 1;
*** /tmp/perm.c.orig	Sat Jul 14 18:22:36 2007
--- src/perm.c	Sat Jul 14 18:23:06 2007
***************
*** 19,29 ****
  Boole	InfoLimits;           /* print program limits */
  Boole	InfoOptions;          /* print usage information */
  
! int 	jpossible   Cdecl ((char **array, int n, int * choice, int i));
! int 	jgetunused  Cdecl ((char **array, int n, int i));
! int 	jchoose     Cdecl ((char **array, int n, int *choice, int i));
  Status	jstrpermut  Cdecl ((char **array, int n));
! void	jprint      Cdecl ((char *name, char **array, int n));
  void	strpermut   Cdecl ((char **array, int size));
  int 	initial     Cdecl ((int argc, char **argv));
  void	usinfo      Cdecl ((void));
--- 19,29 ----
  Boole	InfoLimits;           /* print program limits */
  Boole	InfoOptions;          /* print usage information */
  
! static int 	jpossible   Cdecl ((char **array, int n, int * choice, int i));
! static int 	jgetunused  Cdecl ((char **array, int n, int i));
! static int 	jchoose     Cdecl ((char **array, int n, int *choice, int i));
  Status	jstrpermut  Cdecl ((char **array, int n));
! static void	jprint      Cdecl ((char *name, char **array, int n));
  void	strpermut   Cdecl ((char **array, int size));
  int 	initial     Cdecl ((int argc, char **argv));
  void	usinfo      Cdecl ((void));