diff --git a/configure.ac b/configure.ac
index 57fb56391601795edebf8f16610a1e488646598b..46a4896a03326684711b8682593227e5dc2ec69c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.90 2003/10/22 17:12:30 gbazin Exp $
+dnl $Id: configure.ac,v 1.91 2003/10/23 17:04:39 sam Exp $
 
 AC_INIT(vlc,0.6.3-cvs)
 
@@ -3166,6 +3166,9 @@ then
     dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490
     AX_ADD_CPPFLAGS([mozilla],[[`${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]])
     AX_ADD_LDFLAGS([mozilla],[`${MOZILLA_CONFIG} --libs plugin xpcom`])
+    CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_mozilla}"
+    AC_CHECK_HEADERS(mozilla-config.h)
+    CPPFLAGS="${CPPFLAGS_save}"
   fi
 
 dnl special case for mingw32
diff --git a/mozilla/vlcpeer.cpp b/mozilla/vlcpeer.cpp
index ff68781a21d250edf12e9600bb8fced9f275957e..f7078f42d926f746db13c67ef94eda5c56313d70 100644
--- a/mozilla/vlcpeer.cpp
+++ b/mozilla/vlcpeer.cpp
@@ -2,7 +2,7 @@
  * vlcpeer.cpp: scriptable peer descriptor
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: vlcpeer.cpp,v 1.8 2003/09/21 10:23:59 gbazin Exp $
+ * $Id: vlcpeer.cpp,v 1.9 2003/10/23 17:04:39 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -24,6 +24,8 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "config.h"
+
 #include <vlc/vlc.h>
 
 #ifdef DEBUG
@@ -31,10 +33,19 @@
 #   undef DEBUG
 #endif
 
+#ifdef HAVE_MOZILLA_CONFIG_H
+#   include <mozilla-config.h>
+#endif
 #include <nsISupports.h>
 #include <nsMemory.h>
 #include <npapi.h>
 
+#if !defined(XP_MACOSX) && !defined(XP_UNIX) && !defined(XP_WIN)
+#define XP_UNIX 1
+#elif defined(XP_MACOSX)
+#undef XP_UNIX
+#endif
+
 #include "vlcpeer.h"
 #include "vlcplugin.h"
 
diff --git a/mozilla/vlcplugin.cpp b/mozilla/vlcplugin.cpp
index 32bb31751818f723d6a7fdaba3be032af5e8d2ad..93a1cd4e8d115cb53731bffa88817f266e5b7b19 100644
--- a/mozilla/vlcplugin.cpp
+++ b/mozilla/vlcplugin.cpp
@@ -2,7 +2,7 @@
  * vlcplugin.cpp: a VLC plugin for Mozilla
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: vlcplugin.cpp,v 1.5 2003/07/16 16:33:59 sam Exp $
+ * $Id: vlcplugin.cpp,v 1.6 2003/10/23 17:04:39 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -24,12 +24,23 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "config.h"
+
 #include <vlc/vlc.h>
 
+#ifdef HAVE_MOZILLA_CONFIG_H
+#   include <mozilla-config.h>
+#endif
 #include <nsISupports.h>
 #include <nsMemory.h>
 #include <npapi.h>
 
+#if !defined(XP_MACOSX) && !defined(XP_UNIX) && !defined(XP_WIN)
+#define XP_UNIX 1
+#elif defined(XP_MACOSX)
+#undef XP_UNIX
+#endif
+
 #include "vlcpeer.h"
 #include "vlcplugin.h"
 
diff --git a/mozilla/vlcplugin.h b/mozilla/vlcplugin.h
index e0aa93649aacb1809018b2c210ac1d957a6862cb..a699311970084fad0cd465cf08ce8a3b3b534ace 100644
--- a/mozilla/vlcplugin.h
+++ b/mozilla/vlcplugin.h
@@ -2,7 +2,7 @@
  * vlcplugin.h: a VLC plugin for Mozilla
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: vlcplugin.h,v 1.12 2003/08/14 12:38:03 garf Exp $
+ * $Id: vlcplugin.h,v 1.13 2003/10/23 17:04:40 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -25,11 +25,6 @@
  * Instance state information about the plugin.
  ******************************************************************************/
 
-/* No, I really don't want to use XP_UNIX stuff on MacOSX */
-#ifdef XP_MACOSX
-#undef XP_UNIX
-#endif
-
 class VlcPlugin
 {
 public:
diff --git a/mozilla/vlcshell.cpp b/mozilla/vlcshell.cpp
index 998c40bcbcbf9b471463de0271c4654a68c7f201..a747233d4e5ce2bec30da4de93ccb6a04b139bfd 100644
--- a/mozilla/vlcshell.cpp
+++ b/mozilla/vlcshell.cpp
@@ -2,7 +2,7 @@
  * vlcshell.cpp: a VLC plugin for Mozilla
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: vlcshell.cpp,v 1.25 2003/10/15 07:34:25 gbazin Exp $
+ * $Id: vlcshell.cpp,v 1.26 2003/10/23 17:04:40 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -27,6 +27,8 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -37,9 +39,19 @@
 #endif
 
 /* Mozilla stuff */
+#ifdef HAVE_MOZILLA_CONFIG_H
+#   include <mozilla-config.h>
+#endif
 #include <nsISupports.h>
 #include <nsMemory.h>
 #include <npapi.h>
+#include <jri.h>
+
+#if !defined(XP_MACOSX) && !defined(XP_UNIX) && !defined(XP_WIN)
+#define XP_UNIX 1
+#elif defined(XP_MACOSX)
+#undef XP_UNIX
+#endif
 
 #ifdef XP_WIN
     /* Windows stuff */
@@ -50,6 +62,13 @@
 #   include <Quickdraw.h>
 #endif
 
+#ifdef XP_UNIX
+    /* X11 stuff */
+#   include <X11/Xlib.h>
+#   include <X11/Intrinsic.h>
+#   include <X11/StringDefs.h>
+#endif
+
 #include "vlcpeer.h"
 #include "vlcplugin.h"
 
@@ -59,18 +78,6 @@
 #   define WINDOW_TEXT "(no libvlc)"
 #endif
 
-/* No, I really don't want to use XP_UNIX stuff on MacOSX */
-#ifdef XP_MACOSX
-#undef XP_UNIX
-#endif
-
-#ifdef XP_UNIX
-    /* X11 stuff */
-#   include <X11/Xlib.h>
-#   include <X11/Intrinsic.h>
-#   include <X11/StringDefs.h>
-#endif
-
 /*****************************************************************************
  * Unix-only declarations
 ******************************************************************************/