diff --git a/extensions/psm-glue/src/nsFSDR.cpp b/extensions/psm-glue/src/nsFSDR.cpp
index 578ba31cc24..1e7c238b86b 100644
--- a/extensions/psm-glue/src/nsFSDR.cpp
+++ b/extensions/psm-glue/src/nsFSDR.cpp
@@ -650,7 +650,7 @@ Wallet_SetKey(PRBool isNewkey) {
         Recycle(message1);
         Recycle(message2);
         gKeyCancel = PR_TRUE;
-        return FALSE; /* user does not want to try again */
+        return PR_FALSE; /* user does not want to try again */
       }    
     }
     PR_FREEIF(mismatch);
@@ -686,7 +686,7 @@ Wallet_SetKey(PRBool isNewkey) {
             Recycle(message1);
             Recycle(message2);
             gKeyCancel = PR_TRUE;
-            return FALSE; /* user does not want to try again */
+            return PR_FALSE; /* user does not want to try again */
           }    
         }
       } else {
diff --git a/gfx/src/ps/nsPostScriptObj.cpp b/gfx/src/ps/nsPostScriptObj.cpp
index 891edc9de9f..75b551c8278 100644
--- a/gfx/src/ps/nsPostScriptObj.cpp
+++ b/gfx/src/ps/nsPostScriptObj.cpp
@@ -260,10 +260,10 @@ printf( "top %f bottom %f left %f right %f\n", top, bottom, left, right );
     mPrintSetup->header = "header";
     mPrintSetup->footer = "footer";
     mPrintSetup->sizes = NULL;
-    mPrintSetup->landscape = FALSE;            // Rotated output 
-    mPrintSetup->underline = TRUE;             // underline links 
-    mPrintSetup->scale_images = TRUE;          // Scale unsized images which are too big 
-    mPrintSetup->scale_pre = FALSE;		        // do the pre-scaling thing 
+    mPrintSetup->landscape = PR_FALSE;            // Rotated output 
+    mPrintSetup->underline = PR_TRUE;             // underline links 
+    mPrintSetup->scale_images = PR_TRUE;          // Scale unsized images which are too big 
+    mPrintSetup->scale_pre = PR_FALSE;		        // do the pre-scaling thing 
     // scale margins (specified in inches) to dots.
 
     mPrintSetup->top = (int) (top * mPrintSetup->dpi);     
diff --git a/gfx/src/ps/nsRenderingContextPS.cpp b/gfx/src/ps/nsRenderingContextPS.cpp
index 5b2be0b8ab7..e4e01d989ce 100644
--- a/gfx/src/ps/nsRenderingContextPS.cpp
+++ b/gfx/src/ps/nsRenderingContextPS.cpp
@@ -411,7 +411,7 @@ PRInt32     cliptype;
     mPSObj->closepath();
     mPSObj->clip();
   }else{
-    NS_ASSERTION(FALSE, "illegal clip combination");
+    NS_ASSERTION(PR_FALSE, "illegal clip combination");
   }
 
 #if defined(XP_PC) && !defined(XP_OS2)
@@ -1070,7 +1070,7 @@ PRInt32       y = aY;
 	y += ascent;
 
 	mTMatrix->TransformCoord(&x, &y);
