--- a/editor/composer/moz.build
+++ b/editor/composer/moz.build
@@ -11,27 +11,22 @@ MOCHITEST_CHROME_MANIFESTS += ['test/chr
 XPIDL_SOURCES += [
     'nsIEditingSession.idl',
 ]
 
 XPIDL_MODULE = 'composer'
 
 UNIFIED_SOURCES += [
     'ComposerCommandsUpdater.cpp',
-    'HTMLEditorCommands.cpp',
-    'HTMLEditorController.cpp',
-    'HTMLEditorDocumentCommands.cpp',
     'nsComposerRegistration.cpp',
     'nsEditingSession.cpp',
 ]
 
 EXPORTS.mozilla += [
     'ComposerCommandsUpdater.h',
-    'HTMLEditorCommands.h',
-    'HTMLEditorController.h',
 ]
 
 # Needed because we include HTMLEditor.h which indirectly includes nsDocument.h
 LOCAL_INCLUDES += [
     '/dom/base',
     '/dom/html',  # For nsHTMLDocument
     '/editor/spellchecker', # nsComposeTxtSrvFilter.h
     '/layout/style', # For things nsHTMLDocument includes.

rename from editor/composer/HTMLEditorCommands.cpp
rename to editor/libeditor/HTMLEditorCommands.cpp

rename from editor/composer/HTMLEditorCommands.h
rename to editor/libeditor/HTMLEditorCommands.h

rename from editor/composer/HTMLEditorController.cpp
rename to editor/libeditor/HTMLEditorController.cpp

rename from editor/composer/HTMLEditorController.h
rename to editor/libeditor/HTMLEditorController.h

rename from editor/composer/HTMLEditorDocumentCommands.cpp
rename to editor/libeditor/HTMLEditorDocumentCommands.cpp

--- a/editor/libeditor/moz.build
+++ b/editor/libeditor/moz.build
@@ -18,16 +18,18 @@ EXPORTS.mozilla += [
     'CSSEditUtils.h',
     'EditAction.h',
     'EditorBase.h',
     'EditorController.h',
     'EditorDOMPoint.h',
     'EditorUtils.h',
     'EditTransactionBase.h',
     'HTMLEditor.h',
+    'HTMLEditorCommands.h',
+    'HTMLEditorController.h',
     'ManualNAC.h',
     'SelectionState.h',
     'TextEditor.h',
     'TextEditRules.h',
 ]
 
 UNIFIED_SOURCES += [
     'ChangeAttributeTransaction.cpp',
@@ -43,17 +45,20 @@ UNIFIED_SOURCES += [
     'EditorCommands.cpp',
     'EditorController.cpp',
     'EditorEventListener.cpp',
     'EditorUtils.cpp',
     'EditTransactionBase.cpp',
     'HTMLAbsPositionEditor.cpp',
     'HTMLAnonymousNodeEditor.cpp',
     'HTMLEditor.cpp',
+    'HTMLEditorCommands.cpp',
+    'HTMLEditorController.cpp',
     'HTMLEditorDataTransfer.cpp',
+    'HTMLEditorDocumentCommands.cpp',
     'HTMLEditorEventListener.cpp',
     'HTMLEditorObjectResizer.cpp',
     'HTMLEditRules.cpp',
     'HTMLEditUtils.cpp',
     'HTMLInlineTableEditor.cpp',
     'HTMLStyleEditor.cpp',
     'HTMLTableEditor.cpp',
     'HTMLURIRefObject.cpp',