Bug 63083 mailnews makefiles use EXPORTS instead of INCLUDES. Part 5. r/sr=bienvenu

mailnews/base/search/src/nsMsgLocalSearch.cpp

@@ -43,7 +43,6 @@
 #include "nsMsgSearchCore.h"
 #include "nsMsgLocalSearch.h"
 #include "nsIStreamListener.h"
-#include "nsParseMailbox.h"
 #include "nsMsgSearchBoolExpression.h"
 #include "nsMsgSearchTerm.h"
 #include "nsMsgResultElement.h"
@@ -54,6 +53,7 @@
 #include "nsIMsgLocalMailFolder.h"
 #include "nsIMsgWindow.h"
 #include "nsIFileSpec.h"
+#include "nsIMsgHdr.h"
 
 extern "C"
 {

mailnews/base/search/src/nsMsgLocalSearch.h

@@ -46,7 +46,6 @@
 #include "nsISimpleEnumerator.h"
 
 class nsIMsgDBHdr;
-class nsMsgMailboxParser;
 class nsIMsgSearchScopeTerm;
 class nsIMsgFolder;
 class nsMsgSearchBoolExpression;

mailnews/local/build/Makefile.in

@@ -50,6 +50,7 @@ SHORT_LIBNAME 	= msglocal
 IS_COMPONENT	= 1
 MODULE_NAME	= local_mail_services
 MOZILLA_INTERNAL_API = 1
+LOCAL_INCLUDES += -I$(srcdir)/../src
 
 PACKAGE_FILE = msglocal.pkg
 

mailnews/local/src/Makefile.in

@@ -93,32 +93,10 @@ CPPSRCS		= \
 		nsRssService.cpp       \
 		$(NULL)
 
-EXPORTS		= \
-		nsPop3Protocol.h \
-		nsPop3URL.h \
-		nsPop3Sink.h \
-		nsParseMailbox.h \
-		nsMailboxUrl.h \
-		nsMailboxProtocol.h \
-		nsMailboxService.h \
-		nsPop3Service.h \
-		nsLocalMailFolder.h \
-		nsPop3IncomingServer.h \
-		nsLocalStringBundle.h \
-		nsNoneService.h	\
-		nsNoIncomingServer.h \
-		nsRssService.h	\
-		nsRssIncomingServer.h \
-		$(NULL)
-
 ifdef MOZ_MOVEMAIL
 CPPSRCS		+= \
 		nsMovemailService.cpp \
 		nsMovemailIncomingServer.cpp
-
-EXPORTS		+= \
-		nsMovemailService.h \
-		nsMovemailIncomingServer.h
 endif
 
 # we don't want the shared lib, but we want to force the creation of a static lib.

mailnews/mapi/mapiDll/MapiDll.cpp

@@ -42,7 +42,6 @@
 #include <mapidefs.h>
 #include <mapi.h>
 #include "msgMapi.h"
-#include "msgMapiMain.h"
 
 #define MAX_RECIPS  100
 #define MAX_FILES   100
@@ -120,7 +119,7 @@ BOOL InitMozillaReference(nsIMapi **aRetValue)
     if ((*aRetValue) && (*aRetValue)->IsValid() == S_OK)
          return TRUE;
 
-    HRESULT hRes = ::CoInitialize(nsnull) ;
+    HRESULT hRes = ::CoInitialize(NULL) ;
 
     hRes = ::CoCreateInstance(CLSID_CMapiImp, NULL, CLSCTX_LOCAL_SERVER,
                                          IID_nsIMapi, (LPVOID *)aRetValue);

mailnews/mapi/mapihook/src/Makefile.in

@@ -77,17 +77,6 @@ REQUIRES	= xpcom \
 		  embed_base \
 		  $(NULL)
 
-EXPORTS		= \
-		msgMapiFactory.h \
-		msgMapiHook.h \
-		msgMapiImp.h \
-		msgMapiMain.h \
-		msgMapiSupport.h \
-		nsMapiRegistry.h \
-		nsMapiRegistryUtils.h \
-		Registry.h \
-		$(NULL)
-
 CPPSRCS		= \
 		msgMapiFactory.cpp \
 		msgMapiHook.cpp \