-  PostscriptTextOut(aString, aLength, NS_PIXELS_TO_POINTS(x), NS_PIXELS_TO_POINTS(y), aLength, (const nscoord*) (aSpacing ? dx0 : NULL), FALSE);
+  PostscriptTextOut(aString, aLength, NS_PIXELS_TO_POINTS(x), NS_PIXELS_TO_POINTS(y), aLength, (const nscoord*) (aSpacing ? dx0 : NULL), PR_FALSE);
 
   if ((nsnull != aSpacing) && (dx0 != dxMem)) {
     delete [] dx0;
diff --git a/include/MANIFEST b/include/MANIFEST
index 473935af1cc..98d741676d4 100644
--- a/include/MANIFEST
+++ b/include/MANIFEST
@@ -8,7 +8,6 @@ ctxtfunc.h
 edttypes.h
 fe_proto.h
 libc_r.h
-lo_ele.h
 merrors.h
 minicom.h
 mk_cx_fn.h
diff --git a/include/client.h b/include/client.h
index 661ec74030a..e69de29bb2d 100644
--- a/include/client.h
+++ b/include/client.h
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-
-/*
- * This file should be included after xp_mcom.h
- *
- * All definitions for intermodule communications in the Netscape
- * client should be contained in this file
- */
-
-#ifndef _CLIENT_H_
-#define _CLIENT_H_
-
-#define NEW_FE_CONTEXT_FUNCS
-
-/* include header files needed for prototypes/etc */
-
-#include "xp_mcom.h"
-
-#include "ntypes.h" /* typedefs for commonly used Netscape data structures */
-#include "fe_proto.h" /* all the standard FE functions */
-#include "proto.h" /* library functions */
-
-/* global data structures */
-#include "structs.h"
-#include "merrors.h"
-
-#ifndef XP_MAC /* don't include everything in the world */
-
-/* --------------------------------------------------------------------- */
-/* include other bits of the Netscape client library */
-#include "lo_ele.h"  /* Layout structures */
-#include "net.h"
-#include "gui.h"
-#include "shist.h"
-#include "glhist.h"
-#include "mime.h"
-
-#endif /* !XP_MAC */
-
-#endif /* _CLIENT_H_ */
-
diff --git a/include/lo_ele.h b/include/lo_ele.h
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/include/proto.h b/include/proto.h
index 155edaf6084..e69de29bb2d 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -1,432 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-
-/* This file should contain prototypes of all public functions for all
-   modules in the client library.
-
-   This file will be included automatically when source includes "client.h".
-   By the time this file is included, all global typedefs have been executed.
-*/
-
-/* make sure we only include this once */
-#ifndef _PROTO_H_
-#define _PROTO_H_
-
-#include "ntypes.h"
-#include "lo_ele.h"
-
-XP_BEGIN_PROTOS
-
-/* put your prototypes here..... */
-
-/* --------------------------------------------------------------------------
- * Parser stuff
- */
-
-extern intn PA_ParserInit(PA_Functions *);
-extern NET_StreamClass *PA_BeginParseMDL(FO_Present_Types, void *,
-	URL_Struct *, MWContext *);
-extern intn PA_ParseBlock(NET_StreamClass *, const char *, int);
-extern void PA_MDLComplete(NET_StreamClass *);
-extern void PA_MDLAbort(NET_StreamClass *, int);
-extern Bool PA_HasMocha(PA_Tag *tag);
-extern PA_Tag * PA_CloneMDLTag(PA_Tag * src);
-extern intn PA_ParseStringToTags(MWContext *, char *, int32, void *);
-extern const char *PA_TagString(int32);
-extern int32 PA_TagIndex(char *);
-
-
-/* --------------------------------------------------------------------------
- * Layout stuff
- */
-
-/*#ifndef NO_TAB_NAVIGATION */
-
-extern Bool LO_isTabableElement(MWContext *context, LO_TabFocusData *pCurrentFocus );
-extern Bool LO_isTabableFormElement( LO_FormElementStruct * next_ele );
-extern Bool LO_isFormElementNeedTextTabFocus( LO_FormElementStruct *pElement );
-extern LO_Element * LO_getFirstLastElement(MWContext *context, int wantFirst );
-extern Bool LO_getNextTabableElement( MWContext *context, LO_TabFocusData *currentFocus, int forward );
-
-/* NO_TAB_NAVIGATION  */
-
-extern LO_FormElementStruct *
-LO_ReturnNextFormElement(MWContext *context,
-                         LO_FormElementStruct *current_element);
-extern LO_FormElementStruct *
-LO_ReturnPrevFormElement(MWContext *context,
-                         LO_FormElementStruct *current_element);
-
-/* NO_TAB_NAVIGATION, 
-	LO_ReturnNextFormElementInTabGroup() is used to tab through form elements.
-	Since the winfe now has TAB_NAVIGATION, it is not used any more.
-	If mac and Unix don't use it either, it can be removed.
-*/
-extern LO_FormElementStruct *
-LO_ReturnNextFormElementInTabGroup(MWContext *context,
-                                   LO_FormElementStruct *current_element,
-						 		   XP_Bool go_backwards);
-
-extern intn LO_ProcessTag(void *, PA_Tag *, intn);
-extern void LO_RefreshArea(MWContext *context, int32 left, int32 top,
-	uint32 width, uint32 height);
-extern Bool LO_CheckForUnload(MWContext *context);
-
-#if 0
-extern void LO_MoveLayer(CL_Layer *layer, int32 x, int32 y);
-extern int32 LO_GetLayerXOffset(CL_Layer *layer);
-extern int32 LO_GetLayerYOffset(CL_Layer *layer);
-
-extern int32 LO_GetLayerWrapWidth(CL_Layer *layer);
-extern int32 LO_GetLayerScrollWidth(CL_Layer *layer);
-extern int32 LO_GetLayerScrollHeight(CL_Layer *layer);
-extern void LO_SetLayerScrollWidth(CL_Layer *layer, uint32 width);
-extern void LO_SetLayerScrollHeight(CL_Layer *layer, uint32 height);
-
-extern void LO_SetLayerBbox(CL_Layer *layer, XP_Rect *bbox);
-
-#ifdef DOM
-/* Setters for span contents */
-extern void LO_SetSpanColor(MWContext *context, void *span, LO_Color *color);
-extern void LO_SetSpanBackground(MWContext *context, void *span, LO_Color *color);
-extern void LO_SetSpanFontFamily(MWContext* context, void *span, char *family);
-extern void LO_SetSpanFontWeight(MWContext* context, void *span, char *weight);
-extern void LO_SetSpanFontSize(MWContext* context, void *span, int32 size);
-extern void LO_SetSpanFontSlant(MWContext* context, void *span, char *slant);
-
-/* Setters for table contents */
-extern void LO_SetTableCellAttribute(MWContext *context, void *cell,
-                                     const char *name, const char *value);
-#endif
-
-extern void LO_SetLayerBgColor(CL_Layer *layer, LO_Color *color);
-extern LO_Color * LO_GetLayerBgColor(CL_Layer *layer);
-extern void LO_SetLayerBackdropURL(CL_Layer *layer, const char *url);
-extern const char *LO_GetLayerBackdropURL(CL_Layer *layer);
-extern LO_ImageStruct *LO_GetLayerBackdropImage(CL_Layer *layer);
-extern void LO_SetImageURL(MWContext *context, IL_GroupContext *mocha_img_cx,
-                           LO_ImageStruct *image, const char *url,
-                           NET_ReloadMethod reload_policy);
-extern void LO_SetDocBgColor(MWContext *context, LO_Color *rgb);
-
-extern void
-lo_SetLayerClipExpansionPolicy(CL_Layer *layer, int policy);
-extern int
-lo_GetLayerClipExpansionPolicy(CL_Layer *layer);
-
-#ifdef JAVA
-/* Java Applet layer code */
-extern void LO_SetJavaAppTransparent(LO_JavaAppStruct *javaData);
-#endif
-
-extern void LO_SetEmbedType(LO_EmbedStruct *embed, PRBool is_windowed);
-extern void LO_SetEmbedSize( MWContext *context, LO_EmbedStruct *embed, int32 width, int32 height );
-
-extern char* LO_GetBuiltInAttribute (LO_BuiltinStruct *pBuiltin_struct, 
-                                     char* att);
-
-#ifdef JAVA
-extern void LO_SetJavaAppTransparent(LO_JavaAppStruct *javaData);
-#endif
-
-extern void *LO_GetLayerMochaObjectFromId(MWContext *context, int32 layer_id);
-extern void *LO_GetLayerMochaObjectFromLayer(MWContext *context, 
-                                             CL_Layer *layer);
-extern void LO_SetLayerMochaObject(MWContext *context, int32 layer_id, 
-                                   void *mocha_object);
-extern CL_Layer *LO_GetLayerFromId(MWContext *context, int32 layer_id);
-extern int32 LO_GetIdFromLayer(MWContext *context, CL_Layer *layer);
-extern int32 LO_GetNumberOfLayers(MWContext *context);
-#endif
-extern NET_ReloadMethod LO_GetReloadMethod(MWContext *context);
-
-extern LO_Element *LO_XYToElement(MWContext *, int32, int32);
-extern LO_Element *LO_XYToNearestElement(MWContext *, int32, int32);
-
-extern void LO_MoveGridEdge(MWContext *context, LO_EdgeStruct *edge,
-	int32 x, int32 y);
-extern void LO_SetImageInfo(MWContext *context, int32 ele_id,
-	int32 width, int32 height);
-extern void LO_SetForceLoadImage(char *url, XP_Bool all_images);
-extern void LO_SetUserOverride(Bool override);
-extern void LO_SetDefaultBackdrop(char *url);
-extern void LO_SetDefaultColor(intn type, uint8 red, uint8 green, uint8 blue);
-extern Bool LO_ParseRGB(char *rgb, uint8 *red, uint8 *green, uint8 *blue);
-extern Bool LO_ParseStyleSheetRGB(char *rgb, uint8 *red, uint8 *green, uint8 *blue);
-extern void LO_ClearBackdropBlock(MWContext *context,
-	LO_ImageStruct *image, Bool fg_ok);
-extern void LO_ClearEmbedBlock(MWContext *context, LO_EmbedStruct *embed);
-extern Bool LO_BlockedOnImage(MWContext *, LO_ImageStruct *image);
-extern void LO_CloseAllTags(MWContext *);
-extern void LO_DiscardDocument(MWContext *);
-extern LO_FormSubmitData *LO_SubmitForm(MWContext *context,
-	LO_FormElementStruct *form_element);
-extern LO_FormSubmitData *LO_SubmitImageForm(MWContext *context,
-	LO_ImageStruct *image, int32 x, int32 y);
-extern void LO_ResetForm(MWContext *context,
-	LO_FormElementStruct *form_element);
-extern LO_FormElementStruct *
-LO_FormRadioSet(MWContext *context, LO_FormElementStruct *form_element);
-extern void LO_SaveFormData(MWContext *context);
-extern void LO_CloneFormData(SHIST_SavedData *, MWContext *context,
-	URL_Struct *url_struct);
-extern void LO_HighlightAnchor(MWContext *context, LO_Element *element,Bool on);
-#ifdef OLD_POS_HIST
-extern void LO_SetDocumentPosition(MWContext *context, int32 x, int32 y);
-#endif /* OLD_POS_HIST */
-extern void LO_SetDocumentDimensions(MWContext *context,
-                                     int32 width, int32 height);
-extern void LO_StartSelection(MWContext *context, int32 x, int32 y);
-
-typedef enum {
-	SMALL_BM_ICON,
-	LARGE_BM_ICON
-} BMIconType;
-
-extern char * LO_GetBookmarkIconURLForPage(MWContext *context, BMIconType type);
-
-/* Re-layout layout elements on resize without destroying them and reloading page
-   from scratch */
-extern void LO_RelayoutOnResize(MWContext *context, int32 width, int32 height, int32 leftMargin, int32 topMargin);
-/* Re-layout layout elements when one changes size. */
-extern void LO_RelayoutFromElement(MWContext *context, LO_Element *element);
-
-extern void LO_ExtendSelection(MWContext *context, int32 x, int32 y);
-extern void LO_EndSelection(MWContext *context);
-extern void LO_ClearSelection(MWContext *context);
-extern XP_Block LO_GetSelectionText(MWContext *context);
-extern Bool LO_FindText(MWContext *context, char *text,
-        LO_Element **start_ele_loc, int32 *start_position,
-        LO_Element **end_ele_loc, int32 *end_position,
-        Bool use_case, Bool forward);
-extern Bool LO_FindGridText(MWContext *context, MWContext **ret_context,
-	char *text,
-        LO_Element **start_ele_loc, int32 *start_position,
-        LO_Element **end_ele_loc, int32 *end_position,
-        Bool use_case, Bool forward);
-extern Bool LO_SelectAll(MWContext *context);
-extern void LO_SelectText(MWContext *context, LO_Element *start,int32 start_pos,
-        LO_Element *end, int32 end_pos, int32 *x, int32 *y);
-extern void LO_RefreshAnchors(MWContext *context);
-extern Bool LO_HaveSelection(MWContext *context);
-extern void LO_GetSelectionEndpoints(MWContext *context,
-	LO_Element **start, LO_Element **end, int32 *start_pos, int32 *end_pos, void **sel_layer);
-extern void LO_FreeSubmitData(LO_FormSubmitData *submit_data);
-extern void LO_FreeDocumentFormListData(MWContext *context, void *form_data);
-extern void LO_FreeDocumentEmbedListData(MWContext *context, void *embed_data);
-extern void LO_FreeDocumentGridData(MWContext *context, void *grid_data);
-extern void LO_FreeDocumentAppletData(MWContext *context, void *applet_data);
-extern void LO_RedoFormElements(MWContext *context);
-extern void LO_InvalidateFontData(MWContext *context);
-extern void LO_GetDocumentMargins(MWContext *context,
-	int32 *margin_width, int32 *margin_height);
-extern Bool LO_HasBGImage(MWContext *context);
-extern Bool LO_LocateNamedAnchor(MWContext *context, URL_Struct *url_struct,
-	int32 *xpos, int32 *ypos);
-extern int32 LO_EmptyRecyclingBin(MWContext *context);
-extern LO_AnchorData *LO_MapXYToAreaAnchor(MWContext *context,
-	LO_ImageStruct *image, int32 x, int32 y);
-extern intn LO_DocumentInfo(MWContext *context, NET_StreamClass *stream);
-extern intn LO_ChangeFontSize(intn size, char *size_str);
-extern double LO_GetScalingFactor(int32 scaler);
-extern int16 LO_WindowWidthInFixedChars(MWContext *context);
-extern void LO_CleanupGridHistory(MWContext *context);
-extern void LO_UpdateGridHistory(MWContext *context);
-extern Bool LO_BackInGrid(MWContext *context);
-extern Bool LO_ForwardInGrid(MWContext *context);
-extern Bool LO_GridCanGoForward(MWContext *context);
-extern Bool LO_GridCanGoBackward(MWContext *context);
-
-#if defined(SingleSignon)
-extern void SI_RestoreSignonData
-    (char* URLName, char* name, char** value);
-extern void SI_RememberSignonData
-    (char* URLName, char** name_array, char** value_array, char** type_array, PRInt32 value_cnt);
-extern void SI_RememberSignonDataFromBrowser
-    (char* URLName, char* username, char* password);
-extern void SI_RestoreOldSignonDataFromBrowser
-    (MWContext *context, char* URLName, Bool pickFirstUser,
-    char** username, char** password);
-extern int SI_LoadSignonData(char *filename);
-extern int SI_SaveSignonData(char *filename);
-extern void SI_RemoveAllSignonData();
-extern Bool SI_RemoveUser(char *URLName, char *userName, Bool save);
-extern int SI_PromptUsernameAndPassword
-    (MWContext *context, char *buf,
-    char **username, char **password, char *URLName);
-extern char *SI_PromptPassword
-    (MWContext *context, char *prompt, char *URLName, Bool pickFirstUser);
-extern char * SI_Prompt
-    (MWContext *context, char *prompt, char* defaultUsername, char *URLName);
-extern void SI_AnonymizeSignons();
-extern void SI_UnanonymizeSignons();
-extern void SI_StartOfForm();
-#endif
-
-extern Bool LO_Click( MWContext *context, int32 x, int32 y, Bool requireCaret );
-extern void LO_Hit(MWContext *context, int32 x, int32 y,
-	Bool requireCaret, LO_HitResult *result);
-/* Similar to lo_Click, but doesn't process click
-   Returns TRUE if line would be selected if user clicked here
-   We only use this in Editor, so we can assume "layer" is NULL
-*/
-Bool LO_CanSelectLine(MWContext *context, int32 x, int32 y);
-
-extern int32 LO_TextElementWidth(MWContext *context, LO_TextStruct *text_ele, int charOffset);
-
-extern void LO_AddEmbedData(MWContext* context, LO_EmbedStruct* embed, void* data);
-extern void LO_CopySavedEmbedData(MWContext* context, SHIST_SavedData* newdata);
-extern NET_StreamClass* LO_NewObjectStream(FO_Present_Types format_out, void* type,
-				   						   URL_Struct* urls, MWContext* context);
-
-extern void LO_CreateReblockTag(MWContext* context, LO_Element* element);
-extern void LO_LockLayout(void);
-extern void LO_UnlockLayout(void);
-extern Bool LO_VerifyUnlockedLayout();
-extern void LO_NetlibComplete(MWContext * context);
-
-extern void LO_UpdateTextData(lo_FormElementTextData * textData, const char * text);
-
-#ifdef EDITOR
-
-/* --------------------------------------------------------------------------
- * Layout stuff specific to the editor
- */
-
-
-extern void LO_PositionCaret( MWContext *context, int32 x, int32 y );
-extern void LO_DoubleClick( MWContext *context, int32 x, int32 y );
-
-void LO_PositionCaretBounded(MWContext *context, int32 x, int32 y,
-			int32 minY, int32 maxY );
-
-extern ED_Buffer* LO_GetEDBuffer( MWContext *context);
-extern void LO_GetEffectiveCoordinates( MWContext *pContext, LO_Element *pElement, int32 position,
-     int32* pX, int32* pY, int32* pWidth, int32* pHeight );
-extern void LO_UpDown( MWContext *pContext, LO_Element *pElement, int32 position, int32 iDesiredX, Bool bSelect, Bool bForward );
-extern Bool LO_PreviousPosition( MWContext *pContext,LO_Element *pElement, intn iOffset, 
-			ED_Element **ppEdElement, intn* pOffset);
-extern Bool LO_NextPosition( MWContext *pContext,LO_Element *pElement, intn iOffset, 
-			ED_Element **ppEdElement, intn* pOffset);
-extern Bool LO_NavigateChunk( MWContext *pContext, intn chunkType, Bool bSelect, Bool bForward );
-extern Bool LO_ComputeNewPosition( MWContext *context, intn chunkType,
-    Bool bSelect, Bool bDeselecting, Bool bForward,
-    LO_Element** pElement, int32* pPosition );
-
-extern LO_Element* LO_BeginOfLine( MWContext *pContext, LO_Element *pElement );
-extern LO_Element* LO_EndOfLine( MWContext *pContext, LO_Element *pElement);
-extern LO_Element* LO_FirstElementOnLine( MWContext *pContext,
-	int32 x, int32 y, int32 *pLineNum);
-extern void LO_StartSelectionFromElement( MWContext *context, LO_Element *eptr, 
-            int32 new_pos );
-extern void LO_ExtendSelectionFromElement( MWContext *context, LO_Element *eptr, 
-            int32 position, Bool bFromStart );
-extern Bool LO_SelectElement( MWContext *context, LO_Element *eptr, 
-	int32 position, Bool bFromStart );
-extern void LO_SelectRegion( MWContext *context, LO_Element *begin,
-	int32 beginPosition, LO_Element *end, int32 endPosition,
-	Bool fromStart, Bool forward  );
-extern Bool LO_IsSelected( MWContext *context );
-extern Bool LO_IsSelectionStarted( MWContext *context );
-extern void LO_GetSelectionEndPoints( MWContext *context, 
-	LO_Element **ppStart, intn *pStartOffset, LO_Element **ppEnd, 
-	intn *pEndOffset, Bool *pbFromStart, Bool *pbSingleElementSelection );
-extern void LO_GetSelectionNewPoint( MWContext *context, 
-	LO_Element **ppNew, intn *pNewOffset);
-extern LO_Element* LO_PreviousEditableElement( LO_Element *pElement );
-extern LO_Element* LO_NextEditableElement( LO_Element *pElement );
-extern LO_ImageStruct* LO_NewImageElement( MWContext* context );
-extern void LO_SetBackgroundImage( MWContext *context, char *pUrl );
-extern void LO_RefetchWindowDimensions( MWContext *pContext );
-extern void LO_Relayout( MWContext *context, ED_TagCursor *pCursor,
-	int32 iLine, int iStartEditOffset, XP_Bool bDisplayTables );
-
-#endif /*EDITOR*/
-
-extern void LO_SetBaseURL( MWContext *pContext, char *pURL );
-extern char* LO_GetBaseURL( MWContext *pContext );
-
-#if 0
-extern Bool LO_Click( MWContext *context, int32 x, int32 y, Bool requireCaret );
-extern void LO_Hit(MWContext *context, int32 x, int32 y, Bool requireCaret, LO_HitResult *result);
-#endif
-
-extern void LO_SelectObject( MWContext *context, int32 x, int32 y );
-
-#ifdef XP_UNIX
-extern void LO_DisplayFormElement(LO_FormElementStruct *form);
-#endif /* XP_UNIX */
-
-/* Allows front ends to test for empty cell.
- * Used in Composer to display "zero width border"
- * in cells that layout would normally not display
-*/
-XP_Bool LO_IsEmptyCell(LO_CellStruct *cell);
-
-Bool LO_LayingOut(MWContext * context);
-
-
-#ifdef DOM
-/* Returns true if the layout element is enclosed
-   in <SPAN> </SPAN> */
-Bool LO_IsWithinSpan( LO_Element *ele );
-#endif
-
-/*
- * This is probably the wrong place to add this, but tough,
- * this stuff shouldn't have to exist anyways.
- */
-extern void XP_InitializeContext(MWContext *context);
-extern MWContext *XP_NewContext(void);
-extern void XP_DeleteContext(MWContext *context);
-extern XP_List *XP_GetGlobalContextList(void);
-extern void XP_AddContextToList(MWContext *context);
-extern Bool XP_IsContextInList(MWContext *context);
-extern void XP_RemoveContextFromList(MWContext *context);
-extern MWContext *XP_GetNonGridContext(MWContext *context);
-extern Bool		  XP_IsChildContext(MWContext* parent,  MWContext* child);
-
-extern MWContext *XP_FindNamedContextInList(MWContext * context, char *name);
-extern MWContext *XP_FindContextOfType(MWContext *, MWContextType);
-extern MWContext *XP_FindSomeContext(void);
-extern Bool XP_FindNamedAnchor(MWContext * context, URL_Struct * url, 
-			       int32 *xpos, int32 *ypos);
-extern void XP_RefreshAnchors(void);
-extern void XP_InterruptContext(MWContext * context);
-extern Bool XP_IsContextBusy(MWContext * context);
-extern Bool XP_IsContextStoppable(MWContext * context);
-extern void XP_UpdateParentContext(MWContext * context);
-extern int XP_GetSecurityStatus(MWContext *pContext);
-extern int XP_ContextCount(MWContextType cxType, XP_Bool bTopLevel);
-
-extern char *XP_PromptPassword(MWContext *pContext, const char *pMessage);
-extern char *XP_Prompt(MWContext *pContext, const char *pMessage, const char * pDef);
-extern PRBool XP_PromptUsernameAndPassword (MWContext * window_id,
-					  const char *  message,
-					  char **       username,
-					  char **       password);
-extern PRBool XP_Confirm( MWContext * c, const char * msg);
-
-XP_END_PROTOS
-
-# endif /* _PROTO_H_ */
diff --git a/include/structs.h b/include/structs.h
index 0939da00472..e69de29bb2d 100644
--- a/include/structs.h
+++ b/include/structs.h
@@ -1,482 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-
-/*
- * This file is included by client.h
- *
- * It can be included by hand after mcom.h
- *
- * All intermodule data structures (i.e. MWContext, etc) should be included
- *  in this file
- */
-#ifndef _STRUCTS_H_
-#define _STRUCTS_H_
-
-#include "ntypes.h"
-#include "xp_mcom.h"
-
-#include "il_types.h"
-#include "lo_ele.h"
-#include "shistele.h"
-#include "edttypes.h"
-
-#ifdef JAVA
-#include "prlong.h"
-#include "prclist.h"
-#endif /* JAVA */
-
-/* ------------------------------------------------------------------------ */
-/* ============= Typedefs for the global context structure ================ */
-
-/* will come out of the ctxtfunc.h file eventually
- */
-typedef struct _ContextFuncs ContextFuncs;
-/*
- *   This stuff is front end specific.  Add whatever you need.
- */
-#if defined(OSF1) && defined(__cplusplus)
-    struct fe_ContextData;
-#endif
-
-#if defined(XP_MAC) && defined(__cplusplus)
-class NetscapeContext;
-class CHyperView;
-
-class CNSContext;
-class CHTMLView;
-#endif
-
-#if ( defined(XP_WIN) || defined(XP_OS2) ) && defined(__cplusplus)
-class CAbstractCX;
-class CEditView;
-class CSaveProgress;
-#endif
-
-typedef struct FEstruct_ {
-#ifndef MOZILLA_CLIENT
-	void * generic_data;
-#elif defined(XP_WIN) || defined(XP_OS2)
-#ifdef __cplusplus
-    	CAbstractCX *cx;
-#else
-	void *cx;
-#endif
-#elif defined(XP_TEXT)
-	int doc_cols;
-	int doc_lines;
-	int cur_top_line;
-	int num_anchors;
-	int cur_anchor;
-
-#elif defined(XP_UNIX)
-    struct fe_ContextData *data;
-#elif defined(XP_MAC)
-#ifdef __cplusplus
-    class NetscapeContext*		realContext;
-    class CHyperView*		view;
-    
-    class CNSContext*		newContext;
-    class CHTMLView*		newView;
-#else
-	void*					realContext;
-	void*					view;
-
-	void*					newContext;
-	void*					newView;	
-#endif
-
-/*
-** These members are only used by the EDITOR... However, if they
-** are removed for non-editor builds the MWContext structure
-** becomes skewed for java (and the rest of DIST)...
-*/
-#ifdef __cplusplus
-    class CEditView*		editview;
-    class CSaveProgress*	savedialog;
-#else
-	void*					editview;
-	void*					savedialog;
-#endif
-
-#endif
-#ifdef MOZILLA_CLIENT
-  void*  webWidget; /* Really a nsIWebWidget */
-#endif
-} FEstruct;
-
-#define FEUNITS_X(x,context)   ((int32) ((MWContext *)context)->convertPixX * (x))
-#define FEUNITS_Y(y,context)   ((int32) ((MWContext *)context)->convertPixY * (y))
-
-struct MessageCopyInfo;
-
-/*
-    This is a generic context structure.  There should be one context
-    per document window.  The context will allow assorted modules to
-    pull out things like the URL of the current document as well as
-    giving them a place to hand their window specific stuff.
-
-*/
-
-#if defined (OSF1)
-/* Forward declaration to make compiler happy on OSF1 */
-struct MSG_SearchFrame;
-#ifdef XP_CPLUSPLUS
-class MSG_IMAPFolderInfoMail;
-class MSG_Master;
-class MSG_Pane;
-class TImapServerState; 
-#endif
-#endif
-
-
-#if defined(__cplusplus)
-class nsITransferListener;
-#endif
-
-struct MWContext_ {
-    MWContextType type;
-
-    char       *url;   /* URL of current document */
-    char       * name;	/* name of this context */
-    History      hist;  /* Info needed for the window history module */
-    FEstruct     fe;    /* Front end specific stuff */
-    PRPackedBool          fancyFTP;  /* use fancy ftp ? */
-    PRPackedBool          fancyNews; /* use fancy news ? */
-    PRPackedBool          intrupt;   /* the user just interrupted things */
-    PRPackedBool          graphProgress; /* should the user get visual feedback */
-    PRPackedBool          waitingMode;  /* Has a transfer been initiated?  Once a */
-                 /* transfer is started, the user cannot select another */
-                 /* anchor until either the transfer is aborted, has */
-                 /* started to layout, or has been recognized as a */
-                 /* separate document handled through an external stream/viewer */
-    PRPackedBool          reSize;   /* the user wants to resize the window once the */
-                 /* current transfer is over */
-    int          fileSort;  /* file sorting method */
-    char       * save_as_name;	/* name to save current file as */
-    char       * title;		/* title (if supplied) of current document */
-    Bool       is_grid_cell;	/* Is this a grid cell */
-    struct MWContext_ *grid_parent;	/* pointer to parent of grid cell */
-    XP_List *	 grid_children;	/* grid children of this context */
-    int      convertPixX;	/* convert from pixels to fe-specific coords */
-    int      convertPixY;	/* convert from pixels to fe-specific coords */
-    ContextFuncs * funcs;       /* function table of display routines */
-    PrintSetup	*prSetup;	/* Info about print job */
-    PrintInfo	*prInfo;	/* State information for printing process */
-
-    /* XXXM12N Stuff for the new, modular Image Library. *********************/
-    IL_GroupContext *img_cx;    /* Created by Front Ends.  Passed into Image
-                                   Library function calls.  */
-    IL_ColorSpace *color_space;  /* Colorspace information for images.  This
-                                    should become a part of the FE's display
-                                    context when MWContext goes away. */
-    IL_IRGB *transparent_pixel; /* Background color to be passed into
-                                   IL_GetImage.  Set by Front Ends (?) */
-    /*************************************************************************/
-
-	int32		images;			/* # of distinct images on this page */
-
-	/* ! do not use these !  */
-	/* ! these are going away soon ! */
-	/* instead see intl_csi.h for the i18n accessor functions */
-	int16		do_not_use_win_csid;	/* code set ID of current window	*/
-	int16		do_not_use_doc_csid;	/* code set ID of current document	*/
-	int16		do_not_use_relayout;	/* tell conversion to treat relayout case */
-	char		*do_not_use_mime_charset;	/* MIME charset from URL			*/
-
-    struct MSG_CompositionFrame *msg_cframe; /* ditto. */
-	struct MSG_SearchFrame *msg_searchFrame; /*state for search, for search contexts*/
-	struct MSG_BiffFrame *biff_frame; /* Biff info for this context, if any. */
-    struct BM_Frame *bmframe; /* Bookmarks info for this context, if any. */
-    
-    /* for now, add IMAP mail stuff here */
-#ifdef XP_CPLUSPLUS
-	class MSG_IMAPFolderInfoMail  *currentIMAPfolder;
-	class MSG_Pane				  *imapURLPane;		/* used when updated folders */
-    class MSG_Master              *mailMaster;
-    class TNavigatorImapConnection   *imapConnection; 
-#else
-	struct MSG_IMAPFolderInfoMail *currentIMAPfolder;
-	struct MSG_Pane				  *imapURLPane;		/* used when updated folders */
-    struct MSG_Master	 		  *mailMaster;
-    struct TNavigatorImapConnection *imapConnection; 
-#endif    
-
-	/* for now, add message copy info stuff here */
-	struct MessageCopyInfo		  *msgCopyInfo;
-
-	NPEmbeddedApp *pluginList;	/* plugins on this page */
-	void *pluginReconnect; /* yet another full screen hack */
-
-    struct MimeDisplayData *mime_data;	/* opaque data used by MIME message
-										   parser (not Mail/News specific,
-										   since MIME objects can show up
-										   in Browser windows too.) */
-										/* Also overloaded by progress module to hold private crap! */
-
-
-    struct JSContext *mocha_context;	/* opaque handle to Mocha state */
-    uint32  event_bit;			/* sum of all event capturing objects */
-    XP_Bool js_drag_enabled;		/* indicates JS drag enabled */
-    int8 js_dragging;			/* indicates which button has JS drag in process */
-    XP_List * js_dependent_list;	/* lifetime-linked children of this context */
-    MWContext *js_parent;
-    int32 js_timeouts_pending;          /* Number of pending JavaScript timeouts */
-
-
-    XP_Bool restricted_target;			/* TRUE if window is off-limits for opening links into 
-						from mail or other window-grabbing functions.*/
-
-	NPEmbeddedApp *pEmbeddedApp; /* yet another full screen hack */
-	char * defaultStatus;		/* What string to show in the status area
-								   whenever there's nothing better to show.
-								   FE's should implement FE_Progress so that
-								   if it is passed NULL or "" it will instead
-								   display this string.  libmsg changes this
-								   string all the time for mail and news
-								   contexts. */
-	int32      doc_id;			/* unique identifier for generated documents */
-	int32      context_id;			/* unique identifier for context */
-
-  	void       *pHelpInfo;		/* pointer to additional help information;
-  								   see ns/lib/libnet/mkhelp.c [EA] */
-	
-#ifdef JAVA
-	/* See ns/sun-java/netscape/net/netStubs.c for the next 2 items: */
-
-	/*
-    ** This mysterious list is used in two ways: (1) If you're a real
-    ** window context, it's a list of all dummy java contexts that were
-    ** created for java's network connections. (2) If you're a dummy java
-    ** context, it's where you're linked into the list of connections for
-    ** the real context:
-    */
-	PRCList		javaContexts;
-
-	/*
-    ** Second, if you're a dummy java context, you'll need a pointer to
-    ** the stream data so that you can shut down the netlib connection:
-    */
-	struct nsn_JavaStreamData*	javaContextStreamData;
-
-	/*
-    ** Stuff for GraphProgress. See lj_embed.c
-    */
-	Bool		displayingMeteors;
-	int64		timeOfFirstMeteorShower;
-	int16		numberOfSimultaneousShowers;
-
-#endif /* JAVA */
-
-	/*
-    ** Put the editor stuff at the end so that people can still use the
-    ** the Java DLL from the 2.0 dist build with Navigator Gold.
-    */
-    PRPackedBool is_editor;       /* differentiates between Editor and Browser modes */
-    PRPackedBool is_new_document; /* quick access to new doc state (unsaved-no file yet)*/
-    PRPackedBool display_paragraph_marks; /* True if we should display paragraph and hard-return symbols. */
-    PRPackedBool display_table_borders; /* True if we should display dotted lines around tables with invisible borders. */
-    PRPackedBool edit_view_source_hack;
-    PRPackedBool edit_loading_url;  /* Hack to let us run the net while in a modal dialog */
-    PRPackedBool edit_saving_url;   /*  " */
-	PRPackedBool edit_has_backup;   /* Editor has made a session backup */
-	PRPackedBool bIsComposeWindow;  /* Editor is a compose window */
-
-	/*
-	 * Webfonts that were loaded by this context
-	 */
-	void *webfontsList;
-
-	/* web font stuff */
-	/* On Windows,  they are initialized to 0 in cxdc.cpp	*/
-	int16		WebFontDownLoadCount;	/* # of download for this doc( one download can have multiple fonts) */
-	int16		MissedFontFace;			/* have we missed any font? */
-
-	/*  number of pixels per point-size */
-	double      XpixelsPerPoint;
-	double		YpixelsPerPoint;
-    
-    Bool bJavaScriptCalling;
-	/* Allow JavaScript in certain internally generated contexts even
-	 * when the "enable javascript" pref is turned off.
-	 * This flag will also be inherited by child grid cells.
-	 */
-	PRPackedBool forceJSEnabled;
-
-	/* For increase and decrease font */
-	double		fontScalingPercentage;
-
-    int INTL_tag;     /* used to tell that we have a valid INTL_CSIInfo */
-    INTL_CharSetInfo INTL_CSIInfo; /* new home of private i18n data */
-
-    /* the current tab focused data */
-    LO_TabFocusData *tab_focus_data;
-
-    void *ncast_channel_context;
-  /* if the window is displaying an XML file, keep a pointer to the XML file structure here */
-    void*   xmlfile;
-    Bool anonymous;
-    URL_Struct*   modular_data;
-    PRInt32       ref_count;
-
-    /* This gets set to `true' when layout encounters an image with no
-       width or height: layout will proceed to place the image, but
-       the FE will have to do a reflow once all the netlib connections
-       terminate for the page to be correctly displayed. The idea is
-       to get visible content to the user ASAP, even if it means that
-       stuff looks funny for a couple seconds. */
-    PRPackedBool  requires_reflow;
-
-#if defined(__cplusplus)
-    nsITransferListener* progressManager;
-#else
-    void* progressManager;
-#endif /* __cplusplus */
-};
-
-
-/* This tells libmime.a whether it has the mime_data slot in MWContext
-   (which should always be true eventually, but having this #define here
-   makes life easier for me today.)  -- jwz */
-#define HAVE_MIME_DATA_SLOT
-
-
-/* this is avialible even in non GOLD builds. */
-#define EDT_IS_EDITOR(context)       (context != NULL && context->is_editor)
-#define EDT_DISPLAY_PARAGRAPH_MARKS(context) (context && context->is_editor && context->display_paragraph_marks)
-#define EDT_DISPLAY_TABLE_BORDERS(context) (context && context->is_editor && context->display_table_borders)
-#define EDT_RELAYOUT_FLAG (0x2)
-#define EDT_IN_RELAYOUT(context)       (context != NULL && ((context->is_editor & EDT_RELAYOUT_FLAG) != 0))
-
-#ifdef JAVA
-
-/*
-** This macro is used to recover the MWContext* from the javaContexts
-** list pointer:
-*/
-#define MWCONTEXT_PTR(context) \
-    ((MWContext*) ((char*) (context) - offsetof(MWContext,javaContexts)))
-
-#endif /* JAVA */
-
-/* ------------------------------------------------------------------------ */
-/* ====================== NASTY UGLY SHORT TERM HACKS ===================== */
-
-#define XP_CONTEXTID(ctxt)		((ctxt)->context_id)
-#define XP_DOCID(ctxt)			((ctxt)->doc_id)
-#define XP_SET_DOCID(ctxt, id)	((ctxt)->doc_id = (id))
-
-/* ------------------------------------------------------------------------ */
-/* ============= Typedefs for the parser module structures ================ */
-
-/*
- * I *think* (but am unsure) that these should be forked off into a
- *   parser specific client level include file
- *
- */
-
-typedef int8 TagType;
-
-struct PA_Tag_struct {
-    TagType type;
-    PRPackedBool is_end;
-    uint16 newline_count;
-#if defined(XP_WIN) || defined(XP_OS2)
-    union {                 /* use an anonymous union for debugging purposes*/
-    	PA_Block data;
-        char* data_str;
-    };
-#else
-    PA_Block data;
-#endif
-    int32 data_len;
-    int32 true_len;
-    void *lo_data;
-    struct PA_Tag_struct *next;
-    ED_Element *edit_element;
-};
-
-typedef struct _TagList {
-	PA_Tag *tagList; 
-    PA_Tag *lastTag; 
-} TagList;
-
-#define PA_HAS_PDATA( tag ) (tag->pVoid != 0 )
-
-#ifdef XP_UNIX
-typedef    char *PAAllocate (intn byte_cnt);
-typedef    void  PAFree (char *ptr);
-#else
-typedef    void *PAAllocate (unsigned int byte_cnt);
-typedef    void  PAFree (void *ptr);
-#endif
-typedef    intn  PA_OutputFunction (void *data_object, PA_Tag *tags, intn status);
-
-struct _PA_Functions {
-    PAAllocate  *mem_allocate;
-    PAFree      *mem_free;
-    PA_OutputFunction   *PA_ParsedTag;
-};
-
-typedef struct PA_InitData_struct {
-    PA_OutputFunction   *output_func;
-} PA_InitData;
-
-/* Structure that defines the characteristics of a new window.
- * Each entry should be structured so that 0 should be the
- * default normal value.  Currently all 0 values
- * bring up a chromeless MWContextBrowser type window of
- * arbitrary size.
- */
-struct _Chrome {
-    MWContextType type;			/* Must be set to the correct type you want,
-								 * if doesn't exist, define one!!!
-								 */
-	Bool show_button_bar;        /* TRUE to display button bar */
-	Bool show_url_bar;           /* TRUE to show URL entry area */
- 	Bool show_directory_buttons; /* TRUE to show directory buttons */
-	Bool show_bottom_status_bar; /* TRUE to show bottom status bar */
-	Bool show_menu;				 /* TRUE to show menu bar */
-	Bool show_security_bar;		 /* TRUE to show security bar */
-	Bool hide_title_bar;		 /* TRUE to hide title bar and window controls */
-	int32 w_hint, h_hint;		 /* hints for width and height */
-	int32 outw_hint, outh_hint;	 /* hints for outer window width and height */
-	int32 l_hint, t_hint;		 /* hints for left and top window positioning */
-	Bool topmost;				 /* TRUE for window alwaysOnTop */
-	Bool bottommost;			 /* TRUE for 'desktop' window */
-	Bool z_lock;				 /* TRUE for window which cannot move within z-order */
-	Bool is_modal;				 /* TRUE to make window be modal */
-	Bool show_scrollbar;		 /* TRUE to show scrollbars on window */
-	Bool location_is_chrome;	 /* TRUE if top or left is specified */
-	Bool allow_resize;			 /* TRUE to allow resize of windows */
-	Bool allow_close;			 /* TRUE to allow window to be closed */
-	Bool copy_history;			 /* TRUE to copy history of prototype context*/
-	Bool dependent;				 /* TRUE if this window is to be closed with its parent*/
-	Bool disable_commands;			/* TRUE if user has set hot-keys / menus off */
-	Bool restricted_target;			/* TRUE if window is off-limits for opening links into 
-						    from mail or other window-grabbing functions.*/
-	void (* close_callback)(void *close_arg); /* called on window close */
-	void *close_arg;			 /* passed to close_callback */
-};
-
-
-#endif /* _STRUCTS_H_ */
diff --git a/mailnews/addrbook/src/nsDirPrefs.cpp b/mailnews/addrbook/src/nsDirPrefs.cpp
index 2d7cbc6de2b..425f6b167fa 100644
--- a/mailnews/addrbook/src/nsDirPrefs.cpp
+++ b/mailnews/addrbook/src/nsDirPrefs.cpp
@@ -2838,7 +2838,8 @@ char * dir_ConvertDescriptionToPrefName(DIR_Server * server)
 		numSrcBytes = PL_strlen(descr);
 		while (srcIndex < numSrcBytes && destIndex < MAX_PREF_NAME_SIZE-1)
 		{
-			if (XP_IS_DIGIT(descr[srcIndex]) ||XP_IS_ALPHA(descr[srcIndex]) )
+			if (isascii(descr[srcIndex]) &&
+                (isdigit(descr[srcIndex]) || isalpha(descr[srcIndex]) ))
 			{
 				fileNameBuf[destIndex] = descr[srcIndex];
 				destIndex++;
@@ -4505,10 +4506,10 @@ char *DIR_Unescape (const char *src, PRBool makeHtml)
 				 */
 				PRBool didEscape = PR_FALSE;
 				char c1 = *(tmpSrc + 1);
-				if (c1 && (XP_IS_DIGIT(c1) || XP_IS_ALPHA(c1)))
+				if (c1 && isascii(c1) && (isdigit(c1) || isalpha(c1)))
 				{
 					char c2 = *(tmpSrc + 2);
-					if (c2 && (XP_IS_DIGIT(c2) || XP_IS_ALPHA(c2)))
+					if (c2 && isascii(c2) && (isdigit(c2) || isalpha(c2)))
 					{
 						*tmpDst++ = (UNHEX(c1) << 4) | UNHEX(c2);
 						tmpSrc +=2;
diff --git a/mailnews/db/msgdb/public/nsImapMailDatabase.h b/mailnews/db/msgdb/public/nsImapMailDatabase.h
index 33ba0fc458e..4d0b60c2721 100644
--- a/mailnews/db/msgdb/public/nsImapMailDatabase.h
+++ b/mailnews/db/msgdb/public/nsImapMailDatabase.h
@@ -37,7 +37,7 @@ public:
 
   NS_IMETHOD    StartBatch();
   NS_IMETHOD    EndBatch();
-	NS_IMETHOD    SetSummaryValid(PRBool valid = TRUE);
+	NS_IMETHOD    SetSummaryValid(PRBool valid = PR_TRUE);
   NS_IMETHOD    DeleteMessages(nsMsgKeyArray* nsMsgKeys, nsIDBChangeListener *instigator);
 	
 protected:
diff --git a/mailnews/db/msgdb/src/nsDBFolderInfo.cpp b/mailnews/db/msgdb/src/nsDBFolderInfo.cpp
index 10ab651b7cb..5294d5d744d 100644
--- a/mailnews/db/msgdb/src/nsDBFolderInfo.cpp
+++ b/mailnews/db/msgdb/src/nsDBFolderInfo.cpp
@@ -122,7 +122,7 @@ nsDBFolderInfo::nsDBFolderInfo(nsMsgDatabase *mdb)
 	m_totalPendingMessages =0;
 	m_unreadPendingMessages = 0;
 
-	m_mdbTokensInitialized = FALSE;
+	m_mdbTokensInitialized = PR_FALSE;
 
 	// Initialize a default charset to a pref default.
 	nsresult rv;
@@ -610,12 +610,12 @@ nsDBFolderInfo::GetCharacterSet2(nsString *result, PRBool *usedDefault)
 {
 	nsresult rv = GetProperty(kCharacterSetColumnName, result);
 	
-	*usedDefault = FALSE;
+	*usedDefault = PR_FALSE;
 
 	if (NS_SUCCEEDED(rv) && result->IsEmpty())
 	{
 		result->Assign(gDefaultCharacterSet.GetUnicode());
-		*usedDefault = TRUE;
+		*usedDefault = PR_TRUE;
 	}
 
 	return rv;
diff --git a/mailnews/db/msgdb/src/nsMsgDatabase.cpp b/mailnews/db/msgdb/src/nsMsgDatabase.cpp
index c1117c07622..f377384fb5f 100644
--- a/mailnews/db/msgdb/src/nsMsgDatabase.cpp
+++ b/mailnews/db/msgdb/src/nsMsgDatabase.cpp
@@ -808,7 +808,7 @@ void nsMsgDatabase::UnixToNative(char*& ioPath)
 
 NS_IMETHODIMP nsMsgDatabase::Open(nsIFileSpec *folderName, PRBool create, PRBool upgrading, nsIMsgDatabase** pMessageDB)
 {
-	NS_ASSERTION(FALSE, "must override");
+	NS_ASSERTION(PR_FALSE, "must override");
 	return NS_ERROR_NOT_IMPLEMENTED;
 }
 
@@ -1408,7 +1408,7 @@ nsMsgDatabase::UndoDelete(nsIMsgDBHdr *msgHdr)
 {
     if (msgHdr)
     {
-        SetHdrFlag(msgHdr, FALSE, MSG_FLAG_EXPUNGED);
+        SetHdrFlag(msgHdr, PR_FALSE, MSG_FLAG_EXPUNGED);
         // ** do we need to update folder info regarding the message size
     }
     return NS_OK;
@@ -3051,7 +3051,7 @@ nsresult nsMsgDatabase::ThreadNewHdr(nsMsgHdr* newHdr, PRBool &newThread)
 		{
 			thread->GetThreadKey(&threadId);
 			newHdr->SetThreadId(threadId);
-			result = AddToThread(newHdr, thread, replyToHdr, TRUE);
+			result = AddToThread(newHdr, thread, replyToHdr, PR_TRUE);
 			break;
 		}
 	}
@@ -3071,7 +3071,7 @@ nsresult nsMsgDatabase::ThreadNewHdr(nsMsgHdr* newHdr, PRBool &newThread)
 			//TRACE("threading based on subject %s\n", (const char *) msgHdr->m_subject);
 			// if we move this and do subject threading after, ref threading, 
 			// don't thread within children, since we know it won't work. But for now, pass TRUE.
-			result = AddToThread(newHdr, thread, nsnull, TRUE);     
+			result = AddToThread(newHdr, thread, nsnull, PR_TRUE);     
 		}
 	}
 #endif // SUBJ_THREADING
@@ -3080,11 +3080,11 @@ nsresult nsMsgDatabase::ThreadNewHdr(nsMsgHdr* newHdr, PRBool &newThread)
 	{
 		// couldn't find any parent articles - msgHdr is top-level thread, for now
 		result = AddNewThread(newHdr);
-		newThread = TRUE;
+		newThread = PR_TRUE;
 	}
 	else
 	{
-		newThread = FALSE;
+		newThread = PR_FALSE;
 	}
 	return result;
 }
diff --git a/mailnews/imap/src/nsImapService.cpp b/mailnews/imap/src/nsImapService.cpp
index 9e92bb99a30..3b3651846e8 100644
--- a/mailnews/imap/src/nsImapService.cpp
+++ b/mailnews/imap/src/nsImapService.cpp
@@ -3000,7 +3000,7 @@ nsImapService::GetDefaultLocalPath(nsIFileSpec ** aResult)
     if (!localFile) {
         rv = NS_GetSpecialDirectory(NS_APP_IMAP_MAIL_50_DIR, getter_AddRefs(localFile));
         if (NS_FAILED(rv)) return rv;
-        havePref = FALSE;
+        havePref = PR_FALSE;
     }
         
     PRBool exists;
diff --git a/mailnews/local/src/nsPop3Service.cpp b/mailnews/local/src/nsPop3Service.cpp
index 4621f48d8fd..6a8f01faff6 100644
--- a/mailnews/local/src/nsPop3Service.cpp
+++ b/mailnews/local/src/nsPop3Service.cpp
@@ -452,7 +452,7 @@ nsPop3Service::GetDefaultLocalPath(nsIFileSpec ** aResult)
     if (!localFile) {
         rv = NS_GetSpecialDirectory(NS_APP_MAIL_50_DIR, getter_AddRefs(localFile));
         if (NS_FAILED(rv)) return rv;
-        havePref = FALSE;
+        havePref = PR_FALSE;
     }
         
     PRBool exists;
diff --git a/mailnews/mime/cthandlers/signstub/nsSignedStub.cpp b/mailnews/mime/cthandlers/signstub/nsSignedStub.cpp
index 1579d820255..ad0ccace70c 100644
--- a/mailnews/mime/cthandlers/signstub/nsSignedStub.cpp
+++ b/mailnews/mime/cthandlers/signstub/nsSignedStub.cpp
@@ -20,6 +20,7 @@
  * Contributor(s): 
  */
 #include "nsSignedStub.h"
+#include "prlog.h"
 #include "prmem.h"
 #include "plstr.h"
 #include "mimexpcom.h"
@@ -119,7 +120,7 @@ MimeInlineTextSIGNEDStub_parse_line(char *line, PRInt32 length, MimeObject *obj)
 
   if (!obj->options->write_html_p) 
   {
-    return COM_MimeObject_write(obj, line, length, TRUE);
+    return COM_MimeObject_write(obj, line, length, PR_TRUE);
   }
   
   return 0;
@@ -149,7 +150,7 @@ MimeInlineTextSIGNEDStub_parse_eof (MimeObject *obj, PRBool abort_p)
   if (status < 0) 
     return status;
   
-  status = COM_MimeObject_write(obj, html, PL_strlen(html), TRUE);
+  status = COM_MimeObject_write(obj, html, PL_strlen(html), PR_TRUE);
   PR_FREEIF(html);
   if (status < 0) 
     return status;
diff --git a/mailnews/mime/cthandlers/smimestub/nsSMIMEStub.cpp b/mailnews/mime/cthandlers/smimestub/nsSMIMEStub.cpp
index d1528090f3f..05bd9a7a015 100644
--- a/mailnews/mime/cthandlers/smimestub/nsSMIMEStub.cpp
+++ b/mailnews/mime/cthandlers/smimestub/nsSMIMEStub.cpp
@@ -20,6 +20,7 @@
  * Contributor(s): 
  */
 #include "nsSMIMEStub.h"
+#include "prlog.h"
 #include "prmem.h"
 #include "plstr.h"
 #include "mimexpcom.h"
@@ -119,7 +120,7 @@ MimeInlineTextSMIMEStub_parse_line(char *line, PRInt32 length, MimeObject *obj)
 
   if (!obj->options->write_html_p) 
   {
-    return COM_MimeObject_write(obj, line, length, TRUE);
+    return COM_MimeObject_write(obj, line, length, PR_TRUE);
   }
   
   return 0;
@@ -148,7 +149,7 @@ MimeInlineTextSMIMEStub_parse_eof (MimeObject *obj, PRBool abort_p)
   if (status < 0) 
     return status;
   
-  status = COM_MimeObject_write(obj, html, PL_strlen(html), TRUE);
+  status = COM_MimeObject_write(obj, html, PL_strlen(html), PR_TRUE);
   PR_FREEIF(html);
   if (status < 0) 
     return status;
diff --git a/mailnews/mime/cthandlers/vcard/nsVCardObj.cpp b/mailnews/mime/cthandlers/vcard/nsVCardObj.cpp
index 9833cfce136..2091fdda981 100644
--- a/mailnews/mime/cthandlers/vcard/nsVCardObj.cpp
+++ b/mailnews/mime/cthandlers/vcard/nsVCardObj.cpp
@@ -107,15 +107,15 @@ static PRBool needsQuotedPrintable (const char *s)
     const unsigned char *p = (const unsigned char *)s;
 
 	if (PL_strstr (s, MSG_LINEBREAK))
-		return TRUE;
+		return PR_TRUE;
 
 	while (*p) {
 		if (*p & 0x80)
-			return TRUE;
+			return PR_TRUE;
 		p++;
 	}
 
-	return FALSE;
+	return PR_FALSE;
 }
 
 VObject* newVObject_(const char *id)
@@ -623,7 +623,7 @@ void printVObjectToFile(nsFileSpec *fname, VObject *o)
     fp->close();
   }
 #else
-  PR_ASSERT(FALSE);
+  PR_ASSERT(PR_FALSE);
 #endif
 }
 
