Bug 1765593 - Cleanup mozilla-unified includes r=sylvestre

Differential Revision: https://phabricator.services.mozilla.com/D144202
2025-02-25 20:01:50 +00:00 · 2022-05-03 14:57:45 +00:00 · 2022-05-03 14:57:45 +00:00 · 7648a84eba
commit 7648a84eba
parent 41b9fe7ba7
25 changed files with 8 additions and 63 deletions
--- a/memory/replace/logalloc/LogAlloc.cpp
+++ b/memory/replace/logalloc/LogAlloc.cpp
@ -5,7 +5,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include <cstdlib>
-#include <cstdio>
 #include <fcntl.h>

 #ifdef _WIN32
--- a/memory/replace/logalloc/replay/Replay.cpp
+++ b/memory/replace/logalloc/replay/Replay.cpp
@ -16,11 +16,8 @@ typedef intptr_t ssize_t;
 #  include <unistd.h>
 #endif
 #ifdef XP_LINUX
-#  include <sys/types.h>
-#  include <sys/stat.h>
 #  include <fcntl.h>
 #  include <stdlib.h>
-#  include <ctype.h>
 #endif
 #include <algorithm>
 #include <cmath>
--- a/mozglue/misc/StackWalk.cpp
+++ b/mozglue/misc/StackWalk.cpp
@ -9,7 +9,6 @@
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/IntegerPrintfMacros.h"
 #include "mozilla/StackWalk.h"
 #ifdef XP_WIN
 #  include "mozilla/StackWalkThread.h"
@ -639,7 +638,6 @@ MFBT_API bool MozDescribeCodeAddress(void* aPC,
     MOZ_STACKWALK_SUPPORTS_MACOSX)

 #  include <stdlib.h>
-#  include <string.h>
 #  include <stdio.h>

 // On glibc 2.1, the Dl_info api defined in <dlfcn.h> is only exposed
--- a/mozglue/tests/TestBaseProfiler.cpp
+++ b/mozglue/tests/TestBaseProfiler.cpp
@ -35,9 +35,7 @@
 #  include <process.h>
 #else
 #  include <errno.h>
-#  include <string.h>
 #  include <time.h>
-#  include <unistd.h>
 #endif

 #include <algorithm>
--- a/mozglue/tests/TestIntegerPrintfMacros.cpp
+++ b/mozglue/tests/TestIntegerPrintfMacros.cpp
@ -8,8 +8,6 @@
 #include "mozilla/IntegerPrintfMacros.h"  // this must pick up <stdint.h>
 #include "mozilla/Sprintf.h"

-#include <stddef.h>
-#include <stdio.h>
 #include <string.h>

 /* Output array and poisoning method shared by all tests. */
--- a/toolkit/components/cascade_bloom_filter/CascadeFilter.h
+++ b/toolkit/components/cascade_bloom_filter/CascadeFilter.h
@ -5,8 +5,8 @@
 #ifndef CASCADE_BLOOM_FILTER_CASCADE_FILTER_H_
 #define CASCADE_BLOOM_FILTER_CASCADE_FILTER_H_

+#include "mozilla/AlreadyAddRefed.h"
 #include "nsICascadeFilter.h"
