diff --git a/mozilla/caps/src/Makefile.in b/mozilla/caps/src/Makefile.in
index 5658660494e..8a8e860683f 100644
--- a/mozilla/caps/src/Makefile.in
+++ b/mozilla/caps/src/Makefile.in
@@ -59,5 +59,5 @@ CHROME_L10N    = \
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= -I$(topsrcdir)/include -I$(srcdir)/../include
+INCLUDES	+= -I$(srcdir)/../include
 
diff --git a/mozilla/config/config.mak b/mozilla/config/config.mak
index 68560fd38c5..7de7960738d 100644
--- a/mozilla/config/config.mak
+++ b/mozilla/config/config.mak
@@ -126,7 +126,7 @@ NGLAYOUT_DIST=$(XPDIST)\NGL$(MOZ_BITS)_D.OBJ
 
 CFGFILE=$(OBJDIR)\cmd.cfg
 
-INCS=$(INCS) -I$(PUBLIC) -I$(DIST)\include -I$(DEPTH)\include
+INCS=$(INCS) -I$(PUBLIC) -I$(DIST)\include
 
 !if "$(MOZ_BITS)" == "16"
 CFLAGS=$(MOZ_JAVA_FLAG) -DLAYERS -DEDITOR $(OS_CFLAGS) $(MOZ_CFLAGS)
diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk
index d060bb93913..6f8cff49713 100644
--- a/mozilla/config/config.mk
+++ b/mozilla/config/config.mk
@@ -300,7 +300,7 @@ JAVA_OPTIMIZER	= -g
 XBCFLAGS	= -FR$*
 endif
 
-INCLUDES	= $(LOCAL_INCLUDES) -I$(PUBLIC) -I$(topsrcdir)/include $(OS_INCLUDES)
+INCLUDES	= $(LOCAL_INCLUDES) -I$(PUBLIC) $(OS_INCLUDES)
 
 LIBNT		= $(DIST)/lib/libnt.$(LIB_SUFFIX)
 LIBAWT		= $(DIST)/lib/libawt.$(LIB_SUFFIX)
diff --git a/mozilla/gfx/src/ps/nsPostScriptObj.h b/mozilla/gfx/src/ps/nsPostScriptObj.h
index 3348dcf36e9..a4ad8b9b8ce 100644
--- a/mozilla/gfx/src/ps/nsPostScriptObj.h
+++ b/mozilla/gfx/src/ps/nsPostScriptObj.h
@@ -29,6 +29,7 @@
 #include "xp_file.h"
 #include "ntypes.h"
 #include "net.h"
+#ifdef __cplusplus
 #include "nsColor.h"
 #include "nsCoord.h"
 #include "nsString.h"
@@ -40,7 +41,7 @@
 #include "nsIDeviceContextSpecPS.h"
 
 class nsIImage;
-
+#endif
 
 #define NS_LETTER_SIZE    0
 #define NS_LEGAL_SIZE     1
@@ -77,10 +78,12 @@ typedef struct page_breaks {
     int32 y_break;
 } PageBreaks;
 
+#ifdef __cplusplus
 typedef struct PS_LangGroupInfo_ {
   nsIUnicodeEncoder *mEncoder;
   nsHashtable       *mU2Ntable;
 } PS_LangGroupInfo;
+#endif
 
 typedef struct LineRecord_struct LineRecord;
 
