diff --git a/ompi/class/ompi_free_list.h b/ompi/class/ompi_free_list.h index a175c2c7a3..2f6d79cca8 100644 --- a/ompi/class/ompi_free_list.h +++ b/ompi/class/ompi_free_list.h @@ -22,7 +22,6 @@ #include "ompi_config.h" #include "opal/class/opal_atomic_lifo.h" #include "opal/prefetch.h" -#include "opal/threads/threads.h" #include "opal/threads/condition.h" #include "ompi/constants.h" #include "opal/sys/cache.h" diff --git a/ompi/communicator/comm.c b/ompi/communicator/comm.c index 53d075c453..46331cd3c2 100644 --- a/ompi/communicator/comm.c +++ b/ompi/communicator/comm.c @@ -33,7 +33,6 @@ #include "opal/threads/mutex.h" #include "opal/util/bit_ops.h" #include "opal/util/output.h" -#include "opal/util/convert.h" #include "ompi/mca/topo/topo.h" #include "ompi/mca/topo/base/base.h" #include "ompi/mca/dpm/dpm.h" diff --git a/ompi/communicator/comm_cid.c b/ompi/communicator/comm_cid.c index cccffe59b4..bf3f1e3edf 100644 --- a/ompi/communicator/comm_cid.c +++ b/ompi/communicator/comm_cid.c @@ -24,11 +24,9 @@ #include "ompi_config.h" #include "opal/dss/dss.h" -#include "opal/util/convert.h" #include "orte/types.h" #include "ompi/communicator/communicator.h" #include "ompi/op/op.h" -#include "ompi/proc/proc.h" #include "ompi/constants.h" #include "opal/class/opal_pointer_array.h" #include "opal/class/opal_list.h" diff --git a/ompi/communicator/comm_init.c b/ompi/communicator/comm_init.c index 9fc516519c..796a96054a 100644 --- a/ompi/communicator/comm_init.c +++ b/ompi/communicator/comm_init.c @@ -32,7 +32,6 @@ #include "ompi/runtime/params.h" #include "ompi/communicator/communicator.h" #include "ompi/attribute/attribute.h" -#include "ompi/mca/topo/topo.h" #include "ompi/mca/dpm/dpm.h" #include "ompi/memchecker.h" diff --git a/ompi/datatype/copy_functions_heterogeneous.c b/ompi/datatype/copy_functions_heterogeneous.c index e6eed352f7..b1885ee514 100644 --- a/ompi/datatype/copy_functions_heterogeneous.c +++ b/ompi/datatype/copy_functions_heterogeneous.c @@ -14,7 +14,6 @@ #include "opal/util/arch.h" -#include "opal/types.h" #include "ompi/datatype/datatype.h" #include "ompi/datatype/convertor.h" #include "ompi/datatype/datatype_internal.h" diff --git a/ompi/datatype/dt_args.c b/ompi/datatype/dt_args.c index a1b1958b2f..efd0b3b440 100644 --- a/ompi/datatype/dt_args.c +++ b/ompi/datatype/dt_args.c @@ -22,7 +22,6 @@ #include "opal/align.h" #include "ompi/constants.h" -#include "orte/types.h" #include "mpi.h" #include "ompi/datatype/datatype.h" diff --git a/ompi/datatype/dt_external32.c b/ompi/datatype/dt_external32.c index 628840ec1a..637c7070dc 100644 --- a/ompi/datatype/dt_external32.c +++ b/ompi/datatype/dt_external32.c @@ -19,7 +19,6 @@ #include "ompi_config.h" -#include "ompi/datatype/datatype.h" #include "ompi/datatype/convertor.h" #include "ompi/datatype/datatype_internal.h" #include "opal/util/arch.h" diff --git a/ompi/debuggers/ompi_debugger_canary.c b/ompi/debuggers/ompi_debugger_canary.c index 9bfa38bff9..6c77c8bf7b 100644 --- a/ompi/debuggers/ompi_debugger_canary.c +++ b/ompi/debuggers/ompi_debugger_canary.c @@ -14,18 +14,9 @@ * Include all header files for the datatypes that we care about / use * in the DLL code */ -#include "ompi/class/ompi_free_list.h" -#include "ompi/request/request.h" -#include "ompi/group/group.h" -#include "ompi/communicator/communicator.h" -#include "ompi/datatype/datatype.h" #include "ompi/mca/pml/base/pml_base_request.h" #include "ompi/mca/pml/base/pml_base_sendreq.h" #include "ompi/mca/pml/base/pml_base_recvreq.h" -#include "ompi/mca/topo/topo.h" -#include "opal/class/opal_list.h" -#include "opal/class/opal_hash_table.h" -#include "opal/class/opal_pointer_array.h" /* * Define ompi_field_offset() to be a debugging macro only -- just diff --git a/ompi/debuggers/ompi_debuggers.c b/ompi/debuggers/ompi_debuggers.c index 4674ba0f6e..a21e08d981 100644 --- a/ompi/debuggers/ompi_debuggers.c +++ b/ompi/debuggers/ompi_debuggers.c @@ -66,7 +66,6 @@ #include "ompi/mca/pml/base/pml_base_recvreq.h" #include "opal/class/opal_pointer_array.h" #include "ompi/communicator/communicator.h" -#include "ompi/mca/topo/topo.h" #include "ompi/group/group.h" #include "ompi/datatype/datatype.h" #include "ompi/include/mpi.h" diff --git a/ompi/errhandler/errhandler.c b/ompi/errhandler/errhandler.c index 9f90ec3920..a10e5dc3c0 100644 --- a/ompi/errhandler/errhandler.c +++ b/ompi/errhandler/errhandler.c @@ -27,7 +27,6 @@ #include "ompi/communicator/communicator.h" #include "ompi/win/win.h" -#include "ompi/file/file.h" #include "ompi/errhandler/errhandler.h" #include "ompi/errhandler/errhandler_predefined.h" #include "opal/class/opal_pointer_array.h" diff --git a/ompi/errhandler/errhandler_predefined.c b/ompi/errhandler/errhandler_predefined.c index a666b27c43..00eb47b546 100644 --- a/ompi/errhandler/errhandler_predefined.c +++ b/ompi/errhandler/errhandler_predefined.c @@ -31,13 +31,11 @@ #include "orte/util/show_help.h" #include "orte/runtime/orte_globals.h" -#include "ompi/errhandler/errhandler.h" #include "ompi/errhandler/errhandler_predefined.h" #include "ompi/errhandler/errcode.h" #include "ompi/communicator/communicator.h" #include "ompi/file/file.h" #include "ompi/win/win.h" -#include "orte/runtime/runtime.h" #include "opal/util/printf.h" #include "opal/util/output.h" diff --git a/ompi/group/group_bitmap.c b/ompi/group/group_bitmap.c index 8e4c19dd1f..86b3dc23ee 100644 --- a/ompi/group/group_bitmap.c +++ b/ompi/group/group_bitmap.c @@ -21,7 +21,6 @@ #include "ompi_config.h" #include "ompi/group/group.h" #include "ompi/constants.h" -#include "ompi/proc/proc.h" #include "mpi.h" static bool check_ranks (int, int *); diff --git a/ompi/group/group_sporadic.c b/ompi/group/group_sporadic.c index eeb46f9ed5..d63776b422 100644 --- a/ompi/group/group_sporadic.c +++ b/ompi/group/group_sporadic.c @@ -21,7 +21,6 @@ #include "ompi_config.h" #include "ompi/group/group.h" #include "ompi/constants.h" -#include "ompi/proc/proc.h" #include "mpi.h" int ompi_group_calc_sporadic ( int n , int *ranks) diff --git a/ompi/group/group_strided.c b/ompi/group/group_strided.c index 2214aa385d..505756eef0 100644 --- a/ompi/group/group_strided.c +++ b/ompi/group/group_strided.c @@ -21,7 +21,6 @@ #include "ompi_config.h" #include "ompi/group/group.h" #include "ompi/constants.h" -#include "ompi/proc/proc.h" #include "mpi.h" static int check_stride(int[],int); diff --git a/ompi/include/ompi/types.h b/ompi/include/ompi/types.h index 819b49cdf2..ea819d4eed 100644 --- a/ompi/include/ompi/types.h +++ b/ompi/include/ompi/types.h @@ -19,7 +19,6 @@ #ifndef OMPI_TYPES_H #define OMPI_TYPES_H -#include "opal/types.h" /* * handle to describe a parallel job diff --git a/ompi/info/info.h b/ompi/info/info.h index 83aeef7418..18e2762a71 100644 --- a/ompi/info/info.h +++ b/ompi/info/info.h @@ -26,7 +26,6 @@ #include #include "mpi.h" -#include "opal/util/strncpy.h" #include "opal/class/opal_list.h" #include "opal/class/opal_pointer_array.h" #include "opal/threads/mutex.h" diff --git a/ompi/mca/allocator/basic/allocator_basic.h b/ompi/mca/allocator/basic/allocator_basic.h index 12513d6a07..27c190df03 100644 --- a/ompi/mca/allocator/basic/allocator_basic.h +++ b/ompi/mca/allocator/basic/allocator_basic.h @@ -27,7 +27,6 @@ #include #include #include "opal/threads/mutex.h" -#include "opal/class/opal_object.h" #include "ompi/class/ompi_free_list.h" #include "ompi/mca/allocator/allocator.h" diff --git a/ompi/mca/allocator/bucket/allocator_bucket_alloc.h b/ompi/mca/allocator/bucket/allocator_bucket_alloc.h index d93419ea06..09bb8e981a 100644 --- a/ompi/mca/allocator/bucket/allocator_bucket_alloc.h +++ b/ompi/mca/allocator/bucket/allocator_bucket_alloc.h @@ -27,7 +27,6 @@ #include #include #include "opal/threads/mutex.h" -#include "opal/class/opal_object.h" #include "ompi/mca/allocator/allocator.h" #if defined(c_plusplus) || defined(__cplusplus) extern "C" { diff --git a/ompi/mca/bml/base/bml_base_ft.c b/ompi/mca/bml/base/bml_base_ft.c index 85a686308b..a8b7c63134 100644 --- a/ompi/mca/bml/base/bml_base_ft.c +++ b/ompi/mca/bml/base/bml_base_ft.c @@ -18,9 +18,7 @@ */ #include "ompi_config.h" -#include "ompi/mca/bml/bml.h" #include "ompi/mca/bml/base/base.h" -#include "ompi/mca/btl/btl.h" #include "ompi/mca/btl/base/base.h" #include "ompi/mca/bml/base/bml_base_btl.h" diff --git a/ompi/mca/bml/base/bml_base_open.c b/ompi/mca/bml/base/bml_base_open.c index 88b801cf37..11f8351923 100644 --- a/ompi/mca/bml/base/bml_base_open.c +++ b/ompi/mca/bml/base/bml_base_open.c @@ -23,7 +23,6 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ -#include "ompi/mca/bml/bml.h" #include "ompi/mca/bml/base/base.h" #include "ompi/mca/btl/base/base.h" #include "ompi/mca/bml/base/static-components.h" diff --git a/ompi/mca/bml/bml.h b/ompi/mca/bml/bml.h index 7cf750ef48..b69cb837d7 100644 --- a/ompi/mca/bml/bml.h +++ b/ompi/mca/bml/bml.h @@ -30,7 +30,6 @@ #include "opal/mca/mca.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" diff --git a/ompi/mca/bml/r2/bml_r2.h b/ompi/mca/bml/r2/bml_r2.h index 30025985f5..f22402eef0 100644 --- a/ompi/mca/bml/r2/bml_r2.h +++ b/ompi/mca/bml/r2/bml_r2.h @@ -30,7 +30,6 @@ #define MCA_BML_R2_H #include "ompi/types.h" -#include "ompi/class/ompi_free_list.h" #include "ompi/mca/bml/bml.h" #if defined(c_plusplus) || defined(__cplusplus) diff --git a/ompi/mca/bml/r2/bml_r2_component.c b/ompi/mca/bml/r2/bml_r2_component.c index af3b32cfa4..8319084637 100644 --- a/ompi/mca/bml/r2/bml_r2_component.c +++ b/ompi/mca/bml/r2/bml_r2_component.c @@ -21,7 +21,6 @@ #include "opal/event/event.h" #include "mpi.h" #include "ompi/mca/bml/bml.h" -#include "ompi/mca/btl/btl.h" #include "ompi/mca/btl/base/base.h" #include "opal/mca/base/mca_base_param.h" #include "bml_r2.h" diff --git a/ompi/mca/bml/r2/bml_r2_ft.c b/ompi/mca/bml/r2/bml_r2_ft.c index e3520e98fc..a4003165c6 100644 --- a/ompi/mca/bml/r2/bml_r2_ft.c +++ b/ompi/mca/bml/r2/bml_r2_ft.c @@ -26,9 +26,7 @@ #include #include "ompi/runtime/ompi_cr.h" -#include "ompi/mca/bml/bml.h" #include "ompi/mca/bml/base/base.h" -#include "ompi/mca/btl/btl.h" #include "ompi/mca/btl/base/base.h" #include "ompi/mca/bml/base/bml_base_btl.h" #include "ompi/mca/pml/base/base.h" diff --git a/ompi/mca/bml/r2/bml_r2_ft.h b/ompi/mca/bml/r2/bml_r2_ft.h index a6a0810985..d73d26c8e1 100644 --- a/ompi/mca/bml/r2/bml_r2_ft.h +++ b/ompi/mca/bml/r2/bml_r2_ft.h @@ -21,7 +21,6 @@ #ifndef MCA_BML_R2_FT_H #define MCA_BML_R2_FT_H -#include "ompi/mca/btl/btl.h" #if defined(c_plusplus) || defined(__cplusplus) extern "C" { diff --git a/ompi/mca/btl/base/btl_base_close.c b/ompi/mca/btl/base/btl_base_close.c index 688fb561c0..12f5354e87 100644 --- a/ompi/mca/btl/base/btl_base_close.c +++ b/ompi/mca/btl/base/btl_base_close.c @@ -25,7 +25,6 @@ #include "opal/event/event.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "ompi/mca/btl/btl.h" #include "ompi/mca/btl/base/base.h" int mca_btl_base_close(void) diff --git a/ompi/mca/btl/elan/btl_elan.c b/ompi/mca/btl/elan/btl_elan.c index a6ff84f770..38ef3a0d67 100644 --- a/ompi/mca/btl/elan/btl_elan.c +++ b/ompi/mca/btl/elan/btl_elan.c @@ -11,10 +11,8 @@ #include "ompi_config.h" #include "opal/class/opal_bitmap.h" -#include "opal/util/if.h" #include "opal/util/output.h" #include "ompi/mca/btl/btl.h" -#include "ompi/communicator/communicator.h" #include "btl_elan.h" #include "btl_elan_frag.h" #include "btl_elan_proc.h" @@ -22,8 +20,6 @@ #include "ompi/datatype/convertor.h" #include "ompi/mca/btl/base/base.h" -#include "ompi/runtime/ompi_module_exchange.h" -#include "opal/class/opal_hash_table.h" #include #include "elan/elan.h" diff --git a/ompi/mca/btl/elan/btl_elan_component.c b/ompi/mca/btl/elan/btl_elan_component.c index 66dfe878cf..ad3dbf945b 100644 --- a/ompi/mca/btl/elan/btl_elan_component.c +++ b/ompi/mca/btl/elan/btl_elan_component.c @@ -13,15 +13,12 @@ #include "ompi_config.h" #include "ompi/constants.h" #include "opal/event/event.h" -#include "opal/util/if.h" #include "opal/util/output.h" -#include "opal/util/argv.h" #include "ompi/mca/btl/btl.h" #include "opal/mca/base/mca_base_param.h" #include "ompi/runtime/ompi_module_exchange.h" -#include "orte/runtime/orte_globals.h" #include "ompi/mca/mpool/base/base.h" #include "btl_elan.h" @@ -30,13 +27,10 @@ #include "ompi/mca/btl/base/base.h" #include "ompi/mca/btl/base/btl_base_error.h" -#include "ompi/datatype/convertor.h" #include "elan/elan.h" -#include "opal/util/os_path.h" #include "opal/util/opal_environ.h" -#include "ompi/communicator/communicator.h" #define ELAN_MAX_BTL 10 diff --git a/ompi/mca/btl/elan/btl_elan_endpoint.c b/ompi/mca/btl/elan/btl_elan_endpoint.c index 72c89e77e6..bcea940be8 100644 --- a/ompi/mca/btl/elan/btl_elan_endpoint.c +++ b/ompi/mca/btl/elan/btl_elan_endpoint.c @@ -14,7 +14,6 @@ #include #include #include "ompi/types.h" -#include "opal/dss/dss.h" #include "btl_elan.h" #include "btl_elan_endpoint.h" #include "btl_elan_proc.h" diff --git a/ompi/mca/btl/elan/btl_elan_endpoint.h b/ompi/mca/btl/elan/btl_elan_endpoint.h index f6598c1269..52b3e8990a 100644 --- a/ompi/mca/btl/elan/btl_elan_endpoint.h +++ b/ompi/mca/btl/elan/btl_elan_endpoint.h @@ -14,7 +14,6 @@ #include "opal/class/opal_list.h" #include "opal/event/event.h" -#include "ompi/mca/btl/btl.h" #include "btl_elan_frag.h" #include "btl_elan.h" diff --git a/ompi/mca/btl/elan/btl_elan_proc.c b/ompi/mca/btl/elan/btl_elan_proc.c index bc7769440c..e8437201a3 100644 --- a/ompi/mca/btl/elan/btl_elan_proc.c +++ b/ompi/mca/btl/elan/btl_elan_proc.c @@ -10,11 +10,9 @@ */ #include "ompi_config.h" -#include "opal/class/opal_hash_table.h" #include "ompi/runtime/ompi_module_exchange.h" #include "btl_elan.h" #include "btl_elan_proc.h" -#include "ompi/communicator/communicator.h" static void mca_btl_elan_proc_construct(mca_btl_elan_proc_t* proc); static void mca_btl_elan_proc_destruct(mca_btl_elan_proc_t* proc); diff --git a/ompi/mca/btl/gm/btl_gm.c b/ompi/mca/btl/gm/btl_gm.c index e01f66b4a6..3448e24b05 100644 --- a/ompi/mca/btl/gm/btl_gm.c +++ b/ompi/mca/btl/gm/btl_gm.c @@ -20,7 +20,6 @@ #include "ompi_config.h" #include #include "opal/class/opal_bitmap.h" -#include "opal/util/if.h" #include "opal/util/output.h" #include "ompi/mca/btl/btl.h" @@ -29,7 +28,6 @@ #include "btl_gm_proc.h" #include "btl_gm_endpoint.h" #include "ompi/datatype/convertor.h" -#include "ompi/datatype/datatype.h" #include "ompi/mca/mpool/base/base.h" #include "ompi/mca/mpool/mpool.h" #include "ompi/proc/proc.h" diff --git a/ompi/mca/btl/gm/btl_gm_component.c b/ompi/mca/btl/gm/btl_gm_component.c index 1608bc47d9..b3cec2312c 100644 --- a/ompi/mca/btl/gm/btl_gm_component.c +++ b/ompi/mca/btl/gm/btl_gm_component.c @@ -21,11 +21,8 @@ #include "ompi_config.h" #include "ompi/constants.h" #include "opal/event/event.h" -#include "opal/util/if.h" #include "opal/util/output.h" -#include "opal/util/argv.h" #include "ompi/mca/btl/btl.h" -#include "ompi/request/request.h" #ifdef HAVE_INTTYPES_H #include @@ -39,7 +36,6 @@ #include "btl_gm_endpoint.h" #include "ompi/mca/btl/base/base.h" #include "ompi/mca/btl/base/btl_base_error.h" -#include "ompi/datatype/convertor.h" #include "btl_gm_endpoint.h" #include "orte/runtime/orte_globals.h" #include "orte/util/name_fns.h" diff --git a/ompi/mca/btl/gm/btl_gm_endpoint.h b/ompi/mca/btl/gm/btl_gm_endpoint.h index 8279c51630..20100915e8 100644 --- a/ompi/mca/btl/gm/btl_gm_endpoint.h +++ b/ompi/mca/btl/gm/btl_gm_endpoint.h @@ -21,7 +21,6 @@ #include "opal/class/opal_list.h" #include "opal/event/event.h" -#include "ompi/mca/btl/btl.h" #include "btl_gm_frag.h" #include "btl_gm.h" diff --git a/ompi/mca/btl/gm/btl_gm_proc.c b/ompi/mca/btl/gm/btl_gm_proc.c index 365a36b364..333ae5c907 100644 --- a/ompi/mca/btl/gm/btl_gm_proc.c +++ b/ompi/mca/btl/gm/btl_gm_proc.c @@ -18,7 +18,6 @@ #include "ompi_config.h" -#include "opal/class/opal_hash_table.h" #include "ompi/runtime/ompi_module_exchange.h" #ifdef HAVE_INTTYPES_H diff --git a/ompi/mca/btl/mx/btl_mx.c b/ompi/mca/btl/mx/btl_mx.c index 9c48039ca4..f7cc1f0808 100644 --- a/ompi/mca/btl/mx/btl_mx.c +++ b/ompi/mca/btl/mx/btl_mx.c @@ -18,7 +18,6 @@ #include "ompi_config.h" #include "opal/class/opal_bitmap.h" -#include "opal/util/if.h" #if OPAL_ENABLE_FT == 1 #include "ompi/runtime/ompi_cr.h" diff --git a/ompi/mca/btl/mx/btl_mx_component.c b/ompi/mca/btl/mx/btl_mx_component.c index 1b28679f79..52c8047934 100644 --- a/ompi/mca/btl/mx/btl_mx_component.c +++ b/ompi/mca/btl/mx/btl_mx_component.c @@ -22,8 +22,6 @@ #include "ompi_config.h" #include "opal/prefetch.h" #include "opal/util/opal_environ.h" -#include "opal/util/if.h" -#include "opal/util/argv.h" #include "ompi/constants.h" #include "opal/mca/base/mca_base_param.h" diff --git a/ompi/mca/btl/mx/btl_mx_endpoint.h b/ompi/mca/btl/mx/btl_mx_endpoint.h index af235622be..d8463f2d63 100644 --- a/ompi/mca/btl/mx/btl_mx_endpoint.h +++ b/ompi/mca/btl/mx/btl_mx_endpoint.h @@ -21,7 +21,6 @@ #include "opal/class/opal_list.h" #include "opal/event/event.h" -#include "ompi/mca/btl/btl.h" #include "btl_mx_frag.h" #include "btl_mx.h" diff --git a/ompi/mca/btl/mx/btl_mx_frag.h b/ompi/mca/btl/mx/btl_mx_frag.h index 6a17b194eb..3753856263 100644 --- a/ompi/mca/btl/mx/btl_mx_frag.h +++ b/ompi/mca/btl/mx/btl_mx_frag.h @@ -21,7 +21,6 @@ #include "ompi_config.h" -#include "opal/class/opal_list.h" #include "ompi/class/ompi_free_list.h" #include "btl_mx.h" diff --git a/ompi/mca/btl/mx/btl_mx_proc.c b/ompi/mca/btl/mx/btl_mx_proc.c index 34e7646181..ed319afc6c 100644 --- a/ompi/mca/btl/mx/btl_mx_proc.c +++ b/ompi/mca/btl/mx/btl_mx_proc.c @@ -18,7 +18,6 @@ #include "ompi_config.h" -#include "opal/class/opal_hash_table.h" #include "orte/util/name_fns.h" #include "ompi/runtime/ompi_module_exchange.h" diff --git a/ompi/mca/btl/ofud/btl_ofud.c b/ompi/mca/btl/ofud/btl_ofud.c index 80c251be0f..7298fe5cb4 100644 --- a/ompi/mca/btl/ofud/btl_ofud.c +++ b/ompi/mca/btl/ofud/btl_ofud.c @@ -26,7 +26,6 @@ #include "opal/prefetch.h" #include "opal/util/output.h" #include "ompi/datatype/convertor.h" -#include "ompi/datatype/datatype.h" #include "ompi/mca/btl/btl.h" #include "ompi/mca/btl/base/btl_base_error.h" #include "ompi/mca/mpool/base/base.h" diff --git a/ompi/mca/btl/ofud/btl_ofud_endpoint.c b/ompi/mca/btl/ofud/btl_ofud_endpoint.c index 6b44ee0487..b7a5b4f7d5 100644 --- a/ompi/mca/btl/ofud/btl_ofud_endpoint.c +++ b/ompi/mca/btl/ofud/btl_ofud_endpoint.c @@ -27,7 +27,6 @@ #include "ompi_config.h" #include "opal/prefetch.h" #include "ompi/types.h" -#include "ompi/class/ompi_free_list.h" #include "btl_ofud.h" #include "btl_ofud_endpoint.h" diff --git a/ompi/mca/btl/openib/btl_openib.c b/ompi/mca/btl/openib/btl_openib.c index ca0dc0d695..5972cdc0e0 100644 --- a/ompi/mca/btl/openib/btl_openib.c +++ b/ompi/mca/btl/openib/btl_openib.c @@ -29,7 +29,6 @@ #include "orte/util/show_help.h" #include "orte/runtime/orte_globals.h" #include "opal/class/opal_bitmap.h" -#include "opal/util/if.h" #include "opal/util/output.h" #include "opal/util/arch.h" @@ -46,7 +45,6 @@ #include "btl_openib_endpoint.h" #include "btl_openib_xrc.h" #include "ompi/datatype/convertor.h" -#include "ompi/datatype/datatype.h" #include "ompi/mca/mpool/base/base.h" #include "ompi/mca/mpool/mpool.h" #include "ompi/mca/mpool/rdma/mpool_rdma.h" diff --git a/ompi/mca/btl/openib/btl_openib_async.c b/ompi/mca/btl/openib/btl_openib_async.c index 3330e7a412..c12f80dead 100644 --- a/ompi/mca/btl/openib/btl_openib_async.c +++ b/ompi/mca/btl/openib/btl_openib_async.c @@ -20,7 +20,6 @@ #include #include "orte/util/show_help.h" -#include "ompi/mca/btl/btl.h" #include "ompi/mca/btl/base/base.h" #include "btl_openib.h" diff --git a/ompi/mca/btl/openib/btl_openib_component.c b/ompi/mca/btl/openib/btl_openib_component.c index 25209cd38c..509db8d085 100644 --- a/ompi/mca/btl/openib/btl_openib_component.c +++ b/ompi/mca/btl/openib/btl_openib_component.c @@ -47,7 +47,6 @@ const char *ibv_get_sysfs_path(void); #include "ompi/constants.h" #include "opal/event/event.h" #include "opal/align.h" -#include "opal/util/if.h" #include "opal/util/output.h" #include "opal/util/argv.h" #include "opal/sys/timer.h" @@ -63,7 +62,6 @@ const char *ibv_get_sysfs_path(void); #include "orte/util/show_help.h" #include "orte/util/proc_info.h" -#include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" #include "orte/mca/notifier/notifier.h" @@ -72,7 +70,6 @@ const char *ibv_get_sysfs_path(void); #include "ompi/mca/mpool/base/base.h" #include "ompi/mca/mpool/rdma/mpool_rdma.h" #include "ompi/mca/btl/base/base.h" -#include "ompi/datatype/convertor.h" #include "ompi/mca/mpool/mpool.h" #include "ompi/runtime/ompi_module_exchange.h" #include "ompi/runtime/mpiruntime.h" diff --git a/ompi/mca/btl/openib/btl_openib_mca.c b/ompi/mca/btl/openib/btl_openib_mca.c index b3c0ab6cb6..b324c52824 100644 --- a/ompi/mca/btl/openib/btl_openib_mca.c +++ b/ompi/mca/btl/openib/btl_openib_mca.c @@ -27,7 +27,6 @@ #include "opal/mca/installdirs/installdirs.h" #include "orte/util/show_help.h" -#include "opal/util/argv.h" #include "opal/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "btl_openib.h" diff --git a/ompi/mca/btl/openib/btl_openib_proc.c b/ompi/mca/btl/openib/btl_openib_proc.c index 44ee81a126..9c43bbc974 100644 --- a/ompi/mca/btl/openib/btl_openib_proc.c +++ b/ompi/mca/btl/openib/btl_openib_proc.c @@ -20,7 +20,6 @@ #include "ompi_config.h" -#include "opal/class/opal_hash_table.h" #include "opal/util/arch.h" #include "ompi/runtime/ompi_module_exchange.h" diff --git a/ompi/mca/btl/openib/btl_openib_xrc.c b/ompi/mca/btl/openib/btl_openib_xrc.c index 4c2e7d0f3e..2c99909831 100644 --- a/ompi/mca/btl/openib/btl_openib_xrc.c +++ b/ompi/mca/btl/openib/btl_openib_xrc.c @@ -16,7 +16,6 @@ #include #include -#include "ompi/mca/btl/btl.h" #include "ompi/mca/btl/base/base.h" #include "btl_openib_xrc.h" #include "btl_openib.h" diff --git a/ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c b/ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c index 84c237efa0..a95539ba1c 100644 --- a/ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c +++ b/ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c @@ -258,11 +258,9 @@ #include #include -#include "opal/util/if.h" #include "opal/util/output.h" #include "opal/util/error.h" #include "opal/event/event.h" -#include "opal/class/opal_pointer_array.h" #include "opal_stdint.h" #include "orte/util/show_help.h" diff --git a/ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c b/ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c index 8c5de74359..3ad2c06995 100644 --- a/ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c +++ b/ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c @@ -28,7 +28,6 @@ #include #include -#include "opal/util/argv.h" #include "opal/util/output.h" #include "opal/util/error.h" #include "orte/util/show_help.h" diff --git a/ompi/mca/btl/portals/btl_portals.c b/ompi/mca/btl/portals/btl_portals.c index b0ff60dd52..ebc94621dd 100644 --- a/ompi/mca/btl/portals/btl_portals.c +++ b/ompi/mca/btl/portals/btl_portals.c @@ -29,7 +29,6 @@ #include "ompi/constants.h" #include "ompi/mca/btl/btl.h" #include "ompi/datatype/convertor.h" -#include "ompi/datatype/datatype.h" #include "btl_portals.h" #include "btl_portals_endpoint.h" diff --git a/ompi/mca/btl/portals/btl_portals_component.c b/ompi/mca/btl/portals/btl_portals_component.c index b385526e5a..7d04e7f686 100644 --- a/ompi/mca/btl/portals/btl_portals_component.c +++ b/ompi/mca/btl/portals/btl_portals_component.c @@ -25,7 +25,6 @@ #include "ompi/constants.h" -#include "opal/threads/threads.h" #include "opal/mca/base/mca_base_param.h" #include "ompi/mca/common/portals/common_portals.h" diff --git a/ompi/mca/btl/portals/btl_portals_endpoint.h b/ompi/mca/btl/portals/btl_portals_endpoint.h index 7a30fbdab2..e3c7a89d9f 100644 --- a/ompi/mca/btl/portals/btl_portals_endpoint.h +++ b/ompi/mca/btl/portals/btl_portals_endpoint.h @@ -19,8 +19,6 @@ #ifndef MCA_BTL_PORTALS_ENDPOINT_H #define MCA_BTL_PORTALS_ENDPOINT_H -#include "opal/class/opal_list.h" -#include "ompi/mca/btl/btl.h" #include "btl_portals.h" #if defined(c_plusplus) || defined(__cplusplus) diff --git a/ompi/mca/btl/portals/btl_portals_send.c b/ompi/mca/btl/portals/btl_portals_send.c index 22758d8211..40328c407e 100644 --- a/ompi/mca/btl/portals/btl_portals_send.c +++ b/ompi/mca/btl/portals/btl_portals_send.c @@ -24,7 +24,6 @@ #include "ompi/constants.h" #include "ompi/datatype/convertor.h" -#include "ompi/datatype/datatype.h" #include "btl_portals.h" #include "btl_portals_send.h" diff --git a/ompi/mca/btl/sctp/btl_sctp.c b/ompi/mca/btl/sctp/btl_sctp.c index e455c9960e..cafca7f290 100644 --- a/ompi/mca/btl/sctp/btl_sctp.c +++ b/ompi/mca/btl/sctp/btl_sctp.c @@ -19,7 +19,6 @@ #include "ompi_config.h" #include #include "opal/class/opal_bitmap.h" -#include "opal/util/if.h" #include "ompi/mca/btl/btl.h" #include "btl_sctp.h" @@ -27,7 +26,6 @@ #include "btl_sctp_proc.h" #include "btl_sctp_endpoint.h" #include "ompi/datatype/convertor.h" -#include "ompi/datatype/datatype.h" #include "ompi/mca/mpool/base/base.h" #include "ompi/mca/mpool/mpool.h" #include "ompi/proc/proc.h" diff --git a/ompi/mca/btl/sctp/btl_sctp_component.c b/ompi/mca/btl/sctp/btl_sctp_component.c index 1016a27f91..57b33aa3fa 100644 --- a/ompi/mca/btl/sctp/btl_sctp_component.c +++ b/ompi/mca/btl/sctp/btl_sctp_component.c @@ -61,7 +61,6 @@ #include "btl_sctp_frag.h" #include "btl_sctp_endpoint.h" #include "ompi/mca/btl/base/base.h" -#include "ompi/datatype/convertor.h" #include #include "btl_sctp_recv_handler.h" diff --git a/ompi/mca/btl/sctp/btl_sctp_endpoint.h b/ompi/mca/btl/sctp/btl_sctp_endpoint.h index c00720a049..0d9cc1cca0 100644 --- a/ompi/mca/btl/sctp/btl_sctp_endpoint.h +++ b/ompi/mca/btl/sctp/btl_sctp_endpoint.h @@ -21,7 +21,6 @@ #include "opal/class/opal_list.h" #include "opal/event/event.h" -#include "ompi/mca/btl/btl.h" #include "btl_sctp_frag.h" #include "btl_sctp.h" #if defined(c_plusplus) || defined(__cplusplus) diff --git a/ompi/mca/btl/sctp/btl_sctp_recv_handler.c b/ompi/mca/btl/sctp/btl_sctp_recv_handler.c index 26ede3ed3a..04a8461a2c 100644 --- a/ompi/mca/btl/sctp/btl_sctp_recv_handler.c +++ b/ompi/mca/btl/sctp/btl_sctp_recv_handler.c @@ -18,7 +18,6 @@ #include "ompi_config.h" -#include "opal/opal_socket_errno.h" #ifdef HAVE_UNISTD_H #include #endif @@ -39,12 +38,8 @@ #include "ompi/constants.h" #include "opal/event/event.h" -#include "opal/util/if.h" -#include "opal/util/argv.h" -#include "ompi/mca/btl/btl.h" #include "opal/mca/base/mca_base_param.h" -#include "ompi/runtime/ompi_module_exchange.h" #include "ompi/mca/mpool/base/base.h" #include "ompi/mca/btl/base/btl_base_error.h" #include "btl_sctp.h" @@ -53,7 +48,6 @@ #include "btl_sctp_frag.h" #include "btl_sctp_endpoint.h" #include "ompi/mca/btl/base/base.h" -#include "ompi/datatype/convertor.h" #include #include "btl_sctp_recv_handler.h" diff --git a/ompi/mca/btl/self/btl_self.c b/ompi/mca/btl/self/btl_self.c index d702f22ef6..63e9493cc4 100644 --- a/ompi/mca/btl/self/btl_self.c +++ b/ompi/mca/btl/self/btl_self.c @@ -26,13 +26,8 @@ #include #include "opal/class/opal_bitmap.h" -#include "opal/threads/mutex.h" #include "ompi/datatype/convertor.h" -#include "ompi/datatype/datatype.h" #include "opal/sys/atomic.h" -#include "opal/util/if.h" -#include "opal/util/printf.h" -#include "ompi/class/ompi_free_list.h" #include "ompi/mca/btl/btl.h" #include "ompi/mca/mpool/base/base.h" #include "btl_self.h" diff --git a/ompi/mca/btl/self/btl_self_component.c b/ompi/mca/btl/self/btl_self_component.c index 56c1a41025..b637c7e348 100644 --- a/ompi/mca/btl/self/btl_self_component.c +++ b/ompi/mca/btl/self/btl_self_component.c @@ -29,8 +29,6 @@ #include "ompi/constants.h" #include "opal/sys/cache.h" #include "opal/event/event.h" -#include "opal/util/if.h" -#include "opal/util/argv.h" #include "opal/mca/base/mca_base_param.h" #include "btl_self.h" #include "btl_self_frag.h" diff --git a/ompi/mca/btl/sm/btl_sm.c b/ompi/mca/btl/sm/btl_sm.c index a9aa7f782d..bc136397c8 100644 --- a/ompi/mca/btl/sm/btl_sm.c +++ b/ompi/mca/btl/sm/btl_sm.c @@ -26,10 +26,8 @@ #include #include -#include "opal/threads/mutex.h" #include "opal/sys/atomic.h" #include "opal/class/opal_bitmap.h" -#include "opal/util/if.h" #include "opal/util/output.h" #include "opal/util/printf.h" #include "opal/mca/carto/carto.h" diff --git a/ompi/mca/btl/sm/btl_sm_component.c b/ompi/mca/btl/sm/btl_sm_component.c index d23925f098..f1cb4ddcd1 100644 --- a/ompi/mca/btl/sm/btl_sm_component.c +++ b/ompi/mca/btl/sm/btl_sm_component.c @@ -41,14 +41,11 @@ #include "ompi/constants.h" #include "opal/sys/cache.h" #include "opal/event/event.h" -#include "opal/util/if.h" #include "opal/util/output.h" -#include "opal/util/argv.h" #include "orte/util/proc_info.h" #include "orte/runtime/orte_globals.h" #include "opal/mca/base/mca_base_param.h" -#include "ompi/runtime/ompi_module_exchange.h" #include "ompi/mca/mpool/base/base.h" #include "ompi/mca/common/sm/common_sm_mmap.h" #include "ompi/mca/btl/base/btl_base_error.h" diff --git a/ompi/mca/btl/tcp/btl_tcp.c b/ompi/mca/btl/tcp/btl_tcp.c index 8aa2731e00..91bcee6f75 100644 --- a/ompi/mca/btl/tcp/btl_tcp.c +++ b/ompi/mca/btl/tcp/btl_tcp.c @@ -22,7 +22,6 @@ #include "ompi_config.h" #include #include "opal/class/opal_bitmap.h" -#include "opal/util/if.h" #include "ompi/mca/btl/btl.h" #include "btl_tcp.h" @@ -30,7 +29,6 @@ #include "btl_tcp_proc.h" #include "btl_tcp_endpoint.h" #include "ompi/datatype/convertor.h" -#include "ompi/datatype/datatype.h" #include "ompi/mca/mpool/base/base.h" #include "ompi/mca/mpool/mpool.h" #include "ompi/proc/proc.h" diff --git a/ompi/mca/btl/tcp/btl_tcp_component.c b/ompi/mca/btl/tcp/btl_tcp_component.c index b780a73293..f66836750a 100644 --- a/ompi/mca/btl/tcp/btl_tcp_component.c +++ b/ompi/mca/btl/tcp/btl_tcp_component.c @@ -63,7 +63,6 @@ #include "btl_tcp_frag.h" #include "btl_tcp_endpoint.h" #include "ompi/mca/btl/base/base.h" -#include "ompi/datatype/convertor.h" mca_btl_tcp_component_t mca_btl_tcp_component = { diff --git a/ompi/mca/btl/tcp/btl_tcp_endpoint.c b/ompi/mca/btl/tcp/btl_tcp_endpoint.c index 32f23bbd48..5ec47aba41 100644 --- a/ompi/mca/btl/tcp/btl_tcp_endpoint.c +++ b/ompi/mca/btl/tcp/btl_tcp_endpoint.c @@ -50,7 +50,6 @@ #include "ompi/types.h" #include "ompi/mca/btl/base/btl_base_error.h" -#include "opal/util/if.h" #include "opal/util/net.h" #include "btl_tcp.h" diff --git a/ompi/mca/btl/tcp/btl_tcp_endpoint.h b/ompi/mca/btl/tcp/btl_tcp_endpoint.h index a3f8c06f46..59a0eb4292 100644 --- a/ompi/mca/btl/tcp/btl_tcp_endpoint.h +++ b/ompi/mca/btl/tcp/btl_tcp_endpoint.h @@ -21,7 +21,6 @@ #include "opal/class/opal_list.h" #include "opal/event/event.h" -#include "ompi/mca/btl/btl.h" #include "btl_tcp_frag.h" #include "btl_tcp.h" #if defined(c_plusplus) || defined(__cplusplus) diff --git a/ompi/mca/btl/tcp/btl_tcp_ft.c b/ompi/mca/btl/tcp/btl_tcp_ft.c index a8276f3894..bb51db72e6 100644 --- a/ompi/mca/btl/tcp/btl_tcp_ft.c +++ b/ompi/mca/btl/tcp/btl_tcp_ft.c @@ -22,7 +22,6 @@ #include -#include "ompi/mca/btl/btl.h" #include "btl_tcp.h" #include "btl_tcp_frag.h" diff --git a/ompi/mca/btl/tcp/btl_tcp_hdr.h b/ompi/mca/btl/tcp/btl_tcp_hdr.h index 0d6d235408..c495c94b21 100644 --- a/ompi/mca/btl/tcp/btl_tcp_hdr.h +++ b/ompi/mca/btl/tcp/btl_tcp_hdr.h @@ -23,7 +23,6 @@ #include "ompi_config.h" #include "ompi/mca/btl/base/base.h" #include "btl_tcp.h" -#include "opal/types.h" BEGIN_C_DECLS diff --git a/ompi/mca/btl/template/btl_template.c b/ompi/mca/btl/template/btl_template.c index b47962bc6a..ec31778527 100644 --- a/ompi/mca/btl/template/btl_template.c +++ b/ompi/mca/btl/template/btl_template.c @@ -19,7 +19,6 @@ #include "ompi_config.h" #include #include "opal/class/opal_bitmap.h" -#include "opal/util/if.h" #include "ompi/mca/btl/btl.h" #include "btl_template.h" diff --git a/ompi/mca/btl/template/btl_template_component.c b/ompi/mca/btl/template/btl_template_component.c index 9cc6b7e7be..5ba2c20983 100644 --- a/ompi/mca/btl/template/btl_template_component.c +++ b/ompi/mca/btl/template/btl_template_component.c @@ -20,18 +20,14 @@ #include "ompi_config.h" #include "ompi/constants.h" #include "opal/event/event.h" -#include "opal/util/if.h" -#include "opal/util/argv.h" #include "ompi/mca/btl/btl.h" #include "opal/mca/base/mca_base_param.h" -#include "ompi/runtime/ompi_module_exchange.h" #include "ompi/mca/mpool/base/base.h" #include "btl_template.h" #include "btl_template_frag.h" #include "btl_template_endpoint.h" #include "ompi/mca/btl/base/base.h" -#include "ompi/datatype/convertor.h" mca_btl_template_component_t mca_btl_template_component = { { /* First, the mca_base_component_t struct containing meta information diff --git a/ompi/mca/btl/template/btl_template_endpoint.c b/ompi/mca/btl/template/btl_template_endpoint.c index 3a7004d450..7fe482de1c 100644 --- a/ompi/mca/btl/template/btl_template_endpoint.c +++ b/ompi/mca/btl/template/btl_template_endpoint.c @@ -21,7 +21,6 @@ #include #include #include "ompi/types.h" -#include "opal/dss/dss.h" #include "btl_template.h" #include "btl_template_endpoint.h" #include "btl_template_proc.h" diff --git a/ompi/mca/btl/template/btl_template_endpoint.h b/ompi/mca/btl/template/btl_template_endpoint.h index 46faa44fb3..04cb0d42f6 100644 --- a/ompi/mca/btl/template/btl_template_endpoint.h +++ b/ompi/mca/btl/template/btl_template_endpoint.h @@ -21,7 +21,6 @@ #include "opal/class/opal_list.h" #include "opal/event/event.h" -#include "ompi/mca/btl/btl.h" #include "btl_template_frag.h" #include "btl_template.h" #if defined(c_plusplus) || defined(__cplusplus) diff --git a/ompi/mca/btl/template/btl_template_proc.c b/ompi/mca/btl/template/btl_template_proc.c index aa100c5fc1..ae849c86f8 100644 --- a/ompi/mca/btl/template/btl_template_proc.c +++ b/ompi/mca/btl/template/btl_template_proc.c @@ -18,8 +18,6 @@ #include "ompi_config.h" -#include "opal/class/opal_hash_table.h" -#include "ompi/runtime/ompi_module_exchange.h" #include "btl_template.h" #include "btl_template_proc.h" diff --git a/ompi/mca/btl/udapl/btl_udapl.c b/ompi/mca/btl/udapl/btl_udapl.c index 6191b4648b..e7da5b9628 100644 --- a/ompi/mca/btl/udapl/btl_udapl.c +++ b/ompi/mca/btl/udapl/btl_udapl.c @@ -34,7 +34,6 @@ #include "btl_udapl_mca.h" #include "btl_udapl_proc.h" #include "ompi/datatype/convertor.h" -#include "ompi/datatype/datatype.h" #include "ompi/mca/mpool/base/base.h" #include "ompi/mca/mpool/rdma/mpool_rdma.h" #include "ompi/mca/btl/base/btl_base_error.h" diff --git a/ompi/mca/btl/udapl/btl_udapl_component.c b/ompi/mca/btl/udapl/btl_udapl_component.c index 8943832d65..54966bf0e7 100644 --- a/ompi/mca/btl/udapl/btl_udapl_component.c +++ b/ompi/mca/btl/udapl/btl_udapl_component.c @@ -26,10 +26,8 @@ #include "ompi_config.h" #include "ompi/constants.h" #include "opal/event/event.h" -#include "opal/util/if.h" #include "opal/util/argv.h" #include "ompi/mca/btl/btl.h" -#include "ompi/runtime/params.h" #include "opal/mca/base/mca_base_param.h" #include "ompi/mca/mpool/base/base.h" @@ -41,7 +39,6 @@ #include "btl_udapl_proc.h" #include "ompi/mca/btl/base/base.h" #include "ompi/mca/btl/base/btl_base_error.h" -#include "ompi/datatype/convertor.h" #include "btl_udapl_endpoint.h" #include "orte/util/proc_info.h" #include "ompi/runtime/ompi_module_exchange.h" diff --git a/ompi/mca/btl/udapl/btl_udapl_endpoint.h b/ompi/mca/btl/udapl/btl_udapl_endpoint.h index 2701c13a00..84e263e3e1 100644 --- a/ompi/mca/btl/udapl/btl_udapl_endpoint.h +++ b/ompi/mca/btl/udapl/btl_udapl_endpoint.h @@ -25,7 +25,6 @@ #include "opal/class/opal_list.h" #include "opal/event/event.h" -#include "ompi/mca/btl/btl.h" #include "ompi/mca/btl/base/btl_base_error.h" #include "btl_udapl_frag.h" #include "btl_udapl.h" diff --git a/ompi/mca/btl/udapl/btl_udapl_proc.c b/ompi/mca/btl/udapl/btl_udapl_proc.c index 9d295a9d85..946d2e9d64 100644 --- a/ompi/mca/btl/udapl/btl_udapl_proc.c +++ b/ompi/mca/btl/udapl/btl_udapl_proc.c @@ -21,7 +21,6 @@ #include "ompi_config.h" -#include "opal/class/opal_hash_table.h" #include "ompi/runtime/ompi_module_exchange.h" #include "opal/util/net.h" #include "btl_udapl.h" diff --git a/ompi/mca/coll/base/base.h b/ompi/mca/coll/base/base.h index 93fc42b538..33e762c617 100644 --- a/ompi/mca/coll/base/base.h +++ b/ompi/mca/coll/base/base.h @@ -35,7 +35,6 @@ #include "mpi.h" #include "opal/class/opal_list.h" -#include "ompi/mca/coll/coll.h" /* diff --git a/ompi/mca/coll/base/coll_base_close.c b/ompi/mca/coll/base/coll_base_close.c index f0dcd175eb..364563436a 100644 --- a/ompi/mca/coll/base/coll_base_close.c +++ b/ompi/mca/coll/base/coll_base_close.c @@ -23,7 +23,6 @@ #include "ompi/constants.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" diff --git a/ompi/mca/coll/base/coll_base_comm_select.c b/ompi/mca/coll/base/coll_base_comm_select.c index eff1f8bc65..ec34a8413d 100644 --- a/ompi/mca/coll/base/coll_base_comm_select.c +++ b/ompi/mca/coll/base/coll_base_comm_select.c @@ -28,7 +28,6 @@ #include "mpi.h" #include "ompi/communicator/communicator.h" -#include "opal/util/argv.h" #include "opal/util/output.h" #include "orte/util/show_help.h" #include "opal/class/opal_list.h" diff --git a/ompi/mca/coll/base/coll_base_comm_unselect.c b/ompi/mca/coll/base/coll_base_comm_unselect.c index 338ab67887..0077922b79 100644 --- a/ompi/mca/coll/base/coll_base_comm_unselect.c +++ b/ompi/mca/coll/base/coll_base_comm_unselect.c @@ -26,7 +26,6 @@ #include "ompi/communicator/communicator.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" #define CLOSE(comm, func) \ diff --git a/ompi/mca/coll/demo/coll_demo.h b/ompi/mca/coll/demo/coll_demo.h index f00aa5cc8c..0d333464bf 100644 --- a/ompi/mca/coll/demo/coll_demo.h +++ b/ompi/mca/coll/demo/coll_demo.h @@ -25,7 +25,6 @@ #include "mpi.h" #include "opal/mca/mca.h" #include "ompi/mca/coll/coll.h" -#include "ompi/request/request.h" BEGIN_C_DECLS diff --git a/ompi/mca/coll/hierarch/coll_hierarch.c b/ompi/mca/coll/hierarch/coll_hierarch.c index 0d2c40e19d..62cee12847 100644 --- a/ompi/mca/coll/hierarch/coll_hierarch.c +++ b/ompi/mca/coll/hierarch/coll_hierarch.c @@ -28,7 +28,6 @@ #include "ompi/communicator/communicator.h" #include "ompi/group/group.h" #include "ompi/proc/proc.h" -#include "ompi/op/op.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" diff --git a/ompi/mca/coll/hierarch/coll_hierarch_tmpcoll.c b/ompi/mca/coll/hierarch/coll_hierarch_tmpcoll.c index b007b8ee45..d880c23fbe 100644 --- a/ompi/mca/coll/hierarch/coll_hierarch_tmpcoll.c +++ b/ompi/mca/coll/hierarch/coll_hierarch_tmpcoll.c @@ -24,18 +24,13 @@ #include "mpi.h" #include "ompi/communicator/communicator.h" -#include "ompi/group/group.h" -#include "ompi/proc/proc.h" #include "ompi/op/op.h" -#include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" #include "ompi/mca/coll/base/coll_tags.h" -#include "ompi/mca/bml/bml.h" #include "ompi/mca/bml/base/base.h" #include "ompi/mca/pml/pml.h" -#include "ompi/mca/btl/btl.h" int mca_coll_hierarch_allreduce_tmp(void *sbuf, void *rbuf, int count, diff --git a/ompi/mca/coll/inter/coll_inter.c b/ompi/mca/coll/inter/coll_inter.c index e7c96aaef6..36505b8349 100644 --- a/ompi/mca/coll/inter/coll_inter.c +++ b/ompi/mca/coll/inter/coll_inter.c @@ -25,17 +25,12 @@ #include "mpi.h" #include "ompi/communicator/communicator.h" -#include "ompi/group/group.h" -#include "ompi/proc/proc.h" -#include "ompi/op/op.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" #include "ompi/mca/coll/base/coll_tags.h" -#include "ompi/mca/bml/bml.h" #include "ompi/mca/bml/base/base.h" -#include "ompi/mca/btl/btl.h" #if 0 diff --git a/ompi/mca/coll/inter/coll_inter.h b/ompi/mca/coll/inter/coll_inter.h index 6cb01f8d61..9135868655 100644 --- a/ompi/mca/coll/inter/coll_inter.h +++ b/ompi/mca/coll/inter/coll_inter.h @@ -27,7 +27,6 @@ #include "mpi.h" #include "opal/mca/mca.h" #include "ompi/mca/coll/coll.h" -#include "ompi/request/request.h" #include "ompi/communicator/communicator.h" BEGIN_C_DECLS diff --git a/ompi/mca/coll/sm/coll_sm_component.c b/ompi/mca/coll/sm/coll_sm_component.c index fd3820aaad..6de801a4fb 100644 --- a/ompi/mca/coll/sm/coll_sm_component.c +++ b/ompi/mca/coll/sm/coll_sm_component.c @@ -26,7 +26,6 @@ #include "ompi_config.h" #include "ompi/constants.h" -#include "ompi/communicator/communicator.h" #include "ompi/mca/coll/coll.h" #include "orte/util/show_help.h" #include "coll_sm.h" diff --git a/ompi/mca/coll/sm/coll_sm_module.c b/ompi/mca/coll/sm/coll_sm_module.c index 2a84f8eb37..b8eb83aefe 100644 --- a/ompi/mca/coll/sm/coll_sm_module.c +++ b/ompi/mca/coll/sm/coll_sm_module.c @@ -51,7 +51,6 @@ #include "ompi/communicator/communicator.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" -#include "ompi/mca/mpool/mpool.h" #include "ompi/mca/mpool/base/base.h" #include "ompi/proc/proc.h" #include "coll_sm.h" diff --git a/ompi/mca/coll/sm2/coll_sm2.h b/ompi/mca/coll/sm2/coll_sm2.h index c2a7c406f4..283f922d63 100644 --- a/ompi/mca/coll/sm2/coll_sm2.h +++ b/ompi/mca/coll/sm2/coll_sm2.h @@ -27,7 +27,6 @@ #include "opal/mca/mca.h" /*#include "orte/mca/ns/ns_types.h" */ #include "ompi/mca/coll/coll.h" -#include "ompi/mca/mpool/mpool.h" #include "ompi/mca/common/sm/common_sm_mmap.h" #include "ompi/request/request.h" diff --git a/ompi/mca/coll/sm2/coll_sm2_bcast.c b/ompi/mca/coll/sm2/coll_sm2_bcast.c index ad16b74d37..ea427ce8b9 100644 --- a/ompi/mca/coll/sm2/coll_sm2_bcast.c +++ b/ompi/mca/coll/sm2/coll_sm2_bcast.c @@ -12,7 +12,6 @@ #include "ompi/constants.h" #include "coll_sm2.h" -#include "ompi/op/op.h" #include "ompi/datatype/datatype.h" #include "ompi/communicator/communicator.h" /* debug diff --git a/ompi/mca/coll/sm2/coll_sm2_component.c b/ompi/mca/coll/sm2/coll_sm2_component.c index 3a3e9a3cd6..efc050cbb9 100644 --- a/ompi/mca/coll/sm2/coll_sm2_component.c +++ b/ompi/mca/coll/sm2/coll_sm2_component.c @@ -30,8 +30,6 @@ #include #include "ompi/constants.h" -#include "ompi/communicator/communicator.h" -#include "ompi/mca/coll/coll.h" #include "coll_sm2.h" #include "ompi/mca/coll/base/base.h" diff --git a/ompi/mca/coll/sm2/coll_sm2_module.c b/ompi/mca/coll/sm2/coll_sm2_module.c index af3e735259..158e9bbd31 100644 --- a/ompi/mca/coll/sm2/coll_sm2_module.c +++ b/ompi/mca/coll/sm2/coll_sm2_module.c @@ -32,7 +32,6 @@ #include "ompi/constants.h" #include "ompi/communicator/communicator.h" #include "ompi/mca/coll/coll.h" -#include "opal/util/show_help.h" #include "opal/util/output.h" #include "coll_sm2.h" #include "ompi/mca/coll/base/base.h" diff --git a/ompi/mca/coll/sm2/coll_sm2_service.c b/ompi/mca/coll/sm2/coll_sm2_service.c index f7bfdffbd0..33eaeb1e6a 100644 --- a/ompi/mca/coll/sm2/coll_sm2_service.c +++ b/ompi/mca/coll/sm2/coll_sm2_service.c @@ -29,8 +29,6 @@ #include #include "ompi/constants.h" -#include "ompi/communicator/communicator.h" -#include "ompi/mca/coll/coll.h" #include "coll_sm2.h" #include "ompi/mca/coll/base/base.h" diff --git a/ompi/mca/coll/sync/coll_sync_component.c b/ompi/mca/coll/sync/coll_sync_component.c index 381fe71551..0cc1143fb0 100644 --- a/ompi/mca/coll/sync/coll_sync_component.c +++ b/ompi/mca/coll/sync/coll_sync_component.c @@ -23,7 +23,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "ompi/mca/coll/coll.h" #include "coll_sync.h" /* diff --git a/ompi/mca/coll/tuned/coll_tuned_allgather.c b/ompi/mca/coll/tuned/coll_tuned_allgather.c index 5c2786668c..ee59e0a470 100644 --- a/ompi/mca/coll/tuned/coll_tuned_allgather.c +++ b/ompi/mca/coll/tuned/coll_tuned_allgather.c @@ -25,7 +25,6 @@ #include "ompi/communicator/communicator.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/coll_tags.h" -#include "ompi/op/op.h" #include "coll_tuned.h" #include "coll_tuned_topo.h" #include "coll_tuned_util.h" diff --git a/ompi/mca/coll/tuned/coll_tuned_allgatherv.c b/ompi/mca/coll/tuned/coll_tuned_allgatherv.c index 33eb516fe2..1d45db6761 100644 --- a/ompi/mca/coll/tuned/coll_tuned_allgatherv.c +++ b/ompi/mca/coll/tuned/coll_tuned_allgatherv.c @@ -25,7 +25,6 @@ #include "ompi/communicator/communicator.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/coll_tags.h" -#include "ompi/op/op.h" #include "coll_tuned.h" #include "coll_tuned_topo.h" #include "coll_tuned_util.h" diff --git a/ompi/mca/coll/tuned/coll_tuned_alltoall.c b/ompi/mca/coll/tuned/coll_tuned_alltoall.c index d1391c7bfe..a843c7ed24 100644 --- a/ompi/mca/coll/tuned/coll_tuned_alltoall.c +++ b/ompi/mca/coll/tuned/coll_tuned_alltoall.c @@ -25,7 +25,6 @@ #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/coll_tags.h" #include "ompi/mca/pml/pml.h" -#include "ompi/op/op.h" #include "coll_tuned.h" #include "coll_tuned_topo.h" #include "coll_tuned_util.h" diff --git a/ompi/mca/coll/tuned/coll_tuned_alltoallv.c b/ompi/mca/coll/tuned/coll_tuned_alltoallv.c index 2fa06c049f..f65c1c510f 100644 --- a/ompi/mca/coll/tuned/coll_tuned_alltoallv.c +++ b/ompi/mca/coll/tuned/coll_tuned_alltoallv.c @@ -26,7 +26,6 @@ #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/coll_tags.h" #include "ompi/mca/pml/pml.h" -#include "ompi/op/op.h" #include "coll_tuned.h" #include "coll_tuned_topo.h" #include "coll_tuned_util.h" diff --git a/ompi/mca/coll/tuned/coll_tuned_barrier.c b/ompi/mca/coll/tuned/coll_tuned_barrier.c index 317adec8f3..16a839229d 100644 --- a/ompi/mca/coll/tuned/coll_tuned_barrier.c +++ b/ompi/mca/coll/tuned/coll_tuned_barrier.c @@ -21,12 +21,10 @@ #include "mpi.h" #include "ompi/constants.h" -#include "ompi/datatype/datatype.h" #include "ompi/communicator/communicator.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/coll_tags.h" #include "ompi/mca/pml/pml.h" -#include "ompi/op/op.h" #include "coll_tuned.h" #include "coll_tuned_topo.h" #include "coll_tuned_util.h" diff --git a/ompi/mca/coll/tuned/coll_tuned_decision_dynamic.c b/ompi/mca/coll/tuned/coll_tuned_decision_dynamic.c index 6dd870a047..a45a01aed2 100644 --- a/ompi/mca/coll/tuned/coll_tuned_decision_dynamic.c +++ b/ompi/mca/coll/tuned/coll_tuned_decision_dynamic.c @@ -28,7 +28,6 @@ #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/coll_tags.h" #include "coll_tuned.h" -#include "opal/util/bit_ops.h" #include "coll_tuned.h" diff --git a/ompi/mca/coll/tuned/coll_tuned_decision_fixed.c b/ompi/mca/coll/tuned/coll_tuned_decision_fixed.c index 92d7ac5247..4b53c1c9d0 100644 --- a/ompi/mca/coll/tuned/coll_tuned_decision_fixed.c +++ b/ompi/mca/coll/tuned/coll_tuned_decision_fixed.c @@ -26,7 +26,6 @@ #include "ompi/mca/coll/base/coll_tags.h" #include "ompi/op/op.h" #include "coll_tuned.h" -#include "opal/util/bit_ops.h" /* diff --git a/ompi/mca/coll/tuned/coll_tuned_dynamic_file.c b/ompi/mca/coll/tuned/coll_tuned_dynamic_file.c index d1576e3a5d..079b6865e3 100644 --- a/ompi/mca/coll/tuned/coll_tuned_dynamic_file.c +++ b/ompi/mca/coll/tuned/coll_tuned_dynamic_file.c @@ -23,8 +23,6 @@ #include "mpi.h" #include "opal/mca/mca.h" -#include "ompi/mca/coll/coll.h" -#include "ompi/request/request.h" #include "coll_tuned.h" /* need to include our own topo prototypes so we can malloc data on the comm correctly */ diff --git a/ompi/mca/coll/tuned/coll_tuned_dynamic_rules.c b/ompi/mca/coll/tuned/coll_tuned_dynamic_rules.c index a5f0171106..91d71d9ff6 100644 --- a/ompi/mca/coll/tuned/coll_tuned_dynamic_rules.c +++ b/ompi/mca/coll/tuned/coll_tuned_dynamic_rules.c @@ -20,11 +20,7 @@ #include "mpi.h" #include "opal/mca/mca.h" -#include "ompi/mca/coll/coll.h" -#include "ompi/request/request.h" #include "ompi/constants.h" -#include "ompi/datatype/datatype.h" -#include "ompi/communicator/communicator.h" #include "coll_tuned.h" /* need to include our own topo prototypes so we can malloc data on the comm correctly */ diff --git a/ompi/mca/coll/tuned/coll_tuned_forced.c b/ompi/mca/coll/tuned/coll_tuned_forced.c index 87301d194b..b30947e6e5 100644 --- a/ompi/mca/coll/tuned/coll_tuned_forced.c +++ b/ompi/mca/coll/tuned/coll_tuned_forced.c @@ -20,11 +20,7 @@ #include "mpi.h" #include "opal/mca/mca.h" -#include "ompi/mca/coll/coll.h" -#include "ompi/request/request.h" #include "ompi/constants.h" -#include "ompi/datatype/datatype.h" -#include "ompi/communicator/communicator.h" #include "coll_tuned.h" /* need to include our own topo prototypes so we can malloc data on the comm correctly */ diff --git a/ompi/mca/coll/tuned/coll_tuned_gather.c b/ompi/mca/coll/tuned/coll_tuned_gather.c index 3b7cdf802c..ce81caa2e8 100644 --- a/ompi/mca/coll/tuned/coll_tuned_gather.c +++ b/ompi/mca/coll/tuned/coll_tuned_gather.c @@ -25,7 +25,6 @@ #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/coll_tags.h" #include "ompi/mca/pml/pml.h" -#include "ompi/op/op.h" #include "coll_tuned.h" #include "coll_tuned_topo.h" #include "coll_tuned_util.h" diff --git a/ompi/mca/coll/tuned/coll_tuned_scatter.c b/ompi/mca/coll/tuned/coll_tuned_scatter.c index 3c5c19245b..d2e16d7502 100644 --- a/ompi/mca/coll/tuned/coll_tuned_scatter.c +++ b/ompi/mca/coll/tuned/coll_tuned_scatter.c @@ -25,7 +25,6 @@ #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/coll_tags.h" #include "ompi/mca/pml/pml.h" -#include "ompi/op/op.h" #include "coll_tuned.h" #include "coll_tuned_topo.h" #include "coll_tuned_util.h" diff --git a/ompi/mca/coll/tuned/coll_tuned_topo.c b/ompi/mca/coll/tuned/coll_tuned_topo.c index 325054ee92..5485ee1320 100644 --- a/ompi/mca/coll/tuned/coll_tuned_topo.c +++ b/ompi/mca/coll/tuned/coll_tuned_topo.c @@ -20,9 +20,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "ompi/datatype/datatype.h" #include "ompi/communicator/communicator.h" -#include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/coll_tags.h" #include "coll_tuned.h" #include "coll_tuned_topo.h" diff --git a/ompi/mca/coll/tuned/coll_tuned_util.c b/ompi/mca/coll/tuned/coll_tuned_util.c index dd73cef6fb..e385657c82 100644 --- a/ompi/mca/coll/tuned/coll_tuned_util.c +++ b/ompi/mca/coll/tuned/coll_tuned_util.c @@ -23,7 +23,6 @@ #include "ompi/constants.h" #include "ompi/datatype/datatype.h" #include "ompi/communicator/communicator.h" -#include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/coll_tags.h" #include "ompi/mca/pml/pml.h" #include "coll_tuned_util.h" diff --git a/ompi/mca/coll/tuned/coll_tuned_util.h b/ompi/mca/coll/tuned/coll_tuned_util.h index c6df61c214..b1552d2f0e 100644 --- a/ompi/mca/coll/tuned/coll_tuned_util.h +++ b/ompi/mca/coll/tuned/coll_tuned_util.h @@ -24,7 +24,6 @@ #include "mpi.h" #include "opal/mca/mca.h" #include "ompi/datatype/datatype.h" -#include "ompi/mca/coll/coll.h" #include "ompi/request/request.h" #include "ompi/mca/pml/pml.h" diff --git a/ompi/mca/common/sm/common_sm_mmap.c b/ompi/mca/common/sm/common_sm_mmap.c index 2586686a5f..04bd46f4c9 100644 --- a/ompi/mca/common/sm/common_sm_mmap.c +++ b/ompi/mca/common/sm/common_sm_mmap.c @@ -45,10 +45,8 @@ #include "ompi/constants.h" #include "ompi/proc/proc.h" #include "common_sm_mmap.h" -#include "opal/util/basename.h" #include "opal/util/output.h" #include "opal/align.h" -#include "orte/mca/rml/rml_types.h" #include "orte/mca/rml/rml.h" #include "ompi/mca/dpm/dpm.h" diff --git a/ompi/mca/crcp/base/base.h b/ompi/mca/crcp/base/base.h index 7f274572cc..069a04dafd 100644 --- a/ompi/mca/crcp/base/base.h +++ b/ompi/mca/crcp/base/base.h @@ -21,7 +21,6 @@ #include "ompi_config.h" #include "ompi/constants.h" -#include "opal/dss/dss.h" #include "ompi/mca/crcp/crcp.h" diff --git a/ompi/mca/crcp/base/crcp_base_fns.c b/ompi/mca/crcp/base/crcp_base_fns.c index 269414d27c..0ae362deee 100644 --- a/ompi/mca/crcp/base/crcp_base_fns.c +++ b/ompi/mca/crcp/base/crcp_base_fns.c @@ -32,13 +32,11 @@ #include "opal/mca/base/mca_base_param.h" #include "opal/mca/crs/crs.h" #include "opal/mca/crs/base/base.h" -#include "opal/util/os_dirpath.h" #include "ompi/communicator/communicator.h" #include "ompi/proc/proc.h" #include "ompi/mca/crcp/crcp.h" #include "ompi/mca/crcp/base/base.h" -#include "ompi/mca/bml/bml.h" #include "ompi/mca/bml/base/base.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/pml/base/base.h" diff --git a/ompi/mca/crcp/bkmrk/crcp_bkmrk.h b/ompi/mca/crcp/bkmrk/crcp_bkmrk.h index 1e3b7e79de..b4845b26c1 100644 --- a/ompi/mca/crcp/bkmrk/crcp_bkmrk.h +++ b/ompi/mca/crcp/bkmrk/crcp_bkmrk.h @@ -28,10 +28,6 @@ #include "opal/mca/mca.h" #include "ompi/mca/crcp/crcp.h" -#include "ompi/communicator/communicator.h" -#include "opal/runtime/opal_cr.h" -#include "opal/threads/mutex.h" -#include "opal/threads/condition.h" #include MCA_timer_IMPLEMENTATION_HEADER diff --git a/ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.c b/ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.c index c394e668b7..8e304486e5 100644 --- a/ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.c +++ b/ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.c @@ -22,9 +22,7 @@ #endif /* HAVE_UNIST_H */ #include "opal/class/opal_bitmap.h" -#include "opal/runtime/opal_cr.h" #include "opal/event/event.h" -#include "opal/util/argv.h" #include "opal/util/opal_environ.h" #include "opal/mca/base/mca_base_param.h" #include "opal/mca/mca.h" diff --git a/ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.h b/ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.h index 2ce3ba30ff..ad1f5d2b1f 100644 --- a/ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.h +++ b/ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.h @@ -27,11 +27,7 @@ #include "ompi_config.h" #include "opal/mca/mca.h" -#include "opal/runtime/opal_cr.h" -#include "opal/threads/mutex.h" -#include "opal/threads/condition.h" -#include "ompi/communicator/communicator.h" #include "ompi/mca/crcp/crcp.h" #include "ompi/mca/crcp/bkmrk/crcp_bkmrk.h" diff --git a/ompi/mca/crcp/bkmrk/crcp_bkmrk_module.c b/ompi/mca/crcp/bkmrk/crcp_bkmrk_module.c index 8e695ebea8..c576093367 100644 --- a/ompi/mca/crcp/bkmrk/crcp_bkmrk_module.c +++ b/ompi/mca/crcp/bkmrk/crcp_bkmrk_module.c @@ -27,7 +27,6 @@ #include "opal/util/output.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/argv.h" #include "opal/util/opal_environ.h" #include "ompi/mca/crcp/crcp.h" diff --git a/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c b/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c index e5901ba006..e475ebe77a 100644 --- a/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c +++ b/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c @@ -22,9 +22,7 @@ #include "opal/event/event.h" #include "opal/util/output.h" -#include "opal/util/argv.h" #include "opal/util/opal_environ.h" -#include "opal/util/arch.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" diff --git a/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.h b/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.h index 239eed666e..b477ace49e 100644 --- a/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.h +++ b/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.h @@ -29,10 +29,6 @@ #include "opal/mca/mca.h" #include "ompi/mca/crcp/crcp.h" #include "ompi/communicator/communicator.h" -#include "opal/runtime/opal_cr.h" -#include "opal/threads/mutex.h" -#include "opal/threads/condition.h" -#include "ompi/class/ompi_free_list.h" #include "ompi/mca/crcp/bkmrk/crcp_bkmrk.h" diff --git a/ompi/mca/dpm/dpm.h b/ompi/mca/dpm/dpm.h index bc32fa947b..99cf05d309 100644 --- a/ompi/mca/dpm/dpm.h +++ b/ompi/mca/dpm/dpm.h @@ -30,7 +30,6 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/class/opal_object.h" #include "ompi/info/info.h" #include "ompi/communicator/communicator.h" diff --git a/ompi/mca/dpm/orte/dpm_orte.c b/ompi/mca/dpm/orte/dpm_orte.c index e6ba6c3aa2..78e9b7a301 100644 --- a/ompi/mca/dpm/orte/dpm_orte.c +++ b/ompi/mca/dpm/orte/dpm_orte.c @@ -39,7 +39,6 @@ #include "orte/mca/routed/routed.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" -#include "orte/runtime/orte_data_server.h" #include "orte/runtime/orte_wait.h" #include "ompi/communicator/communicator.h" @@ -47,7 +46,6 @@ #include "ompi/proc/proc.h" #include "ompi/mca/pml/pml.h" #include "ompi/info/info.h" -#include "ompi/runtime/ompi_module_exchange.h" #include "ompi/mca/dpm/base/base.h" #include "dpm_orte.h" diff --git a/ompi/mca/dpm/orte/dpm_orte.h b/ompi/mca/dpm/orte/dpm_orte.h index 71c70a3555..2badcdcb51 100644 --- a/ompi/mca/dpm/orte/dpm_orte.h +++ b/ompi/mca/dpm/orte/dpm_orte.h @@ -21,7 +21,6 @@ #include "ompi_config.h" -#include "orte/types.h" #include "ompi/mca/dpm/dpm.h" diff --git a/ompi/mca/io/base/io_base_delete.c b/ompi/mca/io/base/io_base_delete.c index eb84a329b0..a3c895d73b 100644 --- a/ompi/mca/io/base/io_base_delete.c +++ b/ompi/mca/io/base/io_base_delete.c @@ -24,7 +24,6 @@ #include #include "mpi.h" -#include "ompi/file/file.h" #include "opal/class/opal_list.h" #include "opal/util/argv.h" #include "opal/util/output.h" diff --git a/ompi/mca/io/base/io_base_open.c b/ompi/mca/io/base/io_base_open.c index 796c683799..8a5f58efb2 100644 --- a/ompi/mca/io/base/io_base_open.c +++ b/ompi/mca/io/base/io_base_open.c @@ -20,7 +20,6 @@ #include "ompi_config.h" #include -#include "ompi/class/ompi_free_list.h" #include "opal/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" diff --git a/ompi/mca/io/romio/src/io_romio_file_read.c b/ompi/mca/io/romio/src/io_romio_file_read.c index 24e144e6b2..5f35b9d8ba 100644 --- a/ompi/mca/io/romio/src/io_romio_file_read.c +++ b/ompi/mca/io/romio/src/io_romio_file_read.c @@ -19,7 +19,6 @@ #include "ompi_config.h" #include "mpi.h" #include "ompi/file/file.h" -#include "ompi/request/request.h" #include "io_romio.h" diff --git a/ompi/mca/io/romio/src/io_romio_file_write.c b/ompi/mca/io/romio/src/io_romio_file_write.c index 31e29d2737..bd5f5672ee 100644 --- a/ompi/mca/io/romio/src/io_romio_file_write.c +++ b/ompi/mca/io/romio/src/io_romio_file_write.c @@ -19,7 +19,6 @@ #include "ompi_config.h" #include "mpi.h" #include "ompi/file/file.h" -#include "ompi/request/request.h" #include "io_romio.h" diff --git a/ompi/mca/io/romio/src/io_romio_module.c b/ompi/mca/io/romio/src/io_romio_module.c index b0967f95c9..8a6221153a 100644 --- a/ompi/mca/io/romio/src/io_romio_module.c +++ b/ompi/mca/io/romio/src/io_romio_module.c @@ -20,7 +20,6 @@ #include "ompi_config.h" #include "mpi.h" -#include "opal/threads/mutex.h" #include "ompi/datatype/datatype.h" #include "ompi/mca/io/io.h" #include "io_romio.h" diff --git a/ompi/mca/io/romio/src/io_romio_request.c b/ompi/mca/io/romio/src/io_romio_request.c index 4c8db35ea1..50366b9be6 100644 --- a/ompi/mca/io/romio/src/io_romio_request.c +++ b/ompi/mca/io/romio/src/io_romio_request.c @@ -18,7 +18,6 @@ #include "ompi_config.h" #include "mpi.h" -#include "ompi/file/file.h" #include "ompi/request/request.h" #include "ompi/mca/io/base/io_base_request.h" #include "io_romio.h" diff --git a/ompi/mca/mpool/base/base.h b/ompi/mca/mpool/base/base.h index 89efdc5282..627c1d263b 100644 --- a/ompi/mca/mpool/base/base.h +++ b/ompi/mca/mpool/base/base.h @@ -25,10 +25,8 @@ #include "ompi_config.h" #include "opal/class/opal_list.h" -#include "ompi/class/ompi_rb_tree.h" #include "opal/mca/mca.h" #include "ompi/mca/mpool/mpool.h" -#include "opal/threads/mutex.h" BEGIN_C_DECLS diff --git a/ompi/mca/mpool/base/mpool_base_alloc.c b/ompi/mca/mpool/base/mpool_base_alloc.c index d0805c8627..eb813e2882 100644 --- a/ompi/mca/mpool/base/mpool_base_alloc.c +++ b/ompi/mca/mpool/base/mpool_base_alloc.c @@ -27,7 +27,6 @@ #include "ompi/mca/mpool/mpool.h" #include "base.h" #include "mpool_base_tree.h" -#include "opal/threads/mutex.h" #include "mpool_base_mem_cb.h" /** diff --git a/ompi/mca/mpool/base/mpool_base_close.c b/ompi/mca/mpool/base/mpool_base_close.c index d35e9ec228..a87d1098f0 100644 --- a/ompi/mca/mpool/base/mpool_base_close.c +++ b/ompi/mca/mpool/base/mpool_base_close.c @@ -23,10 +23,8 @@ #include #include "ompi/constants.h" -#include "opal/class/opal_pointer_array.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "ompi/mca/mpool/mpool.h" #include "ompi/mca/mpool/base/base.h" #include "mpool_base_mem_cb.h" diff --git a/ompi/mca/mpool/base/mpool_base_init.c b/ompi/mca/mpool/base/mpool_base_init.c index c5c1fd5dd9..19b4a9dd92 100644 --- a/ompi/mca/mpool/base/mpool_base_init.c +++ b/ompi/mca/mpool/base/mpool_base_init.c @@ -20,11 +20,7 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "ompi/mca/mpool/mpool.h" #include "ompi/mca/mpool/base/base.h" -#include "ompi/class/ompi_rb_tree.h" -#include "ompi/class/ompi_free_list.h" -#include "opal/threads/mutex.h" OBJ_CLASS_INSTANCE(mca_mpool_base_selected_module_t, opal_list_item_t, NULL, NULL); static bool mca_mpool_enable_progress_threads = true; diff --git a/ompi/mca/mpool/base/mpool_base_lookup.c b/ompi/mca/mpool/base/mpool_base_lookup.c index 3e23409149..fe7962d8fe 100644 --- a/ompi/mca/mpool/base/mpool_base_lookup.c +++ b/ompi/mca/mpool/base/mpool_base_lookup.c @@ -30,7 +30,6 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" #include "orte/util/show_help.h" #include "orte/util/name_fns.h" #include "orte/util/proc_info.h" diff --git a/ompi/mca/mpool/base/mpool_base_mem_cb.c b/ompi/mca/mpool/base/mpool_base_mem_cb.c index 15a09203e1..5c52aee8a2 100644 --- a/ompi/mca/mpool/base/mpool_base_mem_cb.c +++ b/ompi/mca/mpool/base/mpool_base_mem_cb.c @@ -26,9 +26,7 @@ #include #endif -#include "opal/class/opal_pointer_array.h" -#include "orte/types.h" #include "orte/util/show_help.h" #include "orte/util/proc_info.h" diff --git a/ompi/mca/mpool/base/mpool_base_mem_cb.h b/ompi/mca/mpool/base/mpool_base_mem_cb.h index c4e5fe2a53..3ec51c037b 100644 --- a/ompi/mca/mpool/base/mpool_base_mem_cb.h +++ b/ompi/mca/mpool/base/mpool_base_mem_cb.h @@ -23,11 +23,7 @@ #include "ompi_config.h" -#include "opal/class/opal_list.h" -#include "ompi/class/ompi_rb_tree.h" #include "opal/mca/mca.h" -#include "ompi/mca/mpool/mpool.h" -#include "opal/threads/mutex.h" #include "opal/memoryhooks/memory.h" #if defined(c_plusplus) || defined(__cplusplus) diff --git a/ompi/mca/mpool/base/mpool_base_open.c b/ompi/mca/mpool/base/mpool_base_open.c index 73b89c04f1..7f9c5fda94 100644 --- a/ompi/mca/mpool/base/mpool_base_open.c +++ b/ompi/mca/mpool/base/mpool_base_open.c @@ -31,7 +31,6 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/memoryhooks/memory.h" -#include "ompi/mca/mpool/mpool.h" #include "ompi/mca/mpool/base/base.h" #include "ompi/constants.h" diff --git a/ompi/mca/mpool/base/mpool_base_tree.h b/ompi/mca/mpool/base/mpool_base_tree.h index e343fba520..e7b15fb7b1 100644 --- a/ompi/mca/mpool/base/mpool_base_tree.h +++ b/ompi/mca/mpool/base/mpool_base_tree.h @@ -25,7 +25,6 @@ #define MCA_MPOOL_BASE_TREE_MAX 8 #include "opal/mca/mca.h" #include "ompi/class/ompi_free_list.h" -#include "ompi/class/ompi_rb_tree.h" #include "ompi/mca/mpool/mpool.h" BEGIN_C_DECLS diff --git a/ompi/mca/mpool/fake/mpool_fake_module.c b/ompi/mca/mpool/fake/mpool_fake_module.c index c7ea430765..68c8351a0d 100644 --- a/ompi/mca/mpool/fake/mpool_fake_module.c +++ b/ompi/mca/mpool/fake/mpool_fake_module.c @@ -21,14 +21,10 @@ #define OMPI_DISABLE_ENABLE_MEM_DEBUG 1 #include "ompi_config.h" -#include "opal/align.h" -#include "orte/util/name_fns.h" -#include "orte/runtime/orte_globals.h" #include "mpool_fake.h" #include #include #include "ompi/mca/mpool/base/base.h" -#include "ompi/runtime/params.h" /* * Initializes the mpool module. diff --git a/ompi/mca/mpool/sm/mpool_sm.h b/ompi/mca/mpool/sm/mpool_sm.h index ebd60e81d1..b25ee8344c 100644 --- a/ompi/mca/mpool/sm/mpool_sm.h +++ b/ompi/mca/mpool/sm/mpool_sm.h @@ -23,8 +23,6 @@ #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" #include "ompi/mca/mpool/mpool.h" #include "ompi/mca/allocator/allocator.h" diff --git a/ompi/mca/mpool/sm/mpool_sm_module.c b/ompi/mca/mpool/sm/mpool_sm_module.c index 83a877aa30..d029df44bc 100644 --- a/ompi/mca/mpool/sm/mpool_sm_module.c +++ b/ompi/mca/mpool/sm/mpool_sm_module.c @@ -23,7 +23,6 @@ #ifdef HAVE_UNISTD_H #include #endif -#include "opal/align.h" #include "opal/mca/maffinity/maffinity.h" #include "opal/mca/maffinity/maffinity_types.h" #include "opal/mca/maffinity/base/base.h" diff --git a/ompi/mca/mtl/base/mtl_base_datatype.h b/ompi/mca/mtl/base/mtl_base_datatype.h index c6c1b03e48..9e475ce628 100644 --- a/ompi/mca/mtl/base/mtl_base_datatype.h +++ b/ompi/mca/mtl/base/mtl_base_datatype.h @@ -23,8 +23,6 @@ #include "ompi/mca/mtl/base/base.h" #include "ompi/constants.h" #include "ompi/datatype/convertor.h" -#include "ompi/datatype/datatype.h" -#include "ompi/datatype/datatype_internal.h" static inline int ompi_mtl_datatype_pack(struct ompi_convertor_t *convertor, diff --git a/ompi/mca/mtl/mtl.h b/ompi/mca/mtl/mtl.h index d12ec554bd..eacfefe165 100644 --- a/ompi/mca/mtl/mtl.h +++ b/ompi/mca/mtl/mtl.h @@ -34,7 +34,6 @@ #include "ompi_config.h" #include "mpi.h" /* needed for MPI_ANY_TAG */ -#include "opal/class/opal_list.h" #include "opal/mca/mca.h" #include "ompi/mca/pml/pml.h" /* for send_mode enum */ diff --git a/ompi/mca/mtl/mx/mtl_mx.c b/ompi/mca/mtl/mx/mtl_mx.c index b7331ed583..555f87d017 100644 --- a/ompi/mca/mtl/mx/mtl_mx.c +++ b/ompi/mca/mtl/mx/mtl_mx.c @@ -21,8 +21,6 @@ #include "opal/prefetch.h" #include "ompi/mca/mtl/mtl.h" -#include "ompi/communicator/communicator.h" -#include "opal/class/opal_list.h" #include "ompi/runtime/ompi_module_exchange.h" #include "ompi/mca/mtl/base/mtl_base_datatype.h" #include "ompi/mca/common/mx/common_mx.h" diff --git a/ompi/mca/mtl/mx/mtl_mx.h b/ompi/mca/mtl/mx/mtl_mx.h index affbcc283a..bdb83ca6b0 100644 --- a/ompi/mca/mtl/mx/mtl_mx.h +++ b/ompi/mca/mtl/mx/mtl_mx.h @@ -19,12 +19,8 @@ #ifndef MTL_MX_H_HAS_BEEN_INCLUDED #define MTL_MX_H_HAS_BEEN_INCLUDED -#include "ompi/class/ompi_free_list.h" -#include "opal/util/cmd_line.h" -#include "ompi/request/request.h" #include "ompi/mca/mtl/mtl.h" #include "ompi/mca/mtl/base/base.h" -#include "ompi/datatype/datatype.h" #include "ompi/datatype/convertor.h" diff --git a/ompi/mca/mtl/mx/mtl_mx_cancel.c b/ompi/mca/mtl/mx/mtl_mx_cancel.c index 4e4e5be3a6..edfc2ca476 100644 --- a/ompi/mca/mtl/mx/mtl_mx_cancel.c +++ b/ompi/mca/mtl/mx/mtl_mx_cancel.c @@ -18,7 +18,6 @@ #include "ompi_config.h" -#include "ompi/request/request.h" #include "mtl_mx.h" #include "mtl_mx_types.h" diff --git a/ompi/mca/mtl/mx/mtl_mx_component.c b/ompi/mca/mtl/mx/mtl_mx_component.c index c9e210d32b..ca66f5001e 100644 --- a/ompi/mca/mtl/mx/mtl_mx_component.c +++ b/ompi/mca/mtl/mx/mtl_mx_component.c @@ -20,7 +20,6 @@ #include "opal/event/event.h" #include "opal/mca/base/mca_base_param.h" -#include "ompi/datatype/convertor.h" #include "ompi/mca/mtl/base/base.h" #include "ompi/mca/common/mx/common_mx.h" diff --git a/ompi/mca/mtl/mx/mtl_mx_probe.c b/ompi/mca/mtl/mx/mtl_mx_probe.c index 9fe6800246..27e33141a7 100644 --- a/ompi/mca/mtl/mx/mtl_mx_probe.c +++ b/ompi/mca/mtl/mx/mtl_mx_probe.c @@ -19,7 +19,6 @@ #include "ompi_config.h" -#include "ompi/request/request.h" #include "ompi/communicator/communicator.h" #include "ompi/mca/mtl/base/base.h" diff --git a/ompi/mca/mtl/mx/mtl_mx_recv.c b/ompi/mca/mtl/mx/mtl_mx_recv.c index 99a1ec3368..7014cf3a8a 100644 --- a/ompi/mca/mtl/mx/mtl_mx_recv.c +++ b/ompi/mca/mtl/mx/mtl_mx_recv.c @@ -18,8 +18,6 @@ #include "ompi_config.h" -#include "ompi/request/request.h" -#include "ompi/datatype/datatype.h" #include "ompi/communicator/communicator.h" #include "ompi/datatype/convertor.h" #include "ompi/mca/mtl/base/mtl_base_datatype.h" diff --git a/ompi/mca/mtl/mx/mtl_mx_send.c b/ompi/mca/mtl/mx/mtl_mx_send.c index 80a6a42005..ad9c9e74bf 100644 --- a/ompi/mca/mtl/mx/mtl_mx_send.c +++ b/ompi/mca/mtl/mx/mtl_mx_send.c @@ -20,7 +20,6 @@ #include "opal/prefetch.h" -#include "ompi/datatype/datatype.h" #include "ompi/communicator/communicator.h" #include "ompi/datatype/convertor.h" diff --git a/ompi/mca/mtl/mx/mtl_mx_types.h b/ompi/mca/mtl/mx/mtl_mx_types.h index 056afc73c4..6f3537e1b1 100644 --- a/ompi/mca/mtl/mx/mtl_mx_types.h +++ b/ompi/mca/mtl/mx/mtl_mx_types.h @@ -22,11 +22,8 @@ #include "ompi_config.h" #include "mtl_mx.h" -#include "ompi/request/request.h" #include "ompi/mca/mtl/mtl.h" #include "ompi/mca/mtl/base/base.h" -#include "ompi/datatype/datatype.h" -#include "ompi/datatype/convertor.h" #include "mtl_mx_endpoint.h" #include "myriexpress.h" diff --git a/ompi/mca/mtl/portals/mtl_portals.c b/ompi/mca/mtl/portals/mtl_portals.c index 33b1c85411..16bc40ff10 100644 --- a/ompi/mca/mtl/portals/mtl_portals.c +++ b/ompi/mca/mtl/portals/mtl_portals.c @@ -19,7 +19,6 @@ #include "ompi_config.h" #include "ompi/mca/mtl/mtl.h" -#include "ompi/communicator/communicator.h" #include "opal/class/opal_list.h" #include "mtl_portals.h" diff --git a/ompi/mca/mtl/portals/mtl_portals.h b/ompi/mca/mtl/portals/mtl_portals.h index 5d3b99d069..e7adc285ed 100644 --- a/ompi/mca/mtl/portals/mtl_portals.h +++ b/ompi/mca/mtl/portals/mtl_portals.h @@ -20,15 +20,10 @@ #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" #include "ompi/class/ompi_free_list.h" -#include "opal/util/cmd_line.h" -#include "ompi/request/request.h" #include "ompi/mca/mtl/mtl.h" #include "ompi/mca/mtl/base/base.h" -#include "ompi/datatype/datatype.h" #include "ompi/datatype/convertor.h" #include "ompi/mca/common/portals/common_portals.h" diff --git a/ompi/mca/mtl/portals/mtl_portals_component.c b/ompi/mca/mtl/portals/mtl_portals_component.c index 9e380b65e5..fa99e0cec8 100644 --- a/ompi/mca/mtl/portals/mtl_portals_component.c +++ b/ompi/mca/mtl/portals/mtl_portals_component.c @@ -21,7 +21,6 @@ #include "opal/event/event.h" #include "opal/util/output.h" #include "opal/mca/base/mca_base_param.h" -#include "ompi/datatype/convertor.h" #include "ompi/mca/common/portals/common_portals.h" #include "mtl_portals.h" diff --git a/ompi/mca/mtl/portals/mtl_portals_probe.c b/ompi/mca/mtl/portals/mtl_portals_probe.c index 1f1f27e87b..ef68970d51 100644 --- a/ompi/mca/mtl/portals/mtl_portals_probe.c +++ b/ompi/mca/mtl/portals/mtl_portals_probe.c @@ -18,7 +18,6 @@ #include "ompi_config.h" #include "ompi/communicator/communicator.h" -#include "ompi/request/request.h" #include "mtl_portals.h" #include "mtl_portals_request.h" #include "mtl_portals_recv.h" diff --git a/ompi/mca/mtl/portals/mtl_portals_recv.c b/ompi/mca/mtl/portals/mtl_portals_recv.c index c8fd82b370..66658c8681 100644 --- a/ompi/mca/mtl/portals/mtl_portals_recv.c +++ b/ompi/mca/mtl/portals/mtl_portals_recv.c @@ -20,8 +20,6 @@ #include "ompi_config.h" #include "opal/class/opal_list.h" -#include "ompi/request/request.h" -#include "ompi/datatype/datatype.h" #include "ompi/communicator/communicator.h" #include "ompi/datatype/convertor.h" #include "ompi/mca/mtl/base/base.h" diff --git a/ompi/mca/mtl/portals/mtl_portals_send.c b/ompi/mca/mtl/portals/mtl_portals_send.c index 87021ff815..89570d79fb 100644 --- a/ompi/mca/mtl/portals/mtl_portals_send.c +++ b/ompi/mca/mtl/portals/mtl_portals_send.c @@ -18,7 +18,6 @@ #include "ompi_config.h" -#include "ompi/datatype/datatype.h" #include "ompi/communicator/communicator.h" #include "ompi/datatype/convertor.h" #include "ompi/mca/mtl/base/base.h" diff --git a/ompi/mca/mtl/psm/mtl_psm.c b/ompi/mca/mtl/psm/mtl_psm.c index 69b86474c1..bfbd612688 100644 --- a/ompi/mca/mtl/psm/mtl_psm.c +++ b/ompi/mca/mtl/psm/mtl_psm.c @@ -20,8 +20,6 @@ #include "ompi_config.h" #include "ompi/mca/mtl/mtl.h" -#include "ompi/communicator/communicator.h" -#include "opal/class/opal_list.h" #include "ompi/runtime/ompi_module_exchange.h" #include "ompi/mca/mtl/base/mtl_base_datatype.h" #include "ompi/proc/proc.h" diff --git a/ompi/mca/mtl/psm/mtl_psm.h b/ompi/mca/mtl/psm/mtl_psm.h index a415823c4b..eec15aef1d 100644 --- a/ompi/mca/mtl/psm/mtl_psm.h +++ b/ompi/mca/mtl/psm/mtl_psm.h @@ -20,15 +20,9 @@ #ifndef MTL_PSM_H_HAS_BEEN_INCLUDED #define MTL_PSM_H_HAS_BEEN_INCLUDED -#include "opal/threads/threads.h" -#include "opal/threads/condition.h" -#include "ompi/class/ompi_free_list.h" -#include "opal/util/cmd_line.h" -#include "ompi/request/request.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/mtl/mtl.h" #include "ompi/mca/mtl/base/base.h" -#include "ompi/datatype/datatype.h" #include "ompi/datatype/convertor.h" #include #include diff --git a/ompi/mca/mtl/psm/mtl_psm_cancel.c b/ompi/mca/mtl/psm/mtl_psm_cancel.c index 3ab79466d2..6da3386a6d 100644 --- a/ompi/mca/mtl/psm/mtl_psm_cancel.c +++ b/ompi/mca/mtl/psm/mtl_psm_cancel.c @@ -18,7 +18,6 @@ */ #include "ompi_config.h" -#include "ompi/request/request.h" #include "mtl_psm.h" #include "mtl_psm_request.h" diff --git a/ompi/mca/mtl/psm/mtl_psm_component.c b/ompi/mca/mtl/psm/mtl_psm_component.c index 0d889176b6..348e069d88 100644 --- a/ompi/mca/mtl/psm/mtl_psm_component.c +++ b/ompi/mca/mtl/psm/mtl_psm_component.c @@ -22,7 +22,6 @@ #include "opal/event/event.h" #include "opal/util/output.h" #include "opal/mca/base/mca_base_param.h" -#include "ompi/datatype/convertor.h" #include "mtl_psm.h" #include "mtl_psm_types.h" diff --git a/ompi/mca/mtl/psm/mtl_psm_endpoint.c b/ompi/mca/mtl/psm/mtl_psm_endpoint.c index eededdbc2b..a58c90d68d 100644 --- a/ompi/mca/mtl/psm/mtl_psm_endpoint.c +++ b/ompi/mca/mtl/psm/mtl_psm_endpoint.c @@ -25,7 +25,6 @@ #include "mtl_psm.h" #include "mtl_psm_types.h" #include "mtl_psm_endpoint.h" -#include "ompi/runtime/ompi_module_exchange.h" /* * Initialize state of the endpoint instance. diff --git a/ompi/mca/mtl/psm/mtl_psm_endpoint.h b/ompi/mca/mtl/psm/mtl_psm_endpoint.h index b18ee44b17..8525242454 100644 --- a/ompi/mca/mtl/psm/mtl_psm_endpoint.h +++ b/ompi/mca/mtl/psm/mtl_psm_endpoint.h @@ -22,7 +22,6 @@ #include "opal/class/opal_list.h" #include "opal/event/event.h" -#include "ompi/proc/proc.h" #include "ompi/mca/mtl/mtl.h" #include "mtl_psm.h" diff --git a/ompi/mca/mtl/psm/mtl_psm_probe.c b/ompi/mca/mtl/psm/mtl_psm_probe.c index 9e5dfb2d5e..7c1ff66b91 100644 --- a/ompi/mca/mtl/psm/mtl_psm_probe.c +++ b/ompi/mca/mtl/psm/mtl_psm_probe.c @@ -20,7 +20,6 @@ */ #include "ompi_config.h" -#include "ompi/request/request.h" #include "mtl_psm.h" #include "mtl_psm_types.h" #include "psm.h" diff --git a/ompi/mca/mtl/psm/mtl_psm_recv.c b/ompi/mca/mtl/psm/mtl_psm_recv.c index aaad4566c8..d05b8de2fc 100644 --- a/ompi/mca/mtl/psm/mtl_psm_recv.c +++ b/ompi/mca/mtl/psm/mtl_psm_recv.c @@ -19,8 +19,6 @@ #include "ompi_config.h" -#include "ompi/request/request.h" -#include "ompi/datatype/datatype.h" #include "ompi/communicator/communicator.h" #include "ompi/datatype/convertor.h" #include "ompi/mca/mtl/base/mtl_base_datatype.h" diff --git a/ompi/mca/mtl/psm/mtl_psm_send.c b/ompi/mca/mtl/psm/mtl_psm_send.c index 4bf8428a3e..7c80eeda52 100644 --- a/ompi/mca/mtl/psm/mtl_psm_send.c +++ b/ompi/mca/mtl/psm/mtl_psm_send.c @@ -19,7 +19,6 @@ #include "ompi_config.h" #include "ompi/mca/pml/pml.h" -#include "ompi/datatype/datatype.h" #include "ompi/communicator/communicator.h" #include "ompi/datatype/convertor.h" diff --git a/ompi/mca/mtl/psm/mtl_psm_types.h b/ompi/mca/mtl/psm/mtl_psm_types.h index 20c95fd8d9..25ab0b9201 100644 --- a/ompi/mca/mtl/psm/mtl_psm_types.h +++ b/ompi/mca/mtl/psm/mtl_psm_types.h @@ -23,15 +23,8 @@ #include "ompi_config.h" #include "mtl_psm.h" -#include "opal/threads/threads.h" -#include "opal/threads/condition.h" -#include "ompi/class/ompi_free_list.h" -#include "opal/util/cmd_line.h" -#include "ompi/request/request.h" #include "ompi/mca/mtl/mtl.h" #include "ompi/mca/mtl/base/base.h" -#include "ompi/datatype/datatype.h" -#include "ompi/datatype/convertor.h" #include "mtl_psm_endpoint.h" #include "psm.h" diff --git a/ompi/mca/op/base/op_base_find_available.c b/ompi/mca/op/base/op_base_find_available.c index 8bedc01c92..bc85da42ae 100644 --- a/ompi/mca/op/base/op_base_find_available.c +++ b/ompi/mca/op/base/op_base_find_available.c @@ -33,7 +33,6 @@ #include "ompi/constants.h" -#include "ompi/op/op.h" #include "ompi/mca/op/op.h" #include "ompi/mca/op/base/base.h" diff --git a/ompi/mca/op/base/op_base_op_select.c b/ompi/mca/op/base/op_base_op_select.c index 8e9f477822..7b2a93e019 100644 --- a/ompi/mca/op/base/op_base_op_select.c +++ b/ompi/mca/op/base/op_base_op_select.c @@ -30,7 +30,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/util/argv.h" #include "opal/util/output.h" #include "opal/class/opal_list.h" #include "opal/class/opal_object.h" diff --git a/ompi/mca/osc/base/base.h b/ompi/mca/osc/base/base.h index d88d211c31..a9f358923d 100644 --- a/ompi/mca/osc/base/base.h +++ b/ompi/mca/osc/base/base.h @@ -20,7 +20,6 @@ #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" #include "ompi/win/win.h" diff --git a/ompi/mca/osc/base/osc_base_init.c b/ompi/mca/osc/base/osc_base_init.c index 956bd0f152..b373a884c2 100644 --- a/ompi/mca/osc/base/osc_base_init.c +++ b/ompi/mca/osc/base/osc_base_init.c @@ -22,7 +22,6 @@ #include "opal/mca/base/mca_base_param.h" #include "ompi/mca/osc/osc.h" #include "ompi/mca/osc/base/base.h" -#include "ompi/datatype/datatype.h" #include "ompi/info/info.h" #include "ompi/communicator/communicator.h" #include "ompi/win/win.h" diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt.h b/ompi/mca/osc/pt2pt/osc_pt2pt.h index 44e9662e7b..3bf07890cb 100644 --- a/ompi/mca/osc/pt2pt/osc_pt2pt.h +++ b/ompi/mca/osc/pt2pt/osc_pt2pt.h @@ -26,7 +26,6 @@ #include "ompi/win/win.h" #include "ompi/communicator/communicator.h" -#include "ompi/request/request.h" #include "ompi/mca/osc/osc.h" BEGIN_C_DECLS diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_component.c b/ompi/mca/osc/pt2pt/osc_pt2pt_component.c index 48a60032e9..bebabb848f 100644 --- a/ompi/mca/osc/pt2pt/osc_pt2pt_component.c +++ b/ompi/mca/osc/pt2pt/osc_pt2pt_component.c @@ -31,7 +31,6 @@ #include "osc_pt2pt_buffer.h" #include "opal/threads/mutex.h" -#include "opal/util/arch.h" #include "ompi/info/info.h" #include "ompi/communicator/communicator.h" diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_replyreq.h b/ompi/mca/osc/pt2pt/osc_pt2pt_replyreq.h index d38440b5fd..f20b0332bf 100644 --- a/ompi/mca/osc/pt2pt/osc_pt2pt_replyreq.h +++ b/ompi/mca/osc/pt2pt/osc_pt2pt_replyreq.h @@ -22,12 +22,10 @@ #include "opal/types.h" #include "opal/class/opal_list.h" -#include "opal/threads/mutex.h" #include "ompi/datatype/datatype.h" #include "ompi/datatype/convertor.h" #include "ompi/communicator/communicator.h" #include "ompi/proc/proc.h" -#include "ompi/op/op.h" #include "ompi/memchecker.h" diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_sendreq.h b/ompi/mca/osc/pt2pt/osc_pt2pt_sendreq.h index 620da6fa1d..95c1e7ac69 100644 --- a/ompi/mca/osc/pt2pt/osc_pt2pt_sendreq.h +++ b/ompi/mca/osc/pt2pt/osc_pt2pt_sendreq.h @@ -21,12 +21,10 @@ #include "osc_pt2pt_longreq.h" #include "opal/class/opal_list.h" -#include "opal/threads/mutex.h" #include "ompi/datatype/datatype.h" #include "ompi/datatype/convertor.h" #include "ompi/communicator/communicator.h" #include "ompi/proc/proc.h" -#include "ompi/op/op.h" #include "ompi/memchecker.h" typedef enum { diff --git a/ompi/mca/osc/rdma/osc_rdma_longreq.c b/ompi/mca/osc/rdma/osc_rdma_longreq.c index fc59ef8ac0..2d183e7c2c 100644 --- a/ompi/mca/osc/rdma/osc_rdma_longreq.c +++ b/ompi/mca/osc/rdma/osc_rdma_longreq.c @@ -18,7 +18,6 @@ #include "osc_rdma_longreq.h" -#include "opal/class/opal_list.h" OBJ_CLASS_INSTANCE(ompi_osc_rdma_longreq_t, opal_free_list_item_t, diff --git a/ompi/mca/osc/rdma/osc_rdma_longreq.h b/ompi/mca/osc/rdma/osc_rdma_longreq.h index d1822f97e4..970fe37c88 100644 --- a/ompi/mca/osc/rdma/osc_rdma_longreq.h +++ b/ompi/mca/osc/rdma/osc_rdma_longreq.h @@ -21,7 +21,6 @@ #include "osc_rdma.h" -#include "opal/class/opal_list.h" #include "opal/class/opal_free_list.h" #include "ompi/datatype/datatype.h" #include "ompi/request/request.h" diff --git a/ompi/mca/osc/rdma/osc_rdma_replyreq.h b/ompi/mca/osc/rdma/osc_rdma_replyreq.h index 6ebfdbe40f..4ab54b3f20 100644 --- a/ompi/mca/osc/rdma/osc_rdma_replyreq.h +++ b/ompi/mca/osc/rdma/osc_rdma_replyreq.h @@ -23,12 +23,10 @@ #include "osc_rdma_longreq.h" #include "opal/class/opal_list.h" -#include "opal/threads/mutex.h" #include "ompi/datatype/datatype.h" #include "ompi/datatype/convertor.h" #include "ompi/communicator/communicator.h" #include "ompi/proc/proc.h" -#include "ompi/op/op.h" #include "ompi/memchecker.h" diff --git a/ompi/mca/osc/rdma/osc_rdma_sendreq.h b/ompi/mca/osc/rdma/osc_rdma_sendreq.h index 5f0dae1ced..a216ccc3c1 100644 --- a/ompi/mca/osc/rdma/osc_rdma_sendreq.h +++ b/ompi/mca/osc/rdma/osc_rdma_sendreq.h @@ -23,12 +23,10 @@ #include "osc_rdma_longreq.h" #include "opal/class/opal_list.h" -#include "opal/threads/mutex.h" #include "ompi/datatype/datatype.h" #include "ompi/datatype/convertor.h" #include "ompi/communicator/communicator.h" #include "ompi/proc/proc.h" -#include "ompi/op/op.h" #include "ompi/memchecker.h" typedef enum { diff --git a/ompi/mca/pml/base/pml_base_ft.c b/ompi/mca/pml/base/pml_base_ft.c index fb6df64102..a08400e3ad 100644 --- a/ompi/mca/pml/base/pml_base_ft.c +++ b/ompi/mca/pml/base/pml_base_ft.c @@ -23,7 +23,6 @@ #include "ompi/mca/pml/pml.h" #include "ompi/mca/pml/base/base.h" -#include "ompi/mca/bml/bml.h" #include "ompi/mca/bml/base/base.h" int mca_pml_base_ft_event(int state) diff --git a/ompi/mca/pml/base/pml_base_sendreq.h b/ompi/mca/pml/base/pml_base_sendreq.h index 7e24f52b53..ffd0e94b61 100644 --- a/ompi/mca/pml/base/pml_base_sendreq.h +++ b/ompi/mca/pml/base/pml_base_sendreq.h @@ -25,7 +25,6 @@ #include "ompi_config.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/pml/base/pml_base_request.h" -#include "ompi/datatype/datatype.h" #include "ompi/datatype/convertor.h" #include "ompi/peruse/peruse-internal.h" diff --git a/ompi/mca/pml/cm/pml_cm.c b/ompi/mca/pml/cm/pml_cm.c index 195fb31536..0b7ba99460 100644 --- a/ompi/mca/pml/cm/pml_cm.c +++ b/ompi/mca/pml/cm/pml_cm.c @@ -17,7 +17,6 @@ #include "ompi_config.h" #include "ompi/communicator/communicator.h" -#include "opal/class/opal_list.h" #include "ompi/mca/pml/base/pml_base_request.h" #include "ompi/mca/pml/base/pml_base_bsend.h" #include "ompi/mca/pml/base/base.h" diff --git a/ompi/mca/pml/cm/pml_cm.h b/ompi/mca/pml/cm/pml_cm.h index c970c86cd0..f669aa2b6d 100644 --- a/ompi/mca/pml/cm/pml_cm.h +++ b/ompi/mca/pml/cm/pml_cm.h @@ -15,15 +15,12 @@ #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" #include "ompi/mca/pml/base/base.h" #include "ompi/datatype/datatype.h" -#include "ompi/datatype/convertor.h" #include "ompi/communicator/communicator.h" #include "ompi/request/request.h" -#include "opal/class/opal_free_list.h" #include "ompi/mca/mtl/mtl.h" BEGIN_C_DECLS diff --git a/ompi/mca/pml/cm/pml_cm_component.c b/ompi/mca/pml/cm/pml_cm_component.c index 5751f4a3d4..d248e00fdf 100644 --- a/ompi/mca/pml/cm/pml_cm_component.c +++ b/ompi/mca/pml/cm/pml_cm_component.c @@ -19,7 +19,6 @@ #include "pml_cm.h" #include "opal/event/event.h" #include "opal/mca/base/mca_base_param.h" -#include "ompi/datatype/convertor.h" #include "ompi/mca/mtl/mtl.h" #include "ompi/mca/mtl/base/base.h" #include "ompi/mca/pml/base/pml_base_bsend.h" diff --git a/ompi/mca/pml/cm/pml_cm_probe.c b/ompi/mca/pml/cm/pml_cm_probe.c index 8889ea95e9..5571c0eaa8 100644 --- a/ompi/mca/pml/cm/pml_cm_probe.c +++ b/ompi/mca/pml/cm/pml_cm_probe.c @@ -11,7 +11,6 @@ #include "ompi_config.h" #include "opal/runtime/opal_progress.h" -#include "ompi/request/request.h" #include "ompi/mca/mtl/mtl.h" #include "pml_cm.h" diff --git a/ompi/mca/pml/cm/pml_cm_recv.c b/ompi/mca/pml/cm/pml_cm_recv.c index 00efffc56f..3a79d1acf5 100644 --- a/ompi/mca/pml/cm/pml_cm_recv.c +++ b/ompi/mca/pml/cm/pml_cm_recv.c @@ -16,7 +16,6 @@ #include "ompi/request/request.h" #include "ompi/datatype/datatype.h" #include "ompi/communicator/communicator.h" -#include "ompi/datatype/convertor.h" #include "pml_cm.h" #include "pml_cm_recvreq.h" diff --git a/ompi/mca/pml/cm/pml_cm_send.c b/ompi/mca/pml/cm/pml_cm_send.c index f7d2e8c131..2a167d8607 100644 --- a/ompi/mca/pml/cm/pml_cm_send.c +++ b/ompi/mca/pml/cm/pml_cm_send.c @@ -14,7 +14,6 @@ #include "ompi/datatype/datatype.h" #include "ompi/communicator/communicator.h" -#include "ompi/datatype/convertor.h" #include "pml_cm.h" #include "pml_cm_sendreq.h" diff --git a/ompi/mca/pml/crcpw/pml_crcpw.h b/ompi/mca/pml/crcpw/pml_crcpw.h index 15c88d9917..f738602498 100644 --- a/ompi/mca/pml/crcpw/pml_crcpw.h +++ b/ompi/mca/pml/crcpw/pml_crcpw.h @@ -25,14 +25,12 @@ #include "ompi_config.h" -#include "opal/runtime/opal_cr.h" #include "ompi/class/ompi_free_list.h" #include "ompi/request/request.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/pml/base/pml_base_request.h" #include "ompi/mca/pml/base/pml_base_bsend.h" #include "ompi/mca/pml/base/pml_base_sendreq.h" -#include "ompi/mca/btl/btl.h" #include "ompi/datatype/datatype.h" #include "ompi/mca/crcp/crcp.h" #include "ompi/mca/crcp/base/base.h" diff --git a/ompi/mca/pml/crcpw/pml_crcpw_component.c b/ompi/mca/pml/crcpw/pml_crcpw_component.c index 4daf2155e3..a0a81e8d92 100644 --- a/ompi/mca/pml/crcpw/pml_crcpw_component.c +++ b/ompi/mca/pml/crcpw/pml_crcpw_component.c @@ -24,7 +24,6 @@ #include "mpi.h" #include "ompi/mca/pml/pml.h" -#include "ompi/mca/btl/btl.h" #include "ompi/mca/btl/base/base.h" #include "opal/mca/base/mca_base_param.h" #include "ompi/mca/pml/base/pml_base_bsend.h" diff --git a/ompi/mca/pml/crcpw/pml_crcpw_module.c b/ompi/mca/pml/crcpw/pml_crcpw_module.c index 5801b9972b..8ddff6888e 100644 --- a/ompi/mca/pml/crcpw/pml_crcpw_module.c +++ b/ompi/mca/pml/crcpw/pml_crcpw_module.c @@ -22,7 +22,6 @@ #include #include "ompi/mca/pml/pml.h" -#include "ompi/mca/btl/btl.h" #include "ompi/mca/btl/base/base.h" #include "ompi/mca/pml/crcpw/pml_crcpw.h" #include "ompi/mca/bml/base/base.h" diff --git a/ompi/mca/pml/csum/pml_csum.c b/ompi/mca/pml/csum/pml_csum.c index 41e0a0410a..e90f7ac9d4 100644 --- a/ompi/mca/pml/csum/pml_csum.c +++ b/ompi/mca/pml/csum/pml_csum.c @@ -44,7 +44,6 @@ #include "ompi/mca/btl/base/base.h" #include "ompi/mca/bml/base/base.h" #include "ompi/runtime/ompi_cr.h" -#include "ompi/runtime/ompi_module_exchange.h" #include "pml_csum.h" #include "pml_csum_component.h" diff --git a/ompi/mca/pml/csum/pml_csum.h b/ompi/mca/pml/csum/pml_csum.h index 017fbfc71a..0792950227 100644 --- a/ompi/mca/pml/csum/pml_csum.h +++ b/ompi/mca/pml/csum/pml_csum.h @@ -26,14 +26,12 @@ #define MCA_PML_CSUM_H #include "ompi_config.h" -#include "opal/threads/threads.h" #include "ompi/class/ompi_free_list.h" #include "ompi/request/request.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/pml/base/pml_base_request.h" #include "ompi/mca/pml/base/pml_base_bsend.h" #include "ompi/mca/pml/base/pml_base_sendreq.h" -#include "ompi/mca/btl/btl.h" #include "ompi/datatype/datatype.h" #include "pml_csum_hdr.h" #include "ompi/mca/bml/base/base.h" diff --git a/ompi/mca/pml/csum/pml_csum_component.c b/ompi/mca/pml/csum/pml_csum_component.c index e871d63d8a..042f575a84 100644 --- a/ompi/mca/pml/csum/pml_csum_component.c +++ b/ompi/mca/pml/csum/pml_csum_component.c @@ -26,11 +26,9 @@ #include "opal/event/event.h" #include "mpi.h" #include "ompi/runtime/params.h" -#include "ompi/datatype/convertor.h" #include "ompi/mca/pml/pml.h" #include "opal/mca/base/mca_base_param.h" -#include "orte/util/show_help.h" #include "ompi/mca/pml/base/pml_base_bsend.h" #include "pml_csum.h" diff --git a/ompi/mca/pml/csum/pml_csum_endpoint.c b/ompi/mca/pml/csum/pml_csum_endpoint.c index 3caacbdd92..5bc347251a 100644 --- a/ompi/mca/pml/csum/pml_csum_endpoint.c +++ b/ompi/mca/pml/csum/pml_csum_endpoint.c @@ -20,7 +20,6 @@ #include -#include "ompi/mca/pml/pml.h" #include "pml_csum_endpoint.h" diff --git a/ompi/mca/pml/csum/pml_csum_endpoint.h b/ompi/mca/pml/csum/pml_csum_endpoint.h index 4f7fb2eb2a..636d742786 100644 --- a/ompi/mca/pml/csum/pml_csum_endpoint.h +++ b/ompi/mca/pml/csum/pml_csum_endpoint.h @@ -21,7 +21,6 @@ #ifndef MCA_PML_CSUM_ENDPOINT_H #define MCA_PML_CSUM_ENDPOINT_H -#include "ompi/mca/btl/btl.h" BEGIN_C_DECLS diff --git a/ompi/mca/pml/csum/pml_csum_rdma.c b/ompi/mca/pml/csum/pml_csum_rdma.c index 52c1e3b5e3..040e988462 100644 --- a/ompi/mca/pml/csum/pml_csum_rdma.c +++ b/ompi/mca/pml/csum/pml_csum_rdma.c @@ -22,9 +22,7 @@ #include "ompi_config.h" #include "ompi/constants.h" #include "ompi/mca/pml/pml.h" -#include "ompi/mca/btl/btl.h" #include "ompi/mca/bml/bml.h" -#include "orte/types.h" #include "ompi/mca/mpool/mpool.h" #include "pml_csum.h" #include "pml_csum_rdma.h" diff --git a/ompi/mca/pml/csum/pml_csum_recvfrag.h b/ompi/mca/pml/csum/pml_csum_recvfrag.h index 71f711f079..b50d0ec83d 100644 --- a/ompi/mca/pml/csum/pml_csum_recvfrag.h +++ b/ompi/mca/pml/csum/pml_csum_recvfrag.h @@ -27,7 +27,6 @@ #define MCA_PML_CSUM_RECVFRAG_H #include "ompi/mca/btl/btl.h" -#include "ompi/mca/bml/bml.h" #include "pml_csum_hdr.h" BEGIN_C_DECLS diff --git a/ompi/mca/pml/csum/pml_csum_recvreq.h b/ompi/mca/pml/csum/pml_csum_recvreq.h index 783ae2fe21..ca428a4445 100644 --- a/ompi/mca/pml/csum/pml_csum_recvreq.h +++ b/ompi/mca/pml/csum/pml_csum_recvreq.h @@ -29,7 +29,6 @@ #include "ompi/mca/pml/csum/pml_csum_comm.h" #include "ompi/mca/mpool/base/base.h" #include "ompi/mca/pml/base/pml_base_recvreq.h" -#include "ompi/datatype/datatype.h" BEGIN_C_DECLS diff --git a/ompi/mca/pml/dr/pml_dr.h b/ompi/mca/pml/dr/pml_dr.h index 1a0ba4b413..61428d9093 100644 --- a/ompi/mca/pml/dr/pml_dr.h +++ b/ompi/mca/pml/dr/pml_dr.h @@ -32,7 +32,6 @@ #include "ompi/mca/pml/base/pml_base_bsend.h" #include "ompi/mca/pml/base/pml_base_sendreq.h" #include "opal/class/opal_pointer_array.h" -#include "ompi/mca/btl/btl.h" #include "ompi/datatype/datatype.h" #if defined(c_plusplus) || defined(__cplusplus) diff --git a/ompi/mca/pml/dr/pml_dr_comm.h b/ompi/mca/pml/dr/pml_dr_comm.h index ed533d92e5..4e303f9a10 100644 --- a/ompi/mca/pml/dr/pml_dr_comm.h +++ b/ompi/mca/pml/dr/pml_dr_comm.h @@ -23,7 +23,6 @@ #define MCA_PML_DR_COMM_H #include "opal/class/opal_list.h" -#include "ompi/class/ompi_seq_tracker.h" #include "ompi/communicator/communicator.h" #include "ompi/proc/proc.h" #include "pml_dr_endpoint.h" diff --git a/ompi/mca/pml/dr/pml_dr_component.c b/ompi/mca/pml/dr/pml_dr_component.c index 2a08000532..edee5e1804 100644 --- a/ompi/mca/pml/dr/pml_dr_component.c +++ b/ompi/mca/pml/dr/pml_dr_component.c @@ -21,7 +21,6 @@ #include "opal/event/event.h" #include "mpi.h" #include "ompi/mca/pml/pml.h" -#include "ompi/mca/btl/btl.h" #include "ompi/mca/btl/base/base.h" #include "opal/mca/base/mca_base_param.h" #include "ompi/mca/pml/base/pml_base_bsend.h" diff --git a/ompi/mca/pml/dr/pml_dr_recvfrag.c b/ompi/mca/pml/dr/pml_dr_recvfrag.c index b59a728dcf..dbd79377a5 100644 --- a/ompi/mca/pml/dr/pml_dr_recvfrag.c +++ b/ompi/mca/pml/dr/pml_dr_recvfrag.c @@ -28,7 +28,6 @@ #include "opal/util/crc.h" #include "ompi/constants.h" #include "ompi/communicator/communicator.h" -#include "ompi/datatype/datatype.h" #include "ompi/mca/pml/pml.h" #include "ompi/class/ompi_seq_tracker.h" #include "pml_dr.h" diff --git a/ompi/mca/pml/dr/pml_dr_sendreq.c b/ompi/mca/pml/dr/pml_dr_sendreq.c index 8ffe014b08..54a2ff0296 100644 --- a/ompi/mca/pml/dr/pml_dr_sendreq.c +++ b/ompi/mca/pml/dr/pml_dr_sendreq.c @@ -28,7 +28,6 @@ #include "ompi/mca/btl/btl.h" #include "ompi/class/ompi_seq_tracker.h" #include "orte/mca/errmgr/errmgr.h" -#include "ompi/mca/mpool/mpool.h" #include "pml_dr.h" #include "pml_dr_hdr.h" #include "pml_dr_sendreq.h" diff --git a/ompi/mca/pml/example/pml_example.h b/ompi/mca/pml/example/pml_example.h index 1c13506395..d393e35079 100644 --- a/ompi/mca/pml/example/pml_example.h +++ b/ompi/mca/pml/example/pml_example.h @@ -15,10 +15,6 @@ #ifndef PML_EXAMPLE_H_HAS_BEEN_INCLUDED #define PML_EXAMPLE_H_HAS_BEEN_INCLUDED -#include "opal/threads/threads.h" -#include "opal/threads/condition.h" -#include "ompi/class/ompi_free_list.h" -#include "opal/util/cmd_line.h" #include "ompi/request/request.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/ptl/ptl.h" diff --git a/ompi/mca/pml/example/pml_example_iprobe.c b/ompi/mca/pml/example/pml_example_iprobe.c index f3f3b3f142..2b6bc09e23 100644 --- a/ompi/mca/pml/example/pml_example_iprobe.c +++ b/ompi/mca/pml/example/pml_example_iprobe.c @@ -10,7 +10,6 @@ */ #include "ompi_config.h" -#include "ompi/request/request.h" #include "pml_example.h" int mca_pml_example_iprobe( int src, int tag, diff --git a/ompi/mca/pml/ob1/pml_ob1.c b/ompi/mca/pml/ob1/pml_ob1.c index 37e28cbd3f..950bc4b5c4 100644 --- a/ompi/mca/pml/ob1/pml_ob1.c +++ b/ompi/mca/pml/ob1/pml_ob1.c @@ -41,10 +41,8 @@ #include "ompi/mca/bml/base/base.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/grpcomm/grpcomm.h" -#include "orte/runtime/orte_globals.h" #include "ompi/runtime/ompi_cr.h" -#include "ompi/runtime/ompi_module_exchange.h" mca_pml_ob1_t mca_pml_ob1 = { { diff --git a/ompi/mca/pml/ob1/pml_ob1.h b/ompi/mca/pml/ob1/pml_ob1.h index 71e94c50f3..4aaac2bb13 100644 --- a/ompi/mca/pml/ob1/pml_ob1.h +++ b/ompi/mca/pml/ob1/pml_ob1.h @@ -23,14 +23,12 @@ #define MCA_PML_OB1_H #include "ompi_config.h" -#include "opal/threads/threads.h" #include "ompi/class/ompi_free_list.h" #include "ompi/request/request.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/pml/base/pml_base_request.h" #include "ompi/mca/pml/base/pml_base_bsend.h" #include "ompi/mca/pml/base/pml_base_sendreq.h" -#include "ompi/mca/btl/btl.h" #include "ompi/datatype/datatype.h" #include "pml_ob1_hdr.h" #include "ompi/mca/bml/base/base.h" diff --git a/ompi/mca/pml/ob1/pml_ob1_endpoint.c b/ompi/mca/pml/ob1/pml_ob1_endpoint.c index 0643998ce3..c2b5eec1f5 100644 --- a/ompi/mca/pml/ob1/pml_ob1_endpoint.c +++ b/ompi/mca/pml/ob1/pml_ob1_endpoint.c @@ -20,7 +20,6 @@ #include -#include "ompi/mca/pml/pml.h" #include "pml_ob1_endpoint.h" diff --git a/ompi/mca/pml/ob1/pml_ob1_endpoint.h b/ompi/mca/pml/ob1/pml_ob1_endpoint.h index 5d4c04bce8..47cdb13f23 100644 --- a/ompi/mca/pml/ob1/pml_ob1_endpoint.h +++ b/ompi/mca/pml/ob1/pml_ob1_endpoint.h @@ -21,7 +21,6 @@ #ifndef MCA_PML_OB1_ENDPOINT_H #define MCA_PML_OB1_ENDPOINT_H -#include "ompi/mca/btl/btl.h" #if defined(c_plusplus) || defined(__cplusplus) extern "C" { #endif diff --git a/ompi/mca/pml/ob1/pml_ob1_rdma.c b/ompi/mca/pml/ob1/pml_ob1_rdma.c index 9953b4bae8..21c7015e62 100644 --- a/ompi/mca/pml/ob1/pml_ob1_rdma.c +++ b/ompi/mca/pml/ob1/pml_ob1_rdma.c @@ -22,9 +22,7 @@ #include "ompi_config.h" #include "ompi/constants.h" #include "ompi/mca/pml/pml.h" -#include "ompi/mca/btl/btl.h" #include "ompi/mca/bml/bml.h" -#include "orte/types.h" #include "ompi/mca/mpool/mpool.h" #include "pml_ob1.h" #include "pml_ob1_rdma.h" diff --git a/ompi/mca/pml/ob1/pml_ob1_recvfrag.h b/ompi/mca/pml/ob1/pml_ob1_recvfrag.h index f50d3845f7..c4fe844d87 100644 --- a/ompi/mca/pml/ob1/pml_ob1_recvfrag.h +++ b/ompi/mca/pml/ob1/pml_ob1_recvfrag.h @@ -24,7 +24,6 @@ #define MCA_PML_OB1_RECVFRAG_H #include "ompi/mca/btl/btl.h" -#include "ompi/mca/bml/bml.h" #include "pml_ob1_hdr.h" #if defined(c_plusplus) || defined(__cplusplus) diff --git a/ompi/mca/pml/ob1/pml_ob1_recvreq.h b/ompi/mca/pml/ob1/pml_ob1_recvreq.h index 00a0cc5a70..a663321d2b 100644 --- a/ompi/mca/pml/ob1/pml_ob1_recvreq.h +++ b/ompi/mca/pml/ob1/pml_ob1_recvreq.h @@ -29,7 +29,6 @@ #include "ompi/mca/pml/ob1/pml_ob1_comm.h" #include "ompi/mca/mpool/base/base.h" #include "ompi/mca/pml/base/pml_base_recvreq.h" -#include "ompi/datatype/datatype.h" BEGIN_C_DECLS diff --git a/ompi/mca/pml/pml.h b/ompi/mca/pml/pml.h index bce0ac867a..be2fb63d09 100644 --- a/ompi/mca/pml/pml.h +++ b/ompi/mca/pml/pml.h @@ -62,7 +62,6 @@ #define MCA_PML_H #include "ompi_config.h" -#include "opal/class/opal_list.h" #include "opal/mca/mca.h" #include "mpi.h" /* needed for MPI_ANY_TAG */ diff --git a/ompi/mca/pml/v/mca/vprotocol/pessimist/vprotocol_pessimist_component.c b/ompi/mca/pml/v/mca/vprotocol/pessimist/vprotocol_pessimist_component.c index 93b274c623..c38bd001f0 100644 --- a/ompi/mca/pml/v/mca/vprotocol/pessimist/vprotocol_pessimist_component.c +++ b/ompi/mca/pml/v/mca/vprotocol/pessimist/vprotocol_pessimist_component.c @@ -12,7 +12,6 @@ #include "opal/mca/mca.h" #include "opal/mca/base/mca_base_param.h" -#include "ompi/communicator/communicator.h" #include "vprotocol_pessimist.h" static inline int mca_param_register_int( const char* param_name, int default_value); diff --git a/ompi/mca/pml/v/mca/vprotocol/pessimist/vprotocol_pessimist_probe.c b/ompi/mca/pml/v/mca/vprotocol/pessimist/vprotocol_pessimist_probe.c index c004706e6e..40c19b6b35 100644 --- a/ompi/mca/pml/v/mca/vprotocol/pessimist/vprotocol_pessimist_probe.c +++ b/ompi/mca/pml/v/mca/vprotocol/pessimist/vprotocol_pessimist_probe.c @@ -9,7 +9,6 @@ */ #include "ompi_config.h" -#include "ompi/request/request.h" #include "vprotocol_pessimist.h" static inline int replay_iprobe(int src, int tag, diff --git a/ompi/mca/pubsub/orte/pubsub_orte.c b/ompi/mca/pubsub/orte/pubsub_orte.c index 2e466e9247..37270460f8 100644 --- a/ompi/mca/pubsub/orte/pubsub_orte.c +++ b/ompi/mca/pubsub/orte/pubsub_orte.c @@ -26,12 +26,9 @@ #include "orte/util/show_help.h" #include "opal/util/argv.h" -#include "opal/util/opal_getcwd.h" #include "opal/dss/dss.h" #include "orte/mca/errmgr/errmgr.h" -#include "orte/mca/grpcomm/grpcomm.h" -#include "orte/mca/plm/plm.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" #include "orte/mca/rml/base/rml_contact.h" @@ -40,10 +37,7 @@ #include "orte/runtime/orte_globals.h" #include "orte/runtime/orte_data_server.h" -#include "ompi/communicator/communicator.h" -#include "ompi/proc/proc.h" #include "ompi/info/info.h" -#include "ompi/runtime/ompi_module_exchange.h" #include "ompi/mca/pubsub/base/base.h" #include "pubsub_orte.h" diff --git a/ompi/mca/pubsub/pubsub.h b/ompi/mca/pubsub/pubsub.h index 2605924871..4a431b0d12 100644 --- a/ompi/mca/pubsub/pubsub.h +++ b/ompi/mca/pubsub/pubsub.h @@ -30,10 +30,8 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/class/opal_object.h" #include "ompi/info/info.h" -#include "ompi/communicator/communicator.h" BEGIN_C_DECLS diff --git a/ompi/mca/rcache/base/base.h b/ompi/mca/rcache/base/base.h index 3b91c6403e..33a32e3e15 100644 --- a/ompi/mca/rcache/base/base.h +++ b/ompi/mca/rcache/base/base.h @@ -24,10 +24,8 @@ #include "ompi_config.h" #include "opal/class/opal_list.h" -#include "ompi/class/ompi_rb_tree.h" #include "opal/mca/mca.h" #include "ompi/mca/rcache/rcache.h" -#include "opal/threads/mutex.h" #if defined(c_plusplus) || defined(__cplusplus) extern "C" { diff --git a/ompi/mca/rcache/rb/rcache_rb_mru.h b/ompi/mca/rcache/rb/rcache_rb_mru.h index 8365d45b97..0dffd3592b 100644 --- a/ompi/mca/rcache/rb/rcache_rb_mru.h +++ b/ompi/mca/rcache/rb/rcache_rb_mru.h @@ -23,7 +23,6 @@ #ifndef MCA_RCACHE_RB_MRU_H #define MCA_RCACHE_RB_MRU_H #include "opal/mca/mca.h" -#include "opal/class/opal_list.h" #include "rcache_rb.h" diff --git a/ompi/mca/rcache/rcache.h b/ompi/mca/rcache/rcache.h index 5bbe7ab7ef..75e32aa7be 100644 --- a/ompi/mca/rcache/rcache.h +++ b/ompi/mca/rcache/rcache.h @@ -23,7 +23,6 @@ #ifndef MCA_RCACHE_H #define MCA_RCACHE_H #include "opal/mca/mca.h" -#include "opal/class/opal_list.h" #include "ompi/mca/mpool/mpool.h" #include "opal/threads/mutex.h" diff --git a/ompi/mca/rcache/vma/rcache_vma_tree.h b/ompi/mca/rcache/vma/rcache_vma_tree.h index 3503ba0076..e929a56e68 100644 --- a/ompi/mca/rcache/vma/rcache_vma_tree.h +++ b/ompi/mca/rcache/vma/rcache_vma_tree.h @@ -26,7 +26,6 @@ #ifndef MCA_RCACHE_VMA_TREE_H #define MCA_RCACHE_VMA_TREE_H #include "opal/mca/mca.h" -#include "ompi/class/ompi_free_list.h" #include "ompi/mca/mpool/mpool.h" #include "rcache_vma.h" /* diff --git a/ompi/mca/topo/base/topo_base_cart_coords.c b/ompi/mca/topo/base/topo_base_cart_coords.c index 4f9945f6ac..56c89fa292 100644 --- a/ompi/mca/topo/base/topo_base_cart_coords.c +++ b/ompi/mca/topo/base/topo_base_cart_coords.c @@ -20,7 +20,6 @@ #include "ompi_config.h" #include "ompi/mca/topo/base/base.h" #include "ompi/communicator/communicator.h" -#include "ompi/mca/topo/topo.h" /* * function - determines process coords in cartesian topology given diff --git a/ompi/mca/topo/base/topo_base_cart_create.c b/ompi/mca/topo/base/topo_base_cart_create.c index 1db3f179e1..b5a2c1b67f 100644 --- a/ompi/mca/topo/base/topo_base_cart_create.c +++ b/ompi/mca/topo/base/topo_base_cart_create.c @@ -21,8 +21,6 @@ #include "ompi/constants.h" #include "ompi/mca/topo/base/base.h" -#include "ompi/communicator/communicator.h" -#include "ompi/group/group.h" #include "ompi/mca/topo/topo.h" /* diff --git a/ompi/mca/topo/base/topo_base_cart_get.c b/ompi/mca/topo/base/topo_base_cart_get.c index 161be087d5..e3e0443dd7 100644 --- a/ompi/mca/topo/base/topo_base_cart_get.c +++ b/ompi/mca/topo/base/topo_base_cart_get.c @@ -25,7 +25,6 @@ #include "ompi/mca/topo/base/base.h" #include "ompi/communicator/communicator.h" -#include "ompi/mca/topo/topo.h" /* * function - retrieves Cartesian topology information associated with a diff --git a/ompi/mca/topo/base/topo_base_cart_rank.c b/ompi/mca/topo/base/topo_base_cart_rank.c index 9b335fa543..83b4c1f4a2 100644 --- a/ompi/mca/topo/base/topo_base_cart_rank.c +++ b/ompi/mca/topo/base/topo_base_cart_rank.c @@ -20,7 +20,6 @@ #include "ompi_config.h" #include "ompi/mca/topo/base/base.h" #include "ompi/communicator/communicator.h" -#include "ompi/mca/topo/topo.h" /* * function - Determines process rank in communicator given Cartesian diff --git a/ompi/mca/topo/base/topo_base_cart_shift.c b/ompi/mca/topo/base/topo_base_cart_shift.c index 4655c804cb..7cb199e19d 100644 --- a/ompi/mca/topo/base/topo_base_cart_shift.c +++ b/ompi/mca/topo/base/topo_base_cart_shift.c @@ -20,7 +20,6 @@ #include "ompi_config.h" #include "ompi/mca/topo/base/base.h" #include "ompi/communicator/communicator.h" -#include "ompi/mca/topo/topo.h" /* * function - Returns the shifted source and destination ranks, given a diff --git a/ompi/mca/topo/base/topo_base_cart_sub.c b/ompi/mca/topo/base/topo_base_cart_sub.c index bb0ff1e86b..70a8f9eab6 100644 --- a/ompi/mca/topo/base/topo_base_cart_sub.c +++ b/ompi/mca/topo/base/topo_base_cart_sub.c @@ -20,7 +20,6 @@ #include "ompi_config.h" #include "ompi/mca/topo/base/base.h" #include "ompi/communicator/communicator.h" -#include "ompi/mca/topo/topo.h" /* * function - partitions a communicator into subgroups which diff --git a/ompi/mca/topo/base/topo_base_cartdim_get.c b/ompi/mca/topo/base/topo_base_cartdim_get.c index 681d469e9c..b259db5ed9 100644 --- a/ompi/mca/topo/base/topo_base_cartdim_get.c +++ b/ompi/mca/topo/base/topo_base_cartdim_get.c @@ -19,7 +19,6 @@ #include "ompi_config.h" #include "ompi/mca/topo/base/base.h" #include "ompi/communicator/communicator.h" -#include "ompi/mca/topo/topo.h" /* * function - retrieves Cartesian topology information associated with a diff --git a/ompi/mca/topo/base/topo_base_close.c b/ompi/mca/topo/base/topo_base_close.c index 11f9e4ac7b..8089a58da8 100644 --- a/ompi/mca/topo/base/topo_base_close.c +++ b/ompi/mca/topo/base/topo_base_close.c @@ -23,7 +23,6 @@ #include "opal/mca/mca.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" -#include "ompi/mca/topo/topo.h" #include "ompi/mca/topo/base/base.h" diff --git a/ompi/mca/topo/base/topo_base_comm_unselect.c b/ompi/mca/topo/base/topo_base_comm_unselect.c index 6c1069c234..72c97eade2 100644 --- a/ompi/mca/topo/base/topo_base_comm_unselect.c +++ b/ompi/mca/topo/base/topo_base_comm_unselect.c @@ -23,7 +23,6 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "ompi/mca/topo/topo.h" #include "ompi/mca/topo/base/base.h" #include "ompi/communicator/communicator.h" diff --git a/ompi/mca/topo/base/topo_base_graph_create.c b/ompi/mca/topo/base/topo_base_graph_create.c index d44bd0b2a6..09ac869a17 100644 --- a/ompi/mca/topo/base/topo_base_graph_create.c +++ b/ompi/mca/topo/base/topo_base_graph_create.c @@ -18,7 +18,6 @@ #include "ompi_config.h" #include "ompi/mca/topo/base/base.h" -#include "ompi/communicator/communicator.h" #include "ompi/mca/topo/topo.h" /* diff --git a/ompi/mca/topo/base/topo_base_graph_get.c b/ompi/mca/topo/base/topo_base_graph_get.c index 256fb7b547..e3489f2abf 100644 --- a/ompi/mca/topo/base/topo_base_graph_get.c +++ b/ompi/mca/topo/base/topo_base_graph_get.c @@ -19,7 +19,6 @@ #include "ompi_config.h" #include "ompi/mca/topo/base/base.h" #include "ompi/communicator/communicator.h" -#include "ompi/mca/topo/topo.h" /* * function - retrieves graph topology information associated with a diff --git a/ompi/mca/topo/base/topo_base_graph_neighbors.c b/ompi/mca/topo/base/topo_base_graph_neighbors.c index d682fd4cf3..9b27783416 100644 --- a/ompi/mca/topo/base/topo_base_graph_neighbors.c +++ b/ompi/mca/topo/base/topo_base_graph_neighbors.c @@ -19,7 +19,6 @@ #include "ompi_config.h" #include "ompi/mca/topo/base/base.h" #include "ompi/communicator/communicator.h" -#include "ompi/mca/topo/topo.h" /* * function - returns the neighbors of a node associated diff --git a/ompi/mca/topo/base/topo_base_graph_neighbors_count.c b/ompi/mca/topo/base/topo_base_graph_neighbors_count.c index 622714fcf2..f7c982dc66 100644 --- a/ompi/mca/topo/base/topo_base_graph_neighbors_count.c +++ b/ompi/mca/topo/base/topo_base_graph_neighbors_count.c @@ -19,7 +19,6 @@ #include "ompi_config.h" #include "ompi/mca/topo/base/base.h" #include "ompi/communicator/communicator.h" -#include "ompi/mca/topo/topo.h" /* * function - returns the number of neighbors of a node diff --git a/ompi/mca/topo/base/topo_base_graphdims_get.c b/ompi/mca/topo/base/topo_base_graphdims_get.c index 5414a48073..7fe375a983 100644 --- a/ompi/mca/topo/base/topo_base_graphdims_get.c +++ b/ompi/mca/topo/base/topo_base_graphdims_get.c @@ -19,7 +19,6 @@ #include "ompi_config.h" #include "ompi/mca/topo/base/base.h" #include "ompi/communicator/communicator.h" -#include "ompi/mca/topo/topo.h" /* * function - Retrieves graph topology information associated with a diff --git a/ompi/mca/topo/unity/topo_unity.h b/ompi/mca/topo/unity/topo_unity.h index 03482912e3..cd5b1cf514 100644 --- a/ompi/mca/topo/unity/topo_unity.h +++ b/ompi/mca/topo/unity/topo_unity.h @@ -20,8 +20,6 @@ #define MCA_TOPO_UNTIY_H #include "ompi_config.h" -#include "opal/util/cmd_line.h" -#include "ompi/request/request.h" #include "ompi/mca/topo/topo.h" /* diff --git a/ompi/mpi/c/abort.c b/ompi/mpi/c/abort.c index be83c5373f..4f587afa65 100644 --- a/ompi/mpi/c/abort.c +++ b/ompi/mpi/c/abort.c @@ -20,6 +20,8 @@ #include "orte/util/show_help.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/runtime/mpiruntime.h" #include "ompi/memchecker.h" #include "ompi/communicator/communicator.h" diff --git a/ompi/mpi/c/accumulate.c b/ompi/mpi/c/accumulate.c index 6ffa8a8a40..51b47d56f0 100644 --- a/ompi/mpi/c/accumulate.c +++ b/ompi/mpi/c/accumulate.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" #include "ompi/mca/osc/osc.h" #include "ompi/op/op.h" diff --git a/ompi/mpi/c/add_error_class.c b/ompi/mpi/c/add_error_class.c index db691d6a92..7d28ea4476 100644 --- a/ompi/mpi/c/add_error_class.c +++ b/ompi/mpi/c/add_error_class.c @@ -20,6 +20,8 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/errhandler/errcode.h" #include "ompi/communicator/communicator.h" #include "ompi/attribute/attribute.h" diff --git a/ompi/mpi/c/add_error_code.c b/ompi/mpi/c/add_error_code.c index badf252f0a..718d0e82dc 100644 --- a/ompi/mpi/c/add_error_code.c +++ b/ompi/mpi/c/add_error_code.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/errhandler/errcode.h" #include "ompi/attribute/attribute.h" diff --git a/ompi/mpi/c/add_error_string.c b/ompi/mpi/c/add_error_string.c index 2424c1e31b..f41a410cdf 100644 --- a/ompi/mpi/c/add_error_string.c +++ b/ompi/mpi/c/add_error_string.c @@ -21,6 +21,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/errhandler/errcode.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/address.c b/ompi/mpi/c/address.c index e3cad84c1b..4025d5c942 100644 --- a/ompi/mpi/c/address.c +++ b/ompi/mpi/c/address.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Address = PMPI_Address diff --git a/ompi/mpi/c/allgather.c b/ompi/mpi/c/allgather.c index 45f7437b3f..ba8ad11b50 100644 --- a/ompi/mpi/c/allgather.c +++ b/ompi/mpi/c/allgather.c @@ -21,6 +21,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/allgatherv.c b/ompi/mpi/c/allgatherv.c index 637a18fecd..7c83645505 100644 --- a/ompi/mpi/c/allgatherv.c +++ b/ompi/mpi/c/allgatherv.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/alloc_mem.c b/ompi/mpi/c/alloc_mem.c index 237f98be54..fd4c0b5ccb 100644 --- a/ompi/mpi/c/alloc_mem.c +++ b/ompi/mpi/c/alloc_mem.c @@ -23,6 +23,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" #include "ompi/mca/mpool/mpool.h" diff --git a/ompi/mpi/c/allreduce.c b/ompi/mpi/c/allreduce.c index ff7d073421..f5762f7c61 100644 --- a/ompi/mpi/c/allreduce.c +++ b/ompi/mpi/c/allreduce.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/op/op.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/alltoall.c b/ompi/mpi/c/alltoall.c index 614c00fa2f..34ee6458d5 100644 --- a/ompi/mpi/c/alltoall.c +++ b/ompi/mpi/c/alltoall.c @@ -21,6 +21,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/alltoallv.c b/ompi/mpi/c/alltoallv.c index b5b4990197..deb2b1d585 100644 --- a/ompi/mpi/c/alltoallv.c +++ b/ompi/mpi/c/alltoallv.c @@ -21,6 +21,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/alltoallw.c b/ompi/mpi/c/alltoallw.c index 009abcd226..c51f0d0544 100644 --- a/ompi/mpi/c/alltoallw.c +++ b/ompi/mpi/c/alltoallw.c @@ -21,6 +21,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/attr_delete.c b/ompi/mpi/c/attr_delete.c index 964595cb20..2263fbfa54 100644 --- a/ompi/mpi/c/attr_delete.c +++ b/ompi/mpi/c/attr_delete.c @@ -21,6 +21,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/attr_fn.c b/ompi/mpi/c/attr_fn.c index 35ab4ede61..dfb077af7a 100644 --- a/ompi/mpi/c/attr_fn.c +++ b/ompi/mpi/c/attr_fn.c @@ -19,6 +19,7 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/communicator/communicator.h" #include "ompi/datatype/datatype.h" #include "ompi/win/win.h" diff --git a/ompi/mpi/c/attr_get.c b/ompi/mpi/c/attr_get.c index 74105da704..a7654fed69 100644 --- a/ompi/mpi/c/attr_get.c +++ b/ompi/mpi/c/attr_get.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/attr_put.c b/ompi/mpi/c/attr_put.c index 14a5bfeb0d..42de3f5929 100644 --- a/ompi/mpi/c/attr_put.c +++ b/ompi/mpi/c/attr_put.c @@ -21,6 +21,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/barrier.c b/ompi/mpi/c/barrier.c index e81d80efd9..20cc7da9ac 100644 --- a/ompi/mpi/c/barrier.c +++ b/ompi/mpi/c/barrier.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/bcast.c b/ompi/mpi/c/bcast.c index 863964460d..38139f828b 100644 --- a/ompi/mpi/c/bcast.c +++ b/ompi/mpi/c/bcast.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/bindings.h b/ompi/mpi/c/bindings.h index 1936407a7d..a5d8eb9dca 100644 --- a/ompi/mpi/c/bindings.h +++ b/ompi/mpi/c/bindings.h @@ -21,9 +21,7 @@ #include "ompi_config.h" #include "mpi.h" -#include "ompi/communicator/communicator.h" #include "ompi/datatype/datatype.h" -#include "ompi/runtime/params.h" /* This library needs to be here so that we can define * the OPAL_CR_* checks diff --git a/ompi/mpi/c/bsend.c b/ompi/mpi/c/bsend.c index 628603f5d1..82d10c6116 100644 --- a/ompi/mpi/c/bsend.c +++ b/ompi/mpi/c/bsend.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/pml/base/pml_base_bsend.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/bsend_init.c b/ompi/mpi/c/bsend_init.c index 7034409cc2..743a2a2c8b 100644 --- a/ompi/mpi/c/bsend_init.c +++ b/ompi/mpi/c/bsend_init.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/pml/base/pml_base_bsend.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/buffer_attach.c b/ompi/mpi/c/buffer_attach.c index 40ea79103e..e5964ddd34 100644 --- a/ompi/mpi/c/buffer_attach.c +++ b/ompi/mpi/c/buffer_attach.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/pml/base/pml_base_bsend.h" diff --git a/ompi/mpi/c/buffer_detach.c b/ompi/mpi/c/buffer_detach.c index 54f8877c05..43548b4e36 100644 --- a/ompi/mpi/c/buffer_detach.c +++ b/ompi/mpi/c/buffer_detach.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/pml/base/pml_base_bsend.h" diff --git a/ompi/mpi/c/cancel.c b/ompi/mpi/c/cancel.c index bdbab31618..b97935ccec 100644 --- a/ompi/mpi/c/cancel.c +++ b/ompi/mpi/c/cancel.c @@ -21,6 +21,7 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" #include "ompi/communicator/communicator.h" #include "ompi/errhandler/errhandler.h" #include "ompi/request/request.h" diff --git a/ompi/mpi/c/cart_coords.c b/ompi/mpi/c/cart_coords.c index 73d0b6a2fe..5ca67e3198 100644 --- a/ompi/mpi/c/cart_coords.c +++ b/ompi/mpi/c/cart_coords.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/topo/topo.h" #include "ompi/group/group.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/cart_create.c b/ompi/mpi/c/cart_create.c index 9aaf776d7a..a82b7f513b 100644 --- a/ompi/mpi/c/cart_create.c +++ b/ompi/mpi/c/cart_create.c @@ -20,7 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" -#include "ompi/mca/topo/topo.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/topo/base/base.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/cart_get.c b/ompi/mpi/c/cart_get.c index e2f54bf80b..225cf2d9d6 100644 --- a/ompi/mpi/c/cart_get.c +++ b/ompi/mpi/c/cart_get.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/topo/topo.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/cart_map.c b/ompi/mpi/c/cart_map.c index 000e4b0551..9c06f5d9a5 100644 --- a/ompi/mpi/c/cart_map.c +++ b/ompi/mpi/c/cart_map.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/topo/topo.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/cart_rank.c b/ompi/mpi/c/cart_rank.c index 21a64be963..6b2d846b73 100644 --- a/ompi/mpi/c/cart_rank.c +++ b/ompi/mpi/c/cart_rank.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/topo/topo.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/cart_shift.c b/ompi/mpi/c/cart_shift.c index 980b2b5881..d9050079f0 100644 --- a/ompi/mpi/c/cart_shift.c +++ b/ompi/mpi/c/cart_shift.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/topo/topo.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/cart_sub.c b/ompi/mpi/c/cart_sub.c index d49a41d6c8..113b592f52 100644 --- a/ompi/mpi/c/cart_sub.c +++ b/ompi/mpi/c/cart_sub.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/topo/topo.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/cartdim_get.c b/ompi/mpi/c/cartdim_get.c index d655c2503b..681118f94c 100644 --- a/ompi/mpi/c/cartdim_get.c +++ b/ompi/mpi/c/cartdim_get.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/topo/topo.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/close_port.c b/ompi/mpi/c/close_port.c index e6fba135b6..6d5dd3a094 100644 --- a/ompi/mpi/c/close_port.c +++ b/ompi/mpi/c/close_port.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/dpm/dpm.h" diff --git a/ompi/mpi/c/comm_accept.c b/ompi/mpi/c/comm_accept.c index da620aa5ff..d5bfb8a65b 100644 --- a/ompi/mpi/c/comm_accept.c +++ b/ompi/mpi/c/comm_accept.c @@ -22,6 +22,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" #include "ompi/mca/dpm/dpm.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/comm_c2f.c b/ompi/mpi/c/comm_c2f.c index d711af7d82..bba24ca5a1 100644 --- a/ompi/mpi/c/comm_c2f.c +++ b/ompi/mpi/c/comm_c2f.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mpi/f77/fint_2_int.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/comm_call_errhandler.c b/ompi/mpi/c/comm_call_errhandler.c index b8e2ffeae3..0425d8d902 100644 --- a/ompi/mpi/c/comm_call_errhandler.c +++ b/ompi/mpi/c/comm_call_errhandler.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/comm_compare.c b/ompi/mpi/c/comm_compare.c index b6fd99efd5..cedbe9f227 100644 --- a/ompi/mpi/c/comm_compare.c +++ b/ompi/mpi/c/comm_compare.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/comm_connect.c b/ompi/mpi/c/comm_connect.c index 052309715e..31c8b9522a 100644 --- a/ompi/mpi/c/comm_connect.c +++ b/ompi/mpi/c/comm_connect.c @@ -21,6 +21,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" #include "ompi/mca/dpm/dpm.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/comm_create.c b/ompi/mpi/c/comm_create.c index 1a4e2a21f5..4ee700e9b3 100644 --- a/ompi/mpi/c/comm_create.c +++ b/ompi/mpi/c/comm_create.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/comm_create_errhandler.c b/ompi/mpi/c/comm_create_errhandler.c index 5323511614..7438384f02 100644 --- a/ompi/mpi/c/comm_create_errhandler.c +++ b/ompi/mpi/c/comm_create_errhandler.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Comm_create_errhandler = PMPI_Comm_create_errhandler diff --git a/ompi/mpi/c/comm_create_keyval.c b/ompi/mpi/c/comm_create_keyval.c index e3db50137e..ce0b51ac23 100644 --- a/ompi/mpi/c/comm_create_keyval.c +++ b/ompi/mpi/c/comm_create_keyval.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/comm_delete_attr.c b/ompi/mpi/c/comm_delete_attr.c index fb380d3f04..1d262c1a31 100644 --- a/ompi/mpi/c/comm_delete_attr.c +++ b/ompi/mpi/c/comm_delete_attr.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/comm_disconnect.c b/ompi/mpi/c/comm_disconnect.c index fa91669796..51fb5f4575 100644 --- a/ompi/mpi/c/comm_disconnect.c +++ b/ompi/mpi/c/comm_disconnect.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/comm_dup.c b/ompi/mpi/c/comm_dup.c index 5c6b262034..e0b584211c 100644 --- a/ompi/mpi/c/comm_dup.c +++ b/ompi/mpi/c/comm_dup.c @@ -21,6 +21,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/comm_f2c.c b/ompi/mpi/c/comm_f2c.c index c03b861c98..38f0a2427e 100644 --- a/ompi/mpi/c/comm_f2c.c +++ b/ompi/mpi/c/comm_f2c.c @@ -21,6 +21,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mpi/f77/fint_2_int.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/comm_free.c b/ompi/mpi/c/comm_free.c index b38339bb89..30db3f14b0 100644 --- a/ompi/mpi/c/comm_free.c +++ b/ompi/mpi/c/comm_free.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/comm_free_keyval.c b/ompi/mpi/c/comm_free_keyval.c index 6384e0d683..70c2e113dd 100644 --- a/ompi/mpi/c/comm_free_keyval.c +++ b/ompi/mpi/c/comm_free_keyval.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/comm_get_attr.c b/ompi/mpi/c/comm_get_attr.c index d034538f97..984b293913 100644 --- a/ompi/mpi/c/comm_get_attr.c +++ b/ompi/mpi/c/comm_get_attr.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/comm_get_errhandler.c b/ompi/mpi/c/comm_get_errhandler.c index d759766d34..3fa352ace1 100644 --- a/ompi/mpi/c/comm_get_errhandler.c +++ b/ompi/mpi/c/comm_get_errhandler.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/comm_get_name.c b/ompi/mpi/c/comm_get_name.c index 5b587e6f74..c7d3f85d87 100644 --- a/ompi/mpi/c/comm_get_name.c +++ b/ompi/mpi/c/comm_get_name.c @@ -22,7 +22,9 @@ #include #include "ompi/mpi/c/bindings.h" -#include "opal/util/strncpy.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/totalview.h" #include "opal/threads/mutex.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/comm_get_parent.c b/ompi/mpi/c/comm_get_parent.c index 3d404cae25..f3e193a903 100644 --- a/ompi/mpi/c/comm_get_parent.c +++ b/ompi/mpi/c/comm_get_parent.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Comm_get_parent = PMPI_Comm_get_parent diff --git a/ompi/mpi/c/comm_group.c b/ompi/mpi/c/comm_group.c index 0b22b43466..1ea3119fab 100644 --- a/ompi/mpi/c/comm_group.c +++ b/ompi/mpi/c/comm_group.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/comm_join.c b/ompi/mpi/c/comm_join.c index 7318155e93..27493825c5 100644 --- a/ompi/mpi/c/comm_join.c +++ b/ompi/mpi/c/comm_join.c @@ -33,10 +33,11 @@ #endif #include "ompi/mpi/c/bindings.h" -#include "ompi/proc/proc.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/dpm/dpm.h" -#include "orte/util/name_fns.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Comm_join = PMPI_Comm_join diff --git a/ompi/mpi/c/comm_rank.c b/ompi/mpi/c/comm_rank.c index 2a2faea038..b3541312f4 100644 --- a/ompi/mpi/c/comm_rank.c +++ b/ompi/mpi/c/comm_rank.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/comm_remote_group.c b/ompi/mpi/c/comm_remote_group.c index 1223ca1b00..f4b0101929 100644 --- a/ompi/mpi/c/comm_remote_group.c +++ b/ompi/mpi/c/comm_remote_group.c @@ -21,6 +21,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/comm_remote_size.c b/ompi/mpi/c/comm_remote_size.c index a0a4718b2d..bd817c9761 100644 --- a/ompi/mpi/c/comm_remote_size.c +++ b/ompi/mpi/c/comm_remote_size.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/comm_set_attr.c b/ompi/mpi/c/comm_set_attr.c index ff88ef812e..49e7b5f50e 100644 --- a/ompi/mpi/c/comm_set_attr.c +++ b/ompi/mpi/c/comm_set_attr.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/comm_set_errhandler.c b/ompi/mpi/c/comm_set_errhandler.c index 4a5b73fd5c..d08894f5f6 100644 --- a/ompi/mpi/c/comm_set_errhandler.c +++ b/ompi/mpi/c/comm_set_errhandler.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/comm_set_name.c b/ompi/mpi/c/comm_set_name.c index c97da70600..a0705accf2 100644 --- a/ompi/mpi/c/comm_set_name.c +++ b/ompi/mpi/c/comm_set_name.c @@ -22,7 +22,9 @@ #include #include "ompi/mpi/c/bindings.h" -#include "opal/util/strncpy.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/totalview.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/comm_size.c b/ompi/mpi/c/comm_size.c index 521182017d..3628a7559a 100644 --- a/ompi/mpi/c/comm_size.c +++ b/ompi/mpi/c/comm_size.c @@ -22,6 +22,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/comm_spawn.c b/ompi/mpi/c/comm_spawn.c index b8bba7ccca..2a2be096c5 100644 --- a/ompi/mpi/c/comm_spawn.c +++ b/ompi/mpi/c/comm_spawn.c @@ -21,6 +21,9 @@ #include "ompi/info/info.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/dpm/dpm.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/comm_spawn_multiple.c b/ompi/mpi/c/comm_spawn_multiple.c index 56861b36eb..ce329903ed 100644 --- a/ompi/mpi/c/comm_spawn_multiple.c +++ b/ompi/mpi/c/comm_spawn_multiple.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" #include "ompi/mca/dpm/dpm.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/comm_split.c b/ompi/mpi/c/comm_split.c index d91894b60c..849563788c 100644 --- a/ompi/mpi/c/comm_split.c +++ b/ompi/mpi/c/comm_split.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/comm_test_inter.c b/ompi/mpi/c/comm_test_inter.c index 8050d23804..a41354aaab 100644 --- a/ompi/mpi/c/comm_test_inter.c +++ b/ompi/mpi/c/comm_test_inter.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/dims_create.c b/ompi/mpi/c/dims_create.c index 937931676d..4e9733f1e4 100644 --- a/ompi/mpi/c/dims_create.c +++ b/ompi/mpi/c/dims_create.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Dims_create = PMPI_Dims_create diff --git a/ompi/mpi/c/errhandler_c2f.c b/ompi/mpi/c/errhandler_c2f.c index 37ff754bcd..acdc9bb608 100644 --- a/ompi/mpi/c/errhandler_c2f.c +++ b/ompi/mpi/c/errhandler_c2f.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mpi/f77/fint_2_int.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/errhandler_create.c b/ompi/mpi/c/errhandler_create.c index d673fd11d1..02215df505 100644 --- a/ompi/mpi/c/errhandler_create.c +++ b/ompi/mpi/c/errhandler_create.c @@ -19,6 +19,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Errhandler_create = PMPI_Errhandler_create diff --git a/ompi/mpi/c/errhandler_f2c.c b/ompi/mpi/c/errhandler_f2c.c index a42c12f241..6523995313 100644 --- a/ompi/mpi/c/errhandler_f2c.c +++ b/ompi/mpi/c/errhandler_f2c.c @@ -21,6 +21,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mpi/f77/fint_2_int.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/errhandler_free.c b/ompi/mpi/c/errhandler_free.c index d19aec844f..15c0b17f5d 100644 --- a/ompi/mpi/c/errhandler_free.c +++ b/ompi/mpi/c/errhandler_free.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Errhandler_free = PMPI_Errhandler_free diff --git a/ompi/mpi/c/errhandler_get.c b/ompi/mpi/c/errhandler_get.c index e6fb1c6fb0..da7f09f5bf 100644 --- a/ompi/mpi/c/errhandler_get.c +++ b/ompi/mpi/c/errhandler_get.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/errhandler_set.c b/ompi/mpi/c/errhandler_set.c index 1afcec9d09..e48785a9b8 100644 --- a/ompi/mpi/c/errhandler_set.c +++ b/ompi/mpi/c/errhandler_set.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/error_class.c b/ompi/mpi/c/error_class.c index e0655a5bcf..12f459dbc2 100644 --- a/ompi/mpi/c/error_class.c +++ b/ompi/mpi/c/error_class.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/errhandler/errcode.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/error_string.c b/ompi/mpi/c/error_string.c index 73cfa1adf9..d3a472845a 100644 --- a/ompi/mpi/c/error_string.c +++ b/ompi/mpi/c/error_string.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/errhandler/errcode.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/exscan.c b/ompi/mpi/c/exscan.c index 861afa7d03..334a4227b7 100644 --- a/ompi/mpi/c/exscan.c +++ b/ompi/mpi/c/exscan.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/op/op.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/file_c2f.c b/ompi/mpi/c/file_c2f.c index 06f70b5162..016502d59f 100644 --- a/ompi/mpi/c/file_c2f.c +++ b/ompi/mpi/c/file_c2f.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mpi/f77/fint_2_int.h" #include "ompi/file/file.h" diff --git a/ompi/mpi/c/file_call_errhandler.c b/ompi/mpi/c/file_call_errhandler.c index c23cc221ac..6d0a79709f 100644 --- a/ompi/mpi/c/file_call_errhandler.c +++ b/ompi/mpi/c/file_call_errhandler.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_close.c b/ompi/mpi/c/file_close.c index 9b249119cc..73bfd9e3fe 100644 --- a/ompi/mpi/c/file_close.c +++ b/ompi/mpi/c/file_close.c @@ -19,6 +19,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_create_errhandler.c b/ompi/mpi/c/file_create_errhandler.c index 855c043475..e116f0ddcf 100644 --- a/ompi/mpi/c/file_create_errhandler.c +++ b/ompi/mpi/c/file_create_errhandler.c @@ -20,6 +20,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_delete.c b/ompi/mpi/c/file_delete.c index 6e90f1fee6..1e65d4dfd3 100644 --- a/ompi/mpi/c/file_delete.c +++ b/ompi/mpi/c/file_delete.c @@ -19,6 +19,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" #include "ompi/file/file.h" #include "ompi/mca/io/io.h" diff --git a/ompi/mpi/c/file_f2c.c b/ompi/mpi/c/file_f2c.c index e7f91bb1f0..0b01d2d712 100644 --- a/ompi/mpi/c/file_f2c.c +++ b/ompi/mpi/c/file_f2c.c @@ -21,6 +21,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mpi/f77/fint_2_int.h" #include "ompi/file/file.h" diff --git a/ompi/mpi/c/file_get_amode.c b/ompi/mpi/c/file_get_amode.c index 6d4483d5e3..d555495d08 100644 --- a/ompi/mpi/c/file_get_amode.c +++ b/ompi/mpi/c/file_get_amode.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_get_atomicity.c b/ompi/mpi/c/file_get_atomicity.c index 82b8fda9b6..f3f7e257e1 100644 --- a/ompi/mpi/c/file_get_atomicity.c +++ b/ompi/mpi/c/file_get_atomicity.c @@ -20,8 +20,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#include "ompi/datatype/datatype.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_File_get_atomicity = PMPI_File_get_atomicity diff --git a/ompi/mpi/c/file_get_byte_offset.c b/ompi/mpi/c/file_get_byte_offset.c index 8710cb3cb0..09ad2e51c8 100644 --- a/ompi/mpi/c/file_get_byte_offset.c +++ b/ompi/mpi/c/file_get_byte_offset.c @@ -20,8 +20,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" -#include "ompi/datatype/datatype.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_File_get_byte_offset = PMPI_File_get_byte_offset diff --git a/ompi/mpi/c/file_get_errhandler.c b/ompi/mpi/c/file_get_errhandler.c index c94bc13734..cacca065ce 100644 --- a/ompi/mpi/c/file_get_errhandler.c +++ b/ompi/mpi/c/file_get_errhandler.c @@ -20,6 +20,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_get_group.c b/ompi/mpi/c/file_get_group.c index 91226db916..81aa247852 100644 --- a/ompi/mpi/c/file_get_group.c +++ b/ompi/mpi/c/file_get_group.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_get_info.c b/ompi/mpi/c/file_get_info.c index ca2d527a1e..8a2ab03ad0 100644 --- a/ompi/mpi/c/file_get_info.c +++ b/ompi/mpi/c/file_get_info.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_get_position.c b/ompi/mpi/c/file_get_position.c index 9543f1bcbb..6239191eaa 100644 --- a/ompi/mpi/c/file_get_position.c +++ b/ompi/mpi/c/file_get_position.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_get_position_shared.c b/ompi/mpi/c/file_get_position_shared.c index 5405f00237..363fd95a4c 100644 --- a/ompi/mpi/c/file_get_position_shared.c +++ b/ompi/mpi/c/file_get_position_shared.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_get_size.c b/ompi/mpi/c/file_get_size.c index a2ac6a3fda..dca1721932 100644 --- a/ompi/mpi/c/file_get_size.c +++ b/ompi/mpi/c/file_get_size.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_get_type_extent.c b/ompi/mpi/c/file_get_type_extent.c index 0be05c2c4a..c32e10c0c0 100644 --- a/ompi/mpi/c/file_get_type_extent.c +++ b/ompi/mpi/c/file_get_type_extent.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/file_get_view.c b/ompi/mpi/c/file_get_view.c index e642323692..dbb9dc3f67 100644 --- a/ompi/mpi/c/file_get_view.c +++ b/ompi/mpi/c/file_get_view.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_iread.c b/ompi/mpi/c/file_iread.c index 4db3bbe503..79cfff49cd 100644 --- a/ompi/mpi/c/file_iread.c +++ b/ompi/mpi/c/file_iread.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/file/file.h" #include "ompi/mca/io/io.h" diff --git a/ompi/mpi/c/file_iread_at.c b/ompi/mpi/c/file_iread_at.c index 5af800d431..8d6a2a7546 100644 --- a/ompi/mpi/c/file_iread_at.c +++ b/ompi/mpi/c/file_iread_at.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/file/file.h" #include "ompi/mca/io/io.h" diff --git a/ompi/mpi/c/file_iread_shared.c b/ompi/mpi/c/file_iread_shared.c index 0f8579afba..c8e5b61c4a 100644 --- a/ompi/mpi/c/file_iread_shared.c +++ b/ompi/mpi/c/file_iread_shared.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/file/file.h" #include "ompi/mca/io/io.h" diff --git a/ompi/mpi/c/file_iwrite.c b/ompi/mpi/c/file_iwrite.c index 84a81ab45d..24bdc44c18 100644 --- a/ompi/mpi/c/file_iwrite.c +++ b/ompi/mpi/c/file_iwrite.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/file/file.h" #include "ompi/mca/io/io.h" diff --git a/ompi/mpi/c/file_iwrite_at.c b/ompi/mpi/c/file_iwrite_at.c index b09c0ff3e2..aa45916ee1 100644 --- a/ompi/mpi/c/file_iwrite_at.c +++ b/ompi/mpi/c/file_iwrite_at.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/file/file.h" #include "ompi/mca/io/io.h" diff --git a/ompi/mpi/c/file_iwrite_shared.c b/ompi/mpi/c/file_iwrite_shared.c index 7c4e690e3b..39404dd1dc 100644 --- a/ompi/mpi/c/file_iwrite_shared.c +++ b/ompi/mpi/c/file_iwrite_shared.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/file/file.h" #include "ompi/mca/io/io.h" diff --git a/ompi/mpi/c/file_open.c b/ompi/mpi/c/file_open.c index 745010ac8c..3eda74bf38 100644 --- a/ompi/mpi/c/file_open.c +++ b/ompi/mpi/c/file_open.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" #include "ompi/file/file.h" #include "ompi/mca/io/io.h" diff --git a/ompi/mpi/c/file_preallocate.c b/ompi/mpi/c/file_preallocate.c index 6e0b1e03fd..127980904e 100644 --- a/ompi/mpi/c/file_preallocate.c +++ b/ompi/mpi/c/file_preallocate.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_read.c b/ompi/mpi/c/file_read.c index bdeb0b0734..52a92a6c31 100644 --- a/ompi/mpi/c/file_read.c +++ b/ompi/mpi/c/file_read.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/file_read_all.c b/ompi/mpi/c/file_read_all.c index c3aa1283fe..bdce7108f6 100644 --- a/ompi/mpi/c/file_read_all.c +++ b/ompi/mpi/c/file_read_all.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/file_read_all_begin.c b/ompi/mpi/c/file_read_all_begin.c index f348a38929..2f03b3ef78 100644 --- a/ompi/mpi/c/file_read_all_begin.c +++ b/ompi/mpi/c/file_read_all_begin.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/file_read_all_end.c b/ompi/mpi/c/file_read_all_end.c index 1afecad8fc..e7fd35f15b 100644 --- a/ompi/mpi/c/file_read_all_end.c +++ b/ompi/mpi/c/file_read_all_end.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_read_at.c b/ompi/mpi/c/file_read_at.c index bc9c2d0455..21d1101668 100644 --- a/ompi/mpi/c/file_read_at.c +++ b/ompi/mpi/c/file_read_at.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/file_read_at_all.c b/ompi/mpi/c/file_read_at_all.c index e252f95cfe..e68a1dd405 100644 --- a/ompi/mpi/c/file_read_at_all.c +++ b/ompi/mpi/c/file_read_at_all.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/file_read_at_all_begin.c b/ompi/mpi/c/file_read_at_all_begin.c index 2347488e74..fb3842efc8 100644 --- a/ompi/mpi/c/file_read_at_all_begin.c +++ b/ompi/mpi/c/file_read_at_all_begin.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/file_read_at_all_end.c b/ompi/mpi/c/file_read_at_all_end.c index 42c738c9ff..a473f95813 100644 --- a/ompi/mpi/c/file_read_at_all_end.c +++ b/ompi/mpi/c/file_read_at_all_end.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_read_ordered.c b/ompi/mpi/c/file_read_ordered.c index 9faaca0396..164553c749 100644 --- a/ompi/mpi/c/file_read_ordered.c +++ b/ompi/mpi/c/file_read_ordered.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #include "ompi/datatype/datatype.h" diff --git a/ompi/mpi/c/file_read_ordered_begin.c b/ompi/mpi/c/file_read_ordered_begin.c index b17a8b46fa..30f311d13d 100644 --- a/ompi/mpi/c/file_read_ordered_begin.c +++ b/ompi/mpi/c/file_read_ordered_begin.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/file_read_ordered_end.c b/ompi/mpi/c/file_read_ordered_end.c index d82e54e46e..048842fbbf 100644 --- a/ompi/mpi/c/file_read_ordered_end.c +++ b/ompi/mpi/c/file_read_ordered_end.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_read_shared.c b/ompi/mpi/c/file_read_shared.c index b5e3dba618..7dfbdff9c5 100644 --- a/ompi/mpi/c/file_read_shared.c +++ b/ompi/mpi/c/file_read_shared.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/file_seek.c b/ompi/mpi/c/file_seek.c index e1743813bf..a59ed7a122 100644 --- a/ompi/mpi/c/file_seek.c +++ b/ompi/mpi/c/file_seek.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_seek_shared.c b/ompi/mpi/c/file_seek_shared.c index 8e78e171a9..f230138d6b 100644 --- a/ompi/mpi/c/file_seek_shared.c +++ b/ompi/mpi/c/file_seek_shared.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_set_atomicity.c b/ompi/mpi/c/file_set_atomicity.c index ecc3d468b1..3e8baa68dc 100644 --- a/ompi/mpi/c/file_set_atomicity.c +++ b/ompi/mpi/c/file_set_atomicity.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_set_errhandler.c b/ompi/mpi/c/file_set_errhandler.c index fc049a5dc7..07e80f4ab8 100644 --- a/ompi/mpi/c/file_set_errhandler.c +++ b/ompi/mpi/c/file_set_errhandler.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_set_info.c b/ompi/mpi/c/file_set_info.c index 31d99057f0..4ee36ac246 100644 --- a/ompi/mpi/c/file_set_info.c +++ b/ompi/mpi/c/file_set_info.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" #include "ompi/file/file.h" diff --git a/ompi/mpi/c/file_set_size.c b/ompi/mpi/c/file_set_size.c index 74f62872e2..3d9548ba68 100644 --- a/ompi/mpi/c/file_set_size.c +++ b/ompi/mpi/c/file_set_size.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_set_view.c b/ompi/mpi/c/file_set_view.c index f95f7f029b..476fe1f9e7 100644 --- a/ompi/mpi/c/file_set_view.c +++ b/ompi/mpi/c/file_set_view.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/info/info.h" #include "ompi/file/file.h" diff --git a/ompi/mpi/c/file_sync.c b/ompi/mpi/c/file_sync.c index 5075c517df..ef7f31d4f7 100644 --- a/ompi/mpi/c/file_sync.c +++ b/ompi/mpi/c/file_sync.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_write.c b/ompi/mpi/c/file_write.c index b63a4dc7bb..b1bcb09bdf 100644 --- a/ompi/mpi/c/file_write.c +++ b/ompi/mpi/c/file_write.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/file_write_all.c b/ompi/mpi/c/file_write_all.c index badadb67e4..0a18c0d971 100644 --- a/ompi/mpi/c/file_write_all.c +++ b/ompi/mpi/c/file_write_all.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/file_write_all_begin.c b/ompi/mpi/c/file_write_all_begin.c index 4ea3474259..603083072a 100644 --- a/ompi/mpi/c/file_write_all_begin.c +++ b/ompi/mpi/c/file_write_all_begin.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/file_write_all_end.c b/ompi/mpi/c/file_write_all_end.c index e910115dd3..04a15cf8dd 100644 --- a/ompi/mpi/c/file_write_all_end.c +++ b/ompi/mpi/c/file_write_all_end.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_write_at.c b/ompi/mpi/c/file_write_at.c index 9a325b45f0..60313039d1 100644 --- a/ompi/mpi/c/file_write_at.c +++ b/ompi/mpi/c/file_write_at.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/file_write_at_all.c b/ompi/mpi/c/file_write_at_all.c index 454b03cd78..fa657cc3f4 100644 --- a/ompi/mpi/c/file_write_at_all.c +++ b/ompi/mpi/c/file_write_at_all.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/file_write_at_all_begin.c b/ompi/mpi/c/file_write_at_all_begin.c index ebc3f56b0e..7812b8fbd0 100644 --- a/ompi/mpi/c/file_write_at_all_begin.c +++ b/ompi/mpi/c/file_write_at_all_begin.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/file_write_at_all_end.c b/ompi/mpi/c/file_write_at_all_end.c index 55bf4cec68..a21a2a1a72 100644 --- a/ompi/mpi/c/file_write_at_all_end.c +++ b/ompi/mpi/c/file_write_at_all_end.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_write_ordered.c b/ompi/mpi/c/file_write_ordered.c index 254a1e91ee..7f95f42025 100644 --- a/ompi/mpi/c/file_write_ordered.c +++ b/ompi/mpi/c/file_write_ordered.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/file_write_ordered_begin.c b/ompi/mpi/c/file_write_ordered_begin.c index 933da084b4..5b702ac958 100644 --- a/ompi/mpi/c/file_write_ordered_begin.c +++ b/ompi/mpi/c/file_write_ordered_begin.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/file_write_ordered_end.c b/ompi/mpi/c/file_write_ordered_end.c index c15390fa08..cb09d00479 100644 --- a/ompi/mpi/c/file_write_ordered_end.c +++ b/ompi/mpi/c/file_write_ordered_end.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/file_write_shared.c b/ompi/mpi/c/file_write_shared.c index 56761e8d7b..7cd25c86e5 100644 --- a/ompi/mpi/c/file_write_shared.c +++ b/ompi/mpi/c/file_write_shared.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/file/file.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/finalize.c b/ompi/mpi/c/finalize.c index 66b6a450ac..d520663c49 100644 --- a/ompi/mpi/c/finalize.c +++ b/ompi/mpi/c/finalize.c @@ -19,6 +19,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Finalize = PMPI_Finalize diff --git a/ompi/mpi/c/finalized.c b/ompi/mpi/c/finalized.c index 704f925e1f..a377843f1d 100644 --- a/ompi/mpi/c/finalized.c +++ b/ompi/mpi/c/finalized.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Finalized = PMPI_Finalized diff --git a/ompi/mpi/c/free_mem.c b/ompi/mpi/c/free_mem.c index fac690a9de..eb67ea82af 100644 --- a/ompi/mpi/c/free_mem.c +++ b/ompi/mpi/c/free_mem.c @@ -23,6 +23,8 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/mpool/mpool.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/gather.c b/ompi/mpi/c/gather.c index cbd7dd4c0a..8df8efed8a 100644 --- a/ompi/mpi/c/gather.c +++ b/ompi/mpi/c/gather.c @@ -22,6 +22,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/gatherv.c b/ompi/mpi/c/gatherv.c index c604476abd..eb6ea4b232 100644 --- a/ompi/mpi/c/gatherv.c +++ b/ompi/mpi/c/gatherv.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/get.c b/ompi/mpi/c/get.c index 7da8873c5a..ea0527017f 100644 --- a/ompi/mpi/c/get.c +++ b/ompi/mpi/c/get.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" #include "ompi/mca/osc/osc.h" #include "ompi/datatype/datatype.h" diff --git a/ompi/mpi/c/get_address.c b/ompi/mpi/c/get_address.c index 2947090749..f2c689d8d8 100644 --- a/ompi/mpi/c/get_address.c +++ b/ompi/mpi/c/get_address.c @@ -18,6 +18,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Get_address = PMPI_Get_address diff --git a/ompi/mpi/c/get_count.c b/ompi/mpi/c/get_count.c index f356db9f3f..b053765fc9 100644 --- a/ompi/mpi/c/get_count.c +++ b/ompi/mpi/c/get_count.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/get_elements.c b/ompi/mpi/c/get_elements.c index 38fcce909a..412fd7b918 100644 --- a/ompi/mpi/c/get_elements.c +++ b/ompi/mpi/c/get_elements.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/get_processor_name.c b/ompi/mpi/c/get_processor_name.c index 167f56a8bc..808bae6cdc 100644 --- a/ompi/mpi/c/get_processor_name.c +++ b/ompi/mpi/c/get_processor_name.c @@ -24,6 +24,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Get_processor_name = PMPI_Get_processor_name diff --git a/ompi/mpi/c/get_version.c b/ompi/mpi/c/get_version.c index 7e977aac3a..321fe67a54 100644 --- a/ompi/mpi/c/get_version.c +++ b/ompi/mpi/c/get_version.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Get_version = PMPI_Get_version diff --git a/ompi/mpi/c/graph_create.c b/ompi/mpi/c/graph_create.c index 79df947cbd..ceaec52aba 100644 --- a/ompi/mpi/c/graph_create.c +++ b/ompi/mpi/c/graph_create.c @@ -20,7 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" -#include "ompi/mca/topo/topo.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/topo/base/base.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/graph_get.c b/ompi/mpi/c/graph_get.c index e88ed9242e..870fb1d03c 100644 --- a/ompi/mpi/c/graph_get.c +++ b/ompi/mpi/c/graph_get.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/topo/topo.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/graph_map.c b/ompi/mpi/c/graph_map.c index a95cd81bba..eddbb2f23d 100644 --- a/ompi/mpi/c/graph_map.c +++ b/ompi/mpi/c/graph_map.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/topo/topo.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/graph_neighbors.c b/ompi/mpi/c/graph_neighbors.c index fa8e90c3a0..89f257ff11 100644 --- a/ompi/mpi/c/graph_neighbors.c +++ b/ompi/mpi/c/graph_neighbors.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/topo/topo.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/graph_neighbors_count.c b/ompi/mpi/c/graph_neighbors_count.c index a47ac03e45..be5cee4e14 100644 --- a/ompi/mpi/c/graph_neighbors_count.c +++ b/ompi/mpi/c/graph_neighbors_count.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/topo/topo.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/graphdims_get.c b/ompi/mpi/c/graphdims_get.c index 2177597071..94333919d1 100644 --- a/ompi/mpi/c/graphdims_get.c +++ b/ompi/mpi/c/graphdims_get.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/topo/topo.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/grequest_complete.c b/ompi/mpi/c/grequest_complete.c index 4709e88aaa..64621d20d3 100644 --- a/ompi/mpi/c/grequest_complete.c +++ b/ompi/mpi/c/grequest_complete.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/request/grequest.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/grequest_start.c b/ompi/mpi/c/grequest_start.c index fb58746dc9..5e46ac5fc2 100644 --- a/ompi/mpi/c/grequest_start.c +++ b/ompi/mpi/c/grequest_start.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/request/grequest.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/group_c2f.c b/ompi/mpi/c/group_c2f.c index ddff686020..bd9e02ac6f 100644 --- a/ompi/mpi/c/group_c2f.c +++ b/ompi/mpi/c/group_c2f.c @@ -20,6 +20,8 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mpi/f77/fint_2_int.h" #include "ompi/group/group.h" diff --git a/ompi/mpi/c/group_compare.c b/ompi/mpi/c/group_compare.c index 3594dd0059..8e7d9e53b9 100644 --- a/ompi/mpi/c/group_compare.c +++ b/ompi/mpi/c/group_compare.c @@ -20,6 +20,7 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" #include "ompi/group/group.h" #include "ompi/errhandler/errhandler.h" #include "ompi/communicator/communicator.h" diff --git a/ompi/mpi/c/group_difference.c b/ompi/mpi/c/group_difference.c index 82d8e89c9a..24a0a1daf0 100644 --- a/ompi/mpi/c/group_difference.c +++ b/ompi/mpi/c/group_difference.c @@ -21,10 +21,10 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" #include "ompi/communicator/communicator.h" #include "ompi/errhandler/errhandler.h" #include "ompi/group/group.h" -#include "ompi/proc/proc.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Group_difference = PMPI_Group_difference diff --git a/ompi/mpi/c/group_excl.c b/ompi/mpi/c/group_excl.c index 71e1815bdb..c8a4c6c01f 100644 --- a/ompi/mpi/c/group_excl.c +++ b/ompi/mpi/c/group_excl.c @@ -21,10 +21,10 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" #include "ompi/group/group.h" #include "ompi/errhandler/errhandler.h" #include "ompi/communicator/communicator.h" -#include "ompi/proc/proc.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Group_excl = PMPI_Group_excl diff --git a/ompi/mpi/c/group_f2c.c b/ompi/mpi/c/group_f2c.c index daca4898e8..ebd3fa09cf 100644 --- a/ompi/mpi/c/group_f2c.c +++ b/ompi/mpi/c/group_f2c.c @@ -21,6 +21,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mpi/f77/fint_2_int.h" #include "ompi/group/group.h" diff --git a/ompi/mpi/c/group_free.c b/ompi/mpi/c/group_free.c index 34231edd4b..415f730f95 100644 --- a/ompi/mpi/c/group_free.c +++ b/ompi/mpi/c/group_free.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/group/group.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/group_incl.c b/ompi/mpi/c/group_incl.c index 7b760d2eab..0e8bcb96e1 100644 --- a/ompi/mpi/c/group_incl.c +++ b/ompi/mpi/c/group_incl.c @@ -21,10 +21,10 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" #include "ompi/group/group.h" #include "ompi/errhandler/errhandler.h" #include "ompi/communicator/communicator.h" -#include "ompi/proc/proc.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Group_incl = PMPI_Group_incl diff --git a/ompi/mpi/c/group_intersection.c b/ompi/mpi/c/group_intersection.c index bb31ff75e3..47059b591d 100644 --- a/ompi/mpi/c/group_intersection.c +++ b/ompi/mpi/c/group_intersection.c @@ -21,10 +21,10 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" #include "ompi/group/group.h" #include "ompi/errhandler/errhandler.h" #include "ompi/communicator/communicator.h" -#include "ompi/proc/proc.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Group_intersection = PMPI_Group_intersection diff --git a/ompi/mpi/c/group_range_excl.c b/ompi/mpi/c/group_range_excl.c index 2d47317f3e..4630e0170b 100644 --- a/ompi/mpi/c/group_range_excl.c +++ b/ompi/mpi/c/group_range_excl.c @@ -21,10 +21,10 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" #include "ompi/group/group.h" #include "ompi/errhandler/errhandler.h" #include "ompi/communicator/communicator.h" -#include "ompi/proc/proc.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Group_range_excl = PMPI_Group_range_excl diff --git a/ompi/mpi/c/group_range_incl.c b/ompi/mpi/c/group_range_incl.c index fc8296f064..608c3bde31 100644 --- a/ompi/mpi/c/group_range_incl.c +++ b/ompi/mpi/c/group_range_incl.c @@ -21,10 +21,10 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" #include "ompi/group/group.h" #include "ompi/errhandler/errhandler.h" #include "ompi/communicator/communicator.h" -#include "ompi/proc/proc.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Group_range_incl = PMPI_Group_range_incl diff --git a/ompi/mpi/c/group_rank.c b/ompi/mpi/c/group_rank.c index fc13157b90..cf369bdbf3 100644 --- a/ompi/mpi/c/group_rank.c +++ b/ompi/mpi/c/group_rank.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/group/group.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/group_size.c b/ompi/mpi/c/group_size.c index 849f85dbf1..e59082dfb1 100644 --- a/ompi/mpi/c/group_size.c +++ b/ompi/mpi/c/group_size.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/group/group.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/group_translate_ranks.c b/ompi/mpi/c/group_translate_ranks.c index 3afe4c4ee9..13a6513347 100644 --- a/ompi/mpi/c/group_translate_ranks.c +++ b/ompi/mpi/c/group_translate_ranks.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/group/group.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/group_union.c b/ompi/mpi/c/group_union.c index f85770d818..7eb2654997 100644 --- a/ompi/mpi/c/group_union.c +++ b/ompi/mpi/c/group_union.c @@ -21,10 +21,10 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" #include "ompi/group/group.h" #include "ompi/errhandler/errhandler.h" #include "ompi/communicator/communicator.h" -#include "ompi/proc/proc.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Group_union = PMPI_Group_union diff --git a/ompi/mpi/c/ibsend.c b/ompi/mpi/c/ibsend.c index 64e5e93cde..8f2dd2f846 100644 --- a/ompi/mpi/c/ibsend.c +++ b/ompi/mpi/c/ibsend.c @@ -20,6 +20,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/pml/base/pml_base_bsend.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/info_c2f.c b/ompi/mpi/c/info_c2f.c index 69a7afac9b..28ecf30a5c 100644 --- a/ompi/mpi/c/info_c2f.c +++ b/ompi/mpi/c/info_c2f.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mpi/f77/fint_2_int.h" #include "ompi/info/info.h" diff --git a/ompi/mpi/c/info_create.c b/ompi/mpi/c/info_create.c index c361c458bb..90f11fdfc3 100644 --- a/ompi/mpi/c/info_create.c +++ b/ompi/mpi/c/info_create.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/info_delete.c b/ompi/mpi/c/info_delete.c index adaf271289..20d2c860fb 100644 --- a/ompi/mpi/c/info_delete.c +++ b/ompi/mpi/c/info_delete.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" #include #include diff --git a/ompi/mpi/c/info_dup.c b/ompi/mpi/c/info_dup.c index a286b8f4fd..c1187a6b7a 100644 --- a/ompi/mpi/c/info_dup.c +++ b/ompi/mpi/c/info_dup.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/info_f2c.c b/ompi/mpi/c/info_f2c.c index 6835527bb8..a4679a26b1 100644 --- a/ompi/mpi/c/info_f2c.c +++ b/ompi/mpi/c/info_f2c.c @@ -21,6 +21,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mpi/f77/fint_2_int.h" #include "ompi/info/info.h" diff --git a/ompi/mpi/c/info_free.c b/ompi/mpi/c/info_free.c index 4c34c13a79..e6da5eb387 100644 --- a/ompi/mpi/c/info_free.c +++ b/ompi/mpi/c/info_free.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/info_get.c b/ompi/mpi/c/info_get.c index 6f61df2047..a5ee9d9932 100644 --- a/ompi/mpi/c/info_get.c +++ b/ompi/mpi/c/info_get.c @@ -19,8 +19,10 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" -#include "opal/util/strncpy.h" #include #include diff --git a/ompi/mpi/c/info_get_nkeys.c b/ompi/mpi/c/info_get_nkeys.c index d80e7b34df..c3da11217e 100644 --- a/ompi/mpi/c/info_get_nkeys.c +++ b/ompi/mpi/c/info_get_nkeys.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/info_get_nthkey.c b/ompi/mpi/c/info_get_nthkey.c index 8338c2cbe6..ba2dcca507 100644 --- a/ompi/mpi/c/info_get_nthkey.c +++ b/ompi/mpi/c/info_get_nthkey.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" #include diff --git a/ompi/mpi/c/info_get_valuelen.c b/ompi/mpi/c/info_get_valuelen.c index 968856e153..618ee4d4b4 100644 --- a/ompi/mpi/c/info_get_valuelen.c +++ b/ompi/mpi/c/info_get_valuelen.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" #include #include diff --git a/ompi/mpi/c/info_set.c b/ompi/mpi/c/info_set.c index 86ebeb0175..189f211c15 100644 --- a/ompi/mpi/c/info_set.c +++ b/ompi/mpi/c/info_set.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" #include #include diff --git a/ompi/mpi/c/init.c b/ompi/mpi/c/init.c index c7b572768d..eed16f0acc 100644 --- a/ompi/mpi/c/init.c +++ b/ompi/mpi/c/init.c @@ -24,6 +24,8 @@ #include "orte/util/show_help.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/constants.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/init_thread.c b/ompi/mpi/c/init_thread.c index 83c5975f40..bb28e17591 100644 --- a/ompi/mpi/c/init_thread.c +++ b/ompi/mpi/c/init_thread.c @@ -20,6 +20,9 @@ #include "orte/util/show_help.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/constants.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/initialized.c b/ompi/mpi/c/initialized.c index cf3174338a..eea19a3659 100644 --- a/ompi/mpi/c/initialized.c +++ b/ompi/mpi/c/initialized.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Initialized = PMPI_Initialized diff --git a/ompi/mpi/c/intercomm_create.c b/ompi/mpi/c/intercomm_create.c index dc9988f7b2..1980a82f3a 100644 --- a/ompi/mpi/c/intercomm_create.c +++ b/ompi/mpi/c/intercomm_create.c @@ -21,6 +21,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/pml/pml.h" #include "ompi/communicator/communicator.h" #include "ompi/request/request.h" diff --git a/ompi/mpi/c/intercomm_merge.c b/ompi/mpi/c/intercomm_merge.c index 7c9006560a..6df2d75a90 100644 --- a/ompi/mpi/c/intercomm_merge.c +++ b/ompi/mpi/c/intercomm_merge.c @@ -22,6 +22,8 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/communicator/communicator.h" #include "ompi/proc/proc.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/iprobe.c b/ompi/mpi/c/iprobe.c index d4bf9c5402..553ff51c82 100644 --- a/ompi/mpi/c/iprobe.c +++ b/ompi/mpi/c/iprobe.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/pml/pml.h" #include "ompi/memchecker.h" #include "ompi/request/request.h" diff --git a/ompi/mpi/c/irecv.c b/ompi/mpi/c/irecv.c index 9e1afd9bb5..6324218f84 100644 --- a/ompi/mpi/c/irecv.c +++ b/ompi/mpi/c/irecv.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/pml/pml.h" #include "ompi/request/request.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/irsend.c b/ompi/mpi/c/irsend.c index 5f76b1c2ae..504a25e858 100644 --- a/ompi/mpi/c/irsend.c +++ b/ompi/mpi/c/irsend.c @@ -20,6 +20,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/pml/pml.h" #include "ompi/request/request.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/is_thread_main.c b/ompi/mpi/c/is_thread_main.c index 1aacaee27b..1b806b8db1 100644 --- a/ompi/mpi/c/is_thread_main.c +++ b/ompi/mpi/c/is_thread_main.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/runtime/mpiruntime.h" #include "opal/threads/threads.h" diff --git a/ompi/mpi/c/isend.c b/ompi/mpi/c/isend.c index 44d0687986..da47c9df18 100644 --- a/ompi/mpi/c/isend.c +++ b/ompi/mpi/c/isend.c @@ -20,6 +20,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/pml/pml.h" #include "ompi/request/request.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/issend.c b/ompi/mpi/c/issend.c index da41bc29d3..5d4d261ca5 100644 --- a/ompi/mpi/c/issend.c +++ b/ompi/mpi/c/issend.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/pml/pml.h" #include "ompi/request/request.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/keyval_create.c b/ompi/mpi/c/keyval_create.c index b9cca39c51..87f9bfdcb8 100644 --- a/ompi/mpi/c/keyval_create.c +++ b/ompi/mpi/c/keyval_create.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" #include "ompi/communicator/communicator.h" diff --git a/ompi/mpi/c/keyval_free.c b/ompi/mpi/c/keyval_free.c index bdc6c0fc27..69355f47b4 100644 --- a/ompi/mpi/c/keyval_free.c +++ b/ompi/mpi/c/keyval_free.c @@ -19,6 +19,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" #include "ompi/communicator/communicator.h" diff --git a/ompi/mpi/c/lookup_name.c b/ompi/mpi/c/lookup_name.c index 59c9ec1a0c..d04812728f 100644 --- a/ompi/mpi/c/lookup_name.c +++ b/ompi/mpi/c/lookup_name.c @@ -19,6 +19,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" #include "ompi/communicator/communicator.h" #include "ompi/mca/pubsub/pubsub.h" diff --git a/ompi/mpi/c/op_c2f.c b/ompi/mpi/c/op_c2f.c index 1a27a2f7b2..a80544b0b5 100644 --- a/ompi/mpi/c/op_c2f.c +++ b/ompi/mpi/c/op_c2f.c @@ -20,6 +20,8 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mpi/f77/fint_2_int.h" #include "ompi/op/op.h" diff --git a/ompi/mpi/c/op_create.c b/ompi/mpi/c/op_create.c index 8081ef8ab5..2a1052168f 100644 --- a/ompi/mpi/c/op_create.c +++ b/ompi/mpi/c/op_create.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/op/op.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/op_f2c.c b/ompi/mpi/c/op_f2c.c index 64b6e2f273..5f5ef7d559 100644 --- a/ompi/mpi/c/op_f2c.c +++ b/ompi/mpi/c/op_f2c.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mpi/f77/fint_2_int.h" #include "ompi/op/op.h" diff --git a/ompi/mpi/c/op_free.c b/ompi/mpi/c/op_free.c index acf786b04c..bd34673ffc 100644 --- a/ompi/mpi/c/op_free.c +++ b/ompi/mpi/c/op_free.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/op/op.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/open_port.c b/ompi/mpi/c/open_port.c index 550d4028fc..aa4affdf53 100644 --- a/ompi/mpi/c/open_port.c +++ b/ompi/mpi/c/open_port.c @@ -19,8 +19,10 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" -#include "ompi/proc/proc.h" #include "ompi/mca/dpm/dpm.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/pack.c b/ompi/mpi/c/pack.c index ce6df1b203..17ea8d2a06 100644 --- a/ompi/mpi/c/pack.c +++ b/ompi/mpi/c/pack.c @@ -22,6 +22,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/datatype/convertor.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/pack_external.c b/ompi/mpi/c/pack_external.c index 6d30d2905a..3d3dbaf916 100644 --- a/ompi/mpi/c/pack_external.c +++ b/ompi/mpi/c/pack_external.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/datatype/convertor.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/pack_external_size.c b/ompi/mpi/c/pack_external_size.c index 2754b0b189..831ef7ea2c 100644 --- a/ompi/mpi/c/pack_external_size.c +++ b/ompi/mpi/c/pack_external_size.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/datatype/convertor.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/pack_size.c b/ompi/mpi/c/pack_size.c index 1dd4f02138..cfd74bdf3c 100644 --- a/ompi/mpi/c/pack_size.c +++ b/ompi/mpi/c/pack_size.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/datatype/convertor.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/pcontrol.c b/ompi/mpi/c/pcontrol.c index a8f13633ac..469162e9a8 100644 --- a/ompi/mpi/c/pcontrol.c +++ b/ompi/mpi/c/pcontrol.c @@ -19,6 +19,8 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Pcontrol = PMPI_Pcontrol diff --git a/ompi/mpi/c/probe.c b/ompi/mpi/c/probe.c index 84a12aa875..6f90aa0d79 100644 --- a/ompi/mpi/c/probe.c +++ b/ompi/mpi/c/probe.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/pml/pml.h" #include "ompi/memchecker.h" #include "ompi/request/request.h" diff --git a/ompi/mpi/c/publish_name.c b/ompi/mpi/c/publish_name.c index 1f62ebe5c3..58500d96ee 100644 --- a/ompi/mpi/c/publish_name.c +++ b/ompi/mpi/c/publish_name.c @@ -19,6 +19,8 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" #include "ompi/communicator/communicator.h" #include "ompi/mca/pubsub/pubsub.h" diff --git a/ompi/mpi/c/put.c b/ompi/mpi/c/put.c index c9a0b3b19a..3c6944cece 100644 --- a/ompi/mpi/c/put.c +++ b/ompi/mpi/c/put.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" #include "ompi/mca/osc/osc.h" #include "ompi/datatype/datatype.h" diff --git a/ompi/mpi/c/query_thread.c b/ompi/mpi/c/query_thread.c index ac35a5f803..3cd5dc6fc5 100644 --- a/ompi/mpi/c/query_thread.c +++ b/ompi/mpi/c/query_thread.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Query_thread = PMPI_Query_thread diff --git a/ompi/mpi/c/recv.c b/ompi/mpi/c/recv.c index 69d015ba2f..c58069f617 100644 --- a/ompi/mpi/c/recv.c +++ b/ompi/mpi/c/recv.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/pml/pml.h" #include "ompi/memchecker.h" #include "ompi/request/request.h" diff --git a/ompi/mpi/c/recv_init.c b/ompi/mpi/c/recv_init.c index c1af298abe..827163bd79 100644 --- a/ompi/mpi/c/recv_init.c +++ b/ompi/mpi/c/recv_init.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/pml/pml.h" #include "ompi/request/request.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/reduce.c b/ompi/mpi/c/reduce.c index 4b396c3418..20c7e43a40 100644 --- a/ompi/mpi/c/reduce.c +++ b/ompi/mpi/c/reduce.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/op/op.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/reduce_local.c b/ompi/mpi/c/reduce_local.c index 2084991c56..53116dabd2 100644 --- a/ompi/mpi/c/reduce_local.c +++ b/ompi/mpi/c/reduce_local.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/op/op.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/reduce_scatter.c b/ompi/mpi/c/reduce_scatter.c index 658e053993..6639d7da36 100644 --- a/ompi/mpi/c/reduce_scatter.c +++ b/ompi/mpi/c/reduce_scatter.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/op/op.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/register_datarep.c b/ompi/mpi/c/register_datarep.c index e495bcfd5c..4d5fcc8fa3 100644 --- a/ompi/mpi/c/register_datarep.c +++ b/ompi/mpi/c/register_datarep.c @@ -20,6 +20,8 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/io/base/base.h" #include "ompi/file/file.h" diff --git a/ompi/mpi/c/request_c2f.c b/ompi/mpi/c/request_c2f.c index 790e5df5e4..c733b7737f 100644 --- a/ompi/mpi/c/request_c2f.c +++ b/ompi/mpi/c/request_c2f.c @@ -21,6 +21,8 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mpi/f77/fint_2_int.h" #include "ompi/request/request.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/request_f2c.c b/ompi/mpi/c/request_f2c.c index 3b1cef6c07..e02f435eca 100644 --- a/ompi/mpi/c/request_f2c.c +++ b/ompi/mpi/c/request_f2c.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mpi/f77/fint_2_int.h" #include "ompi/request/request.h" diff --git a/ompi/mpi/c/request_free.c b/ompi/mpi/c/request_free.c index 49c6893c0a..95e0368e72 100644 --- a/ompi/mpi/c/request_free.c +++ b/ompi/mpi/c/request_free.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/request/request.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/request_get_status.c b/ompi/mpi/c/request_get_status.c index 9e1293d503..2aaa966cce 100644 --- a/ompi/mpi/c/request_get_status.c +++ b/ompi/mpi/c/request_get_status.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/request/request.h" #include "ompi/request/grequest.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/rsend.c b/ompi/mpi/c/rsend.c index eb0d00a746..31d00e0bc7 100644 --- a/ompi/mpi/c/rsend.c +++ b/ompi/mpi/c/rsend.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/pml/pml.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/rsend_init.c b/ompi/mpi/c/rsend_init.c index e1d20e4ef6..c9ef74a51f 100644 --- a/ompi/mpi/c/rsend_init.c +++ b/ompi/mpi/c/rsend_init.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/pml/pml.h" #include "ompi/request/request.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/scan.c b/ompi/mpi/c/scan.c index 8e64860ed9..c9ecf4c271 100644 --- a/ompi/mpi/c/scan.c +++ b/ompi/mpi/c/scan.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/op/op.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/scatter.c b/ompi/mpi/c/scatter.c index 5387d2f6da..856cb5a48c 100644 --- a/ompi/mpi/c/scatter.c +++ b/ompi/mpi/c/scatter.c @@ -22,7 +22,9 @@ #include #include "ompi/mpi/c/bindings.h" -/*#include "ompi/mca/coll/coll.h"*/ +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/scatterv.c b/ompi/mpi/c/scatterv.c index 5b01cadaeb..f20a13f825 100644 --- a/ompi/mpi/c/scatterv.c +++ b/ompi/mpi/c/scatterv.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/send.c b/ompi/mpi/c/send.c index 4bc53be94a..88b7d5bf2a 100644 --- a/ompi/mpi/c/send.c +++ b/ompi/mpi/c/send.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/pml/pml.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/send_init.c b/ompi/mpi/c/send_init.c index 6f0b4c9d20..cf1c46c257 100644 --- a/ompi/mpi/c/send_init.c +++ b/ompi/mpi/c/send_init.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/pml/pml.h" #include "ompi/request/request.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/sendrecv.c b/ompi/mpi/c/sendrecv.c index 3b4a2faafc..67ae4045db 100644 --- a/ompi/mpi/c/sendrecv.c +++ b/ompi/mpi/c/sendrecv.c @@ -18,6 +18,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/pml/pml.h" #include "ompi/request/request.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/sendrecv_replace.c b/ompi/mpi/c/sendrecv_replace.c index a243bf4192..8fa2582e24 100644 --- a/ompi/mpi/c/sendrecv_replace.c +++ b/ompi/mpi/c/sendrecv_replace.c @@ -18,6 +18,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/datatype/convertor.h" #include "ompi/mca/pml/pml.h" diff --git a/ompi/mpi/c/ssend.c b/ompi/mpi/c/ssend.c index 3e1deaa1e3..0a367290ff 100644 --- a/ompi/mpi/c/ssend.c +++ b/ompi/mpi/c/ssend.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/pml/pml.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/ssend_init.c b/ompi/mpi/c/ssend_init.c index cc5a22ff34..2b27de6e13 100644 --- a/ompi/mpi/c/ssend_init.c +++ b/ompi/mpi/c/ssend_init.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/pml/pml.h" #include "ompi/request/request.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/start.c b/ompi/mpi/c/start.c index 7fec98db6f..afda1353b0 100644 --- a/ompi/mpi/c/start.c +++ b/ompi/mpi/c/start.c @@ -20,6 +20,8 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" #include "ompi/mca/pml/pml.h" #include "ompi/request/request.h" #include "ompi/errhandler/errhandler.h" diff --git a/ompi/mpi/c/startall.c b/ompi/mpi/c/startall.c index 4eb5597f09..11987c082f 100644 --- a/ompi/mpi/c/startall.c +++ b/ompi/mpi/c/startall.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mca/pml/pml.h" #include "ompi/request/request.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/status_c2f.c b/ompi/mpi/c/status_c2f.c index 350a8a4b03..985df6a616 100644 --- a/ompi/mpi/c/status_c2f.c +++ b/ompi/mpi/c/status_c2f.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mpi/f77/fint_2_int.h" #include "ompi/mpi/f77/constants.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/status_f2c.c b/ompi/mpi/c/status_f2c.c index be68a30ea8..f305c884d7 100644 --- a/ompi/mpi/c/status_f2c.c +++ b/ompi/mpi/c/status_f2c.c @@ -18,6 +18,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mpi/f77/fint_2_int.h" #include "ompi/mpi/f77/constants.h" diff --git a/ompi/mpi/c/status_set_cancelled.c b/ompi/mpi/c/status_set_cancelled.c index d6a4aad1be..2696b8fe20 100644 --- a/ompi/mpi/c/status_set_cancelled.c +++ b/ompi/mpi/c/status_set_cancelled.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/status_set_elements.c b/ompi/mpi/c/status_set_elements.c index 156fbaf93a..6951ea72c3 100644 --- a/ompi/mpi/c/status_set_elements.c +++ b/ompi/mpi/c/status_set_elements.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/test.c b/ompi/mpi/c/test.c index 7fc375425a..53c89cabfe 100644 --- a/ompi/mpi/c/test.c +++ b/ompi/mpi/c/test.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/request/request.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/test_cancelled.c b/ompi/mpi/c/test_cancelled.c index 49a7005f75..11f986bd06 100644 --- a/ompi/mpi/c/test_cancelled.c +++ b/ompi/mpi/c/test_cancelled.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/testall.c b/ompi/mpi/c/testall.c index 50f3d00019..6946d4c60e 100644 --- a/ompi/mpi/c/testall.c +++ b/ompi/mpi/c/testall.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/request/request.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/testany.c b/ompi/mpi/c/testany.c index f9d3aefe85..6520386230 100644 --- a/ompi/mpi/c/testany.c +++ b/ompi/mpi/c/testany.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/request/request.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/testsome.c b/ompi/mpi/c/testsome.c index 098ca8e29c..8ad0b1f8ef 100644 --- a/ompi/mpi/c/testsome.c +++ b/ompi/mpi/c/testsome.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/request/request.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/topo_test.c b/ompi/mpi/c/topo_test.c index cae81b3ddd..99b56f8969 100644 --- a/ompi/mpi/c/topo_test.c +++ b/ompi/mpi/c/topo_test.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/type_c2f.c b/ompi/mpi/c/type_c2f.c index 949c71f426..d48f66952f 100644 --- a/ompi/mpi/c/type_c2f.c +++ b/ompi/mpi/c/type_c2f.c @@ -20,6 +20,8 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mpi/f77/fint_2_int.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_commit.c b/ompi/mpi/c/type_commit.c index 2c43c4cf69..2a8541d65b 100644 --- a/ompi/mpi/c/type_commit.c +++ b/ompi/mpi/c/type_commit.c @@ -20,6 +20,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_contiguous.c b/ompi/mpi/c/type_contiguous.c index 8c8c6d6c31..423274ebb9 100644 --- a/ompi/mpi/c/type_contiguous.c +++ b/ompi/mpi/c/type_contiguous.c @@ -20,6 +20,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_create_darray.c b/ompi/mpi/c/type_create_darray.c index 22f5e77a22..57f5c3195b 100644 --- a/ompi/mpi/c/type_create_darray.c +++ b/ompi/mpi/c/type_create_darray.c @@ -22,6 +22,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_create_f90_complex.c b/ompi/mpi/c/type_create_f90_complex.c index 9f7a5c6bcb..5339e3a9f4 100644 --- a/ompi/mpi/c/type_create_f90_complex.c +++ b/ompi/mpi/c/type_create_f90_complex.c @@ -21,6 +21,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include diff --git a/ompi/mpi/c/type_create_f90_integer.c b/ompi/mpi/c/type_create_f90_integer.c index 9097ac4daf..cfae5f5ef8 100644 --- a/ompi/mpi/c/type_create_f90_integer.c +++ b/ompi/mpi/c/type_create_f90_integer.c @@ -21,6 +21,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES #pragma weak MPI_Type_create_f90_integer = PMPI_Type_create_f90_integer diff --git a/ompi/mpi/c/type_create_f90_real.c b/ompi/mpi/c/type_create_f90_real.c index 3252b16063..82a5b9805e 100644 --- a/ompi/mpi/c/type_create_f90_real.c +++ b/ompi/mpi/c/type_create_f90_real.c @@ -21,6 +21,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include diff --git a/ompi/mpi/c/type_create_hindexed.c b/ompi/mpi/c/type_create_hindexed.c index 4b2123c9d6..f787554a20 100644 --- a/ompi/mpi/c/type_create_hindexed.c +++ b/ompi/mpi/c/type_create_hindexed.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_create_hvector.c b/ompi/mpi/c/type_create_hvector.c index 7e42398a90..fea9f30638 100644 --- a/ompi/mpi/c/type_create_hvector.c +++ b/ompi/mpi/c/type_create_hvector.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_create_indexed_block.c b/ompi/mpi/c/type_create_indexed_block.c index d26e7f0490..98148728a1 100644 --- a/ompi/mpi/c/type_create_indexed_block.c +++ b/ompi/mpi/c/type_create_indexed_block.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_create_keyval.c b/ompi/mpi/c/type_create_keyval.c index 835cd3a90e..4439f948ea 100644 --- a/ompi/mpi/c/type_create_keyval.c +++ b/ompi/mpi/c/type_create_keyval.c @@ -20,6 +20,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/type_create_resized.c b/ompi/mpi/c/type_create_resized.c index 5bf9981387..2f47523eee 100644 --- a/ompi/mpi/c/type_create_resized.c +++ b/ompi/mpi/c/type_create_resized.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_create_struct.c b/ompi/mpi/c/type_create_struct.c index c25f128137..78444e409f 100644 --- a/ompi/mpi/c/type_create_struct.c +++ b/ompi/mpi/c/type_create_struct.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_create_subarray.c b/ompi/mpi/c/type_create_subarray.c index 3bb3a093c1..dfc4ba8bf5 100644 --- a/ompi/mpi/c/type_create_subarray.c +++ b/ompi/mpi/c/type_create_subarray.c @@ -20,6 +20,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_delete_attr.c b/ompi/mpi/c/type_delete_attr.c index e6be9087a6..4c18dbc239 100644 --- a/ompi/mpi/c/type_delete_attr.c +++ b/ompi/mpi/c/type_delete_attr.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_dup.c b/ompi/mpi/c/type_dup.c index 59e416c6a9..35181bb322 100644 --- a/ompi/mpi/c/type_dup.c +++ b/ompi/mpi/c/type_dup.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/attribute/attribute.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_extent.c b/ompi/mpi/c/type_extent.c index bdb2f79456..799402814e 100644 --- a/ompi/mpi/c/type_extent.c +++ b/ompi/mpi/c/type_extent.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_f2c.c b/ompi/mpi/c/type_f2c.c index 41c8458d05..fe4b95f641 100644 --- a/ompi/mpi/c/type_f2c.c +++ b/ompi/mpi/c/type_f2c.c @@ -20,6 +20,8 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mpi/f77/fint_2_int.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_free.c b/ompi/mpi/c/type_free.c index 592cf34da5..861c811672 100644 --- a/ompi/mpi/c/type_free.c +++ b/ompi/mpi/c/type_free.c @@ -20,6 +20,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_free_keyval.c b/ompi/mpi/c/type_free_keyval.c index 4fbdec6b80..8f8d9b79af 100644 --- a/ompi/mpi/c/type_free_keyval.c +++ b/ompi/mpi/c/type_free_keyval.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/type_get_attr.c b/ompi/mpi/c/type_get_attr.c index 1d29f505d9..f437c52e87 100644 --- a/ompi/mpi/c/type_get_attr.c +++ b/ompi/mpi/c/type_get_attr.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_get_contents.c b/ompi/mpi/c/type_get_contents.c index ff8691c6f6..a8a14cdcc0 100644 --- a/ompi/mpi/c/type_get_contents.c +++ b/ompi/mpi/c/type_get_contents.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_get_envelope.c b/ompi/mpi/c/type_get_envelope.c index f4876ddf40..86bbf8af33 100644 --- a/ompi/mpi/c/type_get_envelope.c +++ b/ompi/mpi/c/type_get_envelope.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_get_extent.c b/ompi/mpi/c/type_get_extent.c index 2aeaf586dc..66a0071360 100644 --- a/ompi/mpi/c/type_get_extent.c +++ b/ompi/mpi/c/type_get_extent.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_get_name.c b/ompi/mpi/c/type_get_name.c index 64627e5624..bb20dbcad3 100644 --- a/ompi/mpi/c/type_get_name.c +++ b/ompi/mpi/c/type_get_name.c @@ -22,6 +22,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_get_true_extent.c b/ompi/mpi/c/type_get_true_extent.c index 82973b4796..949e1c634c 100644 --- a/ompi/mpi/c/type_get_true_extent.c +++ b/ompi/mpi/c/type_get_true_extent.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_hindexed.c b/ompi/mpi/c/type_hindexed.c index 15aafa4871..ec62c04d4a 100644 --- a/ompi/mpi/c/type_hindexed.c +++ b/ompi/mpi/c/type_hindexed.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/type_hvector.c b/ompi/mpi/c/type_hvector.c index 8e1266a2cb..cd2d474237 100644 --- a/ompi/mpi/c/type_hvector.c +++ b/ompi/mpi/c/type_hvector.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/type_indexed.c b/ompi/mpi/c/type_indexed.c index 29f9d5ddc0..7e79c245db 100644 --- a/ompi/mpi/c/type_indexed.c +++ b/ompi/mpi/c/type_indexed.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_lb.c b/ompi/mpi/c/type_lb.c index 0276adafe8..e89ab19376 100644 --- a/ompi/mpi/c/type_lb.c +++ b/ompi/mpi/c/type_lb.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_match_size.c b/ompi/mpi/c/type_match_size.c index 72db821e6d..7716ed40e5 100644 --- a/ompi/mpi/c/type_match_size.c +++ b/ompi/mpi/c/type_match_size.c @@ -20,6 +20,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/type_set_attr.c b/ompi/mpi/c/type_set_attr.c index 93409bdcf7..e2749022e2 100644 --- a/ompi/mpi/c/type_set_attr.c +++ b/ompi/mpi/c/type_set_attr.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_set_name.c b/ompi/mpi/c/type_set_name.c index 2ce54b5d77..331f9b742c 100644 --- a/ompi/mpi/c/type_set_name.c +++ b/ompi/mpi/c/type_set_name.c @@ -21,6 +21,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_size.c b/ompi/mpi/c/type_size.c index 9e45edec81..bd6ca994d5 100644 --- a/ompi/mpi/c/type_size.c +++ b/ompi/mpi/c/type_size.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_ub.c b/ompi/mpi/c/type_ub.c index efbed603fa..e40ab445ca 100644 --- a/ompi/mpi/c/type_ub.c +++ b/ompi/mpi/c/type_ub.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/type_vector.c b/ompi/mpi/c/type_vector.c index 7f7eb81fa4..c5497da605 100644 --- a/ompi/mpi/c/type_vector.c +++ b/ompi/mpi/c/type_vector.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/unpack.c b/ompi/mpi/c/unpack.c index a2486c54c9..a16bee716e 100644 --- a/ompi/mpi/c/unpack.c +++ b/ompi/mpi/c/unpack.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/datatype/convertor.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/unpack_external.c b/ompi/mpi/c/unpack_external.c index 3ce899c7d2..3ceae716df 100644 --- a/ompi/mpi/c/unpack_external.c +++ b/ompi/mpi/c/unpack_external.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/datatype/datatype.h" #include "ompi/datatype/convertor.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/unpublish_name.c b/ompi/mpi/c/unpublish_name.c index 89f7195e7b..333ff17eda 100644 --- a/ompi/mpi/c/unpublish_name.c +++ b/ompi/mpi/c/unpublish_name.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" #include "ompi/mca/pubsub/pubsub.h" diff --git a/ompi/mpi/c/wait.c b/ompi/mpi/c/wait.c index a918a5a54c..2fa255b3ca 100644 --- a/ompi/mpi/c/wait.c +++ b/ompi/mpi/c/wait.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/request/request.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/waitall.c b/ompi/mpi/c/waitall.c index 54f8caeed2..30389b7767 100644 --- a/ompi/mpi/c/waitall.c +++ b/ompi/mpi/c/waitall.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/request/request.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/waitany.c b/ompi/mpi/c/waitany.c index 183eb14413..f6ef5880a0 100644 --- a/ompi/mpi/c/waitany.c +++ b/ompi/mpi/c/waitany.c @@ -22,6 +22,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/request/request.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/waitsome.c b/ompi/mpi/c/waitsome.c index 059e2dd30a..3b0c4622b7 100644 --- a/ompi/mpi/c/waitsome.c +++ b/ompi/mpi/c/waitsome.c @@ -22,6 +22,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/request/request.h" #include "ompi/memchecker.h" diff --git a/ompi/mpi/c/win_c2f.c b/ompi/mpi/c/win_c2f.c index 432e830f18..867e939b3a 100644 --- a/ompi/mpi/c/win_c2f.c +++ b/ompi/mpi/c/win_c2f.c @@ -22,6 +22,8 @@ #include "ompi/win/win.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mpi/f77/fint_2_int.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/win_call_errhandler.c b/ompi/mpi/c/win_call_errhandler.c index bb16f4937b..dca36dfc99 100644 --- a/ompi/mpi/c/win_call_errhandler.c +++ b/ompi/mpi/c/win_call_errhandler.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/win_complete.c b/ompi/mpi/c/win_complete.c index 4593ef00b1..792667cebd 100644 --- a/ompi/mpi/c/win_complete.c +++ b/ompi/mpi/c/win_complete.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" #include "ompi/mca/osc/osc.h" diff --git a/ompi/mpi/c/win_create.c b/ompi/mpi/c/win_create.c index 3848604360..04f7c966cf 100644 --- a/ompi/mpi/c/win_create.c +++ b/ompi/mpi/c/win_create.c @@ -21,9 +21,11 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/info/info.h" #include "ompi/win/win.h" -#include "ompi/attribute/attribute.h" #include "ompi/memchecker.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/win_create_errhandler.c b/ompi/mpi/c/win_create_errhandler.c index 84afa617c7..56ad6397a4 100644 --- a/ompi/mpi/c/win_create_errhandler.c +++ b/ompi/mpi/c/win_create_errhandler.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/win_create_keyval.c b/ompi/mpi/c/win_create_keyval.c index 38e5569287..cc42352df0 100644 --- a/ompi/mpi/c/win_create_keyval.c +++ b/ompi/mpi/c/win_create_keyval.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/win_delete_attr.c b/ompi/mpi/c/win_delete_attr.c index 4fafd4e0ba..5a83b8ffb3 100644 --- a/ompi/mpi/c/win_delete_attr.c +++ b/ompi/mpi/c/win_delete_attr.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" #include "ompi/win/win.h" diff --git a/ompi/mpi/c/win_f2c.c b/ompi/mpi/c/win_f2c.c index 44fb3b9676..52dff94d45 100644 --- a/ompi/mpi/c/win_f2c.c +++ b/ompi/mpi/c/win_f2c.c @@ -21,6 +21,8 @@ #include "ompi/win/win.h" #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/mpi/f77/fint_2_int.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/win_fence.c b/ompi/mpi/c/win_fence.c index 7962012d9d..24cc903b97 100644 --- a/ompi/mpi/c/win_fence.c +++ b/ompi/mpi/c/win_fence.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" #include "ompi/mca/osc/osc.h" diff --git a/ompi/mpi/c/win_free.c b/ompi/mpi/c/win_free.c index 876622d0f5..a012a9d1d8 100644 --- a/ompi/mpi/c/win_free.c +++ b/ompi/mpi/c/win_free.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/win_free_keyval.c b/ompi/mpi/c/win_free_keyval.c index 88211bc3a7..320d483d65 100644 --- a/ompi/mpi/c/win_free_keyval.c +++ b/ompi/mpi/c/win_free_keyval.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/win_get_attr.c b/ompi/mpi/c/win_get_attr.c index 5863c51305..f118d2fd8a 100644 --- a/ompi/mpi/c/win_get_attr.c +++ b/ompi/mpi/c/win_get_attr.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" #include "ompi/win/win.h" diff --git a/ompi/mpi/c/win_get_errhandler.c b/ompi/mpi/c/win_get_errhandler.c index 9c06a58c00..06328244c4 100644 --- a/ompi/mpi/c/win_get_errhandler.c +++ b/ompi/mpi/c/win_get_errhandler.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/win_get_group.c b/ompi/mpi/c/win_get_group.c index 69f7b01157..fbd13e43ae 100644 --- a/ompi/mpi/c/win_get_group.c +++ b/ompi/mpi/c/win_get_group.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/win_get_name.c b/ompi/mpi/c/win_get_name.c index 979f0fa2c3..ee033e2d8a 100644 --- a/ompi/mpi/c/win_get_name.c +++ b/ompi/mpi/c/win_get_name.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/win_lock.c b/ompi/mpi/c/win_lock.c index ad2d60b6f2..92496ecacf 100644 --- a/ompi/mpi/c/win_lock.c +++ b/ompi/mpi/c/win_lock.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" #include "ompi/mca/osc/osc.h" diff --git a/ompi/mpi/c/win_post.c b/ompi/mpi/c/win_post.c index 7f336c2ece..1e649d2d5c 100644 --- a/ompi/mpi/c/win_post.c +++ b/ompi/mpi/c/win_post.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" #include "ompi/mca/osc/osc.h" diff --git a/ompi/mpi/c/win_set_attr.c b/ompi/mpi/c/win_set_attr.c index f484df51b4..bc704128c2 100644 --- a/ompi/mpi/c/win_set_attr.c +++ b/ompi/mpi/c/win_set_attr.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/attribute/attribute.h" #include "ompi/win/win.h" diff --git a/ompi/mpi/c/win_set_errhandler.c b/ompi/mpi/c/win_set_errhandler.c index 5b16662341..8d4449239d 100644 --- a/ompi/mpi/c/win_set_errhandler.c +++ b/ompi/mpi/c/win_set_errhandler.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/win_set_name.c b/ompi/mpi/c/win_set_name.c index 5f249c13ad..6c78d5360e 100644 --- a/ompi/mpi/c/win_set_name.c +++ b/ompi/mpi/c/win_set_name.c @@ -20,6 +20,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES diff --git a/ompi/mpi/c/win_start.c b/ompi/mpi/c/win_start.c index 2315c4c735..b095da0d62 100644 --- a/ompi/mpi/c/win_start.c +++ b/ompi/mpi/c/win_start.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" #include "ompi/mca/osc/osc.h" diff --git a/ompi/mpi/c/win_test.c b/ompi/mpi/c/win_test.c index 14e6bbf837..b6384056c8 100644 --- a/ompi/mpi/c/win_test.c +++ b/ompi/mpi/c/win_test.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" #include "ompi/mca/osc/osc.h" diff --git a/ompi/mpi/c/win_unlock.c b/ompi/mpi/c/win_unlock.c index e768553a6b..f7d49be696 100644 --- a/ompi/mpi/c/win_unlock.c +++ b/ompi/mpi/c/win_unlock.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" #include "ompi/mca/osc/osc.h" diff --git a/ompi/mpi/c/win_wait.c b/ompi/mpi/c/win_wait.c index dc01b87c58..2087fcc481 100644 --- a/ompi/mpi/c/win_wait.c +++ b/ompi/mpi/c/win_wait.c @@ -19,6 +19,9 @@ #include #include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" #include "ompi/win/win.h" #include "ompi/mca/osc/osc.h" diff --git a/ompi/mpi/c/wtime.c b/ompi/mpi/c/wtime.c index 4c0d5cb2fb..e4999e204e 100644 --- a/ompi/mpi/c/wtime.c +++ b/ompi/mpi/c/wtime.c @@ -24,7 +24,6 @@ #include #include MCA_timer_IMPLEMENTATION_HEADER -#include "opal/prefetch.h" #include "ompi/mpi/c/bindings.h" #include "ompi/runtime/mpiruntime.h" diff --git a/ompi/mpi/cxx/comm.cc b/ompi/mpi/cxx/comm.cc index 5d75529797..b8f52218eb 100644 --- a/ompi/mpi/cxx/comm.cc +++ b/ompi/mpi/cxx/comm.cc @@ -26,8 +26,6 @@ #include #endif -#include "opal/threads/mutex.h" -#include "opal/class/opal_list.h" #include "ompi/communicator/communicator.h" #include "ompi/attribute/attribute.h" diff --git a/ompi/mpi/cxx/datatype.cc b/ompi/mpi/cxx/datatype.cc index e5af92b46b..269e94af6c 100644 --- a/ompi/mpi/cxx/datatype.cc +++ b/ompi/mpi/cxx/datatype.cc @@ -15,8 +15,6 @@ #include "mpi.h" #include "ompi/mpi/cxx/mpicxx.h" -#include "opal/threads/mutex.h" -#include "opal/class/opal_list.h" #include "ompi/communicator/communicator.h" #include "ompi/attribute/attribute.h" diff --git a/ompi/mpi/cxx/file.cc b/ompi/mpi/cxx/file.cc index ea321b6bec..38eb9f05f7 100644 --- a/ompi/mpi/cxx/file.cc +++ b/ompi/mpi/cxx/file.cc @@ -16,7 +16,6 @@ #include "ompi/constants.h" #include "ompi/mpi/cxx/mpicxx.h" -#include "opal/threads/mutex.h" #include "opal/class/opal_list.h" #include "ompi/file/file.h" #include "ompi/errhandler/errhandler.h" diff --git a/ompi/mpi/cxx/intercepts.cc b/ompi/mpi/cxx/intercepts.cc index fde907d9a8..ee7febcce6 100644 --- a/ompi/mpi/cxx/intercepts.cc +++ b/ompi/mpi/cxx/intercepts.cc @@ -27,7 +27,6 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/communicator/communicator.h" #include "ompi/datatype/datatype.h" -#include "opal/threads/mutex.h" extern "C" void ompi_mpi_cxx_throw_exception(int *errcode) diff --git a/ompi/mpi/cxx/win.cc b/ompi/mpi/cxx/win.cc index d6ac6fdc87..cd9aa04cb7 100644 --- a/ompi/mpi/cxx/win.cc +++ b/ompi/mpi/cxx/win.cc @@ -15,8 +15,6 @@ #include "mpi.h" #include "ompi/mpi/cxx/mpicxx.h" -#include "opal/threads/mutex.h" -#include "opal/class/opal_list.h" #include "ompi/communicator/communicator.h" #include "ompi/attribute/attribute.h" diff --git a/ompi/mpi/f77/base/attr_fn_f.c b/ompi/mpi/f77/base/attr_fn_f.c index 0236e96088..ce54e1b6d9 100644 --- a/ompi/mpi/f77/base/attr_fn_f.c +++ b/ompi/mpi/f77/base/attr_fn_f.c @@ -21,9 +21,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/fint_2_int.h" -#include "ompi/datatype/datatype.h" -#include "ompi/win/win.h" -#include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS #pragma weak MPI_TYPE_NULL_COPY_FN = mpi_type_null_copy_fn_f diff --git a/ompi/mpi/f77/bindings.h b/ompi/mpi/f77/bindings.h index f19395d2e8..f0bb011fdb 100644 --- a/ompi/mpi/f77/bindings.h +++ b/ompi/mpi/f77/bindings.h @@ -22,9 +22,6 @@ #include "ompi_config.h" #include "mpi.h" -#include "ompi/errhandler/errhandler.h" -#include "ompi/attribute/attribute.h" -#include "ompi/op/op.h" #include "ompi/request/grequest.h" /* diff --git a/ompi/mpi/f77/file_read_all_end_f.c b/ompi/mpi/f77/file_read_all_end_f.c index bb9be1be12..eb9ac709b4 100644 --- a/ompi/mpi/f77/file_read_all_end_f.c +++ b/ompi/mpi/f77/file_read_all_end_f.c @@ -20,8 +20,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/errhandler/errhandler.h" -#include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_FILE_READ_ALL_END = mpi_file_read_all_end_f diff --git a/ompi/mpi/f77/file_read_all_f.c b/ompi/mpi/f77/file_read_all_f.c index 667dff2443..d8629ec3f0 100644 --- a/ompi/mpi/f77/file_read_all_f.c +++ b/ompi/mpi/f77/file_read_all_f.c @@ -20,8 +20,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/errhandler/errhandler.h" -#include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_FILE_READ_ALL = mpi_file_read_all_f diff --git a/ompi/mpi/f77/file_read_at_all_end_f.c b/ompi/mpi/f77/file_read_at_all_end_f.c index 9bf59a09d8..adace8c992 100644 --- a/ompi/mpi/f77/file_read_at_all_end_f.c +++ b/ompi/mpi/f77/file_read_at_all_end_f.c @@ -20,8 +20,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/errhandler/errhandler.h" -#include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_FILE_READ_AT_ALL_END = mpi_file_read_at_all_end_f diff --git a/ompi/mpi/f77/file_read_at_all_f.c b/ompi/mpi/f77/file_read_at_all_f.c index 3ee7d7ab6d..a630f0db1e 100644 --- a/ompi/mpi/f77/file_read_at_all_f.c +++ b/ompi/mpi/f77/file_read_at_all_f.c @@ -21,8 +21,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/errhandler/errhandler.h" -#include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_FILE_READ_AT_ALL = mpi_file_read_at_all_f diff --git a/ompi/mpi/f77/file_read_at_f.c b/ompi/mpi/f77/file_read_at_f.c index a8861d39a4..90ed8381bf 100644 --- a/ompi/mpi/f77/file_read_at_f.c +++ b/ompi/mpi/f77/file_read_at_f.c @@ -21,8 +21,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/errhandler/errhandler.h" -#include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_FILE_READ_AT = mpi_file_read_at_f diff --git a/ompi/mpi/f77/file_read_f.c b/ompi/mpi/f77/file_read_f.c index 1440329ae3..30adcc7a3c 100644 --- a/ompi/mpi/f77/file_read_f.c +++ b/ompi/mpi/f77/file_read_f.c @@ -21,8 +21,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/errhandler/errhandler.h" -#include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_FILE_READ = mpi_file_read_f diff --git a/ompi/mpi/f77/file_read_ordered_end_f.c b/ompi/mpi/f77/file_read_ordered_end_f.c index bf2fc5b7c8..dc70d944d2 100644 --- a/ompi/mpi/f77/file_read_ordered_end_f.c +++ b/ompi/mpi/f77/file_read_ordered_end_f.c @@ -21,8 +21,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/errhandler/errhandler.h" -#include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_FILE_READ_ORDERED_END = mpi_file_read_ordered_end_f diff --git a/ompi/mpi/f77/file_read_ordered_f.c b/ompi/mpi/f77/file_read_ordered_f.c index 21f02973e2..c2556db1f0 100644 --- a/ompi/mpi/f77/file_read_ordered_f.c +++ b/ompi/mpi/f77/file_read_ordered_f.c @@ -20,8 +20,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/errhandler/errhandler.h" -#include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_FILE_READ_ORDERED = mpi_file_read_ordered_f diff --git a/ompi/mpi/f77/file_read_shared_f.c b/ompi/mpi/f77/file_read_shared_f.c index 44270c53dc..34b68abce6 100644 --- a/ompi/mpi/f77/file_read_shared_f.c +++ b/ompi/mpi/f77/file_read_shared_f.c @@ -20,8 +20,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/errhandler/errhandler.h" -#include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_FILE_READ_SHARED = mpi_file_read_shared_f diff --git a/ompi/mpi/f77/file_write_all_end_f.c b/ompi/mpi/f77/file_write_all_end_f.c index 5bf99953cf..17e62eab54 100644 --- a/ompi/mpi/f77/file_write_all_end_f.c +++ b/ompi/mpi/f77/file_write_all_end_f.c @@ -20,8 +20,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/errhandler/errhandler.h" -#include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_FILE_WRITE_ALL_END = mpi_file_write_all_end_f diff --git a/ompi/mpi/f77/file_write_all_f.c b/ompi/mpi/f77/file_write_all_f.c index c6cb82a21d..3fecb687a7 100644 --- a/ompi/mpi/f77/file_write_all_f.c +++ b/ompi/mpi/f77/file_write_all_f.c @@ -20,8 +20,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/errhandler/errhandler.h" -#include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_FILE_WRITE_ALL = mpi_file_write_all_f diff --git a/ompi/mpi/f77/file_write_at_all_end_f.c b/ompi/mpi/f77/file_write_at_all_end_f.c index b743bd2154..a63330730d 100644 --- a/ompi/mpi/f77/file_write_at_all_end_f.c +++ b/ompi/mpi/f77/file_write_at_all_end_f.c @@ -20,8 +20,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/errhandler/errhandler.h" -#include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_FILE_WRITE_AT_ALL_END = mpi_file_write_at_all_end_f diff --git a/ompi/mpi/f77/file_write_at_all_f.c b/ompi/mpi/f77/file_write_at_all_f.c index 6f82f3b323..8598e3c47a 100644 --- a/ompi/mpi/f77/file_write_at_all_f.c +++ b/ompi/mpi/f77/file_write_at_all_f.c @@ -20,8 +20,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/errhandler/errhandler.h" -#include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_FILE_WRITE_AT_ALL = mpi_file_write_at_all_f diff --git a/ompi/mpi/f77/file_write_at_f.c b/ompi/mpi/f77/file_write_at_f.c index d7257bce5a..90b08599d9 100644 --- a/ompi/mpi/f77/file_write_at_f.c +++ b/ompi/mpi/f77/file_write_at_f.c @@ -20,8 +20,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/errhandler/errhandler.h" -#include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_FILE_WRITE_AT = mpi_file_write_at_f diff --git a/ompi/mpi/f77/file_write_f.c b/ompi/mpi/f77/file_write_f.c index 7696510558..e97e9dc17b 100644 --- a/ompi/mpi/f77/file_write_f.c +++ b/ompi/mpi/f77/file_write_f.c @@ -20,8 +20,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/errhandler/errhandler.h" -#include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_FILE_WRITE = mpi_file_write_f diff --git a/ompi/mpi/f77/file_write_ordered_end_f.c b/ompi/mpi/f77/file_write_ordered_end_f.c index 0a4f0f0c0c..804bff760d 100644 --- a/ompi/mpi/f77/file_write_ordered_end_f.c +++ b/ompi/mpi/f77/file_write_ordered_end_f.c @@ -20,8 +20,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/errhandler/errhandler.h" -#include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_FILE_WRITE_ORDERED_END = mpi_file_write_ordered_end_f diff --git a/ompi/mpi/f77/file_write_ordered_f.c b/ompi/mpi/f77/file_write_ordered_f.c index 148b34f89a..252602b092 100644 --- a/ompi/mpi/f77/file_write_ordered_f.c +++ b/ompi/mpi/f77/file_write_ordered_f.c @@ -20,8 +20,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/errhandler/errhandler.h" -#include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_FILE_WRITE_ORDERED = mpi_file_write_ordered_f diff --git a/ompi/mpi/f77/file_write_shared_f.c b/ompi/mpi/f77/file_write_shared_f.c index dd551ba2f5..16a50a11a0 100644 --- a/ompi/mpi/f77/file_write_shared_f.c +++ b/ompi/mpi/f77/file_write_shared_f.c @@ -20,8 +20,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/errhandler/errhandler.h" -#include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_FILE_WRITE_SHARED = mpi_file_write_shared_f diff --git a/ompi/mpi/f77/iprobe_f.c b/ompi/mpi/f77/iprobe_f.c index e2502adee5..0df28243ea 100644 --- a/ompi/mpi/f77/iprobe_f.c +++ b/ompi/mpi/f77/iprobe_f.c @@ -20,7 +20,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/errhandler/errhandler.h" #include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/ompi/mpi/f77/probe_f.c b/ompi/mpi/f77/probe_f.c index a80805e18c..b6862ea59f 100644 --- a/ompi/mpi/f77/probe_f.c +++ b/ompi/mpi/f77/probe_f.c @@ -20,7 +20,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/errhandler/errhandler.h" #include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/ompi/mpi/f77/recv_f.c b/ompi/mpi/f77/recv_f.c index 71943d15dd..07ffa64eaf 100644 --- a/ompi/mpi/f77/recv_f.c +++ b/ompi/mpi/f77/recv_f.c @@ -20,7 +20,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/mpi/f77/constants.h" -#include "ompi/errhandler/errhandler.h" #include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/ompi/mpi/f77/request_free_f.c b/ompi/mpi/f77/request_free_f.c index 9348571c78..5bc8802510 100644 --- a/ompi/mpi/f77/request_free_f.c +++ b/ompi/mpi/f77/request_free_f.c @@ -19,7 +19,6 @@ #include "ompi_config.h" #include "ompi/mpi/f77/bindings.h" -#include "ompi/request/request.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_REQUEST_FREE = mpi_request_free_f diff --git a/ompi/mpi/f77/test_f.c b/ompi/mpi/f77/test_f.c index 8953b88a42..bdadf631f5 100644 --- a/ompi/mpi/f77/test_f.c +++ b/ompi/mpi/f77/test_f.c @@ -19,7 +19,6 @@ #include "ompi_config.h" #include "ompi/mpi/f77/bindings.h" -#include "ompi/request/request.h" #include "ompi/mpi/f77/constants.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/ompi/mpi/f77/type_create_hindexed_f.c b/ompi/mpi/f77/type_create_hindexed_f.c index fdc1b05e72..f19548fe15 100644 --- a/ompi/mpi/f77/type_create_hindexed_f.c +++ b/ompi/mpi/f77/type_create_hindexed_f.c @@ -19,8 +19,6 @@ #include "ompi_config.h" #include "ompi/mpi/f77/bindings.h" -#include "ompi/errhandler/errhandler.h" -#include "ompi/communicator/communicator.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_TYPE_CREATE_HINDEXED = mpi_type_create_hindexed_f diff --git a/ompi/mpi/f77/type_get_name_f.c b/ompi/mpi/f77/type_get_name_f.c index 67e837b12b..cf582725af 100644 --- a/ompi/mpi/f77/type_get_name_f.c +++ b/ompi/mpi/f77/type_get_name_f.c @@ -21,7 +21,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/constants.h" -#include "ompi/errhandler/errhandler.h" #include "ompi/mpi/f77/f77_strings.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/ompi/mpi/f77/wait_f.c b/ompi/mpi/f77/wait_f.c index 1a636a8d98..46433aaf6f 100644 --- a/ompi/mpi/f77/wait_f.c +++ b/ompi/mpi/f77/wait_f.c @@ -19,7 +19,6 @@ #include "ompi_config.h" #include "ompi/mpi/f77/bindings.h" -#include "ompi/request/request.h" #include "ompi/mpi/f77/constants.h" #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER diff --git a/ompi/mpi/f77/win_get_name_f.c b/ompi/mpi/f77/win_get_name_f.c index 3fb859fcc5..3a49464240 100644 --- a/ompi/mpi/f77/win_get_name_f.c +++ b/ompi/mpi/f77/win_get_name_f.c @@ -21,7 +21,6 @@ #include "ompi/mpi/f77/bindings.h" #include "ompi/constants.h" -#include "ompi/errhandler/errhandler.h" #include "ompi/mpi/f77/f77_strings.h" diff --git a/ompi/peruse/peruse.c b/ompi/peruse/peruse.c index 4a77c3afba..86a25e5e1a 100644 --- a/ompi/peruse/peruse.c +++ b/ompi/peruse/peruse.c @@ -18,7 +18,6 @@ #include "mpi.h" #include "ompi/peruse/peruse.h" #include "ompi/peruse/peruse-internal.h" -#include "opal/class/opal_hash_table.h" #include "ompi/communicator/communicator.h" #include "ompi/runtime/params.h" diff --git a/ompi/proc/proc.c b/ompi/proc/proc.c index 9933131b8e..e1380d4dd3 100644 --- a/ompi/proc/proc.c +++ b/ompi/proc/proc.c @@ -23,7 +23,6 @@ #include "opal/threads/mutex.h" #include "orte/util/show_help.h" -#include "opal/util/arch.h" #include "opal/dss/dss.h" #include "orte/mca/errmgr/errmgr.h" @@ -34,9 +33,7 @@ #include "ompi/proc/proc.h" #include "ompi/datatype/convertor.h" -#include "ompi/runtime/params.h" #include "ompi/runtime/mpiruntime.h" -#include "ompi/runtime/ompi_module_exchange.h" static opal_list_t ompi_proc_list; static opal_mutex_t ompi_proc_lock; diff --git a/ompi/proc/proc.h b/ompi/proc/proc.h index 89262337bf..b452aa8ab2 100644 --- a/ompi/proc/proc.h +++ b/ompi/proc/proc.h @@ -34,11 +34,9 @@ #include "ompi_config.h" #include "ompi/types.h" #include "opal/class/opal_list.h" -#include "opal/threads/mutex.h" #include "opal/dss/dss_types.h" #include "opal/mca/paffinity/paffinity.h" -#include "orte/runtime/orte_globals.h" #include "orte/types.h" diff --git a/ompi/runtime/ompi_cr.c b/ompi/runtime/ompi_cr.c index a5362b9784..1859ec8932 100644 --- a/ompi/runtime/ompi_cr.c +++ b/ompi/runtime/ompi_cr.c @@ -47,13 +47,10 @@ #include "orte/mca/snapc/snapc.h" #include "orte/mca/snapc/base/base.h" -#include "orte/runtime/runtime.h" -#include "orte/mca/grpcomm/grpcomm.h" #include "ompi/constants.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/pml/base/base.h" -#include "ompi/mca/btl/btl.h" #include "ompi/mca/btl/base/base.h" #include "ompi/mca/crcp/crcp.h" #include "ompi/mca/crcp/base/base.h" diff --git a/ompi/runtime/ompi_module_exchange.h b/ompi/runtime/ompi_module_exchange.h index 960b9e8d12..c0c3b8262e 100644 --- a/ompi/runtime/ompi_module_exchange.h +++ b/ompi/runtime/ompi_module_exchange.h @@ -56,7 +56,6 @@ #include "opal/mca/mca.h" -#include "orte/types.h" struct ompi_proc_t; diff --git a/ompi/runtime/ompi_mpi_abort.c b/ompi/runtime/ompi_mpi_abort.c index 19da129737..91f1a88922 100644 --- a/ompi/runtime/ompi_mpi_abort.c +++ b/ompi/runtime/ompi_mpi_abort.c @@ -39,7 +39,6 @@ #include "orte/util/name_fns.h" #include "orte/mca/errmgr/errmgr.h" #include "ompi/communicator/communicator.h" -#include "ompi/proc/proc.h" #include "ompi/runtime/mpiruntime.h" #include "ompi/runtime/params.h" #include "ompi/debuggers/debuggers.h" diff --git a/ompi/runtime/ompi_mpi_finalize.c b/ompi/runtime/ompi_mpi_finalize.c index 08d00640f5..66bbbf531c 100644 --- a/ompi/runtime/ompi_mpi_finalize.c +++ b/ompi/runtime/ompi_mpi_finalize.c @@ -55,7 +55,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "ompi/group/group.h" #include "ompi/errhandler/errcode.h" #include "ompi/communicator/communicator.h" #include "ompi/datatype/datatype.h" @@ -67,9 +66,7 @@ #include "ompi/mca/pml/pml.h" #include "ompi/mca/pml/base/base.h" #include "ompi/mca/osc/base/base.h" -#include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" -#include "ompi/mca/topo/topo.h" #include "ompi/mca/topo/base/base.h" #include "ompi/mca/io/io.h" #include "ompi/mca/io/base/base.h" diff --git a/ompi/runtime/ompi_mpi_init.c b/ompi/runtime/ompi_mpi_init.c index 1529e0a54a..d67c702bb4 100644 --- a/ompi/runtime/ompi_mpi_init.c +++ b/ompi/runtime/ompi_mpi_init.c @@ -41,7 +41,6 @@ #include "opal/mca/maffinity/base/base.h" #include "opal/runtime/opal_progress.h" #include "opal/threads/threads.h" -#include "opal/util/argv.h" #include "opal/util/output.h" #include "opal/util/error.h" #include "opal/util/stacktrace.h" @@ -63,7 +62,6 @@ #include "ompi/runtime/mpiruntime.h" #include "ompi/runtime/params.h" #include "ompi/communicator/communicator.h" -#include "ompi/group/group.h" #include "ompi/info/info.h" #include "ompi/errhandler/errcode.h" #include "ompi/request/request.h" @@ -73,16 +71,12 @@ #include "ompi/file/file.h" #include "ompi/attribute/attribute.h" #include "ompi/mca/allocator/base/base.h" -#include "ompi/mca/allocator/allocator.h" #include "ompi/mca/rcache/base/base.h" #include "ompi/mca/rcache/rcache.h" #include "ompi/mca/mpool/base/base.h" -#include "ompi/mca/mpool/mpool.h" #include "ompi/mca/pml/pml.h" -#include "ompi/runtime/ompi_module_exchange.h" #include "ompi/mca/pml/base/base.h" #include "ompi/mca/osc/base/base.h" -#include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" #include "ompi/mca/io/io.h" #include "ompi/mca/io/base/base.h" diff --git a/ompi/runtime/ompi_mpi_params.c b/ompi/runtime/ompi_mpi_params.c index 45519160be..b984554370 100644 --- a/ompi/runtime/ompi_mpi_params.c +++ b/ompi/runtime/ompi_mpi_params.c @@ -32,7 +32,6 @@ #include "ompi/datatype/datatype.h" #include "ompi/runtime/mpiruntime.h" #include "ompi/runtime/params.h" -#include "ompi/datatype/datatype.h" #include "orte/util/show_help.h" #include "opal/mca/base/mca_base_param.h" #include "opal/util/argv.h" diff --git a/ompi/runtime/ompi_mpi_preconnect.c b/ompi/runtime/ompi_mpi_preconnect.c index dc0edc9381..d1b35045e0 100644 --- a/ompi/runtime/ompi_mpi_preconnect.c +++ b/ompi/runtime/ompi_mpi_preconnect.c @@ -23,7 +23,6 @@ #include "ompi/communicator/communicator.h" #include "ompi/request/request.h" #include "ompi/runtime/mpiruntime.h" -#include "ompi/mca/dpm/dpm.h" int ompi_init_preconnect_mpi(void) diff --git a/ompi/tools/ompi-probe/ompi-probe.c b/ompi/tools/ompi-probe/ompi-probe.c index 01b25af8df..6129bd4405 100644 --- a/ompi/tools/ompi-probe/ompi-probe.c +++ b/ompi/tools/ompi-probe/ompi-probe.c @@ -39,12 +39,10 @@ #include #include -#include "opal/dss/dss.h" #include "opal/mca/base/base.h" #include "opal/util/opal_environ.h" #include "opal/runtime/opal.h" -#include "orte/runtime/orte_globals.h" /* * Globals diff --git a/ompi/tools/ompi-profiler/ompi-profiler.c b/ompi/tools/ompi-profiler/ompi-profiler.c index 0e70693a65..03f91c76b3 100644 --- a/ompi/tools/ompi-profiler/ompi-profiler.c +++ b/ompi/tools/ompi-profiler/ompi-profiler.c @@ -21,7 +21,6 @@ #include "opal_config.h" #include "opal/constants.h" -#include "opal/types.h" #include "opal/version.h" #ifdef HAVE_STRING_H @@ -46,8 +45,6 @@ #include "opal/runtime/opal.h" #include "opal/util/cmd_line.h" #include "opal/mca/base/base.h" -#include "opal/util/os_path.h" -#include "opal/util/path.h" #include "opal/util/opal_environ.h" #include "opal/util/show_help.h" diff --git a/ompi/tools/ompi-server/ompi-server.c b/ompi/tools/ompi-server/ompi-server.c index 8aa30bae8c..4e3c5a63a0 100644 --- a/ompi/tools/ompi-server/ompi-server.c +++ b/ompi/tools/ompi-server/ompi-server.c @@ -47,8 +47,6 @@ #include "opal/util/cmd_line.h" #include "opal/util/output.h" #include "orte/util/show_help.h" -#include "opal/util/printf.h" -#include "opal/util/argv.h" #include "opal/util/daemon_init.h" #include "opal/runtime/opal.h" #include "opal/mca/base/mca_base_param.h" diff --git a/ompi/tools/ompi_info/components.cc b/ompi/tools/ompi_info/components.cc index d18f4345c2..9ca57d3aa8 100644 --- a/ompi/tools/ompi_info/components.cc +++ b/ompi/tools/ompi_info/components.cc @@ -55,25 +55,19 @@ #include "opal/runtime/opal.h" #include "opal/dss/dss.h" -#include "ompi/mca/allocator/allocator.h" #include "ompi/mca/allocator/base/base.h" -#include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" #include "ompi/mca/io/io.h" #include "ompi/mca/io/base/base.h" -#include "ompi/mca/mpool/mpool.h" #include "ompi/mca/mpool/base/base.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/pml/base/base.h" -#include "ompi/mca/bml/bml.h" #include "ompi/mca/bml/base/base.h" #include "ompi/mca/rcache/rcache.h" #include "ompi/mca/rcache/base/base.h" -#include "ompi/mca/btl/btl.h" #include "ompi/mca/btl/base/base.h" #include "ompi/mca/mtl/mtl.h" #include "ompi/mca/mtl/base/base.h" -#include "ompi/mca/topo/topo.h" #include "ompi/mca/topo/base/base.h" #include "ompi/mca/osc/osc.h" #include "ompi/mca/osc/base/base.h" diff --git a/ompi/tools/ompi_info/ompi_info.cc b/ompi/tools/ompi_info/ompi_info.cc index b1e5c2ce19..0e7d6536c2 100644 --- a/ompi/tools/ompi_info/ompi_info.cc +++ b/ompi/tools/ompi_info/ompi_info.cc @@ -40,14 +40,12 @@ #include "opal/mca/installdirs/installdirs.h" #include "opal/class/opal_object.h" #include "opal/runtime/opal.h" -#include "orte/runtime/runtime.h" #include "orte/util/show_help.h" #include "opal/util/cmd_line.h" #include "opal/util/argv.h" #include "ompi/communicator/communicator.h" #include "opal/mca/base/base.h" #include "ompi/tools/ompi_info/ompi_info.h" -#include "opal/threads/mutex.h" using namespace std; using namespace ompi_info; diff --git a/opal/class/opal_free_list.h b/opal/class/opal_free_list.h index 8f07efb544..2fbb545620 100644 --- a/opal/class/opal_free_list.h +++ b/opal/class/opal_free_list.h @@ -22,7 +22,6 @@ #include "opal_config.h" #include "opal/class/opal_list.h" -#include "opal/threads/threads.h" #include "opal/threads/condition.h" #include "opal/constants.h" #include "opal/prefetch.h" diff --git a/opal/dss/dss.h b/opal/dss/dss.h index 86e84722c6..5259815313 100644 --- a/opal/dss/dss.h +++ b/opal/dss/dss.h @@ -27,7 +27,6 @@ #include "opal_config.h" -#include "opal/types.h" #include "opal/dss/dss_types.h" diff --git a/opal/dss/dss_get.c b/opal/dss/dss_get.c index 1a1a007edb..4b0305a1e3 100644 --- a/opal/dss/dss_get.c +++ b/opal/dss/dss_get.c @@ -17,7 +17,6 @@ #include "opal_config.h" #include "opal/dss/dss_internal.h" -#include "opal/util/output.h" int opal_dss_get(void **data, opal_dss_value_t *value, opal_data_type_t type) { diff --git a/opal/dss/dss_release.c b/opal/dss/dss_release.c index 2614a22c11..46975eb0ea 100644 --- a/opal/dss/dss_release.c +++ b/opal/dss/dss_release.c @@ -19,7 +19,6 @@ #include "opal_config.h" #include "opal/dss/dss_internal.h" -#include "opal/util/output.h" void opal_dss_release(opal_dss_value_t *value) { diff --git a/opal/dss/dss_types.h b/opal/dss/dss_types.h index bfd3e8028f..5b864d35cd 100644 --- a/opal/dss/dss_types.h +++ b/opal/dss/dss_types.h @@ -27,7 +27,6 @@ #define OPAL_DSS_TYPES_H_ #include "opal_config.h" -#include "opal/types.h" #include "opal/class/opal_object.h" #include "opal/class/opal_list.h" diff --git a/opal/event/evport.c b/opal/event/evport.c index 3d20e0bc45..132cd6d566 100644 --- a/opal/event/evport.c +++ b/opal/event/evport.c @@ -80,7 +80,6 @@ #include "evsignal.h" #endif -#include "opal/util/output.h" #include "opal/threads/mutex.h" extern volatile sig_atomic_t opal_evsignal_caught; diff --git a/opal/event/poll.c b/opal/event/poll.c index b19043c93c..fc0e225028 100644 --- a/opal/event/poll.c +++ b/opal/event/poll.c @@ -59,7 +59,6 @@ #endif #include "log.h" -#include "opal/util/output.h" #include "opal/threads/mutex.h" extern volatile sig_atomic_t opal_evsignal_caught; diff --git a/opal/event/select.c b/opal/event/select.c index 98cf79ae11..9bc315157f 100644 --- a/opal/event/select.c +++ b/opal/event/select.c @@ -27,7 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "opal_config.h" -#include "opal/util/output.h" #ifdef HAVE_SYS_TYPES_H #include #endif diff --git a/opal/event/signal.c b/opal/event/signal.c index 824a49025b..e73a472c04 100644 --- a/opal/event/signal.c +++ b/opal/event/signal.c @@ -62,7 +62,6 @@ #include "evsignal.h" #include "evutil.h" #include "log.h" -#include "opal/util/output.h" struct event_base *evsignal_base = NULL; diff --git a/opal/mca/backtrace/base/backtrace_component.c b/opal/mca/backtrace/base/backtrace_component.c index 12bb38c007..ec064bf640 100644 --- a/opal/mca/backtrace/base/backtrace_component.c +++ b/opal/mca/backtrace/base/backtrace_component.c @@ -20,7 +20,6 @@ #include "opal_config.h" #include "opal/constants.h" -#include "opal/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" diff --git a/opal/mca/base/mca_base_components_open.c b/opal/mca/base/mca_base_components_open.c index 3e8b335e96..582799eb07 100644 --- a/opal/mca/base/mca_base_components_open.c +++ b/opal/mca/base/mca_base_components_open.c @@ -24,7 +24,6 @@ #include #include "opal/class/opal_list.h" -#include "opal/util/strncpy.h" #include "opal/util/argv.h" #include "opal/util/output.h" #include "opal/util/show_help.h" diff --git a/opal/mca/base/mca_base_components_select.c b/opal/mca/base/mca_base_components_select.c index 7d458acd8b..cf0ff8fc8d 100644 --- a/opal/mca/base/mca_base_components_select.c +++ b/opal/mca/base/mca_base_components_select.c @@ -20,10 +20,7 @@ #include "opal/runtime/opal.h" #include "opal/class/opal_list.h" -#include "opal/util/strncpy.h" -#include "opal/util/argv.h" #include "opal/util/output.h" -#include "opal/util/show_help.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" diff --git a/opal/mca/base/mca_base_param.h b/opal/mca/base/mca_base_param.h index b20c84cc91..a992a99ac3 100644 --- a/opal/mca/base/mca_base_param.h +++ b/opal/mca/base/mca_base_param.h @@ -58,9 +58,7 @@ #include "opal_config.h" -#include "opal/class/opal_value_array.h" #include "opal/class/opal_list.h" -#include "opal/class/opal_hash_table.h" #include "opal/mca/mca.h" diff --git a/opal/mca/base/mca_base_param_internal.h b/opal/mca/base/mca_base_param_internal.h index c18efb5a5b..61784d32ce 100644 --- a/opal/mca/base/mca_base_param_internal.h +++ b/opal/mca/base/mca_base_param_internal.h @@ -37,7 +37,6 @@ #include "opal/class/opal_object.h" #include "opal/class/opal_list.h" -#include "opal/class/opal_hash_table.h" #include "opal/mca/base/mca_base_param.h" #if defined(c_plusplus) || defined(__cplusplus) diff --git a/opal/mca/base/mca_base_parse_paramfile.c b/opal/mca/base/mca_base_parse_paramfile.c index 6e4dadf72c..f089b31153 100644 --- a/opal/mca/base/mca_base_parse_paramfile.c +++ b/opal/mca/base/mca_base_parse_paramfile.c @@ -22,11 +22,9 @@ #include #include "opal/class/opal_list.h" -#include "opal/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param_internal.h" -#include "opal/constants.h" #include "opal/util/keyval_parse.h" static void save_value(const char *name, const char *value); diff --git a/opal/mca/carto/base/carto_base_select.c b/opal/mca/carto/base/carto_base_select.c index 970c0a51a9..7b796c3c95 100644 --- a/opal/mca/carto/base/carto_base_select.c +++ b/opal/mca/carto/base/carto_base_select.c @@ -21,7 +21,6 @@ #include "opal_config.h" #include "opal/constants.h" -#include "opal/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" diff --git a/opal/mca/crs/base/crs_base_select.c b/opal/mca/crs/base/crs_base_select.c index b4a27e600b..1f1c42f971 100644 --- a/opal/mca/crs/base/crs_base_select.c +++ b/opal/mca/crs/base/crs_base_select.c @@ -29,7 +29,6 @@ #include "opal/mca/base/mca_base_param.h" #include "opal/mca/crs/crs.h" #include "opal/mca/crs/base/base.h" -#include "opal/runtime/opal_cr.h" int opal_crs_base_select(void) { diff --git a/opal/mca/crs/blcr/crs_blcr.h b/opal/mca/crs/blcr/crs_blcr.h index e5186b55ec..7a3f14a0b6 100644 --- a/opal/mca/crs/blcr/crs_blcr.h +++ b/opal/mca/crs/blcr/crs_blcr.h @@ -26,12 +26,10 @@ #include "opal_config.h" -#include "opal/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/crs/crs.h" #include "opal/mca/base/base.h" -#include "opal/runtime/opal_cr.h" #include diff --git a/opal/mca/crs/blcr/crs_blcr_module.c b/opal/mca/crs/blcr/crs_blcr_module.c index 4ab71c0f34..7b2e05c139 100644 --- a/opal/mca/crs/blcr/crs_blcr_module.c +++ b/opal/mca/crs/blcr/crs_blcr_module.c @@ -29,7 +29,6 @@ #include #include "opal/util/output.h" -#include "opal/util/show_help.h" #include "opal/util/argv.h" #include "opal/constants.h" diff --git a/opal/mca/crs/none/crs_none.h b/opal/mca/crs/none/crs_none.h index 2ecef06203..6e534e035c 100644 --- a/opal/mca/crs/none/crs_none.h +++ b/opal/mca/crs/none/crs_none.h @@ -21,7 +21,6 @@ #include "opal_config.h" -#include "opal/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/crs/crs.h" diff --git a/opal/mca/crs/none/crs_none_module.c b/opal/mca/crs/none/crs_none_module.c index 31c3eef842..a7d22061f8 100644 --- a/opal/mca/crs/none/crs_none_module.c +++ b/opal/mca/crs/none/crs_none_module.c @@ -22,7 +22,6 @@ #include "opal/util/opal_environ.h" #include "opal/util/output.h" #include "opal/util/show_help.h" -#include "opal/util/argv.h" #include "opal/util/opal_environ.h" #include "opal/constants.h" diff --git a/opal/mca/crs/self/crs_self.h b/opal/mca/crs/self/crs_self.h index 5ff3636900..f06bddd68b 100644 --- a/opal/mca/crs/self/crs_self.h +++ b/opal/mca/crs/self/crs_self.h @@ -27,7 +27,6 @@ #include "opal_config.h" -#include "opal/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/crs/crs.h" diff --git a/opal/mca/maffinity/base/maffinity_base_select.c b/opal/mca/maffinity/base/maffinity_base_select.c index 715c3e8e06..a5816743bd 100644 --- a/opal/mca/maffinity/base/maffinity_base_select.c +++ b/opal/mca/maffinity/base/maffinity_base_select.c @@ -20,7 +20,6 @@ #include "opal_config.h" #include "opal/constants.h" -#include "opal/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" diff --git a/opal/mca/mca.h b/opal/mca/mca.h index ac1942bfbe..29cf1196eb 100644 --- a/opal/mca/mca.h +++ b/opal/mca/mca.h @@ -88,8 +88,6 @@ #include "opal_config.h" -#include "opal/class/opal_list.h" -#include "opal/util/cmd_line.h" /** * Common type for all MCA modules. diff --git a/opal/mca/memchecker/base/memchecker_base_select.c b/opal/mca/memchecker/base/memchecker_base_select.c index 9ba2b67d10..2f118f094a 100644 --- a/opal/mca/memchecker/base/memchecker_base_select.c +++ b/opal/mca/memchecker/base/memchecker_base_select.c @@ -14,7 +14,6 @@ #include "opal_config.h" #include "opal/constants.h" -#include "opal/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" diff --git a/opal/mca/memchecker/base/memchecker_base_wrappers.c b/opal/mca/memchecker/base/memchecker_base_wrappers.c index 351a8f680d..3dd9261fd5 100644 --- a/opal/mca/memchecker/base/memchecker_base_wrappers.c +++ b/opal/mca/memchecker/base/memchecker_base_wrappers.c @@ -14,7 +14,6 @@ #if OMPI_WANT_MEMCHECKER -#include "opal/constants.h" #include "opal/mca/memchecker/memchecker.h" #include "opal/mca/memchecker/base/base.h" diff --git a/opal/mca/memcpy/base/memcpy_base_open.c b/opal/mca/memcpy/base/memcpy_base_open.c index 18b5f89570..d0fe01b968 100644 --- a/opal/mca/memcpy/base/memcpy_base_open.c +++ b/opal/mca/memcpy/base/memcpy_base_open.c @@ -13,7 +13,6 @@ #include "opal_config.h" #include "opal/constants.h" -#include "opal/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" diff --git a/opal/mca/memory/base/memory_base_open.c b/opal/mca/memory/base/memory_base_open.c index 5e6902bc82..0abb8b4da2 100644 --- a/opal/mca/memory/base/memory_base_open.c +++ b/opal/mca/memory/base/memory_base_open.c @@ -20,7 +20,6 @@ #include "opal_config.h" #include "opal/constants.h" -#include "opal/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" diff --git a/opal/mca/paffinity/base/paffinity_base_select.c b/opal/mca/paffinity/base/paffinity_base_select.c index 03845bc088..74656d300e 100644 --- a/opal/mca/paffinity/base/paffinity_base_select.c +++ b/opal/mca/paffinity/base/paffinity_base_select.c @@ -21,7 +21,6 @@ #include "opal_config.h" #include "opal/constants.h" -#include "opal/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" diff --git a/opal/mca/paffinity/darwin/paffinity_darwin_module.c b/opal/mca/paffinity/darwin/paffinity_darwin_module.c index 2c51a3e0bc..eccee0f79c 100644 --- a/opal/mca/paffinity/darwin/paffinity_darwin_module.c +++ b/opal/mca/paffinity/darwin/paffinity_darwin_module.c @@ -35,7 +35,6 @@ #include "opal/mca/base/mca_base_param.h" #include "opal/mca/paffinity/paffinity.h" #include "opal/mca/paffinity/base/base.h" -#include "opal/util/output.h" #include "paffinity_darwin.h" diff --git a/opal/mca/paffinity/posix/paffinity_posix_module.c b/opal/mca/paffinity/posix/paffinity_posix_module.c index 1f547f4b60..d9fb80d9a0 100644 --- a/opal/mca/paffinity/posix/paffinity_posix_module.c +++ b/opal/mca/paffinity/posix/paffinity_posix_module.c @@ -31,7 +31,6 @@ #include "opal/mca/base/mca_base_param.h" #include "opal/mca/paffinity/paffinity.h" #include "opal/mca/paffinity/base/base.h" -#include "opal/util/output.h" #include "paffinity_posix.h" diff --git a/opal/mca/pstat/base/pstat_base_select.c b/opal/mca/pstat/base/pstat_base_select.c index 572bf224fd..7b5aa4a52b 100644 --- a/opal/mca/pstat/base/pstat_base_select.c +++ b/opal/mca/pstat/base/pstat_base_select.c @@ -21,7 +21,6 @@ #include "opal_config.h" #include "opal/constants.h" -#include "opal/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" diff --git a/opal/mca/pstat/darwin/pstat_darwin_module.c b/opal/mca/pstat/darwin/pstat_darwin_module.c index 2193f7bda5..202122f53e 100644 --- a/opal/mca/pstat/darwin/pstat_darwin_module.c +++ b/opal/mca/pstat/darwin/pstat_darwin_module.c @@ -37,7 +37,6 @@ #include "opal/mca/base/mca_base_param.h" #include "opal/mca/pstat/pstat.h" #include "opal/mca/pstat/base/base.h" -#include "opal/util/output.h" #include "pstat_darwin.h" diff --git a/opal/mca/timer/base/timer_base_open.c b/opal/mca/timer/base/timer_base_open.c index 9180679c37..756e9f4398 100644 --- a/opal/mca/timer/base/timer_base_open.c +++ b/opal/mca/timer/base/timer_base_open.c @@ -20,7 +20,6 @@ #include "opal_config.h" #include "opal/constants.h" -#include "opal/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" diff --git a/opal/memoryhooks/memory.c b/opal/memoryhooks/memory.c index 953f0ca078..81ac6d5a73 100644 --- a/opal/memoryhooks/memory.c +++ b/opal/memoryhooks/memory.c @@ -26,7 +26,6 @@ #endif /* HAVE_SYS_MMAN_H */ #include "opal/constants.h" -#include "opal/util/output.h" #include "opal/memoryhooks/memory.h" #include "opal/memoryhooks/memory_internal.h" #include "opal/class/opal_list.h" diff --git a/opal/runtime/opal_cr.c b/opal/runtime/opal_cr.c index 65cb7c966d..05bf20d4f6 100644 --- a/opal/runtime/opal_cr.c +++ b/opal/runtime/opal_cr.c @@ -48,7 +48,6 @@ #include "opal/class/opal_object.h" #include "opal/util/opal_environ.h" -#include "opal/util/trace.h" #include "opal/util/output.h" #include "opal/util/malloc.h" #include "opal/util/if.h" @@ -71,7 +70,6 @@ #include "opal/threads/mutex.h" #include "opal/threads/threads.h" #include "opal/mca/crs/base/base.h" -#include "opal/threads/condition.h" /****************** * Global Var Decls diff --git a/opal/runtime/opal_cr.h b/opal/runtime/opal_cr.h index 7a83e0f279..5ba85c22d8 100644 --- a/opal/runtime/opal_cr.h +++ b/opal/runtime/opal_cr.h @@ -26,7 +26,6 @@ #include "opal_config.h" #include "opal/mca/crs/crs.h" #include "opal/event/event.h" -#include "opal/runtime/opal_progress.h" #include "opal/util/output.h" #include "opal/prefetch.h" diff --git a/opal/runtime/opal_params.c b/opal/runtime/opal_params.c index cf0dedda2d..3d4e48d997 100644 --- a/opal/runtime/opal_params.c +++ b/opal/runtime/opal_params.c @@ -28,8 +28,6 @@ #include "opal/constants.h" #include "opal/runtime/opal.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" #include "opal/mca/base/mca_base_param.h" #include "opal/threads/mutex.h" diff --git a/opal/threads/condition.c b/opal/threads/condition.c index 0c8eebea8b..3e25c8f27c 100644 --- a/opal/threads/condition.c +++ b/opal/threads/condition.c @@ -18,7 +18,6 @@ #include "opal_config.h" -#include "opal/threads/mutex.h" #include "opal/threads/condition.h" diff --git a/opal/tools/opal-checkpoint/opal-checkpoint.c b/opal/tools/opal-checkpoint/opal-checkpoint.c index 5e525e6202..7e8537f285 100644 --- a/opal/tools/opal-checkpoint/opal-checkpoint.c +++ b/opal/tools/opal-checkpoint/opal-checkpoint.c @@ -61,7 +61,6 @@ #include "opal/util/show_help.h" #include "opal/util/opal_environ.h" #include "opal/util/output.h" -#include "opal/util/os_path.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" diff --git a/opal/tools/opal-restart/opal-restart.c b/opal/tools/opal-restart/opal-restart.c index b036c9e970..ba16874da7 100644 --- a/opal/tools/opal-restart/opal-restart.c +++ b/opal/tools/opal-restart/opal-restart.c @@ -61,7 +61,6 @@ #include "opal/util/show_help.h" #include "opal/util/output.h" #include "opal/util/opal_environ.h" -#include "opal/util/os_path.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" diff --git a/opal/util/arch.h b/opal/util/arch.h index 7f2b7fab74..c43cecb4c0 100644 --- a/opal/util/arch.h +++ b/opal/util/arch.h @@ -25,7 +25,6 @@ #include #include -#include "opal/constants.h" /*************************************************** ** This file tries to classify the most relevant diff --git a/opal/util/argv.c b/opal/util/argv.c index 7433b943c8..e316adb3ff 100644 --- a/opal/util/argv.c +++ b/opal/util/argv.c @@ -27,7 +27,6 @@ #endif /* HAVE_STRING_H */ #include "opal/util/argv.h" -#include "opal/util/strncpy.h" #include "opal/constants.h" #define ARGSIZE 128 diff --git a/opal/util/basename.c b/opal/util/basename.c index 76c6db1283..42877c04e8 100644 --- a/opal/util/basename.c +++ b/opal/util/basename.c @@ -29,7 +29,6 @@ #include "opal/util/basename.h" #include "opal/util/os_path.h" -#include "opal/constants.h" /** * Return a pointer into the original string where the last PATH delimiter diff --git a/opal/util/if.c b/opal/util/if.c index 066a422e47..5b324eac3e 100644 --- a/opal/util/if.c +++ b/opal/util/if.c @@ -71,7 +71,6 @@ #include "opal/class/opal_list.h" #include "opal/util/if.h" #include "opal/util/output.h" -#include "opal/util/strncpy.h" #include "opal/constants.h" #include "opal/mca/base/mca_base_param.h" diff --git a/opal/util/net.c b/opal/util/net.c index 694c70e05b..fa550434f1 100644 --- a/opal/util/net.c +++ b/opal/util/net.c @@ -69,10 +69,8 @@ #include #endif -#include "opal/class/opal_list.h" #include "opal/util/net.h" #include "opal/util/output.h" -#include "opal/util/strncpy.h" #include "opal/util/argv.h" #include "opal/constants.h" #include "opal/threads/tsd.h" diff --git a/opal/util/os_path.c b/opal/util/os_path.c index fc0df2d871..96d7f38b77 100644 --- a/opal/util/os_path.c +++ b/opal/util/os_path.c @@ -29,7 +29,6 @@ #include #include "opal/util/os_path.h" -#include "opal/constants.h" static const char *path_sep = OPAL_PATH_SEP; diff --git a/opal/util/path.c b/opal/util/path.c index 020dcb8baa..38f7507413 100644 --- a/opal/util/path.c +++ b/opal/util/path.c @@ -33,7 +33,6 @@ #include "opal/util/path.h" #include "opal/util/os_path.h" #include "opal/util/argv.h" -#include "opal/util/output.h" static void path_env_load(char *path, int *pargc, char ***pargv); static char *list_env_get(char *var, char **list); diff --git a/orte/mca/errmgr/base/errmgr_base_fns.c b/orte/mca/errmgr/base/errmgr_base_fns.c index d01147a17b..99c181df71 100644 --- a/orte/mca/errmgr/base/errmgr_base_fns.c +++ b/orte/mca/errmgr/base/errmgr_base_fns.c @@ -27,7 +27,6 @@ #include "opal/util/trace.h" #include "opal/util/output.h" -#include "opal/util/error.h" #include "orte/runtime/orte_globals.h" #include "orte/util/name_fns.h" diff --git a/orte/mca/errmgr/base/errmgr_private.h b/orte/mca/errmgr/base/errmgr_private.h index 8750d4aec5..0013b2fe76 100644 --- a/orte/mca/errmgr/base/errmgr_private.h +++ b/orte/mca/errmgr/base/errmgr_private.h @@ -29,7 +29,6 @@ #include "orte/types.h" #include "opal/dss/dss_types.h" -#include "orte/mca/rml/rml_types.h" #include "orte/mca/plm/plm_types.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/mca/errmgr/default/errmgr_default.c b/orte/mca/errmgr/default/errmgr_default.c index 748c108d86..9b3c42a70d 100644 --- a/orte/mca/errmgr/default/errmgr_default.c +++ b/orte/mca/errmgr/default/errmgr_default.c @@ -23,15 +23,12 @@ #include #include -#include "opal/class/opal_list.h" #include "opal/util/trace.h" -#include "orte/runtime/runtime.h" #include "orte/runtime/orte_globals.h" #include "orte/runtime/orte_wait.h" #include "orte/runtime/orte_locks.h" #include "orte/mca/plm/plm.h" -#include "orte/util/session_dir.h" #include "orte/util/name_fns.h" #include "orte/mca/errmgr/base/errmgr_private.h" diff --git a/orte/mca/errmgr/default/errmgr_default_component.c b/orte/mca/errmgr/default/errmgr_default_component.c index 2c7002380d..1e0bc44ca3 100644 --- a/orte/mca/errmgr/default/errmgr_default_component.c +++ b/orte/mca/errmgr/default/errmgr_default_component.c @@ -27,14 +27,11 @@ */ #include "orte_config.h" #include "orte/constants.h" -#include "orte/types.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "orte/runtime/orte_globals.h" -#include "orte/util/name_fns.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/errmgr/base/base.h" diff --git a/orte/mca/ess/alps/ess_alps_module.c b/orte/mca/ess/alps/ess_alps_module.c index e167c14263..4efc5a2d1f 100644 --- a/orte/mca/ess/alps/ess_alps_module.c +++ b/orte/mca/ess/alps/ess_alps_module.c @@ -23,8 +23,6 @@ #include #include "orte/util/show_help.h" -#include "opal/util/argv.h" -#include "opal/class/opal_pointer_array.h" #include "opal/mca/paffinity/paffinity.h" #include "orte/util/proc_info.h" diff --git a/orte/mca/ess/base/base.h b/orte/mca/ess/base/base.h index 80688b5e11..8ed2ddac28 100644 --- a/orte/mca/ess/base/base.h +++ b/orte/mca/ess/base/base.h @@ -25,11 +25,7 @@ #include "orte/types.h" #include "opal/mca/mca.h" -#include "opal/dss/dss_types.h" -#include "opal/class/opal_pointer_array.h" -#include "opal/class/opal_value_array.h" -#include "orte/runtime/orte_globals.h" #include "orte/mca/ess/ess.h" diff --git a/orte/mca/ess/bproc/ess_bproc_put.c b/orte/mca/ess/bproc/ess_bproc_put.c index 63e54bb164..06c5f7a154 100644 --- a/orte/mca/ess/bproc/ess_bproc_put.c +++ b/orte/mca/ess/bproc/ess_bproc_put.c @@ -25,7 +25,6 @@ #include #include "opal/util/opal_environ.h" -#include "opal/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "orte/orte_constants.h" #include "orte/mca/sds/base/base.h" diff --git a/orte/mca/ess/cnos/ess_cnos_module.c b/orte/mca/ess/cnos/ess_cnos_module.c index 17e17effd1..d9d57a1b79 100644 --- a/orte/mca/ess/cnos/ess_cnos_module.c +++ b/orte/mca/ess/cnos/ess_cnos_module.c @@ -27,7 +27,6 @@ #include "orte/mca/errmgr/base/base.h" -#include "orte/util/name_fns.h" #include "orte/util/proc_info.h" #include "orte/runtime/orte_globals.h" #include "orte/mca/grpcomm/base/base.h" diff --git a/orte/mca/ess/env/ess_env_module.c b/orte/mca/ess/env/ess_env_module.c index 2d712435e8..482198772d 100644 --- a/orte/mca/ess/env/ess_env_module.c +++ b/orte/mca/ess/env/ess_env_module.c @@ -30,25 +30,18 @@ #endif #include "opal/event/event.h" -#include "opal/threads/mutex.h" #include "opal/runtime/opal.h" -#include "opal/runtime/opal_cr.h" -#include "opal/class/opal_pointer_array.h" #include "opal/mca/paffinity/paffinity.h" #include "orte/util/show_help.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/os_path.h" #include "opal/util/output.h" -#include "opal/util/cmd_line.h" #include "opal/util/malloc.h" -#include "opal/util/argv.h" #include "orte/mca/rml/base/base.h" #include "orte/mca/rml/rml_types.h" -#include "orte/mca/rml/base/rml_contact.h" #include "orte/mca/routed/base/base.h" #include "orte/mca/routed/routed.h" #include "orte/mca/errmgr/base/base.h" @@ -58,7 +51,6 @@ #include "orte/mca/ess/ess.h" #include "orte/mca/ras/base/base.h" #include "orte/mca/plm/base/base.h" -#include "orte/mca/odls/base/base.h" #include "orte/mca/rmaps/base/base.h" #if OPAL_ENABLE_FT == 1 @@ -67,7 +59,6 @@ #include "orte/mca/filem/base/base.h" #include "orte/util/proc_info.h" #include "orte/util/session_dir.h" -#include "orte/util/hnp_contact.h" #include "orte/util/name_fns.h" #include "orte/util/nidmap.h" diff --git a/orte/mca/ess/hnp/ess_hnp_module.c b/orte/mca/ess/hnp/ess_hnp_module.c index 69aaa34eea..49169c7b4e 100644 --- a/orte/mca/ess/hnp/ess_hnp_module.c +++ b/orte/mca/ess/hnp/ess_hnp_module.c @@ -43,7 +43,6 @@ #include "orte/util/show_help.h" #include "orte/mca/rml/base/base.h" #include "orte/mca/rml/rml_types.h" -#include "orte/mca/rml/base/rml_contact.h" #include "orte/mca/routed/base/base.h" #include "orte/mca/routed/routed.h" #include "orte/mca/errmgr/base/base.h" diff --git a/orte/mca/ess/lsf/ess_lsf_module.c b/orte/mca/ess/lsf/ess_lsf_module.c index e74b0472a7..dd7f98d359 100644 --- a/orte/mca/ess/lsf/ess_lsf_module.c +++ b/orte/mca/ess/lsf/ess_lsf_module.c @@ -31,9 +31,7 @@ #include -#include "opal/util/argv.h" #include "opal/util/opal_environ.h" -#include "opal/class/opal_pointer_array.h" #include "opal/mca/paffinity/paffinity.h" #include "orte/util/show_help.h" diff --git a/orte/mca/ess/singleton/ess_singleton_module.c b/orte/mca/ess/singleton/ess_singleton_module.c index db1de1e799..3375f022ed 100644 --- a/orte/mca/ess/singleton/ess_singleton_module.c +++ b/orte/mca/ess/singleton/ess_singleton_module.c @@ -36,15 +36,11 @@ #include "opal/util/path.h" #include "opal/mca/base/mca_base_param.h" #include "opal/mca/installdirs/installdirs.h" -#include "opal/class/opal_pointer_array.h" -#include "opal/class/opal_value_array.h" #include "opal/mca/paffinity/paffinity.h" #include "orte/util/show_help.h" #include "orte/util/proc_info.h" #include "orte/mca/errmgr/errmgr.h" -#include "orte/mca/iof/iof.h" -#include "orte/mca/rml/base/rml_contact.h" #include "orte/mca/routed/routed.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/mca/ess/slave/ess_slave_module.c b/orte/mca/ess/slave/ess_slave_module.c index a9a6fdddc3..95a0086764 100644 --- a/orte/mca/ess/slave/ess_slave_module.c +++ b/orte/mca/ess/slave/ess_slave_module.c @@ -30,25 +30,18 @@ #endif #include "opal/event/event.h" -#include "opal/threads/mutex.h" #include "opal/runtime/opal.h" -#include "opal/runtime/opal_cr.h" -#include "opal/class/opal_pointer_array.h" #include "opal/mca/paffinity/paffinity.h" #include "orte/util/show_help.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/os_path.h" #include "opal/util/output.h" -#include "opal/util/cmd_line.h" #include "opal/util/malloc.h" -#include "opal/util/argv.h" #include "orte/mca/rml/base/base.h" #include "orte/mca/rml/rml_types.h" -#include "orte/mca/rml/base/rml_contact.h" #include "orte/mca/routed/base/base.h" #include "orte/mca/routed/routed.h" #include "orte/mca/errmgr/base/base.h" @@ -58,7 +51,6 @@ #include "orte/mca/ess/ess.h" #include "orte/mca/ras/base/base.h" #include "orte/mca/plm/base/base.h" -#include "orte/mca/odls/base/base.h" #include "orte/mca/rmaps/base/base.h" #if OPAL_ENABLE_FT == 1 @@ -67,7 +59,6 @@ #include "orte/mca/filem/base/base.h" #include "orte/util/proc_info.h" #include "orte/util/session_dir.h" -#include "orte/util/hnp_contact.h" #include "orte/util/name_fns.h" #include "orte/util/nidmap.h" diff --git a/orte/mca/ess/slurm/ess_slurm_module.c b/orte/mca/ess/slurm/ess_slurm_module.c index 90a4022220..5178bb9eb0 100644 --- a/orte/mca/ess/slurm/ess_slurm_module.c +++ b/orte/mca/ess/slurm/ess_slurm_module.c @@ -51,8 +51,6 @@ #include "opal/mca/base/mca_base_param.h" #include "opal/util/argv.h" #include "opal/class/opal_pointer_array.h" -#include "opal/util/if.h" -#include "opal/util/net.h" #include "opal/dss/dss.h" #include "opal/mca/paffinity/paffinity.h" diff --git a/orte/mca/ess/slurmd/ess_slurmd_module.c b/orte/mca/ess/slurmd/ess_slurmd_module.c index c024fb4be1..5995050933 100644 --- a/orte/mca/ess/slurmd/ess_slurmd_module.c +++ b/orte/mca/ess/slurmd/ess_slurmd_module.c @@ -41,9 +41,6 @@ #include "opal/mca/base/mca_base_param.h" #include "opal/util/argv.h" #include "opal/class/opal_pointer_array.h" -#include "opal/util/if.h" -#include "opal/util/net.h" -#include "opal/dss/dss.h" #include "opal/mca/paffinity/paffinity.h" #include "orte/util/proc_info.h" @@ -53,7 +50,6 @@ #include "orte/runtime/orte_globals.h" #include "orte/util/nidmap.h" #include "orte/util/regex.h" -#include "orte/mca/rml/base/rml_contact.h" #include "orte/runtime/orte_wait.h" #include "orte/mca/ess/ess.h" diff --git a/orte/mca/ess/tool/ess_tool_module.c b/orte/mca/ess/tool/ess_tool_module.c index 4ce7414808..c6bf55390f 100644 --- a/orte/mca/ess/tool/ess_tool_module.c +++ b/orte/mca/ess/tool/ess_tool_module.c @@ -29,7 +29,6 @@ #include #endif -#include "opal/runtime/opal_cr.h" #include "orte/util/show_help.h" #include "orte/mca/plm/base/base.h" diff --git a/orte/mca/filem/base/base.h b/orte/mca/filem/base/base.h index 5d28d1a9c5..27eb46d840 100644 --- a/orte/mca/filem/base/base.h +++ b/orte/mca/filem/base/base.h @@ -20,7 +20,6 @@ #include "orte_config.h" -#include "opal/dss/dss.h" #if !ORTE_DISABLE_FULL_SUPPORT #include "orte/mca/rml/rml.h" diff --git a/orte/mca/filem/base/filem_base_fns.c b/orte/mca/filem/base/filem_base_fns.c index eca03a2fcd..3716268405 100644 --- a/orte/mca/filem/base/filem_base_fns.c +++ b/orte/mca/filem/base/filem_base_fns.c @@ -32,15 +32,12 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/argv.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/os_dirpath.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/runtime/orte_globals.h" -#include "orte/util/name_fns.h" #include "orte/mca/filem/filem.h" #include "orte/mca/filem/base/base.h" diff --git a/orte/mca/filem/rsh/filem_rsh_module.c b/orte/mca/filem/rsh/filem_rsh_module.c index 8e6bc68321..38ea3c121b 100644 --- a/orte/mca/filem/rsh/filem_rsh_module.c +++ b/orte/mca/filem/rsh/filem_rsh_module.c @@ -44,7 +44,6 @@ #include "opal/util/opal_environ.h" #include "opal/threads/mutex.h" -#include "opal/threads/threads.h" #include "opal/threads/condition.h" #include "orte/util/name_fns.h" diff --git a/orte/mca/grpcomm/bad/grpcomm_bad.h b/orte/mca/grpcomm/bad/grpcomm_bad.h index 3ab186bc1b..cb15880644 100644 --- a/orte/mca/grpcomm/bad/grpcomm_bad.h +++ b/orte/mca/grpcomm/bad/grpcomm_bad.h @@ -21,11 +21,7 @@ #define GRPCOMM_BAD_H #include "orte_config.h" -#include "orte/types.h" -#include "opal/threads/mutex.h" -#include "opal/threads/condition.h" -#include "opal/class/opal_object.h" #include "orte/mca/grpcomm/grpcomm.h" diff --git a/orte/mca/grpcomm/bad/grpcomm_bad_component.c b/orte/mca/grpcomm/bad/grpcomm_bad_component.c index 84f9c4a73b..b5b64b4d57 100644 --- a/orte/mca/grpcomm/bad/grpcomm_bad_component.c +++ b/orte/mca/grpcomm/bad/grpcomm_bad_component.c @@ -32,8 +32,6 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/threads/mutex.h" -#include "opal/class/opal_list.h" #include "opal/mca/mca.h" #include "opal/mca/base/mca_base_param.h" diff --git a/orte/mca/grpcomm/bad/grpcomm_bad_module.c b/orte/mca/grpcomm/bad/grpcomm_bad_module.c index 2210bc03ec..2cd176ae83 100644 --- a/orte/mca/grpcomm/bad/grpcomm_bad_module.c +++ b/orte/mca/grpcomm/bad/grpcomm_bad_module.c @@ -23,10 +23,7 @@ #include -#include "opal/threads/condition.h" -#include "opal/util/bit_ops.h" -#include "opal/class/opal_hash_table.h" #include "orte/util/proc_info.h" #include "opal/dss/dss.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/mca/grpcomm/base/base.h b/orte/mca/grpcomm/base/base.h index 0c582f658a..583af59453 100644 --- a/orte/mca/grpcomm/base/base.h +++ b/orte/mca/grpcomm/base/base.h @@ -28,8 +28,6 @@ #include "opal/class/opal_list.h" #include "opal/mca/mca.h" -#include "opal/threads/mutex.h" -#include "opal/threads/condition.h" #include "orte/mca/grpcomm/grpcomm.h" diff --git a/orte/mca/grpcomm/base/grpcomm_base_allgather.c b/orte/mca/grpcomm/base/grpcomm_base_allgather.c index b9d32e1ceb..b8f599d103 100644 --- a/orte/mca/grpcomm/base/grpcomm_base_allgather.c +++ b/orte/mca/grpcomm/base/grpcomm_base_allgather.c @@ -26,12 +26,10 @@ #include #endif /* HAVE_SYS_TIME_H */ -#include "opal/threads/condition.h" #include "opal/util/output.h" #include "opal/dss/dss.h" #include "orte/mca/errmgr/errmgr.h" -#include "orte/mca/odls/odls_types.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/mca/grpcomm/base/grpcomm_base_coll.c b/orte/mca/grpcomm/base/grpcomm_base_coll.c index 3857d61464..dd8fdb15c4 100644 --- a/orte/mca/grpcomm/base/grpcomm_base_coll.c +++ b/orte/mca/grpcomm/base/grpcomm_base_coll.c @@ -32,14 +32,10 @@ #include #endif /* HAVE_SYS_TIME_H */ -#include "opal/threads/condition.h" -#include "opal/util/bit_ops.h" #include "opal/util/output.h" -#include "opal/class/opal_hash_table.h" #include "opal/dss/dss.h" #include "orte/mca/errmgr/errmgr.h" -#include "orte/mca/odls/odls_types.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/mca/grpcomm/base/grpcomm_base_modex.c b/orte/mca/grpcomm/base/grpcomm_base_modex.c index 0b3c505f49..358b88e7fd 100644 --- a/orte/mca/grpcomm/base/grpcomm_base_modex.c +++ b/orte/mca/grpcomm/base/grpcomm_base_modex.c @@ -28,7 +28,6 @@ #endif /* HAVE_SYS_TIME_H */ #include "opal/threads/condition.h" -#include "opal/util/bit_ops.h" #include "opal/util/output.h" #include "opal/class/opal_hash_table.h" #include "opal/dss/dss.h" @@ -36,7 +35,6 @@ #include "orte/util/proc_info.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/ess/ess.h" -#include "orte/mca/odls/odls_types.h" #include "orte/runtime/orte_globals.h" #include "orte/util/name_fns.h" #include "orte/util/nidmap.h" diff --git a/orte/mca/grpcomm/basic/grpcomm_basic.h b/orte/mca/grpcomm/basic/grpcomm_basic.h index ad2081a189..f03d28a294 100644 --- a/orte/mca/grpcomm/basic/grpcomm_basic.h +++ b/orte/mca/grpcomm/basic/grpcomm_basic.h @@ -21,11 +21,7 @@ #define GRPCOMM_BASIC_H #include "orte_config.h" -#include "orte/types.h" -#include "opal/threads/mutex.h" -#include "opal/threads/condition.h" -#include "opal/class/opal_object.h" #include "orte/mca/grpcomm/grpcomm.h" diff --git a/orte/mca/grpcomm/basic/grpcomm_basic_component.c b/orte/mca/grpcomm/basic/grpcomm_basic_component.c index 016fe94622..bd68d7148e 100644 --- a/orte/mca/grpcomm/basic/grpcomm_basic_component.c +++ b/orte/mca/grpcomm/basic/grpcomm_basic_component.c @@ -32,8 +32,6 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/threads/mutex.h" -#include "opal/class/opal_list.h" #include "opal/mca/mca.h" #include "opal/mca/base/mca_base_param.h" diff --git a/orte/mca/grpcomm/basic/grpcomm_basic_module.c b/orte/mca/grpcomm/basic/grpcomm_basic_module.c index d1cf84a27c..ea5065fe38 100644 --- a/orte/mca/grpcomm/basic/grpcomm_basic_module.c +++ b/orte/mca/grpcomm/basic/grpcomm_basic_module.c @@ -24,9 +24,6 @@ #include #include -#include "opal/threads/condition.h" -#include "opal/util/bit_ops.h" -#include "opal/class/opal_hash_table.h" #include "opal/dss/dss.h" #include "opal/runtime/opal.h" diff --git a/orte/mca/grpcomm/cnos/grpcomm_cnos.h b/orte/mca/grpcomm/cnos/grpcomm_cnos.h index 57a8a72385..5b9d973364 100644 --- a/orte/mca/grpcomm/cnos/grpcomm_cnos.h +++ b/orte/mca/grpcomm/cnos/grpcomm_cnos.h @@ -21,12 +21,8 @@ #define GRPCOMM_CNOS_H #include "orte_config.h" -#include "orte/types.h" #include "orte/constants.h" -#include "opal/threads/mutex.h" -#include "opal/threads/condition.h" -#include "opal/class/opal_object.h" #include "orte/mca/grpcomm/grpcomm.h" diff --git a/orte/mca/grpcomm/cnos/grpcomm_cnos_component.c b/orte/mca/grpcomm/cnos/grpcomm_cnos_component.c index 10fc5ee9a7..5b905242f7 100644 --- a/orte/mca/grpcomm/cnos/grpcomm_cnos_component.c +++ b/orte/mca/grpcomm/cnos/grpcomm_cnos_component.c @@ -31,7 +31,6 @@ */ #include "orte_config.h" #include "orte/constants.h" -#include "orte/types.h" #include "opal/mca/mca.h" #include "opal/mca/base/mca_base_param.h" diff --git a/orte/mca/grpcomm/cnos/grpcomm_cnos_module.c b/orte/mca/grpcomm/cnos/grpcomm_cnos_module.c index 83e69f723b..7ebc1b1bc5 100644 --- a/orte/mca/grpcomm/cnos/grpcomm_cnos_module.c +++ b/orte/mca/grpcomm/cnos/grpcomm_cnos_module.c @@ -28,11 +28,9 @@ #include "opal/dss/dss.h" #include "opal/class/opal_list.h" -#include "opal/class/opal_value_array.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/rml/rml_types.h" -#include "orte/mca/rmaps/rmaps_types.h" #include "grpcomm_cnos.h" diff --git a/orte/mca/grpcomm/grpcomm.h b/orte/mca/grpcomm/grpcomm.h index 778340b684..5f68609098 100644 --- a/orte/mca/grpcomm/grpcomm.h +++ b/orte/mca/grpcomm/grpcomm.h @@ -39,12 +39,9 @@ #include "opal/mca/mca.h" #include "opal/class/opal_list.h" -#include "opal/class/opal_value_array.h" #include "opal/dss/dss_types.h" -#include "orte/mca/rmaps/rmaps_types.h" #include "orte/mca/rml/rml_types.h" -#include "orte/mca/odls/odls_types.h" #include "orte/mca/grpcomm/grpcomm_types.h" diff --git a/orte/mca/grpcomm/hier/grpcomm_hier.h b/orte/mca/grpcomm/hier/grpcomm_hier.h index cf2c1f08dc..a8e2277ca4 100644 --- a/orte/mca/grpcomm/hier/grpcomm_hier.h +++ b/orte/mca/grpcomm/hier/grpcomm_hier.h @@ -21,11 +21,7 @@ #define GRPCOMM_HIER_H #include "orte_config.h" -#include "orte/types.h" -#include "opal/threads/mutex.h" -#include "opal/threads/condition.h" -#include "opal/class/opal_object.h" #include "orte/mca/grpcomm/grpcomm.h" diff --git a/orte/mca/grpcomm/hier/grpcomm_hier_component.c b/orte/mca/grpcomm/hier/grpcomm_hier_component.c index 118fde534d..5b4a98119f 100644 --- a/orte/mca/grpcomm/hier/grpcomm_hier_component.c +++ b/orte/mca/grpcomm/hier/grpcomm_hier_component.c @@ -26,8 +26,6 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/threads/mutex.h" -#include "opal/class/opal_list.h" #include "opal/mca/mca.h" #include "opal/mca/base/mca_base_param.h" diff --git a/orte/mca/grpcomm/hier/grpcomm_hier_module.c b/orte/mca/grpcomm/hier/grpcomm_hier_module.c index e98a350f01..2166215007 100644 --- a/orte/mca/grpcomm/hier/grpcomm_hier_module.c +++ b/orte/mca/grpcomm/hier/grpcomm_hier_module.c @@ -24,9 +24,6 @@ #include #include -#include "opal/threads/condition.h" -#include "opal/util/bit_ops.h" -#include "opal/class/opal_hash_table.h" #include "opal/dss/dss.h" #include "opal/runtime/opal.h" #include "opal/mca/paffinity/paffinity.h" diff --git a/orte/mca/iof/base/base.h b/orte/mca/iof/base/base.h index eeb8b323b1..a63993b919 100644 --- a/orte/mca/iof/base/base.h +++ b/orte/mca/iof/base/base.h @@ -42,8 +42,6 @@ #include #endif -#include "opal/class/opal_free_list.h" -#include "opal/threads/condition.h" #include "opal/mca/mca.h" #include "orte/mca/iof/iof.h" diff --git a/orte/mca/iof/hnp/iof_hnp_read.c b/orte/mca/iof/hnp/iof_hnp_read.c index f0c9431545..731dc0e892 100644 --- a/orte/mca/iof/hnp/iof_hnp_read.c +++ b/orte/mca/iof/hnp/iof_hnp_read.c @@ -30,7 +30,6 @@ #include "opal/dss/dss.h" -#include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/odls/odls_types.h" diff --git a/orte/mca/iof/hnp/iof_hnp_send.c b/orte/mca/iof/hnp/iof_hnp_send.c index 0cc57d4f7b..915ad0cc40 100644 --- a/orte/mca/iof/hnp/iof_hnp_send.c +++ b/orte/mca/iof/hnp/iof_hnp_send.c @@ -32,7 +32,6 @@ #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" #include "orte/mca/errmgr/errmgr.h" -#include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" #include "orte/mca/grpcomm/grpcomm.h" diff --git a/orte/mca/iof/iof.h b/orte/mca/iof/iof.h index 656dd68700..21699d3728 100644 --- a/orte/mca/iof/iof.h +++ b/orte/mca/iof/iof.h @@ -114,13 +114,11 @@ #include "orte_config.h" #include "orte/types.h" -#include "opal/class/opal_list.h" #include "opal/mca/mca.h" #include "opal/mca/crs/crs.h" #include "opal/mca/crs/base/base.h" -#include "orte/util/name_fns.h" #include "iof_types.h" diff --git a/orte/mca/iof/orted/iof_orted_component.c b/orte/mca/iof/orted/iof_orted_component.c index d32251cbb7..2a2d6c54e2 100644 --- a/orte/mca/iof/orted/iof_orted_component.c +++ b/orte/mca/iof/orted/iof_orted_component.c @@ -19,7 +19,6 @@ #include "orte_config.h" -#include "opal/runtime/opal_progress.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" diff --git a/orte/mca/iof/tool/iof_tool_component.c b/orte/mca/iof/tool/iof_tool_component.c index f145bb641f..57f6d2a37a 100644 --- a/orte/mca/iof/tool/iof_tool_component.c +++ b/orte/mca/iof/tool/iof_tool_component.c @@ -19,7 +19,6 @@ #include "orte_config.h" -#include "opal/runtime/opal_progress.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" diff --git a/orte/mca/notifier/command/notifier_command.h b/orte/mca/notifier/command/notifier_command.h index 442fe35ee8..e4a605b30a 100644 --- a/orte/mca/notifier/command/notifier_command.h +++ b/orte/mca/notifier/command/notifier_command.h @@ -27,7 +27,6 @@ #include #endif -#include "orte/types.h" #include "orte/mca/notifier/notifier.h" BEGIN_C_DECLS diff --git a/orte/mca/notifier/command/notifier_command_component.c b/orte/mca/notifier/command/notifier_command_component.c index e512508bf5..ac39a12766 100644 --- a/orte/mca/notifier/command/notifier_command_component.c +++ b/orte/mca/notifier/command/notifier_command_component.c @@ -35,8 +35,9 @@ #include "opal/util/argv.h" #include "orte/constants.h" -#include "orte/runtime/orte_globals.h" +#include "orte/runtime/orte_wait.h" #include "orte/util/show_help.h" +#include "orte/util/proc_info.h" #include "notifier_command.h" diff --git a/orte/mca/notifier/command/notifier_command_module.c b/orte/mca/notifier/command/notifier_command_module.c index 0cb6b6e53c..155de9af29 100644 --- a/orte/mca/notifier/command/notifier_command_module.c +++ b/orte/mca/notifier/command/notifier_command_module.c @@ -37,8 +37,6 @@ #endif #include "opal/util/show_help.h" -#include "opal/util/output.h" -#include "opal/util/argv.h" #include "opal/util/error.h" #include "orte/constants.h" diff --git a/orte/mca/notifier/ftb/notifier_ftb.h b/orte/mca/notifier/ftb/notifier_ftb.h index 51bb960d16..a46c99259a 100644 --- a/orte/mca/notifier/ftb/notifier_ftb.h +++ b/orte/mca/notifier/ftb/notifier_ftb.h @@ -21,7 +21,6 @@ #define NOTIFIER_FTB_H #include "orte_config.h" -#include "orte/types.h" #include "orte/mca/notifier/notifier.h" diff --git a/orte/mca/notifier/smtp/notifier_smtp.h b/orte/mca/notifier/smtp/notifier_smtp.h index 7cfd9acc2d..e30159760d 100644 --- a/orte/mca/notifier/smtp/notifier_smtp.h +++ b/orte/mca/notifier/smtp/notifier_smtp.h @@ -27,7 +27,6 @@ #include "libesmtp.h" -#include "orte/types.h" #include "orte/mca/notifier/notifier.h" BEGIN_C_DECLS diff --git a/orte/mca/notifier/smtp/notifier_smtp_module.c b/orte/mca/notifier/smtp/notifier_smtp_module.c index 39ae4b587c..a87677979f 100644 --- a/orte/mca/notifier/smtp/notifier_smtp_module.c +++ b/orte/mca/notifier/smtp/notifier_smtp_module.c @@ -37,7 +37,6 @@ #endif #include "opal/util/show_help.h" -#include "opal/util/output.h" #include "opal/util/argv.h" #include "orte/constants.h" diff --git a/orte/mca/notifier/syslog/notifier_syslog.h b/orte/mca/notifier/syslog/notifier_syslog.h index 409c54b026..32a242c93e 100644 --- a/orte/mca/notifier/syslog/notifier_syslog.h +++ b/orte/mca/notifier/syslog/notifier_syslog.h @@ -21,7 +21,6 @@ #define NOTIFIER_SYSLOG_H #include "orte_config.h" -#include "orte/types.h" #include "orte/mca/notifier/notifier.h" diff --git a/orte/mca/notifier/twitter/notifier_twitter.h b/orte/mca/notifier/twitter/notifier_twitter.h index a2f2f825ba..2f52a30735 100644 --- a/orte/mca/notifier/twitter/notifier_twitter.h +++ b/orte/mca/notifier/twitter/notifier_twitter.h @@ -25,7 +25,6 @@ #include -#include "orte/types.h" #include "orte/mca/notifier/notifier.h" BEGIN_C_DECLS diff --git a/orte/mca/notifier/twitter/notifier_twitter_module.c b/orte/mca/notifier/twitter/notifier_twitter_module.c index d434cfceeb..14b225ebec 100644 --- a/orte/mca/notifier/twitter/notifier_twitter_module.c +++ b/orte/mca/notifier/twitter/notifier_twitter_module.c @@ -33,7 +33,6 @@ #include #include "opal/util/show_help.h" -#include "opal/util/output.h" #include "orte/version.h" #include "orte/constants.h" diff --git a/orte/mca/odls/base/odls_base_default_fns.c b/orte/mca/odls/base/odls_base_default_fns.c index 52dcc96a93..07e234064c 100644 --- a/orte/mca/odls/base/odls_base_default_fns.c +++ b/orte/mca/odls/base/odls_base_default_fns.c @@ -42,21 +42,18 @@ #include "opal/util/argv.h" #include "opal/util/os_path.h" #include "opal/util/sys_limits.h" -#include "opal/class/opal_pointer_array.h" #include "opal/dss/dss.h" #include "opal/mca/paffinity/base/base.h" #include "opal/mca/pstat/pstat.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/rml/rml.h" -#include "orte/mca/rml/base/rml_contact.h" #include "orte/mca/routed/routed.h" #include "orte/mca/iof/iof.h" #include "orte/mca/iof/base/iof_base_setup.h" #include "orte/mca/ess/base/base.h" #include "orte/mca/plm/base/base.h" #include "orte/mca/routed/base/base.h" -#include "orte/mca/grpcomm/grpcomm.h" #include "orte/util/context_fns.h" #include "orte/util/name_fns.h" diff --git a/orte/mca/odls/base/odls_base_open.c b/orte/mca/odls/base/odls_base_open.c index 2a6a5256e5..b7531b3016 100644 --- a/orte/mca/odls/base/odls_base_open.c +++ b/orte/mca/odls/base/odls_base_open.c @@ -28,13 +28,9 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/trace.h" #include "opal/util/output.h" #include "opal/util/path.h" #include "opal/util/argv.h" -#include "opal/class/opal_value_array.h" -#include "opal/class/opal_pointer_array.h" -#include "opal/dss/dss.h" #include "orte/mca/plm/plm_types.h" #include "orte/util/name_fns.h" diff --git a/orte/mca/odls/base/odls_base_state.c b/orte/mca/odls/base/odls_base_state.c index 06c679678e..4c8dd3502d 100644 --- a/orte/mca/odls/base/odls_base_state.c +++ b/orte/mca/odls/base/odls_base_state.c @@ -34,7 +34,6 @@ #include "opal/util/argv.h" #include "orte/util/show_help.h" #include "orte/runtime/orte_globals.h" -#include "opal/util/trace.h" #include "opal/util/basename.h" #include "orte/util/name_fns.h" diff --git a/orte/mca/odls/base/odls_private.h b/orte/mca/odls/base/odls_private.h index 01e54912dd..c6074715f3 100644 --- a/orte/mca/odls/base/odls_private.h +++ b/orte/mca/odls/base/odls_private.h @@ -28,15 +28,11 @@ #include "orte/types.h" #include "opal/class/opal_list.h" -#include "opal/class/opal_pointer_array.h" -#include "opal/class/opal_value_array.h" #include "opal/threads/mutex.h" #include "opal/threads/condition.h" #include "opal/dss/dss_types.h" #include "orte/mca/grpcomm/grpcomm_types.h" -#include "orte/mca/plm/plm_types.h" -#include "orte/mca/rmaps/rmaps_types.h" #include "orte/mca/rml/rml_types.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/mca/odls/bproc/odls_bproc.c b/orte/mca/odls/bproc/odls_bproc.c index 210acc4adf..2b1ae1cb63 100644 --- a/orte/mca/odls/bproc/odls_bproc.c +++ b/orte/mca/odls/bproc/odls_bproc.c @@ -39,12 +39,10 @@ #include "opal/util/os_dirpath.h" #include "opal/util/os_path.h" #include "opal/util/output.h" -#include "opal/dss/dss.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/iof/iof.h" #include "orte/mca/iof/base/iof_base_setup.h" -#include "orte/mca/rml/rml.h" #include "orte/util/session_dir.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/mca/odls/odls.h b/orte/mca/odls/odls.h index 000fff655a..a64f2d61d9 100644 --- a/orte/mca/odls/odls.h +++ b/orte/mca/odls/odls.h @@ -30,14 +30,10 @@ #include "orte/types.h" #include "opal/mca/mca.h" -#include "opal/class/opal_list.h" #include "opal/dss/dss_types.h" -#include "orte/mca/rmaps/rmaps_types.h" #include "orte/mca/rml/rml_types.h" -#include "orte/runtime/orte_globals.h" -#include "orte/mca/odls/odls_types.h" BEGIN_C_DECLS diff --git a/orte/mca/odls/process/odls_process_component.c b/orte/mca/odls/process/odls_process_component.c index c7bbd13ce4..8bb5b01cfe 100755 --- a/orte/mca/odls/process/odls_process_component.c +++ b/orte/mca/odls/process/odls_process_component.c @@ -21,8 +21,6 @@ #include #endif -#include "opal/util/argv.h" -#include "opal/util/path.h" #include "opal/mca/base/mca_base_param.h" diff --git a/orte/mca/oob/base/base.h b/orte/mca/oob/base/base.h index 7548dc6c3c..4bd9d111b3 100644 --- a/orte/mca/oob/base/base.h +++ b/orte/mca/oob/base/base.h @@ -24,7 +24,6 @@ #define _MCA_OOB_BASE_H_ #include "orte_config.h" -#include "orte/types.h" #ifdef HAVE_UNISTD_H #include diff --git a/orte/mca/oob/oob.h b/orte/mca/oob/oob.h index e68bed43df..bbc2a076ca 100644 --- a/orte/mca/oob/oob.h +++ b/orte/mca/oob/oob.h @@ -30,7 +30,6 @@ #include #endif -#include "opal/types.h" #include "opal/mca/mca.h" #include "orte/mca/rml/rml.h" diff --git a/orte/mca/oob/tcp/oob_tcp.h b/orte/mca/oob/tcp/oob_tcp.h index 28a434586a..ad2bf58ccf 100644 --- a/orte/mca/oob/tcp/oob_tcp.h +++ b/orte/mca/oob/tcp/oob_tcp.h @@ -31,8 +31,6 @@ #include "opal/mca/base/base.h" #include "opal/class/opal_free_list.h" #include "opal/class/opal_hash_table.h" -#include "opal/runtime/opal_progress.h" -#include "opal/runtime/opal_cr.h" #include "opal/threads/mutex.h" #include "opal/threads/condition.h" #include "opal/threads/threads.h" diff --git a/orte/mca/oob/tcp/oob_tcp_addr.h b/orte/mca/oob/tcp/oob_tcp_addr.h index e45f1b1692..ba5a771c55 100644 --- a/orte/mca/oob/tcp/oob_tcp_addr.h +++ b/orte/mca/oob/tcp/oob_tcp_addr.h @@ -35,7 +35,6 @@ #include "opal/class/opal_object.h" -#include "opal/dss/dss.h" BEGIN_C_DECLS diff --git a/orte/mca/oob/tcp/oob_tcp_msg.h b/orte/mca/oob/tcp/oob_tcp_msg.h index bc87862ecf..595869d415 100644 --- a/orte/mca/oob/tcp/oob_tcp_msg.h +++ b/orte/mca/oob/tcp/oob_tcp_msg.h @@ -28,7 +28,6 @@ #include -#include "opal/class/opal_list.h" #include "orte/mca/oob/oob.h" #include "oob_tcp_hdr.h" diff --git a/orte/mca/oob/tcp/oob_tcp_peer.c b/orte/mca/oob/tcp/oob_tcp_peer.c index 0578a11ef2..71ffba6586 100644 --- a/orte/mca/oob/tcp/oob_tcp_peer.c +++ b/orte/mca/oob/tcp/oob_tcp_peer.c @@ -52,7 +52,6 @@ #include "opal/types.h" #include "opal/mca/backtrace/backtrace.h" -#include "opal/util/if.h" #include "opal/util/output.h" #include "opal/util/net.h" #include "opal/util/error.h" diff --git a/orte/mca/plm/alps/plm_alps_module.c b/orte/mca/plm/alps/plm_alps_module.c index 5e7dd5feae..482a788ad5 100644 --- a/orte/mca/plm/alps/plm_alps_module.c +++ b/orte/mca/plm/alps/plm_alps_module.c @@ -61,7 +61,6 @@ #include "orte/runtime/orte_globals.h" #include "orte/util/name_fns.h" -#include "orte/runtime/runtime.h" #include "orte/runtime/orte_wait.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/rmaps/rmaps.h" diff --git a/orte/mca/plm/base/plm_base_close.c b/orte/mca/plm/base/plm_base_close.c index f1dff9985b..8e60fea7a5 100644 --- a/orte/mca/plm/base/plm_base_close.c +++ b/orte/mca/plm/base/plm_base_close.c @@ -24,7 +24,6 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/util/argv.h" -#include "opal/class/opal_list.h" #include "orte/util/proc_info.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/mca/plm/base/plm_base_launch_support.c b/orte/mca/plm/base/plm_base_launch_support.c index 49ce7367cb..66cff63bdc 100644 --- a/orte/mca/plm/base/plm_base_launch_support.c +++ b/orte/mca/plm/base/plm_base_launch_support.c @@ -29,7 +29,6 @@ #endif /* HAVE_SYS_TIME_H */ #include "opal/util/argv.h" -#include "opal/runtime/opal_progress.h" #include "opal/class/opal_pointer_array.h" #include "opal/dss/dss.h" @@ -40,7 +39,6 @@ #include "orte/mca/rmaps/rmaps.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" -#include "orte/mca/rml/base/rml_contact.h" #include "orte/mca/routed/routed.h" #include "orte/mca/grpcomm/grpcomm.h" #include "orte/mca/odls/odls.h" diff --git a/orte/mca/plm/base/plm_base_open.c b/orte/mca/plm/base/plm_base_open.c index 299fc50145..a4c7004360 100644 --- a/orte/mca/plm/base/plm_base_open.c +++ b/orte/mca/plm/base/plm_base_open.c @@ -19,11 +19,9 @@ #include "orte_config.h" #include "orte/constants.h" -#include "orte/types.h" #if !ORTE_DISABLE_FULL_SUPPORT -#include "opal/util/argv.h" #include "opal/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/plm/base/plm_base_orted_cmds.c b/orte/mca/plm/base/plm_base_orted_cmds.c index d7c10609cc..640309131a 100644 --- a/orte/mca/plm/base/plm_base_orted_cmds.c +++ b/orte/mca/plm/base/plm_base_orted_cmds.c @@ -27,8 +27,6 @@ #include #endif -#include "opal/util/argv.h" -#include "opal/util/trace.h" #include "opal/dss/dss.h" #include "orte/mca/odls/odls_types.h" diff --git a/orte/mca/plm/base/plm_base_proxy.c b/orte/mca/plm/base/plm_base_proxy.c index f505e337fb..4840193eec 100644 --- a/orte/mca/plm/base/plm_base_proxy.c +++ b/orte/mca/plm/base/plm_base_proxy.c @@ -25,8 +25,6 @@ #include "orte/util/name_fns.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" -#include "orte/mca/rml/base/rml_contact.h" -#include "orte/mca/iof/iof.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/mca/plm/base/plm_base_receive.c b/orte/mca/plm/base/plm_base_receive.c index fac49f7b21..a3c64da070 100644 --- a/orte/mca/plm/base/plm_base_receive.c +++ b/orte/mca/plm/base/plm_base_receive.c @@ -32,7 +32,6 @@ #include #endif -#include "opal/class/opal_list.h" #include "opal/mca/mca.h" #include "opal/mca/base/mca_base_param.h" @@ -43,8 +42,6 @@ #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" -#include "orte/mca/rml/base/rml_contact.h" -#include "orte/mca/grpcomm/grpcomm.h" #include "orte/mca/routed/routed.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/mca/plm/base/plm_base_rsh_support.c b/orte/mca/plm/base/plm_base_rsh_support.c index 0bfa5b727a..66a3690689 100644 --- a/orte/mca/plm/base/plm_base_rsh_support.c +++ b/orte/mca/plm/base/plm_base_rsh_support.c @@ -32,7 +32,6 @@ #include #include -#include "opal/dss/dss.h" #include "opal/util/os_path.h" #include "opal/util/output.h" #include "opal/util/os_dirpath.h" diff --git a/orte/mca/plm/base/plm_base_select.c b/orte/mca/plm/base/plm_base_select.c index 39554cc1c7..6a85ea4275 100644 --- a/orte/mca/plm/base/plm_base_select.c +++ b/orte/mca/plm/base/plm_base_select.c @@ -19,7 +19,6 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/class/opal_list.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" diff --git a/orte/mca/plm/bproc/plm_bproc.c b/orte/mca/plm/bproc/plm_bproc.c index e2e70515ec..e4807195ab 100644 --- a/orte/mca/plm/bproc/plm_bproc.c +++ b/orte/mca/plm/bproc/plm_bproc.c @@ -62,14 +62,12 @@ #include "orte/dss/dss.h" #include "orte/mca/errmgr/errmgr.h" -#include "orte/mca/iof/iof.h" #include "orte/mca/ras/ras.h" #include "orte/mca/rmaps/rmaps.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" #include "orte/runtime/orte_wait.h" #include "orte/runtime/orte_globals.h" -#include "orte/runtime/runtime.h" #include "orte/runtime/params.h" #include "orte/mca/plm/base/plm_private.h" diff --git a/orte/mca/plm/bproc/plm_bproc_state.c b/orte/mca/plm/bproc/plm_bproc_state.c index 2196be2cdc..8dac5d79d1 100644 --- a/orte/mca/plm/bproc/plm_bproc_state.c +++ b/orte/mca/plm/bproc/plm_bproc_state.c @@ -20,7 +20,6 @@ #include "orte_config.h" #include "orte/orte_constants.h" -#include "opal/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/plm/bproc/smr_bproc_component.c b/orte/mca/plm/bproc/smr_bproc_component.c index 40dda112d9..1a7f029657 100644 --- a/orte/mca/plm/bproc/smr_bproc_component.c +++ b/orte/mca/plm/bproc/smr_bproc_component.c @@ -21,7 +21,6 @@ #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" #include "orte/util/proc_info.h" -#include "opal/util/output.h" #include "orte/mca/smr/base/smr_private.h" #include "orte/mca/smr/bproc/smr_bproc.h" diff --git a/orte/mca/plm/ccp/plm_ccp_component.c b/orte/mca/plm/ccp/plm_ccp_component.c index d4a42de1d4..5e6e5fb142 100644 --- a/orte/mca/plm/ccp/plm_ccp_component.c +++ b/orte/mca/plm/ccp/plm_ccp_component.c @@ -19,7 +19,6 @@ #include "orte_config.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/argv.h" #include "orte/constants.h" #include "orte/util/proc_info.h" diff --git a/orte/mca/plm/ccp/plm_ccp_module.c b/orte/mca/plm/ccp/plm_ccp_module.c index e8152049d1..04e17c1f73 100644 --- a/orte/mca/plm/ccp/plm_ccp_module.c +++ b/orte/mca/plm/ccp/plm_ccp_module.c @@ -41,15 +41,12 @@ #include #include "opal/mca/installdirs/installdirs.h" -#include "opal/threads/condition.h" #include "opal/event/event.h" #include "opal/util/argv.h" #include "opal/util/output.h" #include "opal/util/opal_environ.h" -#include "opal/util/path.h" #include "opal/util/basename.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/runtime/opal_progress.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/mca/plm/lsf/plm_lsf_component.c b/orte/mca/plm/lsf/plm_lsf_component.c index ff4ace73c7..a97a9fa467 100644 --- a/orte/mca/plm/lsf/plm_lsf_component.c +++ b/orte/mca/plm/lsf/plm_lsf_component.c @@ -31,7 +31,6 @@ #include #include "opal/mca/base/mca_base_param.h" -#include "opal/util/argv.h" #include "opal/util/output.h" diff --git a/orte/mca/plm/lsf/plm_lsf_module.c b/orte/mca/plm/lsf/plm_lsf_module.c index 5c39587d53..11d92d7d48 100644 --- a/orte/mca/plm/lsf/plm_lsf_module.c +++ b/orte/mca/plm/lsf/plm_lsf_module.c @@ -59,12 +59,9 @@ #include "opal/util/argv.h" #include "opal/util/output.h" #include "opal/util/opal_environ.h" -#include "opal/util/path.h" -#include "opal/util/basename.h" #include "opal/mca/base/mca_base_param.h" #include "orte/util/show_help.h" -#include "orte/runtime/runtime.h" #include "orte/runtime/orte_globals.h" #include "orte/runtime/orte_wait.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/mca/plm/plm.h b/orte/mca/plm/plm.h index d6c3d49a86..48e7bfee95 100644 --- a/orte/mca/plm/plm.h +++ b/orte/mca/plm/plm.h @@ -35,7 +35,6 @@ #include "opal/mca/mca.h" #include "opal/dss/dss_types.h" -#include "opal/class/opal_pointer_array.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/mca/plm/plm_types.h b/orte/mca/plm/plm_types.h index 2f6aaddbdc..f33d37f07d 100644 --- a/orte/mca/plm/plm_types.h +++ b/orte/mca/plm/plm_types.h @@ -22,9 +22,6 @@ #include "orte_config.h" #include "orte/types.h" -#include "opal/class/opal_object.h" -#include "opal/class/opal_list.h" -#include "opal/class/opal_pointer_array.h" BEGIN_C_DECLS diff --git a/orte/mca/plm/process/plm_process_component.c b/orte/mca/plm/process/plm_process_component.c index 4b1c3ae106..7555d92ca9 100644 --- a/orte/mca/plm/process/plm_process_component.c +++ b/orte/mca/plm/process/plm_process_component.c @@ -35,7 +35,6 @@ #include "opal/util/argv.h" #include "opal/util/path.h" -#include "opal/util/basename.h" #include "opal/util/opal_environ.h" #include "opal/mca/base/mca_base_param.h" diff --git a/orte/mca/plm/process/plm_process_module.c b/orte/mca/plm/process/plm_process_module.c index 483def61f9..c08f12ce46 100644 --- a/orte/mca/plm/process/plm_process_module.c +++ b/orte/mca/plm/process/plm_process_module.c @@ -58,7 +58,6 @@ #include "opal/mca/installdirs/installdirs.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/if.h" #include "opal/util/output.h" #include "opal/util/os_path.h" #include "opal/util/path.h" @@ -70,12 +69,10 @@ #include "opal/util/basename.h" #include "opal/util/opal_environ.h" -#include "orte/util/session_dir.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_wait.h" #include "orte/runtime/orte_globals.h" -#include "opal/dss/dss.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/ras/ras_types.h" diff --git a/orte/mca/plm/rsh/plm_rsh_module.c b/orte/mca/plm/rsh/plm_rsh_module.c index ef24f2eaeb..7b6c2e887c 100644 --- a/orte/mca/plm/rsh/plm_rsh_module.c +++ b/orte/mca/plm/rsh/plm_rsh_module.c @@ -61,19 +61,14 @@ #include "opal/mca/installdirs/installdirs.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/if.h" #include "opal/util/output.h" -#include "opal/util/os_path.h" -#include "opal/util/path.h" #include "opal/event/event.h" #include "opal/util/argv.h" #include "opal/util/opal_environ.h" -#include "opal/util/trace.h" #include "opal/util/basename.h" #include "opal/util/bit_ops.h" #include "orte/util/show_help.h" -#include "orte/util/session_dir.h" #include "orte/runtime/orte_wait.h" #include "orte/runtime/orte_globals.h" #include "orte/util/name_fns.h" @@ -86,9 +81,6 @@ #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/rmaps/rmaps.h" #include "orte/mca/routed/routed.h" -#include "orte/mca/grpcomm/grpcomm.h" -#include "orte/mca/odls/odls.h" -#include "orte/mca/rml/base/rml_contact.h" #include "orte/mca/plm/plm.h" #include "orte/mca/plm/base/base.h" diff --git a/orte/mca/plm/slurm/plm_slurm_module.c b/orte/mca/plm/slurm/plm_slurm_module.c index 9a83b92cc1..812a42d7c5 100644 --- a/orte/mca/plm/slurm/plm_slurm_module.c +++ b/orte/mca/plm/slurm/plm_slurm_module.c @@ -64,7 +64,6 @@ #include "orte/util/show_help.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" -#include "orte/runtime/runtime.h" #include "orte/runtime/orte_wait.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/rmaps/rmaps.h" diff --git a/orte/mca/plm/slurmd/plm_slurmd_module.c b/orte/mca/plm/slurmd/plm_slurmd_module.c index 879b224c4c..c74c8aebd5 100644 --- a/orte/mca/plm/slurmd/plm_slurmd_module.c +++ b/orte/mca/plm/slurmd/plm_slurmd_module.c @@ -64,7 +64,6 @@ #include "orte/util/show_help.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" -#include "orte/runtime/runtime.h" #include "orte/runtime/orte_wait.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/rmaps/rmaps.h" diff --git a/orte/mca/plm/submit/pls_submit_module.c b/orte/mca/plm/submit/pls_submit_module.c index eff7cc88cf..6181f4c97a 100644 --- a/orte/mca/plm/submit/pls_submit_module.c +++ b/orte/mca/plm/submit/pls_submit_module.c @@ -58,18 +58,15 @@ #include "opal/util/argv.h" #include "opal/util/opal_environ.h" #include "orte/util/show_help.h" -#include "opal/util/trace.h" #include "opal/util/basename.h" #include "opal/util/opal_environ.h" #include "orte/util/proc_info.h" #include "orte/util/univ_info.h" -#include "orte/util/session_dir.h" #include "orte/runtime/orte_wait.h" #include "orte/runtime/orte_globals.h" #include "orte/runtime/params.h" -#include "opal/dss/dss.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/ras/ras_types.h" diff --git a/orte/mca/plm/tm/plm_tm_module.c b/orte/mca/plm/tm/plm_tm_module.c index 97376ba894..697278e6c5 100644 --- a/orte/mca/plm/tm/plm_tm_module.c +++ b/orte/mca/plm/tm/plm_tm_module.c @@ -56,13 +56,11 @@ #include #include "opal/mca/installdirs/installdirs.h" -#include "opal/threads/condition.h" #include "opal/event/event.h" #include "opal/util/argv.h" #include "opal/util/output.h" #include "orte/util/show_help.h" #include "opal/util/opal_environ.h" -#include "opal/util/path.h" #include "opal/util/basename.h" #include "opal/mca/base/mca_base_param.h" #include "opal/runtime/opal_progress.h" diff --git a/orte/mca/plm/tmd/plm_tmd_module.c b/orte/mca/plm/tmd/plm_tmd_module.c index a5867bf576..2c1a62512b 100644 --- a/orte/mca/plm/tmd/plm_tmd_module.c +++ b/orte/mca/plm/tmd/plm_tmd_module.c @@ -52,13 +52,11 @@ #include #include "opal/mca/installdirs/installdirs.h" -#include "opal/threads/condition.h" #include "opal/event/event.h" #include "opal/util/argv.h" #include "opal/util/output.h" #include "orte/util/show_help.h" #include "opal/util/opal_environ.h" -#include "opal/util/path.h" #include "opal/util/basename.h" #include "opal/mca/base/mca_base_param.h" #include "opal/runtime/opal_progress.h" diff --git a/orte/mca/ras/alps/ras_alps_module.c b/orte/mca/ras/alps/ras_alps_module.c index faf050d7f6..ca8c4d4cba 100644 --- a/orte/mca/ras/alps/ras_alps_module.c +++ b/orte/mca/ras/alps/ras_alps_module.c @@ -18,7 +18,6 @@ */ #include "orte_config.h" #include "orte/constants.h" -#include "orte/types.h" #include #include @@ -28,11 +27,8 @@ #include #include "opal/mca/installdirs/installdirs.h" -#include "opal/util/argv.h" #include "opal/util/output.h" #include "orte/util/show_help.h" -#include "opal/util/os_path.h" -#include "opal/dss/dss.h" #include "orte/mca/errmgr/errmgr.h" #include "ras_alps.h" diff --git a/orte/mca/ras/base/ras_base_select.c b/orte/mca/ras/base/ras_base_select.c index 2f551e9859..584724ce12 100644 --- a/orte/mca/ras/base/ras_base_select.c +++ b/orte/mca/ras/base/ras_base_select.c @@ -22,8 +22,6 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "orte/util/name_fns.h" -#include "orte/runtime/orte_globals.h" #include "orte/mca/ras/base/ras_private.h" #include "orte/mca/ras/base/base.h" diff --git a/orte/mca/ras/base/ras_private.h b/orte/mca/ras/base/ras_private.h index 18b9d9f6fd..8640e6f03a 100644 --- a/orte/mca/ras/base/ras_private.h +++ b/orte/mca/ras/base/ras_private.h @@ -30,10 +30,7 @@ #include "orte/types.h" #include "opal/class/opal_list.h" -#include "opal/class/opal_pointer_array.h" -#include "opal/dss/dss_types.h" -#include "orte/mca/rml/rml_types.h" #include "orte/mca/ras/ras_types.h" #include "orte/mca/ras/ras.h" diff --git a/orte/mca/ras/ccp/ras_ccp_component.c b/orte/mca/ras/ccp/ras_ccp_component.c index 3df44892b0..1c7148f51c 100644 --- a/orte/mca/ras/ccp/ras_ccp_component.c +++ b/orte/mca/ras/ccp/ras_ccp_component.c @@ -19,7 +19,6 @@ #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/basename.h" #include "orte/constants.h" #include "orte/util/proc_info.h" #include "ras_ccp.h" diff --git a/orte/mca/ras/ccp/ras_ccp_module.c b/orte/mca/ras/ccp/ras_ccp_module.c index b522272013..3bdfe928d7 100644 --- a/orte/mca/ras/ccp/ras_ccp_module.c +++ b/orte/mca/ras/ccp/ras_ccp_module.c @@ -12,7 +12,6 @@ */ #include "orte_config.h" #include "orte/constants.h" -#include "orte/types.h" #include #include @@ -22,13 +21,10 @@ #include #include -#include "opal/util/argv.h" #include "opal/util/output.h" #include "orte/util/show_help.h" -#include "opal/util/os_path.h" #include "orte/runtime/orte_globals.h" -#include "orte/util/name_fns.h" #include "orte/mca/ras/base/ras_private.h" #include "ras_ccp.h" diff --git a/orte/mca/ras/gridengine/ras_gridengine_module.c b/orte/mca/ras/gridengine/ras_gridengine_module.c index 25392dd25f..691d1409e6 100644 --- a/orte/mca/ras/gridengine/ras_gridengine_module.c +++ b/orte/mca/ras/gridengine/ras_gridengine_module.c @@ -27,7 +27,6 @@ #include #include -#include "opal/util/argv.h" #include "opal/util/output.h" #include "orte/util/show_help.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/mca/ras/tm/ras_tm_module.c b/orte/mca/ras/tm/ras_tm_module.c index 954db95b81..a3d80b9645 100644 --- a/orte/mca/ras/tm/ras_tm_module.c +++ b/orte/mca/ras/tm/ras_tm_module.c @@ -24,7 +24,6 @@ #include #include -#include "opal/util/argv.h" #include "orte/util/show_help.h" #include "opal/util/os_path.h" diff --git a/orte/mca/rmaps/base/rmaps_base_map_job.c b/orte/mca/rmaps/base/rmaps_base_map_job.c index 8c32fa9054..a83aafca6f 100644 --- a/orte/mca/rmaps/base/rmaps_base_map_job.c +++ b/orte/mca/rmaps/base/rmaps_base_map_job.c @@ -28,7 +28,6 @@ #include "opal/dss/dss.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/runtime/orte_globals.h" -#include "orte/util/name_fns.h" #include "orte/mca/rmaps/base/base.h" #include "orte/mca/rmaps/base/rmaps_private.h" diff --git a/orte/mca/rmaps/base/rmaps_base_support_fns.c b/orte/mca/rmaps/base/rmaps_base_support_fns.c index d812916f87..d7cc15039c 100644 --- a/orte/mca/rmaps/base/rmaps_base_support_fns.c +++ b/orte/mca/rmaps/base/rmaps_base_support_fns.c @@ -21,7 +21,6 @@ #include -#include "opal/util/argv.h" #include "opal/util/if.h" #include "opal/util/output.h" #include "opal/mca/mca.h" @@ -34,7 +33,6 @@ #include "orte/util/hostfile/hostfile.h" #include "orte/util/dash_host/dash_host.h" #include "orte/mca/errmgr/errmgr.h" -#include "orte/mca/plm/plm_types.h" #include "orte/mca/rmaps/base/rmaps_private.h" #include "orte/mca/rmaps/base/base.h" diff --git a/orte/mca/rmaps/base/rmaps_private.h b/orte/mca/rmaps/base/rmaps_private.h index ebd2b9b33a..e570498214 100644 --- a/orte/mca/rmaps/base/rmaps_private.h +++ b/orte/mca/rmaps/base/rmaps_private.h @@ -27,7 +27,6 @@ #include "orte_config.h" #include "orte/types.h" -#include "opal/dss/dss_types.h" #include "orte/runtime/orte_globals.h" #include "orte/mca/rmaps/rmaps.h" diff --git a/orte/mca/rmaps/rank_file/rmaps_rank_file.h b/orte/mca/rmaps/rank_file/rmaps_rank_file.h index a068167c28..ec87f541a8 100644 --- a/orte/mca/rmaps/rank_file/rmaps_rank_file.h +++ b/orte/mca/rmaps/rank_file/rmaps_rank_file.h @@ -26,7 +26,6 @@ #include "orte_config.h" #include "opal_config.h" -#include "opal/util/argv.h" #include "opal/mca/paffinity/paffinity.h" #ifndef ORTE_RMAPS_RF_H diff --git a/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c b/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c index 911a8058c5..687e8c2457 100644 --- a/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c +++ b/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c @@ -21,7 +21,6 @@ #include "orte_config.h" #include "orte/constants.h" -#include "orte/runtime/orte_globals.h" #include "orte/mca/ras/ras_types.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/rmaps/round_robin/rmaps_rr.c b/orte/mca/rmaps/round_robin/rmaps_rr.c index 5e360d15c5..2348eca5c5 100644 --- a/orte/mca/rmaps/round_robin/rmaps_rr.c +++ b/orte/mca/rmaps/round_robin/rmaps_rr.c @@ -31,7 +31,6 @@ #include "opal/mca/base/mca_base_param.h" #include "opal/util/trace.h" -#include "opal/util/argv.h" #include "orte/util/show_help.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/mca/rmaps/seq/rmaps_seq.c b/orte/mca/rmaps/seq/rmaps_seq.c index 917a7a1aa8..841deaf527 100644 --- a/orte/mca/rmaps/seq/rmaps_seq.c +++ b/orte/mca/rmaps/seq/rmaps_seq.c @@ -30,8 +30,6 @@ #endif /* HAVE_STRING_H */ #include "opal/mca/base/mca_base_param.h" -#include "opal/util/trace.h" -#include "opal/util/argv.h" #include "opal/util/if.h" #include "orte/util/show_help.h" diff --git a/orte/mca/rmaps/topo/rmaps_topo.c b/orte/mca/rmaps/topo/rmaps_topo.c index bbe2d7a7d0..63f175c5ea 100644 --- a/orte/mca/rmaps/topo/rmaps_topo.c +++ b/orte/mca/rmaps/topo/rmaps_topo.c @@ -31,7 +31,6 @@ #include "opal/mca/base/mca_base_param.h" #include "opal/util/trace.h" -#include "opal/util/argv.h" #include "opal/mca/carto/base/base.h" #include "orte/util/show_help.h" diff --git a/orte/mca/rml/base/rml_base_contact.c b/orte/mca/rml/base/rml_base_contact.c index 89c39c21e3..f43d654057 100644 --- a/orte/mca/rml/base/rml_base_contact.c +++ b/orte/mca/rml/base/rml_base_contact.c @@ -29,7 +29,6 @@ #include "orte/mca/routed/routed.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" -#include "orte/mca/grpcomm/grpcomm.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/base/rml_contact.h" diff --git a/orte/mca/rml/ftrm/rml_ftrm_component.c b/orte/mca/rml/ftrm/rml_ftrm_component.c index 16d0d7404f..3d1f343d3b 100644 --- a/orte/mca/rml/ftrm/rml_ftrm_component.c +++ b/orte/mca/rml/ftrm/rml_ftrm_component.c @@ -18,7 +18,6 @@ #include "orte_config.h" -#include "orte/util/name_fns.h" #include "opal/mca/base/base.h" #include "opal/util/output.h" @@ -26,7 +25,6 @@ #include "orte/mca/rml/base/base.h" -#include "orte/mca/rml/rml_types.h" #include "rml_ftrm.h" diff --git a/orte/mca/rml/oob/rml_oob_contact.c b/orte/mca/rml/oob/rml_oob_contact.c index 5976006946..63303c7aa4 100644 --- a/orte/mca/rml/oob/rml_oob_contact.c +++ b/orte/mca/rml/oob/rml_oob_contact.c @@ -15,7 +15,6 @@ #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" -#include "orte/mca/oob/oob.h" #include "rml_oob.h" char* diff --git a/orte/mca/rml/oob/rml_oob_exception.c b/orte/mca/rml/oob/rml_oob_exception.c index 663e880b7b..cfb9346e9f 100644 --- a/orte/mca/rml/oob/rml_oob_exception.c +++ b/orte/mca/rml/oob/rml_oob_exception.c @@ -11,7 +11,6 @@ #include "rml_oob.h" #include "opal/class/opal_list.h" -#include "orte/mca/oob/oob.h" struct orte_rml_oob_exception_t { opal_list_item_t super; diff --git a/orte/mca/rml/oob/rml_oob_ping.c b/orte/mca/rml/oob/rml_oob_ping.c index 588ab8143b..bc77855187 100644 --- a/orte/mca/rml/oob/rml_oob_ping.c +++ b/orte/mca/rml/oob/rml_oob_ping.c @@ -14,7 +14,6 @@ #include "orte/mca/errmgr/errmgr.h" -#include "orte/mca/oob/oob.h" #include "orte/mca/rml/base/rml_contact.h" int diff --git a/orte/mca/rml/oob/rml_oob_recv.c b/orte/mca/rml/oob/rml_oob_recv.c index 54b79c58fb..5426ed3186 100644 --- a/orte/mca/rml/oob/rml_oob_recv.c +++ b/orte/mca/rml/oob/rml_oob_recv.c @@ -15,7 +15,6 @@ #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" -#include "orte/mca/oob/oob.h" #include "rml_oob.h" diff --git a/orte/mca/rml/oob/rml_oob_send.c b/orte/mca/rml/oob/rml_oob_send.c index a4c8b38c8c..fd963474ac 100644 --- a/orte/mca/rml/oob/rml_oob_send.c +++ b/orte/mca/rml/oob/rml_oob_send.c @@ -28,7 +28,6 @@ #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" -#include "orte/mca/oob/oob.h" #include "rml_oob.h" static void diff --git a/orte/mca/routed/binomial/routed_binomial.c b/orte/mca/routed/binomial/routed_binomial.c index dcab550b20..146845b241 100644 --- a/orte/mca/routed/binomial/routed_binomial.c +++ b/orte/mca/routed/binomial/routed_binomial.c @@ -12,7 +12,6 @@ #include "orte/constants.h" #include "opal/threads/condition.h" -#include "opal/runtime/opal_progress.h" #include "opal/dss/dss.h" #include "opal/class/opal_hash_table.h" #include "opal/class/opal_bitmap.h" @@ -21,10 +20,8 @@ #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/ess/ess.h" -#include "orte/mca/grpcomm/grpcomm.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" -#include "orte/mca/odls/odls_types.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" #include "orte/runtime/orte_wait.h" diff --git a/orte/mca/routed/binomial/routed_binomial.h b/orte/mca/routed/binomial/routed_binomial.h index 41b90c8065..123ba75202 100644 --- a/orte/mca/routed/binomial/routed_binomial.h +++ b/orte/mca/routed/binomial/routed_binomial.h @@ -12,7 +12,6 @@ #define MCA_ROUTED_BINOMIAL_H #include "orte_config.h" -#include "orte/types.h" #include "orte/mca/routed/routed.h" diff --git a/orte/mca/routed/binomial/routed_binomial_component.c b/orte/mca/routed/binomial/routed_binomial_component.c index 1e2958e400..7fd6b2c1fa 100644 --- a/orte/mca/routed/binomial/routed_binomial_component.c +++ b/orte/mca/routed/binomial/routed_binomial_component.c @@ -12,13 +12,10 @@ #include "orte_config.h" #include "orte/constants.h" -#include "orte/types.h" -#include "opal/class/opal_hash_table.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "orte/runtime/orte_globals.h" #include "orte/mca/routed/base/base.h" #include "routed_binomial.h" diff --git a/orte/mca/routed/direct/routed_direct.c b/orte/mca/routed/direct/routed_direct.c index eb8092f756..d3b20745e7 100644 --- a/orte/mca/routed/direct/routed_direct.c +++ b/orte/mca/routed/direct/routed_direct.c @@ -12,7 +12,6 @@ #include "orte/constants.h" #include "opal/threads/condition.h" -#include "opal/runtime/opal_progress.h" #include "opal/dss/dss_types.h" #include "opal/util/output.h" diff --git a/orte/mca/routed/direct/routed_direct.h b/orte/mca/routed/direct/routed_direct.h index 2ea8a8f455..a52cc4013e 100644 --- a/orte/mca/routed/direct/routed_direct.h +++ b/orte/mca/routed/direct/routed_direct.h @@ -12,7 +12,6 @@ #define MCA_ROUTED_DIRECT_H #include "orte_config.h" -#include "orte/types.h" #include "orte/mca/routed/routed.h" diff --git a/orte/mca/routed/direct/routed_direct_component.c b/orte/mca/routed/direct/routed_direct_component.c index fe3700fb00..c5e54cf18b 100644 --- a/orte/mca/routed/direct/routed_direct_component.c +++ b/orte/mca/routed/direct/routed_direct_component.c @@ -12,13 +12,10 @@ #include "orte_config.h" #include "orte/constants.h" -#include "orte/types.h" -#include "opal/class/opal_hash_table.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "orte/runtime/orte_globals.h" #include "orte/mca/routed/base/base.h" #include "routed_direct.h" diff --git a/orte/mca/routed/linear/routed_linear.c b/orte/mca/routed/linear/routed_linear.c index b342117a23..a5821ac8d1 100644 --- a/orte/mca/routed/linear/routed_linear.c +++ b/orte/mca/routed/linear/routed_linear.c @@ -12,7 +12,6 @@ #include "orte/constants.h" #include "opal/threads/condition.h" -#include "opal/runtime/opal_progress.h" #include "opal/dss/dss.h" #include "opal/class/opal_bitmap.h" #include "opal/class/opal_hash_table.h" @@ -20,10 +19,8 @@ #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/ess/ess.h" -#include "orte/mca/grpcomm/grpcomm.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" -#include "orte/mca/odls/odls_types.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" #include "orte/runtime/orte_wait.h" diff --git a/orte/mca/routed/linear/routed_linear.h b/orte/mca/routed/linear/routed_linear.h index 20f9f14d7a..b346f06727 100644 --- a/orte/mca/routed/linear/routed_linear.h +++ b/orte/mca/routed/linear/routed_linear.h @@ -12,7 +12,6 @@ #define MCA_ROUTED_LINEAR_H #include "orte_config.h" -#include "orte/types.h" #include "orte/mca/routed/routed.h" diff --git a/orte/mca/routed/linear/routed_linear_component.c b/orte/mca/routed/linear/routed_linear_component.c index 19d0312e12..f48971f7a7 100644 --- a/orte/mca/routed/linear/routed_linear_component.c +++ b/orte/mca/routed/linear/routed_linear_component.c @@ -12,13 +12,10 @@ #include "orte_config.h" #include "orte/constants.h" -#include "orte/types.h" -#include "opal/class/opal_hash_table.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "orte/runtime/orte_globals.h" #include "orte/mca/routed/base/base.h" #include "routed_linear.h" diff --git a/orte/mca/routed/radix/routed_radix.c b/orte/mca/routed/radix/routed_radix.c index e51f26261e..bcfaac8319 100644 --- a/orte/mca/routed/radix/routed_radix.c +++ b/orte/mca/routed/radix/routed_radix.c @@ -12,19 +12,15 @@ #include "orte/constants.h" #include "opal/threads/condition.h" -#include "opal/runtime/opal_progress.h" #include "opal/dss/dss.h" #include "opal/class/opal_hash_table.h" #include "opal/class/opal_bitmap.h" -#include "opal/util/bit_ops.h" #include "opal/util/output.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/ess/ess.h" -#include "orte/mca/grpcomm/grpcomm.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" -#include "orte/mca/odls/odls_types.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" #include "orte/runtime/orte_wait.h" diff --git a/orte/mca/routed/radix/routed_radix.h b/orte/mca/routed/radix/routed_radix.h index 8393116e67..91fb502676 100644 --- a/orte/mca/routed/radix/routed_radix.h +++ b/orte/mca/routed/radix/routed_radix.h @@ -12,7 +12,6 @@ #define MCA_ROUTED_RADIX_H #include "orte_config.h" -#include "orte/types.h" #include "orte/mca/routed/routed.h" diff --git a/orte/mca/routed/radix/routed_radix_component.c b/orte/mca/routed/radix/routed_radix_component.c index b8c09f5e39..2ef22e4cb1 100644 --- a/orte/mca/routed/radix/routed_radix_component.c +++ b/orte/mca/routed/radix/routed_radix_component.c @@ -12,13 +12,10 @@ #include "orte_config.h" #include "orte/constants.h" -#include "orte/types.h" -#include "opal/class/opal_hash_table.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "orte/runtime/orte_globals.h" #include "orte/mca/routed/base/base.h" #include "routed_radix.h" diff --git a/orte/mca/routed/routed.h b/orte/mca/routed/routed.h index 4106328adf..b75aca3ef3 100644 --- a/orte/mca/routed/routed.h +++ b/orte/mca/routed/routed.h @@ -33,7 +33,6 @@ #include "opal/mca/mca.h" #include "opal/dss/dss_types.h" -#include "orte/mca/rml/rml_types.h" #include "opal/mca/crs/crs.h" #include "opal/mca/crs/base/base.h" diff --git a/orte/mca/routed/slave/routed_slave.c b/orte/mca/routed/slave/routed_slave.c index 5be51f41b6..910016aa6e 100644 --- a/orte/mca/routed/slave/routed_slave.c +++ b/orte/mca/routed/slave/routed_slave.c @@ -12,17 +12,11 @@ #include "orte/constants.h" #include "opal/threads/condition.h" -#include "opal/runtime/opal_progress.h" -#include "opal/dss/dss.h" -#include "opal/class/opal_hash_table.h" -#include "opal/util/bit_ops.h" #include "opal/util/output.h" #include "orte/mca/errmgr/errmgr.h" -#include "orte/mca/grpcomm/grpcomm.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" -#include "orte/mca/odls/odls_types.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" #include "orte/runtime/orte_wait.h" diff --git a/orte/mca/routed/slave/routed_slave.h b/orte/mca/routed/slave/routed_slave.h index 12620415e1..76e4752c21 100644 --- a/orte/mca/routed/slave/routed_slave.h +++ b/orte/mca/routed/slave/routed_slave.h @@ -12,7 +12,6 @@ #define MCA_ROUTED_SLAVE_H #include "orte_config.h" -#include "orte/types.h" #include "orte/mca/routed/routed.h" diff --git a/orte/mca/routed/slave/routed_slave_component.c b/orte/mca/routed/slave/routed_slave_component.c index 2cf0378fed..f05576f505 100644 --- a/orte/mca/routed/slave/routed_slave_component.c +++ b/orte/mca/routed/slave/routed_slave_component.c @@ -12,13 +12,10 @@ #include "orte_config.h" #include "orte/constants.h" -#include "orte/types.h" -#include "opal/class/opal_hash_table.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "orte/runtime/orte_globals.h" #include "orte/mca/routed/base/base.h" #include "routed_slave.h" diff --git a/orte/mca/snapc/base/base.h b/orte/mca/snapc/base/base.h index 0a0a19c756..de0e75e234 100644 --- a/orte/mca/snapc/base/base.h +++ b/orte/mca/snapc/base/base.h @@ -23,7 +23,6 @@ #include "orte_config.h" #include "orte/types.h" -#include "opal/dss/dss.h" #include "orte/mca/snapc/snapc.h" diff --git a/orte/mca/snapc/full/snapc_full.h b/orte/mca/snapc/full/snapc_full.h index 53a1a6b5bb..40186bf301 100644 --- a/orte/mca/snapc/full/snapc_full.h +++ b/orte/mca/snapc/full/snapc_full.h @@ -30,7 +30,6 @@ #include "opal/mca/mca.h" #include "opal/event/event.h" -#include "orte/runtime/orte_globals.h" #include "orte/mca/snapc/snapc.h" BEGIN_C_DECLS diff --git a/orte/mca/snapc/full/snapc_full_app.c b/orte/mca/snapc/full/snapc_full_app.c index 97bef23195..070f431d7c 100644 --- a/orte/mca/snapc/full/snapc_full_app.c +++ b/orte/mca/snapc/full/snapc_full_app.c @@ -36,7 +36,6 @@ #include "orte/runtime/orte_cr.h" #include "orte/runtime/orte_globals.h" -#include "opal/util/argv.h" #include "opal/util/output.h" #include "opal/util/opal_environ.h" #include "opal/mca/mca.h" diff --git a/orte/mca/snapc/full/snapc_full_component.c b/orte/mca/snapc/full/snapc_full_component.c index 4bdbbd50d9..4366d2e93c 100644 --- a/orte/mca/snapc/full/snapc_full_component.c +++ b/orte/mca/snapc/full/snapc_full_component.c @@ -17,7 +17,6 @@ #include "orte_config.h" #include "opal/util/output.h" -#include "orte/util/name_fns.h" #include "orte/mca/snapc/snapc.h" #include "orte/mca/snapc/base/base.h" diff --git a/orte/mca/snapc/full/snapc_full_global.c b/orte/mca/snapc/full/snapc_full_global.c index 32bfc9844f..12d489d153 100644 --- a/orte/mca/snapc/full/snapc_full_global.c +++ b/orte/mca/snapc/full/snapc_full_global.c @@ -22,7 +22,6 @@ #include #endif /* HAVE_UNISTD_H */ -#include "opal/util/argv.h" #include "opal/util/output.h" #include "opal/util/opal_environ.h" #include "opal/util/basename.h" diff --git a/orte/mca/snapc/full/snapc_full_local.c b/orte/mca/snapc/full/snapc_full_local.c index afe716787a..85e5ce4d8c 100644 --- a/orte/mca/snapc/full/snapc_full_local.c +++ b/orte/mca/snapc/full/snapc_full_local.c @@ -40,7 +40,6 @@ #include "opal/runtime/opal_progress.h" #include "opal/runtime/opal_cr.h" -#include "opal/util/argv.h" #include "opal/util/output.h" #include "opal/util/opal_environ.h" #include "opal/util/os_dirpath.h" @@ -57,9 +56,7 @@ #include "orte/runtime/orte_globals.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" -#include "orte/mca/plm/plm.h" #include "orte/mca/odls/odls.h" -#include "orte/mca/odls/base/base.h" #include "orte/mca/odls/base/odls_private.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/mca/snapc/full/snapc_full_module.c b/orte/mca/snapc/full/snapc_full_module.c index 71505df82b..4db80dff64 100644 --- a/orte/mca/snapc/full/snapc_full_module.c +++ b/orte/mca/snapc/full/snapc_full_module.c @@ -21,13 +21,11 @@ #include #endif /* HAVE_UNISTD_H */ -#include "orte/util/name_fns.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/argv.h" #include "opal/util/output.h" #include "opal/util/opal_environ.h" diff --git a/orte/orted/orted_comm.c b/orte/orted/orted_comm.c index a417947169..dba9b4b333 100644 --- a/orte/orted/orted_comm.c +++ b/orte/orted/orted_comm.c @@ -43,20 +43,10 @@ #endif -#include "opal/class/opal_pointer_array.h" #include "opal/event/event.h" #include "opal/mca/base/base.h" -#include "opal/threads/mutex.h" -#include "opal/threads/condition.h" -#include "opal/util/bit_ops.h" #include "opal/util/output.h" -#include "opal/util/cmd_line.h" -#include "opal/util/daemon_init.h" #include "opal/util/opal_environ.h" -#include "opal/util/os_path.h" -#include "opal/util/printf.h" -#include "opal/util/trace.h" -#include "opal/util/argv.h" #include "opal/runtime/opal.h" #include "opal/runtime/opal_progress.h" #include "opal/mca/base/mca_base_param.h" @@ -67,10 +57,8 @@ #include "orte/util/name_fns.h" #include "orte/mca/errmgr/errmgr.h" -#include "orte/mca/grpcomm/grpcomm.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" -#include "orte/mca/rml/base/rml_contact.h" #include "orte/mca/odls/odls.h" #include "orte/mca/odls/base/base.h" #include "orte/mca/plm/plm.h" diff --git a/orte/orted/orted_main.c b/orte/orted/orted_main.c index c57a5c91ce..2eb3f4a47a 100644 --- a/orte/orted/orted_main.c +++ b/orte/orted/orted_main.c @@ -46,15 +46,11 @@ #include "opal/event/event.h" #include "opal/mca/base/base.h" -#include "opal/threads/mutex.h" -#include "opal/threads/condition.h" -#include "opal/util/bit_ops.h" #include "opal/util/output.h" #include "opal/util/cmd_line.h" #include "opal/util/opal_environ.h" #include "opal/util/os_path.h" #include "opal/util/printf.h" -#include "opal/util/trace.h" #include "opal/util/argv.h" #include "opal/runtime/opal.h" #include "opal/mca/base/mca_base_param.h" @@ -71,7 +67,6 @@ #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" -#include "orte/mca/rml/base/rml_contact.h" #include "orte/mca/odls/odls.h" #include "orte/mca/plm/plm.h" #include "orte/mca/ras/ras.h" diff --git a/orte/runtime/data_type_support/orte_dt_compare_fns.c b/orte/runtime/data_type_support/orte_dt_compare_fns.c index 48aebae0c9..75ad5d5495 100644 --- a/orte/runtime/data_type_support/orte_dt_compare_fns.c +++ b/orte/runtime/data_type_support/orte_dt_compare_fns.c @@ -22,7 +22,6 @@ #include -#include "opal/dss/dss.h" #include "orte/runtime/data_type_support/orte_dt_support.h" int orte_dt_compare_std_cntr(orte_std_cntr_t *value1, orte_std_cntr_t *value2, opal_data_type_t type) diff --git a/orte/runtime/data_type_support/orte_dt_copy_fns.c b/orte/runtime/data_type_support/orte_dt_copy_fns.c index 735c26472e..a653861e97 100644 --- a/orte/runtime/data_type_support/orte_dt_copy_fns.c +++ b/orte/runtime/data_type_support/orte_dt_copy_fns.c @@ -28,7 +28,6 @@ #include "opal/util/argv.h" #include "orte/mca/errmgr/errmgr.h" -#include "opal/dss/dss.h" #include "orte/runtime/data_type_support/orte_dt_support.h" /* ORTE_STD_CNTR */ diff --git a/orte/runtime/data_type_support/orte_dt_print_fns.c b/orte/runtime/data_type_support/orte_dt_print_fns.c index dad6f0f6d0..2a089d83ef 100644 --- a/orte/runtime/data_type_support/orte_dt_print_fns.c +++ b/orte/runtime/data_type_support/orte_dt_print_fns.c @@ -22,7 +22,6 @@ #include #include "opal/util/argv.h" -#include "opal/class/opal_list.h" #include "orte/mca/errmgr/errmgr.h" #include "opal/dss/dss.h" diff --git a/orte/runtime/orte_cr.c b/orte/runtime/orte_cr.c index 9a57953b4c..7794a479b6 100644 --- a/orte/runtime/orte_cr.c +++ b/orte/runtime/orte_cr.c @@ -49,26 +49,18 @@ #include "opal/runtime/opal_cr.h" #include "orte/runtime/orte_cr.h" -#include "orte/runtime/runtime.h" #include "orte/util/proc_info.h" -#include "orte/util/session_dir.h" -#include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" -#include "orte/mca/plm/plm.h" #include "orte/mca/plm/base/base.h" #include "orte/mca/ess/ess.h" #include "orte/mca/ess/base/base.h" #include "orte/mca/routed/base/base.h" #include "orte/mca/routed/routed.h" #include "orte/mca/rml/base/base.h" -#include "orte/mca/iof/iof.h" #include "orte/mca/iof/base/base.h" -#include "orte/mca/odls/odls.h" -#include "orte/mca/odls/base/base.h" #include "orte/mca/snapc/snapc.h" #include "orte/mca/snapc/base/base.h" -#include "orte/mca/filem/filem.h" #include "orte/mca/filem/base/base.h" /************* diff --git a/orte/runtime/orte_data_server.c b/orte/runtime/orte_data_server.c index 7b962efc94..f1ec76bd2b 100644 --- a/orte/runtime/orte_data_server.c +++ b/orte/runtime/orte_data_server.c @@ -31,8 +31,6 @@ #include "opal/mca/base/mca_base_param.h" #include "opal/util/output.h" -#include "opal/threads/mutex.h" -#include "opal/threads/condition.h" #include "opal/class/opal_pointer_array.h" #include "opal/dss/dss.h" diff --git a/orte/runtime/orte_globals.c b/orte/runtime/orte_globals.c index b37b3e8a48..877ba23fa5 100644 --- a/orte/runtime/orte_globals.c +++ b/orte/runtime/orte_globals.c @@ -27,15 +27,12 @@ #endif #include "opal/mca/base/mca_base_param.h" -#include "opal/threads/mutex.h" -#include "opal/threads/condition.h" #include "opal/util/argv.h" #include "opal/util/output.h" #include "opal/class/opal_pointer_array.h" #include "opal/dss/dss.h" #include "orte/mca/errmgr/errmgr.h" -#include "orte/mca/rml/rml_types.h" #include "orte/runtime/runtime.h" #include "orte/runtime/runtime_internals.h" diff --git a/orte/runtime/orte_globals.h b/orte/runtime/orte_globals.h index cf6f2444cd..035b0aebdf 100644 --- a/orte/runtime/orte_globals.h +++ b/orte/runtime/orte_globals.h @@ -34,8 +34,6 @@ #include #endif -#include "opal/threads/mutex.h" -#include "opal/threads/condition.h" #include "opal/class/opal_pointer_array.h" #include "orte/mca/plm/plm_types.h" diff --git a/orte/runtime/orte_locks.h b/orte/runtime/orte_locks.h index eb1b1651a3..484663858b 100644 --- a/orte/runtime/orte_locks.h +++ b/orte/runtime/orte_locks.h @@ -25,7 +25,6 @@ #define ORTE_LOCKS_H #include "orte_config.h" -#include "orte/types.h" #include "opal/sys/atomic.h" diff --git a/orte/runtime/orte_wait.h b/orte/runtime/orte_wait.h index 2a3d422029..1b8f5eb0d9 100644 --- a/orte/runtime/orte_wait.h +++ b/orte/runtime/orte_wait.h @@ -38,11 +38,11 @@ #include "opal/dss/dss.h" #include "opal/util/output.h" -#include "opal/class/opal_list.h" #include "opal/sys/atomic.h" #include "opal/event/event.h" #include "opal/runtime/opal_progress.h" +#include "orte/types.h" #include "orte/mca/rml/rml_types.h" BEGIN_C_DECLS diff --git a/orte/runtime/runtime.h b/orte/runtime/runtime.h index bf8d8c556f..de42403afb 100644 --- a/orte/runtime/runtime.h +++ b/orte/runtime/runtime.h @@ -26,13 +26,11 @@ #define ORTE_RUNTIME_H #include "orte_config.h" -#include "orte/types.h" #ifdef HAVE_SYS_TYPES_H #include #endif -#include "opal/util/cmd_line.h" BEGIN_C_DECLS diff --git a/orte/test/system/binom.c b/orte/test/system/binom.c index a99401daea..27fe5d02c6 100644 --- a/orte/test/system/binom.c +++ b/orte/test/system/binom.c @@ -16,8 +16,6 @@ #include "opal/class/opal_list.h" #include "opal/class/opal_bitmap.h" -#include "orte/util/name_fns.h" -#include "orte/runtime/orte_globals.h" #include "orte/runtime/runtime.h" typedef struct { diff --git a/orte/test/system/iof_delay.c b/orte/test/system/iof_delay.c index ec72c4ea41..da2c55ada9 100644 --- a/orte/test/system/iof_delay.c +++ b/orte/test/system/iof_delay.c @@ -2,8 +2,6 @@ #include #include -#include "orte/util/name_fns.h" -#include "orte/runtime/orte_globals.h" #include "orte/runtime/runtime.h" diff --git a/orte/test/system/iof_stress.c b/orte/test/system/iof_stress.c index 8a518e8c2f..99eb976c1d 100644 --- a/orte/test/system/iof_stress.c +++ b/orte/test/system/iof_stress.c @@ -2,7 +2,6 @@ #include #include -#include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" #include "orte/runtime/runtime.h" diff --git a/orte/test/system/orte_loop_spawn.c b/orte/test/system/orte_loop_spawn.c index d8b53d650e..4246618b88 100644 --- a/orte/test/system/orte_loop_spawn.c +++ b/orte/test/system/orte_loop_spawn.c @@ -8,7 +8,6 @@ #include "orte/mca/errmgr/errmgr.h" #include "orte/runtime/runtime.h" #include "orte/runtime/orte_globals.h" -#include "orte/util/name_fns.h" int main(int argc, char* argv[]) { diff --git a/orte/test/system/orte_spawn.c b/orte/test/system/orte_spawn.c index a6fbfe73d0..9b8ca36396 100644 --- a/orte/test/system/orte_spawn.c +++ b/orte/test/system/orte_spawn.c @@ -7,7 +7,6 @@ #include -#include "opal/threads/condition.h" #include "opal/util/argv.h" #include "orte/util/proc_info.h" diff --git a/orte/test/system/radix.c b/orte/test/system/radix.c index f0012a89b8..e3e509e80e 100644 --- a/orte/test/system/radix.c +++ b/orte/test/system/radix.c @@ -12,13 +12,10 @@ -#include "opal/util/bit_ops.h" #include "opal/class/opal_list.h" #include "opal/class/opal_bitmap.h" #include "orte/mca/routed/base/base.h" -#include "orte/util/name_fns.h" -#include "orte/runtime/orte_globals.h" #include "orte/runtime/runtime.h" static int Radix; diff --git a/orte/tools/orte-checkpoint/orte-checkpoint.c b/orte/tools/orte-checkpoint/orte-checkpoint.c index 2f86c449e8..d1213dfd05 100644 --- a/orte/tools/orte-checkpoint/orte-checkpoint.c +++ b/orte/tools/orte-checkpoint/orte-checkpoint.c @@ -56,8 +56,6 @@ #include "opal/util/output.h" #include "opal/util/argv.h" #include "opal/util/opal_environ.h" -#include "opal/util/os_path.h" -#include "opal/util/os_dirpath.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" #include "opal/mca/crs/crs.h" diff --git a/orte/tools/orte-clean/orte-clean.c b/orte/tools/orte-clean/orte-clean.c index 1941d13236..19ca944dc7 100644 --- a/orte/tools/orte-clean/orte-clean.c +++ b/orte/tools/orte-clean/orte-clean.c @@ -53,7 +53,6 @@ #endif /* HAVE_PWD_H */ #include "opal/util/cmd_line.h" -#include "opal/util/argv.h" #include "opal/util/opal_environ.h" #include "opal/util/os_dirpath.h" #include "opal/util/basename.h" @@ -62,8 +61,6 @@ #include "orte/util/show_help.h" #include "orte/util/proc_info.h" -#include "opal/util/os_path.h" -#include "orte/util/session_dir.h" #include "opal/runtime/opal.h" #if OPAL_ENABLE_FT == 1 diff --git a/orte/tools/orte-iof/orte-iof.c b/orte/tools/orte-iof/orte-iof.c index 5581a5e0e9..bf5add9501 100644 --- a/orte/tools/orte-iof/orte-iof.c +++ b/orte/tools/orte-iof/orte-iof.c @@ -60,20 +60,14 @@ #include "opal/util/cmd_line.h" #include "opal/util/argv.h" #include "opal/util/opal_environ.h" -#include "opal/util/os_path.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" #include "opal/runtime/opal.h" #if OPAL_ENABLE_FT == 1 -#include "opal/runtime/opal_cr.h" #endif -#include "opal/dss/dss.h" #include "orte/runtime/runtime.h" -#include "opal/util/os_path.h" -#include "orte/util/session_dir.h" #include "orte/util/hnp_contact.h" -#include "orte/util/name_fns.h" #include "orte/util/show_help.h" #include "orte/util/parse_options.h" #include "orte/mca/errmgr/errmgr.h" @@ -81,7 +75,6 @@ #if OPAL_ENABLE_FT == 1 #include "orte/mca/snapc/base/base.h" #endif -#include "orte/runtime/orte_globals.h" /***************************************** diff --git a/orte/tools/orte-ps/orte-ps.c b/orte/tools/orte-ps/orte-ps.c index a32dd26c0a..2bb7369e8b 100644 --- a/orte/tools/orte-ps/orte-ps.c +++ b/orte/tools/orte-ps/orte-ps.c @@ -55,9 +55,7 @@ #include "opal/util/cmd_line.h" #include "opal/util/output.h" -#include "opal/util/argv.h" #include "opal/util/opal_environ.h" -#include "opal/util/os_path.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" #include "opal/runtime/opal.h" @@ -65,10 +63,7 @@ #include "opal/runtime/opal_cr.h" #endif -#include "opal/dss/dss.h" #include "orte/runtime/runtime.h" -#include "opal/util/os_path.h" -#include "orte/util/session_dir.h" #include "orte/util/hnp_contact.h" #include "orte/util/name_fns.h" #include "orte/util/show_help.h" diff --git a/orte/tools/orte-restart/orte-restart.c b/orte/tools/orte-restart/orte-restart.c index 4fbb9150cd..b12a542433 100644 --- a/orte/tools/orte-restart/orte-restart.c +++ b/orte/tools/orte-restart/orte-restart.c @@ -54,7 +54,6 @@ #include "opal/util/output.h" #include "opal/util/argv.h" #include "opal/util/opal_environ.h" -#include "opal/util/os_path.h" #include "opal/util/basename.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" @@ -65,7 +64,6 @@ #include "orte/runtime/orte_cr.h" #include "orte/mca/snapc/snapc.h" #include "orte/mca/snapc/base/base.h" -#include "orte/mca/filem/filem.h" #include "orte/mca/filem/base/base.h" #include "orte/util/show_help.h" diff --git a/orte/tools/orterun/orterun.c b/orte/tools/orterun/orterun.c index 1ca874bf48..84b12d938c 100644 --- a/orte/tools/orterun/orterun.c +++ b/orte/tools/orterun/orterun.c @@ -50,7 +50,6 @@ #include "opal/event/event.h" #include "opal/mca/installdirs/installdirs.h" #include "opal/mca/base/base.h" -#include "opal/threads/condition.h" #include "opal/util/argv.h" #include "opal/util/output.h" #include "opal/util/basename.h" @@ -58,7 +57,6 @@ #include "opal/util/opal_environ.h" #include "opal/util/opal_getcwd.h" #include "orte/util/show_help.h" -#include "opal/util/trace.h" #include "opal/sys/atomic.h" #if OPAL_ENABLE_FT == 1 #include "opal/runtime/opal_cr.h" @@ -66,7 +64,6 @@ #include "opal/version.h" #include "opal/runtime/opal.h" -#include "opal/util/os_dirpath.h" #include "opal/util/os_path.h" #include "opal/util/path.h" #include "opal/class/opal_pointer_array.h" @@ -75,13 +72,10 @@ #include "orte/util/proc_info.h" #include "orte/util/pre_condition_transports.h" #include "orte/util/session_dir.h" -#include "orte/util/name_fns.h" #include "orte/util/hnp_contact.h" -#include "orte/util/parse_options.h" #include "orte/mca/odls/odls.h" #include "orte/mca/plm/plm.h" -#include "orte/mca/rmaps/rmaps_types.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" #include "orte/mca/rml/base/rml_contact.h" diff --git a/orte/tools/orterun/orterun.h b/orte/tools/orterun/orterun.h index 0cfccc5973..a0c560bb4f 100644 --- a/orte/tools/orterun/orterun.h +++ b/orte/tools/orterun/orterun.h @@ -21,12 +21,7 @@ #define ORTERUN_ORTERUN_H #include "orte_config.h" - -#include "opal/threads/condition.h" #include "opal/threads/mutex.h" -#include "opal/util/cmd_line.h" - -#include "orte/runtime/orte_globals.h" BEGIN_C_DECLS diff --git a/orte/util/comm/comm.c b/orte/util/comm/comm.c index fefc0c8203..f9c34edd5a 100644 --- a/orte/util/comm/comm.c +++ b/orte/util/comm/comm.c @@ -22,7 +22,6 @@ #include #include -#include "opal/util/printf.h" #include "opal/util/output.h" #include "opal/threads/tsd.h" diff --git a/orte/util/context_fns.h b/orte/util/context_fns.h index 6242ef5a2b..521b69aef1 100644 --- a/orte/util/context_fns.h +++ b/orte/util/context_fns.h @@ -25,7 +25,6 @@ #define _ORTE_CONTEXT_FNS_H_ #include "orte_config.h" -#include "orte/types.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/util/dash_host/dash_host.c b/orte/util/dash_host/dash_host.c index cbccaf1ed1..564d3b2186 100644 --- a/orte/util/dash_host/dash_host.c +++ b/orte/util/dash_host/dash_host.c @@ -29,7 +29,6 @@ #include "opal/util/argv.h" #include "opal/util/if.h" -#include "opal/dss/dss.h" #include "orte/mca/plm/plm_types.h" #include "orte/util/proc_info.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/util/dash_host/dash_host.h b/orte/util/dash_host/dash_host.h index fd79c13276..8dbe0ac228 100644 --- a/orte/util/dash_host/dash_host.h +++ b/orte/util/dash_host/dash_host.h @@ -23,11 +23,9 @@ #define ORTE_UTIL_DASH_HOST_H #include "orte_config.h" -#include "orte/types.h" #include "opal/class/opal_list.h" -#include "orte/mca/plm/plm_types.h" BEGIN_C_DECLS diff --git a/orte/util/hnp_contact.c b/orte/util/hnp_contact.c index 5a021b76b6..f3c560d465 100644 --- a/orte/util/hnp_contact.c +++ b/orte/util/hnp_contact.c @@ -40,7 +40,6 @@ #include "opal/util/os_dirpath.h" #include "orte/mca/errmgr/errmgr.h" -#include "orte/runtime/runtime.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/base/rml_contact.h" #include "orte/mca/routed/routed.h" diff --git a/orte/util/hostfile/hostfile.c b/orte/util/hostfile/hostfile.c index 7750c78f61..46196d0e69 100644 --- a/orte/util/hostfile/hostfile.c +++ b/orte/util/hostfile/hostfile.c @@ -33,8 +33,6 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/util/if.h" -#include "opal/util/os_path.h" -#include "opal/util/path.h" #include "opal/mca/installdirs/installdirs.h" #include "orte/util/show_help.h" diff --git a/orte/util/nidmap.h b/orte/util/nidmap.h index 6f7a166e6e..6c9ff1f1cd 100644 --- a/orte/util/nidmap.h +++ b/orte/util/nidmap.h @@ -30,9 +30,6 @@ #include "orte_config.h" #include "orte/types.h" -#include "opal/class/opal_list.h" -#include "opal/class/opal_pointer_array.h" -#include "opal/class/opal_value_array.h" #include "opal/dss/dss_types.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/util/parse_options.c b/orte/util/parse_options.c index d9ec2f67d6..0f62cca0a4 100644 --- a/orte/util/parse_options.c +++ b/orte/util/parse_options.c @@ -32,7 +32,6 @@ #include "opal/util/argv.h" -#include "orte/util/name_fns.h" #include "orte/util/parse_options.h" diff --git a/orte/util/parse_options.h b/orte/util/parse_options.h index abdd63d883..7c32455f89 100644 --- a/orte/util/parse_options.h +++ b/orte/util/parse_options.h @@ -25,7 +25,6 @@ #define _ORTE_PARSE_OPTIONS_H_ #include "orte_config.h" -#include "orte/types.h" BEGIN_C_DECLS diff --git a/orte/util/pre_condition_transports.c b/orte/util/pre_condition_transports.c index 1dd06982c6..350a039301 100644 --- a/orte/util/pre_condition_transports.c +++ b/orte/util/pre_condition_transports.c @@ -40,12 +40,10 @@ #include "opal/mca/base/mca_base_param.h" #include "opal/util/opal_environ.h" -#include "opal/util/argv.h" #include "orte/constants.h" #include "orte/types.h" #include "orte/mca/errmgr/errmgr.h" -#include "orte/mca/plm/plm_types.h" #include "orte/util/pre_condition_transports.h" diff --git a/orte/util/show_help.c b/orte/util/show_help.c index 05931259ca..0bbad29041 100644 --- a/orte/util/show_help.c +++ b/orte/util/show_help.c @@ -26,7 +26,6 @@ #include "opal/util/show_help.h" #include "opal/util/output.h" -#include "opal/util/printf.h" #include "opal/dss/dss.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/util/show_help.h b/orte/util/show_help.h index f5d0b420d0..be9cd23c50 100644 --- a/orte/util/show_help.h +++ b/orte/util/show_help.h @@ -31,7 +31,6 @@ #include "orte_config.h" #include "orte/types.h" -#include "opal/util/output.h" #include "orte/mca/rml/rml_types.h" diff --git a/test/datatype/ddt_lib.h b/test/datatype/ddt_lib.h index fc22eb9593..33f3b27037 100644 --- a/test/datatype/ddt_lib.h +++ b/test/datatype/ddt_lib.h @@ -20,7 +20,6 @@ #include "ompi_config.h" #include "ompi/datatype/datatype.h" -#include "ompi/datatype/datatype_internal.h" #include #include #ifdef HAVE_SYS_TIME_H diff --git a/test/datatype/ddt_pack.c b/test/datatype/ddt_pack.c index 11257f74f9..50d0d3ee60 100644 --- a/test/datatype/ddt_pack.c +++ b/test/datatype/ddt_pack.c @@ -20,7 +20,6 @@ #include "ompi_config.h" #include "ompi/datatype/datatype.h" -#include "ompi/datatype/datatype_internal.h" #include "ompi/datatype/convertor.h" #include "ompi/proc/proc.h" diff --git a/test/dss/dss_cmp.c b/test/dss/dss_cmp.c index 8370d18576..acc5ba84e7 100644 --- a/test/dss/dss_cmp.c +++ b/test/dss/dss_cmp.c @@ -17,7 +17,6 @@ */ #include "opal_config.h" -#include "opal/constants.h" #include diff --git a/test/support/components.c b/test/support/components.c index 3e74da2a07..a3cdc94e4e 100644 --- a/test/support/components.c +++ b/test/support/components.c @@ -21,7 +21,6 @@ #include #include "ompi/constants.h" -#include "opal/constants.h" #include "opal/mca/mca.h" #include "opal/libltdl/ltdl.h" diff --git a/test/util/opal_basename.c b/test/util/opal_basename.c index b1eede2700..5eaf60c489 100644 --- a/test/util/opal_basename.c +++ b/test/util/opal_basename.c @@ -23,7 +23,6 @@ #include #include "support.h" -#include "opal/constants.h" #include "opal/util/basename.h" diff --git a/test/util/opal_error.c b/test/util/opal_error.c index 06f9163eab..37ef8e755d 100644 --- a/test/util/opal_error.c +++ b/test/util/opal_error.c @@ -38,7 +38,6 @@ #include "opal/util/error.h" #include "opal/constants.h" #include "opal/runtime/opal.h" -#include "orte/runtime/runtime.h" #include "orte/orte_constants.h" int diff --git a/test/util/opal_timer.c b/test/util/opal_timer.c index 1b576743ba..ef565ba89d 100644 --- a/test/util/opal_timer.c +++ b/test/util/opal_timer.c @@ -21,7 +21,6 @@ #include #include "opal/runtime/opal.h" -#include "opal/constants.h" #include "opal/mca/timer/base/base.h" int diff --git a/test/util/orte_session_dir.c b/test/util/orte_session_dir.c index 5f82854331..e908ac3157 100644 --- a/test/util/orte_session_dir.c +++ b/test/util/orte_session_dir.c @@ -34,10 +34,8 @@ #include "orte/mca/ns/ns_types.h" #include "orte/util/proc_info.h" #include "opal/util/os_path.h" -#include "opal/util/os_dirpath.h" #include "orte/util/session_dir.h" #include "orte/util/proc_info.h" -#include "orte/runtime/runtime.h" static bool test1(void); /* given prefix, both one that works and one that fails */