diff --git a/mozilla/cmd/xfe/src/AddressFolderView.cpp b/mozilla/cmd/xfe/src/AddressFolderView.cpp
index b62db667588..3896b3b3c39 100644
--- a/mozilla/cmd/xfe/src/AddressFolderView.cpp
+++ b/mozilla/cmd/xfe/src/AddressFolderView.cpp
@@ -68,8 +68,6 @@ static MSG_HEADER_SET standard_header_set[] = {
 
 #define TOTAL_HEADERS (sizeof(standard_header_set)/sizeof(MSG_HEADER_SET))
 
-extern "C" char *fe_StringTrim (char *string);
-
 extern "C" char* xfe_ExpandForNameCompletion(char *pString,
                                              ABook *pAddrBook,
                                              DIR_Server *pDirServer);
diff --git a/mozilla/cmd/xfe/src/ComposeView.cpp b/mozilla/cmd/xfe/src/ComposeView.cpp
index 295051d8ddb..515ea822bfd 100644
--- a/mozilla/cmd/xfe/src/ComposeView.cpp
+++ b/mozilla/cmd/xfe/src/ComposeView.cpp
@@ -77,8 +77,6 @@ extern "C" {
   Widget         fe_EditorCreateComposeToolbar(MWContext*, Widget, char*);
 }
 
-extern "C" void fe_sec_logo_cb (Widget, XtPointer, XtPointer);
-
 extern "C" XtPointer fe_GetFont(MWContext *context, int sizeNum, int fontmask);
 extern "C" void
 fe_set_compose_wrap_state(MWContext *context, XP_Bool wrap_p);
@@ -95,11 +93,6 @@ extern "C" void fe_paste_quoted_cb (Widget widget, XtPointer closure,
                                XtPointer call_data);
 extern "C" void fe_mailNew_cb (Widget widget, XtPointer closure,
                                XtPointer call_data);
-extern "C" void fe_load_default_font (MWContext *context);
-extern "C" void fe_find_scrollbar_sizes (MWContext *context);
-extern "C" void fe_get_final_context_resources (MWContext *context);
-extern "C" void fe_InitScrolling (MWContext *context);
-extern "C" void fe_InitRemoteServerWindow (MWContext *context);
 extern "C" void fe_SensitizeMenus (MWContext *context);
 extern "C" int FE_GetMessageBody (MSG_Pane* comppane,
                    char **body,
diff --git a/mozilla/cmd/xfe/src/FolderView.cpp b/mozilla/cmd/xfe/src/FolderView.cpp
index 16e6088c76d..309b410b74c 100644
--- a/mozilla/cmd/xfe/src/FolderView.cpp
+++ b/mozilla/cmd/xfe/src/FolderView.cpp
@@ -69,9 +69,6 @@
 #define FOLDER_OUTLINER_GEOMETRY_PREF "mail.folderpane.outliner_geometry"
 
 // bloody entrails dragging behind.... weighing me down...
-extern "C" CL_Compositor *fe_create_compositor(MWContext *context);
-extern "C" void fe_load_default_font (MWContext *context);
-extern "C" void fe_get_final_context_resources (MWContext *context);
 extern "C" void fe_sec_logo_cb (Widget, XtPointer, XtPointer);
 
 const char *XFE_FolderView::folderSelected = "XFE_FolderView::folderSelected";
diff --git a/mozilla/cmd/xfe/src/context_funcs.cpp b/mozilla/cmd/xfe/src/context_funcs.cpp
index b58273619a6..cda0aa11dd6 100644
--- a/mozilla/cmd/xfe/src/context_funcs.cpp
+++ b/mozilla/cmd/xfe/src/context_funcs.cpp
@@ -106,10 +106,6 @@ extern int XFE_COULD_NOT_FDOPEN_THE_NEW_STDOUT;
 extern int XFE_COULD_NOT_DUP_A_NEW_STDOUT;
 extern int MK_UNABLE_TO_LOCATE_FILE;
 
-#ifdef MOZ_LDAP
-extern "C" void fe_ldapsearch_finished(MWContext *context);
-#endif
-
 #ifndef NO_WEB_FONTS
 /* Webfonts related routines defined in fonts.c */
 extern "C" int fe_WebfontsNeedReload(MWContext *context);