- Last of intrusive commits (promised)... err for now.

Anyway, this is blocking the move: do not include pml.h
   if not really needed, aka none of the following used:
     mca_pml
     MCA_PML_CALL
     OMPI_ANY_TAG
     OMPI_ANY_SOURCE
     OMPI_PROC_NULL

 - Notable exceptions (deleting in one header->adding):
   - ompi/mca/mtl/psm/
   - ompi/mca/osc/rdma/
   - ompi/mca/btl/openib/btl_openib_endpoint.c depended on
     pml_base_sendreq.h

 - Tested on Linux/x86-64, this time including make check
   (thanks Jeff and Ralph)

This commit was SVN r20725.

ompi/mca/bml/base/bml_base_endpoint.c

@@ -21,7 +21,6 @@
 
 #include "opal/sys/atomic.h"
 #include "ompi/mca/bml/bml.h"
-#include "ompi/mca/pml/pml.h" 
 
 
 

ompi/mca/bml/r2/bml_r2_ft.c

@@ -31,7 +31,6 @@
 #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/pml.h"
 #include "ompi/mca/pml/base/base.h"
 #include "orte/mca/grpcomm/grpcomm.h"
 #include "ompi/proc/proc.h"

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/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"
 

ompi/mca/btl/base/btl_base_open.c

@@ -28,7 +28,6 @@
 
 
 #include "opal/mca/base/mca_base_param.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"
 

ompi/mca/btl/base/btl_base_select.c

@@ -25,7 +25,6 @@
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "opal/mca/base/mca_base_component_repository.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"
 #include "orte/mca/errmgr/errmgr.h"

ompi/mca/btl/elan/btl_elan.c

@@ -13,7 +13,6 @@
 #include "opal/class/opal_bitmap.h"
 #include "opal/util/if.h"
 #include "opal/util/output.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/communicator/communicator.h"
 #include "btl_elan.h"

ompi/mca/btl/elan/btl_elan.h

@@ -19,7 +19,6 @@
 
 #include "opal/event/event.h"
 #include "ompi/class/ompi_free_list.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/btl_base_error.h"
 

ompi/mca/btl/elan/btl_elan_component.c

@@ -16,7 +16,6 @@
 #include "opal/util/if.h"
 #include "opal/util/output.h"
 #include "opal/util/argv.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 
 #include "opal/mca/base/mca_base_param.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/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "btl_elan_frag.h"
 #include "btl_elan.h"

ompi/mca/btl/gm/btl_gm.c

@@ -22,7 +22,6 @@
 #include "opal/class/opal_bitmap.h"
 #include "opal/util/if.h"
 #include "opal/util/output.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 
 #include "btl_gm.h"

ompi/mca/btl/gm/btl_gm.h

@@ -31,7 +31,6 @@
 #include "opal/class/opal_bitmap.h"
 #include "opal/event/event.h"
 #include "ompi/class/ompi_free_list.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"
 #include "ompi/mca/mpool/mpool.h" 

ompi/mca/btl/gm/btl_gm_component.c

@@ -24,7 +24,6 @@
 #include "opal/util/if.h"
 #include "opal/util/output.h"
 #include "opal/util/argv.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/request/request.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/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "btl_gm_frag.h"
 #include "btl_gm.h"

ompi/mca/btl/mx/btl_mx.h

@@ -29,7 +29,6 @@
 #include "opal/class/opal_bitmap.h"
 #include "ompi/class/ompi_free_list.h"
 #include "opal/event/event.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"
 #include "ompi/mca/mpool/mpool.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/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "btl_mx_frag.h"
 #include "btl_mx.h"

ompi/mca/btl/openib/btl_openib.c

@@ -33,7 +33,6 @@
 #include "opal/util/output.h"
 #include "opal/util/arch.h"
 
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/btl_base_error.h"
 

ompi/mca/btl/openib/btl_openib.h

@@ -38,7 +38,6 @@
 #include "opal/class/opal_pointer_array.h"
 #include "opal/util/output.h"
 #include "opal/event/event.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/mpool/mpool.h"
 #include "ompi/mca/btl/base/btl_base_error.h"

ompi/mca/btl/openib/btl_openib_component.c

@@ -67,7 +67,6 @@ const char *ibv_get_sysfs_path(void);
 #include "orte/mca/notifier/notifier.h"
 
 #include "ompi/proc/proc.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/mpool/base/base.h"
 #include "ompi/mca/mpool/rdma/mpool_rdma.h"

ompi/mca/btl/openib/btl_openib_endpoint.c

