diff --git a/opal/mca/db/print/db_print.c b/opal/mca/db/print/db_print.c
index 86dc664541..8aeb54ecea 100644
--- a/opal/mca/db/print/db_print.c
+++ b/opal/mca/db/print/db_print.c
@@ -11,6 +11,7 @@
 #include "opal_config.h"
 #include "opal/constants.h"
 
+#include <time.h>
 #include <string.h>
 #include <sys/types.h>
 #ifdef HAVE_LIMITS_H
diff --git a/opal/runtime/opal_info_support.c b/opal/runtime/opal_info_support.c
index 6fc9a722a3..ed7c47eaf5 100644
--- a/opal/runtime/opal_info_support.c
+++ b/opal/runtime/opal_info_support.c
@@ -30,6 +30,8 @@
 #include <unistd.h>
 #endif
 
+#include <errno.h>
+
 #include "opal/class/opal_list.h"
 #include "opal/class/opal_pointer_array.h"
 
diff --git a/opal/threads/thread.c b/opal/threads/thread.c
index a21ac1a039..9f8818c0e8 100644
--- a/opal/threads/thread.c
+++ b/opal/threads/thread.c
@@ -37,14 +37,14 @@ OBJ_CLASS_INSTANCE(opal_thread_t,
 static void opal_thread_construct(opal_thread_t *t)
 {
     t->t_run = 0;
-#ifdef OPAL_HAVE_POSIX_THREADS
+#if OPAL_HAVE_POSIX_THREADS
     t->t_handle = (pthread_t) -1;
 #elif OPAL_HAVE_SOLARIS_THREADS
     t->t_handle = (thread_t) -1;
 #endif
 }
 
-#ifdef OPAL_HAVE_POSIX_THREADS
+#if OPAL_HAVE_POSIX_THREADS
 
 /************************************************************************
  * POSIX threads