Move old 4x plugin headers from mozilla/include to mozilla/modules/plugin/base/p

ublic/ .
Bug #120845 r=bryner

include/makefile.win

@@ -50,8 +50,6 @@ DEPTH = ..
 #INSTALL_DIR=$(XPDIST)\include
 EXPORTS = \
 		minicom.h \
-		npapi.h \
-		npupp.h \
                 platform.h \
                 xp_core.h \
                 xp_file.h \

modules/plugin/base/public/makefile.win

@@ -43,6 +43,12 @@ EXPORTS =                     \
     nsPluginLogging.h              \
     nsPluginError.h
 
+# 4.x headers moved from mozilla/include
+EXPORTS = $(EXPORTS) \
+    npapi.h \
+    npupp.h \
+   $(NULL) 
+
 # DEPRECATED -- remove before we ship 5.0
 EXPORTS = $(EXPORTS)                          \
     nsIPluginStream.h             \