diff --git a/browser/GeckoBrowserPersist.cpp b/browser/GeckoBrowserPersist.cpp
index 48de4d11..5e698d8d 100644
--- a/browser/GeckoBrowserPersist.cpp
+++ b/browser/GeckoBrowserPersist.cpp
@@ -1,3 +1,5 @@
+#ifdef HAVE_GECKO_1_9
+
 #include <stdio.h>
 
 #include <gtkmozembed.h>
@@ -183,3 +185,5 @@ GeckoBrowserPersist::SaveURI(const char *uri, const char *filename)
 
     return TRUE;
 }
+
+#endif
diff --git a/browser/GeckoDocumentObject.cpp b/browser/GeckoDocumentObject.cpp
index 6f034e18..fcbbe694 100644
--- a/browser/GeckoDocumentObject.cpp
+++ b/browser/GeckoDocumentObject.cpp
@@ -1,3 +1,5 @@
+#ifdef HAVE_GECKO_1_9
+
 #include <unistd.h>
 
 #include <glib.h>
@@ -185,3 +187,5 @@ GeckoDocumentObject::SaveImage(const char *filename)
     GeckoBrowserPersist browserPersist(mBrowser);
     return browserPersist.SaveURI(mImageURI.get(), filename);
 }
+
+#endif
diff --git a/browser/GeckoDragDropHooks.cpp b/browser/GeckoDragDropHooks.cpp
index 425ee455..fdca9545 100644
--- a/browser/GeckoDragDropHooks.cpp
+++ b/browser/GeckoDragDropHooks.cpp
@@ -1,3 +1,5 @@
+#ifdef HAVE_GECKO_1_9
+
 #include <sys/time.h>
 #include <time.h>
 
@@ -183,3 +185,5 @@ GeckoDragDropHooks::OnPasteOrDrop(nsIDOMEvent *event, nsITransferable *trans,
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
+
+#endif
diff --git a/browser/sugar-browser.cpp b/browser/sugar-browser.cpp
index 270631b1..273cea8f 100644
--- a/browser/sugar-browser.cpp
+++ b/browser/sugar-browser.cpp
@@ -23,9 +23,12 @@
 #include "sugar-marshal.h"
 #include "GeckoContentHandler.h"
 #include "GeckoDownload.h"
+
+#ifdef HAVE_GECKO_1_9
 #include "GeckoDragDropHooks.h"
 #include "GeckoDocumentObject.h"
 #include "GeckoBrowserPersist.h"
+#endif
 
 #include <gdk/gdkx.h>
 #include <gtkmozembed_internal.h>
@@ -563,7 +566,8 @@ location_cb(GtkMozEmbed *embed)
 static gboolean
 dom_mouse_click_cb(GtkMozEmbed *embed, nsIDOMMouseEvent *mouseEvent)
 {
-	SugarBrowser *browser = SUGAR_BROWSER(embed);
+#ifdef HAVE_GECKO_1_9
+    SugarBrowser *browser = SUGAR_BROWSER(embed);
     SugarBrowserEvent *event;
     gint return_value = FALSE;
 
@@ -592,6 +596,9 @@ dom_mouse_click_cb(GtkMozEmbed *embed, nsIDOMMouseEvent *mouseEvent)
     sugar_browser_event_free(event);
 
     return return_value;
+#else
+    return FALSE;
+#endif
 }
 
 static void
@@ -658,8 +665,12 @@ sugar_browser_save_uri(SugarBrowser *browser,
                        const char   *uri,
                        const char   *filename)
 {
+#ifdef HAVE_GECKO_1_9
     GeckoBrowserPersist browserPersist(browser);
     return browserPersist.SaveURI(uri, filename);
+#else
+    return FALSE;
+#endif
 }
 
 gboolean