@@ -100,8 +103,10 @@ struct PrintInfo_ {
   int pt_size;		    // Size of above table 
   int n_pages;		    // # of valid entries in above table 
 
+#if 0
   void (*scnatt)(MWContext*);   // SetCallNetlibAllTheTime 
   void (*ccnatt)(MWContext*);   // CLearCallNetlibAllTheTime 
+#endif
 
   char*	doc_title;	// best guess at title 
   int32 doc_width;	// Total document width 
@@ -192,6 +197,7 @@ struct PSContext_{
 };
 typedef struct PSContext_ PSContext;
 
+#ifdef __cplusplus
 class nsPostScriptObj
 {
 
@@ -413,6 +419,6 @@ private:
 
 };
 
-
+#endif /* __cplusplus */
 
 #endif
diff --git a/mozilla/gfx/src/ps/xlate_i.h b/mozilla/gfx/src/ps/xlate_i.h
index 2d8003e9abc..6a1b3960c53 100644
--- a/mozilla/gfx/src/ps/xlate_i.h
+++ b/mozilla/gfx/src/ps/xlate_i.h
@@ -20,8 +20,11 @@
  * Contributor(s): 
  */
 
+#if 0
 #include "xp.h"
 #include "xlate.h"
+#endif
+#include "nsPostScriptObj.h"
 
 extern PS_FontInfo *PSFE_MaskToFI[N_FONTS];
 
diff --git a/mozilla/include/Makefile.in b/mozilla/include/Makefile.in
index a620577f4b3..fcddb3f6aac 100644
--- a/mozilla/include/Makefile.in
+++ b/mozilla/include/Makefile.in
@@ -25,8 +25,24 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 EXPORTS         = \
+		csid.h \
+		intl_csi.h \
+		libi18n.h \
+		merrors.h \
+		msgcom.h \
+		msgtypes.h \
+		net.h \
+		npapi.h \
+		npupp.h \
+		ntypes.h \
                 platform.h \
+		xlate.h \
                 xp_core.h \
+                xp_file.h \
+		xp_mem.h \
+		xp_path.h \
+		xp_regexp.h \
+		xp_str.h \
                 $(NULL)
 
 EXPORTS         := $(addprefix $(srcdir)/, $(EXPORTS))
diff --git a/mozilla/include/intl_csi.h b/mozilla/include/intl_csi.h
index 8001ee143e3..4e2181ecf84 100644
--- a/mozilla/include/intl_csi.h
+++ b/mozilla/include/intl_csi.h
@@ -182,6 +182,7 @@ PUBLIC void INTL_CSIReportMetaCharsetTag(
     int type
 );
 
+#if 0
 /**
  * Returns the context's charset info object.
  *
@@ -192,6 +193,7 @@ PUBLIC void INTL_CSIReportMetaCharsetTag(
 PUBLIC INTL_CharSetInfo LO_GetDocumentCharacterSetInfo(
     MWContext *context
 );
+#endif
 
 /**
  * Returns the document charset ID of the given charset info object.
diff --git a/mozilla/include/libi18n.h b/mozilla/include/libi18n.h
index 9629b8f45a6..ca4c33e450e 100644
--- a/mozilla/include/libi18n.h
+++ b/mozilla/include/libi18n.h
@@ -27,13 +27,16 @@
 #ifndef INTL_LIBI18N_H
 #define INTL_LIBI18N_H
 
+#include "xp_core.h"
+#include "csid.h"
+
+#if 0
 #include "xp.h"
 #ifndef iDocumentContext
 #define iDocumentContext MWContext *
 #endif
 #define Stream NET_StreamClass
 #define URL URL_Struct
-#include "csid.h"
 
 #ifdef _UNICVT_DLL_
 
@@ -53,8 +56,6 @@ enum {
 	csiditerate_TryIMAP4Search = 1
 };
 
-
-
 /*
  * To be called when backend catches charset info on <meta ... charset=...> tag.
  * This will force netlib to go get fresh data again either through cache or
@@ -69,8 +70,11 @@ enum
 	METACHARSET_RELAYOUTDONE
 };
 
+#endif 
+
 XP_BEGIN_PROTOS
 
+#if 0
 
 /*=======================================================*/
 /* Character Code Conversion (CCC).
@@ -288,6 +292,8 @@ PUBLIC void INTL_DestroyCharCodeConverter(
     CCCDataObject obj
 );
 
+#endif /* 0 */
+
 /**
  * Converts a piece of text from one charset to another.
  *
@@ -327,6 +333,7 @@ PUBLIC int16 INTL_DocToWinCharSetID(
     int16 csid
 );
 
+#if 0
 /**
  * Return the charset used in internet message from a specified charset.
  *
@@ -712,6 +719,7 @@ PUBLIC void INTL_ReportFontCharSets(
  */
 #define INTL_GetCCCDefaultCSID(obj) \
 		(((obj)->funcs_pointer->get_default_doc_csid)(obj))
+#endif
 
 /*@}*/
 /*=======================================================*/
@@ -773,6 +781,7 @@ PUBLIC unsigned char *INTL_CsidToCharsetNamePt(
     int16 charSetID
 );
 
+#if 0
 /**
  * Returns the Java charset name corresponding to the given charset ID.
  *
@@ -2843,7 +2852,12 @@ PUBLIC char *FE_GetLanguageCountry(INTL_LanguageCountry_Selector selector);
 
 PUBLIC const char *INTL_PlatformIdToISOCode(unsigned short platformIdNum, char *platformIdStr, XP_Bool bLanguage); 
 
+#endif
 
 XP_END_PROTOS
 
+
 #endif /* INTL_LIBI18N_H */
+
+
+
diff --git a/mozilla/include/makefile.win b/mozilla/include/makefile.win
index a879894616a..691115ceb95 100644
--- a/mozilla/include/makefile.win
+++ b/mozilla/include/makefile.win
@@ -48,6 +48,27 @@ DEPTH = ..
 #//------------------------------------------------------------------------
 #INSTALL_FILE_LIST=*.h
 #INSTALL_DIR=$(XPDIST)\include
+EXPORTS = \
+		csid.h \
+		intl_csi.h \
+		libi18n.h \
+		merrors.h \
+		minicom.h \
+		msgcom.h \
+		msgtypes.h \
+		net.h \
+		npapi.h \
+		npupp.h \
+		ntypes.h \
+                platform.h \
+		xlate.h \
+                xp_core.h \
+                xp_file.h \
+		xp_mem.h \
+		xp_path.h \
+		xp_regexp.h \
+		xp_str.h \
+                $(NULL)
 
 #//------------------------------------------------------------------------
 #//
diff --git a/mozilla/include/net.h b/mozilla/include/net.h
index b741627373b..b4f7e59d6fc 100644
--- a/mozilla/include/net.h
+++ b/mozilla/include/net.h
@@ -34,9 +34,10 @@
 #ifndef _NET_PROTO_H_
 #define _NET_PROTO_H_
 
+#include "ntypes.h"
+#if 0
 #include "xp_core.h"
 #include "prio.h"
-#include "ntypes.h"
 #include "shistele.h"
 #include "xp_list.h"
 #include "msgtypes.h"
@@ -215,6 +216,7 @@ Net_GetUrlExitFunc (URL_Struct *URL_s, int status, MWContext *window_id);
 typedef void
 Net_GetUrlProgressFunc (URL_Struct *URL_s, int status, MWContext *window_id);
 
+#endif
 
 /* A structure to store all headers that can be passed into HTTPLOAD. 
  * Used for supporting URLConnection object of Java
@@ -226,6 +228,7 @@ typedef struct _NET_AllHeaders {
     uint32 max_index;           /* maximum no of free slots allocated */
 } NET_AllHeaders;
 
