Preparation work for another commit (after RFC):

- This patch solely _adds_ required headers and is rather localized
   The next patch (after RFC) heavily removes headers (based on script)
 - ompi/communicator/communicator.h: For sources that use
   ompi_mpi_comm_world, don't require them to include "mpi.h"
 - ompi/debuggers/ompi_common_dll.c: mca_topo_base_comm_1_0_0_t needs
   #include "ompi/mca/topo/topo.h"
 - ompi/errhandler/errhandler_predefined.h:
   ompi/communicator/communicator.h depends on this header file!
   To prevent recursion just have fwd declarations.
   #include "ompi/types.h" for fwd declarations of the main structs.
 - ompi/mca/btl/btl.h: #include "opal/types.h" for ompi_ptr_t 
 - ompi/mca/mpool/base/mpool_base_tree.c: We use ompi_free_list_t and
   ompi_rb_tree_t, so have the proper classes
 - ompi/mca/op/op.h:
   Op is pretty self-contained: Nobody up to now has done
   #include "opal/class/opal_object.h"
 - ompi/mca/osc/pt2pt/osc_pt2pt_replyreq.h:
   #include "opal/types.h" for ompi_ptr_t 
 - ompi/mca/pml/base/base.h:
   We use opal_lists  
 - ompi/mca/pml/dr/pml_dr_vfrag.h:
   #include "opal/types.h" for ompi_ptr_t
 - ompi/mca/pml/ob1/pml_ob1_hdr.h:
   #include "ompi/mca/btl/btl.h" for mca_btl_base_segment_t
 - opal/dss/dss_unpack.c:
   #include "opal/types.h"
 - opal/mca/base/base.h:
   #include "opal/util/cmd_line.h" for opal_cmd_line_t
 - orte/mca/oob/tcp/oob_tcp.c:
   #include "opal/types.h" for opal_socklen_t
 - orte/mca/oob/tcp/oob_tcp.h:
   #include "opal/threads/threads.h" for opal_thread_t
 - orte/mca/oob/tcp/oob_tcp_msg.c:
   #include "opal/types.h" 
 - orte/mca/oob/tcp/oob_tcp_peer.c:
   #include "opal/types.h"  for opal_socklen_t
 - orte/mca/oob/tcp/oob_tcp_send.c:
   #include "opal/types.h" 
 - orte/mca/plm/base/plm_base_proxy.c:
   #include "orte/util/name_fns.h" for ORTE_NAME_PRINT
 - orte/mca/rml/base/rml_base_receive.c:
   #include "opal/util/output.h" for OPAL_OUTPUT_VERBOSE
 - orte/mca/rml/oob/rml_oob_recv.c:
   #include "opal/types.h" for ompi_iov_base_ptr_t
 - orte/mca/rml/oob/rml_oob_send.c:
   #include "opal/types.h" for ompi_iov_base_ptr_t
 - orte/runtime/orte_data_server.c
   #include "opal/util/output.h" for OPAL_OUTPUT_VERBOSE
 - orte/runtime/orte_globals.h:
   #include "orte/util/name_fns.h" for ORTE_NAME_PRINT

 Tested on Linux/x86-64

This commit was SVN r20817.

ompi/communicator/communicator.h