@@ -36,7 +36,6 @@
 #include "orte/util/show_help.h"
 
 #include "ompi/types.h"
-#include "ompi/mca/pml/base/pml_base_sendreq.h"
 #include "ompi/class/ompi_free_list.h"
 
 #include "btl_openib_endpoint.h"

ompi/mca/btl/openib/btl_openib_endpoint.h

@@ -27,7 +27,6 @@
 #include "opal/class/opal_list.h"
 #include "opal/event/event.h"
 #include "opal/util/output.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "btl_openib.h"
 #include "btl_openib_frag.h"

ompi/mca/btl/portals/btl_portals.c

@@ -27,7 +27,6 @@
 
 #include "opal/class/opal_bitmap.h"
 #include "ompi/constants.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/datatype/convertor.h"
 #include "ompi/datatype/datatype.h"

ompi/mca/btl/portals/btl_portals.h

@@ -26,7 +26,6 @@
 #include "ompi/mca/common/portals/common_portals.h"
 
 #include "opal/class/opal_bitmap.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"
 #include "ompi/class/ompi_free_list.h"

ompi/mca/btl/sctp/btl_sctp.c

@@ -20,7 +20,6 @@
 #include <string.h>
 #include "opal/class/opal_bitmap.h"
 #include "opal/util/if.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 
 #include "btl_sctp.h"

ompi/mca/btl/sctp/btl_sctp.h

@@ -36,7 +36,6 @@
 #include "opal/event/event.h"
 #include "opal/class/opal_bitmap.h"
 #include "ompi/class/ompi_free_list.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"
 #include "ompi/mca/mpool/mpool.h" 

ompi/mca/btl/sctp/btl_sctp_component.c

@@ -48,7 +48,6 @@
 #include "opal/event/event.h"
 #include "opal/util/if.h"
 #include "opal/util/argv.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 
 #include "opal/mca/base/mca_base_param.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/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "btl_sctp_frag.h"
 #include "btl_sctp.h"

ompi/mca/btl/sctp/btl_sctp_recv_handler.c

@@ -41,7 +41,6 @@
 #include "opal/event/event.h"
 #include "opal/util/if.h"
 #include "opal/util/argv.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 
 #include "opal/mca/base/mca_base_param.h"

ompi/mca/btl/self/btl_self.c

@@ -33,7 +33,6 @@
 #include "opal/util/if.h"
 #include "opal/util/printf.h"
 #include "ompi/class/ompi_free_list.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/mpool/base/base.h"
 #include "btl_self.h"

ompi/mca/btl/self/btl_self.h

@@ -32,7 +32,6 @@
 #include "opal/class/opal_bitmap.h"
 #include "opal/event/event.h"
 #include "ompi/class/ompi_free_list.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h" 
 

ompi/mca/btl/self/btl_self_component.c

@@ -31,7 +31,6 @@
 #include "opal/event/event.h"
 #include "opal/util/if.h"
 #include "opal/util/argv.h"
-#include "ompi/mca/pml/pml.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

@@ -39,7 +39,6 @@
 #include "orte/util/proc_info.h"
 #include "ompi/datatype/convertor.h"
 #include "ompi/class/ompi_free_list.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/mpool/base/base.h"
 #include "ompi/mca/common/sm/common_sm_mmap.h"

ompi/mca/btl/sm/btl_sm.h

@@ -41,7 +41,6 @@
 #include "opal/class/opal_bitmap.h"
 #include "ompi/class/ompi_free_list.h"
 #include "opal/event/event.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"
 

ompi/mca/btl/sm/btl_sm_component.c

@@ -47,7 +47,6 @@
 #include "orte/util/proc_info.h"
 #include "orte/runtime/orte_globals.h"
 
-#include "ompi/mca/pml/pml.h"
 #include "opal/mca/base/mca_base_param.h"
 #include "ompi/runtime/ompi_module_exchange.h"
 #include "ompi/mca/mpool/base/base.h"

ompi/mca/btl/tcp/btl_tcp.c

@@ -23,7 +23,6 @@
 #include <string.h>
 #include "opal/class/opal_bitmap.h"
 #include "opal/util/if.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 
 #include "btl_tcp.h"

ompi/mca/btl/tcp/btl_tcp.h

@@ -37,7 +37,6 @@
 #include "opal/event/event.h"
 #include "opal/class/opal_bitmap.h"
 #include "ompi/class/ompi_free_list.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"
 #include "ompi/mca/mpool/mpool.h" 

ompi/mca/btl/tcp/btl_tcp_component.c

