diff --git a/modules/libpr0n/decoders/bmp/Makefile.in b/modules/libpr0n/decoders/bmp/Makefile.in
index 18a3d6851c3b..d3f5bdb2f968 100644
--- a/modules/libpr0n/decoders/bmp/Makefile.in
+++ b/modules/libpr0n/decoders/bmp/Makefile.in
@@ -36,7 +36,6 @@ MODULE_NAME	= nsBMPModule
 REQUIRES	= xpcom \
 		  gfx \
 		  imglib2 \
-		  string \
 		  $(NULL)
 
 CPPSRCS        = nsBMPDecoder.cpp nsICODecoder.cpp
diff --git a/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp b/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp
index 723a588e00b1..f463c91c6186 100644
--- a/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp
+++ b/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp
@@ -46,14 +46,11 @@
 
 #include "nsIInputStream.h"
 #include "nsIComponentManager.h"
-#include "nsIImage.h"
-#include "nsMemory.h"
 #include "imgIContainerObserver.h"
-#include "nsRect.h"
 
 #include "imgILoad.h"
 
-#include "ImageLogging.h"
+#include "prlog.h"
 
 PRLogModuleInfo *gBMPLog = PR_NewLogModule("BMPDecoder");
 
diff --git a/modules/libpr0n/decoders/bmp/nsICODecoder.cpp b/modules/libpr0n/decoders/bmp/nsICODecoder.cpp
index d717aecaf5a4..46ae0f2d3203 100644
--- a/modules/libpr0n/decoders/bmp/nsICODecoder.cpp
+++ b/modules/libpr0n/decoders/bmp/nsICODecoder.cpp
@@ -43,16 +43,10 @@
 
 #include "nsIInputStream.h"
 #include "nsIComponentManager.h"
-#include "nsIImage.h"
-#include "nsMemory.h"
 #include "imgIContainerObserver.h"
-#include "nsRect.h"
-#include "nsCRT.h"
 
 #include "imgILoad.h"
 
-#include "prcpucfg.h" // To get IS_LITTLE_ENDIAN / IS_BIG_ENDIAN
-
 NS_IMPL_ISUPPORTS1(nsICODecoder, imgIDecoder)
 
 #define ICONCOUNTOFFSET 4
diff --git a/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp b/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
index 822c8a2c66eb..59580ab1785c 100644
--- a/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
+++ b/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
@@ -24,7 +24,6 @@
 #include "nsGIFDecoder2.h"
 #include "nsIInputStream.h"
 #include "nsIComponentManager.h"
-#include "nsIImage.h"
 #include "nsMemory.h"
 
 #include "imgIContainerObserver.h"
diff --git a/modules/libpr0n/decoders/mng/nsMNGDecoder.h b/modules/libpr0n/decoders/mng/nsMNGDecoder.h
index e3a7e7904863..20eedcb1837b 100644
--- a/modules/libpr0n/decoders/mng/nsMNGDecoder.h
+++ b/modules/libpr0n/decoders/mng/nsMNGDecoder.h
@@ -27,7 +27,6 @@
 #include "imgIContainer.h"
 #include "imgIDecoderObserver.h"
 #include "gfxIImageFrame.h"
-#include "nsWeakReference.h"
 #include "imgILoad.h"
 
 #define NS_MNGDECODER_CID \
diff --git a/modules/libpr0n/decoders/xbm/Makefile.in b/modules/libpr0n/decoders/xbm/Makefile.in
index 19b685758813..8ce3fe3a3621 100644
--- a/modules/libpr0n/decoders/xbm/Makefile.in
+++ b/modules/libpr0n/decoders/xbm/Makefile.in
@@ -36,7 +36,6 @@ MODULE_NAME     = nsXBMModule
 REQUIRES	= xpcom \
 		  gfx \
 		  imglib2 \
-		  string \
 		  $(NULL)
 
 CPPSRCS        = nsXBMDecoder.cpp
diff --git a/modules/libpr0n/decoders/xbm/nsXBMDecoder.cpp b/modules/libpr0n/decoders/xbm/nsXBMDecoder.cpp
index adb1d1bb965c..57a92dc55e9e 100644
--- a/modules/libpr0n/decoders/xbm/nsXBMDecoder.cpp
+++ b/modules/libpr0n/decoders/xbm/nsXBMDecoder.cpp
@@ -40,16 +40,12 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <ctype.h>
 
 #include "nsXBMDecoder.h"
 
 #include "nsIInputStream.h"
 #include "nsIComponentManager.h"
-#include "nsIImage.h"
-#include "nsMemory.h"
-#include "imgIContainerObserver.h"
-#include "nsRect.h"
-#include "nsReadableUtils.h"
 
 #include "imgILoad.h"
 
@@ -198,12 +194,6 @@ nsresult nsXBMDecoder::ProcessData(const char* aData, PRUint32 aCount) {
         }
     }
     if (mState == RECV_DATA) {
-#if defined(XP_MAC) || defined(XP_MACOSX)
-// bytes per pixel
-        const PRUint32 bpp = 4;
-#else
-        const PRUint32 bpp = 3;
-#endif
         PRUint32 bpr;
         mFrame->GetImageBytesPerRow(&bpr);
         PRUint32 abpr;