+#if 0
 /* Forward declaration to make compiler happy on OSF1 */
 #if defined (OSF1)
 #ifdef XP_CPLUSPLUS
@@ -252,6 +255,7 @@ typedef struct _ExtCacheDBInfo {
 
 } ExtCacheDBInfo;
 */
+#endif
 
 typedef enum {
     Normal_priority,
@@ -259,6 +263,7 @@ typedef enum {
     CurrentlyPrefetching_priority   /* a prefetch url currently loading */
 } URLLoadPriority;
 
+
 /* passing in structure 
  *
  * use this structure to pass a URL and associated data
@@ -304,11 +309,13 @@ struct URL_Struct_ {
                                  * proxying
                                  */
     char  * window_target;      /* named window support */
+#if 0
     Chrome * window_chrome;     /* pointer to a Chrome structure that
                                  * if non-null specifies the characteristics
                                  * of the target window named in 
                                  * the window_target variable
                                  */
+#endif
 
     /* attributes of the URL that are assembled
      * during and after transfer of the data
@@ -348,6 +355,7 @@ struct URL_Struct_ {
                                            * the filename of its local cache 
                                            * file containing it's data
                                            */
+#if 0
 #ifdef NU_CACHE
     void*    cache_object;
 #else
@@ -357,6 +365,7 @@ struct URL_Struct_ {
                                            * memory segments
                                            * containing it's data
                                            */
+#endif
 #endif
 
     void   * fe_data;                     /* random front end data to be passed
@@ -387,11 +396,13 @@ struct URL_Struct_ {
 
     int32   position_tag;                 /* tag number of last position */
 
+#if 0
     SHIST_SavedData savedData;            /* layout data */
 
     Net_GetUrlExitFunc *pre_exit_fn;      /* If set, called just before the
                                              exit routine that was passed
                                              in to NET_GetURL. */
+#endif
 
     /* Security information */
     int     security_on;                  /* is security on? */
@@ -507,6 +518,7 @@ struct URL_Struct_ {
 #endif
 };
 
+#if 0
 #ifndef NU_CACHE /* Not on my branch you don't */
 /*  silly macro's (methods) to access the URL Struct that nobody uses
  */
@@ -2453,4 +2465,5 @@ extern XP_Bool NET_IsOffline();
 
 XP_END_PROTOS
 
+#endif /* 0 */
 #endif /* _NET_PROTO_H_ */
diff --git a/mozilla/include/ntypes.h b/mozilla/include/ntypes.h
index 44cee81476a..50df3ecb56b 100644
--- a/mozilla/include/ntypes.h
+++ b/mozilla/include/ntypes.h
@@ -26,13 +26,14 @@
 
 #include "xp_core.h"
 
+#if 0
 /*
 	netlib
 */
 typedef int FO_Present_Types;
 typedef struct URL_Struct_ URL_Struct;
 typedef struct _NET_StreamClass NET_StreamClass;
-
+#endif
 
 /*
  * libi18n
@@ -58,6 +59,7 @@ typedef enum NET_ReloadMethod
      SERVER_ONLY       /* server only, force_reload */
 } NET_ReloadMethod;
 
+#if 0
 /*
    plugins
 */
@@ -211,5 +213,7 @@ typedef enum
 
 struct LJAppletData;
 
+#endif /* 0 */
+
 #endif /* _NetscapeTypes_ */
 
diff --git a/mozilla/include/xp_file.h b/mozilla/include/xp_file.h
index 6dd53ca8990..8a802f26bb1 100644
--- a/mozilla/include/xp_file.h
+++ b/mozilla/include/xp_file.h
@@ -24,6 +24,7 @@
 #ifndef _XP_File_
 #define _XP_File_
 
+#include "xp_core.h"
 #include "xp_path.h"
 
 #define XP_FILE_NATIVE_PATH char *
diff --git a/mozilla/include/xp_str.h b/mozilla/include/xp_str.h
index 711d5b6fefb..19b80960c80 100644
--- a/mozilla/include/xp_str.h
+++ b/mozilla/include/xp_str.h
@@ -25,6 +25,7 @@
 
 #include <string.h>
 #include "platform.h"
+#include "xp_core.h"
 
 #define XP_STRCASECMP  strcasecomp
 #define XP_STRNCASECMP strncasecomp
@@ -34,7 +35,6 @@
 #define XP_TO_UPPER(i)  xp_toupper(i)	
 #define XP_TO_LOWER(i) 	xp_tolower(i)
 
-#ifdef XP_UNIX /* because I can't verify yet.. */
 #ifdef DEBUG
 	XP_BEGIN_PROTOS
 		extern char * NOT_NULL (const char *x);
@@ -136,7 +136,6 @@
 #endif
 #endif
 
-#endif /* XP_UNIX -- ifdef'd because I can't yet verify */
 XP_BEGIN_PROTOS
 
 /*
diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp
index e5dfd7d0131..b331bfb1a7e 100644
--- a/mozilla/layout/generic/nsObjectFrame.cpp
+++ b/mozilla/layout/generic/nsObjectFrame.cpp
@@ -59,7 +59,7 @@
 #include "nsIStyleContext.h"
 
 //~~~ For image mime types
-#include "net.h"
+#include "nsMimeTypes.h"
 
 #include "nsObjectFrame.h"
 
diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp
index e5dfd7d0131..b331bfb1a7e 100644
--- a/mozilla/layout/html/base/src/nsObjectFrame.cpp
+++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp
@@ -59,7 +59,7 @@
 #include "nsIStyleContext.h"
 
 //~~~ For image mime types
-#include "net.h"
+#include "nsMimeTypes.h"
 
 #include "nsObjectFrame.h"
 
diff --git a/mozilla/layout/mathml/base/src/nsMathMLmpaddedFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmpaddedFrame.cpp
index 5d33cc52fe7..f7d3236291b 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLmpaddedFrame.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLmpaddedFrame.cpp
@@ -39,7 +39,7 @@
 
 #include "nsMathMLmpaddedFrame.h"
 
-#include "xp_mcom.h"  // to get XP_IS_SPACE
+#include "xp_str.h"  // to get XP_IS_SPACE
 
 //
 // <mpadded> -- adjust space around content - implementation
diff --git a/mozilla/mailnews/addrbook/src/nsDirPrefs.cpp b/mozilla/mailnews/addrbook/src/nsDirPrefs.cpp
index 21f21dda7d9..a912d4cf4ae 100644
--- a/mozilla/mailnews/addrbook/src/nsDirPrefs.cpp
+++ b/mozilla/mailnews/addrbook/src/nsDirPrefs.cpp
@@ -36,6 +36,9 @@
 #include "plstr.h"
 #include "prmem.h"
 #include "libi18n.h"
+#include "xp_str.h"
+#include "xp_file.h"
+#include "prprf.h"
 
 static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
 static NS_DEFINE_CID(kAddrBookSessionCID, NS_ADDRBOOKSESSION_CID);
diff --git a/mozilla/mailnews/compose/src/nsMsgSend.cpp b/mozilla/mailnews/compose/src/nsMsgSend.cpp
index 4ea1eb5fc78..cb2ef6d34ae 100644
--- a/mozilla/mailnews/compose/src/nsMsgSend.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgSend.cpp
@@ -69,6 +69,7 @@
 #include "nsIAppShellService.h"
 #include "nsMailHeaders.h"
 #include "nsIDocShell.h"
+#include "nsMimeTypes.h"
 
 // This will go away once select is passed a prompter interface
 #include "nsAppShellCIDs.h" // TODO remove later
diff --git a/mozilla/mailnews/compose/src/nsMsgSendPart.cpp b/mozilla/mailnews/compose/src/nsMsgSendPart.cpp
index 178c66fb609..7836e359acf 100644
--- a/mozilla/mailnews/compose/src/nsMsgSendPart.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgSendPart.cpp
@@ -32,6 +32,7 @@
 #include "nsMsgCompUtils.h"
 #include "nsFileStream.h"
 #include "nsMsgMimeCID.h"
+#include "nsMimeTypes.h"
 
 // defined in msgCompGlue.cpp
 static char *mime_mailto_stream_read_buffer = 0;
diff --git a/mozilla/mailnews/compose/src/nsMsgSendPart.h b/mozilla/mailnews/compose/src/nsMsgSendPart.h
index 071a3b440b4..b7d183934e1 100644
--- a/mozilla/mailnews/compose/src/nsMsgSendPart.h
+++ b/mozilla/mailnews/compose/src/nsMsgSendPart.h
@@ -26,6 +26,7 @@
 #include "msgCore.h"
 #include "prprf.h" /* should be defined into msgCore.h? */
 #include "xp_core.h"
+#include "xp_file.h"
 #include "intl_csi.h"
 #include "nsMsgZapIt.h"
 #include "nsMsgSend.h"
diff --git a/mozilla/mailnews/compose/tests/compose/test.cpp b/mozilla/mailnews/compose/tests/compose/test.cpp
index 9e39f73ce04..11563657b2f 100644
--- a/mozilla/mailnews/compose/tests/compose/test.cpp
+++ b/mozilla/mailnews/compose/tests/compose/test.cpp
@@ -58,7 +58,13 @@
 #include "nsCRT.h"
 #include "prmem.h"
 #include "nsIURL.h"
+#if 0
 #include "xp.h"
+#endif
+#ifdef XP_WIN
+#include <windows.h>
+#endif
+#include "nsMimeTypes.h"
 
 #ifdef XP_PC
 #define XPCOM_DLL  "xpcom32.dll"
diff --git a/mozilla/mailnews/db/msgdb/public/nsMsgHdr.h b/mozilla/mailnews/db/msgdb/public/nsMsgHdr.h
index a427a71959c..c4ec33ff2d2 100644
--- a/mozilla/mailnews/db/msgdb/public/nsMsgHdr.h
+++ b/mozilla/mailnews/db/msgdb/public/nsMsgHdr.h
@@ -26,7 +26,9 @@
 #include "nsIMsgHdr.h"
 #include "nsString.h"
 #include "MailNewsTypes.h"
+#if 0
 #include "xp.h"
+#endif
 #include "mdb.h"
 
 class nsMsgDatabase;
diff --git a/mozilla/mailnews/db/msgdb/src/nsImapMailDatabase.cpp b/mozilla/mailnews/db/msgdb/src/nsImapMailDatabase.cpp
index cec90fa2d1e..5068782e837 100644
--- a/mozilla/mailnews/db/msgdb/src/nsImapMailDatabase.cpp
+++ b/mozilla/mailnews/db/msgdb/src/nsImapMailDatabase.cpp
@@ -20,6 +20,7 @@
  * Contributor(s): 
  */
 
+#include "xp_file.h"
 #include "msgCore.h"
 #include "nsImapMailDatabase.h"
 #include "nsDBFolderInfo.h"
diff --git a/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp b/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp
index 6330944e4a0..2e9333745a1 100644
--- a/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp
+++ b/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp
@@ -36,6 +36,7 @@
 #include "nsMsgBaseCID.h"
 #include "nsMorkCID.h"
 #include "nsIMdbFactoryFactory.h"
+#include "xp_file.h"
 
 #include "nsILocale.h"
 #include "nsLocaleCID.h"
diff --git a/mozilla/mailnews/local/src/nsParseMailbox.cpp b/mozilla/mailnews/local/src/nsParseMailbox.cpp
index f85cb26597b..7736f6de85f 100644
--- a/mozilla/mailnews/local/src/nsParseMailbox.cpp
+++ b/mozilla/mailnews/local/src/nsParseMailbox.cpp
@@ -21,6 +21,7 @@
  *   Pierre Phaneuf <pp@ludusdesign.com>
  */
 
+#include "xp_str.h"
 #include "msgCore.h"
 #include "nsIURI.h"
 #include "nsParseMailbox.h"
diff --git a/mozilla/mailnews/mime/cthandlers/vcard/mimevcrd.cpp b/mozilla/mailnews/mime/cthandlers/vcard/mimevcrd.cpp
index 24ecd4fc4d3..7dd3af85090 100644
--- a/mozilla/mailnews/mime/cthandlers/vcard/mimevcrd.cpp
+++ b/mozilla/mailnews/mime/cthandlers/vcard/mimevcrd.cpp
@@ -1226,7 +1226,7 @@ static int BeginVCard (MimeObject *obj)
     }
     
 	s_unique++;
