--- Imakefile.orig	Tue Mar 24 01:55:08 1998
+++ Imakefile	Mon Sep 14 22:22:19 1998
@@ -95,9 +95,9 @@
 XCOMM XA_CVID_DEF = -DXA_CINEPAK
 XCOMM XA_CYUV_DEF = -DXA_CYUV
 XCOMM
-XA_IV32_LIB = 
-XA_CVID_LIB = 
-XA_CYUV_LIB = 
+XCOMM XA_IV32_LIB = xa2.0_cvid_netbsd386.o
+XCOMM XA_CVID_LIB = xa2.0_iv32_netbsd386.o
+XCOMM XA_CYUV_LIB = xa1.0_cyuv_netbsd386.o
 XCOMM
 XCOMM NOTE: SGI Machines Only:
 XCOMM    if your linker core dumps then you'll need to uncomment the following
@@ -165,7 +165,7 @@
 XCOMM XA_AUDIO_DEFS =
 XCOMM
 XCOMM -- Sun Sparcs -----------------------------------------------------------
-XA_AUDIO_DEFS = -DXA_SPARC_AUDIO
+XCOMM XA_AUDIO_DEFS = -DXA_SPARC_AUDIO
 XCOMM
 XCOMM NOTE: Imakefile should add the -DSVR4 to Sun Solaris machines, if not
 XCOMM       use the following:
@@ -210,8 +210,8 @@
 XCOMM XA_MACH_LIBS = -lc
 XCOMM 
 XCOMM -- Also FreeBSD, and BSDI with SBlast-BSD-1.5 (development stages)-------
-XCOMM XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_LINUX_NEWER_SND
-XCOMM XA_AUDIO_LIBS = -lc
+XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_LINUX_NEWER_SND
+XA_AUDIO_LIBS = -lc
 XCOMM
 XCOMM -- SGI Indigo -----------------------------------------------------------
 XCOMM XA_AUDIO_DEFS = -DXA_SGI_AUDIO
@@ -325,7 +325,7 @@
 XCOMM   -- following symbols(XmbufDisplayBuffers, XmbufQueryExtension,
 XCOMM   --  XmbufCreateBuffers).
 XCOMM   -- NOTE_7: HP-UX machines need to comment this out.
-XCOMM XA_MULTIBUF = -DXMBUF
+XA_MULTIBUF = -DXMBUF
 XCOMM
 XCOMM ********************
  
@@ -345,7 +345,7 @@
 
 PROGRAMS = xanim
 
-INCLUDES = -I$(INCDIR) $(XA_INCS)
+INCLUDES = -I$(INCDIR)/X11 $(XA_INCS)
 
 
    LIBS1 = $(XA_LIBS) $(EXTENSIONLIB) $(XTOOLLIB) $(XLIB) -lm