Header include dependency cleanup. b=64023 r=jag rs=brendan

accessible/src/base/nsAccessible.cpp

@@ -29,6 +29,7 @@
 #include "nsIContent.h"
 #include "nsIFrame.h"
 #include "nsIScrollableView.h"
+#include "nsIWidget.h"
 #include "nsRootAccessible.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsPIDOMWindow.h"
@@ -37,6 +38,8 @@
 #include "nsHTMLFormControlAccessible.h"
 #include "nsHTMLLinkAccessible.h"
 #include "nsIDOMHTMLAreaElement.h"
+#include "nsISelection.h"
+#include "nsISelectionController.h"
 #include "nsIServiceManager.h"
 #include "nsIStringBundle.h"
 #include "nsXPIDLString.h"

accessible/src/base/nsGenericAccessible.cpp

@@ -25,6 +25,7 @@
 #include "nsIFrame.h"
 #include "nsCOMPtr.h"
 #include "nsIWeakReference.h"
+#include "nsISelectionController.h"
 #include "nsReadableUtils.h"
 #include "nsIContent.h"
 

accessible/src/html/nsHTMLAreaAccessible.cpp

@@ -24,11 +24,13 @@
 #include "nsGenericAccessible.h"
 #include "nsHTMLAreaAccessible.h"
 #include "nsReadableUtils.h"
+#include "nsString.h"
 #include "nsAccessible.h"
 #include "nsIAccessibilityService.h"
 #include "nsIServiceManager.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMHTMLAreaElement.h"
+#include "nsGUIEvent.h"
 
 
 // --- area -----

accessible/src/html/nsHTMLFormControlAccessible.cpp

@@ -29,10 +29,12 @@
 #include "nsHTMLAtoms.h"
 #include "nsIDOMHTMLButtonElement.h"
 #include "nsReadableUtils.h"
+#include "nsString.h"
 #include "nsAccessible.h"
 #include "nsIFrame.h"
 #include "nsIDOMHTMLLabelElement.h"
 #include "nsIDOMHTMLFormElement.h"
+#include "nsISelectionController.h"
 
 nsHTMLFormControlAccessible::nsHTMLFormControlAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
 nsLeafAccessible(aNode, aShell)

accessible/src/html/nsHTMLTextAccessible.cpp

@@ -24,6 +24,7 @@
 #include "nsHTMLTextAccessible.h"
 #include "nsWeakReference.h"
 #include "nsIFrame.h"
+#include "nsString.h"
 #include "nsILink.h"
 #include "nsILinkHandler.h"
 #include "nsISelection.h"

accessible/src/nsAccessible.cpp

@@ -29,6 +29,7 @@
 #include "nsIContent.h"
 #include "nsIFrame.h"
 #include "nsIScrollableView.h"
+#include "nsIWidget.h"
 #include "nsRootAccessible.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsPIDOMWindow.h"
@@ -37,6 +38,8 @@
 #include "nsHTMLFormControlAccessible.h"
 #include "nsHTMLLinkAccessible.h"
 #include "nsIDOMHTMLAreaElement.h"
+#include "nsISelection.h"
+#include "nsISelectionController.h"
 #include "nsIServiceManager.h"
 #include "nsIStringBundle.h"
 #include "nsXPIDLString.h"

accessible/src/nsGenericAccessible.cpp

@@ -25,6 +25,7 @@
 #include "nsIFrame.h"
 #include "nsCOMPtr.h"
 #include "nsIWeakReference.h"
+#include "nsISelectionController.h"
 #include "nsReadableUtils.h"
 #include "nsIContent.h"
 

accessible/src/nsHTMLAreaAccessible.cpp

@@ -24,11 +24,13 @@
 #include "nsGenericAccessible.h"
 #include "nsHTMLAreaAccessible.h"
 #include "nsReadableUtils.h"
+#include "nsString.h"
 #include "nsAccessible.h"
 #include "nsIAccessibilityService.h"
 #include "nsIServiceManager.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMHTMLAreaElement.h"
+#include "nsGUIEvent.h"
 
 
 // --- area -----

accessible/src/nsHTMLFormControlAccessible.cpp

@@ -29,10 +29,12 @@
 #include "nsHTMLAtoms.h"
 #include "nsIDOMHTMLButtonElement.h"
 #include "nsReadableUtils.h"
+#include "nsString.h"
 #include "nsAccessible.h"
 #include "nsIFrame.h"
 #include "nsIDOMHTMLLabelElement.h"
 #include "nsIDOMHTMLFormElement.h"
+#include "nsISelectionController.h"
 
 nsHTMLFormControlAccessible::nsHTMLFormControlAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell):
 nsLeafAccessible(aNode, aShell)

accessible/src/nsHTMLTextAccessible.cpp

@@ -24,6 +24,7 @@
 #include "nsHTMLTextAccessible.h"
 #include "nsWeakReference.h"
 #include "nsIFrame.h"
+#include "nsString.h"
 #include "nsILink.h"
 #include "nsILinkHandler.h"
 #include "nsISelection.h"

caps/src/nsScriptSecurityManager.cpp