-	PR_snprintf (htmlHeaders, sizeof(htmlHeaders), "<HTML>%s<BODY>%s", LINEBREAK, LINEBREAK);
+	PR_snprintf (htmlHeaders, sizeof(htmlHeaders), "<HTML>%s<BODY>%s", MSG_LINEBREAK, MSG_LINEBREAK);
     status = COM_MimeObject_write(obj, htmlHeaders, nsCRT::strlen(htmlHeaders), PR_TRUE);
 
 	if (status < 0) return status;
diff --git a/mozilla/mailnews/mime/cthandlers/vcard/nsVCard.cpp b/mozilla/mailnews/mime/cthandlers/vcard/nsVCard.cpp
index a281ef98d56..f7b62801b76 100644
--- a/mozilla/mailnews/mime/cthandlers/vcard/nsVCard.cpp
+++ b/mozilla/mailnews/mime/cthandlers/vcard/nsVCard.cpp
@@ -69,6 +69,7 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 #include "nsVCard.h"
 #include "nsVCardObj.h"
 #include "nsFileStream.h"
+#include "prprf.h"
 
 #ifndef lint
 char yysccsid[] = "@(#)yaccpar	1.4 (Berkeley) 02/25/90";
diff --git a/mozilla/mailnews/mime/cthandlers/vcard/nsVCard.h b/mozilla/mailnews/mime/cthandlers/vcard/nsVCard.h
index af6f4142fb4..c9266a90fda 100644
--- a/mozilla/mailnews/mime/cthandlers/vcard/nsVCard.h
+++ b/mozilla/mailnews/mime/cthandlers/vcard/nsVCard.h
@@ -62,7 +62,7 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 #ifndef __VCC_H__
 #define __VCC_H__ 1
 
