Backed out changeset a8d6973e5743 (bug 917885) because I pushed the wrong patch

xpcom/base/AvailableMemoryTracker.cpp

@@ -6,17 +6,19 @@
 
 #include "mozilla/AvailableMemoryTracker.h"
 
-#if defined(XP_WIN)
 #include "prinrval.h"
 #include "prenv.h"
-#endif
 
+#include "nsIMemoryReporter.h"
 #include "nsIObserver.h"
 #include "nsIObserverService.h"
 #include "nsIRunnable.h"
 #include "nsISupports.h"
-#include "nsThreadUtils.h"
+#include "nsMemoryPressure.h"
+#include "nsPrintfCString.h"
+#include "nsThread.h"
 
+#include "mozilla/Atomics.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
 

xpcom/base/CycleCollectedJSRuntime.h

@@ -9,6 +9,7 @@
 
 #include "mozilla/MemoryReporting.h"
 #include "jsapi.h"
+#include "js/Class.h"
 
 #include "nsCycleCollector.h"
 #include "nsCycleCollectionParticipant.h"
@@ -17,12 +18,9 @@
 #include "nsTArray.h"
 
 class nsCycleCollectionNoteRootCallback;
+class nsScriptObjectTracer;
 class nsIException;
 
-namespace js {
-class Class;
-}
-
 namespace mozilla {
 
 class JSGCThingParticipant: public nsCycleCollectionParticipant

xpcom/base/VisualEventTracer.cpp

@@ -8,6 +8,7 @@
 #include "nscore.h"
 #include "prthread.h"
 #include "prprf.h"
+#include "prio.h"
 #include "prenv.h"
 #include "plstr.h"
 #include "nsThreadUtils.h"

xpcom/base/VisualEventTracer.h

@@ -20,12 +20,11 @@
  * to record in the log.
  */
 
-#include <stdint.h>
-#include "mozilla/Attributes.h"
+#include "nscore.h"
 #include "mozilla/GuardObjects.h"
+#include "nsIVisualEventTracer.h"
 
 #ifdef MOZ_VISUAL_EVENT_TRACER
-#include "nsIVisualEventTracer.h"
 
 // Bind an object instance, usually |this|, to a name, usually URL or 
 // host name, the instance deals with for its lifetime.  The name string 

xpcom/base/nsConsoleMessage.cpp

@@ -8,6 +8,7 @@
  */
 
 #include "nsConsoleMessage.h"
+#include "nsReadableUtils.h"
 #include "jsapi.h"
 
 NS_IMPL_ISUPPORTS1(nsConsoleMessage, nsIConsoleMessage)

xpcom/base/nsConsoleService.cpp

@@ -11,12 +11,14 @@
 /* Threadsafe. */
 
 #include "nsMemory.h"
+#include "nsIServiceManager.h"
 #include "nsCOMArray.h"
 #include "nsThreadUtils.h"
 
 #include "nsConsoleService.h"
 #include "nsConsoleMessage.h"
 #include "nsIClassInfoImpl.h"
+#include "nsThreadUtils.h"
 
 #include "mozilla/Preferences.h"
 

xpcom/base/nsConsoleService.h

@@ -13,6 +13,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/Mutex.h"
 
+#include "nsCOMPtr.h"
 #include "nsInterfaceHashtable.h"
 #include "nsHashKeys.h"
 

xpcom/base/nsCycleCollector.cpp

@@ -105,25 +105,34 @@
 #include "mozilla/CycleCollectedJSRuntime.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsCycleCollectionNoteRootCallback.h"
+#include "nsHashKeys.h"
 #include "nsDeque.h"
 #include "nsCycleCollector.h"
 #include "nsThreadUtils.h"
 #include "prenv.h"
+#include "prprf.h"
+#include "plstr.h"
 #include "nsPrintfCString.h"
 #include "nsTArray.h"
 #include "nsIConsoleService.h"
+#include "nsTArray.h"
 #include "mozilla/Attributes.h"
 #include "nsICycleCollectorListener.h"
 #include "nsIMemoryReporter.h"
 #include "nsIFile.h"
+#include "nsDirectoryServiceDefs.h"
 #include "nsMemoryInfoDumper.h"
 #include "xpcpublic.h"
+#include "nsXPCOMPrivate.h"
 #include "GeckoProfiler.h"
 #include <stdint.h>
 #include <stdio.h>
+#include <string.h>
 
+#include "mozilla/CondVar.h"
 #include "mozilla/Likely.h"
 #include "mozilla/mozPoisonWrite.h"
+#include "mozilla/Mutex.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/ThreadLocal.h"
 

xpcom/base/nsCycleCollector.h

@@ -8,6 +8,7 @@
 
 class nsICycleCollectorListener;
 class nsISupports;
+class nsScriptObjectTracer;
 
 #include "nsError.h"
 #include "nsID.h"

xpcom/base/nsDebugImpl.cpp

@@ -16,6 +16,8 @@
 #include "nsStringGlue.h"
 #include "prprf.h"
 #include "prlog.h"
+#include "prinit.h"
+#include "plstr.h"
 #include "nsError.h"
 #include "prerror.h"
 #include "prerr.h"
@@ -25,12 +27,13 @@
 #include <android/log.h>
 #endif
 
-#ifdef _WIN32
-/* for getenv() */
+#if defined(XP_UNIX) || defined(_WIN32) || defined(XP_OS2)
+/* for abort() and getenv() */
 #include <stdlib.h>
 #endif
 
 #include "nsTraceRefcntImpl.h"
+#include "nsISupportsUtils.h"
 
 #if defined(XP_UNIX)
 #include <signal.h>
@@ -46,6 +49,7 @@
 
 #if defined(XP_MACOSX)
 #include <stdbool.h>
+#include <sys/types.h>
 #include <unistd.h>
 #include <sys/sysctl.h>
 #endif

xpcom/base/nsErrorService.cpp

@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsErrorService.h"
-#include "nsCRTGlue.h"
+#include "nsCRT.h"
 #include "nsAutoPtr.h"
 
 static void*

xpcom/base/nsGZFileWriter.h

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsIGZFileWriter.h"
+#include <stdio.h>
 #include "zlib.h"
 
 /**

xpcom/base/nsInterfaceRequestorAgg.cpp

@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsInterfaceRequestorAgg.h"
-#include "nsIInterfaceRequestor.h"
 #include "nsCOMPtr.h"
 #include "mozilla/Attributes.h"
 #include "nsThreadUtils.h"

xpcom/base/nsInterfaceRequestorAgg.h

@@ -5,10 +5,9 @@
 #ifndef nsInterfaceRequestorAgg_h__
 #define nsInterfaceRequestorAgg_h__
 
-#include "nsError.h"
+#include "nsIInterfaceRequestor.h"
 
 class nsIEventTarget;
-class nsIInterfaceRequestor;
 
 /**
  * This function returns an instance of nsIInterfaceRequestor that aggregates

xpcom/base/nsMacUtilsImpl.cpp

@@ -6,6 +6,7 @@
 #include "nsMacUtilsImpl.h"
 
 #include <CoreFoundation/CoreFoundation.h>
+#include <sys/sysctl.h>
 
 NS_IMPL_ISUPPORTS1(nsMacUtilsImpl, nsIMacUtils)
 

xpcom/base/nsMemoryImpl.cpp

@@ -3,14 +3,21 @@
  * 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 "nsXPCOM.h"
 #include "nsMemoryImpl.h"
 #include "nsThreadUtils.h"
 
 #include "nsIObserver.h"
 #include "nsIObserverService.h"
+#include "nsIServiceManager.h"
 #include "nsISimpleEnumerator.h"
 
+#include "prcvar.h"
+#include "pratom.h"
+
+#include "nsAlgorithm.h"
 #include "nsCOMPtr.h"
+#include "nsString.h"
 #include "mozilla/Services.h"
 
 #ifdef ANDROID

xpcom/base/nsMemoryImpl.h

@@ -10,6 +10,7 @@
 
 #include "nsIMemory.h"
 #include "nsIRunnable.h"
+#include "prtime.h"
 
 // nsMemoryImpl is a static object. We can do this because it doesn't have
 // a constructor/destructor or any instance members. Please don't add

xpcom/base/nsMemoryInfoDumper.cpp

@@ -6,9 +6,11 @@
 
 #include "mozilla/nsMemoryInfoDumper.h"
 
-#ifdef XP_LINUX
+#include "mozilla/Atomics.h"
+#include "mozilla/ClearOnShutdown.h"
+#include "mozilla/FileUtils.h"
 #include "mozilla/Preferences.h"
-#endif
+#include "mozilla/StaticPtr.h"
 #include "mozilla/unused.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/ContentChild.h"
@@ -19,6 +21,7 @@
 #include "nsGZFileWriter.h"
 #include "nsJSEnvironment.h"
 #include "nsPrintfCString.h"
+#include "pratom.h"
 
 #ifdef XP_WIN
 #include <process.h>

xpcom/base/nsMemoryInfoDumper.h

@@ -8,8 +8,7 @@
 #define mozilla_nsMemoryInfoDumper_h
 
 #include "nsIMemoryInfoDumper.h"
-
-class nsACString;
+#include "nsString.h"
 
 /**
  * This class facilitates dumping information about our memory usage to disk.

xpcom/base/nsMemoryReporterManager.cpp

@@ -8,14 +8,18 @@
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsCOMArray.h"
+#include "nsDirectoryServiceUtils.h"
 #include "nsServiceManagerUtils.h"
 #include "nsMemoryReporterManager.h"
+#include "nsArrayEnumerator.h"
 #include "nsISimpleEnumerator.h"
+#include "nsIFile.h"
+#include "nsIFileStreams.h"
+#include "nsPrintfCString.h"
 #include "nsThreadUtils.h"
 #include "nsIObserverService.h"
-#if defined(XP_LINUX)
+#include "nsThread.h"
 #include "nsMemoryInfoDumper.h"
-#endif
 #include "mozilla/Telemetry.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Services.h"
@@ -33,6 +37,7 @@ using namespace mozilla;
 
 #if defined(XP_LINUX)
 
+#include <unistd.h>
 static nsresult GetProcSelfStatmField(int aField, int64_t* aN)
 {
     // There are more than two fields, but we're only interested in the first
@@ -450,6 +455,7 @@ public:
 
 #ifdef XP_UNIX
 
+#include <sys/time.h>
 #include <sys/resource.h>
 
 #define HAVE_PAGE_FAULT_REPORTERS 1

xpcom/base/nsMemoryReporterManager.h

@@ -6,6 +6,8 @@
 
 #include "nsIMemoryReporter.h"
 #include "mozilla/Mutex.h"
+#include "mozilla/Attributes.h"
+#include "nsString.h"
 #include "nsTHashtable.h"
 #include "nsHashKeys.h"
 

xpcom/base/nsStackWalk.cpp

@@ -6,8 +6,9 @@
 
 /* API for getting a stack trace of the C/C++ stack on the current thread */
 
+#include "mozilla/Util.h"
 #include "mozilla/StackWalk.h"
-#include "mozilla/Assertions.h"
+#include "nsDebug.h"
 #include "nsStackWalkPrivate.h"
 
 #include "nsStackWalk.h"
@@ -41,6 +42,7 @@ static CriticalAddress gCriticalAddress;
 
 #if NSSTACKWALK_SUPPORTS_MACOSX
 #include <pthread.h>
+#include <errno.h>
 #include <CoreServices/CoreServices.h>
 
 typedef void
@@ -812,6 +814,7 @@ NS_FormatCodeAddressDetails(void *aPC, const nsCodeAddressDetails *aDetails,
 
 #include <stdlib.h>
 #include <string.h>
+#include <math.h>
 #include "nscore.h"
 #include <stdio.h>
 #include "plstr.h"
@@ -828,6 +831,7 @@ NS_FormatCodeAddressDetails(void *aPC, const nsCodeAddressDetails *aDetails,
 // Yes, this is a gcc only hack
 #if defined(MOZ_DEMANGLE_SYMBOLS)
 #include <cxxabi.h>
+#include <stdlib.h> // for free()
 #endif // MOZ_DEMANGLE_SYMBOLS
 
 void DemangleSymbol(const char * aSymbol, 

xpcom/base/nsSystemInfo.cpp

@@ -7,6 +7,8 @@
 
 #include "nsSystemInfo.h"
 #include "prsystem.h"
+#include "nsString.h"
+#include "prprf.h"
 #include "mozilla/SSE.h"
 #include "mozilla/arm.h"
 

xpcom/base/nsTraceRefcntImpl.cpp

@@ -9,12 +9,17 @@
 #include "nsISupports.h"
 #include "nsTArray.h"
 #include "prenv.h"
+#include "prprf.h"
+#include "prlog.h"
 #include "plstr.h"
 #include "prlink.h"
+#include <stdlib.h>
+#include "nsCOMPtr.h"
 #include "nsCRT.h"
 #include <math.h>
 #include "nsStackWalkPrivate.h"
 #include "nsStackWalk.h"
+#include "nsString.h"
 
 #include "nsXULAppAPI.h"
 #ifdef XP_WIN

xpcom/base/nsUUIDGenerator.cpp

@@ -13,6 +13,8 @@
 #include "prrng.h"
 #endif
 
+#include "nsMemory.h"
+
 #include "nsUUIDGenerator.h"
 
 using namespace mozilla;