diff --git a/ompi/class/ompi_rb_tree.h b/ompi/class/ompi_rb_tree.h
index 6bf6a99551..854955ccba 100644
--- a/ompi/class/ompi_rb_tree.h
+++ b/ompi/class/ompi_rb_tree.h
@@ -25,6 +25,7 @@
 #ifndef OMPI_RB_TREE_H
 #define OMPI_RB_TREE_H
 
+#include "ompi_config.h"
 #include <stdlib.h>
 #include "ompi/constants.h"
 #include "opal/class/opal_object.h"
diff --git a/ompi/communicator/communicator.h b/ompi/communicator/communicator.h
index 48d8de16d2..12b00a1f18 100644
--- a/ompi/communicator/communicator.h
+++ b/ompi/communicator/communicator.h
@@ -23,6 +23,7 @@
 #ifndef OMPI_COMMUNICATOR_H
 #define OMPI_COMMUNICATOR_H
 
+#include "ompi_config.h"
 #include "opal/class/opal_object.h"
 #include "ompi/errhandler/errhandler.h"
 #include "opal/threads/mutex.h"
diff --git a/ompi/datatype/datatype.h b/ompi/datatype/datatype.h
index 0bf94411b9..1f6dd62adb 100644
--- a/ompi/datatype/datatype.h
+++ b/ompi/datatype/datatype.h
@@ -31,6 +31,7 @@
 #ifndef DATATYPE_H_HAS_BEEN_INCLUDED
 #define DATATYPE_H_HAS_BEEN_INCLUDED
 
+#include "ompi_config.h"
 #include "opal/class/opal_object.h"
 #include "opal/class/opal_pointer_array.h"
 #include "mpi.h"
diff --git a/ompi/datatype/datatype_internal.h b/ompi/datatype/datatype_internal.h
index 59aef2ae74..9b5a10fd3c 100644
--- a/ompi/datatype/datatype_internal.h
+++ b/ompi/datatype/datatype_internal.h
@@ -20,6 +20,8 @@
 #ifndef DATATYPE_INTERNAL_H_HAS_BEEN_INCLUDED
 #define DATATYPE_INTERNAL_H_HAS_BEEN_INCLUDED
 
+#include "ompi_config.h"
+
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif  /* HAVE_STRING_H */
diff --git a/ompi/debuggers/msgq_interface.h b/ompi/debuggers/msgq_interface.h
index 0149d74c56..be7e91aef3 100644
--- a/ompi/debuggers/msgq_interface.h
+++ b/ompi/debuggers/msgq_interface.h
@@ -118,6 +118,7 @@
 #ifndef _MPI_INTERFACE_INCLUDED
 #define _MPI_INTERFACE_INCLUDED
 
+#include "ompi_config.h"
 #include <stdio.h>				/* For FILENAME_MAX */
 
 /* No MPI2 support yet */
diff --git a/ompi/file/file.h b/ompi/file/file.h
index 815cb907a5..cfe9cd1c2c 100644
--- a/ompi/file/file.h
+++ b/ompi/file/file.h
@@ -21,6 +21,7 @@
 #ifndef OMPI_FILE_H
 #define OMPI_FILE_H
 
+#include "ompi_config.h"
 #include "mpi.h"
 #include "opal/class/opal_list.h"
 #include "ompi/errhandler/errhandler.h"
diff --git a/ompi/group/group.h b/ompi/group/group.h
index 86ca625c18..75c7d1274f 100644
--- a/ompi/group/group.h
+++ b/ompi/group/group.h
@@ -25,13 +25,15 @@
  *
  * Infrastructure for MPI group support.
  */
-#include "ompi/proc/proc.h"
 #ifndef OMPI_GROUP_H
 #define OMPI_GROUP_H
 
+#include "ompi_config.h"
+#include "ompi/proc/proc.h"
 #include "mpi.h"
 #include "opal/class/opal_pointer_array.h"
 #include "opal/util/output.h"
+
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
diff --git a/ompi/info/info.h b/ompi/info/info.h
index 24135c913c..83aeef7418 100644
--- a/ompi/info/info.h
+++ b/ompi/info/info.h
@@ -22,6 +22,7 @@
 #ifndef OMPI_INFO_H
 #define OMPI_INFO_H
 
+#include "ompi_config.h"
 #include <string.h>
 
 #include "mpi.h"
diff --git a/ompi/mca/allocator/allocator.h b/ompi/mca/allocator/allocator.h
index be0bcfc0d4..483f5c3839 100644
--- a/ompi/mca/allocator/allocator.h
+++ b/ompi/mca/allocator/allocator.h
@@ -21,6 +21,7 @@
   */
 #ifndef MCA_ALLOCATOR_H
 #define MCA_ALLOCATOR_H
+#include "ompi_config.h"
 #include "opal/mca/mca.h"
 #include "ompi/mca/mpool/mpool.h" 
 
diff --git a/ompi/mca/allocator/basic/allocator_basic.h b/ompi/mca/allocator/basic/allocator_basic.h
index 4aa967e5a0..12513d6a07 100644
--- a/ompi/mca/allocator/basic/allocator_basic.h
+++ b/ompi/mca/allocator/basic/allocator_basic.h
@@ -23,6 +23,7 @@
 #ifndef ALLOCATOR_BASIC_H 
 #define ALLOCATOR_BASIC_H 
 
+#include "ompi_config.h"
 #include <stdlib.h>
 #include <string.h>
 #include "opal/threads/mutex.h"
diff --git a/ompi/mca/allocator/bucket/allocator_bucket_alloc.h b/ompi/mca/allocator/bucket/allocator_bucket_alloc.h
index 64db2ee917..d93419ea06 100644
--- a/ompi/mca/allocator/bucket/allocator_bucket_alloc.h
+++ b/ompi/mca/allocator/bucket/allocator_bucket_alloc.h
@@ -23,6 +23,7 @@
 #ifndef ALLOCATOR_BUCKET_ALLOC_H 
 #define ALLOCATOR_BUCKET_ALLOC_H 
 
+#include "ompi_config.h"
 #include <stdlib.h>
 #include <string.h>
 #include "opal/threads/mutex.h"
diff --git a/ompi/mca/bml/bml.h b/ompi/mca/bml/bml.h
index 41abeb919a..088df2b959 100644
--- a/ompi/mca/bml/bml.h
+++ b/ompi/mca/bml/bml.h
@@ -26,18 +26,19 @@
 #ifndef MCA_BML_H
 #define MCA_BML_H
 
+#include "ompi_config.h"
 #include "opal/mca/mca.h"
 #include "opal/class/opal_bitmap.h"
 
 #include "ompi/mca/btl/btl.h"
