diff --git a/mozilla/editor/libeditor/build/Makefile.in b/mozilla/editor/libeditor/build/Makefile.in
index 9172ef239a4..a75239a74b5 100644
--- a/mozilla/editor/libeditor/build/Makefile.in
+++ b/mozilla/editor/libeditor/build/Makefile.in
@@ -60,18 +60,17 @@ REQUIRES	= xpcom \
 		  txtsvc \
 		  $(NULL)
 
+CPPSRCS = nsEditorRegistration.cpp
+
 ifdef MOZ_PLAINTEXT_EDITOR_ONLY
-# We're only building the Core PlainText Editor Source so just include
-# the plain text registration file.
 ifeq ($(OS_ARCH),WINNT)
 LIBRARY_NAME	= texteditor
 endif
-CPPSRCS = nsTextEditorReg.cpp
 SHARED_LIBRARY_LIBS = $(NULL)
+DEFINES += -DMOZILLA_PLAINTEXT_EDITOR_ONLY
 
 else
 # We're building both plain and html editing
-CPPSRCS = nsEditorRegistration.cpp
 SHARED_LIBRARY_LIBS = \
 		../html/$(LIB_PREFIX)htmleditor_s.$(LIB_SUFFIX)      \
 		../../txtsvc/src/$(LIB_PREFIX)txtsvc_s.$(LIB_SUFFIX) \
diff --git a/mozilla/editor/libeditor/build/nsEditorRegistration.cpp b/mozilla/editor/libeditor/build/nsEditorRegistration.cpp
index 83e76ddab90..3e23135a442 100644
--- a/mozilla/editor/libeditor/build/nsEditorRegistration.cpp
+++ b/mozilla/editor/libeditor/build/nsEditorRegistration.cpp
@@ -42,7 +42,6 @@
 
 #include "nsEditorCID.h"
 #include "nsEditor.h"				// for gInstanceCount
-#include "nsHTMLEditor.h"
 #include "nsPlaintextEditor.h"
 
 #include "nsEditorController.h" //CID
@@ -53,6 +52,10 @@
 
 #include "nsIServiceManager.h"
 
+#ifndef MOZILLA_PLAINTEXT_EDITOR_ONLY
+#include "nsHTMLEditor.h"
+#endif
+
 ////////////////////////////////////////////////////////////////////////
 // Define the contructor function for the objects
 //
@@ -96,12 +99,14 @@ NS_IMETHODIMP nsEditorControllerConstructor(nsISupports *aOuter, REFNSIID aIID,
   return context->QueryInterface(aIID, aResult);
 }
 
+#ifndef MOZILLA_PLAINTEXT_EDITOR_ONLY
 #ifdef ENABLE_EDITOR_API_LOG
 #include "nsHTMLEditorLog.h"
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLEditorLog)
 #else
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLEditor)
 #endif
+#endif
 
 ////////////////////////////////////////////////////////////////////////
 // Define a table of CIDs implemented by this module along with other
@@ -111,12 +116,14 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLEditor)
 static const nsModuleComponentInfo components[] = {
     { "Text Editor", NS_TEXTEDITOR_CID,
       "@mozilla.org/editor/texteditor;1", nsPlaintextEditorConstructor, },
+#ifndef MOZILLA_PLAINTEXT_EDITOR_ONLY
 #ifdef ENABLE_EDITOR_API_LOG
     { "HTML Editor", NS_HTMLEDITOR_CID,
       "@mozilla.org/editor/htmleditor;1", nsHTMLEditorLogConstructor, },
 #else
     { "HTML Editor", NS_HTMLEDITOR_CID,
       "@mozilla.org/editor/htmleditor;1", nsHTMLEditorConstructor, },
+#endif
 #endif
     { "Editor Controller", NS_EDITORCONTROLLER_CID,
       "@mozilla.org/editor/editorcontroller;1",
diff --git a/mozilla/editor/libeditor/build/nsTextEditorReg.cpp b/mozilla/editor/libeditor/build/nsTextEditorReg.cpp
deleted file mode 100644
index 66a04c67f7c..00000000000
--- a/mozilla/editor/libeditor/build/nsTextEditorReg.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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 the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsIGenericFactory.h"
-
-#include "nsEditorCID.h"
-#include "nsEditor.h"           // for gInstanceCount
-#include "nsPlaintextEditor.h"
-#include "nsEditorService.h" 
-#include "nsEditorController.h" //CID
-
-////////////////////////////////////////////////////////////////////////
-// Define the contructor function for the objects
-//
-// NOTE: This creates an instance of objects by using the default constructor
-//
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsEditorController)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsEditorService)
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsPlaintextEditor)
-
-////////////////////////////////////////////////////////////////////////
-// Define a table of CIDs implemented by this module along with other
-// information like the function to create an instance, contractid, and
-// class name.
-//
-static const nsModuleComponentInfo components[] = {
-    { "Text Editor", NS_TEXTEDITOR_CID,
-      "@mozilla.org/editor/texteditor;1", nsPlaintextEditorConstructor, },
-    { "Editor Controller", NS_EDITORCONTROLLER_CID,
-      "@mozilla.org/editor/editorcontroller;1", nsEditorControllerConstructor, }
-};
-
-////////////////////////////////////////////////////////////////////////
-// Implement the NSGetModule() exported function for your module
-// and the entire implementation of the module object.
-//
-NS_IMPL_NSGETMODULE(nsEditorModule, components)
diff --git a/mozilla/editor/macbuild/editor.xml b/mozilla/editor/macbuild/editor.xml
index e3ec1b4c255..d3ace48d8dd 100644
--- a/mozilla/editor/macbuild/editor.xml
+++ b/mozilla/editor/macbuild/editor.xml
@@ -3607,7 +3607,7 @@
                 <SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>1</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>MacEditorPrefixDebug.h</VALUE></SETTING>
+                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>MacPlaintextEditorPrefixDebug.h</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>0</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>1</VALUE></SETTING>
@@ -5004,7 +5004,7 @@
                 <SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>1</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>MacEditorPrefix.h</VALUE></SETTING>
+                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>MacPlaintextEditorPrefix.h</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>0</VALUE></SETTING>
                 <SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>1</VALUE></SETTING>