@@ -639,7 +639,7 @@ void printVObjectsToFile(nsFileSpec *fname,VObject *list)
     fp->close();
   }
 #else
-  PR_ASSERT(FALSE);
+  PR_ASSERT(PR_FALSE);
 #endif
 }
 
@@ -1173,9 +1173,9 @@ static void writeQPString(OFile *fp, const char *s)
     const unsigned char *p = (const unsigned char *)s;
 	int current_column = 0;
 	static const char hexdigits[] = "0123456789ABCDEF";
-	PRBool white = FALSE;
-	PRBool contWhite = FALSE;
-	PRBool mb_p = FALSE;
+	PRBool white = PR_FALSE;
+	PRBool contWhite = PR_FALSE;
+	PRBool mb_p = PR_FALSE;
 
 	if (needsQuotedPrintable (s)) 
 	{
@@ -1205,13 +1205,13 @@ static void writeQPString(OFile *fp, const char *s)
 					appendcOFile(fp,'=');
 					appendcOFile(fp,'\n');
 					appendcOFile(fp,'\t');
-					contWhite = FALSE;
+					contWhite = PR_FALSE;
 				}
 
 				/* If its CRLF, swallow two chars instead of one. */
 				if (*p == CR && *(p+1) == LF)
 					p++;
-				white = FALSE;
+				white = PR_FALSE;
 				current_column = 0;
 			}
 			else
