Bug 912195 - Minimize the #includes in docshell/shistory; r=bzbarsky

docshell/shistory/src/nsSHEntry.cpp

@@ -5,18 +5,16 @@
 
 // Local Includes
 #include "nsSHEntry.h"
-#include "nsXPIDLString.h"
-#include "nsReadableUtils.h"
 #include "nsIDocShellLoadInfo.h"
 #include "nsIDocShellTreeItem.h"
-#include "nsISHistory.h"
-#include "nsISHistoryInternal.h"
 #include "nsDocShellEditorData.h"
 #include "nsSHEntryShared.h"
 #include "nsILayoutHistoryState.h"
 #include "nsIContentViewer.h"
 #include "nsISupportsArray.h"
 #include "nsIStructuredCloneContainer.h"
+#include "nsIInputStream.h"
+#include "nsIURI.h"
 #include <algorithm>
 
 namespace dom = mozilla::dom;

docshell/shistory/src/nsSHEntry.h

@@ -15,12 +15,12 @@
 #include "mozilla/Attributes.h"
 
 // Interfaces needed
-#include "nsIInputStream.h"
 #include "nsISHEntry.h"
 #include "nsISHContainer.h"
-#include "nsIURI.h"
 
 class nsSHEntryShared;
+class nsIInputStream;
+class nsIURI;
 
 class nsSHEntry MOZ_FINAL : public nsISHEntry,
                             public nsISHContainer,

docshell/shistory/src/nsSHEntryShared.cpp

@@ -14,8 +14,8 @@
 #include "nsDocShellEditorData.h"
 #include "nsThreadUtils.h"
 #include "nsILayoutHistoryState.h"
-#include "prprf.h"
 #include "mozilla/Attributes.h"
+#include "nsISupportsArray.h"
 
 namespace dom = mozilla::dom;
 

docshell/shistory/src/nsSHEntryShared.h

@@ -8,7 +8,6 @@
 #include "nsCOMPtr.h"
 #include "nsAutoPtr.h"
 #include "nsCOMArray.h"
-#include "nsISupportsArray.h"
 #include "nsIBFCacheEntry.h"
 #include "nsIMutationObserver.h"
 #include "nsExpirationTracker.h"
@@ -23,6 +22,7 @@ class nsIContentViewer;
 class nsIDocShellTreeItem;
 class nsILayoutHistoryState;
 class nsDocShellEditorData;
+class nsISupportsArray;
 
 // A document may have multiple SHEntries, either due to hash navigations or
 // calls to history.pushState.  SHEntries corresponding to the same document

docshell/shistory/src/nsSHTransaction.cpp

@@ -6,6 +6,7 @@
 
 // Local Includes
 #include "nsSHTransaction.h"
+#include "nsISHEntry.h"
 
 //*****************************************************************************
 //***    nsSHTransaction: Object Management

docshell/shistory/src/nsSHTransaction.h

@@ -12,7 +12,8 @@
 
 // Needed interfaces
 #include "nsISHTransaction.h"
-#include "nsISHEntry.h"
+
+class nsISHEntry;
 
 class nsSHTransaction: public nsISHTransaction
 {

docshell/shistory/src/nsSHistory.cpp

@@ -9,8 +9,6 @@
 #include <algorithm>
 
 // Helper Classes
-#include "nsXPIDLString.h"
-#include "nsReadableUtils.h"
 #include "mozilla/Preferences.h"
 
 // Interfaces Needed
@@ -20,8 +18,6 @@
 #include "nsISHContainer.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIDocShellTreeNode.h"
-#include "nsIDocShellLoadInfo.h"
-#include "nsIServiceManager.h"
 #include "nsIURI.h"
 #include "nsIContentViewer.h"
 #include "nsICacheService.h"
@@ -32,9 +28,13 @@
 #include "nsCOMArray.h"
 #include "nsDocShell.h"
 #include "mozilla/Attributes.h"
+#include "nsISHEntry.h"
+#include "nsISHTransaction.h"
+#include "nsISHistoryListener.h"
+#include "nsComponentManagerUtils.h"
 
 // For calculating max history entries and max cachable contentviewers
-#include "nspr.h"
+#include "prsystem.h"
 #include "mozilla/MathAlgorithms.h"
 
 using namespace mozilla;

docshell/shistory/src/nsSHistory.h

@@ -13,13 +13,10 @@
 //Interfaces Needed
 #include "nsISHistory.h"
 #include "nsISHistoryInternal.h"
-#include "nsISHTransaction.h"
 #include "nsIWebNavigation.h"
-#include "nsIWeakReference.h"
 #include "nsISimpleEnumerator.h"
-#include "nsISHistoryListener.h"
-#include "nsISHEntry.h"
 #include "nsTObserverArray.h"
+#include "nsWeakPtr.h"
 
 // Needed to maintain global list of all SHistory objects
 #include "prclist.h"
@@ -27,6 +24,9 @@
 class nsIDocShell;
 class nsSHEnumerator;
 class nsSHistoryObserver;
+class nsISHEntry;
+class nsISHTransaction;
+
 class nsSHistory: public PRCList,
                   public nsISHistory,
                   public nsISHistoryInternal,