diff --git a/mozilla/modules/plugin/tools/sdk/Makefile.in b/mozilla/modules/plugin/tools/sdk/Makefile.in
index 65b918ddded..b1df44389d7 100644
--- a/mozilla/modules/plugin/tools/sdk/Makefile.in
+++ b/mozilla/modules/plugin/tools/sdk/Makefile.in
@@ -37,24 +37,30 @@ install::
 	$(MAKE_INSTALL) $(XPDIST)\include\java\jri_md.h .\include
 	$(MAKE_INSTALL) $(XPDIST)\include\java\jritypes.h .\include
 
-	$(INSTALL) $(XPDIST)/include/xpcom/nsCom.h ./include
-	$(INSTALL) $(XPDIST)/include/xpcom/nsComponentManagerUtils.h ./include
-	$(INSTALL) $(XPDIST)/include/xpcom/nsCOMPtr.h ./include
-	$(INSTALL) $(XPDIST)/include/xpcom/nscore.h ./include
-	$(INSTALL) $(XPDIST)/include/xpcom/nsDebug.h ./include
-	$(INSTALL) $(XPDIST)/include/xpcom/nsError.h ./include
-	$(INSTALL) $(XPDIST)/include/xpcom/nsIClassInfo.h ./include
-	$(INSTALL) $(XPDIST)/include/xpcom/nsIComponentManager.h ./include
-	$(INSTALL) $(XPDIST)/include/xpcom/nsID.h ./include
-	$(INSTALL) $(XPDIST)/include/xpcom/nsIFactory.h ./include
-	$(INSTALL) $(XPDIST)/include/xpcom/nsIID.h ./include
-	$(INSTALL) $(XPDIST)/include/xpcom/nsIMemory.h ./include
-	$(INSTALL) $(XPDIST)/include/xpcom/nsIProgrammingLanguage.h ./include
-	$(INSTALL) $(XPDIST)/include/xpcom/nsIServiceManager.h ./include
-	$(INSTALL) $(XPDIST)/include/xpcom/nsISupports.h ./include
-	$(INSTALL) $(XPDIST)/include/xpcom/nsISupportsUtils.h ./include
-	$(INSTALL) $(XPDIST)/include/xpcom/nsrootidl.h ./include
-	$(INSTALL) $(XPDIST)/include/xpcom/nsTraceRefcnt.h ./include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsCom.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsComObsolete.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsComponentManagerUtils.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsCOMPtr.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nscore.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsDebug.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsError.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIClassInfo.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIComponentManager.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsID.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIFactory.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIMemory.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIProgrammingLanguage.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIServiceManager.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIServiceManagerObsolete.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIServiceManagerUtils.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsISupports.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsISupportsBase.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsISupportsImpl.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsISupportsObsolete.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsISupportsUtils.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsrootidl.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsTraceRefcnt.h .\include
+	$(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsXPCOM.h .\include
 
 	$(INSTALL) $(XPDIST)/include/nspr/pratom.h ./include
 	$(INSTALL) $(XPDIST)/include/nspr/prcpucfg.h ./include
diff --git a/mozilla/modules/plugin/tools/sdk/makefile.win b/mozilla/modules/plugin/tools/sdk/makefile.win
index 3fa14285ae4..45355a407ce 100644
--- a/mozilla/modules/plugin/tools/sdk/makefile.win
+++ b/mozilla/modules/plugin/tools/sdk/makefile.win
@@ -40,6 +40,7 @@ install::
   $(MAKE_INSTALL) $(XPDIST)\include\java\jritypes.h .\include
 
   $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsCom.h .\include
+  $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsComObsolete.h .\include
   $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsComponentManagerUtils.h .\include
   $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsCOMPtr.h .\include
   $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nscore.h .\include
@@ -48,26 +49,20 @@ install::
   $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIClassInfo.h .\include
   $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIComponentManager.h .\include
   $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsID.h .\include
-  $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIDirectoryService.h .\include
   $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIFactory.h .\include
-  $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIFile.h .\include
-  $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIID.h .\include
-  $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIInputStream.h .\include
-  $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIInterfaceRequestor.h .\include
-  $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsILocalFile.h .\include
   $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIMemory.h .\include
-  $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIModule.h .\include
-  $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIObserver.h .\include
-  $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIOutputStream.h .\include
   $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIProgrammingLanguage.h .\include
-  $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIProperties.h .\include
   $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIServiceManager.h .\include
-  $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsISimpleEmumerator.h .\include
+  $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIServiceManagerObsolete.h .\include
+  $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIServiceManagerUtils.h .\include
   $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsISupports.h .\include
+  $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsISupportsBase.h .\include
+  $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsISupportsImpl.h .\include
+  $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsISupportsObsolete.h .\include
   $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsISupportsUtils.h .\include
-  $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsIWeakReference.h .\include
   $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsrootidl.h .\include
   $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsTraceRefcnt.h .\include
+  $(MAKE_INSTALL) $(XPDIST)\include\xpcom\nsXPCOM.h .\include
 
   $(MAKE_INSTALL) $(XPDIST)\include\nspr\pratom.h .\include
   $(MAKE_INSTALL) $(XPDIST)\include\nspr\prcpucfg.h .\include