--- texk/xdvik/xdvi.h
+++ texk/xdvik/xdvi.h	2008-09-24 15:43:29.000000000 +0000
@@ -202,6 +202,12 @@ typedef unsigned long xuint32;
 #include <inttypes.h>
 #endif
 
+/* redefine X11 macros for our own usage, see below */
+#ifdef __STDC__
+# undef NeedFunctionPrototypes
+# undef NeedWidePrototypes
+#endif
+
 /* for unused parameters */
 #ifndef UNUSED
 #  define UNUSED(x) ((void)(x))