-#include "nsCOMPtr.h"

 namespace mozilla {

--- a/toolkit/components/commandlines/nsCommandLine.cpp
+++ b/toolkit/components/commandlines/nsCommandLine.cpp
@ -21,8 +21,6 @@
 #include "nsUnicharUtils.h"
 #include "nsTextFormatter.h"
 #include "nsXPCOMCID.h"
-#include "plstr.h"
-#include "mozilla/Attributes.h"

 #ifdef MOZ_WIDGET_COCOA
 #  include <CoreFoundation/CoreFoundation.h>
@ -30,8 +28,6 @@
 #elif defined(XP_WIN)
 #  include <windows.h>
 #  include <shlobj.h>
-#elif defined(XP_UNIX)
-#  include <unistd.h>
 #endif

 #ifdef DEBUG_bsmedberg
--- a/toolkit/components/ctypes/ctypes.cpp
+++ b/toolkit/components/ctypes/ctypes.cpp
@ -8,12 +8,9 @@
 #include "js/experimental/CTypes.h"  // JS::CTypesCallbacks, JS::InitCTypesClass, JS::SetCTypesCallbacks
 #include "js/MemoryFunctions.h"
 #include "js/PropertyAndElement.h"  // JS_GetProperty
-#include "nsMemory.h"
 #include "nsString.h"
 #include "nsNativeCharsetUtils.h"
-#include "mozilla/Preferences.h"
 #include "mozJSComponentLoader.h"
-#include "nsZipArchive.h"
 #include "xpc_make_class.h"

 namespace mozilla::ctypes {
--- a/toolkit/components/ctypes/ctypes.h
+++ b/toolkit/components/ctypes/ctypes.h
@ -7,7 +7,6 @@
 #define COMPONENTS_CTYPES_H

 #include "nsIXPCScriptable.h"
-#include "mozilla/Attributes.h"

 namespace mozilla {
 namespace ctypes {
--- a/toolkit/components/downloads/DownloadPlatform.cpp
+++ b/toolkit/components/downloads/DownloadPlatform.cpp
@ -9,13 +9,10 @@
 #include "nsIProtocolHandler.h"
 #include "nsIURI.h"
 #include "nsIFile.h"
-#include "nsDirectoryServiceDefs.h"
-#include "nsThreadUtils.h"
 #include "xpcpublic.h"

 #include "mozilla/dom/Promise.h"
 #include "mozilla/Preferences.h"
-#include "mozilla/Services.h"

 #define PREF_BDM_ADDTORECENTDOCS "browser.download.manager.addToRecentDocs"

--- a/toolkit/components/downloads/DownloadPlatform.h
+++ b/toolkit/components/downloads/DownloadPlatform.h
@ -7,9 +7,7 @@

 #include "mozIDownloadPlatform.h"

-#include "nsCOMPtr.h"
-
-class nsIURI;
+#include "nsISupports.h"

 class DownloadPlatform : public mozIDownloadPlatform {
 protected:
--- a/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp
+++ b/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp
@ -10,11 +10,8 @@
 #include "js/Object.h"              // JS::GetClass, JS::GetReservedSlot
 #include "js/PropertyAndElement.h"  // JS_DefineFunctions
 #include "js/PropertySpec.h"
-#include "mozJSComponentLoader.h"
 #include "nsIThread.h"
-#include "nsZipArchive.h"

-#include "mozilla/Scoped.h"
 #include "mozilla/Services.h"
 #include "nsIObserverService.h"
 #include "nsThreadUtils.h"
--- a/toolkit/components/osfile/NativeOSFileInternals.cpp
+++ b/toolkit/components/osfile/NativeOSFileInternals.cpp
@ -13,7 +13,6 @@
 #include "nsString.h"
 #include "nsNetCID.h"
 #include "nsThreadUtils.h"
-#include "nsXPCOMCID.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsServiceManagerUtils.h"
 #include "nsProxyRelease.h"
@ -36,20 +35,13 @@
 #include "jsapi.h"
 #include "jsfriendapi.h"
 #include "js/ArrayBuffer.h"  // JS::GetArrayBufferByteLength,IsArrayBufferObject,NewArrayBufferWithContents,StealArrayBufferContents
-#include "js/Conversions.h"
 #include "js/experimental/TypedData.h"  // JS_NewUint8ArrayWithBuffer
-#include "js/MemoryFunctions.h"
-#include "js/UniquePtr.h"
 #include "js/Utility.h"
 #include "xpcpublic.h"

 #include <algorithm>
 #if defined(XP_UNIX)
-#  include <unistd.h>
 #  include <errno.h>
-#  include <fcntl.h>
-#  include <sys/stat.h>
-#  include <sys/uio.h>
 #endif  // defined (XP_UNIX)

 #if defined(XP_WIN)
--- a/toolkit/components/osfile/NativeOSFileInternals.h
+++ b/toolkit/components/osfile/NativeOSFileInternals.h
@ -9,7 +9,7 @@

 #include "nsINativeOSFileInternals.h"

-#include "mozilla/Attributes.h"
+#include "nsISupports.h"

 namespace mozilla {

--- a/toolkit/components/parentalcontrols/nsParentalControlsServiceDefault.cpp
+++ b/toolkit/components/parentalcontrols/nsParentalControlsServiceDefault.cpp
@ -4,7 +4,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "nsParentalControlsService.h"
-#include "nsString.h"
 #include "nsIFile.h"
 #include "mozilla/Unused.h"

--- a/toolkit/components/reflect/reflect.cpp
+++ b/toolkit/components/reflect/reflect.cpp
@ -5,9 +5,8 @@

 #include "reflect.h"
 #include "jsapi.h"
-#include "nsMemory.h"
+
 #include "nsString.h"
-#include "nsNativeCharsetUtils.h"
 #include "xpc_make_class.h"

 namespace mozilla::reflect {
--- a/toolkit/components/reflect/reflect.h
+++ b/toolkit/components/reflect/reflect.h
@ -7,7 +7,7 @@
 #define COMPONENTS_REFLECT_H

 #include "nsIXPCScriptable.h"
-#include "mozilla/Attributes.h"
+#include "nsISupports.h"

 namespace mozilla {
 namespace reflect {
--- a/toolkit/components/terminator/nsTerminator.cpp
+++ b/toolkit/components/terminator/nsTerminator.cpp
@ -20,15 +20,12 @@

 #include "prthread.h"
 #include "prmon.h"
-#include "plstr.h"
 #include "prio.h"

 #include "nsString.h"
-#include "nsServiceManagerUtils.h"
 #include "nsDirectoryServiceUtils.h"
 #include "nsAppDirectoryServiceDefs.h"

-#include "nsIObserverService.h"
 #include "nsExceptionHandler.h"
 #include "GeckoProfiler.h"
 #include "nsThreadUtils.h"
@ -43,12 +40,10 @@
 #include "mozilla/AppShutdown.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Atomics.h"
-#include "mozilla/Attributes.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/IntentionalCrash.h"
 #include "mozilla/MemoryChecking.h"
 #include "mozilla/Preferences.h"
-#include "mozilla/Services.h"
 #include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Unused.h"
--- a/toolkit/system/gnome/nsAlertsIconListener.cpp
+++ b/toolkit/system/gnome/nsAlertsIconListener.cpp
@ -6,7 +6,6 @@
 #include "nsAlertsIconListener.h"
 #include "imgIContainer.h"
 #include "imgIRequest.h"
-#include "nsNetUtil.h"
 #include "nsServiceManagerUtils.h"
 #include "nsSystemAlertsService.h"
 #include "nsIAlertsService.h"
--- a/toolkit/system/gnome/nsGSettingsService.cpp
+++ b/toolkit/system/gnome/nsGSettingsService.cpp
@ -3,12 +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/. */

-#include "mozilla/ArrayUtils.h"
-
 #include "nsGSettingsService.h"
 #include "nsString.h"
 #include "nsCOMPtr.h"
-#include "nsMemory.h"
 #include "prlink.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIMutableArray.h"
--- a/toolkit/system/gnome/nsSystemAlertsService.cpp
+++ b/toolkit/system/gnome/nsSystemAlertsService.cpp
@ -4,7 +4,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "nsComponentManagerUtils.h"
-#include "nsXULAppAPI.h"
 #include "nsSystemAlertsService.h"
 #include "nsAlertsIconListener.h"

--- a/toolkit/system/gnome/nsSystemAlertsService.h
+++ b/toolkit/system/gnome/nsSystemAlertsService.h
@ -8,7 +8,6 @@

 #include "nsIAlertsService.h"
 #include "nsTHashMap.h"
-#include "nsCOMPtr.h"

 class nsAlertsIconListener;

--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
@ -6,18 +6,15 @@
 #include "nsISystemProxySettings.h"
 #include "mozilla/Components.h"
 #include "nsIURI.h"
-#include "nsReadableUtils.h"
 #include "nsArrayUtils.h"
 #include "prnetdb.h"
 #include "prenv.h"
-#include "nsPrintfCString.h"
-#include "nsNetCID.h"
+#include "nsInterfaceHashtable.h"
+#include "nsHashtablesFwd.h"
+#include "nsHashKeys.h"
 #include "nsNetUtil.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIGSettingsService.h"
-#include "nsInterfaceHashtable.h"
-#include "mozilla/Attributes.h"
-#include "nsIURI.h"

 using namespace mozilla;

--- a/toolkit/xre/ProfileReset.cpp
+++ b/toolkit/xre/ProfileReset.cpp
@ -15,13 +15,11 @@
 #include "nsDirectoryServiceUtils.h"
 #include "nsPIDOMWindow.h"
 #include "nsString.h"
-#include "nsXPCOMCIDInternal.h"
 #include "mozilla/Components.h"
 #include "mozilla/XREAppData.h"

 #include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/Unused.h"
-#include "prtime.h"

 using namespace mozilla;

--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@ -35,7 +35,6 @@

 #include "nsAppRunner.h"
 #include "nsExceptionHandler.h"
-#include "nsString.h"
 #include "nsThreadUtils.h"
 #include "nsJSUtils.h"
 #include "nsWidgetsCID.h"
@ -87,8 +86,6 @@
 #include "mozilla/gfx/GPUProcessImpl.h"
 #include "mozilla/net/SocketProcessImpl.h"

-#include "GeckoProfiler.h"
-#include "BaseProfiler.h"
 #include "ProfilerControl.h"

 #if defined(MOZ_SANDBOX) && defined(XP_WIN)