-#include "xp.h"
+#include "xp_core.h"
 #include "nsFileStream.h"
 #include "nsFileSpec.h"
 #include "nsVCardObj.h"
diff --git a/mozilla/mailnews/mime/cthandlers/vcard/nsVCardObj.cpp b/mozilla/mailnews/mime/cthandlers/vcard/nsVCardObj.cpp
index 596177d1a55..194456e50de 100644
--- a/mozilla/mailnews/mime/cthandlers/vcard/nsVCardObj.cpp
+++ b/mozilla/mailnews/mime/cthandlers/vcard/nsVCardObj.cpp
@@ -67,6 +67,8 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 #include "nsVCardObj.h"
 #include "prmem.h"
 #include "plstr.h"
+#include "msgCore.h"
+#include "prprf.h"
 #define NOT_NULL(X)	X
 
 /* debugging utilities */
@@ -104,7 +106,7 @@ static PRBool needsQuotedPrintable (const char *s)
 {
     const unsigned char *p = (const unsigned char *)s;
 
-	if (PL_strstr (s, LINEBREAK))
+	if (PL_strstr (s, MSG_LINEBREAK))
 		return TRUE;
 
 	while (*p) {
diff --git a/mozilla/mailnews/mime/src/mimedrft.cpp b/mozilla/mailnews/mime/src/mimedrft.cpp
index 9d2c16e889e..70116624bf4 100644
--- a/mozilla/mailnews/mime/src/mimedrft.cpp
+++ b/mozilla/mailnews/mime/src/mimedrft.cpp
@@ -35,6 +35,7 @@
 #include "mimebuf.h"
 #include "mimemoz2.h"
 #include "mimemsg.h"
+#include "nsMimeTypes.h"
 
 #include "prmem.h"
 #include "plstr.h"
diff --git a/mozilla/mailnews/mime/src/mimehdrs.cpp b/mozilla/mailnews/mime/src/mimehdrs.cpp
index 4db645d8cff..fccde2d35f4 100644
--- a/mozilla/mailnews/mime/src/mimehdrs.cpp
+++ b/mozilla/mailnews/mime/src/mimehdrs.cpp
@@ -19,6 +19,7 @@
  *
  * Contributor(s): 
  */
+#include "xp_str.h"
 #include "nsCOMPtr.h"
 #include "msgCore.h"
 #include "mimei.h"
diff --git a/mozilla/mailnews/mime/src/mimei.cpp b/mozilla/mailnews/mime/src/mimei.cpp
index 01c9dee65c5..e9470b6aeaf 100644
--- a/mozilla/mailnews/mime/src/mimei.cpp
+++ b/mozilla/mailnews/mime/src/mimei.cpp
@@ -69,6 +69,7 @@
 #include "prenv.h"
 #include "plstr.h"
 #include "prlink.h"
+#include "prprf.h"
 #include "mimecth.h"
 #include "mimebuf.h"
 #include "nsIServiceManager.h"
@@ -78,6 +79,7 @@
 #include "nsIComponentManager.h"
 #include "nsVoidArray.h"
 #include "nsMimeStringResources.h"
+#include "nsMimeTypes.h"
 
 static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
 static NS_DEFINE_IID(kIMimeContentTypeHandlerIID, NS_IMIME_CONTENT_TYPE_HANDLER_IID);
diff --git a/mozilla/mailnews/mime/src/mimemoz2.cpp b/mozilla/mailnews/mime/src/mimemoz2.cpp
index 2b886c105fe..23bd2f747d7 100644
--- a/mozilla/mailnews/mime/src/mimemoz2.cpp
+++ b/mozilla/mailnews/mime/src/mimemoz2.cpp
@@ -34,8 +34,10 @@
 #include "mimemalt.h"
 #include "mimebuf.h"
 #include "mimemapl.h"
+#if 0
 #include "edt.h"
 #include "proto.h"
+#endif
 #include "prprf.h"
 #include "intl_csi.h"
 #include "mimei.h"      /* for moved MimeDisplayData struct */
@@ -62,6 +64,7 @@
 #include "nsMsgI18N.h"
 #include "nsICharsetConverterManager.h"
 #include "nsICharsetAlias.h"
+#include "nsMimeTypes.h"
 
 #include "nsIIOService.h"
 #include "nsIURI.h"
@@ -1049,6 +1052,7 @@ mime_get_main_object(MimeObject* obj)
   return NULL;
 }
 
+#if 0
 int
 MimeGetAttachmentCount(MWContext* context)
 {
@@ -1078,6 +1082,7 @@ MimeGetAttachmentCount(MWContext* context)
   else
 	  return cobj->nchildren;
 }
+#endif
 
 #ifdef MOZ_SECURITY
 HG56025
@@ -1147,11 +1152,12 @@ PRBool MimeObjectChildIsMessageBody(MimeObject *obj,
 HG99007
 #endif
 
+#if 0
 extern int MIME_HasAttachments(MWContext *context)
 {
 	return (context->mime_data && context->mime_data->last_parsed_object->showAttachmentIcon);
 }
-
+#endif
 //
 // New Stream Converter Interface
 //
diff --git a/mozilla/mailnews/mime/src/mimemult.cpp b/mozilla/mailnews/mime/src/mimemult.cpp
index c7626579541..f89bc834833 100644
--- a/mozilla/mailnews/mime/src/mimemult.cpp
+++ b/mozilla/mailnews/mime/src/mimemult.cpp
@@ -29,6 +29,7 @@
 #include "plstr.h"
 #include "prio.h"
 #include "nsMimeStringResources.h"
+#include "nsMimeTypes.h"
 
 #define MIME_SUPERCLASS mimeContainerClass
 MimeDefClass(MimeMultipart, MimeMultipartClass,
diff --git a/mozilla/mailnews/mime/src/mimetext.cpp b/mozilla/mailnews/mime/src/mimetext.cpp
index 9ac8f8dafa0..7e395ac8c9d 100644
--- a/mozilla/mailnews/mime/src/mimetext.cpp
+++ b/mozilla/mailnews/mime/src/mimetext.cpp
@@ -35,6 +35,7 @@
 #include "nsCRT.h"
 #include "nsIPref.h"
 #include "nsIServiceManager.h"
+#include "nsMimeTypes.h"
 
 #define MIME_SUPERCLASS mimeLeafClass
 MimeDefClass(MimeInlineText, MimeInlineTextClass, mimeInlineTextClass,
diff --git a/mozilla/mailnews/mime/src/modmime.h b/mozilla/mailnews/mime/src/modmime.h
index b85d2661d3c..3d4e6b0e114 100644
--- a/mozilla/mailnews/mime/src/modmime.h
+++ b/mozilla/mailnews/mime/src/modmime.h
@@ -24,7 +24,9 @@
 #define MIME_H
 
 #include "ntypes.h"
+#if 0
 #include "mimeenc.h"
+#endif
 
 XP_BEGIN_PROTOS
 
diff --git a/mozilla/mailnews/mime/src/oldi18n.c b/mozilla/mailnews/mime/src/oldi18n.c
index 60f87a61737..5bfe9a564fb 100644
--- a/mozilla/mailnews/mime/src/oldi18n.c
+++ b/mozilla/mailnews/mime/src/oldi18n.c
@@ -19,17 +19,23 @@
  *
  * Contributor(s): 
  */
+#if 0
 #include "xp.h"
+#endif
+
+#include "libi18n.h"
 #include "prmem.h"
 #include "plstr.h"
 #include "intl_csi.h"
 
+#if 0
 INTL_CharSetInfo 
 LO_GetDocumentCharacterSetInfo(MWContext *context)
 {
     /* MOZ_FUNCTION_STUB; */
     return NULL;
 }
+#endif
 
 void 
 INTL_CharSetIDToName(int16 csid, char  *charset)
@@ -83,6 +89,7 @@ INTL_DocToWinCharSetID(int16 csid)
     return CS_FE_ASCII;
 }
 
+#if 0
 int16
 INTL_DefaultDocCharSetID(iDocumentContext context)
 {
@@ -97,3 +104,5 @@ unsigned char *INTL_ConvMailToWinCharCode(
 {
 	return NULL;
 }
+#endif
+
diff --git a/mozilla/mailnews/news/src/nsNNTPNewsgroupList.cpp b/mozilla/mailnews/news/src/nsNNTPNewsgroupList.cpp
index ffbb3c358db..c1c1ae99bc8 100644
--- a/mozilla/mailnews/news/src/nsNNTPNewsgroupList.cpp
+++ b/mozilla/mailnews/news/src/nsNNTPNewsgroupList.cpp
@@ -63,7 +63,7 @@
 #include "prprf.h"
 
 #include "nsCRT.h"
-#include "xp_mcom.h"
+#include "xp_str.h"
 
 #include "nsMsgDatabase.h"
 
diff --git a/mozilla/mailnews/news/src/nsNNTPNewsgroupPost.cpp b/mozilla/mailnews/news/src/nsNNTPNewsgroupPost.cpp
index 37487ff19b8..2e3327ef891 100644
--- a/mozilla/mailnews/news/src/nsNNTPNewsgroupPost.cpp
+++ b/mozilla/mailnews/news/src/nsNNTPNewsgroupPost.cpp
@@ -30,7 +30,7 @@
 #include "prmem.h"
 
 // for CRLF
-#include "fe_proto.h"
+//#include "fe_proto.h"
 
 const char* nsNNTPNewsgroupPost::m_headerName[HEADER_LAST+1]=
 {
diff --git a/mozilla/modules/libimg/public/libimg.h b/mozilla/modules/libimg/public/libimg.h
index f1048564bb9..219493b6646 100644
--- a/mozilla/modules/libimg/public/libimg.h
+++ b/mozilla/modules/libimg/public/libimg.h
@@ -22,7 +22,7 @@
 
 /* -*- Mode: C; tab-width: 4 -*-
  *  libimg.h --- API calls to the Image Library.
- *  $Id: libimg.h,v 3.7 2000-03-19 16:58:09 morse%netscape.com Exp $
+ *  $Id: libimg.h,v 3.8 2000-07-10 07:13:26 cls%seawood.org Exp $
  */
 
 
@@ -32,7 +32,9 @@
 #include "prtypes.h"
 #include "il_types.h"
 
+#if 0
 #include "dummy_nc.h"
+#endif
 
 #include "ilISystemServices.h"
 #include "ilIImageRenderer.h"
diff --git a/mozilla/modules/libimg/src/color.cpp b/mozilla/modules/libimg/src/color.cpp
index 634f41c9292..6ff5b13a9dd 100644
--- a/mozilla/modules/libimg/src/color.cpp
+++ b/mozilla/modules/libimg/src/color.cpp
@@ -38,13 +38,13 @@
                Includes dithering for B&W displays, but not dithering
                for PseudoColor displays which can be found in dither.c.
                
-   $Id: color.cpp,v 3.15 2000-04-05 02:36:47 mkaply%us.ibm.com Exp $
+   $Id: color.cpp,v 3.16 2000-07-10 07:13:27 cls%seawood.org Exp $
 */
 
 
 #include "if.h"
 #include "nsQuickSort.h"
-#include "xp_mcom.h" //for XP_RANDOM
+#include "xp_str.h" //for XP_RANDOM
 
 #ifdef PROFILE
 #pragma profile on
diff --git a/mozilla/modules/libimg/src/xpcompat.cpp b/mozilla/modules/libimg/src/xpcompat.cpp
index 07aec814688..d174ff13f3c 100644
--- a/mozilla/modules/libimg/src/xpcompat.cpp
+++ b/mozilla/modules/libimg/src/xpcompat.cpp
@@ -35,7 +35,9 @@
 #include "plstr.h"
 #include "ilISystemServices.h"
 #include "nsCRT.h"
+#if 0
 #include "xp_mcom.h"
+#endif
 
 extern ilISystemServices *il_ss;
 
diff --git a/mozilla/modules/libjar/nsJAR.h b/mozilla/modules/libjar/nsJAR.h
index c37157c4db8..93240e04779 100644
--- a/mozilla/modules/libjar/nsJAR.h
+++ b/mozilla/modules/libjar/nsJAR.h
@@ -35,7 +35,9 @@
 #include "plstr.h"
 #include "prlog.h"
 #include "prtypes.h"
+#if 0
 #include "xp_regexp.h"
+#endif
 
 #include "nsRepository.h"
 #include "nsIComponentManager.h"
diff --git a/mozilla/modules/libpref/src/prefapi.c b/mozilla/modules/libpref/src/prefapi.c
index 6318cf5cbda..42c15b8f9e7 100644
--- a/mozilla/modules/libpref/src/prefapi.c
+++ b/mozilla/modules/libpref/src/prefapi.c
@@ -22,6 +22,7 @@
 
 #include "prefapi.h"
 #include "jsapi.h"
+#include "xp_core.h" /* Needed for XP_ defines */
 
 #define PREF_SUPPORT_OLD_PATH_STRINGS 1
 #ifdef PREF_SUPPORT_OLD_PATH_STRINGS
@@ -52,8 +53,10 @@
 #include "prlog.h"
 #include "prmem.h"
 #include "prprf.h"
+#if 0
 #include "xpassert.h"
 #include "xp_str.h"
+#endif
 #include "nsQuickSort.h"
 
 #ifdef XP_OS2
diff --git a/mozilla/modules/libpref/src/prefapi.cpp b/mozilla/modules/libpref/src/prefapi.cpp
index 6318cf5cbda..42c15b8f9e7 100644
--- a/mozilla/modules/libpref/src/prefapi.cpp
+++ b/mozilla/modules/libpref/src/prefapi.cpp
@@ -22,6 +22,7 @@
 
 #include "prefapi.h"
 #include "jsapi.h"
+#include "xp_core.h" /* Needed for XP_ defines */
 
 #define PREF_SUPPORT_OLD_PATH_STRINGS 1
 #ifdef PREF_SUPPORT_OLD_PATH_STRINGS
@@ -52,8 +53,10 @@
 #include "prlog.h"
 #include "prmem.h"
 #include "prprf.h"
+#if 0
 #include "xpassert.h"
 #include "xp_str.h"
+#endif
 #include "nsQuickSort.h"
 
 #ifdef XP_OS2
diff --git a/mozilla/modules/oji/src/nsJVMPluginTagInfo.cpp b/mozilla/modules/oji/src/nsJVMPluginTagInfo.cpp
index 84f3e00a6b5..7867af9d43a 100644
--- a/mozilla/modules/oji/src/nsJVMPluginTagInfo.cpp
+++ b/mozilla/modules/oji/src/nsJVMPluginTagInfo.cpp
@@ -27,8 +27,11 @@
 #ifdef XP_UNIX
 #undef Bool
 #endif
+#if 0
 #include "xp.h"
 #include "xp_str.h"
+#endif
+#include "xp_mem.h"
 
 static NS_DEFINE_IID(kIJVMPluginTagInfoIID, NS_IJVMPLUGINTAGINFO_IID);
 static NS_DEFINE_IID(kIPluginTagInfo2IID, NS_IPLUGINTAGINFO2_IID);
diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index 234e411eff2..b31bab00bb4 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -56,7 +56,9 @@
 #include "nsIDOMPlugin.h"
 #include "nsIDOMMimeType.h"
 #include "prprf.h"
+#if 0
 #include "gui.h"
+#endif
 
 #if defined(XP_PC) && !defined(XP_OS2)
 #include "windows.h"
diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
index 234e411eff2..b31bab00bb4 100644
--- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
@@ -56,7 +56,9 @@
 #include "nsIDOMPlugin.h"
 #include "nsIDOMMimeType.h"
 #include "prprf.h"
+#if 0
 #include "gui.h"
+#endif
 
 #if defined(XP_PC) && !defined(XP_OS2)
 #include "windows.h"