Dependencies fixes.

This commit was SVN r7318.

ompi/mca/coll/basic/coll_basic.h

@@ -21,9 +21,10 @@
 
 #include "mpi.h"
 #include "mca/mca.h"
-#include "mca/coll/coll.h"
-#include "request/request.h"
-#include "mca/pml/pml.h"
+#include "ompi/mca/coll/coll.h"
+#include "ompi/request/request.h"
+#include "ompi/mca/pml/pml.h"
+#include "ompi/communicator/communicator.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C"

ompi/mca/coll/basic/coll_basic_allgather.c

@@ -19,11 +19,10 @@
 
 #include "mpi.h"
 #include "ompi/include/constants.h"
-#include "communicator/communicator.h"
-#include "datatype/datatype.h"
-#include "mca/coll/coll.h"
-#include "mca/pml/pml.h"
-#include "mca/coll/base/coll_tags.h"
+#include "ompi/datatype/datatype.h"
+#include "ompi/mca/coll/coll.h"
+#include "ompi/mca/pml/pml.h"
+#include "ompi/mca/coll/base/coll_tags.h"
 #include "coll_basic.h"
 
 

ompi/mca/coll/basic/coll_basic_allgatherv.c

@@ -19,9 +19,8 @@
 
 #include "mpi.h"
 #include "ompi/include/constants.h"
-#include "communicator/communicator.h"
-#include "mca/coll/coll.h"
-#include "mca/coll/base/coll_tags.h"
+#include "ompi/mca/coll/coll.h"
+#include "ompi/mca/coll/base/coll_tags.h"
 #include "coll_basic.h"
 
 

ompi/mca/coll/basic/coll_basic_allreduce.c

@@ -19,13 +19,12 @@
 
 #include "mpi.h"
 #include "ompi/include/constants.h"
-#include "communicator/communicator.h"
-#include "datatype/datatype.h"
-#include "op/op.h"
-#include "mca/coll/coll.h"
-#include "mca/coll/base/coll_tags.h"
+#include "ompi/datatype/datatype.h"
+#include "ompi/op/op.h"
+#include "ompi/mca/coll/coll.h"
+#include "ompi/mca/coll/base/coll_tags.h"
 #include "coll_basic.h"
