diff --git a/src/gtk/eggtrayicon.c b/src/gtk/eggtrayicon.c
index 6c4c3b1cf3..de2777a4fd 100644
--- a/src/gtk/eggtrayicon.c
+++ b/src/gtk/eggtrayicon.c
@@ -106,10 +106,12 @@ Anders
 
 #include "wx/platform.h"
 
-#ifdef __WXGTK20__
+#include <gdk/gdkx.h>
+#include <gtk/gtkversion.h>
+
+#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 1, 0)
 
 #include <string.h>
-#include <gdk/gdkx.h>
 #include "eggtrayicon.h"
 
 #define SYSTEM_TRAY_REQUEST_DOCK    0
diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp
index fe4c00d4af..859a89f7cd 100644
--- a/src/gtk/taskbar.cpp
+++ b/src/gtk/taskbar.cpp
@@ -19,7 +19,10 @@
 #include "wx/log.h"
 #include "wx/frame.h"
 
-#ifdef __WXGTK20__
+#include <gdk/gdkx.h>
+#include <gtk/gtkversion.h>
+
+#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 1, 0)
 
 #include "wx/gtk/taskbarpriv.h"
 #include "eggtrayicon.h"
diff --git a/src/gtk1/eggtrayicon.c b/src/gtk1/eggtrayicon.c
index 6c4c3b1cf3..de2777a4fd 100644
--- a/src/gtk1/eggtrayicon.c
+++ b/src/gtk1/eggtrayicon.c
@@ -106,10 +106,12 @@ Anders
 
 #include "wx/platform.h"
 
-#ifdef __WXGTK20__
+#include <gdk/gdkx.h>
+#include <gtk/gtkversion.h>
+
+#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 1, 0)
 
 #include <string.h>
-#include <gdk/gdkx.h>
 #include "eggtrayicon.h"
 
 #define SYSTEM_TRAY_REQUEST_DOCK    0
diff --git a/src/gtk1/taskbar.cpp b/src/gtk1/taskbar.cpp
index fe4c00d4af..859a89f7cd 100644
--- a/src/gtk1/taskbar.cpp
+++ b/src/gtk1/taskbar.cpp
@@ -19,7 +19,10 @@
 #include "wx/log.h"
 #include "wx/frame.h"
 
-#ifdef __WXGTK20__
+#include <gdk/gdkx.h>
+#include <gtk/gtkversion.h>
+
+#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 1, 0)
 
 #include "wx/gtk/taskbarpriv.h"
 #include "eggtrayicon.h"