diff -Naur xawtv-3.95.orig/common/midictrl.c xawtv-3.95/common/midictrl.c
--- xawtv-3.95.orig/common/midictrl.c	2003-02-14 15:14:04.000000000 +0100
+++ xawtv-3.95/common/midictrl.c	2006-07-26 14:26:16.000000000 +0200
@@ -6,7 +6,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <pthread.h>
-#include <X11/Intrinsic.h>
 
 #include "grab-ng.h"
 #include "commands.h"
diff -Naur xawtv-3.95.orig/common/vbi-data.c xawtv-3.95/common/vbi-data.c
--- xawtv-3.95.orig/common/vbi-data.c	2003-02-14 15:14:04.000000000 +0100
+++ xawtv-3.95/common/vbi-data.c	2006-07-26 14:26:16.000000000 +0200
@@ -14,7 +14,6 @@
 #include <assert.h>
 #include <pthread.h>
 
-#include <X11/Intrinsic.h>
 
 #include "vbi-data.h"
 #include "vbi-sim.c"
diff -Naur xawtv-3.95.orig/console/fbtv.c xawtv-3.95/console/fbtv.c
--- xawtv-3.95.orig/console/fbtv.c	2005-09-30 12:09:22.000000000 +0200
+++ xawtv-3.95/console/fbtv.c	2006-07-26 14:35:01.000000000 +0200
@@ -187,6 +187,7 @@
 
 #define NKEYTAB (sizeof(keytab)/sizeof(struct KEYTAB))
 
+//static char              *snapbase;
 static char              default_title[128] = "???";
 static char              message[128] = "";
 
diff -Naur xawtv-3.95.orig/libng/grab-ng.h xawtv-3.95/libng/grab-ng.h
--- xawtv-3.95.orig/libng/grab-ng.h	2003-02-14 15:14:07.000000000 +0100
+++ xawtv-3.95/libng/grab-ng.h	2006-07-26 14:26:01.000000000 +0200
@@ -25,7 +25,9 @@
 
 #if __STDC_VERSION__ < 199901
 # define restrict
-# define bool int
+# ifndef bool
+#  define bool int
+# endif
 #endif
 
 #define UNSET          (-1U)
diff -Naur xawtv-3.95.orig/libng/plugins/read-avi.c xawtv-3.95/libng/plugins/read-avi.c
--- xawtv-3.95.orig/libng/plugins/read-avi.c	2003-02-14 15:14:05.000000000 +0100
+++ xawtv-3.95/libng/plugins/read-avi.c	2006-07-26 14:26:01.000000000 +0200
@@ -7,6 +7,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/uio.h>
+#include <inttypes.h>
 
 #include "riff.h"
 #include "list.h"
@@ -64,7 +65,7 @@
     h->movi[h->movi_cnt].size  = size;
     h->movi_cnt++;
     if (ng_debug)
-	fprintf(stderr,"%*s[movie data list: 0x%llx+0x%llx]\n",
+	fprintf(stderr,"%*s[movie data list: 0x%" PRIx64 "+0x%" PRIx64 "]\n",
 		level, "", start, size);
 }
 
@@ -213,7 +214,7 @@
 	*pos += (chunk.size + 3) & ~0x03; /* 32-bit align */
 	if (FCCS(chunk.id) == id) {
 	    if (ng_debug)
-		fprintf(stderr,"avi: chunk %4.4s: 0x%llx+0x%x\n",
+		fprintf(stderr,"avi: chunk %4.4s: 0x%" PRIx64 "+0x%x\n",
 			chunk.id,*pos,chunk.size);
 	    return chunk.size;
 	}
diff -Naur xawtv-3.95.orig/Makefile.in xawtv-3.95/Makefile.in
--- xawtv-3.95.orig/Makefile.in	2004-04-22 16:52:29.000000000 +0200
+++ xawtv-3.95/Makefile.in	2006-07-26 14:25:53.000000000 +0200
@@ -49,7 +49,7 @@
 VBI_LIBS	:= @LIBZVBI@
 GL_LIBS		:= @LIBGL@
 DV_LIBS		:= @LIBDV@
-FS_LIBS		:= -L@x_libraries@ @FSLIB@
+FS_LIBS		:= @X_LIBS@ @FSLIB@
 DLFLAGS		:= @DLFLAGS@
 
 # stuff configure has found