@@ -51,7 +51,6 @@
 #include "opal/util/output.h"
 #include "opal/util/argv.h"
 #include "orte/types.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 
 #include "opal/mca/base/mca_base_param.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/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "btl_tcp_frag.h"
 #include "btl_tcp.h"

ompi/mca/btl/template/btl_template.c

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

ompi/mca/btl/template/btl_template.h

@@ -29,7 +29,6 @@
 #include "opal/class/opal_bitmap.h"
 #include "opal/event/event.h"
 #include "ompi/class/ompi_free_list.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"
 #include "ompi/mca/mpool/mpool.h" 

ompi/mca/btl/template/btl_template_component.c

@@ -22,7 +22,6 @@
 #include "opal/event/event.h"
 #include "opal/util/if.h"
 #include "opal/util/argv.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 
 #include "opal/mca/base/mca_base_param.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/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "btl_template_frag.h"
 #include "btl_template.h"

ompi/mca/btl/udapl/btl_udapl.c

@@ -26,7 +26,6 @@
 #include <string.h>
 #include "opal/class/opal_bitmap.h"
 #include "opal/util/if.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 
 #include "btl_udapl.h"

ompi/mca/btl/udapl/btl_udapl.h

@@ -35,7 +35,6 @@
 #include "opal/class/opal_bitmap.h"
 #include "opal/event/event.h"
 #include "ompi/class/ompi_free_list.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"
 #include "ompi/mca/btl/base/btl_base_error.h"

ompi/mca/btl/udapl/btl_udapl_component.c

@@ -28,7 +28,6 @@
 #include "opal/event/event.h"
 #include "opal/util/if.h"
 #include "opal/util/argv.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/runtime/params.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/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/btl_base_error.h"
 #include "btl_udapl_frag.h"

ompi/mca/coll/basic/coll_basic.h

@@ -26,7 +26,6 @@
 #include "opal/mca/mca.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/request/request.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/communicator/communicator.h"
 
 BEGIN_C_DECLS

ompi/mca/coll/basic/coll_basic_alltoallw.c

@@ -24,6 +24,7 @@
 #include "ompi/datatype/datatype.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/coll_tags.h"
+#include "ompi/mca/pml/pml.h"
 
 
 /*

ompi/mca/coll/basic/coll_basic_gatherv.c

@@ -24,6 +24,7 @@
 #include "ompi/datatype/datatype.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/coll_tags.h"
+#include "ompi/mca/pml/pml.h"
 #include "coll_basic.h"
 
 /*

ompi/mca/coll/basic/coll_basic_reduce.c

@@ -25,6 +25,7 @@
 #include "ompi/constants.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"
 
 /*

ompi/mca/coll/basic/coll_basic_reduce_scatter.c

@@ -27,6 +27,7 @@
 #include "ompi/constants.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/coll_tags.h"
+#include "ompi/mca/pml/pml.h"
 #include "ompi/datatype/datatype.h"
 #include "coll_basic.h"
 #include "ompi/op/op.h"

ompi/mca/coll/basic/coll_basic_scan.c

@@ -26,6 +26,7 @@
 #include "ompi/op/op.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/coll_tags.h"
+#include "ompi/mca/pml/pml.h"
 #include "coll_basic.h"
 
 

ompi/mca/coll/demo/coll_demo.h

@@ -26,7 +26,6 @@
 #include "opal/mca/mca.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/request/request.h"
-#include "ompi/mca/pml/pml.h"
 
 BEGIN_C_DECLS
 

ompi/mca/coll/inter/coll_inter.c

@@ -35,7 +35,6 @@
 
 #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"
 
 

ompi/mca/coll/self/coll_self.h

@@ -26,7 +26,6 @@
 #include "opal/mca/mca.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/request/request.h"
-#include "ompi/mca/pml/pml.h"
 
 BEGIN_C_DECLS
 

ompi/mca/coll/tuned/coll_tuned.h

@@ -27,7 +27,6 @@
 #include "opal/mca/mca.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/request/request.h"
-#include "ompi/mca/pml/pml.h"
 
 /* need to include our own topo prototypes so we can malloc data on the comm correctly */
 #include "coll_tuned_topo.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/mca/pml/pml.h"
 #include "ompi/op/op.h"
 #include "coll_tuned.h"
 #include "coll_tuned_topo.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/mca/pml/pml.h"
 #include "ompi/op/op.h"
 #include "coll_tuned.h"
 #include "coll_tuned_topo.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 "ompi/mca/pml/pml.h"
 #include "opal/util/bit_ops.h"
 
 #include "coll_tuned.h"

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 "ompi/mca/pml/pml.h"
 #include "opal/util/bit_ops.h"
 
 

