diff --git a/gfx/public/nsIImage.h b/gfx/public/nsIImage.h
index edde6fdb89d..37fe47605d6 100644
--- a/gfx/public/nsIImage.h
+++ b/gfx/public/nsIImage.h
@@ -43,9 +43,7 @@
 #include "nsRect.h"
 #include "gfxRect.h"
 
-#ifdef MOZ_CAIRO_GFX
 class gfxASurface;
-#endif
 
 class nsIDeviceContext;
 
@@ -72,13 +70,6 @@ typedef enum {
 #define  nsImageUpdateFlags_kColorMapChanged 0x1
 #define  nsImageUpdateFlags_kBitsChanged     0x2
 
-#ifndef MOZ_CAIRO_GFX
-// The following platforms store image data rows bottom-up.
-#if defined(XP_WIN) || defined(XP_OS2) || defined(XP_MACOSX)
-#define MOZ_PLATFORM_IMAGES_BOTTOM_TO_TOP
-#endif
-#endif
-
 // IID for the nsIImage interface
 // fd31e1f2-bd46-47f1-b8b6-b94ce954f9ce
 #define NS_IIMAGE_IID \