+#include "ompi/class/ompi_free_list.h"
 
 #include "ompi/mca/bml/base/bml_base_btl.h"
-
 #include "ompi/types.h"
-#include "ompi/class/ompi_free_list.h"
 
 #include "opal/mca/crs/crs.h"
 #include "opal/mca/crs/base/base.h"
+#include "ompi/constants.h"
 
 #define OMPI_ENABLE_DEBUG_RELIABILITY 0
 
diff --git a/ompi/mca/bml/r2/bml_r2.h b/ompi/mca/bml/r2/bml_r2.h
index cf11058924..30025985f5 100644
--- a/ompi/mca/bml/r2/bml_r2.h
+++ b/ompi/mca/bml/r2/bml_r2.h
@@ -22,6 +22,7 @@
  *
  */
 
+#include "ompi_config.h"
 #include "opal/mca/mca.h"
 #include "ompi/mca/btl/btl.h"
 
diff --git a/ompi/mca/btl/btl.h b/ompi/mca/btl/btl.h
index b12bac789a..62068c41c1 100644
--- a/ompi/mca/btl/btl.h
+++ b/ompi/mca/btl/btl.h
@@ -106,15 +106,15 @@
  *
  */
 
-#include "opal/mca/mca.h"
-
 #ifndef MCA_BTL_H
 #define MCA_BTL_H
 
-#include "ompi/types.h"
+#include "ompi_config.h"
+#include "opal/mca/mca.h"
 #include "opal/class/opal_bitmap.h"
 #include "opal/prefetch.h" /* For OPAL_LIKELY */
 #include "ompi/mca/mpool/mpool.h"
+#include "ompi/types.h"
 
 #include "opal/mca/crs/crs.h"
 #include "opal/mca/crs/base/base.h"
diff --git a/ompi/mca/btl/elan/btl_elan.h b/ompi/mca/btl/elan/btl_elan.h
index 6eb0539660..ad38032201 100644
--- a/ompi/mca/btl/elan/btl_elan.h
+++ b/ompi/mca/btl/elan/btl_elan.h
@@ -17,7 +17,6 @@
 
 #include "ompi_config.h"
 
-/* Open MPI includes */
 #include "opal/event/event.h"
 #include "ompi/class/ompi_free_list.h"
 #include "ompi/mca/pml/pml.h"
diff --git a/ompi/mca/btl/gm/btl_gm.h b/ompi/mca/btl/gm/btl_gm.h
index b2d26262e4..3f6e9ac54f 100644
--- a/ompi/mca/btl/gm/btl_gm.h
+++ b/ompi/mca/btl/gm/btl_gm.h
@@ -22,7 +22,7 @@
 #ifndef MCA_BTL_GM_H
 #define MCA_BTL_GM_H
 
-/* Standard system includes */
+#include "ompi_config.h"
 #include <sys/types.h>
 #include <string.h>
 #include <gm.h>
diff --git a/ompi/mca/btl/mx/btl_mx.h b/ompi/mca/btl/mx/btl_mx.h
index 45f2119be3..48cf124146 100644
--- a/ompi/mca/btl/mx/btl_mx.h
+++ b/ompi/mca/btl/mx/btl_mx.h
@@ -21,7 +21,7 @@
 #ifndef MCA_PTL_MX_H
 #define MCA_PTL_MX_H
 
-/* Standard system includes */
+#include "ompi_config.h"
 #include <sys/types.h>
 #include <string.h>
 
diff --git a/ompi/mca/btl/ofud/btl_ofud.h b/ompi/mca/btl/ofud/btl_ofud.h
index e7a12a80db..bacd7dc45c 100644
--- a/ompi/mca/btl/ofud/btl_ofud.h
+++ b/ompi/mca/btl/ofud/btl_ofud.h
@@ -28,7 +28,7 @@
    modular arithmetic with it. */
 #define MCA_BTL_UD_NUM_QP 4
 
-/* Standard system includes */
+#include "ompi_config.h"
 #include <sys/types.h>
 #include <infiniband/verbs.h>
 
diff --git a/ompi/mca/btl/openib/btl_openib.h b/ompi/mca/btl/openib/btl_openib.h
index c15b8b07ba..d8dc9d3cc6 100644
--- a/ompi/mca/btl/openib/btl_openib.h
+++ b/ompi/mca/btl/openib/btl_openib.h
@@ -27,7 +27,7 @@
 #ifndef MCA_BTL_IB_H
 #define MCA_BTL_IB_H
 
-/* Standard system includes */
+#include "ompi_config.h"
 #include <sys/types.h>
 #include <string.h>
 #include <infiniband/verbs.h>
diff --git a/ompi/mca/btl/portals/btl_portals.h b/ompi/mca/btl/portals/btl_portals.h
index 9ed47e2257..e8f7049b30 100644
--- a/ompi/mca/btl/portals/btl_portals.h
+++ b/ompi/mca/btl/portals/btl_portals.h
@@ -22,6 +22,7 @@
 #ifndef OMPI_BTL_PORTALS_H
 #define OMPI_BTL_PORTALS_H
 
+#include "ompi_config.h"
 #include "ompi/mca/common/portals/common_portals.h"
 
 #include "opal/class/opal_bitmap.h"
diff --git a/ompi/mca/btl/sctp/btl_sctp.h b/ompi/mca/btl/sctp/btl_sctp.h
index 06cc0a1655..0e81cf5d26 100644
--- a/ompi/mca/btl/sctp/btl_sctp.h
+++ b/ompi/mca/btl/sctp/btl_sctp.h
@@ -21,7 +21,6 @@
 #ifndef MCA_BTL_SCTP_H
 #define MCA_BTL_SCTP_H
 
-/* Standard system includes */
 #include "ompi_config.h"
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/ompi/mca/btl/self/btl_self.h b/ompi/mca/btl/self/btl_self.h
index ca7eb5db5a..93ababd531 100644
--- a/ompi/mca/btl/self/btl_self.h
+++ b/ompi/mca/btl/self/btl_self.h
@@ -21,6 +21,8 @@
 #ifndef MCA_BTL_SELF_H
 #define MCA_BTL_SELF_H
 
+#include "ompi_config.h"
+
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif  /* HAVE_STDLIB_H */
diff --git a/ompi/mca/btl/sm/btl_sm.h b/ompi/mca/btl/sm/btl_sm.h
index 43dbb343aa..107639aced 100644
--- a/ompi/mca/btl/sm/btl_sm.h
+++ b/ompi/mca/btl/sm/btl_sm.h
@@ -23,6 +23,7 @@
 #ifndef MCA_BTL_SM_H
 #define MCA_BTL_SM_H
 
