... Delayed due to notifier commits earlier this day ...

- Delete unnecessary header files using
   contrib/check_unnecessary_headers.sh after applying
   patches, that include headers, being "lost" due to
   inclusion in one of the now deleted headers...

   In total 817 files are touched.
   In ompi/mpi/c/ header files are moved up into the actual c-file,
   where necessary (these are the only additional #include),
   otherwise it is only deletions of #include (apart from the above
   additions required due to notifier...)

 - To get different MCAs (OpenIB, TM, ALPS), an earlier version was
   successfully compiled (yesterday) on:
   Linux locally using intel-11, gcc-4.3.2 and gcc-SVN + warnings enabled
   Smoky cluster (x86-64 running Linux) using PGI-8.0.2 + warnings enabled
   Lens cluster (x86-64 running Linux) using Pathscale-3.2 + warnings enabled

This commit was SVN r21096.

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"

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"

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"

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"
 

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"

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"

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"

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

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"

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"

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"
 

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

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) 

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

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

ompi/info/info.h

@@ -26,7 +26,6 @@
 #include <string.h>
 
 #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"

ompi/mca/allocator/basic/allocator_basic.h

@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include "opal/threads/mutex.h"
-#include "opal/class/opal_object.h"
 #include "ompi/class/ompi_free_list.h"
 #include "ompi/mca/allocator/allocator.h"
 

ompi/mca/allocator/bucket/allocator_bucket_alloc.h

@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 #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" {

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"
 

ompi/mca/bml/base/bml_base_open.c

@@ -23,7 +23,6 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #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"

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"

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)

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"

ompi/mca/bml/r2/bml_r2_ft.c

@@ -26,9 +26,7 @@
 #include <string.h>
 
 #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"

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

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)

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 <stdio.h>
 #include "elan/elan.h"

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
 

ompi/mca/btl/elan/btl_elan_endpoint.c

@@ -14,7 +14,6 @@
 #include <sys/time.h>
 #include <time.h>
 #include "ompi/types.h"
-#include "opal/dss/dss.h"
 #include "btl_elan.h"
 #include "btl_elan_endpoint.h" 
 #include "btl_elan_proc.h"

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"
 

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

ompi/mca/btl/gm/btl_gm.c

@@ -20,7 +20,6 @@
 #include "ompi_config.h"
 #include <string.h>
 #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"

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 <inttypes.h>
@@ -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"

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"
 

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

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"

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"

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"
 

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" 
 

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"
 

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"

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"

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"

ompi/mca/btl/openib/btl_openib_async.c

@@ -20,7 +20,6 @@
 #include <errno.h>
 
 #include "orte/util/show_help.h"
-#include "ompi/mca/btl/btl.h"
 
 #include "ompi/mca/btl/base/base.h"
 #include "btl_openib.h"

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"

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"

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"

ompi/mca/btl/openib/btl_openib_xrc.c

@@ -16,7 +16,6 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"
 #include "btl_openib_xrc.h"
 #include "btl_openib.h"

ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c

@@ -258,11 +258,9 @@
 #include <fcntl.h>
 #include <infiniband/cm.h>
 
-#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"

ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c

@@ -28,7 +28,6 @@
 #include <dirent.h>
 #include <malloc.h>
 
-#include "opal/util/argv.h"
 #include "opal/util/output.h"
 #include "opal/util/error.h"
 #include "orte/util/show_help.h"

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"

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"

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)

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"

ompi/mca/btl/sctp/btl_sctp.c

@@ -19,7 +19,6 @@
 #include "ompi_config.h"
 #include <string.h>
 #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"

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 <netinet/sctp.h>
 #include "btl_sctp_recv_handler.h"

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)

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 <unistd.h>
 #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 <netinet/sctp.h>
 #include "btl_sctp_recv_handler.h"

ompi/mca/btl/self/btl_self.c

@@ -26,13 +26,8 @@
 #include <errno.h>
 
 #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"

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"

ompi/mca/btl/sm/btl_sm.c

@@ -26,10 +26,8 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#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"

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"

ompi/mca/btl/tcp/btl_tcp.c

@@ -22,7 +22,6 @@
 #include "ompi_config.h"
 #include <string.h>
 #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"

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

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"

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)

ompi/mca/btl/tcp/btl_tcp_ft.c

@@ -22,7 +22,6 @@
 
 #include <string.h>
 
-#include "ompi/mca/btl/btl.h"
 
 #include "btl_tcp.h"
 #include "btl_tcp_frag.h" 

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
 

ompi/mca/btl/template/btl_template.c

@@ -19,7 +19,6 @@
 #include "ompi_config.h"
 #include <string.h>
 #include "opal/class/opal_bitmap.h"
-#include "opal/util/if.h"
 #include "ompi/mca/btl/btl.h"
 
 #include "btl_template.h"

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

ompi/mca/btl/template/btl_template_endpoint.c

@@ -21,7 +21,6 @@
 #include <sys/time.h>
 #include <time.h>
 #include "ompi/types.h"
-#include "opal/dss/dss.h"
 #include "btl_template.h"
 #include "btl_template_endpoint.h" 
 #include "btl_template_proc.h"

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)

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"

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"

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"

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"

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"

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

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"
 
 

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"

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

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
 

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"

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,

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

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

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"

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"

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"
 

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 

ompi/mca/coll/sm2/coll_sm2_component.c

@@ -30,8 +30,6 @@
 #include <fcntl.h>
 
 #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"
 

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"

ompi/mca/coll/sm2/coll_sm2_service.c

@@ -29,8 +29,6 @@
 #include <fcntl.h>
 
 #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"
 

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

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"

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"

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"

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"

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"

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"