-#include "mca/pml/pml.h"
+#include "ompi/mca/pml/pml.h"
 
 
 /*

ompi/mca/coll/basic/coll_basic_alltoall.c

@@ -19,11 +19,10 @@
 
 #include "mpi.h"
 #include "ompi/include/constants.h"
-#include "datatype/datatype.h"
-#include "communicator/communicator.h"
-#include "mca/coll/coll.h"
-#include "mca/coll/base/coll_tags.h"
-#include "mca/pml/pml.h"
+#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_alltoallv.c

@@ -19,11 +19,10 @@
 
 #include "mpi.h"
 #include "ompi/include/constants.h"
-#include "datatype/datatype.h"
-#include "communicator/communicator.h"
-#include "mca/coll/coll.h"
-#include "mca/coll/base/coll_tags.h"
-#include "mca/pml/pml.h"
+#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_alltoallw.c

@@ -19,10 +19,9 @@
 
 #include "mpi.h"
 #include "ompi/include/constants.h"
-#include "datatype/datatype.h"
-#include "communicator/communicator.h"
-#include "mca/coll/coll.h"
-#include "mca/coll/base/coll_tags.h"
+#include "ompi/datatype/datatype.h"
+#include "ompi/mca/coll/coll.h"
+#include "ompi/mca/coll/base/coll_tags.h"
 
 
 /*

ompi/mca/coll/basic/coll_basic_barrier.c

@@ -19,11 +19,10 @@
 
 #include "mpi.h"
 #include "ompi/include/constants.h"
-#include "communicator/communicator.h"
 #include "opal/util/bit_ops.h"
-#include "mca/pml/pml.h"
-#include "mca/coll/coll.h"
-#include "mca/coll/base/coll_tags.h"
+#include "ompi/mca/pml/pml.h"
+#include "ompi/mca/coll/coll.h"
+#include "ompi/mca/coll/base/coll_tags.h"
 #include "coll_basic.h"
 
 

ompi/mca/coll/basic/coll_basic_bcast.c

@@ -19,12 +19,11 @@
 
 #include "mpi.h"
 #include "ompi/include/constants.h"
-#include "datatype/datatype.h"
-#include "communicator/communicator.h"
-#include "mca/coll/coll.h"
-#include "mca/coll/base/coll_tags.h"
+#include "ompi/datatype/datatype.h"
+#include "ompi/mca/coll/coll.h"
+#include "ompi/mca/coll/base/coll_tags.h"
 #include "coll_basic.h"
-#include "mca/pml/pml.h"
+#include "ompi/mca/pml/pml.h"
 #include "opal/util/bit_ops.h"
 
 

ompi/mca/coll/basic/coll_basic_exscan.c

@@ -21,11 +21,11 @@
 
 #include "mpi.h"
 #include "ompi/include/constants.h"
-#include "op/op.h"
-#include "datatype/datatype.h"
-#include "mca/pml/pml.h"
-#include "mca/coll/coll.h"
-#include "mca/coll/base/coll_tags.h"
+#include "ompi/op/op.h"
+#include "ompi/datatype/datatype.h"
+#include "ompi/mca/pml/pml.h"
+#include "ompi/mca/coll/coll.h"
+#include "ompi/mca/coll/base/coll_tags.h"
 #include "coll_basic.h"
 
 

ompi/mca/coll/basic/coll_basic_gather.c

@@ -20,10 +20,10 @@
 #include "mpi.h"
 #include "ompi/include/constants.h"
 #include "coll_basic.h"
-#include "datatype/datatype.h"
-#include "mca/coll/coll.h"
-#include "mca/coll/base/coll_tags.h"
-#include "mca/pml/pml.h"
+#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"
 
 /*
  *	gather_intra

ompi/mca/coll/basic/coll_basic_gatherv.c

@@ -19,12 +19,11 @@
 
 #include "mpi.h"
 #include "ompi/include/constants.h"
-#include "datatype/datatype.h"
-#include "mca/coll/coll.h"
-#include "mca/coll/base/coll_tags.h"
+#include "ompi/datatype/datatype.h"
+#include "ompi/mca/coll/coll.h"
+#include "ompi/mca/coll/base/coll_tags.h"
 #include "coll_basic.h"
 
-
 /*
  *	gatherv_intra
  *

ompi/mca/coll/basic/coll_basic_module.c

@@ -20,10 +20,9 @@
 #include <stdio.h>
 
 #include "mpi.h"
-#include "communicator/communicator.h"
-#include "mca/base/mca_base_param.h"
-#include "mca/coll/coll.h"
-#include "mca/coll/base/base.h"
+#include "opal/mca/base/mca_base_param.h"
+#include "ompi/mca/coll/coll.h"
+#include "ompi/mca/coll/base/base.h"
 #include "coll_basic.h"
 
 

ompi/mca/coll/basic/coll_basic_reduce.c

@@ -21,10 +21,9 @@
 
 #include "mpi.h"
 #include "ompi/include/constants.h"
-#include "mca/coll/coll.h"
-#include "mca/coll/base/coll_tags.h"
-#include "op/op.h"
-
+#include "ompi/mca/coll/coll.h"
+#include "ompi/mca/coll/base/coll_tags.h"
+#include "ompi/op/op.h"
 
 /*
  *	reduce_lin_intra

ompi/mca/coll/basic/coll_basic_reduce_scatter.c

@@ -22,10 +22,10 @@
 
 #include "mpi.h"
 #include "ompi/include/constants.h"
-#include "mca/coll/coll.h"
-#include "mca/coll/base/coll_tags.h"
+#include "ompi/mca/coll/coll.h"
+#include "ompi/mca/coll/base/coll_tags.h"
 #include "coll_basic.h"
-#include "op/op.h"
+#include "ompi/op/op.h"
 
 
 /*

ompi/mca/coll/basic/coll_basic_scan.c

@@ -21,9 +21,9 @@
 
 #include "mpi.h"
 #include "ompi/include/constants.h"
-#include "op/op.h"
-#include "mca/coll/coll.h"
-#include "mca/coll/base/coll_tags.h"
+#include "ompi/op/op.h"
+#include "ompi/mca/coll/coll.h"
+#include "ompi/mca/coll/base/coll_tags.h"
 #include "coll_basic.h"
 
 

ompi/mca/coll/basic/coll_basic_scatter.c

@@ -19,10 +19,10 @@
 
 #include "mpi.h"
 #include "ompi/include/constants.h"
-#include "datatype/datatype.h"
-#include "mca/coll/coll.h"
-#include "mca/coll/base/coll_tags.h"
-#include "mca/pml/pml.h"
+#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_scatterv.c

@@ -19,10 +19,10 @@
 
 #include "mpi.h"
 #include "ompi/include/constants.h"
-#include "datatype/datatype.h"
-#include "mca/coll/coll.h"
-#include "mca/coll/base/coll_tags.h"
-#include "mca/pml/pml.h"
+#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"