+#include "ompi_config.h"
 #include <stdlib.h>
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/ompi/mca/btl/tcp/btl_tcp.h b/ompi/mca/btl/tcp/btl_tcp.h
index 70e684983a..b273dd1c31 100644
--- a/ompi/mca/btl/tcp/btl_tcp.h
+++ b/ompi/mca/btl/tcp/btl_tcp.h
@@ -22,7 +22,6 @@
 #ifndef MCA_BTL_TCP_H
 #define MCA_BTL_TCP_H
 
-/* Standard system includes */
 #include "ompi_config.h"
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/ompi/mca/btl/template/btl_template.h b/ompi/mca/btl/template/btl_template.h
index 1dff47af0c..ea1f13cb7d 100644
--- a/ompi/mca/btl/template/btl_template.h
+++ b/ompi/mca/btl/template/btl_template.h
@@ -21,7 +21,7 @@
 #ifndef MCA_PTL_TEMPLATE_H
 #define MCA_PTL_TEMPLATE_H
 
-/* Standard system includes */
+#include "ompi_config.h"
 #include <sys/types.h>
 #include <string.h>
 
diff --git a/ompi/mca/btl/udapl/btl_udapl.h b/ompi/mca/btl/udapl/btl_udapl.h
index aa807a300b..60f2f48f7a 100644
--- a/ompi/mca/btl/udapl/btl_udapl.h
+++ b/ompi/mca/btl/udapl/btl_udapl.h
@@ -25,7 +25,7 @@
 #ifndef MCA_BTL_UDAPL_H
 #define MCA_BTL_UDAPL_H
 
-/* Standard system includes */
+#include "ompi_config.h"
 #include <sys/types.h>
 #include <string.h>
 #include <dat/udat.h>
diff --git a/ompi/mca/common/mx/common_mx.h b/ompi/mca/common/mx/common_mx.h
index fb1d7456f1..722f187a13 100644
--- a/ompi/mca/common/mx/common_mx.h
+++ b/ompi/mca/common/mx/common_mx.h
@@ -19,6 +19,7 @@
 #ifndef OMPI_MCA_COMMON_MX_H
 #define OMPI_MCA_COMMON_MX_H
 
+#include "ompi_config.h"
 #include "myriexpress.h"
 
 
diff --git a/ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.c b/ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.c
index 0bd5686b0a..c394e668b7 100644
--- a/ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.c
+++ b/ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.c
@@ -30,8 +30,6 @@
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 
-#include "orte/util/output.h"
-
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"
 #include "ompi/mca/crcp/crcp.h"
diff --git a/ompi/mca/io/base/io_base_request.h b/ompi/mca/io/base/io_base_request.h
index 2fa6ab9e66..01fb871843 100644
--- a/ompi/mca/io/base/io_base_request.h
+++ b/ompi/mca/io/base/io_base_request.h
@@ -24,6 +24,7 @@
 #ifndef IO_BASE_REQUEST_H
 #define IO_BASE_REQUEST_H
 
+#include "ompi_config.h"
 #include "opal/class/opal_object.h"
 #include "ompi/request/request.h"
 #include "ompi/file/file.h"
diff --git a/ompi/mca/io/romio/src/io_romio.h b/ompi/mca/io/romio/src/io_romio.h
index 22ae8693fd..9fff2d0592 100644
--- a/ompi/mca/io/romio/src/io_romio.h
+++ b/ompi/mca/io/romio/src/io_romio.h
@@ -20,6 +20,7 @@
 #ifndef MCA_IO_ROMIO_H
 #define MCA_IO_ROMIO_H
 
+#include "ompi_config.h"
 #include "opal/threads/mutex.h"
 #include "ompi/request/request.h"
 #include "ompi/file/file.h"
diff --git a/ompi/mca/mpool/fake/mpool_fake.h b/ompi/mca/mpool/fake/mpool_fake.h
index 9848bed86f..c53cad6774 100644
--- a/ompi/mca/mpool/fake/mpool_fake.h
+++ b/ompi/mca/mpool/fake/mpool_fake.h
@@ -24,6 +24,7 @@
 #ifndef MCA_MPOOL_FAKE_H
 #define MCA_MPOOL_FAKE_H
 
+#include "ompi_config.h"
 #include "ompi/mca/mpool/mpool.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/ompi/mca/mpool/mpool.h b/ompi/mca/mpool/mpool.h
index 71a4e643b5..736b38676c 100644
--- a/ompi/mca/mpool/mpool.h
+++ b/ompi/mca/mpool/mpool.h
@@ -22,6 +22,7 @@
   */
 #ifndef MCA_MPOOL_H
 #define MCA_MPOOL_H
+#include "ompi_config.h"
 #include "opal/mca/mca.h"
 #include "ompi/info/info.h"
 #include "ompi/class/ompi_free_list.h" 
diff --git a/ompi/mca/mpool/rdma/mpool_rdma.h b/ompi/mca/mpool/rdma/mpool_rdma.h
index 80ab4697da..28f1bf6d85 100644
--- a/ompi/mca/mpool/rdma/mpool_rdma.h
+++ b/ompi/mca/mpool/rdma/mpool_rdma.h
@@ -23,6 +23,7 @@
 #ifndef MCA_MPOOL_OPENIB_H
 #define MCA_MPOOL_OPENIB_H
 
+#include "ompi_config.h"
 #include "opal/class/opal_list.h"
 #include "ompi/class/ompi_free_list.h"
 #include "opal/event/event.h"
diff --git a/ompi/mca/mpool/sm/mpool_sm.h b/ompi/mca/mpool/sm/mpool_sm.h
index 3bb5979b4c..ebd60e81d1 100644
--- a/ompi/mca/mpool/sm/mpool_sm.h
+++ b/ompi/mca/mpool/sm/mpool_sm.h
@@ -22,6 +22,7 @@
 #ifndef MCA_MPOOL_SM_H
 #define MCA_MPOOL_SM_H
 
+#include "ompi_config.h"
 #include "opal/class/opal_list.h"
 #include "ompi/class/ompi_free_list.h"
 #include "opal/event/event.h"
diff --git a/ompi/mca/mtl/mx/mtl_mx_types.h b/ompi/mca/mtl/mx/mtl_mx_types.h
index 675aa13d40..056afc73c4 100644
--- a/ompi/mca/mtl/mx/mtl_mx_types.h
+++ b/ompi/mca/mtl/mx/mtl_mx_types.h
@@ -19,6 +19,7 @@
 #ifndef MTL_MX_TYPES_H_HAS_BEEN_INCLUDED
 #define MTL_MX_TYPES_H_HAS_BEEN_INCLUDED
 
