diff -Nurd xless-1.7.orig/Makefile xless-1.7/Makefile
--- xless-1.7.orig/Makefile	1969-12-31 19:00:00.000000000 -0500
+++ xless-1.7/Makefile	2008-04-06 15:55:08.000000000 -0400
@@ -0,0 +1,15 @@
+SRCS = help.c init.c popup.c util.c callbacks.c window.c main.c \
+       actions.c functions.c
+OBJS = help.o init.o popup.o util.o callbacks.o window.o main.o \
+       actions.o functions.o
+
+LIBS = regexp/libregexp.a -lXaw -lXmu -lXt -lX11
+
+.c.o:
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFINES) -c -o $@ $<
+
+regexp/libregexp.a:
+	$(MAKE) $(MAKEFLAGS) -C regexp
+
+xless: regexp/libregexp.a $(OBJS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $(OBJS)
diff -Nurd xless-1.7.orig/callbacks.c xless-1.7/callbacks.c
--- xless-1.7.orig/callbacks.c	1994-07-28 22:29:23.000000000 -0400
+++ xless-1.7/callbacks.c	2008-04-06 15:18:31.000000000 -0400
@@ -21,6 +21,7 @@
  * $Header: /usr/sww/share/src/X11R6/local/applications/xless-1.7/RCS/callbacks.c,v 1.37 1994/07/29 02:28:14 dglo Exp $
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <fcntl.h>
diff -Nurd xless-1.7.orig/functions.c xless-1.7/functions.c
--- xless-1.7.orig/functions.c	1994-06-02 16:45:40.000000000 -0400
+++ xless-1.7/functions.c	2008-04-06 16:03:30.000000000 -0400
@@ -21,6 +21,7 @@
  * $Header: /usr/sww/share/src/X11R6/local/applications/xless-1.5/RCS/functions.c,v 1.11 1994/06/02 20:45:12 dglo Exp $
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 
 #include <X11/X.h>
diff -Nurd xless-1.7.orig/init.c xless-1.7/init.c
--- xless-1.7.orig/init.c	1994-07-28 23:08:43.000000000 -0400
+++ xless-1.7/init.c	2008-04-06 15:06:25.000000000 -0400
@@ -21,6 +21,7 @@
  * $Header: /usr/sww/share/src/X11R6/local/applications/xless-1.7/RCS/init.c,v 1.45 1994/07/29 03:07:33 dglo Exp $
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/types.h>
diff -Nurd xless-1.7.orig/main.c xless-1.7/main.c
--- xless-1.7.orig/main.c	1994-07-28 22:57:15.000000000 -0400
+++ xless-1.7/main.c	2008-04-06 16:03:07.000000000 -0400
@@ -21,6 +21,7 @@
  * $Header: /usr/sww/share/src/X11R6/local/applications/xless-1.7/RCS/main.c,v 1.36 1994/07/29 02:55:50 dglo Exp $
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 
 #include <X11/X.h>
diff -Nurd xless-1.7.orig/regexp/Makefile xless-1.7/regexp/Makefile
--- xless-1.7.orig/regexp/Makefile	1969-12-31 19:00:00.000000000 -0500
+++ xless-1.7/regexp/Makefile	2008-04-06 15:57:52.000000000 -0400
@@ -0,0 +1,9 @@
+SRCS = regerror.c regexp.c regsub.c
+OBJS = regerror.o regexp.o regsub.o
+
+.c.o:
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFINES) -c -o $@ $<
+
+libregexp.a: $(OBJS)
+	ar rv $@ $(OBJS)
+	ranlib $@
diff -Nurd xless-1.7.orig/regexp/regerror.c xless-1.7/regexp/regerror.c
--- xless-1.7.orig/regexp/regerror.c	1991-02-24 17:15:07.000000000 -0500
+++ xless-1.7/regexp/regerror.c	2008-04-06 15:58:28.000000000 -0400
@@ -1,4 +1,4 @@
-#include <regexp.h>
+#include "regexp.h"
 #include <stdio.h>
 
 void
diff -Nurd xless-1.7.orig/regexp/regexp.c xless-1.7/regexp/regexp.c
--- xless-1.7.orig/regexp/regexp.c	1991-05-07 21:14:54.000000000 -0400
+++ xless-1.7/regexp/regexp.c	2008-04-06 15:58:20.000000000 -0400
@@ -32,7 +32,7 @@
  * precedence is structured in regular expressions.  Serious changes in
  * regular-expression syntax might require a total rethink.
  */
-#include <regexp.h>
+#include "regexp.h"
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
diff -Nurd xless-1.7.orig/regexp/regsub.c xless-1.7/regexp/regsub.c
--- xless-1.7.orig/regexp/regsub.c	1994-06-16 18:29:08.000000000 -0400
+++ xless-1.7/regexp/regsub.c	2008-04-06 15:58:15.000000000 -0400
@@ -18,7 +18,7 @@
  *	3. Altered versions must be plainly marked as such, and must not
  *		be misrepresented as being the original software.
  */
-#include <regexp.h>
+#include "regexp.h"
 #include <stdio.h>
 #include <string.h>
 #include "regmagic.h"
diff -Nurd xless-1.7.orig/util.c xless-1.7/util.c
--- xless-1.7.orig/util.c	1994-06-16 18:33:55.000000000 -0400
+++ xless-1.7/util.c	2008-04-06 15:07:07.000000000 -0400
@@ -22,6 +22,7 @@
  */
 
 
+#include <stdlib.h>
 #include <stdio.h>
 
 #include <X11/X.h>
diff -Nurd xless-1.7.orig/window.c xless-1.7/window.c
--- xless-1.7.orig/window.c	1994-07-28 22:36:07.000000000 -0400
+++ xless-1.7/window.c	2008-04-06 16:06:40.000000000 -0400
@@ -21,6 +21,7 @@
  * $Header: /usr/sww/share/src/X11R6/local/applications/xless-1.7/RCS/window.c,v 1.24 1994/07/29 02:34:16 dglo Exp $
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
 
diff -Nurd xless-1.7.orig/xless.h xless-1.7/xless.h
--- xless-1.7.orig/xless.h	1994-07-28 22:56:41.000000000 -0400
+++ xless-1.7/xless.h	2008-04-06 15:09:56.000000000 -0400
@@ -39,12 +39,7 @@
 #define XLESS_MAX_INPUT		256
 
 /* handle differences between K&R and ANSI C */
-#if __STDC__
-#define __P(a)	a
-#else
-#define __P(a)	()
-#define const
-#endif
+#include <sys/cdefs.h>
 
 /*
  * The default editor; make sure the file exists.