diff --git a/mozilla/gfx/src/windows/makefile.win b/mozilla/gfx/src/windows/makefile.win
index 3850215a544..3de172d33a5 100644
--- a/mozilla/gfx/src/windows/makefile.win
+++ b/mozilla/gfx/src/windows/makefile.win
@@ -72,11 +72,6 @@ LLIBS=				\
 !if defined(NGLAYOUT_DDRAW)
  ole32.lib \
  $(NGLAYOUT_DDRAW)\lib\ddraw.lib \
-!if "$(MOZ_VCVER)" == "50"
- $(NGLAYOUT_DDRAW)\lib\uuid.lib \
-!else
- $(NGLAYOUT_DDRAW)\lib\dxguid.lib \
-!endif
 !endif
  $(LIBNSPR)  
 
diff --git a/mozilla/gfx/src/windows/nsRenderingContextWin.cpp b/mozilla/gfx/src/windows/nsRenderingContextWin.cpp
index ea78e016323..d1b7e5e939a 100644
--- a/mozilla/gfx/src/windows/nsRenderingContextWin.cpp
+++ b/mozilla/gfx/src/windows/nsRenderingContextWin.cpp
@@ -16,6 +16,10 @@
  * Reserved.
  */
 
+#ifdef NGLAYOUT_DDRAW
+#define INITGUID
+#endif
+
 #include "nsRenderingContextWin.h"
 #include "nsRegionWin.h"
 #include <math.h>