+#include "ompi_config.h"
 #include "mtl_mx.h"
 
 #include "ompi/request/request.h"
diff --git a/ompi/mca/mtl/portals/mtl_portals.h b/ompi/mca/mtl/portals/mtl_portals.h
index 6870f2799b..5d3b99d069 100644
--- a/ompi/mca/mtl/portals/mtl_portals.h
+++ b/ompi/mca/mtl/portals/mtl_portals.h
@@ -19,6 +19,7 @@
 #ifndef MTL_PORTALS_H_HAS_BEEN_INCLUDED
 #define MTL_PORTALS_H_HAS_BEEN_INCLUDED
 
+#include "ompi_config.h"
 #include "opal/threads/threads.h"
 #include "opal/threads/condition.h"
 #include "opal/class/opal_list.h"
diff --git a/ompi/mca/mtl/psm/mtl_psm_types.h b/ompi/mca/mtl/psm/mtl_psm_types.h
index 9024e56711..20c95fd8d9 100644
--- a/ompi/mca/mtl/psm/mtl_psm_types.h
+++ b/ompi/mca/mtl/psm/mtl_psm_types.h
@@ -20,6 +20,7 @@
 #ifndef MTL_PSM_TYPES_H_HAS_BEEN_INCLUDED
 #define MTL_PSM_TYPS_H_HAS_BEEN_INCLUDED
 
+#include "ompi_config.h"
 #include "mtl_psm.h"
 
 #include "opal/threads/threads.h"
diff --git a/ompi/mca/op/base/functions.h b/ompi/mca/op/base/functions.h
index c152a8668b..72019b393d 100644
--- a/ompi/mca/op/base/functions.h
+++ b/ompi/mca/op/base/functions.h
@@ -20,6 +20,7 @@
 #ifndef OMPI_OP_BASE_FUNCTIONS_H
 #define OMPI_OP_BASE_FUNCTIONS_H
 
+#include "ompi_config.h"
 #include "ompi/mca/op/op.h"
 
 /*
diff --git a/ompi/mca/op/op.h b/ompi/mca/op/op.h
index 3abdd249af..1eca35e84c 100644
--- a/ompi/mca/op/op.h
+++ b/ompi/mca/op/op.h
@@ -75,6 +75,7 @@
  * close all available op components.
  */
 
+#include "ompi_config.h"
 #include "opal/mca/mca.h"
 
 #ifndef MCA_OP_H
diff --git a/ompi/mca/osc/base/base.h b/ompi/mca/osc/base/base.h
index d26deca93e..d88d211c31 100644
--- a/ompi/mca/osc/base/base.h
+++ b/ompi/mca/osc/base/base.h
@@ -19,6 +19,7 @@
 #ifndef OMPI_MCA_OSC_BASE_H
 #define OMPI_MCA_OSC_BASE_H
 
+#include "ompi_config.h"
 #include "ompi/datatype/datatype.h"
 #include "ompi/info/info.h"
 #include "ompi/communicator/communicator.h"
diff --git a/ompi/mca/osc/base/osc_base_obj_convert.h b/ompi/mca/osc/base/osc_base_obj_convert.h
index 93d3889449..2b618db5c2 100644
--- a/ompi/mca/osc/base/osc_base_obj_convert.h
+++ b/ompi/mca/osc/base/osc_base_obj_convert.h
@@ -23,6 +23,7 @@
  * objects, usually based on indexes sent from remote peers.
  */
 
+#include "ompi_config.h"
 #include "ompi/datatype/datatype.h"
 #include "ompi/proc/proc.h"
 #include "ompi/op/op.h"
diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt.h b/ompi/mca/osc/pt2pt/osc_pt2pt.h
index 26c3945d0e..44e9662e7b 100644
--- a/ompi/mca/osc/pt2pt/osc_pt2pt.h
+++ b/ompi/mca/osc/pt2pt/osc_pt2pt.h
@@ -19,6 +19,7 @@
 #ifndef OMPI_OSC_PT2PT_H
 #define OMPI_OSC_PT2PT_H
 
+#include "ompi_config.h"
 #include "opal/class/opal_list.h"
 #include "opal/class/opal_free_list.h"
 #include "opal/class/opal_hash_table.h"
diff --git a/ompi/mca/osc/rdma/osc_rdma.h b/ompi/mca/osc/rdma/osc_rdma.h
index 11116e6e51..293b3e91a9 100644
--- a/ompi/mca/osc/rdma/osc_rdma.h
+++ b/ompi/mca/osc/rdma/osc_rdma.h
@@ -19,6 +19,7 @@
 #ifndef OMPI_OSC_RDMA_H
 #define OMPI_OSC_RDMA_H
 
+#include "ompi_config.h"
 #include "opal/class/opal_list.h"
 #include "opal/class/opal_free_list.h"
 #include "opal/class/opal_hash_table.h"
diff --git a/ompi/mca/pml/base/pml_base_bsend.h b/ompi/mca/pml/base/pml_base_bsend.h
index 80588b98e9..2ceabbb6ed 100644
--- a/ompi/mca/pml/base/pml_base_bsend.h
+++ b/ompi/mca/pml/base/pml_base_bsend.h
@@ -19,6 +19,7 @@
 #ifndef _MCA_PML_BASE_BSEND_H_
 #define _MCA_PML_BASE_BSEND_H_
 
+#include "ompi_config.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
 
diff --git a/ompi/mca/pml/base/pml_base_recvreq.h b/ompi/mca/pml/base/pml_base_recvreq.h
index 60e5c8e031..a33c4efa0b 100644
--- a/ompi/mca/pml/base/pml_base_recvreq.h
+++ b/ompi/mca/pml/base/pml_base_recvreq.h
@@ -22,6 +22,7 @@
 #ifndef MCA_PML_BASE_RECV_REQUEST_H
 #define MCA_PML_BASE_RECV_REQUEST_H
 
+#include "ompi_config.h"
 #include "ompi/mca/pml/base/pml_base_request.h"
 #include "ompi/datatype/convertor.h"
 #include "ompi/peruse/peruse-internal.h"
diff --git a/ompi/mca/pml/base/pml_base_request.h b/ompi/mca/pml/base/pml_base_request.h
index 328dbffe50..33450b80d6 100644
--- a/ompi/mca/pml/base/pml_base_request.h
+++ b/ompi/mca/pml/base/pml_base_request.h
@@ -22,6 +22,7 @@
 #ifndef MCA_PML_BASE_REQUEST_H
 #define MCA_PML_BASE_REQUEST_H
 
