diff --git a/opal/class/opal_hash_table.h b/opal/class/opal_hash_table.h
index 08c5695fb3..7d20bad0b3 100644
--- a/opal/class/opal_hash_table.h
+++ b/opal/class/opal_hash_table.h
@@ -29,6 +29,10 @@
 #define OPAL_HASH_TABLE_H
 
 #include "opal_config.h"
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
 #include "opal/class/opal_list.h"
 
 BEGIN_C_DECLS
diff --git a/opal/include/opal/types.h b/opal/include/opal/types.h
index e1080e8c34..c938260b86 100644
--- a/opal/include/opal/types.h
+++ b/opal/include/opal/types.h
@@ -21,6 +21,9 @@
 
 #include "opal_config.h"
 
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
diff --git a/orte/util/name_fns.h b/orte/util/name_fns.h
index a04722c0be..3db46e3980 100644
--- a/orte/util/name_fns.h
+++ b/orte/util/name_fns.h
@@ -28,6 +28,11 @@
 #define _ORTE_NAME_FNS_H_
 
 #include "orte_config.h"
+
+#ifdef HAVE_STDINT_h
+#include <stdint.h>
+#endif
+
 #include "orte/types.h"
 
 #include "opal/class/opal_list.h"
diff --git a/orte/util/proc_info.h b/orte/util/proc_info.h
index c8e61ef87b..6a996c9efa 100644
--- a/orte/util/proc_info.h
+++ b/orte/util/proc_info.h
@@ -27,12 +27,16 @@
 #define _ORTE_PROC_INFO_H_
 
 #include "orte_config.h"
-#include "orte/types.h"
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 
+#include "orte/types.h"
 #include "opal/dss/dss_types.h"
 
 BEGIN_C_DECLS