Cleanup the dependencies between the MPI layer and the rest of the ompi files.

Modify the includes to start with the root directory (i.e orte/datatype/datatype.h).

This commit was SVN r7306.

ompi/mpi/c/abort.c

@@ -15,10 +15,8 @@
  */
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
 #include "ompi/runtime/mpiruntime.h"
-#include "errhandler/errhandler.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Abort = PMPI_Abort

ompi/mpi/c/accumulate.c

@@ -16,10 +16,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Accumulate = PMPI_Accumulate

ompi/mpi/c/add_error_class.c

@@ -16,10 +16,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "errhandler/errclass.h"
-#include "communicator/communicator.h"
+#include "ompi/errhandler/errclass.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Add_error_class = PMPI_Add_error_class

ompi/mpi/c/add_error_code.c

@@ -16,11 +16,9 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "errhandler/errcode.h"
-#include "errhandler/errclass.h"
-#include "communicator/communicator.h"
+#include "ompi/errhandler/errcode.h"
+#include "ompi/errhandler/errclass.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Add_error_code = PMPI_Add_error_code

ompi/mpi/c/add_error_string.c

@@ -17,10 +17,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "errhandler/errcode.h"
-#include "communicator/communicator.h"
+#include "ompi/errhandler/errcode.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Add_error_string = PMPI_Add_error_string

ompi/mpi/c/address.c

@@ -17,10 +17,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "errhandler/errhandler.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Address = PMPI_Address

ompi/mpi/c/allgather.c

@@ -17,11 +17,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "mca/coll/coll.h"
-#include "communicator/communicator.h"
-#include "datatype/datatype.h"
+#include "ompi/datatype/datatype.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Allgather = PMPI_Allgather

ompi/mpi/c/allgatherv.c

@@ -17,11 +17,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "mca/coll/coll.h"
-#include "communicator/communicator.h"
-#include "datatype/datatype.h"
+#include "ompi/datatype/datatype.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Allgatherv = PMPI_Allgatherv

ompi/mpi/c/alloc_mem.c

@@ -19,12 +19,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "info/info.h"
-#include "mca/mpool/mpool.h"
+#include "ompi/info/info.h"
+#include "ompi/mca/mpool/mpool.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Alloc_mem = PMPI_Alloc_mem

ompi/mpi/c/allreduce.c

@@ -17,12 +17,9 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
-#include "datatype/datatype.h"
 #include "mpi/c/bindings.h"
-#include "mca/coll/coll.h"
-#include "communicator/communicator.h"
-#include "op/op.h"
+#include "ompi/datatype/datatype.h"
+#include "ompi/op/op.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Allreduce = PMPI_Allreduce

ompi/mpi/c/alltoall.c

@@ -17,11 +17,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "mca/coll/coll.h"
-#include "communicator/communicator.h"
-#include "datatype/datatype.h"
+#include "ompi/datatype/datatype.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Alltoall = PMPI_Alltoall

ompi/mpi/c/alltoallv.c

@@ -17,11 +17,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "mca/coll/coll.h"
-#include "communicator/communicator.h"
-#include "datatype/datatype.h"
+#include "ompi/datatype/datatype.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Alltoallv = PMPI_Alltoallv

ompi/mpi/c/alltoallw.c

@@ -17,11 +17,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "mca/coll/coll.h"
-#include "communicator/communicator.h"
-#include "datatype/datatype.h"
+#include "ompi/datatype/datatype.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Alltoallw = PMPI_Alltoallw

ompi/mpi/c/attr_delete.c

@@ -17,10 +17,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "attribute/attribute.h"
-#include "communicator/communicator.h"
+#include "ompi/attribute/attribute.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Attr_delete = PMPI_Attr_delete

ompi/mpi/c/attr_fn.c