@@ -25,6 +25,7 @@
 #include "nsScriptSecurityManager.h"
 #include "nsIServiceManager.h"
 #include "nsIScriptObjectPrincipal.h"
+#include "nsIScriptContext.h"
 #include "nsIURL.h"
 #include "nsIJARURI.h"
 #include "nspr.h"

caps/src/nsSecurityManagerFactory.cpp

@@ -34,6 +34,7 @@
 #include "nsICategoryManager.h"
 #include "nsXPIDLString.h"
 #include "nsCOMPtr.h"
+#include "nsIServiceManager.h"
 
 ///////////////////////
 // nsSecurityNameSet //

content/base/public/nsIContent.h

@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include "nslayout.h"
 #include "nsISupports.h"
-#include "nsGUIEvent.h"
+#include "nsEvent.h"
 #include "nsAWritableString.h"
 
 // Forward declarations

content/base/public/nsIDocument.h

@@ -24,8 +24,9 @@
 
 #include "nslayout.h"
 #include "nsISupports.h"
-#include "nsGUIEvent.h"
+#include "nsEvent.h"
 #include "nsAWritableString.h"
+#include "nsString.h"
 
 class nsIAtom;
 class nsIArena;

content/base/src/nsCopySupport.cpp

@@ -26,6 +26,7 @@
 #include "nsIComponentManager.h" 
 #include "nsIServiceManager.h"
 #include "nsIClipboard.h"
+#include "nsISelection.h"
 #include "nsWidgetsCID.h"
 #include "nsIEventStateManager.h"
 #include "nsIPresContext.h"

content/base/src/nsDocument.cpp

@@ -49,6 +49,7 @@
 #include "nsIBaseWindow.h"
 
 #include "nsIDOMEventListener.h"
+#include "nsGUIEvent.h"
 
 #include "nsIDOMStyleSheet.h"
 #include "nsDOMAttribute.h"

content/base/src/nsDocumentViewer.cpp

@@ -83,6 +83,8 @@
 #include "nsIFrameManager.h"
 #include "nsIParser.h"
 #include "nsIPrintContext.h"
+#include "nsGUIEvent.h"
+#include "nsHTMLReflowState.h"
 #include "nsIDOMHTMLAnchorElement.h"
 #include "nsIDOMHTMLImageElement.h"
 

content/base/src/nsGenericElement.cpp

@@ -42,6 +42,7 @@
 #include "nsIFrame.h"
 #include "nsIPresShell.h"
 #include "nsIPresContext.h"
+#include "nsStyleConsts.h"
 #include "nsIView.h"
 #include "nsIViewManager.h"
 #include "nsString.h"

content/base/src/nsRange.cpp

@@ -40,6 +40,7 @@
 #include "nsIComponentManager.h"
 #include "nsParserCIID.h"
 #include "nsIHTMLFragmentContentSink.h"
+#include "nsIEnumerator.h"
 #include "nsScriptSecurityManager.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIScriptContext.h"

content/base/src/nsScriptLoader.cpp

@@ -32,6 +32,7 @@
 #include "nsHTMLAtoms.h"
 #include "nsNetUtil.h"
 #include "nsIScriptGlobalObject.h"
+#include "nsIScriptContext.h"
 #include "nsINodeInfo.h"
 #include "nsINameSpaceManager.h"
 #include "nsIScriptSecurityManager.h"

content/base/src/nsSelection.cpp

@@ -40,6 +40,7 @@
 #include "nsIDOMNode.h"
 #include "nsRange.h"
 #include "nsISupportsArray.h"
+#include "nsGUIEvent.h"
 #include "nsIDOMKeyEvent.h"
 #include "nsITableLayout.h"
 #include "nsITableCellLayout.h"

content/events/public/nsIEventListenerManager.h

@@ -23,7 +23,7 @@
 #ifndef nsIEventListenerManager_h__
 #define nsIEventListenerManager_h__
 
-#include "nsGUIEvent.h"
+#include "nsEvent.h"
 #include "nsISupports.h"
 #include "nsVoidArray.h"
 

content/events/public/nsIEventStateManager.h

@@ -23,7 +23,7 @@
 #ifndef nsIEventStateManager_h__
 #define nsIEventStateManager_h__
 
-#include "nsGUIEvent.h"
+#include "nsEvent.h"
 #include "nsISupports.h"
 #include "nsVoidArray.h"
 

content/events/public/nsIPrivateCompositionEvent.h

@@ -23,7 +23,7 @@
 #ifndef nsIPrivateCompositionEvent_h__
 #define nsIPrivateCompositionEvent_h__
 
-#include "nsGUIEvent.h"
+#include "nsEvent.h"
 #include "nsISupports.h"
 
 // {ECF6BEF1-5F0C-11d3-9EB3-0060089FE59B}

content/events/public/nsIPrivateDOMEvent.h

@@ -23,7 +23,7 @@
 #ifndef nsIPrivateDOMEvent_h__
 #define nsIPrivateDOMEvent_h__
 
-#include "nsGUIEvent.h"
+#include "nsEvent.h"
 #include "nsISupports.h"
 
 class nsIPresContext;