@@ -1222,8 +1222,8 @@ static void writeQPString(OFile *fp, const char *s)
 				{
 					appendcOFile(fp,*p);
 					current_column++;
-					white = FALSE;
-					contWhite = FALSE;
+					white = PR_FALSE;
+					contWhite = PR_FALSE;
 				}
 				else if (*p == ' ' || *p == '\t')		/* whitespace */
 				{
@@ -1233,14 +1233,14 @@ static void writeQPString(OFile *fp, const char *s)
 						appendcOFile(fp,hexdigits[*p >> 4]);
 						appendcOFile(fp,hexdigits[*p & 0xF]);
 						current_column += 3;
-						contWhite = FALSE;
+						contWhite = PR_FALSE;
 					}
 					else
 					{
 						appendcOFile(fp,*p);
 						current_column++;
 					}
-					white = TRUE;
+					white = PR_TRUE;
 				}
 				else										/* print as =FF */
 				{
@@ -1248,8 +1248,8 @@ static void writeQPString(OFile *fp, const char *s)
 					appendcOFile(fp,hexdigits[*p >> 4]);
 					appendcOFile(fp,hexdigits[*p & 0xF]);
 					current_column += 3;
-					white = FALSE;
-					contWhite = FALSE;
+					white = PR_FALSE;
+					contWhite = PR_FALSE;
 				}
 
 				PR_ASSERT(current_column <= 76); /* Hard limit required by spec */
