--- Imakefile.orig	Fri Aug 22 16:59:16 1997
+++ Imakefile	Tue Aug 26 13:14:52 1997
@@ -46,12 +46,12 @@
 XCOMM set JPEGLIBDIR after the #else to the directory where you have the source
 XCOMM for jpeg.
 
-XCOMM #define USEINSTALLEDJPEG
+#define USEINSTALLEDJPEG
 
 XCOMM Uncomment the following definition for XAWLIB if you want to use
 XCOMM the 3d Athena Widget Set (highly recommended!)
 
-XCOMM XAWLIB = -lXaw3d
+XAWLIB = -lXaw3d
 
 XCOMM Uncomment the following if needed for DECstations running older X11R4 
 XCOMM INCROOT=/usr/include/mit
@@ -66,12 +66,12 @@
 XCOMM Change XPMLIB if necessary to point to the xpm library (libXpm)
 XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
 
-XCOMM #define USEXPM
-XCOMM #define USEXPM_ICON
+#define USEXPM
+#define USEXPM_ICON
 
 #ifdef USEXPM
 XPMLIBDIR = $(USRLIBDIR)
-XPMINC = -I$(INCDIR)
+XPMINC = -I$(INCDIR)/X11 -I$(INCDIR)
 XPMLIB = -L$(XPMLIBDIR) -lXpm
 #endif
 
@@ -79,7 +79,7 @@
 
 #ifdef USEINSTALLEDJPEG
 JPEGLIBDIR = /usr/local/lib
-JPEGINCDIR = -I/usr/include/X11
+JPEGINCDIR = -I/usr/local/include
 JPEGLIB = -L$(JPEGLIBDIR) -ljpeg
 #else
 JPEGLIBDIR = ../jpeg
@@ -112,7 +112,7 @@
 XCOMM inline functions. With the "INLINE" keyword, you should notice that
 XCOMM the display will be a bit faster in complex figures
 
-XCOMM USEINLINE = -DUSE_INLINE
+USEINLINE = -DUSE_INLINE
 
 XCOMM use (and change) the following if you want the multi-key data base file
 XCOMM somewhere other than the standard X11 library directory
@@ -213,7 +213,7 @@
 #endif
 #endif
 
-DEFINES =             $(STRDEFINES) -DGSBIT $(USEINLINE) $(DUSEXPM) \
+DEFINES =             $(STRDEFINES) $(USEINLINE) $(DUSEXPM) \
 			$(DUSEXPMICON) $(DUSEGIF) $(DUSEJPEG) $(I18N_DEFS)
 
 XFIGSRC =	d_arc.c d_arcbox.c d_box.c d_ellipse.c d_picobj.c \