Renamed thread.h to pythread.h.
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index f619032..e068872 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -59,7 +59,7 @@
 #include <ctype.h>
 
 #ifdef WITH_THREAD
-#include "thread.h"
+#include "pythread.h"
 #endif
 
 #ifdef MS_WINDOWS
@@ -71,6 +71,10 @@
 #include "myselect.h"
 #endif
 
+#ifdef PYOS_OS2
+#include "myselect.h"
+#endif
+
 #include <tcl.h>
 #include <tk.h>
 
diff --git a/Modules/bsddbmodule.c b/Modules/bsddbmodule.c
index 2f0d05d..ca7fa5f 100644
--- a/Modules/bsddbmodule.c
+++ b/Modules/bsddbmodule.c
@@ -42,7 +42,7 @@
 
 #include "Python.h"
 #ifdef WITH_THREAD
-#include "thread.h"
+#include "pythread.h"
 #endif
 
 #include <sys/types.h>
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index b632efd..8795463 100644
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -93,7 +93,7 @@
 
 #ifdef WITH_THREAD
 #include <sys/types.h> /* For pid_t */
-#include "thread.h"
+#include "pythread.h"
 static long main_thread;
 static pid_t main_pid;
 #endif
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index f9b4fcd..e195389 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -87,7 +87,7 @@
 
 #include "Python.h"
 #if defined(WITH_THREAD) && !defined(HAVE_GETHOSTBYNAME_R) && !defined(MS_WINDOWS)
-#include "thread.h"
+#include "pythread.h"
 #endif
 
 #ifdef HAVE_UNISTD_H
diff --git a/Modules/stdwinmodule.c b/Modules/stdwinmodule.c
index 27ffdb2..c24b3ef 100644
--- a/Modules/stdwinmodule.c
+++ b/Modules/stdwinmodule.c
@@ -85,7 +85,7 @@
 
 #ifdef WITH_THREAD
 
-#include "thread.h"
+#include "pythread.h"
 
 static type_lock StdwinLock; /* Lock held when interpreter not locked */
 
diff --git a/Modules/threadmodule.c b/Modules/threadmodule.c
index 52d2eb2..3f32af2 100644
--- a/Modules/threadmodule.c
+++ b/Modules/threadmodule.c
@@ -40,7 +40,7 @@
 #error "Then run `make clean' followed by `make'."
 #endif
 
-#include "thread.h"
+#include "pythread.h"
 
 static PyObject *ThreadError;