diff --git a/extensions/pref/Makefile.in b/extensions/pref/Makefile.in
index 6a23c7590457..ee00dda6b085 100644
--- a/extensions/pref/Makefile.in
+++ b/extensions/pref/Makefile.in
@@ -46,7 +46,9 @@ include $(DEPTH)/config/autoconf.mk
 DIRS             = autoconfig
 
 ifdef MOZ_ENABLE_GTK2
+ifdef MOZ_ENABLE_GCONF
 DIRS		+= system-pref
 endif
+endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/extensions/pref/system-pref/src/Makefile.in b/extensions/pref/system-pref/src/Makefile.in
index 75053dc36def..7da79c96d66a 100644
--- a/extensions/pref/system-pref/src/Makefile.in
+++ b/extensions/pref/system-pref/src/Makefile.in
@@ -52,8 +52,10 @@ LIBXUL_LIBRARY = 1
 
 
 ifdef MOZ_ENABLE_GTK2
+ifdef MOZ_ENABLE_GCONF
 DIRS		= gconf
 endif
+endif
 
 CPPSRCS =   \
   nsSystemPref.cpp	   \
diff --git a/toolkit/library/libxul-config.mk b/toolkit/library/libxul-config.mk
index 8b763f0c6e12..0fd82c8f5977 100644
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -260,9 +260,11 @@ endif
 ifdef MOZ_ENABLE_GTK2
 COMPONENT_LIBS += widget_gtk2
 ifdef MOZ_PREF_EXTENSIONS
+ifdef MOZ_ENABLE_GCONF
 COMPONENT_LIBS += system-pref
 endif
 endif
+endif
 
 ifdef MOZ_ENABLE_GTK2
 ifdef MOZ_X11
diff --git a/toolkit/library/nsStaticXULComponents.cpp b/toolkit/library/nsStaticXULComponents.cpp
index 4e3c0326eec1..1d03f63d062e 100644
--- a/toolkit/library/nsStaticXULComponents.cpp
+++ b/toolkit/library/nsStaticXULComponents.cpp
@@ -111,12 +111,14 @@
 
 #ifdef MOZ_PREF_EXTENSIONS
 #ifdef MOZ_ENABLE_GTK2
+#ifdef MOZ_ENABLE_GCONF
 #define SYSTEMPREF_MODULES \
     MODULE(nsSystemPrefModule) \
     MODULE(nsAutoConfigModule)
 #else
 #define SYSTEMPREF_MODULES MODULE(nsAutoConfigModule)
 #endif
+#endif
 #else
 #define SYSTEMPREF_MODULES
 #endif
diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
index c356d835811c..dfd1a3ffb46e 100644
--- a/widget/src/gtk2/nsWindow.cpp
+++ b/widget/src/gtk2/nsWindow.cpp
@@ -4229,6 +4229,7 @@ nsWindow::Create(nsIWidget        *aParent,
         Resize(mBounds.x, mBounds.y, mBounds.width, mBounds.height, PR_FALSE);
 
 #ifdef ACCESSIBILITY
+#ifdef MOZ_ENABLE_GCONF
     nsresult rv;
     if (!sAccessibilityChecked) {
         sAccessibilityChecked = PR_TRUE;
@@ -4250,11 +4251,12 @@ nsWindow::Create(nsIWidget        *aParent,
                 sysPrefService->GetBoolPref(sAccessibilityKey,
                                             &sAccessibilityEnabled);
             }
-
         }
     }
 #endif
 
+#endif
+
 #ifdef MOZ_DFB
     if (!mDFB) {
          DirectFBCreate( &mDFB );