diff --git a/mozilla/include/MANIFEST b/mozilla/include/MANIFEST
index f5ee27bdb71..400a0d72532 100644
--- a/mozilla/include/MANIFEST
+++ b/mozilla/include/MANIFEST
@@ -3,8 +3,6 @@
 #
 
 minicom.h
-npapi.h
-npupp.h
 platform.h
 xpassert.h
 xp_core.h
diff --git a/mozilla/include/Makefile.in b/mozilla/include/Makefile.in
index 58a2bac380d..b8ff9efdba4 100644
--- a/mozilla/include/Makefile.in
+++ b/mozilla/include/Makefile.in
@@ -25,8 +25,6 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 EXPORTS         = \
-		npapi.h \
-		npupp.h \
                 platform.h \
                 xp_core.h \
                 xp_file.h \
@@ -35,7 +33,5 @@ EXPORTS         = \
 		xp_str.h \
                 $(NULL)
 
-EXPORTS         := $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/modules/plugin/base/public/MANIFEST b/mozilla/modules/plugin/base/public/MANIFEST
index 614ac2405d0..25692025ec3 100644
--- a/mozilla/modules/plugin/base/public/MANIFEST
+++ b/mozilla/modules/plugin/base/public/MANIFEST
@@ -52,3 +52,5 @@ nsIPluginInputStream2.h
 nsPIPluginHost.h
 nsPluginLogging.h
 nsPluginError.h
+npapi.h
+npupp.h
diff --git a/mozilla/modules/plugin/base/public/Makefile.in b/mozilla/modules/plugin/base/public/Makefile.in
index ed1013be766..e7c312f288f 100644
--- a/mozilla/modules/plugin/base/public/Makefile.in
+++ b/mozilla/modules/plugin/base/public/Makefile.in
@@ -58,6 +58,12 @@ EXPORTS		= \
 		nsPluginError.h \
 		$(NULL)
 
+# 4.x headers moved from mozilla/include
+EXPORTS		+= \
+		npapi.h \
+		npupp.h \
+		$(NULL)
+
 # DEPRECATED -- remove before we ship 5.0
 EXPORTS		+= \
 		nsIPluginStream.h \
diff --git a/mozilla/modules/plugin/samples/default/mac/DefaultPlugin.xml b/mozilla/modules/plugin/samples/default/mac/DefaultPlugin.xml
index b1465fe14cd..3725291af1a 100644
--- a/mozilla/modules/plugin/samples/default/mac/DefaultPlugin.xml
+++ b/mozilla/modules/plugin/samples/default/mac/DefaultPlugin.xml
@@ -85,6 +85,16 @@
                         <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
                         <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
                     </SETTING>
+                    <SETTING>
+                        <SETTING><NAME>SearchPath</NAME>
+                            <SETTING><NAME>Path</NAME><VALUE>::::::modules:plugin:base:public:</VALUE></SETTING>
+                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
+                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
+                        </SETTING>
+                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
+                        <SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
+                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
+                    </SETTING>
                     <SETTING>
                         <SETTING><NAME>SearchPath</NAME>
                             <SETTING><NAME>Path</NAME><VALUE>::::::sun-java:stubs:include:</VALUE></SETTING>
diff --git a/mozilla/modules/plugin/samples/default/unix/Makefile.in b/mozilla/modules/plugin/samples/default/unix/Makefile.in
index 00f18d98e43..e5d43cd7321 100644
--- a/mozilla/modules/plugin/samples/default/unix/Makefile.in
+++ b/mozilla/modules/plugin/samples/default/unix/Makefile.in
@@ -29,6 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 #MODULE		= plugin
 LIBRARY_NAME	= nullplugin
 REQUIRES	= java \
+		  plugin \
 		  $(NULL)
 
 CSRCS		= \
diff --git a/mozilla/modules/plugin/samples/default/windows/Makefile.in b/mozilla/modules/plugin/samples/default/windows/Makefile.in
index a09f0c292cf..dc8718edc3d 100644
--- a/mozilla/modules/plugin/samples/default/windows/Makefile.in
+++ b/mozilla/modules/plugin/samples/default/windows/Makefile.in
@@ -30,7 +30,7 @@ MODULE		= plugin
 LIBRARY_NAME	= npnul32
 RESFILE		= npnul32.res
 DEFFILE		= $(srcdir)/npnul32.def
-REQUIRES	= java
+REQUIRES	= java plugin
 
 CPPSRCS		= \
 		maindll.cpp \
diff --git a/mozilla/modules/plugin/samples/default/windows/makefile.win b/mozilla/modules/plugin/samples/default/windows/makefile.win
index cfde76578be..b126d20be01 100644
--- a/mozilla/modules/plugin/samples/default/windows/makefile.win
+++ b/mozilla/modules/plugin/samples/default/windows/makefile.win
@@ -22,6 +22,7 @@
 DEPTH=..\..\..\..\..
 MODULE=npnul32
 REQUIRES	= java \
+		  plugin \
 		  $(NULL)
 include <$(DEPTH)/config/config.mak>