diff --git a/mozilla/gfx/src/xlib/Makefile.in b/mozilla/gfx/src/xlib/Makefile.in
index 89786fff8cb..f88f2d6243c 100644
--- a/mozilla/gfx/src/xlib/Makefile.in
+++ b/mozilla/gfx/src/xlib/Makefile.in
@@ -109,6 +109,7 @@ EXTRA_DSO_LDOPTS += \
 		$(NSPR_LIBS)	\
 		-lxpcom		\
 		-lgkgfx		\
+		-lgfxshared_s   \
 		$(GFX_XIE_LIBS) \
 		$(NULL)
 
@@ -130,6 +131,7 @@ endif
 LOCAL_INCLUDES	+= \
 		-I$(srcdir)/. \
 		-I$(srcdir)/.. \
+		-I$(srcdir)/../shared \
 		-I$(srcdir)/../x11shared \
 		$(NULL)
 
diff --git a/mozilla/gfx/src/xlib/nsGfxFactoryXlib.cpp b/mozilla/gfx/src/xlib/nsGfxFactoryXlib.cpp
index fe2a97c7bde..b0260fabac0 100644
--- a/mozilla/gfx/src/xlib/nsGfxFactoryXlib.cpp
+++ b/mozilla/gfx/src/xlib/nsGfxFactoryXlib.cpp
@@ -58,6 +58,7 @@
 #include "nsFontList.h"
 #include "nsPrintOptionsXlib.h"
 #include "nsPrintSession.h"
+#include "gfxImageFrame.h"
 
 // objects that just require generic constructors
 
@@ -75,6 +76,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerXlib)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsPrintOptionsXlib)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsPrinterEnumeratorXlib)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintSession, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR(gfxImageFrame)
 
 // our custom constructors
 
@@ -186,6 +188,10 @@ static const nsModuleComponentInfo components[] =
     //    "@mozilla.org/gfx/printer_enumerator/xlib;1",
     "@mozilla.org/gfx/printerenumerator;1",
     nsPrinterEnumeratorXlibConstructor },
+  { "windows image frame",
+    GFX_IMAGEFRAME_CID,
+    "@mozilla.org/gfx/image/frame;2",
+    gfxImageFrameConstructor, },
   { "Print Session",
     NS_PRINTSESSION_CID,
     "@mozilla.org/gfx/printsession;1",