diff -urb ./plugins/collab/core/session/xp/AbiCollabSessionManager.cpp /home/ib/abiword/plugins/collab/core/session/xp/AbiCollabSessionManager.cpp
--- ./plugins/collab/core/session/xp/AbiCollabSessionManager.cpp	2011-11-17 14:20:36.000000000 +0100
+++ /home/ib/abiword/plugins/collab/core/session/xp/AbiCollabSessionManager.cpp	2011-11-18 10:04:48.000000000 +0100
@@ -1563,7 +1563,7 @@
 		}
 	}
 	Sleep(10);
-#elif defined(TOOLKIT_GTK)
+#elif defined(TOOLKIT_GTK_ALL)
 		for (UT_sint32 i = 0; (i < 10) && gtk_events_pending(); i++)
 			gtk_main_iteration ();
 		usleep(1000*10);
diff -urb ./plugins/gdict/Makefile.am /home/ib/abiword/plugins/gdict/Makefile.am
--- ./plugins/gdict/Makefile.am	2011-11-17 14:20:33.000000000 +0100
+++ /home/ib/abiword/plugins/gdict/Makefile.am	2011-11-18 10:04:37.000000000 +0100
@@ -1,5 +1,5 @@
 
-if TOOLKIT_GTK
+if TOOLKIT_GTK_ALL
 
 SUBDIRS = unix
 
diff -urb ./plugins/ots/xp/AbiOts.cpp /home/ib/abiword/plugins/ots/xp/AbiOts.cpp
--- ./plugins/ots/xp/AbiOts.cpp	2011-11-17 14:20:24.000000000 +0100
+++ /home/ib/abiword/plugins/ots/xp/AbiOts.cpp	2011-11-18 10:04:29.000000000 +0100
@@ -47,7 +47,7 @@
 
 #include <ots/libots.h>
 
-#ifdef TOOLKIT_GTK
+#ifdef TOOLKIT_GTK_ALL
 #include <gtk/gtk.h>
 #include "xap_UnixApp.h"
 #include "xap_UnixDialogHelper.h"
@@ -55,7 +55,7 @@
 
 static const char* Ots_MenuLabel = "&Summarize";
 static const char* Ots_MenuTooltip = "Summarize your document or selected text";
-#ifdef TOOLKIT_GTK
+#ifdef TOOLKIT_GTK_ALL
 
 static int getSummaryPercent(void)
 {
@@ -197,7 +197,7 @@
   
   EV_Menu_Action* myAction = new EV_Menu_Action(newID,                     // id that the layout said we could use
 						0,                      // no, we don't have a sub menu.
-#ifdef TOOLKIT_GTK
+#ifdef TOOLKIT_GTK_ALL
 						1,                      // yes, we raise a dialog.
 #else
 						0,                      // no dialog
diff -urb ./plugins/wmf/xp/ie_impGraphic_WMF.cpp /home/ib/abiword/plugins/wmf/xp/ie_impGraphic_WMF.cpp
--- ./plugins/wmf/xp/ie_impGraphic_WMF.cpp	2011-11-17 14:20:32.000000000 +0100
+++ /home/ib/abiword/plugins/wmf/xp/ie_impGraphic_WMF.cpp	2011-11-18 10:03:53.000000000 +0100
@@ -112,7 +112,7 @@
 
 	bool importAsPNG = true;
 
-#ifdef TOOLKIT_GTK
+#ifdef TOOLKIT_GTK_ALL
 	importAsPNG = false;
 #endif