@@ -16,11 +16,9 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "datatype/datatype.h"
-#include "communicator/communicator.h"
-#include "win/win.h"
+#include "ompi/datatype/datatype.h"
+#include "ompi/win/win.h"
 
 /*
  * Comment to circumvent error-msg of weak-check:

ompi/mpi/c/attr_get.c

@@ -17,10 +17,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "attribute/attribute.h"
-#include "communicator/communicator.h"
+#include "ompi/attribute/attribute.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Attr_get = PMPI_Attr_get

ompi/mpi/c/attr_put.c

@@ -17,10 +17,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "attribute/attribute.h"
-#include "communicator/communicator.h"
+#include "ompi/attribute/attribute.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Attr_put = PMPI_Attr_put

ompi/mpi/c/barrier.c

@@ -16,11 +16,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "mca/coll/coll.h"
-#include "errhandler/errhandler.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Barrier = PMPI_Barrier

ompi/mpi/c/bcast.c

@@ -16,11 +16,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "mca/coll/coll.h"
-#include "communicator/communicator.h"
-#include "datatype/datatype.h"
+#include "ompi/datatype/datatype.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Bcast = PMPI_Bcast

ompi/mpi/c/bindings.h

@@ -19,6 +19,8 @@
 
 #include "ompi_config.h"
 #include "mpi.h"
+#include "ompi/communicator/communicator.h"
+
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif

ompi/mpi/c/bsend.c

@@ -16,12 +16,10 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
 #include "mca/pml/pml.h"
 #include "mca/pml/base/pml_base_bsend.h"
 
-
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Bsend = PMPI_Bsend
 #endif

ompi/mpi/c/bsend_init.c

@@ -16,10 +16,9 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "mca/pml/pml.h"
-#include "mca/pml/base/pml_base_bsend.h"
+#include "ompi/mca/pml/pml.h"
+#include "ompi/mca/pml/base/pml_base_bsend.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Bsend_init = PMPI_Bsend_init

ompi/mpi/c/buffer_attach.c

@@ -16,13 +16,9 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "mca/pml/pml.h"
-#include "mca/pml/base/pml_base_bsend.h"
-
+#include "ompi/mca/pml/pml.h"
+#include "ompi/mca/pml/base/pml_base_bsend.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Buffer_attach = PMPI_Buffer_attach

ompi/mpi/c/buffer_detach.c

@@ -16,10 +16,9 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "mca/pml/pml.h"
-#include "mca/pml/base/pml_base_bsend.h"
+#include "ompi/mca/pml/pml.h"
+#include "ompi/mca/pml/base/pml_base_bsend.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Buffer_detach = PMPI_Buffer_detach

ompi/mpi/c/cancel.c

@@ -18,11 +18,11 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "mca/pml/pml.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
+#include "ompi/mca/pml/pml.h"
+#include "ompi/communicator/communicator.h"
+#include "ompi/errhandler/errhandler.h"
+#include "ompi/request/request.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Cancel = PMPI_Cancel

ompi/mpi/c/cart_coords.c

@@ -16,12 +16,9 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "mca/topo/topo.h"
-#include "errhandler/errhandler.h"
-#include "group/group.h"
+#include "ompi/mca/topo/topo.h"
+#include "ompi/group/group.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Cart_coords = PMPI_Cart_coords

ompi/mpi/c/cart_create.c

@@ -16,12 +16,9 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "mca/topo/topo.h"
-#include "mca/topo/base/base.h"
-#include "errhandler/errhandler.h"
+#include "ompi/mca/topo/topo.h"
+#include "ompi/mca/topo/base/base.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Cart_create = PMPI_Cart_create

ompi/mpi/c/cart_get.c

@@ -16,11 +16,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "mca/topo/topo.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
+#include "ompi/mca/topo/topo.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Cart_get = PMPI_Cart_get

ompi/mpi/c/cart_map.c

@@ -16,11 +16,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "mca/topo/topo.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
+#include "ompi/mca/topo/topo.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Cart_map = PMPI_Cart_map

ompi/mpi/c/cart_rank.c

@@ -16,11 +16,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "mca/topo/topo.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
+#include "ompi/mca/topo/topo.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Cart_rank = PMPI_Cart_rank

ompi/mpi/c/cart_shift.c

@@ -16,11 +16,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "mca/topo/topo.h"
-#include "errhandler/errhandler.h"
+#include "ompi/mca/topo/topo.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Cart_shift = PMPI_Cart_shift

ompi/mpi/c/cart_sub.c

@@ -16,11 +16,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "mca/topo/topo.h"
-#include "errhandler/errhandler.h"
+#include "ompi/mca/topo/topo.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Cart_sub = PMPI_Cart_sub

ompi/mpi/c/cartdim_get.c

@@ -16,10 +16,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
+#include "ompi/mca/topo/topo.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Cartdim_get = PMPI_Cartdim_get

ompi/mpi/c/close_port.c

@@ -16,9 +16,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Close_port = PMPI_Close_port

ompi/mpi/c/comm_accept.c

@@ -16,10 +16,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "info/info.h"
-#include "communicator/communicator.h"
+#include "ompi/info/info.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_accept = PMPI_Comm_accept
@@ -75,7 +73,6 @@ int MPI_Comm_accept(char *port_name, MPI_Info info, int root,
         }
     }
 
-
     /* parse info object. no prefedined values for this function in MPI-2 
      * so lets ignore it for the moment.
      * if ( rank == root && MPI_INFO_NULL != info ) {
@@ -87,8 +84,8 @@ int MPI_Comm_accept(char *port_name, MPI_Info info, int root,
      * The two leaders will figure this out later. However, we need the tag.
      */
     if ( rank == root ) {
-	tmp_port = ompi_parse_port(port_name, &tag);
-	free (tmp_port);
+	    tmp_port = ompi_parse_port(port_name, &tag);
+	    free (tmp_port);
     }
     rc = ompi_comm_connect_accept (comm, root, NULL, send_first, &newcomp, tag);
 

