diff -Naur tmp-old/mozilla-plugin/configure tmp-new/mozilla-plugin/configure
--- mozilla-plugin/configure	2005-08-04 17:51:21.000000000 +0000
+++ mozilla-plugin/configure	2006-05-10 11:08:43.000000000 +0000
@@ -19891,7 +19891,7 @@
 echo "${ECHO_T}no" >&6
 fi
 
-mozidldir="$mozprefix/share/idl/mozilla-$mozversion"
+mozidldir="/usr/lib/mozilla/idl"
 MOZILLA_XPIDLFLAGS="-I $mozidldir"
 
 
diff -Naur tmp-old/mozilla-plugin/configure.ac tmp-new/mozilla-plugin/configure.ac
--- mozilla-plugin/configure.ac	2005-08-03 21:41:31.000000000 +0000
+++ mozilla-plugin/configure.ac	2006-05-12 08:08:16.000000000 +0000
@@ -29,7 +29,7 @@
 AC_ARG_VAR([XPIDL], [Mozilla XPCOM IDL compiler])
 AC_ARG_VAR([XPIDLFLAGS], [Mozilla XPCOM IDL compiler flags])
 AC_PATH_PROG([XPIDL], [xpidl], , ["$mozlibdir"])
-mozidldir="$mozprefix/share/idl/mozilla-$mozversion"
+mozidldir="/usr/lib/mozilla/idl"
 MOZILLA_XPIDLFLAGS="-I $mozidldir"
 AC_SUBST([mozlibdir])
 AC_SUBST([MOZILLA_XPIDLFLAGS])
diff -Naur tmp-old/mozilla-plugin/src/openvrml.cpp tmp-new/mozilla-plugin/src/openvrml.cpp
--- mozilla-plugin/src/openvrml.cpp	2006-05-12 08:07:48.000000000 +0000
+++ mozilla-plugin/src/openvrml.cpp	2006-05-12 08:08:32.000000000 +0000
@@ -34,7 +34,7 @@
 # include <nsMemory.h>
 # include <nsString.h>
 # include <nsIConsoleService.h>
-# include <nsIDOMWindow.h>
+# include <dom/nsIDOMWindow.h>
 # include <dom/nsIDOMWindowInternal.h>
 # include <dom/nsIDOMLocation.h>
 # if defined MOZ_X11
diff -Naur tmp-old/src/libopenvrml/openvrml/field_value.h tmp-new/src/libopenvrml/openvrml/field_value.h
--- src/libopenvrml/openvrml/field_value.h	2006-05-12 04:58:10.000000000 +0000
+++ src/libopenvrml/openvrml/field_value.h	2006-05-12 05:50:14.000000000 +0000
@@ -28,10 +28,24 @@
 #   include <stdexcept>
 #   include <string>
 #   include <typeinfo>
+
+/* Ugly hack -- X headers define None as various kinds of 0,
+ * and sometimes even as -1, but boost libraries define their
+ * own type None; this file at one place expects None to be 0l
+ */
+#undef None
+
 #   include <boost/cast.hpp>
 #   include <boost/concept_check.hpp>
 #   include <boost/shared_ptr.hpp>
 #   include <boost/utility.hpp>
+
+/* Ugly hack -- X headers define None as various kinds of 0,
+ * and sometimes even as -1, but boost libraries define their
+ * own type None; this file at one place expects None to be 0l
+ */
+#define None 0l
+
 #   include <openvrml/basetypes.h>
 #   include <openvrml/node_ptr.h>