Protect the includes.

This commit was SVN r8532.

orte/tools/orterun/orterun.c

@@ -29,8 +29,12 @@
 #include <errno.h>
 #include <signal.h>
 #include <ctype.h>
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif  /* HAVE_SYS_TYPES_H */
+#ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
+#endif  /* HAVE_SYS_WAIT_H */
 
 #include "opal/event/event.h"
 #include "opal/mca/base/base.h"

orte/tools/orterun/totalview.c

@@ -38,11 +38,15 @@
  */
 
 #include <stdio.h>
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif  /* HAVE_STDLIB_H */
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
+#endif  /* HAVE_STRINGS_H */
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
+#endif  /* HAVE_UNISTD_H */
 #include <ctype.h>
 
 /*