diff --git a/content/base/public/nsINode.h b/content/base/public/nsINode.h
index b95dce508716..c853a5b5429d 100644
--- a/content/base/public/nsINode.h
+++ b/content/base/public/nsINode.h
@@ -16,6 +16,7 @@
 #include "nsPropertyTable.h"        // for typedefs
 #include "nsTObserverArray.h"       // for member
 #include "nsWindowMemoryReporter.h" // for NS_DECL_SIZEOF_EXCLUDING_THIS
+#include "mozilla/ErrorResult.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/dom/EventTarget.h" // for base class
 
diff --git a/content/events/public/EventTarget.h b/content/events/public/EventTarget.h
index cc0a74d46940..af4001d8a6d8 100644
--- a/content/events/public/EventTarget.h
+++ b/content/events/public/EventTarget.h
@@ -8,19 +8,21 @@
 
 #include "nsIDOMEventTarget.h"
 #include "nsWrapperCache.h"
-#include "nsIDOMEventListener.h"
-#include "mozilla/ErrorResult.h"
-#include "mozilla/dom/Nullable.h"
 #include "nsIAtom.h"
 
 class nsDOMEvent;
 class nsIDOMWindow;
+class nsIDOMEventListener;
 
 namespace mozilla {
+
+class ErrorResult;
+
 namespace dom {
 
 class EventListener;
 class EventHandlerNonNull;
+template <class T> class Nullable;
 
 // IID for the dom::EventTarget interface
 #define NS_EVENTTARGET_IID \
diff --git a/content/events/src/DOMWheelEvent.cpp b/content/events/src/DOMWheelEvent.cpp
index d0ae74ca02e8..d56016b39f3f 100644
--- a/content/events/src/DOMWheelEvent.cpp
+++ b/content/events/src/DOMWheelEvent.cpp
@@ -6,7 +6,6 @@
 
 #include "DOMWheelEvent.h"
 #include "nsGUIEvent.h"
-#include "nsIContent.h"
 #include "prtime.h"
 
 namespace mozilla {
diff --git a/content/events/src/SpeechRecognitionError.cpp b/content/events/src/SpeechRecognitionError.cpp
index 04deac5fda50..57fd782f5c0c 100644
--- a/content/events/src/SpeechRecognitionError.cpp
+++ b/content/events/src/SpeechRecognitionError.cpp
@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsDOMClassInfoID.h"
 #include "SpeechRecognitionError.h"
 
 namespace mozilla {
diff --git a/content/events/src/TextComposition.h b/content/events/src/TextComposition.h
index e488ee126609..51dbbb5e9600 100644
--- a/content/events/src/TextComposition.h
+++ b/content/events/src/TextComposition.h
@@ -10,16 +10,13 @@
 #include "nsCOMPtr.h"
 #include "nsEvent.h"
 #include "nsINode.h"
-#include "nsString.h"
 #include "nsTArray.h"
 #include "nsThreadUtils.h"
 #include "mozilla/Attributes.h"
 
-class nsCompositionEvent;
 class nsDispatchingCallback;
 class nsIMEStateManager;
 class nsIWidget;
-class nsPresContext;
 
 namespace mozilla {
 
diff --git a/content/events/src/Touch.cpp b/content/events/src/Touch.cpp
index bff2bde3d939..cfe2361d323d 100644
--- a/content/events/src/Touch.cpp
+++ b/content/events/src/Touch.cpp
@@ -7,10 +7,8 @@
 
 #include "mozilla/dom/EventTarget.h"
 #include "mozilla/dom/TouchBinding.h"
-#include "mozilla/Preferences.h"
 #include "nsContentUtils.h"
 #include "nsDOMTouchEvent.h"
-#include "nsPresContext.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/events/src/nsContentEventHandler.h b/content/events/src/nsContentEventHandler.h
index 493ee3288623..0eb208d64ee6 100644
--- a/content/events/src/nsContentEventHandler.h
+++ b/content/events/src/nsContentEventHandler.h
@@ -6,16 +6,12 @@
 #ifndef nsContentEventHandler_h__
 #define nsContentEventHandler_h__
 
-#include "nscore.h"
 #include "nsCOMPtr.h"
 
 #include "nsISelection.h"
 #include "nsRange.h"
-#include "nsIDOMTreeWalker.h"
 
 class nsCaret;
-class nsIContent;
-class nsIPresShell;
 class nsPresContext;
 class nsQueryContentEvent;
 class nsSelectionEvent;
diff --git a/content/events/src/nsDOMAnimationEvent.h b/content/events/src/nsDOMAnimationEvent.h
index a37079c1b3c0..80e6f74878b2 100644
--- a/content/events/src/nsDOMAnimationEvent.h
+++ b/content/events/src/nsDOMAnimationEvent.h
@@ -7,10 +7,9 @@
 
 #include "nsDOMEvent.h"
 #include "nsIDOMAnimationEvent.h"
-#include "nsString.h"
 #include "mozilla/dom/AnimationEventBinding.h"
 
-class nsAnimationEvent;
+class nsAString;
 
 class nsDOMAnimationEvent : public nsDOMEvent,
                             public nsIDOMAnimationEvent
diff --git a/content/events/src/nsDOMClipboardEvent.cpp b/content/events/src/nsDOMClipboardEvent.cpp
index 43a14ed6d4a4..02d21a7197c9 100644
--- a/content/events/src/nsDOMClipboardEvent.cpp
+++ b/content/events/src/nsDOMClipboardEvent.cpp
@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsDOMClipboardEvent.h"
-#include "nsClientRect.h"
 #include "nsDOMDataTransfer.h"
 #include "nsIClipboard.h"
 
diff --git a/content/events/src/nsDOMDataTransfer.cpp b/content/events/src/nsDOMDataTransfer.cpp
index 0a554a82e3fd..560efce63bef 100644
--- a/content/events/src/nsDOMDataTransfer.cpp
+++ b/content/events/src/nsDOMDataTransfer.cpp
@@ -7,11 +7,7 @@
 
 #include "nsDOMDataTransfer.h"
 
-#include "prlog.h"
-#include "nsString.h"
 #include "nsIDOMDocument.h"
-#include "nsIServiceManager.h"
-#include "nsIInterfaceRequestorUtils.h"
 #include "nsIVariant.h"
 #include "nsISupportsPrimitives.h"
 #include "nsDOMClassInfoID.h"
@@ -21,12 +17,10 @@
 #include "nsError.h"
 #include "nsIDragService.h"
 #include "nsIClipboard.h"
-#include "nsIScriptableRegion.h"
 #include "nsContentUtils.h"
 #include "nsIContent.h"
 #include "nsCRT.h"
 #include "nsIScriptObjectPrincipal.h"
-#include "nsIWebNavigation.h"
 #include "nsIScriptContext.h"
 
 using namespace mozilla;
diff --git a/content/events/src/nsDOMDataTransfer.h b/content/events/src/nsDOMDataTransfer.h
index 7e9e50f4193d..367a46cbe989 100644
--- a/content/events/src/nsDOMDataTransfer.h
+++ b/content/events/src/nsDOMDataTransfer.h
@@ -11,16 +11,16 @@
 #include "nsIVariant.h"
 #include "nsIPrincipal.h"
 #include "nsIDOMDataTransfer.h"
-#include "nsIDragService.h"
 #include "nsIDOMElement.h"
 #include "nsCycleCollectionParticipant.h"
 
 #include "nsAutoPtr.h"
-#include "nsIFile.h"
 #include "nsDOMFile.h"
 #include "mozilla/Attributes.h"
 
 class nsITransferable;
+class nsISupportsArray;
+class nsILoadContext;
 
 /**
  * TransferItem is used to hold data for a particular format. Each piece of
diff --git a/content/events/src/nsDOMDragEvent.cpp b/content/events/src/nsDOMDragEvent.cpp
index 57d72ce95453..21d57376f8ff 100644
--- a/content/events/src/nsDOMDragEvent.cpp
+++ b/content/events/src/nsDOMDragEvent.cpp
@@ -4,11 +4,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsDOMDragEvent.h"
-#include "nsIServiceManager.h"
 #include "nsGUIEvent.h"
 #include "nsContentUtils.h"
-#include "nsDOMDataTransfer.h"
-#include "nsIDragService.h"
+#include "nsIDOMDataTransfer.h"
+#include "prtime.h"
 
 nsDOMDragEvent::nsDOMDragEvent(mozilla::dom::EventTarget* aOwner,
                                nsPresContext* aPresContext,
diff --git a/content/events/src/nsDOMDragEvent.h b/content/events/src/nsDOMDragEvent.h
index 64e0c1c6e67a..026483f3eb9b 100644
--- a/content/events/src/nsDOMDragEvent.h
+++ b/content/events/src/nsDOMDragEvent.h
@@ -10,8 +10,6 @@
 #include "nsDOMMouseEvent.h"
 #include "mozilla/dom/DragEventBinding.h"
 
-class nsEvent;
-
 class nsDOMDragEvent : public nsDOMMouseEvent,
                        public nsIDOMDragEvent
 {
diff --git a/content/events/src/nsDOMEvent.cpp b/content/events/src/nsDOMEvent.cpp
index 0f8ff86600ee..c8615f0bf998 100644
--- a/content/events/src/nsDOMEvent.cpp
+++ b/content/events/src/nsDOMEvent.cpp
@@ -5,9 +5,6 @@
 
 #include "base/basictypes.h"
 
-/* This must occur *after* base/basictypes.h to avoid typedefs conflicts. */
-#include "mozilla/Util.h"
-
 #include "ipc/IPCMessageUtils.h"
 #include "nsCOMPtr.h"
 #include "nsError.h"
@@ -17,18 +14,10 @@
 #include "nsIContent.h"
 #include "nsIPresShell.h"
 #include "nsIDocument.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsGkAtoms.h"
 #include "nsMutationEvent.h"
 #include "nsContentUtils.h"
 #include "nsJSEnvironment.h"
-#include "nsIURI.h"
-#include "nsIScriptSecurityManager.h"
-#include "nsIScriptError.h"
 #include "mozilla/Preferences.h"
-#include "nsJSUtils.h"
-#include "DictionaryHelpers.h"
 #include "nsLayoutUtils.h"
 #include "nsIScrollableFrame.h"
 #include "nsDOMEventTargetHelper.h"
diff --git a/content/events/src/nsDOMEventTargetHelper.cpp b/content/events/src/nsDOMEventTargetHelper.cpp
index 31b648b65687..5f0433a069ce 100644
--- a/content/events/src/nsDOMEventTargetHelper.cpp
+++ b/content/events/src/nsDOMEventTargetHelper.cpp
@@ -6,12 +6,9 @@
 #include "nsDOMEventTargetHelper.h"
 #include "nsContentUtils.h"
 #include "nsEventDispatcher.h"
-#include "nsGUIEvent.h"
 #include "nsIDocument.h"
-#include "nsDOMJSUtils.h"
 #include "prprf.h"
 #include "nsGlobalWindow.h"
-#include "nsDOMEvent.h"
 #include "mozilla/Likely.h"
 
 using namespace mozilla;
diff --git a/content/events/src/nsDOMEventTargetHelper.h b/content/events/src/nsDOMEventTargetHelper.h
index 8065cc3c4484..598a54e437ff 100644
--- a/content/events/src/nsDOMEventTargetHelper.h
+++ b/content/events/src/nsDOMEventTargetHelper.h
@@ -17,8 +17,6 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/EventTarget.h"
 
-class nsDOMEvent;
-
 #define NS_DOMEVENTTARGETHELPER_IID \
 { 0xda0e6d40, 0xc17b, 0x4937, \
   { 0x8e, 0xa2, 0x99, 0xca, 0x1c, 0x81, 0xea, 0xbe } }
diff --git a/content/events/src/nsDOMMouseEvent.h b/content/events/src/nsDOMMouseEvent.h
index 2e7e736fb105..a2fc6ca4bfed 100644
--- a/content/events/src/nsDOMMouseEvent.h
+++ b/content/events/src/nsDOMMouseEvent.h
@@ -10,8 +10,6 @@
 #include "nsDOMUIEvent.h"
 #include "mozilla/dom/MouseEventBinding.h"
 
-class nsEvent;
-
 class nsDOMMouseEvent : public nsDOMUIEvent,
                         public nsIDOMMouseEvent
 {
diff --git a/content/events/src/nsDOMNotifyAudioAvailableEvent.h b/content/events/src/nsDOMNotifyAudioAvailableEvent.h
index c6f19c891ded..a5db1b2b39d8 100644
--- a/content/events/src/nsDOMNotifyAudioAvailableEvent.h
+++ b/content/events/src/nsDOMNotifyAudioAvailableEvent.h
@@ -9,10 +9,11 @@
 
 #include "nsIDOMNotifyAudioAvailableEvent.h"
 #include "nsDOMEvent.h"
-#include "nsPresContext.h"
 #include "nsCycleCollectionParticipant.h"
 #include "mozilla/dom/NotifyAudioAvailableEventBinding.h"
 
+class nsPresContext;
+
 class nsDOMNotifyAudioAvailableEvent : public nsDOMEvent,
                                        public nsIDOMNotifyAudioAvailableEvent
 {
diff --git a/content/events/src/nsDOMNotifyPaintEvent.cpp b/content/events/src/nsDOMNotifyPaintEvent.cpp
index 64d74ae72dc7..0652ae08e632 100644
--- a/content/events/src/nsDOMNotifyPaintEvent.cpp
+++ b/content/events/src/nsDOMNotifyPaintEvent.cpp
@@ -10,7 +10,6 @@
 #include "nsContentUtils.h"
 #include "nsClientRect.h"
 #include "nsPaintRequest.h"
-#include "nsIFrame.h"
 
 nsDOMNotifyPaintEvent::nsDOMNotifyPaintEvent(mozilla::dom::EventTarget* aOwner,
                                              nsPresContext* aPresContext,
diff --git a/content/events/src/nsDOMScrollAreaEvent.h b/content/events/src/nsDOMScrollAreaEvent.h
index adb4dbd27342..afc0e45f719d 100644
--- a/content/events/src/nsDOMScrollAreaEvent.h
+++ b/content/events/src/nsDOMScrollAreaEvent.h
@@ -10,7 +10,6 @@
 #include "nsIDOMScrollAreaEvent.h"
 #include "nsDOMUIEvent.h"
 
-#include "nsGUIEvent.h"
 #include "nsClientRect.h"
 #include "mozilla/dom/ScrollAreaEventBinding.h"
 
diff --git a/content/events/src/nsDOMTouchEvent.cpp b/content/events/src/nsDOMTouchEvent.cpp
index 61dc5e44349c..2f1e8a161285 100644
--- a/content/events/src/nsDOMTouchEvent.cpp
+++ b/content/events/src/nsDOMTouchEvent.cpp
@@ -8,7 +8,6 @@
 #include "nsGUIEvent.h"
 #include "nsContentUtils.h"
 #include "mozilla/Preferences.h"
-#include "nsPresContext.h"
 #include "mozilla/dom/Touch.h"
 #include "mozilla/dom/TouchListBinding.h"
 
diff --git a/content/events/src/nsDOMTouchEvent.h b/content/events/src/nsDOMTouchEvent.h
index 744056d4f550..07a3b656fc75 100644
--- a/content/events/src/nsDOMTouchEvent.h
+++ b/content/events/src/nsDOMTouchEvent.h
@@ -6,13 +6,14 @@
 #define nsDOMTouchEvent_h_
 
 #include "nsDOMUIEvent.h"
-#include "nsString.h"
 #include "nsTArray.h"
 #include "mozilla/Attributes.h"
 #include "nsJSEnvironment.h"
 #include "mozilla/dom/TouchEventBinding.h"
 #include "nsWrapperCache.h"
 
+class nsAString;
+
 class nsDOMTouchList MOZ_FINAL : public nsISupports
                                , public nsWrapperCache
 {
diff --git a/content/events/src/nsDOMTransitionEvent.h b/content/events/src/nsDOMTransitionEvent.h
index 9956e568824d..3ab2564b9b2d 100644
--- a/content/events/src/nsDOMTransitionEvent.h
+++ b/content/events/src/nsDOMTransitionEvent.h
@@ -7,10 +7,9 @@
 
 #include "nsDOMEvent.h"
 #include "nsIDOMTransitionEvent.h"
-#include "nsString.h"
 #include "mozilla/dom/TransitionEventBinding.h"
 
-class nsTransitionEvent;
+class nsAString;
 
 class nsDOMTransitionEvent : public nsDOMEvent,
                              public nsIDOMTransitionEvent
diff --git a/content/events/src/nsDOMUIEvent.cpp b/content/events/src/nsDOMUIEvent.cpp
index dd5d90845b17..faed83e1601d 100644
--- a/content/events/src/nsDOMUIEvent.cpp
+++ b/content/events/src/nsDOMUIEvent.cpp
@@ -7,7 +7,6 @@
 #include "ipc/IPCMessageUtils.h"
 #include "nsCOMPtr.h"
 #include "nsDOMUIEvent.h"
-#include "nsIPresShell.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIDOMWindow.h"
 #include "nsIDOMNode.h"
@@ -15,7 +14,6 @@
 #include "nsContentUtils.h"
 #include "nsEventStateManager.h"
 #include "nsIFrame.h"
-#include "nsIScrollableFrame.h"
 #include "mozilla/Util.h"
 #include "mozilla/Assertions.h"
 #include "prtime.h"
diff --git a/content/events/src/nsEventDispatcher.cpp b/content/events/src/nsEventDispatcher.cpp
index a4289635002a..bc3487055a3b 100644
--- a/content/events/src/nsEventDispatcher.cpp
+++ b/content/events/src/nsEventDispatcher.cpp
@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsEventDispatcher.h"
-#include "nsDOMEvent.h"
 #include "nsPresContext.h"
 #include "nsEventListenerManager.h"
 #include "nsContentUtils.h"
@@ -15,7 +14,6 @@
 #include <new>
 #include "nsINode.h"
 #include "nsPIDOMWindow.h"
-#include "nsFrameLoader.h"
 #include "nsDOMTouchEvent.h"
 #include "GeckoProfiler.h"
 #include "GeneratedEvents.h"
diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp
index cbc4bf9e0244..1a0b0e525b96 100644
--- a/content/events/src/nsEventListenerManager.cpp
+++ b/content/events/src/nsEventListenerManager.cpp
@@ -3,7 +3,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#ifdef MOZ_B2G
 #include "mozilla/Hal.h"
+#endif
 #include "mozilla/HalSensor.h"
 
 // Microsoft's API Name hackery sucks
@@ -13,46 +15,29 @@
 #include "nsGUIEvent.h"
 #include "nsDOMEvent.h"
 #include "nsEventListenerManager.h"
-#include "nsCaret.h"
 #include "nsIDOMEventListener.h"
-#include "nsITextControlFrame.h"
 #include "nsGkAtoms.h"
 #include "nsPIDOMWindow.h"
 #include "nsIJSEventListener.h"
 #include "nsIScriptGlobalObject.h"
-#include "nsLayoutUtils.h"
 #include "nsINameSpaceManager.h"
 #include "nsIContent.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/dom/Element.h"
-#include "nsIFrame.h"
-#include "nsView.h"
-#include "nsViewManager.h"
 #include "nsCOMPtr.h"
-#include "nsIServiceManager.h"
-#include "nsIScriptSecurityManager.h"
 #include "nsError.h"
 #include "nsIDocument.h"
-#include "nsIPresShell.h"
 #include "nsMutationEvent.h"
 #include "nsIXPConnect.h"
 #include "nsDOMCID.h"
-#include "nsFocusManager.h"
-#include "nsIDOMElement.h"
 #include "nsContentUtils.h"
 #include "nsCxPusher.h"
 #include "nsJSUtils.h"
-#include "nsContentCID.h"
 #include "nsEventDispatcher.h"
-#include "nsDOMJSUtils.h"
-#include "nsDataHashtable.h"
 #include "nsCOMArray.h"
 #include "nsEventListenerService.h"
 #include "nsIContentSecurityPolicy.h"
-#include "nsJSEnvironment.h"
 #include "xpcpublic.h"
 #include "nsSandboxFlags.h"
-#include "mozilla/dom/time/TimeChangeObserver.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
diff --git a/content/events/src/nsEventListenerManager.h b/content/events/src/nsEventListenerManager.h
index 206582a59a76..8a6efbea1eac 100644
--- a/content/events/src/nsEventListenerManager.h
+++ b/content/events/src/nsEventListenerManager.h
@@ -8,31 +8,27 @@
 
 #include "mozilla/dom/EventListenerBinding.h"
 #include "mozilla/MemoryReporting.h"
-#include "nsAutoPtr.h"
-#include "nsCOMArray.h"
 #include "nsCOMPtr.h"
-#include "nsCxPusher.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsGkAtoms.h"
 #include "nsGUIEvent.h"
 #include "nsIDOMEventListener.h"
 #include "nsIJSEventListener.h"
-#include "nsIScriptContext.h"
 #include "nsTObserverArray.h"
 
 class nsIDOMEvent;
-class nsIAtom;
-class nsIWidget;
-struct nsPoint;
 struct EventTypeData;
 class nsEventTargetChainItem;
 class nsPIDOMWindow;
 class nsCxPusher;
 class nsIEventListenerInfo;
+class nsIScriptContext;
 
 struct nsListenerStruct;
 class nsEventListenerManager;
 
+template<class T> class nsCOMArray;
+
 namespace mozilla {
 namespace dom {
 
diff --git a/content/events/src/nsEventListenerService.cpp b/content/events/src/nsEventListenerService.cpp
index 2aa6361597ca..49493b9c3012 100644
--- a/content/events/src/nsEventListenerService.cpp
+++ b/content/events/src/nsEventListenerService.cpp
@@ -5,13 +5,9 @@
 #include "nsEventListenerService.h"
 #include "nsCOMArray.h"
 #include "nsEventListenerManager.h"
-#include "nsIVariant.h"
-#include "nsIServiceManager.h"
 #include "nsMemory.h"
 #include "nsCxPusher.h"
 #include "nsIXPConnect.h"
-#include "nsIDOMWindow.h"
-#include "nsPIDOMWindow.h"
 #include "nsJSUtils.h"
 #include "nsGUIEvent.h"
 #include "nsEventDispatcher.h"
@@ -21,6 +17,7 @@
 #endif
 #include "nsDOMClassInfoID.h"
 #include "mozilla/Maybe.h"
+#include "nsServiceManagerUtils.h"
 
 using namespace mozilla::dom;
 using mozilla::AutoSafeJSContext;
diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index e21487c376f4..891d5e0db4a7 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -10,7 +10,6 @@
 
 #include "nsCOMPtr.h"
 #include "nsEventStateManager.h"
-#include "nsEventListenerManager.h"
 #include "nsIMEStateManager.h"
 #include "nsContentEventHandler.h"
 #include "nsIContent.h"
@@ -35,19 +34,9 @@
 #include "nsPIWindowRoot.h"
 #include "nsIWebNavigation.h"
 #include "nsIContentViewer.h"
-#include <algorithm>
-#ifdef MOZ_XUL
-#include "nsXULPopupManager.h"
-#endif
 #include "nsFrameManager.h"
 
-#include "nsIServiceManager.h"
-#include "nsIScriptSecurityManager.h"
-
-#include "nsFocusManager.h"
-
 #include "nsIDOMXULElement.h"
-#include "nsIDOMDocument.h"
 #include "nsIDOMKeyEvent.h"
 #include "nsIObserverService.h"
 #include "nsIDocShell.h"
@@ -56,14 +45,9 @@
 #include "nsIDOMDragEvent.h"
 #include "nsIDOMUIEvent.h"
 #include "nsDOMDragEvent.h"
-#include "nsIDOMNSEditableElement.h"
-#include "nsIDOMMozBrowserFrame.h"
 #include "nsIMozBrowserFrame.h"
 
-#include "nsCaret.h"
-
 #include "nsSubDocumentFrame.h"
-#include "nsLayoutCID.h"
 #include "nsLayoutUtils.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsUnicharUtils.h"
@@ -88,14 +72,11 @@
 #include "nsIController.h"
 #include "nsICommandParams.h"
 #include "mozilla/Services.h"
-#include "mozAutoDocUpdate.h"
 #include "mozilla/dom/HTMLLabelElement.h"
 
 #include "mozilla/Preferences.h"
 #include "mozilla/LookAndFeel.h"
 #include "GeckoProfiler.h"
-
-#include "nsIDOMClientRect.h"
 #include "Units.h"
 
 #ifdef XP_MACOSX
diff --git a/content/events/src/nsEventStateManager.h b/content/events/src/nsEventStateManager.h
index 7e19f25d5804..d879809fbe37 100644
--- a/content/events/src/nsEventStateManager.h
+++ b/content/events/src/nsEventStateManager.h
@@ -12,20 +12,14 @@
 #include "nsGUIEvent.h"
 #include "nsIObserver.h"
 #include "nsWeakReference.h"
-#include "nsITimer.h"
 #include "nsCOMPtr.h"
 #include "nsCOMArray.h"
-#include "nsIFrameLoader.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsIMarkupDocumentViewer.h"
-#include "nsIScrollableFrame.h"
 #include "nsFocusManager.h"
-#include "nsEventStates.h"
 #include "mozilla/TimeStamp.h"
 #include "nsIFrame.h"
 #include "Units.h"
 
-class nsIPresShell;
 class nsIContent;
 class nsIDocument;
 class nsIDocShell;
@@ -34,7 +28,10 @@ class nsIDocShellTreeItem;
 class imgIContainer;
 class nsDOMDataTransfer;
 class MouseEnterLeaveDispatcher;
-class nsIFrame;
+class nsEventStates;
+class nsIMarkupDocumentViewer;
+class nsIScrollableFrame;
+class nsITimer;
 
 namespace mozilla {
 namespace dom {
diff --git a/content/events/src/nsIMEStateManager.cpp b/content/events/src/nsIMEStateManager.cpp
index 30405b758f51..df90efd8b0db 100644
--- a/content/events/src/nsIMEStateManager.cpp
+++ b/content/events/src/nsIMEStateManager.cpp
@@ -6,15 +6,11 @@
 
 #include "nsIMEStateManager.h"
 #include "nsCOMPtr.h"
-#include "nsViewManager.h"
 #include "nsIPresShell.h"
 #include "nsISupports.h"
-#include "nsPIDOMWindow.h"
-#include "nsIInterfaceRequestorUtils.h"
 #include "nsIContent.h"
 #include "nsIDocument.h"
 #include "nsPresContext.h"
-#include "nsIDOMWindow.h"
 #include "nsIDOMMouseEvent.h"
 #include "nsContentUtils.h"
 #include "nsINode.h"
@@ -33,10 +29,10 @@
 #include "nsIForm.h"
 #include "mozilla/dom/HTMLFormElement.h"
 #include "mozilla/Attributes.h"
-#include "nsEventDispatcher.h"
 #include "TextComposition.h"
 #include "mozilla/Preferences.h"
 #include "nsAsyncDOMEvent.h"
+#include "nsGUIEvent.h"
 
 using namespace mozilla;
 using namespace mozilla::widget;
diff --git a/content/events/src/nsIMEStateManager.h b/content/events/src/nsIMEStateManager.h
index 9f6bd7c510e6..78a8d6786ad2 100644
--- a/content/events/src/nsIMEStateManager.h
+++ b/content/events/src/nsIMEStateManager.h
@@ -6,7 +6,6 @@
 #ifndef nsIMEStateManager_h__
 #define nsIMEStateManager_h__
 
-#include "nscore.h"
 #include "nsEvent.h"
 #include "nsIWidget.h"
 
diff --git a/content/events/src/nsPaintRequest.cpp b/content/events/src/nsPaintRequest.cpp
index b41ec23bc527..86ff073972e7 100644
--- a/content/events/src/nsPaintRequest.cpp
+++ b/content/events/src/nsPaintRequest.cpp
@@ -5,9 +5,9 @@
 
 #include "nsPaintRequest.h"
 
-#include "nsIFrame.h"
 #include "mozilla/dom/PaintRequestBinding.h"
 #include "mozilla/dom/PaintRequestListBinding.h"
+#include "nsClientRect.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
diff --git a/content/events/src/nsPaintRequest.h b/content/events/src/nsPaintRequest.h
index f1b8e4dfc9e8..56132fc11eda 100644
--- a/content/events/src/nsPaintRequest.h
+++ b/content/events/src/nsPaintRequest.h
@@ -10,9 +10,10 @@
 #include "nsPresContext.h"
 #include "nsIDOMEvent.h"
 #include "mozilla/Attributes.h"
-#include "nsClientRect.h"
 #include "nsWrapperCache.h"
 
+class nsClientRect;
+
 class nsPaintRequest MOZ_FINAL : public nsIDOMPaintRequest
                                , public nsWrapperCache
 {
diff --git a/image/src/VectorImage.cpp b/image/src/VectorImage.cpp
index 69f3a0cf6a90..f87babcfe9f6 100644
--- a/image/src/VectorImage.cpp
+++ b/image/src/VectorImage.cpp
@@ -29,6 +29,7 @@
 #include "nsSVGUtils.h"  // for nsSVGUtils::ConvertToSurfaceSize
 #include "Orientation.h"
 #include "SVGDocumentWrapper.h"
+#include "nsIDOMEventListener.h"
 
 namespace mozilla {