Reworked an issue with includes to prevent compile problems with C & C++ code.

mailnews/mime/src/mimemoz2.h

@@ -23,32 +23,6 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include "xp.h"
-#include "mimei.h"
-#include "prtypes.h"
-
-/*
- * This is for the reworked mime parser.
- */
-struct mime_stream_data {           /* This struct is the state we pass around
-                                       amongst the various stream functions
-                                       used by MIME_MessageConverter(). */
-  URL_Struct          *url;         /* The URL this is all coming from. */
-  int                 format_out;
-  MWContext           *context;     /* Must REMOVE this entry. */
-  void                *streamObj;   /* The new XP-COM stream converter object */
-  NET_StreamClass     *istream;     /* Stream we're writing out image data-if any. */
-  MimeObject          *obj;         /* The root parser object */
-  MimeDisplayOptions  *options;     /* Data for communicating with libmime.a */
-
-  /* These are used by FO_QUOTE_HTML_MESSAGE stuff only: */
-  PRInt16             lastcsid;     /* csid corresponding to above. */
-  PRInt16             outcsid;      /* csid passed to EDT_PasteQuoteINTL */
-#ifdef DEBUG_rhp
-  PRFileDesc          *logit;        /* Temp file to put generated HTML into. */
-#endif
-};
-
 ////////////////////////////////////////////////////////////////
 // Bridge routines for legacy mime code
 ////////////////////////////////////////////////////////////////

mailnews/mime/src/plugin_inst.cpp

@@ -21,6 +21,8 @@
 #include "plugin_inst.h"
 #include "rebuffer.h"
 
+#include "net.h"
+
 static NS_DEFINE_IID(kINetPluginInstanceIID,  NS_INETPLUGININSTANCE_IID);
 static NS_DEFINE_IID(kINetOStreamIID,         NS_INETOSTREAM_IID);
 static NS_DEFINE_IID(kISupportsIID,           NS_ISUPPORTS_IID);