diff --git a/xpcom/reflect/xptinfo/public/MANIFEST_IDL b/xpcom/reflect/xptinfo/public/MANIFEST_IDL
index 4719bf9c742..e69de29bb2d 100644
--- a/xpcom/reflect/xptinfo/public/MANIFEST_IDL
+++ b/xpcom/reflect/xptinfo/public/MANIFEST_IDL
@@ -1,6 +0,0 @@
-#
-# This is a list of local files which get copied to the mozilla:dist directory
-#
-
-nsIInterfaceInfoManager.idl
-nsIInterfaceInfo.idl
diff --git a/xpcom/reflect/xptinfo/public/Makefile.in b/xpcom/reflect/xptinfo/public/Makefile.in
index adc099012c6..e850f7fc1e0 100644
--- a/xpcom/reflect/xptinfo/public/Makefile.in
+++ b/xpcom/reflect/xptinfo/public/Makefile.in
@@ -37,6 +37,7 @@ EXPORTS		= \
 XPIDLSRCS = \
 	nsIInterfaceInfo.idl          \
 	nsIInterfaceInfoManager.idl   \
+	nsIXPTLoader.idl \
 	$(NULL)
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
diff --git a/xpcom/reflect/xptinfo/public/makefile.win b/xpcom/reflect/xptinfo/public/makefile.win
index a8caff26bcd..e69de29bb2d 100644
--- a/xpcom/reflect/xptinfo/public/makefile.win
+++ b/xpcom/reflect/xptinfo/public/makefile.win
@@ -1,37 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1999 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-
-DEPTH=..\..\..\..
-MODULE	= xpcom
-
-XPIDL_MODULE = xpcom_xpti
-
-EXPORTS = \
-	xptinfo.h                       \
-	$(NULL)
-
-XPIDLSRCS = \
-	.\nsIInterfaceInfo.idl          \
-	.\nsIInterfaceInfoManager.idl   \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>
diff --git a/xpcom/reflect/xptinfo/public/nsIXPTLoader.idl b/xpcom/reflect/xptinfo/public/nsIXPTLoader.idl
new file mode 100644
index 00000000000..d46ed50c2fb
--- /dev/null
+++ b/xpcom/reflect/xptinfo/public/nsIXPTLoader.idl
@@ -0,0 +1,88 @@
+/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the external XPT loader interface.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  John Bandhauer <jband@netscape.com>
+ *  Alec Flett <alecf@netscape.com>
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+
+#include "nsISupports.idl"
+#include "nsILocalFile.idl"
+#include "nsIInputStream.idl"
+
+/**
+ * Implement nsIXPTLoaderSink if you want to enumerate the entries in
+ * an XPT archive of some kind
+ */
+[scriptable, uuid(6E48C500-8682-4730-ADD6-7DB693B9E7BA)]
+interface nsIXPTLoaderSink : nsISupports {
+    
+    /**
+     * called by the loader for each entry in the archive
+     * @param itemName the name of this particular item in the archive
+     * @param index the index of the item inthe archive
+     * @param stream contains the contents of the xpt file
+     */
+    void foundEntry(in string itemName,
+                    in long index,
+                    in nsIInputStream xptData);
+};
+
+/**
+ * The XPT loader interface: implemented by a loader to grab an input
+ * stream which will be consumed by the interface loader.
+ */
+[scriptable, uuid(368A15D9-17A9-4c2b-AC3D-A35B3A22B876)]
+interface nsIXPTLoader : nsISupports {
+    /**
+     * enumerate entries in the given archive
+     * for each entry found, the loader will call the sink's
+     * foundEntry() method with the appropriate information and a
+     * stream that the consumer can read from
+     * @param file the file to read from
+     * @param sink an object which will be called with each file found
+     *             in the file
+     */
+    void enumerateEntries(in nsILocalFile file,
+                          in nsIXPTLoaderSink sink );
+
+    /**
+     * Load a specific entry from the archive
+     * @param file the file to read from
+     * @param name the name of the xpt within the file
+     * @return an input stream that will read the raw xpt data from
+     *         the file
+     */
+    nsIInputStream loadEntry(in nsILocalFile file,
+                             in string name);
+};
+
+
+%{C++
+
+// the first part of the contractID for any loader
+// append the type of loader that you need, such as "zip"
+#define NS_XPTLOADER_CONTRACTID_PREFIX \
+   "@mozilla.org/xptinfo/loader;1&type="
+
+%}