content/events/public/nsIPrivateTextEvent.h

@@ -23,7 +23,7 @@
 #ifndef nsIPrivateTextEvent_h__
 #define nsIPrivateTextEvent_h__
 
-#include "nsGUIEvent.h"
+#include "nsEvent.h"
 #include "nsISupports.h"
 #include "nsIPrivateTextRange.h"
 

content/events/src/nsEventStateManager.cpp

@@ -59,6 +59,7 @@
 #include "nsFrameTraversal.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIWebNavigation.h"
+#include "nsIContentViewer.h"
 
 #include "nsIServiceManager.h"
 #include "nsIPref.h"

content/html/content/public/nsIFormSubmitObserver.h

@@ -32,10 +32,10 @@
 
 #include "nsISupports.h"
 #include "prtypes.h"
-#include "nsIDOMWindowInternal.h"
-#include "nsIURI.h"
 
-class nsString;
+class nsIContent;
+class nsIDOMWindowInternal;
+class nsIURI;
 
 // {a6cf9106-15b3-11d2-932e-00805f8add32}
 #define NS_IFORMSUBMITOBSERVER_IID      \

content/html/content/src/nsGenericHTMLElement.h

@@ -50,6 +50,7 @@ class nsIURI;
 class nsIFormControlFrame;
 class nsIForm;
 class nsIPresState;
+struct nsRect;
 
 extern void GetGenericHTMLElementIIDs(nsVoidArray& aArray);
 

content/html/content/src/nsHTMLButtonElement.cpp

@@ -39,6 +39,7 @@
 #include "nsIDOMEvent.h"
 #include "nsISizeOfHandler.h"
 #include "nsIDocument.h"
+#include "nsGUIEvent.h"
 
 
 class nsHTMLButtonElement : public nsGenericHTMLContainerFormElement,

content/html/content/src/nsHTMLFormElement.cpp

@@ -45,6 +45,7 @@
 #include "nsContentUtils.h"
 #include "nsHashtable.h"
 #include "nsContentList.h"
+#include "nsGUIEvent.h"
 
 static const int NS_FORM_CONTROL_LIST_HASHTABLE_SIZE = 16;
 

content/html/content/src/nsHTMLImageElement.cpp

@@ -49,6 +49,7 @@
 #include "nsIImageFrame.h"
 #include "nsLayoutAtoms.h"
 #include "nsNodeInfoManager.h"
+#include "nsGUIEvent.h"
 #include "nsContentPolicyUtils.h"
 #include "nsIDOMWindow.h"
 

content/html/content/src/nsHTMLInputElement.cpp

@@ -54,6 +54,7 @@
 #include "nsDOMError.h"
 #include "nsIPrivateDOMEvent.h"
 #include "nsIEditor.h"
+#include "nsGUIEvent.h"
 
 #include "nsIPresState.h"
 #include "nsIDOMEvent.h"

content/html/content/src/nsHTMLLabelElement.cpp

@@ -38,6 +38,7 @@
 #include "nsISizeOfHandler.h"
 #include "nsIFormControlFrame.h"
 #include "nsIPresShell.h"
+#include "nsGUIEvent.h"
 
 
 class nsHTMLLabelElement : public nsGenericHTMLContainerFormElement,

content/html/content/src/nsHTMLScriptElement.cpp

@@ -33,6 +33,7 @@
 #include "nsIScriptLoader.h"
 #include "nsIScriptLoaderObserver.h"
 #include "nsIScriptElement.h"
+#include "nsGUIEvent.h"
 
 class nsHTMLScriptElement : public nsGenericHTMLContainerElement,
                             public nsIDOMHTMLScriptElement,

content/html/content/src/nsHTMLSelectElement.cpp

@@ -42,6 +42,7 @@
 #include "nsISelectElement.h"
 #include "nsISelectControlFrame.h"
 #include "nsIDOMNSHTMLOptionCollectn.h"
+#include "nsGUIEvent.h"
 
 // PresState
 #include "nsISupportsArray.h"

content/html/content/src/nsHTMLTextAreaElement.cpp

@@ -48,6 +48,7 @@
 #include "nsIFrame.h"
 #include "nsIFormControlFrame.h"
 #include "nsIPrivateDOMEvent.h"
+#include "nsGUIEvent.h"
 #include "nsIRuleNode.h"
 
 static NS_DEFINE_CID(kXULControllersCID,  NS_XULCONTROLLERS_CID);

content/html/document/src/nsHTMLContentSink.cpp

@@ -118,6 +118,7 @@
 #include "nsDOMError.h"
 #include "nsIScrollable.h"
 #include "nsContentPolicyUtils.h"
+#include "nsIScriptContext.h"
 #include "nsStyleLinkElement.h"
 
 #include "nsReadableUtils.h"

content/html/document/src/nsIHTMLDocument.h

@@ -27,6 +27,7 @@
 
 class nsIImageMap;
 class nsString;
+class nsIDOMNodeList;
 class nsIDOMHTMLCollection;
 class nsIDOMHTMLFormElement;
 class nsIDOMHTMLMapElement;

