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;
diff --git a/Python/ceval.c b/Python/ceval.c
index 0178f84..b004c79 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -109,7 +109,7 @@
#ifdef WITH_THREAD
#include <errno.h>
-#include "thread.h"
+#include "pythread.h"
extern int _PyThread_Started; /* Flag for Py_Exit */
diff --git a/Python/import.c b/Python/import.c
index c8bbc29..32dc319 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -119,7 +119,7 @@
#ifdef WITH_THREAD
-#include "thread.h"
+#include "pythread.h"
static type_lock import_lock = 0;
static long import_lock_thread = -1;
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 2be073b..7cff848 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1031,7 +1031,7 @@
/* Clean up and exit */
#ifdef WITH_THREAD
-#include "thread.h"
+#include "pythread.h"
int _PyThread_Started = 0; /* Set by threadmodule.c and maybe others */
#endif
diff --git a/Python/thread.c b/Python/thread.c
index 9da701d..ff5aefe 100644
--- a/Python/thread.c
+++ b/Python/thread.c
@@ -59,7 +59,7 @@
#endif
#endif
-#include "thread.h"
+#include "pythread.h"
#ifdef __ksr__
#define _POSIX_THREADS