Include <unistd.h> in Python.h. Fixes #500924.
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index f5ce749..c997ecf 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -9,10 +9,6 @@
 
 #include <ctype.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #ifdef RISCOS
 #include "unixstuff.h"
 #endif
diff --git a/Python/dynload_beos.c b/Python/dynload_beos.c
index 5de96c9..eec8592 100644
--- a/Python/dynload_beos.c
+++ b/Python/dynload_beos.c
@@ -4,7 +4,6 @@
 #include <kernel/image.h>
 #include <kernel/OS.h>
 #include <stdlib.h>
-#include <unistd.h>
 
 #include "Python.h"
 #include "importdl.h"
diff --git a/Python/frozenmain.c b/Python/frozenmain.c
index efc87d7..21724ef 100644
--- a/Python/frozenmain.c
+++ b/Python/frozenmain.c
@@ -9,15 +9,6 @@
 extern int PyInitFrozenExtensions(void);
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h> /* For isatty() */
-#endif
-
-/* For isatty()'s proto. - [cjh] */
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 /* Main program */
 
 int
diff --git a/Python/import.c b/Python/import.c
index 0b4cd0f..ba7d5d5 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -15,10 +15,6 @@
 #include "macglue.h"
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 4294c97..6b70739 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -13,10 +13,6 @@
 #include "eval.h"
 #include "marshal.h"
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
 #endif
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index ff49adc..cdc728c 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -20,10 +20,6 @@
 
 #include "osdefs.h"
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #ifdef MS_COREDLL
 extern void *PyWin_DLLhModule;
 /* A string loaded from the DLL at startup: */
diff --git a/Python/thread.c b/Python/thread.c
index df42f31..f9a4de9 100644
--- a/Python/thread.c
+++ b/Python/thread.c
@@ -5,7 +5,7 @@
    which is included by this file dependent on config settings.
    Stuff shared by all thread_*.h files is collected here. */
 
-#include "pyconfig.h"
+#include "Python.h"
 
 /* pyconfig.h may or may not define DL_IMPORT */
 #ifndef DL_IMPORT	/* declarations for DLL import/export */
@@ -24,10 +24,6 @@
 #endif
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #ifdef __DGUX
 #define _USING_POSIX4A_DRAFT6
 #endif
diff --git a/Python/thread_solaris.h b/Python/thread_solaris.h
index 4c958b9..8e24126 100644
--- a/Python/thread_solaris.h
+++ b/Python/thread_solaris.h
@@ -1,7 +1,6 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <errno.h>
 #include </usr/include/thread.h>
 #undef _POSIX_THREADS