+#include "ompi_config.h"
 #include "ompi/class/ompi_free_list.h"
 #include "ompi/request/request.h"
 #include "ompi/datatype/convertor.h"
diff --git a/ompi/mca/pml/cm/pml_cm.h b/ompi/mca/pml/cm/pml_cm.h
index 7dd947487a..62e5be9964 100644
--- a/ompi/mca/pml/cm/pml_cm.h
+++ b/ompi/mca/pml/cm/pml_cm.h
@@ -14,6 +14,7 @@
 #ifndef PML_CM_H
 #define PML_CM_H
 
+#include "ompi_config.h"
 #include "opal/util/cmd_line.h"
 #include "ompi/request/request.h"
 #include "ompi/mca/pml/pml.h"
diff --git a/ompi/mca/pml/dr/pml_dr_recvreq.c b/ompi/mca/pml/dr/pml_dr_recvreq.c
index ee8571ea86..e0024639b7 100644
--- a/ompi/mca/pml/dr/pml_dr_recvreq.c
+++ b/ompi/mca/pml/dr/pml_dr_recvreq.c
@@ -22,7 +22,6 @@
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/bml/bml.h" 
 #include "ompi/mca/btl/btl.h"
-#include "ompi/mca/mpool/mpool.h" 
 #include "pml_dr_comm.h"
 #include "pml_dr_recvreq.h"
 #include "pml_dr_recvfrag.h"
diff --git a/ompi/mca/pml/v/mca/vprotocol/base/base.h b/ompi/mca/pml/v/mca/vprotocol/base/base.h
index 3a5c2dbdaf..c432d92cfd 100644
--- a/ompi/mca/pml/v/mca/vprotocol/base/base.h
+++ b/ompi/mca/pml/v/mca/vprotocol/base/base.h
@@ -11,6 +11,7 @@
 #ifndef __INCLUDE_VPROTOCOL_BASE_H_
 #define __INCLUDE_VPROTOCOL_BASE_H_
 
+#include "ompi_config.h"
 #include "ompi/constants.h"
 #include "opal/mca/mca.h"
 #include "../vprotocol.h"
diff --git a/ompi/mca/rcache/rb/rcache_rb.h b/ompi/mca/rcache/rb/rcache_rb.h
index dca4368143..7a1d7883ac 100644
--- a/ompi/mca/rcache/rb/rcache_rb.h
+++ b/ompi/mca/rcache/rb/rcache_rb.h
@@ -23,6 +23,7 @@
 #ifndef MCA_RCACHE_RB_H
 #define MCA_RCACHE_RB_H
 
+#include "ompi_config.h"
 #include "opal/mca/mca.h"
 #include "opal/class/opal_list.h" 
 #include "ompi/class/ompi_rb_tree.h"
diff --git a/ompi/mca/rcache/rb/rcache_rb_tree.h b/ompi/mca/rcache/rb/rcache_rb_tree.h
index 658425ef42..039346911b 100644
--- a/ompi/mca/rcache/rb/rcache_rb_tree.h
+++ b/ompi/mca/rcache/rb/rcache_rb_tree.h
@@ -22,6 +22,7 @@
   */
 #ifndef MCA_RCACHE_RB_TREE_H
 #define MCA_RCACHE_RB_TREE_H
+#include "ompi_config.h"
 #include "opal/mca/mca.h"
 #include "ompi/class/ompi_free_list.h"
 #include "ompi/mca/mpool/mpool.h"
diff --git a/ompi/mca/rcache/vma/rcache_vma.h b/ompi/mca/rcache/vma/rcache_vma.h
index 440d35a86b..adcefb5ed3 100644
--- a/ompi/mca/rcache/vma/rcache_vma.h
+++ b/ompi/mca/rcache/vma/rcache_vma.h
@@ -25,6 +25,7 @@
   */
 #ifndef MCA_RCACHE_VMA_H
 #define MCA_RCACHE_VMA_H
+#include "ompi_config.h"
 #include "opal/mca/mca.h"
 #include "opal/class/opal_list.h" 
 #include "ompi/class/ompi_rb_tree.h"
diff --git a/ompi/mpi/f77/prototypes_mpi.h b/ompi/mpi/f77/prototypes_mpi.h
index 157b0b11d8..db8bdfe3e2 100644
--- a/ompi/mpi/f77/prototypes_mpi.h
+++ b/ompi/mpi/f77/prototypes_mpi.h
@@ -42,6 +42,7 @@
 #ifndef OMPI_F77_PROTOTYPES_MPI_H
 #define OMPI_F77_PROTOTYPES_MPI_H
 
+#include "ompi_config.h"
 #include "ompi/mpi/f77/datarep.h"
 
 /* These are the prototypes for the "real" back-end fortran functions. */
diff --git a/ompi/peruse/peruse-internal.h b/ompi/peruse/peruse-internal.h
index 0aea9a2c0a..31d83b650a 100644
--- a/ompi/peruse/peruse-internal.h
+++ b/ompi/peruse/peruse-internal.h
@@ -13,6 +13,7 @@
 #ifndef _PERUSE_INTERNAL_H_
 #define _PERUSE_INTERNAL_H_
 
+#include "ompi_config.h"
 #include "ompi/peruse/peruse.h"
 #include "opal/class/opal_list.h"
 #include "ompi/communicator/communicator.h"
diff --git a/ompi/peruse/peruse.h b/ompi/peruse/peruse.h
index 048532b4e4..8c6c05b186 100644
--- a/ompi/peruse/peruse.h
+++ b/ompi/peruse/peruse.h
@@ -16,6 +16,7 @@
 #ifndef _PERUSE_H_
 #define _PERUSE_H_
 
+#include "ompi_config.h"
 #include "mpi.h"
 
 /* PERUSE type declarations */
diff --git a/ompi/proc/proc.h b/ompi/proc/proc.h
index 38820a728e..52cbe04e09 100644
--- a/ompi/proc/proc.h
+++ b/ompi/proc/proc.h
@@ -31,6 +31,7 @@
 #ifndef OMPI_PROC_PROC_H
 #define OMPI_PROC_PROC_H
 
+#include "ompi_config.h"
 #include "ompi/types.h"
 #include "opal/class/opal_list.h"
 #include "opal/threads/mutex.h"
diff --git a/ompi/request/request.h b/ompi/request/request.h
index 843c3a0c7d..b399effe02 100644
--- a/ompi/request/request.h
+++ b/ompi/request/request.h
@@ -27,10 +27,12 @@
 #ifndef OMPI_REQUEST_H
 #define OMPI_REQUEST_H
 
