diff -ur vice-2.2.orig/configure.in vice-2.2/configure.in
--- vice-2.2.orig/configure.in	2009-12-12 18:57:37.000000000 +0200
+++ vice-2.2/configure.in	2010-03-24 12:05:10.000000000 +0200
@@ -2192,6 +2192,16 @@
                  [ X_LIBS="-lXext $X_LIBS";
                    LINK_X_LIBS="-lXext $LINK_X_LIBS"],,$X_LIBS)
 
+    PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+                 HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
+    		 HAVE_XEXTPROTO_71="no")
+
+    if test x"$HAVE_XEXTPROTO_71" = "xyes"; then
+      AM_CONDITIONAL(HAVE_XEXTPROTO_71, true)
+    else
+      AM_CONDITIONAL(HAVE_XEXTPROTO_71, false)
+    fi
+
     AC_MSG_CHECKING(for X11/extensions/Xvlib.h)
     AC_TRY_LINK([#include <X11/Xlib.h>
                  #include <X11/extensions/Xvlib.h>],
diff -ur vice-2.2.orig/src/arch/unix/x11/xaw/x11video.c vice-2.2/src/arch/unix/x11/xaw/x11video.c
--- vice-2.2.orig/src/arch/unix/x11/xaw/x11video.c	2009-10-21 19:46:45.000000000 +0300
+++ vice-2.2/src/arch/unix/x11/xaw/x11video.c	2010-03-24 12:01:48.000000000 +0200
@@ -56,6 +56,7 @@
 #include "vice.h"
 
 #include <X11/Xlib.h>
+#include <X11/Xlibint.h>
 #include <X11/Xutil.h>
 #include <X11/Intrinsic.h>
 #include <X11/cursorfont.h>
@@ -95,6 +96,10 @@
 #endif
 
 #ifdef USE_MITSHM
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/shmproto.h>
+#include <X11/extensions/XShm.h>
+#endif
 extern int shmhandler(Display* display, XErrorEvent* err);
 extern int mitshm_failed; /* will be set to true if XShmAttach() failed */
 extern int shmmajor;          /* major number of MITSHM error codes */