diff --git a/lib/python/Makefile.am b/lib/python/Makefile.am
index e1ac7930..eedc5ea7 100644
--- a/lib/python/Makefile.am
+++ b/lib/python/Makefile.am
@@ -14,6 +14,7 @@ pkgpyexec_LTLIBRARIES = _sugar.la
 _sugar_la_LDFLAGS = -module -avoid-version -R$(MOZILLA_HOME)
 _sugar_la_LIBADD =					\
 	$(LIB_LIBS)					\
+	$(GECKO_LIBS)					\
 	$(PYCAIRO_LIBS)					\
 	$(top_builddir)/lib/src/libsugarprivate.la
 
diff --git a/lib/src/GeckoContentHandler.cpp b/lib/src/GeckoContentHandler.cpp
index 4d9de8e7..a19cdc3d 100644
--- a/lib/src/GeckoContentHandler.cpp
+++ b/lib/src/GeckoContentHandler.cpp
@@ -1,3 +1,5 @@
+#include "mozilla-config.h"
+
 #include <nsCExternalHandlerService.h>
 #include <nsIFile.h>
 
diff --git a/lib/src/GeckoDownload.cpp b/lib/src/GeckoDownload.cpp
index 66eb7c8f..35993d7d 100644
--- a/lib/src/GeckoDownload.cpp
+++ b/lib/src/GeckoDownload.cpp
@@ -1,3 +1,5 @@
+#include "mozilla-config.h"
+
 #include "sugar-download-manager.h"
 
 #include "GeckoDownload.h"
diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am
index 341caf87..8fce6f63 100644
--- a/lib/src/Makefile.am
+++ b/lib/src/Makefile.am
@@ -15,6 +15,7 @@ libsugarprivate_la_CPPFLAGS =			\
 noinst_LTLIBRARIES = libsugarprivate.la
 
 libsugarprivate_la_LIBADD = $(LIB_LIBS) 		\
+			    $(GECKO_LIBS)		\
 			    -lgstinterfaces-0.10	\
 			    -lgstaudio-0.10
 
diff --git a/lib/src/sugar-browser.cpp b/lib/src/sugar-browser.cpp
index dfd05d7b..56082490 100644
--- a/lib/src/sugar-browser.cpp
+++ b/lib/src/sugar-browser.cpp
@@ -17,6 +17,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "mozilla-config.h"
+
 #include "sugar-browser.h"
 #include "GeckoContentHandler.h"
 #include "GeckoDownload.h"