--- Makefile.SH	2007-12-21 23:32:35.000000000 +0100
+++ Makefile.SH	2007-12-21 23:32:48.000000000 +0100
@@ -158,7 +158,7 @@
 	lint $(lintflags) $(defs) $(c) > perl.fuzz
 
 depend: makedepend
-	./makedepend
+	LANG=C LC_ALL=C ./makedepend
 
 test: perl
 	chmod 755 t/TEST t/base.* t/comp.* t/cmd.* t/io.* t/op.*
--- arg.c	2002-12-19 00:44:13.000000000 +0100
+++ arg.c	2007-12-21 22:53:47.000000000 +0100
@@ -24,6 +24,7 @@
  * 
  */
 
+#include <unistd.h>
 #include <signal.h>
 #include "handy.h"
 #include "EXTERN.h"
--- handy.h	2002-12-19 00:44:13.000000000 +0100
+++ handy.h	2007-12-21 22:53:31.000000000 +0100
@@ -6,6 +6,9 @@
  * 
  */
 
+#include <stdlib.h>
+#include <string.h>
+
 #define Null(type) ((type)0)
 #define Nullch Null(char*)
 #define Nullfp Null(FILE*)
--- makedepend.SH	2003-12-18 15:03:39.000000000 +0100
+++ makedepend.SH	2007-12-21 22:50:01.000000000 +0100
@@ -92,6 +92,7 @@
 	-e '/^#.*<builtin>/d' \
 	-e '/^#.*<built-in>/d' \
 	-e '/^#.*<command line>/d' \
+	-e '/^#.*<command-line>/d' \
 	-e '/^# *[0-9]/!d' \
 	-e 's/^.*"\(.*\)".*$/'$filebase'.o: \1/' \
 	-e 's|: \./|: |' \
--- perl.h	2002-12-19 00:44:13.000000000 +0100
+++ perl.h	2007-12-21 23:07:37.000000000 +0100
@@ -18,8 +18,6 @@
  * 
  */
 
-#define DEBUGGING
-
 #define VOIDUSED 1
 #include "config.h"
 
@@ -52,6 +50,18 @@
 typedef struct atbl ARRAY;
 typedef struct htbl HASH;
 
+ARG *listish(ARG *);
+ARG *l(ARG *);
+ARG *mod_match(int type,ARG *left,ARG *pat);
+ARG *addflags(int i, int flags, ARG *arg);
+ARG *hide_ary(ARG *arg);
+ARG *make_list(ARG *arg);
+ARG *cval_to_arg(char *cval);
+ARG *cmd_to_arg(CMD *cmd);
+CMD *add_label(char *lbl, register CMD *cmd);
+
+int yydebug;
+
 #include "str.h"
 #include "form.h"
 #include "stab.h"
@@ -61,12 +71,6 @@
 #include "array.h"
 #include "hash.h"
 
-#ifdef CHARSPRINTF
-    char *sprintf();
-#else
-    int sprintf();
-#endif
-
 /* A string is TRUE if not "" or "0". */
 #define True(val) (tmps = (val), (*tmps && !(*tmps == '0' && !tmps[1])))
 EXT char *Yes INIT("1");
--- perl.y	2002-12-19 00:44:13.000000000 +0100
+++ perl.y	2007-12-21 23:07:20.000000000 +0100
@@ -136,8 +136,8 @@
 	|	loop	/* loops add their own labels */
 	|	label ';'
 			{ if ($1 != Nullch) {
-			      $$ = add_label(make_acmd(C_EXPR, Nullstab,
-				  Nullarg, Nullarg) );
+			      $$ = add_label($1, make_acmd(C_EXPR, Nullstab,
+				  Nullarg, Nullarg));
 			    } else
 			      $$ = Nullcmd; }
 	|	label sideff ';'
--- perly.c	2002-12-19 00:44:13.000000000 +0100
+++ perly.c	2007-12-21 23:02:49.000000000 +0100
@@ -23,7 +23,6 @@
 char *filename;
 char *e_tmpname = "/tmp/perl-eXXXXXX";
 FILE *e_fp = Nullfp;
-ARG *l();
 
 main(argc,argv,env)
 register int argc;
@@ -1369,6 +1368,7 @@
 
 ARG *
 mod_match(type,left,pat)
+int type;
 register ARG *left;
 register ARG *pat;
 {
--- stab.c	2003-12-18 15:03:39.000000000 +0100
+++ stab.c	2007-12-21 22:57:05.000000000 +0100
@@ -168,7 +168,7 @@
 {
     char *s;
     int i;
-    int sighandler();
+    void sighandler();
 
     if (stab->stab_flags & SF_VMAGIC) {
 	switch (stab->stab_name[0]) {
@@ -279,7 +279,7 @@
     return 0;
 }
 
-sighandler(sig)
+void sighandler(sig)
 int sig;
 {
     STAB *stab;
--- t/op.stat	2002-12-19 00:44:13.000000000 +0100
+++ t/op.stat	2007-12-21 23:24:32.000000000 +0100
@@ -14,8 +14,8 @@
 print foo "Now is the time for all good men to come to.\n";
 close(foo);
 
-$base = time;
-while (time == $base) {}
+$base = 1 + time;
+while (time <= $base) {}
 
 `rm -f Op.stat.tmp2; ln Op.stat.tmp Op.stat.tmp2; chmod 644 Op.stat.tmp`;
 
--- util.c	2002-12-19 00:44:13.000000000 +0100
+++ util.c	2007-12-21 22:57:27.000000000 +0100
@@ -32,7 +32,6 @@
 MEM_SIZE size;
 {
     char *ptr;
-    char *malloc();
 
     ptr = malloc(size?size:1);	/* malloc(0) is NASTY on our system */
 #ifdef DEBUGGING
@@ -56,7 +55,6 @@
 MEM_SIZE size;
 {
     char *ptr;
-    char *realloc();
 
     ptr = realloc(where,size?size:1);	/* realloc(0) is NASTY on our system */
 #ifdef DEBUGGING
--- version.c	2002-12-19 00:44:13.000000000 +0100
+++ version.c	2007-12-21 22:57:41.000000000 +0100
@@ -6,6 +6,7 @@
  * 
  */
 
+#include <stdio.h>
 #include "patchlevel.h"
 
 /* Print out the version number. */