ompi/mca/coll/tuned/coll_tuned_dynamic_file.c

@@ -25,7 +25,6 @@
 #include "opal/mca/mca.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/request/request.h"
-#include "ompi/mca/pml/pml.h"
 #include "coll_tuned.h"
 
 /* need to include our own topo prototypes so we can malloc data on the comm correctly */

ompi/mca/coll/tuned/coll_tuned_topo.c

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

ompi/mca/mtl/mx/mtl_mx_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/pml/pml.h"
 #include "ompi/mca/mtl/mtl.h"
 #include "mtl_mx.h"
 

ompi/mca/mtl/psm/mtl_psm.h

@@ -25,6 +25,7 @@
 #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"

ompi/mca/mtl/psm/mtl_psm_endpoint.h

@@ -23,7 +23,6 @@
 #include "opal/class/opal_list.h"
 #include "opal/event/event.h"
 #include "ompi/proc/proc.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/mtl/mtl.h"
 #include "mtl_psm.h"
 

ompi/mca/mtl/psm/mtl_psm_send.c

@@ -18,6 +18,7 @@
  */
 
 #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"

ompi/mca/osc/pt2pt/osc_pt2pt_replyreq.h

@@ -27,7 +27,6 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/proc/proc.h"
 #include "ompi/op/op.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/memchecker.h"
 
 

ompi/mca/osc/pt2pt/osc_pt2pt_sendreq.h

@@ -27,7 +27,6 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/proc/proc.h"
 #include "ompi/op/op.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/memchecker.h"
 
 typedef enum {

ompi/mca/osc/rdma/osc_rdma_component.c

@@ -40,7 +40,6 @@
 #include "ompi/mca/osc/base/osc_base_obj_convert.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/bml/bml.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/bml/base/base.h"
 
 static int component_open(void);

ompi/mca/osc/rdma/osc_rdma_data_move.c

@@ -28,6 +28,7 @@
 #include "opal/util/arch.h"
 #include "opal/util/output.h"
 #include "opal/sys/atomic.h"
+#include "ompi/mca/pml/pml.h"
 #include "ompi/mca/bml/bml.h"
 #include "ompi/mca/bml/base/base.h"
 #include "ompi/mca/btl/btl.h"

ompi/mca/osc/rdma/osc_rdma_replyreq.h

@@ -29,7 +29,6 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/proc/proc.h"
 #include "ompi/op/op.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/memchecker.h"
 
 

ompi/mca/osc/rdma/osc_rdma_sendreq.h

@@ -29,7 +29,6 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/proc/proc.h"
 #include "ompi/op/op.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/memchecker.h"
 
 typedef enum {

ompi/mca/pubsub/orte/pubsub_orte.c

@@ -42,7 +42,6 @@
 
 #include "ompi/communicator/communicator.h"
 #include "ompi/proc/proc.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/info/info.h"
 #include "ompi/runtime/ompi_module_exchange.h"
 

ompi/mpi/c/cancel.c

@@ -21,7 +21,6 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/communicator/communicator.h"
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/request/request.h"

ompi/mpi/c/request_free.c

@@ -20,7 +20,6 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
 #include "ompi/memchecker.h"
 

ompi/mpi/c/test.c

@@ -20,7 +20,6 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
 #include "ompi/memchecker.h"
 

ompi/mpi/c/testall.c

@@ -20,7 +20,6 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
 #include "ompi/memchecker.h"
 

ompi/mpi/c/testany.c

@@ -20,7 +20,6 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
 #include "ompi/memchecker.h"
 

ompi/mpi/c/testsome.c

@@ -20,7 +20,6 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
 #include "ompi/memchecker.h"
 

ompi/mpi/c/wait.c

@@ -20,7 +20,6 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
 #include "ompi/memchecker.h"
 

ompi/mpi/c/waitall.c

@@ -20,7 +20,6 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
 #include "ompi/memchecker.h"
 

ompi/mpi/c/waitany.c

@@ -22,7 +22,6 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
 #include "ompi/memchecker.h"
 

ompi/mpi/c/waitsome.c

@@ -22,7 +22,6 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
 #include "ompi/memchecker.h"
 

ompi/proc/proc.c

@@ -33,7 +33,6 @@
 #include "orte/runtime/orte_globals.h"
 
 #include "ompi/proc/proc.h"
-#include "ompi/mca/pml/pml.h"
 #include "ompi/datatype/convertor.h"
 #include "ompi/runtime/params.h"
 #include "ompi/runtime/mpiruntime.h"