ompi/mpi/c/comm_c2f.c

@@ -16,11 +16,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
 #include "mpi/f77/fint_2_int.h"
-#include "errhandler/errhandler.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_c2f = PMPI_Comm_c2f

ompi/mpi/c/comm_call_errhandler.c

@@ -16,10 +16,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "errhandler/errhandler.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_call_errhandler = PMPI_Comm_call_errhandler

ompi/mpi/c/comm_compare.c

@@ -16,9 +16,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_compare = PMPI_Comm_compare

ompi/mpi/c/comm_connect.c

@@ -16,11 +16,9 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "info/info.h"
-#include "communicator/communicator.h"
-#include "mca/ns/ns.h"
+#include "ompi/info/info.h"
+#include "orte/mca/ns/ns.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_connect = PMPI_Comm_connect

ompi/mpi/c/comm_create.c

@@ -16,9 +16,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_create = PMPI_Comm_create

ompi/mpi/c/comm_create_errhandler.c

@@ -16,10 +16,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "errhandler/errhandler.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_create_errhandler = PMPI_Comm_create_errhandler

ompi/mpi/c/comm_create_keyval.c

@@ -16,10 +16,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "attribute/attribute.h"
-#include "communicator/communicator.h"
+#include "ompi/attribute/attribute.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_create_keyval = PMPI_Comm_create_keyval

ompi/mpi/c/comm_delete_attr.c

@@ -16,10 +16,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "attribute/attribute.h"
-#include "communicator/communicator.h"
+#include "ompi/attribute/attribute.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_delete_attr = PMPI_Comm_delete_attr

ompi/mpi/c/comm_disconnect.c

@@ -16,9 +16,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_disconnect = PMPI_Comm_disconnect

ompi/mpi/c/comm_dup.c

@@ -16,9 +16,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_dup = PMPI_Comm_dup

ompi/mpi/c/comm_f2c.c

@@ -16,11 +16,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
 #include "mpi/f77/fint_2_int.h"
-#include "errhandler/errhandler.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_f2c = PMPI_Comm_f2c

ompi/mpi/c/comm_free.c

@@ -16,9 +16,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_free = PMPI_Comm_free

ompi/mpi/c/comm_free_keyval.c

@@ -16,10 +16,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "attribute/attribute.h"
-#include "communicator/communicator.h"
+#include "ompi/attribute/attribute.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_free_keyval = PMPI_Comm_free_keyval

