diff -Naur unrtf-0.19.7/Makefile unrtf-0.19.7-new/Makefile
--- unrtf-0.19.7/Makefile	2005-06-05 20:46:38.000000000 +0200
+++ unrtf-0.19.7-new/Makefile	2005-12-04 18:48:37.000000000 +0100
@@ -31,7 +31,7 @@
 EXEEXT=
 
 CFLAGS=-g -Wall
-CC=gcc
+CC=cc
 
 OBJS=convert.o word.o error.o main.o hash.o \
 	parse.o malloc.o attr.o util.o \
@@ -40,7 +40,7 @@
 TARGET=unrtf${EXEEXT}
 
 ${TARGET}:	${OBJS}
-	gcc ${OBJS} -o ${TARGET}
+	cc ${OBJS} -o ${TARGET}
 
 clean:
 	rm -f ${OBJS} ${TARGET} 
@@ -61,7 +61,7 @@
 install:	${TARGET}
 	-mkdir -p ${prefix}/bin
 	-mkdir -p ${mandir}
-	cp ${TARGET} /usr/local/bin
+	cp ${TARGET} ${prefix}/bin
 	cp unrtf.1 ${mandir}
 
 attr.o: attr.c defs.h error.h attr.h main.h malloc.h
diff -Naur unrtf-0.19.7/error.c unrtf-0.19.7-new/error.c
--- unrtf-0.19.7/error.c	2005-06-05 20:46:34.000000000 +0200
+++ unrtf-0.19.7-new/error.c	2005-12-04 18:52:26.000000000 +0100
@@ -39,9 +39,7 @@
 
 
 #include <stdio.h>
-#if linux || __DJGPP__ /* daved - 0.19.1, st001906 - 0.19.6 */
 #include <stdlib.h>
-#endif
 #include "defs.h"
 #include "main.h"
 
diff -Naur unrtf-0.19.7/main.c unrtf-0.19.7-new/main.c
--- unrtf-0.19.7/main.c	2005-06-05 20:46:37.000000000 +0200
+++ unrtf-0.19.7-new/main.c	2005-12-04 18:52:53.000000000 +0100
@@ -45,9 +45,7 @@
 
 
 #include <stdio.h>
-#if linux || __DJGPP__ /* daved - 0.19.0, st001906 - 0.19.6 */
 #include <stdlib.h>
-#endif
 #include <string.h>
 
 #include "defs.h"
diff -Naur unrtf-0.19.7/malloc.c unrtf-0.19.7-new/malloc.c
--- unrtf-0.19.7/malloc.c	2005-06-05 20:46:39.000000000 +0200
+++ unrtf-0.19.7-new/malloc.c	2005-12-04 18:54:35.000000000 +0100
@@ -38,20 +38,8 @@
 
 
 #include <stdio.h>
-#if linux /* daved - 0.19.0 */
-#include <stdlib.h>
-#endif
 #include <string.h>
-#if linux /* daved - 0.19.0 */
-#include <stdlib.h>
-#endif
-
-#if AMIGA
 #include <stdlib.h>
-#else
-#include <malloc.h>
-#endif
-
 #include "error.h"
 
 
diff -Naur unrtf-0.19.7/output.c unrtf-0.19.7-new/output.c
--- unrtf-0.19.7/output.c	2005-06-05 20:57:25.000000000 +0200
+++ unrtf-0.19.7-new/output.c	2005-12-04 18:55:11.000000000 +0100
@@ -36,9 +36,7 @@
 
 
 #include <stdio.h>
-#if linux || __DJGPP__ /* daved - 0.19.0,  st001906 - 0.19.6 */
 #include <stdlib.h>
-#endif
 #include <string.h>
 #include "malloc.h"
 #include "defs.h"