diff --git a/mozilla/cmd/xfe/plugins/ImAlive/ImAlive.c b/mozilla/cmd/xfe/plugins/ImAlive/ImAlive.c
index 91cce6d3e62..703b8ccb4bb 100644
--- a/mozilla/cmd/xfe/plugins/ImAlive/ImAlive.c
+++ b/mozilla/cmd/xfe/plugins/ImAlive/ImAlive.c
@@ -67,7 +67,7 @@ NPP_GetMIMEDescription(void)
 }
 
 NPError
-NPP_GetValue(void *future, NPPVariable variable, void *value)
+NPP_GetValue(NPP future, NPPVariable variable, void *value)
 {
 	NPError err = NPERR_NO_ERROR;
 
diff --git a/mozilla/cmd/xfe/plugins/javatest/npshell.c b/mozilla/cmd/xfe/plugins/javatest/npshell.c
index 62437c02bef..133e04b4429 100644
--- a/mozilla/cmd/xfe/plugins/javatest/npshell.c
+++ b/mozilla/cmd/xfe/plugins/javatest/npshell.c
@@ -107,7 +107,7 @@ NPP_GetMIMEDescription(void)
 #define PLUGIN_DESCRIPTION	"Tests java natives and reflection stuff."
 
 NPError
-NPP_GetValue(void *future, NPPVariable variable, void *value)
+NPP_GetValue(NPP future, NPPVariable variable, void *value)
 {
     NPError err = NPERR_NO_ERROR;
     if (variable == NPPVpluginNameString)
diff --git a/mozilla/cmd/xfe/plugins/nullplugin/npshell.c b/mozilla/cmd/xfe/plugins/nullplugin/npshell.c
index f556833d19c..ab421e085f7 100644
--- a/mozilla/cmd/xfe/plugins/nullplugin/npshell.c
+++ b/mozilla/cmd/xfe/plugins/nullplugin/npshell.c
@@ -50,7 +50,7 @@ NPP_GetMIMEDescription(void)
 }
 
 NPError
-NPP_GetValue(void *instance, NPPVariable variable, void *value)
+NPP_GetValue(NPP instance, NPPVariable variable, void *value)
 {
 	NPError err = NPERR_NO_ERROR;
 
diff --git a/mozilla/cmd/xfe/plugins/textplugin/npshell.c b/mozilla/cmd/xfe/plugins/textplugin/npshell.c
index 8f328426de5..5cde3d4f881 100644
--- a/mozilla/cmd/xfe/plugins/textplugin/npshell.c
+++ b/mozilla/cmd/xfe/plugins/textplugin/npshell.c
@@ -111,7 +111,7 @@ NPP_GetMIMEDescription(void)
 }
 
 NPError
-NPP_GetValue(void *future, NPPVariable variable, void *value)
+NPP_GetValue(NPP future, NPPVariable variable, void *value)
 {
 	NPError err = NPERR_NO_ERROR;
 
@@ -280,7 +280,6 @@ NPP_SetWindow(NPP instance, NPWindow* window)
 #ifdef TEXT_PLUGIN
 		{
 			Widget netscape_widget;
-			Widget form;
 			Arg av[20];
 			int ac;
 
@@ -448,7 +447,7 @@ NPP_Print(NPP instance, NPPrint* printInfo)
 		return;
 
 	if (instance != NULL) {
-		PluginInstance* This = (PluginInstance*) instance->pdata;
+      /*PluginInstance* This = (PluginInstance*) instance->pdata;*/
 	
 		if (printInfo->mode == NP_FULL) {
 		    /*