@@ -1261,10 +1261,10 @@ static void writeQPString(OFile *fp, const char *s)
 					appendcOFile(fp,'\t');
 					current_column = 0;
 					if (white)
-						contWhite = TRUE;
+						contWhite = PR_TRUE;
 					else 
-						contWhite = FALSE;
-					white = FALSE;
+						contWhite = PR_FALSE;
+					white = PR_FALSE;
 				}
 			}	
 			p++;
@@ -1470,7 +1470,7 @@ void writeVObjectToFile(nsFileSpec *fname, VObject *o)
     fp->close();
   }
 #else
-  PR_ASSERT(FALSE);
+  PR_ASSERT(PR_FALSE);
 #endif
 }
 
@@ -1486,7 +1486,7 @@ void writeVObjectsToFile(nsFileSpec *fname, VObject *list)
 	fp->close();
 	}
 #else
-	PR_ASSERT(FALSE);
+	PR_ASSERT(PR_FALSE);
 #endif
 }
 
diff --git a/mailnews/mime/src/Makefile.in b/mailnews/mime/src/Makefile.in
index 31267f9822b..0cd39ba9b3a 100644
--- a/mailnews/mime/src/Makefile.in
+++ b/mailnews/mime/src/Makefile.in
@@ -66,7 +66,6 @@ CPPSRCS		= \
 		mimecom.cpp \
 		mimemoz2.cpp \
 		comi18n.cpp \
