diff -ur Democracy-0.8.5.orig/platform/gtk-x11/frontend_implementation/MozillaBrowserXPCOM.h Democracy-0.8.5/platform/gtk-x11/frontend_implementation/MozillaBrowserXPCOM.h
--- Democracy-0.8.5.orig/platform/gtk-x11/frontend_implementation/MozillaBrowserXPCOM.h	2006-08-04 07:26:34.000000000 -0400
+++ Democracy-0.8.5/platform/gtk-x11/frontend_implementation/MozillaBrowserXPCOM.h	2006-08-04 07:28:39.000000000 -0400
@@ -4,6 +4,9 @@
 #include <gtkmozembed.h>
 #include <nscore.h>
 
+#ifndef MOZILLA_INTERNAL_API
+#define MOZILLA_INTERNAL_API
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -25,4 +28,5 @@
 }
 #endif
 
+#endif /* MOZILLA_INTERNAL_API */
 #endif /* MOZILLA_BROWSER_XPCOM_H */
diff -ur Democracy-0.8.5.orig/platform/gtk-x11/setup.py Democracy-0.8.5/platform/gtk-x11/setup.py
--- Democracy-0.8.5.orig/platform/gtk-x11/setup.py	2006-08-04 07:26:34.000000000 -0400
+++ Democracy-0.8.5/platform/gtk-x11/setup.py	2006-08-04 07:34:30.000000000 -0400
@@ -145,8 +145,10 @@
 
     if options_dict is None:
         options_dict = {
-            'include_dirs' : [],
-            'library_dirs' : [],
+            'include_dirs' : ['/usr/lib/mozilla-firefox/include/webbrwsr',
+	                      '/usr/lib/mozilla-firefox/include/dom',
+	                      '/usr/lib/mozilla-firefox/include/uriloader'],
+	    'library_dirs' : [],
             'libraries' : [],
             'extra_compile_args' : []
         }
@@ -160,8 +162,6 @@
             options_dict['library_dirs'].append(rest)
         elif prefix == '-l':
             options_dict['libraries'].append(rest)
-        else:
-            options_dict['extra_compile_args'].append(comp)
     return options_dict
 
 #### The fasttypes extension ####
@@ -179,6 +179,9 @@
 elif re.search("^mozilla-xpcom", packages, re.MULTILINE):
     xpcom = 'mozilla-xpcom'
     gtkmozembed = 'mozilla-gtkmozembed'
+elif re.search("^firefox-xpcom", packages, re.MULTILINE):
+    xpcom = 'firefox-xpcom'
+    gtkmozembed = 'firefox-gtkmozembed'
 else:
     raise RuntimeError("Can't find xulrunner-xpcom or mozilla-xpcom")
 mozilla_browser_options = parsePkgConfig("pkg-config" ,