Correct the includes and some indentation.

This commit was SVN r7322.

ompi/communicator/comm.c

@@ -17,7 +17,6 @@
 #include "ompi_config.h"
 #include <string.h>
 #include <stdio.h>
-#include "mpi.h"
 
 #include "ompi/include/constants.h"
 #include "dps/dps.h"
@@ -34,7 +33,7 @@
 #include "communicator/communicator.h"
 #include "mca/pml/pml.h"
 #include "mca/ptl/base/ptl_base_comm.h"
-
+#include "request/request.h"
 
 /*
 ** sort-function for MPI_Comm_split 

ompi/communicator/comm_cid.c

@@ -15,7 +15,6 @@
  */
 
 #include "ompi_config.h"
-#include "mpi.h"
 
 #include "dps/dps.h"
 #include "opal/util/convert.h"
@@ -26,9 +25,9 @@
 #include "class/ompi_pointer_array.h"
 #include "opal/class/opal_list.h"
 #include "mca/pml/pml.h"
-#include "mca/coll/coll.h"
 #include "mca/coll/base/base.h"
 #include "mca/rml/rml.h"
+#include "ompi/request/request.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {

ompi/communicator/comm_dyn.c

@@ -24,11 +24,10 @@
 #include <unistd.h>
 #endif
 
-#include "mpi.h"
 #include "dps/dps.h"
-#include "communicator/communicator.h"
+#include "ompi/communicator/communicator.h"
+#include "ompi/request/request.h"
 #include "errhandler/errhandler.h"
-#include "group/group.h"
 #include "proc/proc.h"
 #include "info/info.h"
 #include "opal/threads/mutex.h"
@@ -39,11 +38,9 @@
 #include "mca/pml/pml.h"
 #include "mca/ns/ns.h"
 #include "mca/gpr/gpr.h"
-#include "mca/oob/oob_types.h"
 #include "mca/errmgr/errmgr.h"
 #include "mca/rmgr/rmgr.h"
 
-#include "mca/pml/pml.h"
 #include "mca/rml/rml.h"
 
 #include "runtime/runtime.h"
@@ -73,10 +70,9 @@ int ompi_comm_connect_accept ( ompi_communicator_t *comm, int root,
            exchange that.
         */
 	    if ( OMPI_COMM_JOIN_TAG != (int)tag ) {
-	    rport = ompi_comm_get_rport (port,send_first,
+	        rport = ompi_comm_get_rport( port,send_first,
                                          group->grp_proc_pointers[rank], tag);
-	}
+	    } else {
-	else {
 	        rport = port;
 	    }
 	
@@ -106,8 +102,7 @@ int ompi_comm_connect_accept ( ompi_communicator_t *comm, int root,
 	    if ( send_first ) {
 	        rc = orte_rml.send_buffer(rport, nbuf, tag, 0);
 	        rc = orte_rml.recv_buffer(rport, nrbuf, tag);
-	}
+	    } else {
-	else {
 	        rc = orte_rml.recv_buffer(rport, nrbuf, tag);
 	        rc = orte_rml.send_buffer(rport, nbuf, tag, 0);
 	    }
@@ -258,7 +253,6 @@ orte_process_name_t *ompi_comm_get_rport (orte_process_name_t *port, int send_fi
     ompi_proc_t *rproc=NULL;
     bool isnew = false;
 
-
     if ( send_first ) {
         orte_buffer_t *sbuf;