-		nsMimeTransition.cpp \
 		nsMsgHeaderParser.cpp \
 		nsStreamConverter.cpp \
 		mimedrft.cpp \
@@ -90,7 +89,6 @@ EXPORTS		= \
 		mimemult.h \
 		mimemsig.h \
 		mimehdrs.h \
-		modmime.h \
 		mimepbuf.h \
 		modlmime.h \
 		comi18n.h \
diff --git a/mailnews/mime/src/makefile.win b/mailnews/mime/src/makefile.win
index 1947ecd606c..9c46fe3d289 100644
--- a/mailnews/mime/src/makefile.win
+++ b/mailnews/mime/src/makefile.win
@@ -43,7 +43,6 @@ EXPORTS =								\
 		mimemult.h						\
 		mimemsig.h						\
 		mimehdrs.h						\
-		modmime.h						\
 		mimepbuf.h						\
 		modlmime.h						\
 		comi18n.h						\
@@ -106,9 +105,6 @@ OBJS=											\
 		.\$(OBJDIR)\nsMimeHeaders.obj		\
 # XP-COM BRIDGES
 		.\$(OBJDIR)\comi18n.obj				\
-# EXTERNAL (OLD) DEPENDENCIES - SHOULD EVENTUALLY BE REMOVED 
-# WHEN NEW WORLD FUNCTIONS ARE FOUND 
-		.\$(OBJDIR)\nsMimeTransition.obj	\
 		$(NULL)
 
 