ompi/mpi/c/comm_get_attr.c

@@ -16,10 +16,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "attribute/attribute.h"
-#include "communicator/communicator.h"
+#include "ompi/attribute/attribute.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_get_attr = PMPI_Comm_get_attr

ompi/mpi/c/comm_get_errhandler.c

@@ -16,10 +16,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "errhandler/errhandler.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_get_errhandler = PMPI_Comm_get_errhandler

ompi/mpi/c/comm_get_name.c

@@ -18,11 +18,9 @@
 
 #include <string.h>
 
+#include "mpi/c/bindings.h"
 #include "opal/util/strncpy.h"
 #include "include/totalview.h"
-#include "mpi.h"
-#include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
 #include "opal/threads/mutex.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES

ompi/mpi/c/comm_get_parent.c

@@ -16,9 +16,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_get_parent = PMPI_Comm_get_parent

ompi/mpi/c/comm_group.c

@@ -16,9 +16,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_group = PMPI_Comm_group

ompi/mpi/c/comm_join.c

@@ -30,10 +30,9 @@
 #include <netinet/in.h>
 #endif
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "mca/ns/ns.h"
+#include "orte/mca/ns/ns.h"
+#include "ompi/proc/proc.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_join = PMPI_Comm_join

ompi/mpi/c/comm_rank.c

@@ -16,9 +16,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_rank = PMPI_Comm_rank

ompi/mpi/c/comm_remote_group.c

@@ -17,9 +17,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_remote_group = PMPI_Comm_remote_group

ompi/mpi/c/comm_remote_size.c

@@ -16,9 +16,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_remote_size = PMPI_Comm_remote_size

ompi/mpi/c/comm_set_attr.c

@@ -16,10 +16,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "attribute/attribute.h"
-#include "communicator/communicator.h"
+#include "ompi/attribute/attribute.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_set_attr = PMPI_Comm_set_attr

ompi/mpi/c/comm_set_errhandler.c

@@ -16,10 +16,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "errhandler/errhandler.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_set_errhandler = PMPI_Comm_set_errhandler

ompi/mpi/c/comm_set_name.c

@@ -18,11 +18,9 @@
 
 #include <string.h>
 
+#include "mpi/c/bindings.h"
 #include "opal/util/strncpy.h"
 #include "include/totalview.h"
-#include "mpi.h"
-#include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES 
 #pragma weak MPI_Comm_set_name = PMPI_Comm_set_name

ompi/mpi/c/comm_size.c

@@ -16,9 +16,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_size = PMPI_Comm_size

ompi/mpi/c/comm_spawn.c

@@ -16,11 +16,9 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "mca/oob/oob.h"
-#include "info/info.h"
-#include "communicator/communicator.h"
+#include "orte/mca/oob/oob.h"
+#include "ompi/info/info.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_spawn = PMPI_Comm_spawn

ompi/mpi/c/comm_spawn_multiple.c

@@ -16,10 +16,8 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "info/info.h"
-#include "communicator/communicator.h"
+#include "ompi/info/info.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_spawn_multiple = PMPI_Comm_spawn_multiple

ompi/mpi/c/comm_split.c

@@ -16,9 +16,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_split = PMPI_Comm_split

ompi/mpi/c/comm_test_inter.c

@@ -16,9 +16,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_test_inter = PMPI_Comm_test_inter

ompi/mpi/c/dims_create.c

@@ -16,10 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Dims_create = PMPI_Dims_create

ompi/mpi/c/errhandler_c2f.c

@@ -16,11 +16,8 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
 #include "mpi/f77/fint_2_int.h"
-#include "errhandler/errhandler.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Errhandler_c2f = PMPI_Errhandler_c2f

ompi/mpi/c/errhandler_create.c

@@ -16,7 +16,6 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES

ompi/mpi/c/errhandler_f2c.c

@@ -16,11 +16,8 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
 #include "mpi/f77/fint_2_int.h"
-#include "errhandler/errhandler.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Errhandler_f2c = PMPI_Errhandler_f2c

ompi/mpi/c/errhandler_free.c