+#include "ompi_config.h"
 #include "mpi.h"
 #include "ompi/class/ompi_free_list.h"
 #include "opal/class/opal_pointer_array.h"
 #include "opal/threads/condition.h"
+#include "ompi/constants.h"
 
 BEGIN_C_DECLS
 
diff --git a/ompi/runtime/ompi_mpi_finalize.c b/ompi/runtime/ompi_mpi_finalize.c
index f13236259a..788970b561 100644
--- a/ompi/runtime/ompi_mpi_finalize.c
+++ b/ompi/runtime/ompi_mpi_finalize.c
@@ -73,10 +73,10 @@
 #include "ompi/mca/io/io.h"
 #include "ompi/mca/io/base/base.h"
 #include "ompi/mca/mpool/base/base.h"
+#include "ompi/mca/mpool/base/mpool_base_tree.h"
 #include "ompi/mca/rcache/base/base.h"
 #include "ompi/mca/pml/base/pml_base_bsend.h"
 #include "ompi/runtime/params.h"
-#include "ompi/mca/mpool/base/mpool_base_tree.h"
 #include "ompi/mca/dpm/base/base.h"
 #include "ompi/mca/pubsub/base/base.h"
 
diff --git a/ompi/runtime/params.h b/ompi/runtime/params.h
index 60aee9d85c..434df5862a 100644
--- a/ompi/runtime/params.h
+++ b/ompi/runtime/params.h
@@ -22,6 +22,8 @@
 #ifndef OMPI_RUNTIME_PARAMS_H
 #define OMPI_RUNTIME_PARAMS_H
 
+#include "ompi_config.h"
+
 BEGIN_C_DECLS
 
 /*
diff --git a/opal/class/opal_graph.h b/opal/class/opal_graph.h
index 40fc0e8def..409786d73d 100644
--- a/opal/class/opal_graph.h
+++ b/opal/class/opal_graph.h
@@ -27,6 +27,7 @@
 #ifndef OPAL_GRAPH_H
 #define OPAL_GRAPH_H
 
+#include "opal_config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include "opal/class/opal_object.h"
diff --git a/opal/class/opal_list.h b/opal/class/opal_list.h
index b4ca2a26a3..36a493a5db 100644
--- a/opal/class/opal_list.h
+++ b/opal/class/opal_list.h
@@ -63,6 +63,7 @@
 #ifndef OPAL_LIST_H
 #define OPAL_LIST_H
 
+#include "opal_config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include "opal/class/opal_object.h"
diff --git a/opal/class/opal_object.h b/opal/class/opal_object.h
index 1385b8dc27..27d8467fc4 100644
--- a/opal/class/opal_object.h
+++ b/opal/class/opal_object.h
@@ -116,6 +116,7 @@
 #ifndef OPAL_OBJECT_H
 #define OPAL_OBJECT_H
 
+#include "opal_config.h"
 #include <assert.h>
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
diff --git a/opal/include/opal_config_bottom.h b/opal/include/opal_config_bottom.h
index 9c0d47d1e1..ac20831e53 100644
--- a/opal/include/opal_config_bottom.h
+++ b/opal/include/opal_config_bottom.h
@@ -261,6 +261,7 @@
    including stdint.h */
 #define __STDC_LIMIT_MACROS
 #endif
+#include "opal_config.h"
 #include <stdint.h>
 #else
 #include "opal_stdint.h"
diff --git a/opal/mca/timer/darwin/timer_darwin.h b/opal/mca/timer/darwin/timer_darwin.h
index 2c0ebf967b..7d4e342c6c 100644
--- a/opal/mca/timer/darwin/timer_darwin.h
+++ b/opal/mca/timer/darwin/timer_darwin.h
@@ -19,6 +19,7 @@
 #ifndef OPAL_MCA_TIMER_DARWIN_TIMER_DARWIN_H
 #define OPAL_MCA_TIMER_DARWIN_TIMER_DARWIN_H
 
+#include "opal_config.h"
 #include <mach/mach_time.h>
 
 typedef uint64_t opal_timer_t;
diff --git a/opal/mca/timer/windows/timer_windows.h b/opal/mca/timer/windows/timer_windows.h
index 7f5fbc0876..b4734c061d 100644
--- a/opal/mca/timer/windows/timer_windows.h
+++ b/opal/mca/timer/windows/timer_windows.h
@@ -19,6 +19,7 @@
 #ifndef OPAL_MCA_TIMER_WINDOWS_H
 #define OPAL_MCA_TIMER_WINDOWS_H
 
+#include "opal_config.h"
 #include "windows.h"
 
 #include <opal/sys/timer.h>
diff --git a/opal/mca/timer/windows/timer_windows_component.h b/opal/mca/timer/windows/timer_windows_component.h
index 6c6beaeed5..606d7e6b78 100755
--- a/opal/mca/timer/windows/timer_windows_component.h
+++ b/opal/mca/timer/windows/timer_windows_component.h
@@ -19,6 +19,7 @@
 #ifndef OPAL_MCA_TIMER_WINDOWS_COMPONENT_H
 #define OPAL_MCA_TIMER_WINDOWS_COMPONENT_H
 
+#include "opal_config.h"
 #include "opal/mca/timer/windows/timer_windows.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/opal/memoryhooks/memory.h b/opal/memoryhooks/memory.h
index a1715c0987..ab488f4cef 100644
--- a/opal/memoryhooks/memory.h
+++ b/opal/memoryhooks/memory.h
@@ -38,6 +38,7 @@
 #ifndef OPAL_MEMORY_MEMORY_H
 #define OPAl_MEMORY_MEMORY_H
 
+#include "opal_config.h"
 #include "memory_internal.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/opal/runtime/opal_cr.h b/opal/runtime/opal_cr.h
index f5f89add99..7a83e0f279 100644
--- a/opal/runtime/opal_cr.h
+++ b/opal/runtime/opal_cr.h
@@ -23,6 +23,7 @@
  * Checkpoint functionality for Open MPI
  */
 
+#include "opal_config.h"
 #include "opal/mca/crs/crs.h"
 #include "opal/event/event.h"
 #include "opal/runtime/opal_progress.h"
