diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index 708af0a..3564a57 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -31,8 +31,6 @@
  *   PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* CVS: $Id$ */
-
 /*
 
 A number of SysV or ncurses functions don't have wrappers yet; if you
diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
index a785e79..8b876d1 100644
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -2,9 +2,15 @@
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
 #include <stddef.h> /* For offsetof */
 #include "_iomodule.h"
 
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index 5d053f0..13806c7 100644
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -7,12 +7,17 @@
 #include "intrcheck.h"
 
 #ifdef MS_WINDOWS
+#ifdef HAVE_PROCESS_H
 #include <process.h>
 #endif
+#endif
 
+#ifdef HAVE_SIGNAL_H
 #include <signal.h>
-
+#endif
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif