cleanup #includes; r=kaie, sr=darin, bug=180316

editor/composer/src/nsComposeTxtSrvFilter.h

@@ -42,11 +42,9 @@
 #include "nsITextServicesFilter.h"
 #include "nsIAtom.h"
 
-class nsIContent;
-
 /**
  * This class implements a filter interface, that enables
- * those usnig it to ski;p over certain nodes when traversing content
+ * those using it to skip over certain nodes when traversing content
  *
  * This filter is used to skip over various form control nodes and
  * mail's cite nodes

editor/composer/src/nsComposerCommands.cpp

@@ -43,11 +43,10 @@
 
 #include "nsIEditor.h"
 #include "nsIHTMLEditor.h"
-#include "nsIEditingSession.h"
-
 #include "nsIHTMLAbsPosEditor.h"
 
 #include "nsIDOMElement.h"
+#include "nsIAtom.h"
 
 #include "nsIClipboard.h"
 

editor/composer/src/nsComposerCommandsUpdater.cpp

@@ -25,17 +25,17 @@
 
 #include "nsIDOMWindow.h"
 #include "nsComposerCommandsUpdater.h"
-#include "nsIServiceManager.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIDOMDocument.h"
 #include "nsISelection.h"
 #include "nsIScriptGlobalObject.h"
 
 #include "nsIInterfaceRequestorUtils.h"
+#include "nsLiteralString.h"
 
 #include "nsICommandManager.h"
 #include "nsPICommandUpdater.h"
 
-#include "nsIEditor.h"
 #include "nsIDocShell.h"
 #include "nsITransactionManager.h"
 

editor/composer/src/nsComposerCommandsUpdater.h

@@ -30,7 +30,6 @@
 #define nsComposerCommandsUpdater_h__
 
 #include "nsCOMPtr.h"
-#include "nsString.h"
 #include "nsITimer.h"
 
 #include "nsISelectionListener.h"

editor/composer/src/nsComposerController.cpp

@@ -39,7 +39,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsIComponentManager.h"
 #include "nsIControllerCommandTable.h"
 #include "nsComposerController.h"
 #include "nsComposerCommands.h"

editor/composer/src/nsComposerRegistration.cpp

@@ -45,6 +45,7 @@
 #include "nsEditorSpellCheck.h"     // for the CID
 #include "nsEditorService.h"
 #include "nsComposeTxtSrvFilter.h"
+#include "nsIController.h"
 #include "nsIControllerContext.h"
 #include "nsIControllerCommandTable.h"
 

editor/composer/src/nsEditingSession.cpp

@@ -50,6 +50,7 @@
 #include "nsITransactionManager.h"
 
 #include "nsIEditorDocShell.h"
+#include "nsIDocShell.h"
 
 #include "nsIChannel.h"
 #include "nsIWebProgress.h"
@@ -67,13 +68,13 @@
 #include "nsComposerCommandsUpdater.h"
 #include "nsEditingSession.h"
 
-#include "nsIComponentManager.h"
-#include "nsIInterfaceRequestor.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIInterfaceRequestorUtils.h"
 
 #include "nsIContentViewer.h"
 #include "nsISelectionController.h"
 #include "nsIPlaintextEditor.h"
+#include "nsIEditor.h"
 
 #include "nsIDOMNSDocument.h"
 #include "nsIScriptContext.h"

editor/composer/src/nsEditingSession.h

@@ -45,17 +45,8 @@
 #include "nsWeakReference.h"
 #endif
 
-#include "nsIEditor.h"
 #include "nsITimer.h"
 
-#ifndef __gen_nsIControllers_h__
-#include "nsIControllers.h"
-#endif
-
-#ifndef __gen_nsIDocShell_h__
-#include "nsIDocShell.h"
-#endif
-
 #ifndef __gen_nsIWebProgressListener_h__
 #include "nsIWebProgressListener.h"
 #endif
@@ -71,8 +62,11 @@
 
 
 class nsIWebProgress;
+class nsIDocShell;
 class nsIEditorDocShell;
 class nsIChannel;
+class nsIEditor;
+class nsIControllers;
 
 class nsComposerCommandsUpdater;
 

editor/composer/src/nsEditorParserObserver.cpp

@@ -37,7 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsIServiceManager.h"
+#include "nsIServiceManagerUtils.h"
 #include "nsIParserService.h"
 #include "nsEditorParserObserver.h"
 

editor/composer/src/nsEditorParserObserver.h

@@ -39,11 +39,9 @@
 
 #include "nsIElementObserver.h"
 #include "nsIObserver.h"
-#include "nsIObserverService.h"
 
 #include "nsWeakReference.h"
 #include "nsString.h"
-#include "nsVoidArray.h"
 #include "nsHTMLTags.h"
 
 class nsEditorParserObserver : public nsSupportsWeakReference,

editor/composer/src/nsEditorSpellCheck.cpp

@@ -55,7 +55,7 @@
 #include "nsIChromeRegistry.h"
 #include "nsString.h"
 #include "nsReadableUtils.h"
-#include "nsComposeTxtSrvFilter.h"
+#include "nsITextServicesFilter.h"
 
 NS_IMPL_ISUPPORTS1(nsEditorSpellCheck, nsIEditorSpellCheck);
 

editor/composer/src/nsEditorSpellCheck.h

@@ -46,8 +46,6 @@
 #include "nsVoidArray.h"
 #include "nsCOMPtr.h"
 
-#include "nsComposeTxtSrvFilter.h"
-
 #define NS_EDITORSPELLCHECK_CID                     \
 { /* {75656ad9-bd13-4c5d-939a-ec6351eea0cc} */        \
     0x75656ad9, 0xbd13, 0x4c5d,                       \