@@ -16,10 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "errhandler/errhandler.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Errhandler_free = PMPI_Errhandler_free

ompi/mpi/c/errhandler_get.c

@@ -16,10 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Errhandler_get = PMPI_Errhandler_get

ompi/mpi/c/errhandler_set.c

@@ -16,10 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Errhandler_set = PMPI_Errhandler_set

ompi/mpi/c/error_class.c

@@ -16,10 +16,8 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "errhandler/errcode.h"
-#include "communicator/communicator.h"
+#include "ompi/errhandler/errcode.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Error_class = PMPI_Error_class

ompi/mpi/c/error_string.c

@@ -16,11 +16,8 @@
 #include "ompi_config.h"
 #include <string.h>
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
 #include "errhandler/errcode.h"
-#include "errhandler/errhandler.h"
-#include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Error_string = PMPI_Error_string

ompi/mpi/c/exscan.c

@@ -16,13 +16,9 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
-#include "datatype/datatype.h"
 #include "mpi/c/bindings.h"
-#include "mca/coll/coll.h"
-#include "errhandler/errhandler.h"
-#include "communicator/communicator.h"
-#include "op/op.h"
+#include "ompi/datatype/datatype.h"
+#include "ompi/op/op.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Exscan = PMPI_Exscan

ompi/mpi/c/file_c2f.c

@@ -16,12 +16,9 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
 #include "mpi/f77/fint_2_int.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "file/file.h"
+#include "ompi/file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_c2f = PMPI_File_c2f

ompi/mpi/c/file_call_errhandler.c

@@ -16,11 +16,8 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "errhandler/errhandler.h"
-#include "communicator/communicator.h"
-#include "file/file.h"
+#include "ompi/file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_call_errhandler = PMPI_File_call_errhandler

ompi/mpi/c/file_close.c

@@ -16,11 +16,8 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "file/file.h"
+#include "ompi/file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_close = PMPI_File_close

ompi/mpi/c/file_create_errhandler.c

@@ -16,11 +16,8 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "file/file.h"
+#include "ompi/file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_create_errhandler = PMPI_File_create_errhandler

ompi/mpi/c/file_delete.c

@@ -16,14 +16,11 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "info/info.h"
-#include "file/file.h"
-#include "mca/io/io.h"
-#include "mca/io/base/base.h"
+#include "ompi/info/info.h"
+#include "ompi/file/file.h"
+#include "ompi/mca/io/io.h"
+#include "ompi/mca/io/base/base.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_delete = PMPI_File_delete

ompi/mpi/c/file_f2c.c

@@ -16,12 +16,9 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
 #include "mpi/f77/fint_2_int.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "file/file.h"
+#include "ompi/file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_f2c = PMPI_File_f2c

ompi/mpi/c/file_get_amode.c

@@ -16,11 +16,8 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "file/file.h"
+#include "ompi/file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_get_amode = PMPI_File_get_amode

ompi/mpi/c/file_get_atomicity.c

@@ -16,12 +16,9 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "file/file.h"
-#include "datatype/datatype.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

ompi/mpi/c/file_get_byte_offset.c

@@ -16,12 +16,9 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "file/file.h"
-#include "datatype/datatype.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

ompi/mpi/c/file_get_errhandler.c

@@ -16,11 +16,8 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "file/file.h"
+#include "ompi/file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_get_errhandler = PMPI_File_get_errhandler

ompi/mpi/c/file_get_group.c

@@ -16,11 +16,8 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "file/file.h"
+#include "ompi/file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_get_group = PMPI_File_get_group

ompi/mpi/c/file_get_info.c

@@ -16,11 +16,8 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "file/file.h"
+#include "ompi/file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_get_info = PMPI_File_get_info

ompi/mpi/c/file_get_position.c

@@ -16,11 +16,8 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "file/file.h"
+#include "ompi/file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_get_position = PMPI_File_get_position

ompi/mpi/c/file_get_position_shared.c

@@ -16,11 +16,8 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "file/file.h"
+#include "ompi/file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_get_position_shared = PMPI_File_get_position_shared