diff --git a/mailnews/mime/src/mimecom.cpp b/mailnews/mime/src/mimecom.cpp
index 15e8f94ff67..bde2d2ae654 100644
--- a/mailnews/mime/src/mimecom.cpp
+++ b/mailnews/mime/src/mimecom.cpp
@@ -20,7 +20,6 @@
  * Contributor(s): 
  */
 #include "mimei.h"
-#include "modmime.h"
 #include "mimeobj.h"	/*  MimeObject (abstract)							*/
 #include "mimecont.h"	/*   |--- MimeContainer (abstract)					*/
 #include "mimemult.h"	/*   |     |--- MimeMultipart (abstract)			*/
diff --git a/mailnews/mime/src/mimecth.h b/mailnews/mime/src/mimecth.h
index 586cf63b587..ee071674a94 100644
--- a/mailnews/mime/src/mimecth.h
+++ b/mailnews/mime/src/mimecth.h
@@ -31,7 +31,6 @@
 #define _MIMECTH_H_
 
 #include "mimei.h"
-#include "modmime.h"
 #include "mimeobj.h"	/*  MimeObject (abstract)							*/
 #include "mimecont.h"	/*   |--- MimeContainer (abstract)					*/
 #include "mimemult.h"	/*   |     |--- MimeMultipart (abstract)			*/
diff --git a/mailnews/mime/src/mimeebod.cpp b/mailnews/mime/src/mimeebod.cpp
index e8fc1d16529..c9f4d3bc161 100644
--- a/mailnews/mime/src/mimeebod.cpp
+++ b/mailnews/mime/src/mimeebod.cpp
@@ -30,7 +30,6 @@
 #include "nsFileSpec.h"
 #include "nsEscape.h"
 #include "msgCore.h"
-#include "nsMimeTransition.h"
 #include "nsMimeStringResources.h"
 #include "mimemoz2.h"
 
diff --git a/mailnews/mime/src/mimeeobj.cpp b/mailnews/mime/src/mimeeobj.cpp
index 502f8bb5b0d..08aa06dfced 100644
--- a/mailnews/mime/src/mimeeobj.cpp
+++ b/mailnews/mime/src/mimeeobj.cpp
@@ -25,7 +25,6 @@
 #include "prmem.h"
 #include "plstr.h"
 #include "prlog.h"
-#include "nsMimeTransition.h"
 #include "nsMimeStringResources.h"
 #include "mimemoz2.h"
 #include "nsCRT.h"
diff --git a/mailnews/mime/src/mimehdrs.cpp b/mailnews/mime/src/mimehdrs.cpp
index 6eeabd160d8..55b068fb936 100644
--- a/mailnews/mime/src/mimehdrs.cpp
+++ b/mailnews/mime/src/mimehdrs.cpp
@@ -23,7 +23,6 @@
 #include "nsCOMPtr.h"
 #include "msgCore.h"
 #include "mimei.h"
-#include "modmime.h"
 #include "prmem.h"
 #include "plstr.h"
 #include "mimebuf.h"
@@ -34,7 +33,6 @@
 #include "nsCRT.h"
 #include "nsIPref.h"
 #include "nsEscape.h"
-#include "nsMimeTransition.h"
 #include "nsMsgMessageFlags.h"
 #include "nsMimeAddress.h"
 #include "comi18n.h"
diff --git a/mailnews/mime/src/mimei.cpp b/mailnews/mime/src/mimei.cpp
index ffd167a9ea2..649a0c0e52a 100644
--- a/mailnews/mime/src/mimei.cpp
+++ b/mailnews/mime/src/mimei.cpp
@@ -31,7 +31,6 @@
 #endif
 
 #include "nsCOMPtr.h"
-#include "modmime.h"
 #include "mimeobj.h"	/*  MimeObject (abstract)							*/
 #include "mimecont.h"	/*   |--- MimeContainer (abstract)					*/
 #include "mimemult.h"	/*   |     |--- MimeMultipart (abstract)			*/
@@ -44,11 +43,6 @@
 #include "mimesun.h"	/*   |     |     |--- MimeSunAttachment				*/
 #include "mimemsig.h"	/*   |     |     |--- MimeMultipartSigned (abstract)*/
 
-#ifdef MOZ_SECURITY
-#include HG01921
-#include HG01944
-#include HG01999
-#endif /* MOZ_SECURITY */
 
 #include "mimemsg.h"	/*   |     |--- MimeMessage							*/
 #include "mimeunty.h"	/*   |     |--- MimeUntypedText						*/
@@ -65,6 +59,7 @@
 #include "mimeiimg.h"	/*   |     |--- MimeInlineImage						*/
 #include "mimeeobj.h"	/*   |     |--- MimeExternalObject					*/
 #include "mimeebod.h"	/*   |--- MimeExternalBody							*/
+#include "prlog.h"
 #include "prmem.h"
 #include "prenv.h"
 #include "plstr.h"
@@ -81,6 +76,8 @@
 #include "nsMimeStringResources.h"
 #include "nsMimeTypes.h"
 
+#define	IMAP_EXTERNAL_CONTENT_HEADER "X-Mozilla-IMAP-Part"
+
 static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
 
 /* ==========================================================================
diff --git a/mailnews/mime/src/mimemapl.cpp b/mailnews/mime/src/mimemapl.cpp
index d03746648f5..7d0aa3126da 100644
--- a/mailnews/mime/src/mimemapl.cpp
+++ b/mailnews/mime/src/mimemapl.cpp
@@ -24,7 +24,6 @@
 #include "mimemapl.h"
 #include "prmem.h"
 #include "plstr.h"
-#include "nsMimeTransition.h"
 #include "nsMimeStringResources.h"
 #include "mimemoz2.h"
 #include "nsMimeTypes.h"
diff --git a/mailnews/mime/src/mimemoz2.cpp b/mailnews/mime/src/mimemoz2.cpp
index 39afefaf413..18cf548f5eb 100644
--- a/mailnews/mime/src/mimemoz2.cpp
+++ b/mailnews/mime/src/mimemoz2.cpp
@@ -43,7 +43,6 @@
 #include "nsIPref.h"
 #include "nsIServiceManager.h"
 #include "nsFileSpec.h"
-#include "nsMimeTransition.h"
 #include "comi18n.h"
 #include "nsIStringBundle.h"
 #include "nsString.h"
diff --git a/mailnews/mime/src/mimemrel.cpp b/mailnews/mime/src/mimemrel.cpp
index d95516d153c..1cba27d3139 100644
--- a/mailnews/mime/src/mimemrel.cpp
+++ b/mailnews/mime/src/mimemrel.cpp
@@ -117,7 +117,6 @@
 #include "prlog.h"
 #include "plstr.h"
 #include "mimemoz2.h"
-#include "nsMimeTransition.h"
 #include "nsString.h"
 #include "nsIURL.h"
 #include "nsCRT.h"
diff --git a/mailnews/mime/src/mimemult.cpp b/mailnews/mime/src/mimemult.cpp
index 580222ea584..91b285088c8 100644
--- a/mailnews/mime/src/mimemult.cpp
+++ b/mailnews/mime/src/mimemult.cpp
@@ -22,7 +22,6 @@
 
 #include "msgCore.h"
 #include "mimemult.h"
-#include "modmime.h"
 #include "mimemoz2.h"
 
 #include "prmem.h"
diff --git a/mailnews/mime/src/mimetpfl.cpp b/mailnews/mime/src/mimetpfl.cpp
index 346708b11ba..ae04170988d 100644
--- a/mailnews/mime/src/mimetpfl.cpp
+++ b/mailnews/mime/src/mimetpfl.cpp
@@ -25,7 +25,6 @@
 #include "mimebuf.h"
 #include "prmem.h"
 #include "plstr.h"
-#include "nsMimeTransition.h"
 #include "mozITXTToHTMLConv.h"
 #include "nsString.h"
 #include "nsMimeStringResources.h"
diff --git a/mailnews/mime/src/mimetpla.cpp b/mailnews/mime/src/mimetpla.cpp
index 1ff97f0cb08..342127fa611 100644
--- a/mailnews/mime/src/mimetpla.cpp
+++ b/mailnews/mime/src/mimetpla.cpp
@@ -25,7 +25,6 @@
 #include "mimebuf.h"
 #include "prmem.h"
 #include "plstr.h"
-#include "nsMimeTransition.h"
 #include "mozITXTToHTMLConv.h"
 #include "nsCOMPtr.h"
 #include "nsIComponentManager.h"
diff --git a/mailnews/mime/src/modmime.h b/mailnews/mime/src/modmime.h
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/mailnews/mime/src/nsMimeTransition.cpp b/mailnews/mime/src/nsMimeTransition.cpp
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/mailnews/mime/src/nsMimeTransition.h b/mailnews/mime/src/nsMimeTransition.h
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/modules/libimg/gifcom/gif.cpp b/modules/libimg/gifcom/gif.cpp
index cb0dd4459d9..e86c93cef98 100644
--- a/modules/libimg/gifcom/gif.cpp
+++ b/modules/libimg/gifcom/gif.cpp
@@ -568,7 +568,7 @@ il_gif_init_transparency(il_container *ic, int index)
     if (!src_trans_pixel) {
         src_trans_pixel = PR_NEWZAP(IL_IRGB);
         if (!src_trans_pixel)
-            return FALSE;
+            return PR_FALSE;
         ic->src_header->transparent_pixel = src_trans_pixel;
 
         /* Initialize the destination image's transparent pixel. */
@@ -588,7 +588,7 @@ il_gif_init_transparency(il_container *ic, int index)
        from frame to frame in an animated gif. */
     src_trans_pixel->index = index;
 
-    return TRUE;
+    return PR_TRUE;
 }
 
 
@@ -680,7 +680,7 @@ process_buffered_gif_input_data(gif_struct* gs)
     /* test, stop loopers if error */
     if( state == gif_error){
             ic->loop_count = 0;
-            gs->destroy_pending =TRUE;
+            gs->destroy_pending = PR_TRUE;
             ic->state = IC_ABORT_PENDING;
     }
     if (gs->destroy_pending &&
@@ -1151,13 +1151,13 @@ il_gif_write(il_container *ic, const PRUint8 *buf, int32 len)
                 ILTRACE(2,("il:gif: transparent pixel %d", gs->tpixel));
                 if (!il_gif_init_transparency(ic, gs->tpixel))
                     return MK_OUT_OF_MEMORY;
-                gs->is_transparent = TRUE;
+                gs->is_transparent = PR_TRUE;
             }
             else
             {
                 ILTRACE(2,("il:gif: ignoring gfx control extension"));
             }
-            gs->control_extension = TRUE;
+            gs->control_extension = PR_TRUE;
             gs->disposal_method = (gdispose)(((*q) >> 2) & 0x7);
             gs->delay_time = GETINT16(q + 1) * 10;
             GETN(1,gif_consume_block);
