diff -Naur gtk+-3.8.2.orig/config.h.in gtk+-3.8.2/config.h.in
--- gtk+-3.8.2.orig/config.h.in	2013-05-13 00:26:28.000000000 -1000
+++ gtk+-3.8.2/config.h.in	2014-12-15 15:39:55.241809676 -1000
@@ -18,6 +18,9 @@
 /* Define the location where the catalogs will be installed */
 #undef GTK_LOCALEDIR
 
+/* Define if we're using atk-bridge-2.0 */
+#undef HAVE_ATK_BRIDGE
+
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #undef HAVE_BIND_TEXTDOMAIN_CODESET
 
diff -Naur gtk+-3.8.2.orig/configure gtk+-3.8.2/configure
--- gtk+-3.8.2.orig/configure	2013-05-13 00:26:27.000000000 -1000
+++ gtk+-3.8.2/configure	2014-12-15 16:20:02.034647253 -1000
@@ -1024,6 +1024,7 @@
 enable_modules
 with_included_immodules
 with_x
+with_atk_bridge
 enable_cups
 enable_papi
 enable_test_print_backend
@@ -1767,6 +1768,7 @@
   --with-included-immodules=MODULE1,MODULE2,...
                           build the specified input methods into gtk
   --with-x                use the X Window System
+  --without-atk-bridge    Do not use atk-bridge-2.0
   --with-html-dir=PATH    path to installed docs
   --with-xml-catalog=CATALOG
                           path to xml catalog to use
@@ -24084,13 +24086,23 @@
 # Check for Accessibility Toolkit flags
 ########################################
 
-if test x$enable_x11_backend = xyes; then
+# Check whether --with-atk-bridge was given.
+if test "${with_atk_bridge+set}" = set; then :
+  withval=$with_atk_bridge; :
+else
+  with_atk_bridge=$enable_x11_backend
+fi
+
+
+if test x$with_atk_bridge != xno; then
    ATK_PACKAGES="atk atk-bridge-2.0"
+
+$as_echo "#define HAVE_ATK_BRIDGE 1" >>confdefs.h
+
 else
    ATK_PACKAGES="atk"
 fi
 
-
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ATK" >&5
 $as_echo_n "checking for ATK... " >&6; }
diff -Naur gtk+-3.8.2.orig/configure.ac gtk+-3.8.2/configure.ac
--- gtk+-3.8.2.orig/configure.ac	2013-05-13 00:23:51.000000000 -1000
+++ gtk+-3.8.2/configure.ac	2014-12-15 15:32:51.614838264 -1000
@@ -1303,8 +1303,13 @@
 # Check for Accessibility Toolkit flags
 ########################################
 
-if test x$enable_x11_backend = xyes; then
+AC_ARG_WITH(atk-bridge,
+	    AS_HELP_STRING([--without-atk-bridge], [Do not use atk-bridge-2.0]),
+	    :, with_atk_bridge=$enable_x11_backend)
+
+if test x$with_atk_bridge != xno; then
    ATK_PACKAGES="atk atk-bridge-2.0"
+   AC_DEFINE([HAVE_ATK_BRIDGE], [1], [Define if we're using atk-bridge-2.0])
 else
    ATK_PACKAGES="atk"
 fi
diff -Naur gtk+-3.8.2.orig/gtk/a11y/gtkaccessibility.c gtk+-3.8.2/gtk/a11y/gtkaccessibility.c
--- gtk+-3.8.2.orig/gtk/a11y/gtkaccessibility.c	2013-05-05 08:01:07.000000000 -1000
+++ gtk+-3.8.2/gtk/a11y/gtkaccessibility.c	2014-12-15 15:59:04.773732099 -1000
@@ -37,9 +37,6 @@
 #include <gtk/gtkcombobox.h>
 #include <gtk/gtkaccessible.h>
 
-#ifdef GDK_WINDOWING_X11
-#include <atk-bridge.h>
-#endif
 
 static gboolean gail_focus_watcher      (GSignalInvocationHint *ihint,
                                          guint                  n_param_values,
@@ -989,9 +986,6 @@
 
   g_clear_object (&atk_misc_instance);
 
-#ifdef GDK_WINDOWING_X11
-  atk_bridge_adaptor_cleanup ();
-#endif
 
   undo_window_event_initialization ();
 }
@@ -1011,9 +1005,6 @@
   _gtk_accessibility_override_atk_util ();
   do_window_event_initialization ();
 
-#ifdef GDK_WINDOWING_X11
-  atk_bridge_adaptor_init (NULL, NULL);
-#endif
 
   atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL);
 }
