--- a/image/DecoderFactory.cpp
+++ b/image/DecoderFactory.cpp
@@ -2,17 +2,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 "DecoderFactory.h"
 
 #include "nsMimeTypes.h"
 #include "mozilla/RefPtr.h"
-#include "nsString.h"
 
 #include "Decoder.h"
 #include "IDecodingTask.h"
 #include "nsPNGDecoder.h"
 #include "nsGIFDecoder2.h"
 #include "nsJPEGDecoder.h"
 #include "nsBMPDecoder.h"
 #include "nsICODecoder.h"

--- a/image/DecoderFactory.h
+++ b/image/DecoderFactory.h
@@ -10,18 +10,16 @@
 #include "DecoderFlags.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/NotNull.h"
 #include "mozilla/gfx/2D.h"
 #include "nsCOMPtr.h"
 #include "SurfaceFlags.h"
 
-class nsACString;
-
 namespace mozilla {
 namespace image {
 
 class Decoder;
 class IDecodingTask;
 class RasterImage;
 class SourceBuffer;
 

--- a/image/DownscalingFilter.h
+++ b/image/DownscalingFilter.h
@@ -14,17 +14,16 @@
  */
 
 #ifndef mozilla_image_DownscalingFilter_h
 #define mozilla_image_DownscalingFilter_h
 
 #include <algorithm>
 #include <ctime>
 #include <stdint.h>
-#include <string.h>
 
 #include "mozilla/Maybe.h"
 #include "mozilla/SSE.h"
 #include "mozilla/mips.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/gfx/2D.h"
 #include "gfxPrefs.h"
 

--- a/image/ImageLogging.h
+++ b/image/ImageLogging.h
@@ -4,17 +4,16 @@
  * 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/. */
 
 #ifndef mozilla_image_ImageLogging_h
 #define mozilla_image_ImageLogging_h
 
 #include "mozilla/Logging.h"
 #include "prinrval.h"
-#include "nsString.h"
 
 static mozilla::LazyLogModule gImgLog("imgRequest");
 
 #define GIVE_ME_MS_NOW() PR_IntervalToMilliseconds(PR_IntervalNow())
 
 using mozilla::LogLevel;
 
 class LogScope {

--- a/image/decoders/icon/gtk/nsIconChannel.cpp
+++ b/image/decoders/icon/gtk/nsIconChannel.cpp
@@ -14,18 +14,16 @@
 #include <gio/gio.h>
 #endif
 
 #include <gtk/gtk.h>
 
 #include "nsMimeTypes.h"
 #include "nsIMIMEService.h"
 
-#include "nsIStringBundle.h"
-#include "nsIStringStream.h"
 #include "nsServiceManagerUtils.h"
 
 #include "nsNetUtil.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIStringStream.h"
 #include "nsServiceManagerUtils.h"
 #include "nsNullPrincipal.h"
 #include "nsIURL.h"

--- a/image/imgLoader.cpp
+++ b/image/imgLoader.cpp
@@ -7,17 +7,16 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/Move.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/ChaosMode.h"
 
 #include "ImageLogging.h"
 #include "nsImageModule.h"
-#include "nsPrintfCString.h"
 #include "imgLoader.h"
 #include "imgRequestProxy.h"
 
 #include "nsCOMPtr.h"
 
 #include "nsContentPolicyUtils.h"
 #include "nsContentUtils.h"
 #include "nsNetUtil.h"