diff -ur mozilla-old/Makefile.am mozilla/Makefile.am
--- projects/mozilla/Makefile.am	2011-04-14 16:55:34.302641648 +0200
+++ projects/mozilla/Makefile.am	2011-04-14 15:24:07.773311393 +0200
@@ -19,7 +19,7 @@
 	support/classinfo.h
 
 DIST_sources = $(SOURCES_mozilla_common) \
-	support/npwin.cpp support/npmac.cpp support/npunix.c
+	support/npwin.cpp support/npmac.cpp support/npunix.cpp
 
 if BUILD_MOZILLA
 
@@ -135,7 +135,7 @@
 
 npvlc = libvlcplugin$(LIBEXT)
 npvlcdir = $(libdir)/mozilla/plugins
-SOURCES_support = support/npunix.c
+SOURCES_support = support/npunix.cpp
 
 libvlcplugin_la_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support)
 libvlcplugin_la_CFLAGS = `$(VLC_CONFIG) --cflags mozilla` $(CPPFLAGS_mozilla_EXTRA)
diff -ur mozilla-old/support/npunix.cpp mozilla/support/npunix.cpp
--- projects/mozilla/support/npunix.cpp	2011-04-14 16:55:34.374641648 +0200
+++ projects/mozilla/support/npunix.cpp	2011-04-14 17:14:35.453402702 +0200
@@ -635,7 +635,7 @@
                        NPReason reason, void* notifyData);
 void Private_Print(NPP instance, NPPrint* platformPrint);
 NPError Private_GetValue(NPP instance, NPPVariable variable, void *r_value);
-NPError Private_SetValue(NPP instance, NPPVariable variable, void *r_value);
+NPError Private_SetValue(NPP instance, NPNVariable variable, void *r_value);
 #ifdef OJI
 JRIGlobalRef Private_GetJavaClass(void);
 #endif
@@ -736,7 +736,7 @@
 }
 
 NPError
-Private_SetValue(NPP instance, NPPVariable variable, void *r_value)
+Private_SetValue(NPP instance, NPNVariable variable, void *r_value)
 {
     PLUGINDEBUGSTR("SetValue");
     return NPP_SetValue(instance, variable, r_value);
@@ -782,7 +782,7 @@
 NPError
 NP_GetValue(void* future, NPPVariable variable, void *value)
 {
-    return NPP_GetValue(future, variable, value);
+    return NPP_GetValue((NPP)future, variable, value);
 }
 
 /*