diff --git a/dom/base/moz.build b/dom/base/moz.build
index fc68e6867ba5..27fcf10ad557 100644
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -423,7 +423,7 @@ LOCAL_INCLUDES += [
     '/dom/xslt/xpath',
     '/dom/xul',
     '/gfx/2d',
-    '/image/src',
+    '/image',
     '/js/xpconnect/src',
     '/js/xpconnect/wrappers',
     '/layout/base',
diff --git a/dom/canvas/moz.build b/dom/canvas/moz.build
index 9c8cf2eedecb..deb5c9ab0527 100644
--- a/dom/canvas/moz.build
+++ b/dom/canvas/moz.build
@@ -142,7 +142,7 @@ LOCAL_INCLUDES += [
     '/dom/svg',
     '/dom/xul',
     '/gfx/gl',
-    '/image/src',
+    '/image',
     '/js/xpconnect/src',
     '/layout/generic',
     '/layout/style',
diff --git a/image/src/BMPFileHeaders.h b/image/BMPFileHeaders.h
similarity index 97%
rename from image/src/BMPFileHeaders.h
rename to image/BMPFileHeaders.h
index cf3e8e8ea847..7311e71a467d 100644
--- a/image/src/BMPFileHeaders.h
+++ b/image/BMPFileHeaders.h
@@ -2,8 +2,8 @@
  * 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_src_BMPFileHeaders_h
-#define mozilla_image_src_BMPFileHeaders_h
+#ifndef mozilla_image_BMPFileHeaders_h
+#define mozilla_image_BMPFileHeaders_h
 
 namespace mozilla {
 namespace image {
@@ -141,4 +141,4 @@ enum ERLEState {
                               ///< be read as padding
 };
 
-#endif // mozilla_image_src_BMPFileHeaders_h
+#endif // mozilla_image_BMPFileHeaders_h
diff --git a/image/src/ClippedImage.cpp b/image/ClippedImage.cpp
similarity index 100%
rename from image/src/ClippedImage.cpp
rename to image/ClippedImage.cpp
diff --git a/image/src/ClippedImage.h b/image/ClippedImage.h
similarity index 96%
rename from image/src/ClippedImage.h
rename to image/ClippedImage.h
index 7f0787e39f0b..febf421f9d76 100644
--- a/image/src/ClippedImage.h
+++ b/image/ClippedImage.h
@@ -3,8 +3,8 @@
  * 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_src_ClippedImage_h
-#define mozilla_image_src_ClippedImage_h
+#ifndef mozilla_image_ClippedImage_h
+#define mozilla_image_ClippedImage_h
 
 #include "ImageWrapper.h"
 #include "mozilla/gfx/2D.h"
@@ -91,4 +91,4 @@ private:
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_ClippedImage_h
+#endif // mozilla_image_ClippedImage_h
diff --git a/image/src/DecodePool.cpp b/image/DecodePool.cpp
similarity index 100%
rename from image/src/DecodePool.cpp
rename to image/DecodePool.cpp
diff --git a/image/src/DecodePool.h b/image/DecodePool.h
similarity index 96%
rename from image/src/DecodePool.h
rename to image/DecodePool.h
index 4145f7ddb3f9..0b26fd0a47ea 100644
--- a/image/src/DecodePool.h
+++ b/image/DecodePool.h
@@ -7,8 +7,8 @@
  * DecodePool manages the threads used for decoding raster images.
  */
 
-#ifndef mozilla_image_src_DecodePool_h
-#define mozilla_image_src_DecodePool_h
+#ifndef mozilla_image_DecodePool_h
+#define mozilla_image_DecodePool_h
 
 #include "mozilla/Mutex.h"
 #include "mozilla/StaticPtr.h"
@@ -111,4 +111,4 @@ private:
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_DecodePool_h
+#endif // mozilla_image_DecodePool_h
diff --git a/image/src/Decoder.cpp b/image/Decoder.cpp
similarity index 100%
rename from image/src/Decoder.cpp
rename to image/Decoder.cpp
diff --git a/image/src/Decoder.h b/image/Decoder.h
similarity index 99%
rename from image/src/Decoder.h
rename to image/Decoder.h
index df40d77a6573..3781b1ea5c80 100644
--- a/image/src/Decoder.h
+++ b/image/Decoder.h
@@ -3,8 +3,8 @@
  * 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_src_Decoder_h
-#define mozilla_image_src_Decoder_h
+#ifndef mozilla_image_Decoder_h
+#define mozilla_image_Decoder_h
 
 #include "FrameAnimator.h"
 #include "RasterImage.h"
@@ -502,4 +502,4 @@ private:
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_Decoder_h
+#endif // mozilla_image_Decoder_h
diff --git a/image/src/Downscaler.cpp b/image/Downscaler.cpp
similarity index 100%
rename from image/src/Downscaler.cpp
rename to image/Downscaler.cpp
diff --git a/image/src/Downscaler.h b/image/Downscaler.h
similarity index 97%
rename from image/src/Downscaler.h
rename to image/Downscaler.h
index a2ae2e39b9a3..d676717912fc 100644
--- a/image/src/Downscaler.h
+++ b/image/Downscaler.h
@@ -9,8 +9,8 @@
  * scaling implementation.
  */
 
-#ifndef mozilla_image_src_Downscaler_h
-#define mozilla_image_src_Downscaler_h
+#ifndef mozilla_image_Downscaler_h
+#define mozilla_image_Downscaler_h
 
 #include "mozilla/UniquePtr.h"
 #include "nsRect.h"
@@ -156,4 +156,4 @@ public:
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_Downscaler_h
+#endif // mozilla_image_Downscaler_h
diff --git a/image/src/DynamicImage.cpp b/image/DynamicImage.cpp
similarity index 100%
rename from image/src/DynamicImage.cpp
rename to image/DynamicImage.cpp
diff --git a/image/src/DynamicImage.h b/image/DynamicImage.h
similarity index 95%
rename from image/src/DynamicImage.h
rename to image/DynamicImage.h
index adf554f4af6d..2ba75120bb08 100644
--- a/image/src/DynamicImage.h
+++ b/image/DynamicImage.h
@@ -3,8 +3,8 @@
  * 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_src_DynamicImage_h
-#define mozilla_image_src_DynamicImage_h
+#ifndef mozilla_image_DynamicImage_h
+#define mozilla_image_DynamicImage_h
 
 #include "mozilla/MemoryReporting.h"
 #include "gfxDrawable.h"
@@ -72,4 +72,4 @@ private:
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_DynamicImage_h
+#endif // mozilla_image_DynamicImage_h
diff --git a/image/src/FrameAnimator.cpp b/image/FrameAnimator.cpp
similarity index 100%
rename from image/src/FrameAnimator.cpp
rename to image/FrameAnimator.cpp
diff --git a/image/src/FrameAnimator.h b/image/FrameAnimator.h
similarity index 98%
rename from image/src/FrameAnimator.h
rename to image/FrameAnimator.h
index e9c2c6f22057..00fccf547762 100644
--- a/image/src/FrameAnimator.h
+++ b/image/FrameAnimator.h
@@ -4,8 +4,8 @@
  * 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_src_FrameAnimator_h
-#define mozilla_image_src_FrameAnimator_h
+#ifndef mozilla_image_FrameAnimator_h
+#define mozilla_image_FrameAnimator_h
 
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/TimeStamp.h"
@@ -287,4 +287,4 @@ private: // data
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_FrameAnimator_h
+#endif // mozilla_image_FrameAnimator_h
diff --git a/image/src/FrozenImage.cpp b/image/FrozenImage.cpp
similarity index 100%
rename from image/src/FrozenImage.cpp
rename to image/FrozenImage.cpp
diff --git a/image/src/FrozenImage.h b/image/FrozenImage.h
similarity index 95%
rename from image/src/FrozenImage.h
rename to image/FrozenImage.h
index c64ebdb8730c..9366ae57271f 100644
--- a/image/src/FrozenImage.h
+++ b/image/FrozenImage.h
@@ -3,8 +3,8 @@
  * 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_src_FrozenImage_h
-#define mozilla_image_src_FrozenImage_h
+#ifndef mozilla_image_FrozenImage_h
+#define mozilla_image_FrozenImage_h
 
 #include "ImageWrapper.h"
 #include "mozilla/gfx/2D.h"
@@ -66,4 +66,4 @@ private:
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_FrozenImage_h
+#endif // mozilla_image_FrozenImage_h
diff --git a/image/src/ICOFileHeaders.h b/image/ICOFileHeaders.h
similarity index 93%
rename from image/src/ICOFileHeaders.h
rename to image/ICOFileHeaders.h
index 80209211dcc1..aae5c99e82fa 100644
--- a/image/src/ICOFileHeaders.h
+++ b/image/ICOFileHeaders.h
@@ -3,8 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 
-#ifndef mozilla_image_src_ICOFileHeaders_h
-#define mozilla_image_src_ICOFileHeaders_h
+#ifndef mozilla_image_ICOFileHeaders_h
+#define mozilla_image_ICOFileHeaders_h
 
 namespace mozilla {
 namespace image {
@@ -78,4 +78,4 @@ struct IconDirEntry
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_ICOFileHeaders_h
+#endif // mozilla_image_ICOFileHeaders_h
diff --git a/image/src/IProgressObserver.h b/image/IProgressObserver.h
similarity index 92%
rename from image/src/IProgressObserver.h
rename to image/IProgressObserver.h
index ab06834ab129..d2e94a6d73b2 100644
--- a/image/src/IProgressObserver.h
+++ b/image/IProgressObserver.h
@@ -3,8 +3,8 @@
  * 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_src_IProgressObserver_h
-#define mozilla_image_src_IProgressObserver_h
+#ifndef mozilla_image_IProgressObserver_h
+#define mozilla_image_IProgressObserver_h
 
 #include "mozilla/WeakPtr.h"
 #include "nsISupports.h"
@@ -56,4 +56,4 @@ protected:
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_IProgressObserver_h
+#endif // mozilla_image_IProgressObserver_h
diff --git a/image/src/Image.cpp b/image/Image.cpp
similarity index 100%
rename from image/src/Image.cpp
rename to image/Image.cpp
diff --git a/image/src/Image.h b/image/Image.h
similarity index 99%
rename from image/src/Image.h
rename to image/Image.h
index 5d61a9753144..200c4c8cf55a 100644
--- a/image/src/Image.h
+++ b/image/Image.h
@@ -3,8 +3,8 @@
  * 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_src_Image_h
-#define mozilla_image_src_Image_h
+#ifndef mozilla_image_Image_h
+#define mozilla_image_Image_h
 
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/TimeStamp.h"
@@ -339,4 +339,4 @@ protected:
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_Image_h
+#endif // mozilla_image_Image_h
diff --git a/image/src/ImageFactory.cpp b/image/ImageFactory.cpp
similarity index 100%
rename from image/src/ImageFactory.cpp
rename to image/ImageFactory.cpp
diff --git a/image/src/ImageFactory.h b/image/ImageFactory.h
similarity index 96%
rename from image/src/ImageFactory.h
rename to image/ImageFactory.h
index c33674017277..6c2e0f50451a 100644
--- a/image/src/ImageFactory.h
+++ b/image/ImageFactory.h
@@ -4,8 +4,8 @@
  * 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_src_ImageFactory_h
-#define mozilla_image_src_ImageFactory_h
+#ifndef mozilla_image_ImageFactory_h
+#define mozilla_image_ImageFactory_h
 
 #include "nsCOMPtr.h"
 #include "nsProxyRelease.h"
@@ -92,4 +92,4 @@ private:
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_ImageFactory_h
+#endif // mozilla_image_ImageFactory_h
diff --git a/image/src/ImageMetadata.cpp b/image/ImageMetadata.cpp
similarity index 100%
rename from image/src/ImageMetadata.cpp
rename to image/ImageMetadata.cpp
diff --git a/image/src/ImageMetadata.h b/image/ImageMetadata.h
similarity index 93%
rename from image/src/ImageMetadata.h
rename to image/ImageMetadata.h
index 63c03693c520..a8d374bb828e 100644
--- a/image/src/ImageMetadata.h
+++ b/image/ImageMetadata.h
@@ -4,8 +4,8 @@
  * 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_src_ImageMetadata_h
-#define mozilla_image_src_ImageMetadata_h
+#ifndef mozilla_image_ImageMetadata_h
+#define mozilla_image_ImageMetadata_h
 
 #include <stdint.h>
 #include "mozilla/Maybe.h"
@@ -71,4 +71,4 @@ private:
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_ImageMetadata_h
+#endif // mozilla_image_ImageMetadata_h
diff --git a/image/src/ImageOps.cpp b/image/ImageOps.cpp
similarity index 100%
rename from image/src/ImageOps.cpp
rename to image/ImageOps.cpp
diff --git a/image/src/ImageOps.h b/image/ImageOps.h
similarity index 94%
rename from image/src/ImageOps.h
rename to image/ImageOps.h
index fd3a6536d4e2..d080a54e4d96 100644
--- a/image/src/ImageOps.h
+++ b/image/ImageOps.h
@@ -4,8 +4,8 @@
  * 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_src_ImageOps_h
-#define mozilla_image_src_ImageOps_h
+#ifndef mozilla_image_ImageOps_h
+#define mozilla_image_ImageOps_h
 
 #include "nsCOMPtr.h"
 #include "nsRect.h"
@@ -69,4 +69,4 @@ private:
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_ImageOps_h
+#endif // mozilla_image_ImageOps_h
diff --git a/image/src/ImageRegion.h b/image/ImageRegion.h
similarity index 96%
rename from image/src/ImageRegion.h
rename to image/ImageRegion.h
index cba7bf8f72b4..d9b3b9e1c50a 100644
--- a/image/src/ImageRegion.h
+++ b/image/ImageRegion.h
@@ -3,8 +3,8 @@
  * 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_src_ImageRegion_h
-#define mozilla_image_src_ImageRegion_h
+#ifndef mozilla_image_ImageRegion_h
+#define mozilla_image_ImageRegion_h
 
 #include "gfxRect.h"
 
@@ -155,4 +155,4 @@ private:
 }  // namespace image
 }  // namespace mozilla
 
-#endif // mozilla_image_src_ImageRegion_h
+#endif // mozilla_image_ImageRegion_h
diff --git a/image/src/ImageURL.h b/image/ImageURL.h
similarity index 95%
rename from image/src/ImageURL.h
rename to image/ImageURL.h
index 3d48b7f9016e..8aa65fc1f249 100644
--- a/image/src/ImageURL.h
+++ b/image/ImageURL.h
@@ -3,8 +3,8 @@
  * 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_src_ImageURL_h
-#define mozilla_image_src_ImageURL_h
+#ifndef mozilla_image_ImageURL_h
+#define mozilla_image_ImageURL_h
 
 #include "nsIURI.h"
 #include "MainThreadUtils.h"
@@ -90,4 +90,4 @@ private:
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_ImageURL_h
+#endif // mozilla_image_ImageURL_h
diff --git a/image/src/ImageWrapper.cpp b/image/ImageWrapper.cpp
similarity index 100%
rename from image/src/ImageWrapper.cpp
rename to image/ImageWrapper.cpp
diff --git a/image/src/ImageWrapper.h b/image/ImageWrapper.h
similarity index 95%
rename from image/src/ImageWrapper.h
rename to image/ImageWrapper.h
index 99f52c3705db..997595441896 100644
--- a/image/src/ImageWrapper.h
+++ b/image/ImageWrapper.h
@@ -3,8 +3,8 @@
  * 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_src_ImageWrapper_h
-#define mozilla_image_src_ImageWrapper_h
+#ifndef mozilla_image_ImageWrapper_h
+#define mozilla_image_ImageWrapper_h
 
 #include "mozilla/MemoryReporting.h"
 #include "Image.h"
@@ -82,4 +82,4 @@ private:
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_ImageWrapper_h
+#endif // mozilla_image_ImageWrapper_h
diff --git a/image/src/MultipartImage.cpp b/image/MultipartImage.cpp
similarity index 100%
rename from image/src/MultipartImage.cpp
rename to image/MultipartImage.cpp
diff --git a/image/src/MultipartImage.h b/image/MultipartImage.h
similarity index 95%
rename from image/src/MultipartImage.h
rename to image/MultipartImage.h
index d3d3c6c9a4d8..6c45c1075572 100644
--- a/image/src/MultipartImage.h
+++ b/image/MultipartImage.h
@@ -3,8 +3,8 @@
  * 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_src_MultipartImage_h
-#define mozilla_image_src_MultipartImage_h
+#ifndef mozilla_image_MultipartImage_h
+#define mozilla_image_MultipartImage_h
 
 #include "ImageWrapper.h"
 #include "IProgressObserver.h"
@@ -88,4 +88,4 @@ private:
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_MultipartImage_h
+#endif // mozilla_image_MultipartImage_h
diff --git a/image/src/Orientation.h b/image/Orientation.h
similarity index 91%
rename from image/src/Orientation.h
rename to image/Orientation.h
index 5b1344e32402..a0f2e1b75a0a 100644
--- a/image/src/Orientation.h
+++ b/image/Orientation.h
@@ -3,8 +3,8 @@
  * 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_src_Orientation_h
-#define mozilla_image_src_Orientation_h
+#ifndef mozilla_image_Orientation_h
+#define mozilla_image_Orientation_h
 
 #include <stdint.h>
 
@@ -59,4 +59,4 @@ struct Orientation
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_Orientation_h
+#endif // mozilla_image_Orientation_h
diff --git a/image/src/OrientedImage.cpp b/image/OrientedImage.cpp
similarity index 100%
rename from image/src/OrientedImage.cpp
rename to image/OrientedImage.cpp
diff --git a/image/src/OrientedImage.h b/image/OrientedImage.h
similarity index 95%
rename from image/src/OrientedImage.h
rename to image/OrientedImage.h
index a276f5949ab8..1796f3125d64 100644
--- a/image/src/OrientedImage.h
+++ b/image/OrientedImage.h
@@ -3,8 +3,8 @@
  * 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_src_OrientedImage_h
-#define mozilla_image_src_OrientedImage_h
+#ifndef mozilla_image_OrientedImage_h
+#define mozilla_image_OrientedImage_h
 
 #include "ImageWrapper.h"
 #include "mozilla/gfx/2D.h"
@@ -72,4 +72,4 @@ private:
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_OrientedImage_h
+#endif // mozilla_image_OrientedImage_h
diff --git a/image/src/ProgressTracker.cpp b/image/ProgressTracker.cpp
similarity index 100%
rename from image/src/ProgressTracker.cpp
rename to image/ProgressTracker.cpp
diff --git a/image/src/ProgressTracker.h b/image/ProgressTracker.h
similarity index 98%
rename from image/src/ProgressTracker.h
rename to image/ProgressTracker.h
index 79225c56e52c..8143ecdf866f 100644
--- a/image/src/ProgressTracker.h
+++ b/image/ProgressTracker.h
@@ -4,8 +4,8 @@
  * 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_src_ProgressTracker_h
-#define mozilla_image_src_ProgressTracker_h
+#ifndef mozilla_image_ProgressTracker_h
+#define mozilla_image_ProgressTracker_h
 
 #include "mozilla/Mutex.h"
 #include "mozilla/RefPtr.h"
@@ -208,4 +208,4 @@ private:
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_ProgressTracker_h
+#endif // mozilla_image_ProgressTracker_h
diff --git a/image/src/RasterImage.cpp b/image/RasterImage.cpp
similarity index 100%
rename from image/src/RasterImage.cpp
rename to image/RasterImage.cpp
diff --git a/image/src/RasterImage.h b/image/RasterImage.h
similarity index 99%
rename from image/src/RasterImage.h
rename to image/RasterImage.h
index 0e9865d070e2..0075b39646f5 100644
--- a/image/src/RasterImage.h
+++ b/image/RasterImage.h
@@ -14,8 +14,8 @@
  * @author  Andrew Smith <asmith15@learn.senecac.on.ca>
  */
 
-#ifndef mozilla_image_src_RasterImage_h
-#define mozilla_image_src_RasterImage_h
+#ifndef mozilla_image_RasterImage_h
+#define mozilla_image_RasterImage_h
 
 #include "Image.h"
 #include "nsCOMPtr.h"
@@ -486,4 +486,4 @@ RasterImage::GetAnimationMode(uint16_t* aAnimationMode) {
 } // namespace image
 } // namespace mozilla
 
-#endif /* mozilla_image_src_RasterImage_h */
+#endif /* mozilla_image_RasterImage_h */
diff --git a/image/src/SVGDocumentWrapper.cpp b/image/SVGDocumentWrapper.cpp
similarity index 100%
rename from image/src/SVGDocumentWrapper.cpp
rename to image/SVGDocumentWrapper.cpp
diff --git a/image/src/SVGDocumentWrapper.h b/image/SVGDocumentWrapper.h
similarity index 96%
rename from image/src/SVGDocumentWrapper.h
rename to image/SVGDocumentWrapper.h
index 41040ef2adf8..beb1de740071 100644
--- a/image/src/SVGDocumentWrapper.h
+++ b/image/SVGDocumentWrapper.h
@@ -5,8 +5,8 @@
 
 /* This class wraps an SVG document, for use by VectorImage objects. */
 
-#ifndef mozilla_image_src_SVGDocumentWrapper_h
-#define mozilla_image_src_SVGDocumentWrapper_h
+#ifndef mozilla_image_SVGDocumentWrapper_h
+#define mozilla_image_SVGDocumentWrapper_h
 
 #include "mozilla/Attributes.h"
 
@@ -148,4 +148,4 @@ private:
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_SVGDocumentWrapper_h
+#endif // mozilla_image_SVGDocumentWrapper_h
diff --git a/image/src/ScriptedNotificationObserver.cpp b/image/ScriptedNotificationObserver.cpp
similarity index 100%
rename from image/src/ScriptedNotificationObserver.cpp
rename to image/ScriptedNotificationObserver.cpp
diff --git a/image/src/ScriptedNotificationObserver.h b/image/ScriptedNotificationObserver.h
similarity index 84%
rename from image/src/ScriptedNotificationObserver.h
rename to image/ScriptedNotificationObserver.h
index b3529e743664..1a1e35d70328 100644
--- a/image/src/ScriptedNotificationObserver.h
+++ b/image/ScriptedNotificationObserver.h
@@ -4,8 +4,8 @@
  * 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_src_ScriptedNotificationObserver_h
-#define mozilla_image_src_ScriptedNotificationObserver_h
+#ifndef mozilla_image_ScriptedNotificationObserver_h
+#define mozilla_image_ScriptedNotificationObserver_h
 
 #include "imgINotificationObserver.h"
 #include "nsCOMPtr.h"
@@ -34,4 +34,4 @@ private:
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_ScriptedNotificationObserver_h
+#endif // mozilla_image_ScriptedNotificationObserver_h
diff --git a/image/src/ShutdownTracker.cpp b/image/ShutdownTracker.cpp
similarity index 100%
rename from image/src/ShutdownTracker.cpp
rename to image/ShutdownTracker.cpp
diff --git a/image/src/ShutdownTracker.h b/image/ShutdownTracker.h
similarity index 90%
rename from image/src/ShutdownTracker.h
rename to image/ShutdownTracker.h
index d6fbb567300c..5f220e4cde14 100644
--- a/image/src/ShutdownTracker.h
+++ b/image/ShutdownTracker.h
@@ -8,8 +8,8 @@
  * whether shutdown has started.
  */
 
-#ifndef mozilla_image_src_ShutdownTracker_h
-#define mozilla_image_src_ShutdownTracker_h
+#ifndef mozilla_image_ShutdownTracker_h
+#define mozilla_image_ShutdownTracker_h
 
 namespace mozilla {
 namespace image {
@@ -43,4 +43,4 @@ private:
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_ShutdownTracker_h
+#endif // mozilla_image_ShutdownTracker_h
diff --git a/image/src/SourceBuffer.cpp b/image/SourceBuffer.cpp
similarity index 100%
rename from image/src/SourceBuffer.cpp
rename to image/SourceBuffer.cpp
diff --git a/image/src/SourceBuffer.h b/image/SourceBuffer.h
similarity index 98%
rename from image/src/SourceBuffer.h
rename to image/SourceBuffer.h
index abb3f9880345..53f2177496a0 100644
--- a/image/src/SourceBuffer.h
+++ b/image/SourceBuffer.h
@@ -8,8 +8,8 @@
  * storing image source (compressed) data.
  */
 
-#ifndef mozilla_image_src_sourcebuffer_h
-#define mozilla_image_src_sourcebuffer_h
+#ifndef mozilla_image_sourcebuffer_h
+#define mozilla_image_sourcebuffer_h
 
 #include "mozilla/Maybe.h"
 #include "mozilla/MemoryReporting.h"
@@ -379,4 +379,4 @@ private:
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_sourcebuffer_h
+#endif // mozilla_image_sourcebuffer_h
diff --git a/image/src/SurfaceCache.cpp b/image/SurfaceCache.cpp
similarity index 100%
rename from image/src/SurfaceCache.cpp
rename to image/SurfaceCache.cpp
diff --git a/image/src/SurfaceCache.h b/image/SurfaceCache.h
similarity index 99%
rename from image/src/SurfaceCache.h
rename to image/SurfaceCache.h
index 5dcc41fe2961..bd600d17e717 100644
--- a/image/src/SurfaceCache.h
+++ b/image/SurfaceCache.h
@@ -8,8 +8,8 @@
  * data in imagelib.
  */
 
-#ifndef mozilla_image_src_SurfaceCache_h
-#define mozilla_image_src_SurfaceCache_h
+#ifndef mozilla_image_SurfaceCache_h
+#define mozilla_image_SurfaceCache_h
 
 #include "mozilla/Maybe.h"           // for Maybe
 #include "mozilla/MemoryReporting.h" // for MallocSizeOf
@@ -417,4 +417,4 @@ private:
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_SurfaceCache_h
+#endif // mozilla_image_SurfaceCache_h
diff --git a/image/src/VectorImage.cpp b/image/VectorImage.cpp
similarity index 100%
rename from image/src/VectorImage.cpp
rename to image/VectorImage.cpp
diff --git a/image/src/VectorImage.h b/image/VectorImage.h
similarity index 97%
rename from image/src/VectorImage.h
rename to image/VectorImage.h
index b88c3de29016..5c382052664c 100644
--- a/image/src/VectorImage.h
+++ b/image/VectorImage.h
@@ -3,8 +3,8 @@
  * 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_src_VectorImage_h
-#define mozilla_image_src_VectorImage_h
+#ifndef mozilla_image_VectorImage_h
+#define mozilla_image_VectorImage_h
 
 #include "Image.h"
 #include "nsIStreamListener.h"
@@ -124,4 +124,4 @@ inline NS_IMETHODIMP VectorImage::SetAnimationMode(uint16_t aAnimationMode) {
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_VectorImage_h
+#endif // mozilla_image_VectorImage_h
diff --git a/image/build/moz.build b/image/build/moz.build
index 654076ae84b0..8cbcfd96b148 100644
--- a/image/build/moz.build
+++ b/image/build/moz.build
@@ -16,10 +16,10 @@ FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '../encoders/bmp',
-    '../encoders/ico',
-    '../encoders/jpeg',
-    '../encoders/png',
-    '../src',
+    '/image',
+    '/image/encoders/bmp',
+    '/image/encoders/ico',
+    '/image/encoders/jpeg',
+    '/image/encoders/png',
 ]
 
diff --git a/image/decoders/moz.build b/image/decoders/moz.build
index 6e52a478befc..0508afb19e57 100644
--- a/image/decoders/moz.build
+++ b/image/decoders/moz.build
@@ -36,7 +36,7 @@ FAIL_ON_WARNINGS = True
 
 # Decoders need RasterImage.h
 LOCAL_INCLUDES += [
-    '/image/src',
+    '/image',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/image/encoders/bmp/moz.build b/image/encoders/bmp/moz.build
index 20530d9d3707..eb8f884c3124 100644
--- a/image/encoders/bmp/moz.build
+++ b/image/encoders/bmp/moz.build
@@ -11,7 +11,7 @@ SOURCES += [
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
-    '/image/src',
+    '/image',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/image/encoders/ico/moz.build b/image/encoders/ico/moz.build
index 87fa481fc51f..7f00248e9e41 100644
--- a/image/encoders/ico/moz.build
+++ b/image/encoders/ico/moz.build
@@ -12,9 +12,9 @@ FAIL_ON_WARNINGS = True
 
 # Decoders need RasterImage.h
 LOCAL_INCLUDES += [
-    '../bmp',
-    '../png',
-    '/image/src',
+    '/image',
+    '/image/encoders/bmp',
+    '/image/encoders/png',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/image/encoders/png/moz.build b/image/encoders/png/moz.build
index 3cdb746d9c62..65e6bb8bb9ca 100644
--- a/image/encoders/png/moz.build
+++ b/image/encoders/png/moz.build
@@ -11,7 +11,7 @@ SOURCES += [
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
-    '/image/src',
+    '/image',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/image/src/imgFrame.cpp b/image/imgFrame.cpp
similarity index 100%
rename from image/src/imgFrame.cpp
rename to image/imgFrame.cpp
diff --git a/image/src/imgFrame.h b/image/imgFrame.h
similarity index 99%
rename from image/src/imgFrame.h
rename to image/imgFrame.h
index 3343dcd923f3..c77d32543a43 100644
--- a/image/src/imgFrame.h
+++ b/image/imgFrame.h
@@ -4,8 +4,8 @@
  * 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_src_imgFrame_h
-#define mozilla_image_src_imgFrame_h
+#ifndef mozilla_image_imgFrame_h
+#define mozilla_image_imgFrame_h
 
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Monitor.h"
@@ -532,4 +532,4 @@ private:
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_imgFrame_h
+#endif // mozilla_image_imgFrame_h
diff --git a/image/src/imgLoader.cpp b/image/imgLoader.cpp
similarity index 100%
rename from image/src/imgLoader.cpp
rename to image/imgLoader.cpp
diff --git a/image/src/imgLoader.h b/image/imgLoader.h
similarity index 99%
rename from image/src/imgLoader.h
rename to image/imgLoader.h
index 5097f836f297..8f13aaa6c967 100644
--- a/image/src/imgLoader.h
+++ b/image/imgLoader.h
@@ -4,8 +4,8 @@
  * 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_src_imgLoader_h
-#define mozilla_image_src_imgLoader_h
+#ifndef mozilla_image_imgLoader_h
+#define mozilla_image_imgLoader_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/Mutex.h"
@@ -571,4 +571,4 @@ private:
   bool mHadInsecureRedirect;
 };
 
-#endif // mozilla_image_src_imgLoader_h
+#endif // mozilla_image_imgLoader_h
diff --git a/image/src/imgRequest.cpp b/image/imgRequest.cpp
similarity index 100%
rename from image/src/imgRequest.cpp
rename to image/imgRequest.cpp
diff --git a/image/src/imgRequest.h b/image/imgRequest.h
similarity index 98%
rename from image/src/imgRequest.h
rename to image/imgRequest.h
index 14caef3b2e2e..4beb25fa80e2 100644
--- a/image/src/imgRequest.h
+++ b/image/imgRequest.h
@@ -4,8 +4,8 @@
  * 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_src_imgRequest_h
-#define mozilla_image_src_imgRequest_h
+#ifndef mozilla_image_imgRequest_h
+#define mozilla_image_imgRequest_h
 
 #include "nsIChannelEventSink.h"
 #include "nsIInterfaceRequestor.h"
@@ -279,4 +279,4 @@ private:
   bool mHadInsecureRedirect : 1;
 };
 
-#endif // mozilla_image_src_imgRequest_h
+#endif // mozilla_image_imgRequest_h
diff --git a/image/src/imgRequestProxy.cpp b/image/imgRequestProxy.cpp
similarity index 100%
rename from image/src/imgRequestProxy.cpp
rename to image/imgRequestProxy.cpp
diff --git a/image/src/imgRequestProxy.h b/image/imgRequestProxy.h
similarity index 98%
rename from image/src/imgRequestProxy.h
rename to image/imgRequestProxy.h
index 34305154434c..df2a1762814f 100644
--- a/image/src/imgRequestProxy.h
+++ b/image/imgRequestProxy.h
@@ -4,8 +4,8 @@
  * 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_src_imgRequestProxy_h
-#define mozilla_image_src_imgRequestProxy_h
+#ifndef mozilla_image_imgRequestProxy_h
+#define mozilla_image_imgRequestProxy_h
 
 #include "imgIRequest.h"
 #include "nsISecurityInfoProvider.h"
@@ -243,4 +243,4 @@ protected:
   nsCOMPtr<nsIPrincipal> mPrincipal;
 };
 
-#endif // mozilla_image_src_imgRequestProxy_h
+#endif // mozilla_image_imgRequestProxy_h
diff --git a/image/src/imgTools.cpp b/image/imgTools.cpp
similarity index 100%
rename from image/src/imgTools.cpp
rename to image/imgTools.cpp
diff --git a/image/src/imgTools.h b/image/imgTools.h
similarity index 86%
rename from image/src/imgTools.h
rename to image/imgTools.h
index 3d2244632e97..e82af9624a79 100644
--- a/image/src/imgTools.h
+++ b/image/imgTools.h
@@ -4,8 +4,8 @@
  * 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_src_imgITools_h
-#define mozilla_image_src_imgITools_h
+#ifndef mozilla_image_imgITools_h
+#define mozilla_image_imgITools_h
 
 #include "imgITools.h"
 
@@ -28,4 +28,4 @@ public:
 private:
   virtual ~imgTools();
 };
-#endif // mozilla_image_src_imgITools_h
+#endif // mozilla_image_imgITools_h
diff --git a/image/moz.build b/image/moz.build
index 4baf4aeadeb0..6b697d36d3d9 100644
--- a/image/moz.build
+++ b/image/moz.build
@@ -4,7 +4,7 @@
 # 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/.
 
-DIRS += ['build', 'src', 'decoders', 'encoders']
+DIRS += ['build', 'decoders', 'encoders']
 
 with Files('**'):
     BUG_COMPONENT = ('Core', 'ImageLib')
@@ -35,4 +35,70 @@ XPIDL_MODULE = 'imglib2'
 
 EXPORTS += [
     'ImageLogging.h',
+    'ImageOps.h',
+    'ImageRegion.h',
+    'imgLoader.h',
+    'imgRequest.h',
+    'imgRequestProxy.h',
+    'IProgressObserver.h',
+    'Orientation.h',
+    'SurfaceCache.h',
 ]
+
+UNIFIED_SOURCES += [
+    'ClippedImage.cpp',
+    'DecodePool.cpp',
+    'Decoder.cpp',
+    'DynamicImage.cpp',
+    'FrameAnimator.cpp',
+    'FrozenImage.cpp',
+    'Image.cpp',
+    'ImageFactory.cpp',
+    'ImageMetadata.cpp',
+    'ImageOps.cpp',
+    'ImageWrapper.cpp',
+    'imgFrame.cpp',
+    'imgTools.cpp',
+    'MultipartImage.cpp',
+    'OrientedImage.cpp',
+    'ScriptedNotificationObserver.cpp',
+    'ShutdownTracker.cpp',
+    'SourceBuffer.cpp',
+    'SurfaceCache.cpp',
+    'SVGDocumentWrapper.cpp',
+    'VectorImage.cpp',
+]
+if CONFIG['MOZ_ENABLE_SKIA']:
+    UNIFIED_SOURCES += [ 'Downscaler.cpp']
+
+# These files can't be unified because of ImageLogging.h #include order issues.
+SOURCES += [
+    'imgLoader.cpp',
+    'imgRequest.cpp',
+    'imgRequestProxy.cpp',
+    'ProgressTracker.cpp',
+    'RasterImage.cpp',
+]
+
+FAIL_ON_WARNINGS = True
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'xul'
+
+LOCAL_INCLUDES += [
+    # Because SVGDocumentWrapper.cpp includes "mozilla/dom/SVGSVGElement.h"
+    '/dom/base',
+    '/dom/svg',
+    # Access to Skia headers for Downscaler
+    '/gfx/2d',
+    # We need to instantiate the decoders
+    '/image/decoders',
+    # Because VectorImage.cpp includes nsSVGUtils.h and nsSVGEffects.h
+    '/layout/svg',
+    # For URI-related functionality
+    '/netwerk/base',
+]
+
+# Because imgFrame.cpp includes "cairo.h"
+CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
diff --git a/image/src/moz.build b/image/src/moz.build
deleted file mode 100644
index 5f7d8b93c08c..000000000000
--- a/image/src/moz.build
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-EXPORTS += [
-    'ImageOps.h',
-    'ImageRegion.h',
-    'imgLoader.h',
-    'imgRequest.h',
-    'imgRequestProxy.h',
-    'IProgressObserver.h',
-    'Orientation.h',
-    'SurfaceCache.h',
-]
-
-UNIFIED_SOURCES += [
-    'ClippedImage.cpp',
-    'DecodePool.cpp',
-    'Decoder.cpp',
-    'DynamicImage.cpp',
-    'FrameAnimator.cpp',
-    'FrozenImage.cpp',
-    'Image.cpp',
-    'ImageFactory.cpp',
-    'ImageMetadata.cpp',
-    'ImageOps.cpp',
-    'ImageWrapper.cpp',
-    'imgFrame.cpp',
-    'imgTools.cpp',
-    'MultipartImage.cpp',
-    'OrientedImage.cpp',
-    'ScriptedNotificationObserver.cpp',
-    'ShutdownTracker.cpp',
-    'SourceBuffer.cpp',
-    'SurfaceCache.cpp',
-    'SVGDocumentWrapper.cpp',
-    'VectorImage.cpp',
-]
-if CONFIG['MOZ_ENABLE_SKIA']:
-    UNIFIED_SOURCES += [ 'Downscaler.cpp']
-
-# These files can't be unified because of ImageLogging.h #include order issues.
-SOURCES += [
-    'imgLoader.cpp',
-    'imgRequest.cpp',
-    'imgRequestProxy.cpp',
-    'ProgressTracker.cpp',
-    'RasterImage.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-include('/ipc/chromium/chromium-config.mozbuild')
-
-FINAL_LIBRARY = 'xul'
-
-LOCAL_INCLUDES += [
-    # Because SVGDocumentWrapper.cpp includes "mozilla/dom/SVGSVGElement.h"
-    '/dom/base',
-    '/dom/svg',
-    # Access to Skia headers for Downscaler
-    '/gfx/2d',
-    # We need to instantiate the decoders
-    '/image/decoders',
-    # Because VectorImage.cpp includes nsSVGUtils.h and nsSVGEffects.h
-    '/layout/svg',
-    # For URI-related functionality
-    '/netwerk/base',
-]
-
-# Because imgFrame.cpp includes "cairo.h"
-CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']