@@ -1367,10 +1367,10 @@ il_gif_write(il_container *ic, const PRUint8 *buf, int32 len)
             if ( *(q+8) & 0x40 )
             {
                 ILTRACE(2,("il:gif: interlaced"));
-                gs->interlaced = TRUE;
+                gs->interlaced = PR_TRUE;
                 gs->ipass = 1;
             } else {
-                gs->interlaced = FALSE;
+                gs->interlaced = PR_FALSE;
                 gs->ipass = 0;
             }
             
@@ -1417,7 +1417,7 @@ il_gif_write(il_container *ic, const PRUint8 *buf, int32 len)
                 if(ic->imgdcb)
                    ic->imgdcb->ImgDCBResetPalette();
 
-                gs->is_local_colormap_defined = TRUE;
+                gs->is_local_colormap_defined = PR_TRUE;
                 GETN(gs->local_colormap_size * 3, gif_image_colormap);
             }
             else
@@ -1427,7 +1427,7 @@ il_gif_write(il_container *ic, const PRUint8 *buf, int32 len)
                   if(ic->imgdcb)
                     ic->imgdcb->ImgDCBResetPalette();
 
-                gs->is_local_colormap_defined = FALSE;
+                gs->is_local_colormap_defined = PR_FALSE;
                 GETN(1, gif_lzw_start);
             }
         }
@@ -1503,8 +1503,8 @@ il_gif_write(il_container *ic, const PRUint8 *buf, int32 len)
                 gs->images_decoded++;                
 
                 /* Clear state from this image */
-                gs->control_extension = FALSE;
-                gs->is_transparent = FALSE;
+                gs->control_extension = PR_FALSE;
+                gs->is_transparent = PR_FALSE;
 
                 if(ic->animate_request == eImageAnimation_None){
                     /* This is not really an error, but a mechanism
@@ -1637,11 +1637,11 @@ il_gif_complete(il_container *ic)
            so don't actually free any of the data structures. */
         if (gs->delay_timeout) {
             /* We will free the data structures when image display completes. */
-            gs->destroy_pending = TRUE;
+            gs->destroy_pending = PR_TRUE;
             return;
         } else if (gs->requested_buffer_fullness) {
             /* We will free the data structures when image display completes. */
-            gs->destroy_pending = TRUE;
+            gs->destroy_pending = PR_TRUE;
             process_buffered_gif_input_data(gs);
             return;
         }
diff --git a/modules/libimg/pngcom/ipng.cpp b/modules/libimg/pngcom/ipng.cpp
index 834155ce3d0..7e92d59236f 100644
--- a/modules/libimg/pngcom/ipng.cpp
+++ b/modules/libimg/pngcom/ipng.cpp
@@ -312,7 +312,7 @@ info_callback(png_structp png_ptr, png_infop info_ptr)
 #endif
                  ic->image->header.alpha_bits = 1;  
         ic->image->header.alpha_shift = 0;
-        ic->image->header.is_interleaved_alpha = TRUE;
+        ic->image->header.is_interleaved_alpha = PR_TRUE;
     }
 
     ic->imgdcb->ImgDCBImageSize();
diff --git a/modules/libimg/src/color.cpp b/modules/libimg/src/color.cpp
index 6ff5b13a9dd..65cb2a68033 100644
--- a/modules/libimg/src/color.cpp
+++ b/modules/libimg/src/color.cpp
@@ -38,7 +38,7 @@
                Includes dithering for B&W displays, but not dithering
                for PseudoColor displays which can be found in dither.c.
                
-   $Id: color.cpp,v 3.16 2000-07-10 07:13:27 cls%seawood.org Exp $
+   $Id: color.cpp,v 3.17 2001-01-10 06:12:10 jgmyers%netscape.com Exp $
 */
 
 
@@ -664,7 +664,7 @@ il_init_rgb_depth_tables(IL_ColorSpace *color_space)
     if (private_data->r8torgbn &&
         private_data->g8torgbn &&
         private_data->b8torgbn)
-        return TRUE;
+        return PR_TRUE;
 
     red_bits = rgb->red_bits;
     red_shift = rgb->red_shift;
@@ -686,7 +686,7 @@ il_init_rgb_depth_tables(IL_ColorSpace *color_space)
               private_data->g8torgbn &&
               private_data->b8torgbn)) {
             ILTRACE(0,("il: MEM il_init_rgb_tables"));
-            return FALSE;
+            return PR_FALSE;
         }
 
         /* XXXM12N These could be optimized. */
@@ -722,7 +722,7 @@ il_init_rgb_depth_tables(IL_ColorSpace *color_space)
               private_data->g8torgbn &&
               private_data->b8torgbn)) {
             ILTRACE(0,("il: MEM il_init_rgb_tables"));
-            return FALSE;
+            return PR_FALSE;
         }
 
 /* Compensate for Win95's sometimes-weird color quantization. */
@@ -768,7 +768,7 @@ il_init_rgb_depth_tables(IL_ColorSpace *color_space)
               private_data->g8torgbn &&
               private_data->b8torgbn)) {
             ILTRACE(0,("il: MEM il_init_rgb_tables"));
-            return FALSE;
+            return PR_FALSE;
         }
 
         tmp_map = (PRUint32*)private_data->r8torgbn;
@@ -793,7 +793,7 @@ il_init_rgb_depth_tables(IL_ColorSpace *color_space)
         PR_ASSERT(0);
     }
 
-    return TRUE;
+    return PR_TRUE;
 }
 
 
diff --git a/modules/libimg/src/colormap.cpp b/modules/libimg/src/colormap.cpp
index e7619df9ec0..52c655f64a9 100644
--- a/modules/libimg/src/colormap.cpp
+++ b/modules/libimg/src/colormap.cpp
@@ -23,7 +23,7 @@
 /* -*- Mode: C; tab-width: 4 -*-
  *  colormap.c
  *             
- *   $Id: colormap.cpp,v 3.3 1999-11-06 03:31:26 dmose%mozilla.org Exp $
+ *   $Id: colormap.cpp,v 3.4 2001-01-10 06:12:10 jgmyers%netscape.com Exp $
  */
 
 
@@ -51,8 +51,8 @@ il_reset_palette(il_container *ic)
     }
 
     ic->colormap_serial_num = -1;
-    ic->dont_use_custom_palette = FALSE;
-    ic->rendered_with_custom_palette = FALSE;
+    ic->dont_use_custom_palette = PR_FALSE;
+    ic->rendered_with_custom_palette = PR_FALSE;
     
     return ret;
    
diff --git a/modules/libimg/src/scale.cpp b/modules/libimg/src/scale.cpp
index f527131e907..687dbc0171f 100644
--- a/modules/libimg/src/scale.cpp
+++ b/modules/libimg/src/scale.cpp
@@ -101,7 +101,7 @@ il_partial(
     if (!ic->new_data_for_fe) {
         ic->update_start_row = row;
         ic->update_end_row = row + row_count - 1;
-        ic->new_data_for_fe = TRUE;
+        ic->new_data_for_fe = PR_TRUE;
     } else {
         if (row < ic->update_start_row)
             ic->update_start_row = row;
@@ -216,7 +216,7 @@ il_flush_image_data(il_container *ic)
     /* Notify observers of image progress. */
     il_progress_notify(ic);
 
-    ic->new_data_for_fe = FALSE;
+    ic->new_data_for_fe = PR_FALSE;
     ic->update_end_row = ic->update_start_row = 0;
 }
 
@@ -1223,7 +1223,7 @@ il_emit_row(
 
 #ifndef M12N                    /* Clean this up */
     if (ic->image->pixmap_depth == 1)
-        do_dither = TRUE;
+        do_dither = PR_TRUE;
     else
         do_dither = ic->converter && (row_count <= 4) &&
             ((ic->dither_mode == IL_Dither) ||
@@ -1233,7 +1233,7 @@ il_emit_row(
     if ((nsCRT::strncasecmp(ic->type, "image/gif",9)==0)||
         (nsCRT::strncasecmp(ic->type, "image/png",9)==0) &&
         (!ic->converter || (row_count > 4)))
-              do_dither = FALSE;
+              do_dither = PR_FALSE;
    
 #endif /* M12N */   
 
diff --git a/modules/libjar/nsWildCard.cpp b/modules/libjar/nsWildCard.cpp
index 0075f7770de..1eea3a44590 100644
--- a/modules/libjar/nsWildCard.cpp
+++ b/modules/libjar/nsWildCard.cpp
@@ -265,7 +265,7 @@ XP_RegExpMatch(char *str, char *xp, PRBool case_insensitive) {
             break;
         }
     }
-    if(_shexp_match(str,expr, FALSE) == MATCH) {
+    if(_shexp_match(str,expr, PR_FALSE) == MATCH) {
         PR_Free(expr);
         return 0;
     }
@@ -289,7 +289,7 @@ XP_RegExpSearch(char *str, char *expr)
         case NON_SXP:
             return (strcmp(expr,str) ? 1 : 0);
         default:
-            return XP_RegExpMatch(str, expr, FALSE);
+            return XP_RegExpMatch(str, expr, PR_FALSE);
       }
 }
 
diff --git a/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/xpfe/components/bookmarks/src/nsBookmarksService.cpp
index 4d9d69f95df..01155e2e0c2 100644
--- a/xpfe/components/bookmarks/src/nsBookmarksService.cpp
+++ b/xpfe/components/bookmarks/src/nsBookmarksService.cpp
@@ -1999,7 +1999,7 @@ nsBookmarksService::FireTimer(nsITimer* aTimer, void* aClosure)
 						}
 						if (NS_SUCCEEDED(rv = channel->AsyncRead(bmks, nsnull)))
 						{
-							bmks->busySchedule = TRUE;
+							bmks->busySchedule = PR_TRUE;
 						}
 					}
 				}
diff --git a/xpfe/components/search/src/nsInternetSearchService.cpp b/xpfe/components/search/src/nsInternetSearchService.cpp
index b8e05c56e82..0b4ae07d18b 100755
--- a/xpfe/components/search/src/nsInternetSearchService.cpp
+++ b/xpfe/components/search/src/nsInternetSearchService.cpp
@@ -635,7 +635,7 @@ InternetSearchDataSource::FireTimer(nsITimer* aTimer, void* aClosure)
 
 		if (NS_SUCCEEDED(rv = channel->AsyncRead(search, engineContext)))
 		{
-			search->busySchedule = TRUE;
+			search->busySchedule = PR_TRUE;
 
 #ifdef	DEBUG_SEARCH_UPDATES
 			printf("    InternetSearchDataSource::FireTimer - Pinging '%s'\n", (char *)updateURL);