ompi/mpi/c/file_get_size.c

@@ -16,11 +16,8 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "file/file.h"
+#include "ompi/file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_get_size = PMPI_File_get_size

ompi/mpi/c/file_get_type_extent.c

@@ -16,11 +16,8 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "file/file.h"
+#include "ompi/file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_get_type_extent = PMPI_File_get_type_extent

ompi/mpi/c/file_get_view.c

@@ -16,11 +16,8 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "file/file.h"
+#include "ompi/file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_get_view = PMPI_File_get_view

ompi/mpi/c/file_iread.c

@@ -16,14 +16,11 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
-#include "datatype/datatype.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "file/file.h"
-#include "mca/io/io.h"
-#include "mca/io/base/io_base_request.h"
+#include "ompi/datatype/datatype.h"
+#include "ompi/file/file.h"
+#include "ompi/mca/io/io.h"
+#include "ompi/mca/io/base/io_base_request.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_iread = PMPI_File_iread

ompi/mpi/c/file_iread_at.c

@@ -16,14 +16,11 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
-#include "datatype/datatype.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "file/file.h"
-#include "mca/io/io.h"
-#include "mca/io/base/io_base_request.h"
+#include "ompi/datatype/datatype.h"
+#include "ompi/file/file.h"
+#include "ompi/mca/io/io.h"
+#include "ompi/mca/io/base/io_base_request.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_iread_at = PMPI_File_iread_at

ompi/mpi/c/file_iread_shared.c

@@ -16,14 +16,11 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
-#include "datatype/datatype.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "file/file.h"
-#include "mca/io/io.h"
-#include "mca/io/base/io_base_request.h"
+#include "ompi/datatype/datatype.h"
+#include "ompi/file/file.h"
+#include "ompi/mca/io/io.h"
+#include "ompi/mca/io/base/io_base_request.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_iread_shared = PMPI_File_iread_shared

ompi/mpi/c/file_iwrite.c

@@ -16,14 +16,11 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
-#include "datatype/datatype.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "file/file.h"
-#include "mca/io/io.h"
-#include "mca/io/base/io_base_request.h"
+#include "ompi/datatype/datatype.h"
+#include "ompi/file/file.h"
+#include "ompi/mca/io/io.h"
+#include "ompi/mca/io/base/io_base_request.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_iwrite = PMPI_File_iwrite

ompi/mpi/c/file_iwrite_at.c

@@ -16,14 +16,11 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
-#include "datatype/datatype.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "file/file.h"
-#include "mca/io/io.h"
-#include "mca/io/base/io_base_request.h"
+#include "ompi/datatype/datatype.h"
+#include "ompi/file/file.h"
+#include "ompi/mca/io/io.h"
+#include "ompi/mca/io/base/io_base_request.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_iwrite_at = PMPI_File_iwrite_at

ompi/mpi/c/file_iwrite_shared.c

@@ -16,14 +16,11 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
-#include "datatype/datatype.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "file/file.h"
-#include "mca/io/io.h"
-#include "mca/io/base/io_base_request.h"
+#include "ompi/datatype/datatype.h"
+#include "ompi/file/file.h"
+#include "ompi/mca/io/io.h"
+#include "ompi/mca/io/base/io_base_request.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_iwrite_shared = PMPI_File_iwrite_shared

ompi/mpi/c/file_open.c

@@ -16,14 +16,11 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "info/info.h"
-#include "file/file.h"
-#include "mca/io/io.h"
-#include "mca/io/base/base.h"
+#include "ompi/info/info.h"
+#include "ompi/file/file.h"
+#include "ompi/mca/io/io.h"
+#include "ompi/mca/io/base/base.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_open = PMPI_File_open

ompi/mpi/c/file_preallocate.c

@@ -16,11 +16,8 @@
 
 #include "ompi_config.h"
 
-#include "mpi.h"
 #include "mpi/c/bindings.h"
-#include "communicator/communicator.h"
-#include "errhandler/errhandler.h"
-#include "file/file.h"
+#include "ompi/file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_preallocate = PMPI_File_preallocate