--- a/gfx/layers/d3d9/ImageLayerD3D9.cpp
+++ b/gfx/layers/d3d9/ImageLayerD3D9.cpp
@@ -58,17 +58,17 @@ SurfaceToTexture(IDirect3DDevice9 *aDevi
 
   nsRefPtr<gfxContext> context = new gfxContext(imageSurface);
 
   context->SetSource(aSurface);
   context->Paint();
 
   nsRefPtr<IDirect3DTexture9> texture;
   nsRefPtr<IDirect3DDevice9Ex> deviceEx;
-  aDevice->QueryInterface(__uuidof(IDirect3DDevice9Ex),
+  aDevice->QueryInterface(IID_IDirect3DDevice9Ex,
                           (void**)getter_AddRefs(deviceEx));
 
   if (deviceEx) {
     // D3D9Ex doesn't support managed textures. We could use dynamic textures
     // here but since Images are immutable that probably isn't such a great
     // idea.
     if (FAILED(aDevice->
                CreateTexture(aSize.width, aSize.height,
@@ -445,17 +445,17 @@ PlanarYCbCrImageD3D9::AllocateTextures(I
   PRUint8* src;
   PRUint8* dest;
 
   nsRefPtr<IDirect3DSurface9> tmpSurfaceY;
   nsRefPtr<IDirect3DSurface9> tmpSurfaceCb;
   nsRefPtr<IDirect3DSurface9> tmpSurfaceCr;
 
   nsRefPtr<IDirect3DDevice9Ex> deviceEx;
-  aDevice->QueryInterface(__uuidof(IDirect3DDevice9Ex),
+  aDevice->QueryInterface(IID_IDirect3DDevice9Ex,
                           getter_AddRefs(deviceEx));
 
   bool isD3D9Ex = deviceEx;
 
   if (isD3D9Ex) {
     nsRefPtr<IDirect3DTexture9> tmpYTexture;
     nsRefPtr<IDirect3DTexture9> tmpCbTexture;
     nsRefPtr<IDirect3DTexture9> tmpCrTexture;

--- a/gfx/layers/d3d9/LayerManagerD3D9.cpp
+++ b/gfx/layers/d3d9/LayerManagerD3D9.cpp
@@ -39,16 +39,17 @@
 
 #include "ThebesLayerD3D9.h"
 #include "ContainerLayerD3D9.h"
 #include "ImageLayerD3D9.h"
 #include "ColorLayerD3D9.h"
 #include "CanvasLayerD3D9.h"
 #include "gfxWindowsPlatform.h"
 #include "nsIGfxInfo.h"
+#include "nsServiceManagerUtils.h"
 
 #ifdef CAIRO_HAS_D2D_SURFACE
 #include "gfxD2DSurface.h"
 #endif
 
 namespace mozilla {
 namespace layers {