diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk
index 37733dabd0a..b57e05069a1 100644
--- a/mozilla/config/config.mk
+++ b/mozilla/config/config.mk
@@ -429,7 +429,6 @@ DEFINES	+= \
 	-D_IMPL_NS_GFX \
 	-D_IMPL_NS_MSG_BASE \
 	-D_IMPL_NS_PICS \
-	-D_IMPL_NS_PLUGIN \
 	-D_IMPL_NS_WIDGET \
 	$(NULL)
 endif
diff --git a/mozilla/modules/plugin/base/macbuild/plugin.xml b/mozilla/modules/plugin/base/macbuild/plugin.xml
index 3e3a8523b1c..c789dde0981 100644
--- a/mozilla/modules/plugin/base/macbuild/plugin.xml
+++ b/mozilla/modules/plugin/base/macbuild/plugin.xml
@@ -469,7 +469,7 @@
                 <SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>1</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>pluginDebugPrefix.h</VALUE></SETTING>
+                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>MacSharedPrefix_debug.h</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>0</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>1</VALUE></SETTING>
@@ -1546,7 +1546,7 @@
                 <SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>1</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>pluginPrefix.h</VALUE></SETTING>
+                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>MacSharedPrefix.h</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>0</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>1</VALUE></SETTING>
diff --git a/mozilla/modules/plugin/base/macbuild/pluginClassicDebugPrefix.h b/mozilla/modules/plugin/base/macbuild/pluginClassicDebugPrefix.h
index f5252287eda..9dc0b69bfef 100644
--- a/mozilla/modules/plugin/base/macbuild/pluginClassicDebugPrefix.h
+++ b/mozilla/modules/plugin/base/macbuild/pluginClassicDebugPrefix.h
@@ -20,8 +20,6 @@
  * Contributor(s): 
  */
 
-#define _IMPL_NS_PLUGINS 1
-
 #include "MacSharedPrefix_debug.h"
 
 #undef TARGET_CARBON
diff --git a/mozilla/modules/plugin/base/macbuild/pluginClassicPrefix.h b/mozilla/modules/plugin/base/macbuild/pluginClassicPrefix.h
index ce0dec01dc2..adc056d4b2b 100644
--- a/mozilla/modules/plugin/base/macbuild/pluginClassicPrefix.h
+++ b/mozilla/modules/plugin/base/macbuild/pluginClassicPrefix.h
@@ -20,8 +20,6 @@
  * Contributor(s): 
  */
 
-#define _IMPL_NS_PLUGINS 1
-
 #include "MacSharedPrefix.h"
 
 #undef TARGET_CARBON
diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in
index 6ca494511ad..7f46c860c5a 100644
--- a/mozilla/modules/plugin/base/src/Makefile.in
+++ b/mozilla/modules/plugin/base/src/Makefile.in
@@ -109,8 +109,6 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D_IMPL_NS_PLUGIN
-
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 CXXFLAGS	+= -GX
diff --git a/mozilla/modules/plugin/samples/default/unix/Makefile.in b/mozilla/modules/plugin/samples/default/unix/Makefile.in
index 34cc87a2fdd..fa82b57804a 100644
--- a/mozilla/modules/plugin/samples/default/unix/Makefile.in
+++ b/mozilla/modules/plugin/samples/default/unix/Makefile.in
@@ -38,8 +38,6 @@ CSRCS		= \
 		npunix.c\
 		$(NULL)
 
-DEFINES		+= -D_IMPL_NS_PLUGIN
-
 # plugins should always be shared, even in the "static" build
 FORCE_SHARED_LIB = 1
 
diff --git a/mozilla/modules/plugin/samples/default/windows/Makefile.in b/mozilla/modules/plugin/samples/default/windows/Makefile.in
index 7d61ce2e234..83d79b08e99 100644
--- a/mozilla/modules/plugin/samples/default/windows/Makefile.in
+++ b/mozilla/modules/plugin/samples/default/windows/Makefile.in
@@ -45,7 +45,7 @@ CPPSRCS		= \
 		utils.cpp \
 		$(NULL)
 
-DEFINES		+= -D_IMPL_NS_PLUGIN -DWIN32_LEAN_AND_MEAN
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
 
 # plugins should always be shared, even in the "static" build
 FORCE_SHARED_LIB = 1
diff --git a/mozilla/xpcom/base/nsComObsolete.h b/mozilla/xpcom/base/nsComObsolete.h
index d02f16aa17f..11af1de13fc 100644
--- a/mozilla/xpcom/base/nsComObsolete.h
+++ b/mozilla/xpcom/base/nsComObsolete.h
@@ -51,12 +51,6 @@
 #define NS_GFX_(type) NS_IMPORT_(type)
 #endif
 
-#ifdef _IMPL_NS_PLUGIN
-#define NS_PLUGIN NS_EXPORT
-#else
-#define NS_PLUGIN NS_IMPORT
-#endif
-
 #ifdef _IMPL_NS_APPSHELL
 #define NS_APPSHELL NS_EXPORT
 #else