Juggle headers a bit so that we can build on VC5.0 and gcc-2.7.2.3 (need definition of classes for use with nsCOMPtr).

mailnews/base/search/public/nsIMsgSearchAdapter.h

@@ -28,7 +28,10 @@
 { 0x66f4b80c, 0x0fb5, 0x11d3,                 \
     { 0xa5, 0x15, 0x0, 0x60, 0xb0, 0xfc, 0x04, 0xb7 } }
 
-
+class nsMsgSearchScopeTerm;
+class nsMsgSearchTermArray;
+class nsMsgResultElement;
+class nsMsgSearchValue;
 
 class nsIMsgSearchAdapter : public nsISupports
 {

mailnews/base/search/public/nsMsgSearchCore.h

@@ -22,11 +22,12 @@
 #include "MailNewsTypes.h"
 #include "nsString.h"
 #include "nsIMsgHeaderParser.h"
+#include "nsIMsgSearchAdapter.h"
+#include "nsIMsgHeaderParser.h"
+#include "nsIMsgFolder.h"
 #include "nsCOMPtr.h"
 
 class nsIMsgDatabase;
-class nsIMsgFolder;
-class nsIMsgSearchAdapter;
 class nsIMsgDBHdr;
 
 typedef enum

mailnews/base/search/src/nsMsgFilterList.h

@@ -20,6 +20,7 @@
 #define _nsMsgFilterList_H_
 
 #include "nscore.h"
+#include "nsIMsgFolder.h"
 #include "nsIMsgFilterList.h"
 #include "nsCOMPtr.h"
 #include "nsISupportsArray.h"

mailnews/base/search/src/nsMsgLocalSearch.cpp

@@ -19,6 +19,7 @@
 // Implementation of db search for POP and offline IMAP mail folders
 
 #include "msgCore.h"
+#include "nsIMsgDatabase.h"
 #include "nsMsgSearchCore.h"
 #include "nsMsgLocalSearch.h"
 #include "nsIStreamListener.h"