--- a/editor/composer/moz.build
+++ b/editor/composer/moz.build
@@ -11,34 +11,32 @@ MOCHITEST_CHROME_MANIFESTS += ['test/chr
 XPIDL_SOURCES += [
     'nsIEditingSession.idl',
 ]
 
 XPIDL_MODULE = 'composer'
 
 UNIFIED_SOURCES += [
     'ComposerCommandsUpdater.cpp',
-    'EditorSpellCheck.cpp',
     'nsComposerCommands.cpp',
     'nsComposerController.cpp',
     'nsComposerDocumentCommands.cpp',
     'nsComposerRegistration.cpp',
-    'nsComposeTxtSrvFilter.cpp',
     'nsEditingSession.cpp',
 ]
 
 EXPORTS.mozilla += [
     'ComposerCommandsUpdater.h',
-    'EditorSpellCheck.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.
 ]
 
 FINAL_LIBRARY = 'xul'
 RESOURCE_FILES += [
     'res/EditorOverride.css',
     'res/grabber.gif',
     'res/table-add-column-after-active.gif',

rename from editor/composer/EditorSpellCheck.cpp
rename to editor/spellchecker/EditorSpellCheck.cpp

rename from editor/composer/EditorSpellCheck.h
rename to editor/spellchecker/EditorSpellCheck.h

--- a/editor/spellchecker/moz.build
+++ b/editor/spellchecker/moz.build
@@ -11,17 +11,20 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'txtsvc'
 
 EXPORTS += [
     'nsISpellChecker.h',
 ]
 
 EXPORTS.mozilla += [
+    'EditorSpellCheck.h',
     'TextServicesDocument.h',
 ]
 
 UNIFIED_SOURCES += [
+    'EditorSpellCheck.cpp',
+    'nsComposeTxtSrvFilter.cpp',
     'nsFilteredContentIterator.cpp',
     'TextServicesDocument.cpp',
 ]
 
 FINAL_LIBRARY = 'xul'

rename from editor/composer/nsComposeTxtSrvFilter.cpp
rename to editor/spellchecker/nsComposeTxtSrvFilter.cpp

rename from editor/composer/nsComposeTxtSrvFilter.h
rename to editor/spellchecker/nsComposeTxtSrvFilter.h