Bug 1774864 - Cleanup xpcom/ includes r=sylvestre

Differential Revision: https://phabricator.services.mozilla.com/D149671

xpcom/base/nsDebugImpl.cpp

@@ -18,8 +18,6 @@
 #include "nsExceptionHandler.h"
 #include "nsString.h"
 #include "nsXULAppAPI.h"
-#include "prprf.h"
-#include "nsError.h"
 #include "prerror.h"
 #include "prerr.h"
 #include "prenv.h"
@@ -91,8 +89,6 @@ static void Break(const char* aMsg);
 #  include <windows.h>
 #  include <signal.h>
 #  include <malloc.h>  // for _alloca
-#elif defined(XP_UNIX)
-#  include <stdlib.h>
 #endif
 
 using namespace mozilla;

xpcom/base/nsDumpUtils.cpp

@@ -7,8 +7,8 @@
 #include "nsDumpUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
-#include "prenv.h"
 #include <errno.h>
+#include "prenv.h"
 #include "mozilla/Services.h"
 #include "nsIObserverService.h"
 #include "mozilla/ClearOnShutdown.h"
@@ -19,7 +19,6 @@
 #  include "mozilla/Preferences.h"
 #  include <fcntl.h>
 #  include <unistd.h>
-#  include <sys/types.h>
 #  include <sys/stat.h>
 
 using namespace mozilla;

xpcom/glue/FileUtils.cpp

@@ -6,16 +6,11 @@
 
 #include "mozilla/FileUtils.h"
 
-#include <errno.h>
-#include <stdio.h>
-#include <inttypes.h>
-
 #include "nscore.h"
 #include "private/pprio.h"
 #include "prmem.h"
-#include "mozilla/Assertions.h"
-#include "mozilla/MemUtils.h"
 #include "mozilla/BaseProfilerMarkers.h"
+#include "mozilla/MemUtils.h"
 
 #if defined(XP_MACOSX)
 #  include <fcntl.h>

xpcom/glue/standalone/nsXPCOMGlue.cpp

@@ -6,16 +6,12 @@
 
 #include "mozilla/Bootstrap.h"
 
-#include "nspr.h"
-#include "nsDebug.h"
 #include "nsXPCOMPrivate.h"
-#include "nsCOMPtr.h"
 #include <stdlib.h>
 #include <stdio.h>
 
 #include "mozilla/FileUtils.h"
 #include "mozilla/Result.h"
-#include "mozilla/Sprintf.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/UniquePtrExtensions.h"
 

xpcom/io/nsLocalFileUnix.cpp

@@ -18,7 +18,6 @@
 #include "mozilla/FilePreferences.h"
 #include "prtime.h"
 
-#include <sys/fcntl.h>
 #include <sys/select.h>
 #include <sys/stat.h>
 #include <sys/time.h>
@@ -26,10 +25,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <utime.h>
 #include <dirent.h>
-#include <ctype.h>
-#include <locale.h>
 
 #if defined(XP_MACOSX)
 #  include <sys/xattr.h>
@@ -45,13 +41,9 @@
 #endif
 
 #include "nsDirectoryServiceDefs.h"
-#include "nsCRT.h"
 #include "nsCOMPtr.h"
-#include "nsMemory.h"
 #include "nsIFile.h"
 #include "nsString.h"
-#include "nsReadableUtils.h"
-#include "prproces.h"
 #include "nsIDirectoryEnumerator.h"
 #include "nsSimpleEnumerator.h"
 #include "private/pprio.h"
@@ -78,7 +70,6 @@ static nsresult MacErrorMapper(OSErr inErr);
 
 #include "nsNativeCharsetUtils.h"
 #include "nsTraceRefcnt.h"
-#include "nsHashKeys.h"
 
 /**
  *  we need these for statfs()
@@ -98,11 +89,6 @@ extern "C" int statvfs(const char*, struct statvfs*);
 #  include <sys/vfs.h>
 #endif
 
-#ifdef HAVE_SYS_MOUNT_H
-#  include <sys/param.h>
-#  include <sys/mount.h>
-#endif
-
 #if defined(HAVE_STATVFS64) && (!defined(LINUX) && !defined(__osf__))
 #  define STATFS statvfs64
 #  define F_BSIZE f_frsize

xpcom/io/nsLocalFileUnix.h

@@ -12,14 +12,9 @@
 #define _nsLocalFileUNIX_H_
 
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 #include "nscore.h"
 #include "nsString.h"
-#include "nsReadableUtils.h"
-#include "nsIClassInfoImpl.h"
-#include "mozilla/Attributes.h"
 #ifdef MOZ_WIDGET_COCOA
 #  include "nsILocalFileMac.h"
 #endif

xpcom/reflect/xptcall/md/unix/xptcinvoke_x86_64_unix.cpp

@@ -6,7 +6,8 @@
 
 // Platform specific code to invoke XPCOM methods on native objects
 
-#include "xptcprivate.h"
+#include "xptcall.h"
+#include "xptinfo.h"
 
 // 6 integral parameters are passed in registers, but 1 is |this| which isn't
 // considered here.

xpcom/reflect/xptcall/xptcall.cpp

@@ -6,7 +6,6 @@
 /* entry point wrappers. */
 
 #include "xptcprivate.h"
-#include "nsPrintfCString.h"
 
 using namespace mozilla;
 

xpcom/reflect/xptcall/xptcall.h

@@ -12,7 +12,6 @@
 #include "nsISupports.h"
 #include "xptinfo.h"
 #include "js/Value.h"
-#include "mozilla/Attributes.h"
 #include "mozilla/MemoryReporting.h"
 
 struct nsXPTCMiniVariant {

xpcom/tests/TestMemoryPressureWatcherLinux.cpp

@@ -6,7 +6,6 @@
 #include "mozilla/AvailableMemoryWatcherUtils.h"
 
 #include <fstream>
-#include <iostream>
 
 using namespace mozilla;
 

xpcom/tests/TestQuickReturn.cpp

@@ -1,5 +1,3 @@
-#include <stdio.h>
-
 int main(int argc, char* argv[]) {
   if (argc != 1) return -1;
 

xpcom/tests/gtest/TestAllocReplacement.cpp

@@ -4,7 +4,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 "mozilla/Attributes.h"
 #include "mozmemory.h"
 #include "gtest/gtest.h"
 

xpcom/tests/gtest/TestHashtables.cpp

@@ -9,7 +9,7 @@
 #include "nsTHashMap.h"
 #include "nsInterfaceHashtable.h"
 #include "nsClassHashtable.h"
-#include "nsRefPtrHashtable.h"
+#include "nsRefCountedHashtable.h"
 
 #include "nsCOMPtr.h"
 #include "nsIMemoryReporter.h"

xpcom/threads/IdleTaskRunner.cpp

@@ -5,8 +5,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "IdleTaskRunner.h"
+#include "mozilla/TaskCategory.h"
+#include "mozilla/TaskController.h"
 #include "nsRefreshDriver.h"
-#include "nsComponentManagerUtils.h"
 
 namespace mozilla {
 

xpcom/threads/IdleTaskRunner.h

@@ -8,9 +8,9 @@
 #define IdleTaskRunner_h
 
 #include "mozilla/TimeStamp.h"
-#include "mozilla/TaskCategory.h"
-#include "mozilla/TaskController.h"
-#include "nsThreadUtils.h"
+#include "nsIEventTarget.h"
+#include "nsISupports.h"
+#include "nsITimer.h"
 #include <functional>
 
 namespace mozilla {