diff --git a/client.mk b/client.mk
index ac22abee806..6112c842427 100644
--- a/client.mk
+++ b/client.mk
@@ -93,7 +93,7 @@ endif
 ifeq (Darwin,$(shell uname -s))
 AUTOCONF ?= autoconf213
 else
-AUTOCONF ?= autoconf-2.13
+AUTOCONF ?= $(shell which autoconf-2.13 autoconf2.13 autoconf213 | head -1)
 endif
 
 MKDIR := mkdir
diff --git a/gfx/cairo/cairo/src/cairo-platform.h b/gfx/cairo/cairo/src/cairo-platform.h
index 870df814f88..21026c7cc75 100644
--- a/gfx/cairo/cairo/src/cairo-platform.h
+++ b/gfx/cairo/cairo/src/cairo-platform.h
@@ -67,7 +67,7 @@
 #  endif
 # else
 #  ifdef HAVE_VISIBILITY_ATTRIBUTE
-#   define cairo_public
+#   define cairo_public extern __attribute__((visibility("default")))
 #  elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
 #   define cairo_public extern __global
 #  else
diff --git a/gfx/src/thebes/nsThebesDeviceContext.cpp b/gfx/src/thebes/nsThebesDeviceContext.cpp
index e1658b2fa2a..b95d4a143e1 100644
--- a/gfx/src/thebes/nsThebesDeviceContext.cpp
+++ b/gfx/src/thebes/nsThebesDeviceContext.cpp
@@ -227,6 +227,7 @@ nsThebesDeviceContext::SetDPI()
 
         // we probably want to actually get a real DPI here?
         dpi = 96;
+
 #elif defined(MOZ_WIDGET_QT)
 		// TODO: get real DPI here with Qt methods
         dpi = 96;
diff --git a/gfx/thebes/src/gfxFontconfigUtils.cpp b/gfx/thebes/src/gfxFontconfigUtils.cpp
index 86b000c135a..293fa61e08c 100644
--- a/gfx/thebes/src/gfxFontconfigUtils.cpp
+++ b/gfx/thebes/src/gfxFontconfigUtils.cpp
@@ -311,7 +311,6 @@ gfxFontconfigUtils::UpdateFontListInternal(PRBool aForce)
     for (PRInt32 i = 0; i < mAliasForMultiFonts.Count(); i++) {
         nsRefPtr<gfxFontNameList> fonts = new gfxFontNameList;
         nsCAutoString fontname(*mAliasForMultiFonts.CStringAt(i));
-        printf("Alias %s\n", fontname.get());
         rv = GetResolvedFonts(fontname, fonts);
         if (NS_FAILED(rv))
             return rv;