@@ -229,6 +229,8 @@ struct ompi_predefined_communicator_t {
 typedef struct ompi_predefined_communicator_t ompi_predefined_communicator_t;
 
 OMPI_DECLSPEC extern ompi_communicator_t *ompi_mpi_comm_parent;
+OMPI_DECLSPEC extern ompi_predefined_communicator_t ompi_mpi_comm_world;
+OMPI_DECLSPEC extern ompi_predefined_communicator_t ompi_mpi_comm_self;
 OMPI_DECLSPEC extern ompi_predefined_communicator_t ompi_mpi_comm_null;
 
 

ompi/debuggers/ompi_common_dll.c

@@ -36,6 +36,7 @@
 #include "ompi_config.h"
 
 #include "ompi_common_dll_defs.h"
+#include "ompi/mca/topo/topo.h"
 
 /* Basic callbacks into the debugger */
 const mqs_basic_callbacks *mqs_basic_entrypoints;

ompi/errhandler/errhandler_predefined.h

@@ -20,6 +20,7 @@
 #define OMPI_ERRHANDLER_PREDEFINED_H
 
 #include "ompi_config.h"
+#include "ompi/types.h"
 
 /**
  * Handler function for MPI_ERRORS_ARE_FATAL

ompi/mca/btl/btl.h

@@ -115,6 +115,7 @@
 #include "opal/prefetch.h" /* For OPAL_LIKELY */
 #include "ompi/mca/mpool/mpool.h"
 #include "ompi/types.h"
+#include "opal/types.h"
 
 #include "opal/mca/crs/crs.h"
 #include "opal/mca/crs/base/base.h"

ompi/mca/mpool/base/mpool_base_tree.c

@@ -30,6 +30,8 @@
 #include "orte/util/proc_info.h"
 #include "orte/runtime/orte_globals.h"
 #include "ompi/runtime/params.h"
+#include "ompi/class/ompi_free_list.h"
+#include "ompi/class/ompi_rb_tree.h"
 #include "mpool_base_tree.h"
 
 

ompi/mca/op/op.h

@@ -75,12 +75,14 @@
  * close all available op components.
  */
 
-#include "ompi_config.h"
-#include "opal/mca/mca.h"
-
 #ifndef MCA_OP_H
 #define MCA_OP_H
 
+#include "ompi_config.h"
+
+#include "opal/class/opal_object.h"
+#include "opal/mca/mca.h"
+
 /*
  * This file includes some basic struct declarations (but not
  * definitions) just so that we can avoid including files like op/op.h

ompi/mca/osc/pt2pt/osc_pt2pt_replyreq.h

@@ -20,6 +20,7 @@
 #include "osc_pt2pt.h"
 #include "osc_pt2pt_longreq.h"
 
+#include "opal/types.h"
 #include "opal/class/opal_list.h"
 #include "opal/threads/mutex.h"
 #include "ompi/datatype/datatype.h"

ompi/mca/pml/base/base.h

@@ -24,6 +24,7 @@
 
 #include "opal/mca/mca.h"
 #include "ompi/mca/pml/pml.h"
+#include "opal/class/opal_list.h"
 #include "opal/class/opal_pointer_array.h"
 
 /*

ompi/mca/pml/dr/pml_dr_vfrag.h

@@ -23,6 +23,7 @@
 
 #include "ompi_config.h"
 #include "opal/event/event.h"
+#include "opal/types.h"
 #include "pml_dr.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)

ompi/mca/pml/ob1/pml_ob1_hdr.h

@@ -30,8 +30,9 @@
 #endif
 
 #include "opal/types.h"
-#include "ompi/proc/proc.h"
 #include "opal/util/arch.h"
+#include "ompi/mca/btl/btl.h"
+#include "ompi/proc/proc.h"
 
 #define MCA_PML_OB1_HDR_TYPE_MATCH     (MCA_BTL_TAG_PML + 1)
 #define MCA_PML_OB1_HDR_TYPE_RNDV      (MCA_BTL_TAG_PML + 2)

opal/dss/dss_unpack.c

@@ -17,6 +17,7 @@
  */
 
 #include "opal_config.h"
+#include "opal/types.h"
 #include "opal/util/output.h"
 #include "opal/dss/dss_internal.h"
 

opal/mca/base/base.h

@@ -23,12 +23,14 @@
 #include "opal_config.h"
 
 #include "opal/class/opal_object.h"
+#include "opal/class/opal_list.h"
 
 /*
  * These units are large enough to warrant their own .h files
  */
 #include "opal/mca/mca.h"
 #include "opal/mca/base/mca_base_param.h"
+#include "opal/util/cmd_line.h"
 
 BEGIN_C_DECLS
 

orte/mca/oob/tcp/oob_tcp.c

@@ -26,6 +26,7 @@
 
 #include "orte_config.h"
 #include "orte/types.h"
+#include "opal/types.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

orte/mca/oob/tcp/oob_tcp.h

@@ -35,6 +35,7 @@
 #include "opal/runtime/opal_cr.h"
 #include "opal/threads/mutex.h"
 #include "opal/threads/condition.h"
+#include "opal/threads/threads.h"
 #include "opal/mca/timer/base/base.h"
 
 #include "orte/mca/oob/oob.h"

orte/mca/oob/tcp/oob_tcp_msg.c

@@ -25,6 +25,7 @@
 
 #include "orte_config.h"
 #include "orte/constants.h"
+#include "opal/types.h"
 
 #include "opal/opal_socket_errno.h"
 

orte/mca/oob/tcp/oob_tcp_send.c

@@ -19,6 +19,7 @@
  */
 #include "orte_config.h"
 #include "orte/types.h"
+#include "opal/types.h"
 
 #include "orte/util/name_fns.h"
 #include "orte/runtime/orte_globals.h"

orte/mca/plm/base/plm_base_proxy.c

@@ -22,6 +22,7 @@
 #include "orte/constants.h"
 
 #include "opal/dss/dss.h"
+#include "orte/util/name_fns.h"
 #include "orte/mca/rml/rml.h"
 #include "orte/mca/rml/rml_types.h"
 #include "orte/mca/rml/base/rml_contact.h"

orte/mca/rml/base/rml_base_receive.c

@@ -30,6 +30,7 @@
 #include "orte/types.h"
 
 #include "opal/dss/dss.h"
+#include "opal/util/output.h"
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/runtime/orte_globals.h"
 #include "orte/runtime/orte_wait.h"

orte/mca/rml/oob/rml_oob_recv.c

@@ -7,7 +7,7 @@
  */
 
 #include "orte_config.h"
-
+#include "opal/types.h"
 
 #include "orte/mca/rml/base/base.h"
 #include "orte/mca/rml/rml_types.h"

orte/mca/rml/oob/rml_oob_send.c

@@ -17,7 +17,7 @@
  */
 
 #include "orte_config.h"
-
+#include "opal/types.h"
 
 #include "orte/mca/routed/routed.h"
 #include "opal/dss/dss.h"

orte/runtime/orte_data_server.c

@@ -26,6 +26,7 @@
 #endif
 
 #include "opal/mca/base/mca_base_param.h"
+#include "opal/util/output.h"
 #include "opal/threads/mutex.h"
 #include "opal/threads/condition.h"
 #include "opal/class/opal_pointer_array.h"

orte/runtime/orte_globals.h

@@ -41,6 +41,7 @@
 #include "orte/mca/plm/plm_types.h"
 #include "orte/mca/rmaps/rmaps_types.h"
 #include "orte/util/proc_info.h"
+#include "orte/util/name_fns.h"
 #include "orte/runtime/runtime.h"
 #include "orte/runtime/orte_wait.h"