diff --git a/mailnews/addrbook/public/MANIFEST b/mailnews/addrbook/public/MANIFEST
index fc49f7396f4..70389fd5d43 100644
--- a/mailnews/addrbook/public/MANIFEST
+++ b/mailnews/addrbook/public/MANIFEST
@@ -16,7 +16,7 @@
 # This is a list of local files which get copied to the mozilla:dist:mailnews directory
 #
 
-nsIAbBase.h
-nsIAbListener.h
-nsIAbDirectory.h
-nsIAbCard.h
+#[installed by xpidl] nsIAbBase.h
+#[installed by xpidl] nsIAbListener.h
+#[installed by xpidl] nsIAbDirectory.h
+#[installed by xpidl] nsIAbCard.h
diff --git a/mailnews/base/public/MANIFEST b/mailnews/base/public/MANIFEST
index 1ab8d694715..4594f5991f9 100644
--- a/mailnews/base/public/MANIFEST
+++ b/mailnews/base/public/MANIFEST
@@ -16,30 +16,31 @@
 # This is a list of local files which get copied to the mozilla:dist:mailnews directory
 #
 
+#[installed by xpidl] nsIMsgHost.h
+#[installed by xpidl] nsIFolder.h
+#[installed by xpidl] nsIMsgFolder.h
+#[installed by xpidl] nsIUrlListener.h
+#[installed by xpidl] nsIFolderListener.h
+#[installed by xpidl] nsIMsgMailSession.h
+#[installed by xpidl] nsIMsgIdentity.h
+#[installed by xpidl] nsIDOMMsgAppCore.h
+#[installed by xpidl] nsIMsgGroupRecord.h
+#[installed by xpidl] nsICopyMessageListener.h
+#[installed by xpidl] nsIMessageView.h
+#[installed by xpidl] nsIMsgSignature.h
+#[installed by xpidl] nsIMsgVCard.h
+#[installed by xpidl] nsIMsgAccount.h
+#[installed by xpidl] nsIMsgAccountManager.h
+#[installed by xpidl] nsIMsgIdentity.h
+#[installed by xpidl] nsIMsgIncomingServer.h
+#[installed by xpidl] nsIMsgThread.h
+#[installed by xpidl] nsIMsgMessageService.h
+#[installed by xpidl] nsIMessage.h
+
 msgCore.h
 nsMsgFolderFlags.h
 nsMsgLocalFolderHdrs.h
 nsMsgHeaderMasks.h
 nsMsgMessageFlags.h
-nsIMsgHost.h
-nsIFolder.h
-nsIMsgFolder.h
 nsIMsgMailNewsUrl.h
 nsIUrlListenerManager.h
-nsIUrlListener.h
-nsIFolderListener.h
-nsIMsgMailSession.h
-nsIMsgIdentity.h
-nsIDOMMsgAppCore.h
-nsIMsgGroupRecord.h
-nsICopyMessageListener.h
-nsIMessageView.h
-nsIMsgSignature.h
-nsIMsgVCard.h
-nsIMsgAccount.h
-nsIMsgAccountManager.h
-nsIMsgIdentity.h
-nsIMsgIncomingServer.h
-nsIMsgThread.h
-nsIMsgMessageService.h
-nsIMessage.h
diff --git a/mailnews/compose/public/MANIFEST b/mailnews/compose/public/MANIFEST
index 68b820fc043..fef7aee971b 100644
--- a/mailnews/compose/public/MANIFEST
+++ b/mailnews/compose/public/MANIFEST
@@ -16,14 +16,15 @@
 # This is a list of local files which get copied to the mozilla:dist:mailnews directory
 #
 
+#[installed by xpidl] nsIDOMComposeAppCore.h
+#[installed by xpidl] nsIMsgCompFields.h
+
+nsIMsgSend.h
 nsIMsgCompose.h
 nsMsgComposeFact.h
-nsIMsgCompFields.h
 nsMsgCompFieldsFact.h
-nsIMsgSend.h
 nsMsgSendFact.h
 nsISmtpUrl.h
 nsISmtpService.h
 MsgCompGlue.h
-nsIDOMComposeAppCore.h
 nsIComposer.h
diff --git a/mailnews/local/public/MANIFEST b/mailnews/local/public/MANIFEST
index cce1946dce9..8a84eaed953 100644
--- a/mailnews/local/public/MANIFEST
+++ b/mailnews/local/public/MANIFEST
@@ -16,10 +16,11 @@
 # This is a list of local files which get copied to the mozilla:dist:mailnews directory
 #
 
-nsIPop3Sink.h
+#[installed by xpidl] nsIPop3Sink.h
+#[installed by xpidl] nsIMailboxService.h
+#[installed by xpidl] nsIPop3Service.h
+#[installed by xpidl] nsIPop3IncomingServer.h
+
 nsIPop3URL.h
 nsIMailboxUrl.h
-nsIMailboxService.h
-nsIPop3Service.h
-nsIPop3IncomingServer.h
 nsIMsgParseMailMsgState.h
diff --git a/mailnews/news/public/MANIFEST b/mailnews/news/public/MANIFEST
index e79ab24a7cd..a91422ed37d 100644
--- a/mailnews/news/public/MANIFEST
+++ b/mailnews/news/public/MANIFEST
@@ -16,14 +16,15 @@
 # This is a list of local files which get copied to the mozilla:dist:mailnews directory
 #
 
-nsINNTPNewsgroupList.h
-nsINNTPCategory.h
-nsINNTPCategoryContainer.h
-nsINNTPHost.h
-nsINNTPNewsgroup.h
-nsIMsgOfflineNewsState.h
-nsINNTPArticleList.h
-nsINntpUrl.h
+#[installed by xpidl] nsINNTPNewsgroupList.h
+#[installed by xpidl] nsINNTPCategory.h
+#[installed by xpidl] nsINNTPCategoryContainer.h
+#[installed by xpidl] nsINNTPHost.h
+#[installed by xpidl] nsINNTPNewsgroup.h
+#[installed by xpidl] nsIMsgOfflineNewsState.h
+#[installed by xpidl] nsINNTPArticleList.h
+#[installed by xpidl] nsINntpService.h
+#[installed by xpidl] nsINntpIncomingServer.h
+
 nsINNTPNewsgroupPost.h
-nsINntpService.h
-nsINntpIncomingServer.h
+nsINntpUrl.h