--- trexp.c
+++ trexp.c
@@ -18,10 +18,12 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "trexp.h"
 
 #ifdef DEBUG
+int
 main()
 {
 	int st;
@@ -84,7 +86,6 @@
 	register int i, low, high;
 	char *ptr, *save;
 	trexp *t;
-	char *malloc();
 
 	if ((t = (trexp *) malloc(sizeof(trexp))) == NULL)
 		return(NULL);
--- xprompt.c
+++ xprompt.c
@@ -41,6 +41,7 @@
 #include <sys/stat.h>
 #include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
@@ -167,8 +168,6 @@
 static void Syntax();
 static int get_user_text_translations();
 
-char *malloc();
-
 /*ARGSUSED*/
 static void
 EraseLine(ctx, event, args, nargs)
@@ -386,14 +385,16 @@
 
 void unparsegeometry();
 
+int
 main(argc, argv)
-unsigned int argc;
+int argc;
 char **argv;
 {
     register int i, j;
 	int len, maxpromptlen;
     Arg arg[11];
-    int geom_mask, geom_x, geom_y, geom_width, geom_height;
+    int geom_mask, geom_x, geom_y;
+    unsigned int geom_width, geom_height;
     char geom_str[100];
 	XtTranslations t;
     XFontStruct *prompt_font, *reply_font;
@@ -655,6 +656,7 @@
 	}
 
     XtMainLoop();
+    return 0;
 }
 
 static int