--- nxviewer/nxviewer/Imakefile.orig	Fri Dec  1 08:54:17 2006
+++ nxviewer/nxviewer/Imakefile
@@ -26,6 +26,11 @@
 DEFINES = -DMITSHM
 #endif
 
+#if defined(i386Architecture) && defined(FreeBSDArchitecture)
+DEFINES = -DMITSHM
+JPEG_INC = -I/usr/local/include
+#endif
+
 NX_INC = -I../../nxcomp -I../../nxcompext -I../../nx-X11/exports/include
 NX_LIB = -L../../nxcomp -lXcomp -L../../nxcompext -lXcompext
 
@@ -37,7 +42,7 @@
 #endif
 
 
-INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I/usr/include/X11 $(NX_INC)
+INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I../../nx-X11/exports/include/X11 $(NX_INC)
 
 VNCAUTH_LIB = ../libvncauth/libvncauth.a
 ZLIB_LIB = -L/usr/local/lib -lz