- An intrusive commit yet again (sorry): with the separation we

get bitten by header depending on having already included the corresponding [opal|orte|ompi]_config.h header. When separating, things like [OPAL|ORTE|OMPI]_DECLSPEC are missed. Script to add the corresponding header in front of all following (taking care of possible #ifdef HAVE_...) - Including some minor cleanups to - ompi/group/group.h -- include _after_ #ifndef OMPI_GROUP_H - ompi/mca/btl/btl.h -- nclude _after_ #ifndef MCA_BTL_H - ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.c -- still no need for orte/util/output.h - ompi/mca/pml/dr/pml_dr_recvreq.c -- no need for mpool.h - ompi/mca/btl/btl.h -- reorder to fit - ompi/mca/bml/bml.h -- reorder to fit - ompi/runtime/ompi_mpi_finalize.c -- reorder to fit - ompi/request/request.h -- additionally need ompi/constants.h - Tested on linux/x86-64 This commit was SVN r20720.
2009-03-04 15:35:54 +00:00 · 2009-03-04 15:35:54 +00:00 · fd28b392bf
--- 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"
--- 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"
--- 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"
--- 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 */
--- 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 */
--- 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"
--- 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
--- 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"
--- 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" 

--- 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"
--- 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"
--- 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

--- 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"

--- 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"
--- 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"
--- 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>
--- 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>

--- 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>

--- 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>
--- 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"
--- 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>
--- 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 */
--- 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>
--- 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>
--- 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>

--- 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>
--- 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"


--- 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"
--- 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"
--- 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"
--- 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)
--- 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" 
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"

 /*
--- 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
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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. */
--- 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"
--- 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 */
--- 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"
--- 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

--- 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"

--- 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

 /*
--- 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"
--- 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"
--- 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>
--- 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"
--- 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;
--- 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>
--- 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)
--- 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)
--- 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"
--- 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"

 /**
--- 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
--- 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"

--- 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
--- 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
--- 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>

 /*
--- 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
--- 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
--- 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
--- 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 */
--- 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
--- 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"

--- 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
--- 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"

--- 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"

--- 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"

--- 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
--- 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"

--- 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"

--- 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"
--- 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
--- 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
--- 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
--- 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"

--- 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"
--- 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