--- Imakefile.orig	Fri Jul  3 03:37:09 1998
+++ Imakefile	Mon Jul  6 17:27:55 1998
@@ -49,12 +49,12 @@
 XCOMM Uncomment the following definiton if you want to use the small icons
 XCOMM for the panel buttons.  Use this if you have a 800x600 or smaller screen.
 
-XCOMM #define USESMALLICONS
+#define USESMALLICONS
 
 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
@@ -70,12 +70,12 @@
 XCOMM Change XPMLIBS 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)
 XPMLIBS = -L$(XPMLIBDIR) -lXpm
 #endif
 
@@ -101,7 +101,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
@@ -169,7 +169,7 @@
 
 #ifdef USEJPEG
 #ifdef USEINSTALLEDJPEG
-JPEGINCDIR = -I/usr/include/X11
+JPEGINCDIR = -I/usr/local/include
 JPEGLIB = -L$(JPEGLIBDIR) -ljpeg
 #else
 JPEGCONF = configure
@@ -226,7 +226,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 \