ompi: resolve header dependency issues

This commit resolves issues discovered when sorting includes. This includes
missing header files and one header dependency loop. There may be others but
they are not exposed by an alphabetical include order.

Signed-off-by: Nathan Hjelm <[email protected]>

Author: hjelmn

ompi/datatype/ompi_datatype_internal.h

@@ -29,6 +29,7 @@
 #define OMPI_DATATYPE_INTERNAL_H
 
 #include "opal/datatype/opal_datatype_internal.h"
+#include "ompi/datatype/ompi_datatype.h"
 
 /*
  * This is the OMPI-layered numbering of ALL supported MPI types

ompi/mca/coll/adapt/coll_adapt_topocache.h

@@ -13,6 +13,8 @@
 #ifndef MCA_COLL_ADAPT_TOPOCACHE_H
 #define MCA_COLL_ADAPT_TOPOCACHE_H
 
+#include "ompi/communicator/communicator.h"
+#include "ompi/mca/coll/adapt/coll_adapt.h"
 #include "opal/class/opal_list.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/coll_base_topo.h"

ompi/mca/coll/han/coll_han_dynamic.h

@@ -21,8 +21,6 @@
 #include "ompi/mca/mca.h"
 #include "opal/util/output.h"
 #include "ompi/mca/coll/base/coll_base_functions.h"
-#include "ompi/mca/coll/han/coll_han.h"
-
 
 /*
  * @file

ompi/mca/common/monitoring/common_monitoring_coll.h

@@ -19,6 +19,7 @@ BEGIN_C_DECLS
 
 #include "ompi_config.h"
 #include "opal/mca/base/mca_base_pvar.h"
+#include "ompi/mca/common/monitoring/common_monitoring.h"
 
 OMPI_DECLSPEC void mca_common_monitoring_coll_flush(FILE *pf, mca_monitoring_coll_data_t*data);
 

ompi/mca/osc/rdma/osc_rdma_sync.h

@@ -13,6 +13,8 @@
 #if !defined(OSC_RDMA_SYNC_H)
 #define OSC_RDMA_SYNC_H
 
+#include "ompi/group/group.h"
+#include "opal/mca/btl/btl.h"
 #include "osc_rdma_types.h"
 #include "opal/class/opal_object.h"
 #include "opal/mca/threads/threads.h"

ompi/mca/pml/ob1/pml_ob1_component.h

@@ -20,6 +20,8 @@
 #ifndef MCA_PML_OB1_COMPONENT_H
 #define MCA_PML_OB1_COMPONENT_H
 
+#include "ompi/mca/pml/pml.h"
+
 BEGIN_C_DECLS
 
 /*

ompi/mca/pml/ob1/pml_ob1_rdma.h

@@ -25,6 +25,9 @@
 #ifndef MCA_PML_OB1_RDMA_H
 #define MCA_PML_OB1_RDMA_H
 
+#include "ompi/mca/bml/bml.h"
+#include "ompi/mca/pml/ob1/pml_ob1_comm.h"
+
 struct mca_bml_base_endpoint_t;
 
 /*

ompi/mca/pml/ob1/pml_ob1_recvfrag.h

@@ -28,7 +28,8 @@
 #ifndef MCA_PML_OB1_RECVFRAG_H
 #define MCA_PML_OB1_RECVFRAG_H
 
-#include "pml_ob1_hdr.h"
+#include "ompi/mca/pml/ob1/pml_ob1_comm.h"
+#include "ompi/mca/pml/ob1/pml_ob1_hdr.h"
 
 BEGIN_C_DECLS
 

ompi/mca/vprotocol/pessimist/vprotocol_pessimist_eventlog.h

@@ -11,6 +11,7 @@
 #ifndef __VPROTOCOL_PESSIMIST_EVENTLOG_H__
 #define __VPROTOCOL_PESSIMIST_EVENTLOG_H__
 
+#include "ompi/mca/pml/v/pml_v_output.h"
 #include "vprotocol_pessimist.h"
 #include "vprotocol_pessimist_request.h"
 #include "vprotocol_pessimist_eventlog_protocol.h"