--- ./xtb.c.org	Wed Dec 13 15:05:55 1989
+++ ./xtb.c	Thu Nov 24 20:17:29 1994
@@ -31,7 +31,7 @@
 #define VARARGS(func, rtn, args)	/*VARARGS1*/ rtn func(va_alist) va_dcl
 #endif
 
-typedef struct h_info {
+struct h_info {
     FNPTR(func, xtb_hret, (XEvent *evt, xtb_data info)); /* Function to call */
     xtb_data info;		/* Additional info  */
 };
@@ -196,7 +196,7 @@
 {
     xtb_data data;
 
-    if (!XFindContext(t_disp, win, h_context, &data)) {
+    if (!XFindContext(t_disp, win, h_context, (XPointer*)&data)) {
 	return ((struct h_info *) data)->info;
     } else {
 	return (xtb_data) 0;
@@ -244,7 +244,7 @@
 #define BT_LPAD	3
 #define BT_BRDR	1
 
-typedef struct b_info {
+struct b_info {
     FNPTR( func, xtb_hret, (Window win, int state, xtb_data val) );
 				/* Function to call */    
     char *text;			/* Text of button   */
@@ -445,7 +445,7 @@
 #define BR_YPAD		2
 #define BR_INTER	2
 
-typedef struct br_info {
+struct br_info {
     Window main_win;		/* Main button row    */
     int which_one;		/* Which button is on */
     int btn_cnt;		/* How many buttons   */
@@ -584,7 +584,7 @@
 #define TO_HPAD	1
 #define TO_VPAD	1
 
-typedef struct to_info {
+struct to_info {
     char *text;			/* Text to display */
     XFontStruct *ft;		/* Font to use     */
 };
@@ -675,7 +675,7 @@
 #define TI_BRDR 2
 #define TI_CRSP	1
 
-typedef struct ti_info {
+struct ti_info {
     FNPTR( func, xtb_hret, (Window win, int ch, char *textcopy, xtb_data *val) );
     				/* Function to call   */
     int maxlen;			/* Maximum characters */
--- ./xgraph.c.org	Wed Dec 13 14:11:56 1989
+++ ./xgraph.c	Thu Nov 24 20:30:53 1994
@@ -46,8 +46,6 @@
 #define BTNPAD		1
 #define BTNINTER	3
 
-#define MAX(a,b)	((a) > (b) ? (a) : (b))
-#define MIN(a,b)	((a) < (b) ? (a) : (b))
 #define ABS(x)		((x) < 0 ? -(x) : (x))
 #define ZERO_THRES	1.0E-07
 
@@ -266,6 +264,7 @@
 	if (!strm) {
 	    (void) fprintf(stderr, "Warning:  cannot open file `%s'\n",
 			   inFileNames[idx]);
+	    errs++;
 	} else {
 	    if ((maxitems = ReadData(strm, inFileNames[idx])) < 0) {
 		errs++;
--- ./hpgl.c.org	Wed Dec 13 11:56:44 1989
+++ ./hpgl.c	Thu Nov 24 20:17:29 1994
@@ -11,10 +11,8 @@
 #include "xgout.h"
 #include "plotter.h"
 #include <stdio.h>
+#include <stdlib.h>
 #include <math.h>
-#define MAX(a,b) ( ((a)>(b)) ? (a) : (b) )
-#define MIN(a,b) ( ((a)<(b)) ? (a) : (b) )
-char *malloc();
 
 static void hpglText();
 static void hpglSeg();
--- ./xgraph.h.org	Wed Dec 13 14:55:58 1989
+++ ./xgraph.h	Thu Nov 24 20:17:29 1994
@@ -5,7 +5,12 @@
 #ifndef _XGRAPH_H_
 #define _XGRAPH_H_
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <X11/Xos.h>
+#undef index
+#undef rindex
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/cursorfont.h>
@@ -33,17 +38,9 @@
 extern void ho_dialog();	/* Hardcopy dialog         */
 extern void set_X();		/* Initializes X device    */
 
-/* To make lint happy */
-extern char *malloc();
-extern char *realloc();
-extern char *sprintf();
-extern char *strcpy();
-extern char *strcat();
-extern char *rindex();
-extern char *index();
-extern void exit();
-extern void free();
-extern double atof();
-extern void abort();
+#ifndef MAX
+#define MAX(a,b)        ((a) > (b) ? (a) : (b))
+#define MIN(a,b)        ((a) < (b) ? (a) : (b))
+#endif
 
 #endif /* _XGRAPH_H_ */
--- ./hard_devices.h.org	Fri Nov 17 11:37:12 1989
+++ ./hard_devices.h	Thu Nov 24 20:17:29 1994
@@ -9,7 +9,7 @@
 
 typedef enum hard_dev_docu_defn { NONE, NO, YES } hard_dev_docu;
 
-typedef struct hard_dev {
+struct hard_dev {
     char *dev_name;		/* Device name                */
     int (*dev_init)();		/* Initialization function    */
     char *dev_spec;		/* Default pipe program       */
--- ./ps.c.org	Wed Dec 13 11:56:57 1989
+++ ./ps.c	Thu Nov 24 20:17:30 1994
@@ -57,7 +57,6 @@
 #define PS(str)		OUT(psFile, str)
 #define PSU(str)	OUT(ui->psFile, str)
 #define IY(val)		(ui->height_devs - val)
-#define MAX(a, b)	((a) > (b) ? (a) : (b))
 
 /*
  * Globals
--- ./xgX.c.org	Wed Dec 13 14:56:29 1989
+++ ./xgX.c	Thu Nov 24 20:17:28 1994
@@ -19,7 +19,7 @@
 #define TICKLENGTH	5
 #define MAXSEGS		1000
 
-typedef struct x_state {
+struct x_state {
     Window win;			/* Primary window           */
 };
 
--- ./dialog.c.org	Wed Dec 13 15:19:58 1989
+++ ./dialog.c	Thu Nov 24 20:17:29 1994
@@ -40,7 +40,7 @@
 #define D_DSP	10
 #define D_FS	10
 
-typedef struct d_info {
+struct d_info {
     char *prog;			/* Program name              */
     xtb_data cookie;		/* Info used by do_harcopy   */
     Window choices;		/* Output device choices     */
@@ -639,7 +639,7 @@
 }
 
 
-typedef struct err_info {
+struct err_info {
     Window title;
     Window contbtn;
     int num_lines;