diff --git a/install/gtk/configure b/install/gtk/configure
index a1cf20cca5..cbf6463a2a 100755
--- a/install/gtk/configure
+++ b/install/gtk/configure
@@ -2712,7 +2712,7 @@ else
 fi
 
 GTK_JOYSTICK=""
-if test "$ac_cv_header_linux_joystick_h" != ""; then
+if test "$ac_cv_header_linux_joystick_h" = "yes"; then
   GTK_JOYSTICK="gtk/joystick.cpp"
 fi
 
diff --git a/install/gtk/configure.in b/install/gtk/configure.in
index e1c60efb5f..4e2e279986 100644
--- a/install/gtk/configure.in
+++ b/install/gtk/configure.in
@@ -422,7 +422,7 @@ dnl   defines HAVE_UNISTD_H
 dnl As it needs Linux 2.1.x for the moment: check whether the file exists (GL).
 AC_CHECK_HEADER(linux/joystick.h)
 GTK_JOYSTICK=""
-if test "$ac_cv_header_linux_joystick_h" != ""; then
+if test "$ac_cv_header_linux_joystick_h" = "yes"; then
   GTK_JOYSTICK="gtk/joystick.cpp"
 fi
 AC_SUBST(GTK_JOYSTICK)
diff --git a/src/gtk/threadno.cpp b/src/gtk/threadno.cpp
index 126a211fca..deccf57775 100644
--- a/src/gtk/threadno.cpp
+++ b/src/gtk/threadno.cpp
@@ -13,6 +13,7 @@
 #endif
 
 #include "wx/wx.h"
+#include "wx/thread.h"
 
 wxMutex::wxMutex()
 {
diff --git a/src/gtk/threadpsx.cpp b/src/gtk/threadpsx.cpp
index 9f6620f0c1..f6ffab19b9 100644
--- a/src/gtk/threadpsx.cpp
+++ b/src/gtk/threadpsx.cpp
@@ -28,7 +28,7 @@ enum thread_state {
 // Static variables
 /////////////////////////////////////////////////////////////////////////////
 
-#include "thread.h"
+#include "wx/thread.h"
 
 static pthread_t p_mainid;
 wxMutex wxMainMutex; // controls access to all GUI functions
diff --git a/src/gtk/threadsgi.cpp b/src/gtk/threadsgi.cpp
index ea652677e1..10945b3900 100644
--- a/src/gtk/threadsgi.cpp
+++ b/src/gtk/threadsgi.cpp
@@ -30,6 +30,8 @@ enum thread_state {
 // Static variables
 /////////////////////////////////////////////////////////////////////////////
 
+#include "wx/thread.h"
+
 static int p_mainid;
 wxMutex wxMainMutex;
 
diff --git a/src/gtk1/threadno.cpp b/src/gtk1/threadno.cpp
index 126a211fca..deccf57775 100644
--- a/src/gtk1/threadno.cpp
+++ b/src/gtk1/threadno.cpp
@@ -13,6 +13,7 @@
 #endif
 
 #include "wx/wx.h"
+#include "wx/thread.h"
 
 wxMutex::wxMutex()
 {
diff --git a/src/gtk1/threadpsx.cpp b/src/gtk1/threadpsx.cpp
index 9f6620f0c1..f6ffab19b9 100644
--- a/src/gtk1/threadpsx.cpp
+++ b/src/gtk1/threadpsx.cpp
@@ -28,7 +28,7 @@ enum thread_state {
 // Static variables
 /////////////////////////////////////////////////////////////////////////////
 
-#include "thread.h"
+#include "wx/thread.h"
 
 static pthread_t p_mainid;
 wxMutex wxMainMutex; // controls access to all GUI functions
diff --git a/src/gtk1/threadsgi.cpp b/src/gtk1/threadsgi.cpp
index ea652677e1..10945b3900 100644
--- a/src/gtk1/threadsgi.cpp
+++ b/src/gtk1/threadsgi.cpp
@@ -30,6 +30,8 @@ enum thread_state {
 // Static variables
 /////////////////////////////////////////////////////////////////////////////
 
+#include "wx/thread.h"
+
 static int p_mainid;
 wxMutex wxMainMutex;