content/html/document/src/nsImageDocument.cpp

@@ -50,6 +50,7 @@
 // Needed to fetch scrollbar prefs for image documents that are iframes/frameset frames
 #include "nsIScrollable.h"
 #include "nsWeakReference.h"
+#include "nsRect.h"
 
 #define NSIMAGEDOCUMENT_PROPERTIES_URI "chrome://communicator/locale/layout/ImageDocument.properties"
 static NS_DEFINE_CID(kStringBundleServiceCID,  NS_STRINGBUNDLESERVICE_CID);

content/html/style/src/nsCSSScanner.cpp

@@ -34,11 +34,11 @@ static char* kNullPointer = "null pointer";
 // for #ifdef CSS_REPORT_PARSE_ERRORS
 #include "nsCOMPtr.h"
 #include "nsIServiceManager.h"
+#include "nsIComponentManager.h"
 #include "nsReadableUtils.h"
 #include "nsIURI.h"
 #include "nsIConsoleService.h"
 #include "nsIScriptError.h"
-#include "nsComponentManagerUtils.h"  // put this higher and gcc barfs...
 
 // Don't bother collecting whitespace characters in token's mIdent buffer
 #undef COLLECT_WHITESPACE

content/xbl/public/nsIBindingManager.h

@@ -42,6 +42,7 @@ class nsIXBLDocumentInfo;
 class nsIAtom;
 class nsIStreamListener;
 class nsIXPConnectWrappedJS;
+class nsIDOMNodeList;
 
 // {55D70FE0-C8E5-11d3-97FB-00400553EEF0}
 #define NS_IBINDING_MANAGER_IID \

content/xbl/src/nsBindingManager.cpp

@@ -66,6 +66,7 @@
 
 #include "jsapi.h"
 #include "nsIXPConnect.h"
+#include "nsIScriptContext.h"
 
 // Static IIDs/CIDs. Try to minimize these.
 static NS_DEFINE_CID(kNameSpaceManagerCID,        NS_NAMESPACEMANAGER_CID);

content/xbl/src/nsXBLBinding.cpp

@@ -53,6 +53,7 @@
 #include "nsXBLService.h"
 #include "nsIXBLInsertionPoint.h"
 #include "nsIXPConnect.h"
+#include "nsIScriptContext.h"
 
 // Event listeners
 #include "nsIEventListenerManager.h"

content/xbl/src/nsXBLPrototypeHandler.cpp

@@ -54,6 +54,7 @@
 #include "nsIServiceManager.h"
 #include "nsXPIDLString.h"
 #include "nsXULAtoms.h"
+#include "nsGUIEvent.h"
 #include "nsIXPConnect.h"
 #include "nsIDOMScriptObjectFactory.h"
 #include "nsDOMCID.h"

content/xml/content/src/nsXMLElement.cpp

@@ -41,6 +41,8 @@
 #include "nsIRefreshURI.h"
 #include "nsStyleConsts.h"
 #include "nsIPresShell.h"
+#include "nsGUIEvent.h"
+#include "nsIPresContext.h"
 
 #include "nsIDOMCSSStyleDeclaration.h"
 #include "nsIDOMViewCSS.h"

content/xml/document/src/nsXMLContentSink.cpp

@@ -74,6 +74,7 @@
 #include "nsParserUtils.h"
 #include "nsIDocumentViewer.h"
 #include "nsIScrollable.h"
+#include "nsRect.h"
 #include "nsGenericElement.h"
 #include "nsIWebNavigation.h"
 #include "nsIScriptElement.h"

content/xml/document/src/nsXMLDocument.cpp

@@ -75,6 +75,7 @@
 #include "nsLayoutCID.h"
 #include "nsContentCID.h"
 #include "nsDOMAttribute.h"
+#include "nsGUIEvent.h"
 
 #include "nsCExternalHandlerService.h"
 #include "nsIMIMEService.h"

content/xul/content/src/nsXULPopupListener.cpp

@@ -31,6 +31,7 @@
  */
 
 #include "nsCOMPtr.h"
+#include "nsIServiceManager.h"
 #include "nsXULAtoms.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMXULElement.h"
@@ -44,6 +45,7 @@
 #include "nsContentCID.h"
 
 #include "nsIScriptGlobalObject.h"
+#include "nsIScriptContext.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsIDOMXULDocument.h"
 #include "nsIDocument.h"

content/xul/content/src/nsXULTreeElement.cpp

@@ -46,6 +46,7 @@
 #include "nsLayoutCID.h"
 #include "nsString.h"
 #include "nsITreeBoxObject.h"
+#include "nsGUIEvent.h"
 
 static NS_DEFINE_CID(kCRangeCID, NS_RANGE_CID);
 static NS_DEFINE_IID(kCContentIteratorCID, NS_CONTENTITERATOR_CID);

content/xul/document/src/nsXULCommandDispatcher.cpp

@@ -49,6 +49,7 @@
 #include "nsXULCommandDispatcher.h"
 #include "prlog.h"
 #include "nsIDOMEventTarget.h"
+#include "nsGUIEvent.h"
 #include "nsContentUtils.h"
 
 #ifdef PR_LOGGING