diff --git a/opal/runtime/opal_progress.h b/opal/runtime/opal_progress.h
index f1224caa2e..42f84a7899 100644
--- a/opal/runtime/opal_progress.h
+++ b/opal/runtime/opal_progress.h
@@ -32,6 +32,7 @@
 extern "C" {
 #endif
 
+#include "opal_config.h"
 #include "opal/threads/mutex.h"
 
 /**
diff --git a/opal/threads/mutex_unix.h b/opal/threads/mutex_unix.h
index 0a0005d097..bffa06809e 100644
--- a/opal/threads/mutex_unix.h
+++ b/opal/threads/mutex_unix.h
@@ -32,6 +32,7 @@
  * available.
  */
 
+#include "opal_config.h"
 
 #if OMPI_HAVE_POSIX_THREADS
 #ifdef HAVE_PTHREAD_H
diff --git a/opal/threads/mutex_windows.h b/opal/threads/mutex_windows.h
index c957abd8c4..dc23b4602a 100644
--- a/opal/threads/mutex_windows.h
+++ b/opal/threads/mutex_windows.h
@@ -31,6 +31,7 @@
  * On Windows, base everything on InterlockedExchange().
  */
 
+#include "opal_config.h"
 #include "opal/class/opal_object.h"
 #include "opal/sys/atomic.h"
 
diff --git a/opal/threads/threads.h b/opal/threads/threads.h
index e721f01745..247f91bb2a 100644
--- a/opal/threads/threads.h
+++ b/opal/threads/threads.h
@@ -19,6 +19,8 @@
 #ifndef OPAL_THREAD_H
 #define OPAL_THREAD_H 1
 
+#include "opal_config.h"
+
 #if OMPI_HAVE_POSIX_THREADS
 #include <pthread.h>
 #elif OMPI_HAVE_SOLARIS_THREADS
diff --git a/opal/util/if.h b/opal/util/if.h
index 55ea187a4a..188840b7ff 100644
--- a/opal/util/if.h
+++ b/opal/util/if.h
@@ -24,6 +24,8 @@
 #ifndef OPAL_IF_UTIL_
 #define OPAL_IF_UTIL_
 
+#include "opal_config.h"
+
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
diff --git a/opal/util/malloc.h b/opal/util/malloc.h
index d1c0e45bbb..b4e3d0a47b 100644
--- a/opal/util/malloc.h
+++ b/opal/util/malloc.h
@@ -21,6 +21,7 @@
 #ifndef OPAL_MALLOC_H
 #define OPAL_MALLOC_H
 
+#include "opal_config.h"
 #include <stdlib.h>
 
 /*
diff --git a/opal/util/net.h b/opal/util/net.h
index 5dfcd364ef..c1ec888610 100644
--- a/opal/util/net.h
+++ b/opal/util/net.h
@@ -23,6 +23,8 @@
 #ifndef OPAL_UTIL_NET_H
 #define OPAL_UTIL_NET_H
 
+#include "opal_config.h"
+
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
diff --git a/opal/util/opal_environ.h b/opal/util/opal_environ.h
index a5b20bb36e..2f263258e7 100644
--- a/opal/util/opal_environ.h
+++ b/opal/util/opal_environ.h
@@ -27,6 +27,8 @@
 #ifndef OPAL_ENVIRON_H
 #define OPAL_ENVIRON_H
 
+#include "opal_config.h"
+
 #ifdef HAVE_CRT_EXTERNS_H
 #include <crt_externs.h>
 #endif
diff --git a/opal/util/opal_pty.h b/opal/util/opal_pty.h
index 953b2fb3fc..6cd812f901 100644
--- a/opal/util/opal_pty.h
+++ b/opal/util/opal_pty.h
@@ -19,6 +19,8 @@
 #ifndef OPAL_UTIL_PTY_H
 #define OPAL_UTIL_PTY_H
 
+#include "opal_config.h"
+
 #ifdef HAVE_UTIL_H
 #include <util.h>
 #endif
diff --git a/orte/mca/iof/hnp/iof_hnp.h b/orte/mca/iof/hnp/iof_hnp.h
index d00f96b9b7..f68d9a9afb 100644
--- a/orte/mca/iof/hnp/iof_hnp.h
+++ b/orte/mca/iof/hnp/iof_hnp.h
@@ -37,6 +37,8 @@
 #ifndef ORTE_IOF_HNP_H
 #define ORTE_IOF_HNP_H
 
+#include "orte_config.h"
+
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif  /* HAVE_SYS_TYPES_H */
diff --git a/orte/mca/iof/tool/iof_tool.h b/orte/mca/iof/tool/iof_tool.h
index d34f48ec31..368e74a4e6 100644
--- a/orte/mca/iof/tool/iof_tool.h
+++ b/orte/mca/iof/tool/iof_tool.h
@@ -34,6 +34,7 @@
 #ifndef ORTE_IOF_TOOL_H
 #define ORTE_IOF_TOOL_H
 
+#include "orte_config.h"
 #include "orte/mca/iof/iof.h"
 
 BEGIN_C_DECLS
diff --git a/orte/mca/ras/alps/ras_alps.h b/orte/mca/ras/alps/ras_alps.h
index b387e68a1f..882d2f4e1f 100644
--- a/orte/mca/ras/alps/ras_alps.h
+++ b/orte/mca/ras/alps/ras_alps.h
@@ -24,6 +24,7 @@
 #ifndef ORTE_RAS_ALPS_H
 #define ORTE_RAS_ALPS_H
 
+#include "orte_config.h"
 #include "orte/mca/ras/ras.h"
 #include "orte/mca/ras/base/base.h"
 
diff --git a/orte/mca/ras/bjs/ras_bjs.h b/orte/mca/ras/bjs/ras_bjs.h
index 1f1f2bc9dd..a16157fe58 100644
--- a/orte/mca/ras/bjs/ras_bjs.h
+++ b/orte/mca/ras/bjs/ras_bjs.h
@@ -23,6 +23,7 @@
 #ifndef ORTE_RAS_BJS_H
 #define ORTE_RAS_BJS_H
 
+#include "orte_config.h"
 #include "orte/mca/ras/ras.h"
 
 BEGIN_C_DECLS
diff --git a/orte/mca/ras/ccp/ras_ccp.h b/orte/mca/ras/ccp/ras_ccp.h
index 293e1c95c5..975559e770 100644
--- a/orte/mca/ras/ccp/ras_ccp.h
+++ b/orte/mca/ras/ccp/ras_ccp.h
@@ -20,6 +20,7 @@
 #ifndef ORTE_RAS_ccp_H
 #define ORTE_RAS_ccp_H
 
+#include "orte_config.h"
 #include "orte/mca/ras/ras.h"
 #include "orte/mca/ras/base/base.h"
 
diff --git a/orte/mca/ras/gridengine/ras_gridengine.h b/orte/mca/ras/gridengine/ras_gridengine.h
index fae2804c7a..9950a0001d 100644
--- a/orte/mca/ras/gridengine/ras_gridengine.h
+++ b/orte/mca/ras/gridengine/ras_gridengine.h
@@ -24,6 +24,7 @@
 #ifndef ORTE_RAS_GRIDENGINE_H
 #define ORTE_RAS_GRIDENGINE_H
 
+#include "orte_config.h"
 #include "orte/mca/ras/ras.h"
 #include "orte/mca/ras/base/base.h"
 
diff --git a/orte/mca/ras/loadleveler/ras_loadleveler.h b/orte/mca/ras/loadleveler/ras_loadleveler.h
index c13eedfad1..a35eaca5fa 100644
--- a/orte/mca/ras/loadleveler/ras_loadleveler.h
+++ b/orte/mca/ras/loadleveler/ras_loadleveler.h
@@ -23,6 +23,7 @@
 #ifndef ORTE_RAS_LOADLEVELER_H
 #define ORTE_RAS_LOADLEVELER_H
 
+#include "orte_config.h"
 #include "orte/mca/ras/ras.h"
 #include "orte/mca/ras/base/base.h"
 
diff --git a/orte/mca/ras/lsf/ras_lsf.h b/orte/mca/ras/lsf/ras_lsf.h
index b16b5e6a82..0bc38784cf 100644
--- a/orte/mca/ras/lsf/ras_lsf.h
+++ b/orte/mca/ras/lsf/ras_lsf.h
@@ -23,6 +23,7 @@
 #ifndef ORTE_RAS_LSF_H
 #define ORTE_RAS_LSF_H
 
+#include "orte_config.h"
 #include "orte/mca/ras/ras.h"
 
 BEGIN_C_DECLS
diff --git a/orte/mca/ras/slurm/ras_slurm.h b/orte/mca/ras/slurm/ras_slurm.h
index 31f1980a51..863ab8b1a2 100644
--- a/orte/mca/ras/slurm/ras_slurm.h
+++ b/orte/mca/ras/slurm/ras_slurm.h
@@ -23,6 +23,7 @@
 #ifndef ORTE_RAS_SLURM_H
 #define ORTE_RAS_SLURM_H
 
+#include "orte_config.h"
 #include "orte/mca/ras/ras.h"
 #include "orte/mca/ras/base/base.h"
 
diff --git a/orte/mca/ras/tm/ras_tm.h b/orte/mca/ras/tm/ras_tm.h
index 7632378d4b..a2a2272901 100644
--- a/orte/mca/ras/tm/ras_tm.h
+++ b/orte/mca/ras/tm/ras_tm.h
@@ -23,6 +23,7 @@
 #ifndef ORTE_RAS_TM_H
 #define ORTE_RAS_TM_H
 
+#include "orte_config.h"
 #include "orte/mca/ras/ras.h"
 #include "orte/mca/ras/base/base.h"
 
diff --git a/orte/mca/rmaps/rank_file/rmaps_rank_file.h b/orte/mca/rmaps/rank_file/rmaps_rank_file.h
index 9f43a16c96..a068167c28 100644
--- a/orte/mca/rmaps/rank_file/rmaps_rank_file.h
+++ b/orte/mca/rmaps/rank_file/rmaps_rank_file.h
@@ -24,6 +24,7 @@
  */
 
 
+#include "orte_config.h"
 #include "opal_config.h"
 #include "opal/util/argv.h"
 #include "opal/mca/paffinity/paffinity.h"
diff --git a/orte/mca/rmaps/round_robin/rmaps_rr.h b/orte/mca/rmaps/round_robin/rmaps_rr.h
index cde3383c26..beeed3d139 100644
--- a/orte/mca/rmaps/round_robin/rmaps_rr.h
+++ b/orte/mca/rmaps/round_robin/rmaps_rr.h
@@ -23,6 +23,7 @@
 #ifndef ORTE_RMAPS_RR_H
 #define ORTE_RMAPS_RR_H
 
+#include "orte_config.h"
 #include "orte/mca/rmaps/rmaps.h"
 
 BEGIN_C_DECLS
diff --git a/orte/mca/rmaps/seq/rmaps_seq.h b/orte/mca/rmaps/seq/rmaps_seq.h
index b294867e94..94b349f060 100644
--- a/orte/mca/rmaps/seq/rmaps_seq.h
+++ b/orte/mca/rmaps/seq/rmaps_seq.h
@@ -23,6 +23,7 @@
 #ifndef ORTE_RMAPS_SEQ_H
 #define ORTE_RMAPS_SEQ_H
 
+#include "orte_config.h"
 #include "orte/mca/rmaps/rmaps.h"
 
 BEGIN_C_DECLS
diff --git a/orte/mca/rmaps/topo/rmaps_topo.h b/orte/mca/rmaps/topo/rmaps_topo.h
index cd19c74acb..5440bf15ed 100644
--- a/orte/mca/rmaps/topo/rmaps_topo.h
+++ b/orte/mca/rmaps/topo/rmaps_topo.h
@@ -23,6 +23,7 @@
 #ifndef ORTE_RMAPS_TOPO_H
 #define ORTE_RMAPS_TOPO_H
 
+#include "orte_config.h"
 #include "orte/mca/rmaps/rmaps.h"
 
 BEGIN_C_DECLS
diff --git a/orte/mca/rml/ftrm/rml_ftrm.h b/orte/mca/rml/ftrm/rml_ftrm.h
index c786dcad31..59f8b4c193 100644
--- a/orte/mca/rml/ftrm/rml_ftrm.h
+++ b/orte/mca/rml/ftrm/rml_ftrm.h
@@ -23,6 +23,7 @@
 #ifndef MCA_RML_FTRM_H
 #define MCA_RML_FTRM_H
 
+#include "orte_config.h"
 #include "orte/mca/rml/rml.h"
 #include "orte/mca/rml/rml_types.h"
 
diff --git a/orte/mca/rml/oob/rml_oob.h b/orte/mca/rml/oob/rml_oob.h
index ee4fc3b05b..c81af7be91 100644
--- a/orte/mca/rml/oob/rml_oob.h
+++ b/orte/mca/rml/oob/rml_oob.h
@@ -20,6 +20,7 @@
 #ifndef MCA_RML_OOB_RML_OOB_H
 #define MCA_RML_OOB_RML_OOB_H
 
+#include "orte_config.h"
 #include "opal/threads/condition.h"
 #include "opal/threads/mutex.h"
 #include "opal/event/event.h"
diff --git a/orte/mca/routed/routed.h b/orte/mca/routed/routed.h
index 6a8ec11510..4106328adf 100644
--- a/orte/mca/routed/routed.h
+++ b/orte/mca/routed/routed.h
@@ -23,6 +23,8 @@
 #ifndef ORTE_MCA_ROUTED_ROUTED_H_
 #define ORTE_MCA_ROUTED_ROUTED_H_
 
+#include "orte_config.h"
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif