Merge pull request open-mpi#751 from ggouaillardet/topic/v2.x/spml_vs_ob1

oshmem: do not include pml/ob1 headers

Author: hppritcha

oshmem/mca/spml/base/spml_base_request.h

@@ -4,6 +4,8 @@
  *                         All rights reserved.
  * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -22,7 +24,6 @@
 #include "opal/datatype/opal_convertor.h"
 
 #include "opal/class/opal_free_list.h"
-#include "ompi/mca/pml/ob1/pml_ob1_comm.h"
 
 BEGIN_C_DECLS
 

oshmem/mca/spml/yoda/spml_yoda_getreq.h

@@ -4,6 +4,8 @@
  *                         All rights reserved.
  * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -17,7 +19,6 @@
 #include "opal/mca/btl/btl.h"
 #include "oshmem/mca/spml/base/spml_base_putreq.h"
 #include "opal/mca/mpool/base/base.h"
-#include "ompi/mca/pml/ob1/pml_ob1_comm.h"
 #include "ompi/mca/bml/bml.h"
 #include "oshmem/mca/spml/yoda/spml_yoda_rdmafrag.h"
 #include "oshmem/mca/spml/yoda/spml_yoda.h"