content/xul/document/src/nsXULDocument.cpp

@@ -65,6 +65,7 @@
 #include "nsIDOMEvent.h"
 #include "nsIDOMEventListener.h"
 #include "nsIDOMEventReceiver.h"
+#include "nsGUIEvent.h"
 #include "nsIDOMRange.h"
 #include "nsIDOMScriptObjectFactory.h"
 #include "nsIDOMText.h"
@@ -137,6 +138,7 @@
 #include "nsIMIMEService.h"
 #include "nsNetUtil.h"
 #include "nsMimeTypes.h"
+#include "nsISelectionController.h"
 #include "nsContentUtils.h"
 
 

content/xul/document/src/nsXULPrototypeCache.cpp

@@ -40,6 +40,7 @@
 #include "nsIDocument.h"
 #include "nsIXBLDocumentInfo.h"
 #include "nsIPref.h"
+#include "nsIServiceManager.h"
 
 class nsXULPrototypeCache : public nsIXULPrototypeCache
 {

docshell/base/nsDSURIContentListener.cpp

@@ -24,6 +24,7 @@
 #include "nsDSURIContentListener.h"
 #include "nsIChannel.h"
 #include "nsXPIDLString.h"
+#include "nsIServiceManager.h"
 
 //*****************************************************************************
 //***    nsDSURIContentListener: Object Management

docshell/base/nsDocShell.h

@@ -32,6 +32,7 @@
 #include "nsIContentViewer.h"
 #include "nsIPref.h"
 #include "nsVoidArray.h"
+#include "nsIScriptContext.h"
 
 #include "nsCDocShell.h"
 #include "nsIDocShellTreeOwner.h"

docshell/base/nsIContentViewer.idl

@@ -4,8 +4,7 @@ interface nsIDOMDocument;
 
 
 %{ C++
-#include "nsIWidget.h"
+class nsIWidget;
-
 class nsIDeviceContext;
 struct nsRect;
 %}

docshell/base/nsIContentViewerFile.idl

@@ -24,9 +24,9 @@
 
 
 %{ C++
-#include "nsIDeviceContext.h"
+class nsIDeviceContext;
-#include "nsIWebShell.h"
+class nsIWebShell;
-#include "nsIDOMWindow.h"
+class nsIDOMWindow;
 %}
 
 [ptr] native nsIDeviceContext(nsIDeviceContext);

docshell/base/nsIDocShell.idl

@@ -22,12 +22,11 @@
  */
 
 #include "nsISupports.idl"
-#include "nsIURIContentListener.idl"
+#include "domstubs.idl"
-#include "nsIURI.idl"
-#include "nsIContentViewer.idl"
 
 %{ C++
-#include "nsIPresContext.h"
+class nsIPresContext;
+class nsIPresShell;
 %}
 
 /**
@@ -37,11 +36,15 @@
 [ptr] native nsIPresContext(nsIPresContext);
 [ptr] native nsIPresShell(nsIPresShell);
 
+interface nsIURI;
+interface nsIContentViewer;
+interface nsIURIContentListener;
 interface nsIChromeEventHandler;
 interface nsIDocShellLoadInfo;
 interface nsIDocumentCharsetInfo;
 interface nsIWebNavigation;
 interface nsISimpleEnumerator;
+interface nsIInputStream;
 interface nsISHEntry;
 
 [scriptable, uuid(69E5DE00-7B8B-11d3-AF61-00A024FFC08C)]

docshell/base/nsIMarkupDocumentViewer.idl

@@ -20,8 +20,6 @@
  *   Travis Bogard <travis@netscape.com>
  */
 
-#include "nsISupports.idl"
-
 /**
  * The nsIContentViewerEdit    
  */

docshell/base/nsWebShell.cpp

@@ -102,6 +102,9 @@ typedef unsigned long HMTX;
 #include "nsPIDOMWindow.h"
 #include "nsIController.h"
 #include "nsIFocusController.h"
+#include "nsGUIEvent.h"
+#include "nsISelection.h"
+#include "nsISelectionController.h"
 #include "nsIFileStream.h"
 
 #include "nsIHttpChannel.h" // add this to the ick include list...we need it to QI for post data interface

dom/public/nsIScriptContext.h

@@ -31,6 +31,7 @@ class nsIScriptGlobalObject;
 class nsIScriptSecurityManager;
 class nsIScriptContextOwner;
 class nsIPrincipal;
+class nsIAtom;
 
 typedef void (*nsScriptTerminationFunc)(nsISupports* aRef);
 

dom/public/nsIScriptGlobalObject.h

@@ -24,9 +24,7 @@
 #define nsIScriptGlobalObject_h__
 
 #include "nsISupports.h"
-#include "nsIScriptContext.h"
+#include "nsEvent.h"
-#include "nsGUIEvent.h"
-#include "jsapi.h"
 
 class nsIScriptContext;
 class nsIDOMDocument;
@@ -35,6 +33,7 @@ class nsIPresContext;
 class nsIDocShell;
 class nsIDOMWindowInternal;
 class nsIScriptGlobalObjectOwner;
+struct JSObject;
 
 #define NS_ISCRIPTGLOBALOBJECT_IID \
 { 0x2b16fc80, 0xfa41, 0x11d1,  \

dom/src/base/nsDOMClassInfo.cpp

@@ -41,6 +41,8 @@
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMNSDocument.h"
+#include "nsIDOMEvent.h"
+#include "nsIDOMKeyEvent.h"
 #include "nsIDOMEventListener.h"
 
 // Window scriptable helper includes

dom/src/base/nsDOMException.cpp

@@ -23,6 +23,7 @@
 
 #include "nsIDOMDOMException.h"
 #include "nsDOMError.h"
+#include "nsCRT.h"
 #include "prprf.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsReadableUtils.h"

dom/src/base/nsGlobalWindow.cpp

@@ -45,7 +45,6 @@
 #include "nsIEventListenerManager.h"
 #include "nsEscape.h"
 #include "nsStyleCoord.h"
-#include "nsHTMLReflowState.h"
 #include "nsMimeTypeArray.h"
 #include "nsNetUtil.h"
 #include "nsPluginArray.h"
@@ -100,6 +99,7 @@
 #include "nsDOMError.h"
 #include "nsIWindowWatcher.h"
 #include "nsPIWindowWatcher.h"
+#include "nsIContentViewer.h"
 #include "nsISupportsPrimitives.h"
 #include "nsDOMClassInfo.h"
 #include "nsIJSNativeInitializer.h"

dom/src/base/nsJSEnvironment.cpp

@@ -52,6 +52,7 @@
 #include "nsIInterfaceRequestor.h"
 #include "nsIPrompt.h"
 #include "nsIObserverService.h"
+#include "nsGUIEvent.h"
 #include "nsScriptNameSpaceManager.h"
 #include "nsIThread.h"
 

editor/base/IMETextTxn.cpp

@@ -30,6 +30,7 @@
 #include "nsIPresShell.h"
 #include "EditAggregateTxn.h"
 #include "nsLayoutCID.h"
+#include "nsISelectionController.h"
 
 // #define DEBUG_IMETXN
 static NS_DEFINE_IID(kRangeCID, NS_RANGE_CID);

editor/base/nsComposerCommands.cpp

@@ -37,6 +37,7 @@
 #include "nsIClipboard.h"
 
 #include "nsXPIDLString.h"
+#include "nsCOMPtr.h"
 
 #include "nsComposerCommands.h"
 

editor/base/nsEditor.cpp

@@ -48,6 +48,7 @@
 #include "nsIViewManager.h"
 #include "nsISelection.h"
 #include "nsISelectionPrivate.h"
+#include "nsISelectionController.h"
 #include "nsIEnumerator.h"
 #include "nsIAtom.h"
 #include "nsISupportsArray.h"
@@ -59,6 +60,7 @@
 #include "nsIWidget.h"
 #include "nsIScrollbar.h"
 #include "nsIPlaintextEditor.h"
+#include "nsGUIEvent.h"
 
 #include "nsIFrame.h"  // Needed by IME code
 

editor/base/nsEditorCommands.cpp

@@ -23,6 +23,7 @@
 
 
 #include "nsCRT.h"
+#include "nsString.h"
 
 #include "nsIEditor.h"
 #include "nsIEditorMailSupport.h"

editor/base/nsEditorEventListeners.cpp

@@ -31,6 +31,7 @@
 #include "nsIPresShell.h"
 #include "nsIDOMElement.h"
 #include "nsISelection.h"
+#include "nsISelectionController.h"
 #include "nsIDOMCharacterData.h"
 #include "nsISupportsArray.h"
 #include "nsIStringStream.h"

editor/base/nsEditorShell.cpp

@@ -54,6 +54,7 @@
 #include "nsCURILoader.h"
 #include "nsNetUtil.h"
 #include "nsIFileChannel.h"
+#include "nsILocalFile.h"
 
 #include "nsIScriptGlobalObject.h"
 #include "nsIWebNavigation.h"
@@ -76,6 +77,7 @@
 #include "nsIPresContext.h"
 #include "nsISelection.h"
 #include "nsISelectionPrivate.h"
+#include "nsISelectionController.h"
 
 #include "nsIFilePicker.h"
 #include "nsIFindComponent.h"

editor/base/nsEditorShell.h

@@ -47,6 +47,7 @@
 #include "nsIHTMLEditor.h"
 #include "nsIStringBundle.h"
 #include "nsICSSStyleSheet.h"
+#include "nsISupportsArray.h"
 
 // Parser Observation
 #include "nsEditorParserObserver.h"

editor/base/nsHTMLEditRules.cpp

@@ -42,6 +42,7 @@
 #include "nsIDOMNodeList.h"
 #include "nsISelection.h"
 #include "nsISelectionPrivate.h"
+#include "nsISelectionController.h"
 #include "nsIDOMRange.h"
 #include "nsIDOMNSRange.h"
 #include "nsIDOMCharacterData.h"

editor/base/nsHTMLEditor.cpp

@@ -86,6 +86,7 @@
 #include "nsInternetCiter.h"
 #include "nsISupportsPrimitives.h"
 #include "SetDocTitleTxn.h"
+#include "nsGUIEvent.h"
 
 // netwerk
 #include "nsIURI.h"

editor/base/nsPlaintextEditor.cpp

@@ -41,6 +41,7 @@
 #include "nsIDOMHTMLAnchorElement.h"
 #include "nsIDOMHTMLImageElement.h"
 #include "nsISelectionController.h"
+#include "nsGUIEvent.h"
 
 #include "nsIIndependentSelection.h" //domselections answer to frameselection
 

editor/base/nsStyleSheetTxns.cpp

@@ -28,6 +28,7 @@
 #include "nsIStyleSet.h"
 #include "nsIDocument.h"
 #include "nsIDocumentObserver.h"
+#include "nsISelectionController.h"
 
 
 #include "nsStyleSheetTxns.h"

editor/composer/src/nsComposerCommands.cpp

@@ -37,6 +37,7 @@
 #include "nsIClipboard.h"
 
 #include "nsXPIDLString.h"
+#include "nsCOMPtr.h"
 
 #include "nsComposerCommands.h"
 

editor/composer/src/nsEditorShell.cpp

@@ -54,6 +54,7 @@
 #include "nsCURILoader.h"
 #include "nsNetUtil.h"
 #include "nsIFileChannel.h"
+#include "nsILocalFile.h"
 
 #include "nsIScriptGlobalObject.h"
 #include "nsIWebNavigation.h"
@@ -76,6 +77,7 @@
 #include "nsIPresContext.h"
 #include "nsISelection.h"
 #include "nsISelectionPrivate.h"
+#include "nsISelectionController.h"
 
 #include "nsIFilePicker.h"
 #include "nsIFindComponent.h"

editor/composer/src/nsEditorShell.h

@@ -47,6 +47,7 @@
 #include "nsIHTMLEditor.h"
 #include "nsIStringBundle.h"
 #include "nsICSSStyleSheet.h"
+#include "nsISupportsArray.h"
 
 // Parser Observation
 #include "nsEditorParserObserver.h"

editor/idl/nsIEditor.idl

@@ -21,18 +21,22 @@
 
 #include "nsISupports.idl"
 #include "domstubs.idl"
-#include "nsISelection.idl"
+
-#include "nsISelectionController.idl"
+interface nsIFile;
-#include "nsIFile.idl"
+interface nsIAtom;
-#include "nsIAtom.idl"
+interface nsISelection;
-#include "nsIOutputStream.idl"
+interface nsISelectionController;
-#include "nsIDocumentStateListener.idl"
+interface nsIDocumentStateListener;
-#include "nsITransactionManager.idl"
+interface nsIOutputStream;
-#include "nsIEditorObserver.idl"
+interface nsITransactionManager;
-#include "nsIEditActionListener.idl"
+interface nsITransaction;
+interface nsIEditorObserver;
+interface nsIEditActionListener;
 
 %{C++
 
+#include "nsAWritableString.h"
+
 //class nsIDOMDocument;
 //class nsIDOMElement;
 //class nsIDOMNode;

editor/idl/nsIEditorShell.idl

@@ -21,12 +21,12 @@
  */
  
 #include "nsISupports.idl"
-#include "nsIFile.idl"
-#include "nsISupportsArray.idl"
-#include "nsIDocumentStateListener.idl"
-#include "nsISelectionController.idl"
-#include "nsITransactionManager.idl"
 
+interface nsIFile;
+interface nsISupportsArray;
+interface nsIDocumentStateListener;
+interface nsISelectionController;
+interface nsITransactionManager;
 interface nsIDOMWindowInternal;
 interface nsIDOMDocument;
 interface nsISelection;

editor/libeditor/base/IMETextTxn.cpp

@@ -30,6 +30,7 @@
 #include "nsIPresShell.h"
 #include "EditAggregateTxn.h"
 #include "nsLayoutCID.h"
+#include "nsISelectionController.h"
 
 // #define DEBUG_IMETXN
 static NS_DEFINE_IID(kRangeCID, NS_RANGE_CID);

editor/libeditor/base/nsEditor.cpp

@@ -48,6 +48,7 @@
 #include "nsIViewManager.h"
 #include "nsISelection.h"
 #include "nsISelectionPrivate.h"
+#include "nsISelectionController.h"
 #include "nsIEnumerator.h"
 #include "nsIAtom.h"
 #include "nsISupportsArray.h"
@@ -59,6 +60,7 @@
 #include "nsIWidget.h"
 #include "nsIScrollbar.h"
 #include "nsIPlaintextEditor.h"
+#include "nsGUIEvent.h"
 
 #include "nsIFrame.h"  // Needed by IME code
 

editor/libeditor/base/nsEditorCommands.cpp

@@ -23,6 +23,7 @@
 
 
 #include "nsCRT.h"
+#include "nsString.h"
 
 #include "nsIEditor.h"
 #include "nsIEditorMailSupport.h"

editor/libeditor/base/nsStyleSheetTxns.cpp

@@ -28,6 +28,7 @@
 #include "nsIStyleSet.h"
 #include "nsIDocument.h"
 #include "nsIDocumentObserver.h"
+#include "nsISelectionController.h"
 
 
 #include "nsStyleSheetTxns.h"

editor/libeditor/html/nsHTMLEditRules.cpp

@@ -42,6 +42,7 @@
 #include "nsIDOMNodeList.h"
 #include "nsISelection.h"
 #include "nsISelectionPrivate.h"
+#include "nsISelectionController.h"
 #include "nsIDOMRange.h"
 #include "nsIDOMNSRange.h"
 #include "nsIDOMCharacterData.h"

editor/libeditor/html/nsHTMLEditor.cpp

@@ -86,6 +86,7 @@
 #include "nsInternetCiter.h"
 #include "nsISupportsPrimitives.h"
 #include "SetDocTitleTxn.h"
+#include "nsGUIEvent.h"
 
 // netwerk
 #include "nsIURI.h"

editor/libeditor/text/nsEditorEventListeners.cpp

@@ -31,6 +31,7 @@
 #include "nsIPresShell.h"
 #include "nsIDOMElement.h"
 #include "nsISelection.h"
+#include "nsISelectionController.h"
 #include "nsIDOMCharacterData.h"
 #include "nsISupportsArray.h"
 #include "nsIStringStream.h"

editor/libeditor/text/nsPlaintextEditor.cpp

@@ -41,6 +41,7 @@
 #include "nsIDOMHTMLAnchorElement.h"
 #include "nsIDOMHTMLImageElement.h"
 #include "nsISelectionController.h"
+#include "nsGUIEvent.h"
 
 #include "nsIIndependentSelection.h" //domselections answer to frameselection
 

editor/libeditor/txtsvc/nsTextServicesDocument.cpp

@@ -23,6 +23,8 @@
 
 #include "nsLayoutCID.h"
 #include "nsIAtom.h"
+#include "nsString.h"
+#include "nsIEnumerator.h"
 #include "nsIContent.h"
 #include "nsIContentIterator.h"
 #include "nsIDOMNodeList.h"

editor/libeditor/txtsvc/nsTextServicesDocument.h

@@ -34,6 +34,7 @@
 #include "nsITextServicesDocument.h"
 #include "nsVoidArray.h"
 #include "nsTSDNotifier.h"
+#include "nsISelectionController.h"
 
 /** implementation of a text services object.
  *

editor/txtsvc/src/nsTextServicesDocument.cpp

@@ -23,6 +23,8 @@
 
 #include "nsLayoutCID.h"
 #include "nsIAtom.h"
+#include "nsString.h"
+#include "nsIEnumerator.h"
 #include "nsIContent.h"
 #include "nsIContentIterator.h"
 #include "nsIDOMNodeList.h"

editor/txtsvc/src/nsTextServicesDocument.h

@@ -34,6 +34,7 @@
 #include "nsITextServicesDocument.h"
 #include "nsVoidArray.h"
 #include "nsTSDNotifier.h"
+#include "nsISelectionController.h"
 
 /** implementation of a text services object.
  *

embedding/browser/activex/src/control/MozillaBrowser.cpp

@@ -46,6 +46,7 @@
 #include "nsIPrintListener.h"
 #include "nsIPrintOptions.h"
 #include "nsIWebBrowserPrint.h"
+#include "nsIWidget.h"
 
 #include "nsIDOMWindowInternal.h"
 #include "nsIDOMHTMLAnchorElement.h"

embedding/browser/activex/src/control/WebBrowserContainer.h

@@ -28,6 +28,7 @@
 #include "nsIContextMenuListener.h"
 #include "nsICommandHandler.h"
 #include "nsIEmbeddingSiteWindow.h"
+#include "nsIURIContentListener.h"
 #include "nsWeakReference.h"
 
 

embedding/browser/build/nsWebBrowserModule.cpp

@@ -21,6 +21,7 @@
  */
 
 #include "nsIModule.h"
+#include "nsIServiceManager.h"
 #include "nsIGenericFactory.h"
 #include "nsICategoryManager.h"
 #include "nsXPIDLString.h"

embedding/browser/gtk/src/EmbedPrivate.cpp

@@ -21,6 +21,7 @@
 
 #include <nsIDocShell.h>
 #include <nsIWebProgress.h>
+#include "nsIWidget.h"
 
 // for NS_APPSHELL_CID
 #include <nsWidgetsCID.h>

embedding/browser/gtk/src/EmbedWindow.cpp

@@ -24,6 +24,7 @@
 #include <nsCWebBrowser.h>
 #include <nsIComponentManager.h>
 #include <nsIDocShellTreeItem.h>
+#include "nsIWidget.h"
 
 #include "EmbedWindow.h"
 #include "EmbedPrivate.h"

embedding/browser/gtk/src/EmbedWindow.h

@@ -32,6 +32,7 @@
 #include <nsIBaseWindow.h>
 #include <nsIInterfaceRequestor.h>
 #include <nsCOMPtr.h>
+#include "nsString.h"
 
 #include <gtk/gtk.h>