- On the way to get the BTLs split out and lessen dependency on orte:

Often, orte/util/show_help.h is included, although no functionality
   is required -- instead, most often opal_output.h, or               
   orte/mca/rml/rml_types.h                                           
   Please see orte_show_help_replacement.sh commited next.            

 - Local compilation (Linux/x86_64) w/ -Wimplicit-function-declaration
   actually showed two *missing* #include "orte/util/show_help.h"     
   in orte/mca/odls/base/odls_base_default_fns.c and                  
   in orte/tools/orte-top/orte-top.c                                  
   Manually added these.                                              

   Let's have MTT the last word.

This commit was SVN r20557.

ompi/class/ompi_free_list.c

@@ -22,8 +22,8 @@
 
 #include "ompi/class/ompi_free_list.h"
 #include "opal/include/opal/align.h"
+#include "opal/util/output.h"
 #include "opal/sys/cache.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/mpool/mpool.h"
 
 static void ompi_free_list_construct(ompi_free_list_t* fl);

ompi/class/ompi_seq_tracker.c

@@ -20,7 +20,6 @@
 
 #include "ompi/class/ompi_seq_tracker.h"
 #include "opal/sys/cache.h"
-#include "orte/util/show_help.h"
 
 
 

ompi/communicator/comm.c

@@ -26,11 +26,12 @@
 
 #include "opal/dss/dss.h"
 #include "orte/util/name_fns.h"
+#include "orte/mca/rml/rml_types.h"
 
 #include "ompi/proc/proc.h"
 #include "opal/threads/mutex.h"
 #include "opal/util/bit_ops.h"
-#include "orte/util/show_help.h"
+#include "opal/util/output.h"
 #include "opal/util/convert.h"
 #include "ompi/mca/topo/topo.h"
 #include "ompi/mca/topo/base/base.h"

ompi/datatype/copy_functions_heterogeneous.c

@@ -12,7 +12,6 @@
 
 #include "ompi_config.h"
 
-#include "orte/util/show_help.h"
 #include "opal/util/arch.h"
 
 #include "opal/types.h"

ompi/datatype/datatype_internal.h

@@ -23,7 +23,7 @@
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif  /* HAVE_STRING_H */
-#include "orte/util/show_help.h"
+#include "opal/util/output.h"
 
 extern int ompi_ddt_dfd;
 

ompi/errhandler/errhandler_predefined.c

@@ -38,6 +38,7 @@
 #include "ompi/win/win.h"
 #include "orte/runtime/runtime.h"
 #include "opal/util/printf.h"
+#include "opal/util/output.h"
 
 /*
  * Local functions

ompi/file/file.c

@@ -22,10 +22,10 @@
 
 #include "ompi/file/file.h"
 #include "opal/class/opal_list.h"
+#include "opal/util/output.h"
 #include "ompi/runtime/params.h"
 #include "ompi/mca/io/base/base.h"
 #include "ompi/info/info.h"
-#include "orte/util/show_help.h"
 
 /*
  * Table for Fortran <-> C file handle conversion

ompi/group/group.h

@@ -28,9 +28,9 @@
 #ifndef OMPI_GROUP_H
 #define OMPI_GROUP_H
 
-#include "orte/util/show_help.h"
 #include "mpi.h"
 #include "opal/class/opal_pointer_array.h"
+#include "opal/util/output.h"
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif

ompi/info/info.c

@@ -19,6 +19,7 @@
  */
 
 #include "ompi_config.h"
+#include "opal/util/output.h"
 
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -33,7 +34,6 @@
 #include "ompi/constants.h"
 #include "ompi/info/info.h"
 #include "ompi/runtime/params.h"
-#include "orte/util/show_help.h"
 
 
 /*

ompi/mca/bml/base/bml_base_btl.h

@@ -23,7 +23,6 @@
 
 #include "opal/mca/mca.h"
 
-#include "orte/util/show_help.h" 
 
 /*
  * Global functions for the BML

ompi/mca/bml/r2/bml_r2.c

@@ -26,6 +26,7 @@
 #include <string.h>
 
 #include "opal/util/argv.h"
+#include "opal/util/output.h"
 #include "orte/util/show_help.h"
 #include "ompi/class/ompi_bitmap.h"
 #include "ompi/mca/bml/bml.h"

ompi/mca/bml/r2/bml_r2_ft.c

@@ -20,11 +20,11 @@
  */
 
 #include "ompi_config.h"
+#include "opal/util/output.h"
 
 #include <stdlib.h>
 #include <string.h>
 
-#include "orte/util/show_help.h"
 #include "ompi/runtime/ompi_cr.h"
 #include "ompi/class/ompi_bitmap.h"
 #include "ompi/mca/bml/bml.h"

ompi/mca/bml/r2/bml_r2_ft.h

@@ -21,7 +21,6 @@
 #ifndef MCA_BML_R2_FT_H
 #define MCA_BML_R2_FT_H
 
-#include "orte/util/show_help.h"
 #include "ompi/mca/btl/btl.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)

ompi/mca/btl/base/btl_base_error.h

@@ -28,7 +28,6 @@
 
 #include "orte/util/proc_info.h"
 #include "orte/util/name_fns.h"
-#include "orte/util/show_help.h"
 #include "orte/runtime/orte_globals.h"
 
 OMPI_DECLSPEC extern int mca_btl_base_verbose;

ompi/mca/btl/base/btl_base_mca.c

@@ -24,8 +24,8 @@
 #include <stdio.h>
 
 #include "opal/mca/base/mca_base_param.h"
+#include "opal/util/output.h"
 
-#include "orte/util/show_help.h"
 
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"

ompi/mca/btl/base/btl_base_open.c

@@ -23,10 +23,9 @@
 #include <stdio.h>
 
 #include "opal/mca/mca.h"
+#include "opal/util/output.h"
 #include "opal/mca/base/base.h"
-#include "orte/util/show_help.h"
 
-#include "orte/util/show_help.h"
 
 #include "opal/mca/base/mca_base_param.h"
 #include "ompi/mca/pml/pml.h"

ompi/mca/btl/base/btl_base_select.c

@@ -20,6 +20,7 @@
 #include "ompi_config.h"
 
 #include "opal/util/argv.h"
+#include "opal/util/output.h"
 #include "orte/util/show_help.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"

ompi/mca/btl/elan/btl_elan.c

@@ -10,8 +10,8 @@
  */
 
 #include "ompi_config.h"
-#include "orte/util/show_help.h"
 #include "opal/util/if.h"
+#include "opal/util/output.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/communicator/communicator.h"

ompi/mca/btl/elan/btl_elan.h

@@ -23,7 +23,6 @@
 #include "opal/event/event.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/btl/base/btl_base_error.h"
 
 #include "ompi/mca/btl/btl.h"

ompi/mca/btl/elan/btl_elan_component.c

@@ -14,8 +14,8 @@
 #include "ompi/constants.h"
 #include "opal/event/event.h"
 #include "opal/util/if.h"
+#include "opal/util/output.h"
 #include "opal/util/argv.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 

ompi/mca/btl/gm/btl_gm.c

@@ -19,8 +19,8 @@
 
 #include "ompi_config.h"
 #include <string.h>
-#include "orte/util/show_help.h"
 #include "opal/util/if.h"
+#include "opal/util/output.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 

ompi/mca/btl/gm/btl_gm.h

@@ -34,7 +34,6 @@
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/mpool/mpool.h" 
 #include "ompi/mca/btl/btl.h"
 #include "btl_gm_endpoint.h"

ompi/mca/btl/gm/btl_gm_component.c

@@ -22,8 +22,8 @@
 #include "ompi/constants.h"
 #include "opal/event/event.h"
 #include "opal/util/if.h"
+#include "opal/util/output.h"
 #include "opal/util/argv.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/request/request.h"

ompi/mca/btl/mx/btl_mx.h

@@ -28,7 +28,6 @@
 /* Open MPI includes */
 #include "ompi/class/ompi_free_list.h"
 #include "ompi/class/ompi_bitmap.h"
-#include "orte/util/show_help.h"
 #include "opal/event/event.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"

ompi/mca/btl/ofud/btl_ofud.c

@@ -23,7 +23,7 @@
 
 #include "ompi_config.h"
 #include "opal/prefetch.h"
-#include "orte/util/show_help.h"
+#include "opal/util/output.h"
 #include "ompi/datatype/convertor.h"
 #include "ompi/datatype/datatype.h"
 #include "ompi/mca/btl/btl.h"

ompi/mca/btl/ofud/btl_ofud.h

@@ -34,7 +34,6 @@
 
 /* Open MPI includes */
 #include "opal/class/opal_hash_table.h"
-#include "orte/util/show_help.h"
 #include "opal/sys/timer.h"
 #include "ompi/class/ompi_free_list.h"
 #include "ompi/class/ompi_bitmap.h"

ompi/mca/btl/openib/btl_openib.c

@@ -28,6 +28,7 @@
 #include <inttypes.h>
 #include "orte/util/show_help.h"
 #include "opal/util/if.h"
+#include "opal/util/output.h"
 #include "opal/util/arch.h"
 
 #include "ompi/mca/pml/pml.h"

ompi/mca/btl/openib/btl_openib.h

@@ -36,10 +36,10 @@
 #include "ompi/class/ompi_free_list.h"
 #include "ompi/class/ompi_bitmap.h"
 #include "opal/class/opal_pointer_array.h"
+#include "opal/util/output.h"
 #include "opal/event/event.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/mpool/mpool.h"
 #include "ompi/mca/btl/base/btl_base_error.h"
 

ompi/mca/btl/openib/btl_openib_component.c

@@ -47,6 +47,7 @@ const char *ibv_get_sysfs_path(void);
 #include "opal/event/event.h"
 #include "opal/include/opal/align.h"
 #include "opal/util/if.h"
+#include "opal/util/output.h"
 #include "opal/util/argv.h"
 #include "opal/sys/timer.h"
 #include "opal/sys/atomic.h"

ompi/mca/btl/openib/btl_openib_fd.c

@@ -34,7 +34,6 @@
 
 #include "opal/class/opal_list.h"
 #include "opal/event/event.h"
-#include "orte/util/show_help.h"
 
 #include "ompi/constants.h"
 

ompi/mca/btl/openib/btl_openib_mca.c

@@ -28,6 +28,7 @@
 #include "opal/mca/installdirs/installdirs.h"
 #include "orte/util/show_help.h"
 #include "opal/util/argv.h"
+#include "opal/util/output.h"
 #include "opal/mca/base/mca_base_param.h"
 #include "btl_openib.h"
 #include "btl_openib_mca.h"

ompi/mca/btl/openib/btl_openib_xrc.c

@@ -16,7 +16,6 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "orte/util/show_help.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"
 #include "btl_openib_xrc.h"

ompi/mca/btl/openib/connect/btl_openib_connect_base.c

@@ -27,6 +27,7 @@
 
 #include "orte/util/show_help.h"
 #include "opal/util/argv.h"
+#include "opal/util/output.h"
 
 /*
  * Array of all possible connection functions

ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c

@@ -259,6 +259,7 @@
 #include <infiniband/cm.h>
 
 #include "opal/util/if.h"
+#include "opal/util/output.h"
 #include "opal/util/error.h"
 #include "opal/event/event.h"
 #include "opal/class/opal_pointer_array.h"

ompi/mca/btl/openib/connect/btl_openib_connect_oob.c

@@ -26,8 +26,10 @@
 #include "opal/dss/dss.h"
 #include "orte/util/show_help.h"
 #include "opal/util/error.h"
+#include "opal/util/output.h"
 #include "orte/mca/oob/base/base.h"
 #include "orte/mca/rml/rml.h"
+#include "orte/mca/rml/rml_types.h"
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/util/name_fns.h"
 #include "orte/runtime/orte_globals.h"

ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c

@@ -29,6 +29,7 @@
 #include <malloc.h>
 
 #include "opal/util/argv.h"
+#include "opal/util/output.h"
 #include "opal/util/error.h"
 #include "orte/util/show_help.h"
 

ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c

@@ -13,9 +13,11 @@
 
 #include "opal/dss/dss.h"
 #include "opal/util/error.h"
+#include "opal/util/output.h"
 #include "orte/util/show_help.h"
 #include "orte/util/name_fns.h"
 #include "orte/mca/rml/rml.h"
+#include "orte/mca/rml/rml_types.h"
 #include "orte/mca/errmgr/errmgr.h"
 #include "ompi/mca/dpm/dpm.h"
 

ompi/mca/btl/sctp/btl_sctp.c

@@ -18,7 +18,6 @@
 
 #include "ompi_config.h"
 #include <string.h>
-#include "orte/util/show_help.h"
 #include "opal/util/if.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"

ompi/mca/btl/sctp/btl_sctp.h

@@ -35,7 +35,6 @@
 
 /* Open MPI includes */
 #include "opal/event/event.h"
-#include "orte/util/show_help.h"
 #include "ompi/class/ompi_bitmap.h"
 #include "ompi/class/ompi_free_list.h"
 #include "ompi/mca/pml/pml.h"

ompi/mca/btl/sctp/btl_sctp_component.c

@@ -48,7 +48,6 @@
 #include "opal/event/event.h"
 #include "opal/util/if.h"
 #include "opal/util/argv.h"
-#include "orte/util/show_help.h"
 #include "orte/mca/oob/base/base.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"

ompi/mca/btl/sctp/btl_sctp_recv_handler.c

@@ -41,7 +41,6 @@
 #include "opal/event/event.h"
 #include "opal/util/if.h"
 #include "opal/util/argv.h"
-#include "orte/util/show_help.h"
 #include "orte/mca/oob/base/base.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"

ompi/mca/btl/self/btl_self.c

@@ -29,7 +29,6 @@
 #include "ompi/datatype/convertor.h"
 #include "ompi/datatype/datatype.h"
 #include "opal/sys/atomic.h"
-#include "orte/util/show_help.h"
 #include "opal/util/if.h"
 #include "orte/util/proc_info.h"
 #include "opal/util/printf.h"

ompi/mca/btl/self/btl_self_component.c

@@ -31,7 +31,6 @@
 #include "opal/event/event.h"
 #include "opal/util/if.h"
 #include "opal/util/argv.h"
-#include "orte/util/show_help.h"
 #include "orte/util/proc_info.h"
 #include "ompi/mca/pml/pml.h"
 #include "opal/mca/base/mca_base_param.h"

ompi/mca/btl/sm/btl_sm.c

@@ -29,8 +29,8 @@
 #include "opal/threads/mutex.h"
 #include "ompi/datatype/convertor.h"
 #include "opal/sys/atomic.h"
-#include "orte/util/show_help.h"
 #include "opal/util/if.h"
+#include "opal/util/output.h"
 #include "opal/mca/carto/carto.h"
 #include "opal/mca/carto/base/base.h"
 #include "opal/mca/paffinity/base/base.h"

ompi/mca/btl/sm/btl_sm_component.c

@@ -42,8 +42,8 @@
 #include "opal/sys/cache.h"
 #include "opal/event/event.h"
 #include "opal/util/if.h"
+#include "opal/util/output.h"
 #include "opal/util/argv.h"
-#include "orte/util/show_help.h"
 #include "orte/util/proc_info.h"
 #include "orte/runtime/orte_globals.h"
 

ompi/mca/btl/tcp/btl_tcp.c

@@ -21,7 +21,6 @@
 
 #include "ompi_config.h"
 #include <string.h>
-#include "orte/util/show_help.h"
 #include "opal/util/if.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"

ompi/mca/btl/tcp/btl_tcp.h

@@ -36,7 +36,6 @@
 
 /* Open MPI includes */
 #include "opal/event/event.h"
-#include "orte/util/show_help.h"
 #include "ompi/class/ompi_bitmap.h"
 #include "ompi/class/ompi_free_list.h"
 #include "ompi/mca/pml/pml.h"

ompi/mca/btl/tcp/btl_tcp_component.c

@@ -48,8 +48,8 @@
 #include "ompi/constants.h"
 #include "opal/event/event.h"
 #include "opal/util/if.h"
+#include "opal/util/output.h"
 #include "opal/util/argv.h"
-#include "orte/util/show_help.h"
 #include "orte/mca/oob/base/base.h"
 #include "orte/types.h"
 #include "ompi/mca/pml/pml.h"

ompi/mca/btl/tcp/btl_tcp_ft.h

@@ -24,7 +24,6 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#include "orte/util/show_help.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {

ompi/mca/btl/template/btl_template.c

@@ -18,7 +18,6 @@
 
 #include "ompi_config.h"
 #include <string.h>
-#include "orte/util/show_help.h"
 #include "opal/util/if.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"

ompi/mca/btl/template/btl_template.h

@@ -32,7 +32,6 @@
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/mpool/mpool.h" 
 #include "ompi/mca/btl/btl.h"
 

ompi/mca/btl/template/btl_template_component.c

@@ -22,7 +22,6 @@
 #include "opal/event/event.h"
 #include "opal/util/if.h"
 #include "opal/util/argv.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 

ompi/mca/btl/udapl/btl_udapl.c

@@ -24,7 +24,6 @@
 #include "ompi_config.h"
 #include <errno.h> 
 #include <string.h>
-#include "orte/util/show_help.h"
 #include "opal/util/if.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"

ompi/mca/btl/udapl/btl_udapl_component.c

@@ -28,7 +28,6 @@
 #include "opal/event/event.h"
 #include "opal/util/if.h"
 #include "opal/util/argv.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/runtime/params.h"

ompi/mca/btl/udapl/btl_udapl_mca.c

@@ -19,7 +19,6 @@
  */
 
 #include "ompi_config.h"
-#include "orte/util/show_help.h"
 #include "opal/mca/base/mca_base_param.h"
 #include "btl_udapl.h"
 #include "btl_udapl_mca.h"

ompi/mca/coll/base/coll_base_comm_select.c

@@ -29,6 +29,7 @@
 #include "mpi.h"
 #include "ompi/communicator/communicator.h"
 #include "opal/util/argv.h"
+#include "opal/util/output.h"
 #include "orte/util/show_help.h"
 #include "opal/class/opal_list.h"
 #include "opal/class/opal_object.h"

ompi/mca/coll/base/coll_base_comm_unselect.c

@@ -24,7 +24,6 @@
 
 #include "mpi.h"
 #include "ompi/communicator/communicator.h"
-#include "orte/util/show_help.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "ompi/mca/coll/coll.h"

ompi/mca/coll/base/coll_base_find_available.c

@@ -26,6 +26,7 @@
 #include "mpi.h"
 #include "ompi/constants.h"
 #include "opal/class/opal_list.h"
+#include "opal/util/output.h"
 #include "orte/util/show_help.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"

ompi/mca/coll/base/coll_base_open.c

@@ -21,12 +21,11 @@
 #include <stdio.h>
 
 #include "ompi/constants.h"
-#include "orte/util/show_help.h"
 #include "opal/mca/mca.h"
+#include "opal/util/output.h"
 #include "opal/mca/base/base.h"
 #include "opal/mca/base/mca_base_param.h"
 
-#include "orte/util/show_help.h"
 
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/base.h"

ompi/mca/coll/demo/coll_demo_allgather.c

@@ -17,10 +17,10 @@
  */
 
 #include "ompi_config.h"
+#include "opal/util/output.h"
 
 #include "mpi.h"
 #include "ompi/constants.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/base.h"
 #include "coll_demo.h"

ompi/mca/coll/demo/coll_demo_allgatherv.c

@@ -17,10 +17,10 @@
  */
 
 #include "ompi_config.h"
+#include "opal/util/output.h"
 
 #include "mpi.h"
 #include "ompi/constants.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/base.h"
 #include "coll_demo.h"

ompi/mca/coll/demo/coll_demo_allreduce.c

@@ -17,10 +17,10 @@
  */
 
 #include "ompi_config.h"
+#include "opal/util/output.h"
 
 #include "mpi.h"
 #include "ompi/constants.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/base.h"
 #include "coll_demo.h"

ompi/mca/coll/demo/coll_demo_alltoall.c

@@ -17,10 +17,10 @@
  */
 
 #include "ompi_config.h"
+#include "opal/util/output.h"
 
 #include "mpi.h"
 #include "ompi/constants.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/base.h"
 #include "coll_demo.h"

ompi/mca/coll/demo/coll_demo_alltoallv.c

@@ -17,10 +17,10 @@
  */
 
 #include "ompi_config.h"
+#include "opal/util/output.h"
 
 #include "mpi.h"
 #include "ompi/constants.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/base.h"
 #include "coll_demo.h"

ompi/mca/coll/demo/coll_demo_alltoallw.c

@@ -17,10 +17,10 @@
  */
 
 #include "ompi_config.h"
+#include "opal/util/output.h"
 
 #include "mpi.h"
 #include "ompi/constants.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/base.h"
 #include "coll_demo.h"

ompi/mca/coll/demo/coll_demo_barrier.c

@@ -17,10 +17,10 @@
  */
 
 #include "ompi_config.h"
+#include "opal/util/output.h"
 
 #include "mpi.h"
 #include "ompi/constants.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/base.h"
 #include "coll_demo.h"

ompi/mca/coll/demo/coll_demo_bcast.c

@@ -17,10 +17,10 @@
  */
 
 #include "ompi_config.h"
+#include "opal/util/output.h"
 
 #include "mpi.h"
 #include "ompi/constants.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/base.h"
 #include "coll_demo.h"

ompi/mca/coll/demo/coll_demo_exscan.c

@@ -17,10 +17,10 @@
  */
 
 #include "ompi_config.h"
+#include "opal/util/output.h"
 
 #include "mpi.h"
 #include "ompi/constants.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/base.h"
 #include "coll_demo.h"

ompi/mca/coll/demo/coll_demo_gather.c

@@ -17,10 +17,10 @@
  */
 
 #include "ompi_config.h"
+#include "opal/util/output.h"
 
 #include "mpi.h"
 #include "ompi/constants.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/base.h"
 #include "coll_demo.h"

ompi/mca/coll/demo/coll_demo_gatherv.c

@@ -17,10 +17,10 @@
  */
 
 #include "ompi_config.h"
+#include "opal/util/output.h"
 
 #include "mpi.h"
 #include "ompi/constants.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/base.h"
 #include "coll_demo.h"

ompi/mca/coll/demo/coll_demo_reduce.c

@@ -17,10 +17,10 @@
  */
 
 #include "ompi_config.h"
+#include "opal/util/output.h"
 
 #include "mpi.h"
 #include "ompi/constants.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/base.h"
 #include "coll_demo.h"

ompi/mca/coll/demo/coll_demo_reduce_scatter.c

@@ -17,10 +17,10 @@
  */
 
 #include "ompi_config.h"
+#include "opal/util/output.h"
 
 #include "mpi.h"
 #include "ompi/constants.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/base.h"
 #include "coll_demo.h"

ompi/mca/coll/demo/coll_demo_scan.c

@@ -17,10 +17,10 @@
  */
 
 #include "ompi_config.h"
+#include "opal/util/output.h"
 
 #include "mpi.h"
 #include "ompi/constants.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/base.h"
 #include "coll_demo.h"

ompi/mca/coll/demo/coll_demo_scatter.c

@@ -17,10 +17,10 @@
  */
 
 #include "ompi_config.h"
+#include "opal/util/output.h"
 
 #include "mpi.h"
 #include "ompi/constants.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/base.h"
 #include "coll_demo.h"

ompi/mca/coll/demo/coll_demo_scatterv.c

@@ -17,10 +17,10 @@
  */
 
 #include "ompi_config.h"
+#include "opal/util/output.h"
 
 #include "mpi.h"
 #include "ompi/constants.h"
-#include "orte/util/show_help.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/base.h"
 #include "coll_demo.h"

ompi/mca/coll/hierarch/coll_hierarch_allreduce.c

@@ -24,7 +24,6 @@
 
 #include "mpi.h"
 #include "ompi/constants.h"
-#include "orte/util/show_help.h"
 #include "ompi/communicator/communicator.h"
 #include "ompi/datatype/datatype.h"
 #include "ompi/mca/coll/coll.h"

ompi/mca/coll/hierarch/coll_hierarch_barrier.c

@@ -23,7 +23,6 @@
 
 #include "mpi.h"
 #include "ompi/constants.h"
-#include "orte/util/show_help.h"
 #include "ompi/communicator/communicator.h"
 #include "ompi/mca/coll/coll.h"
 

ompi/mca/coll/hierarch/coll_hierarch_bcast.c

@@ -22,7 +22,6 @@
 
 #include "mpi.h"
 #include "ompi/constants.h"
-#include "orte/util/show_help.h"
 #include "ompi/communicator/communicator.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/coll_tags.h"

ompi/mca/coll/hierarch/coll_hierarch_reduce.c

@@ -24,7 +24,6 @@
 
 #include "mpi.h"
 #include "ompi/constants.h"
-#include "orte/util/show_help.h"
 #include "ompi/communicator/communicator.h"
 #include "ompi/datatype/datatype.h"
 #include "ompi/mca/coll/coll.h"

ompi/mca/coll/inter/coll_inter_bcast.c

@@ -22,7 +22,6 @@
 
 #include "mpi.h"
 #include "ompi/constants.h"
-#include "orte/util/show_help.h"
 #include "ompi/communicator/communicator.h"
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/coll/base/coll_tags.h"

ompi/mca/coll/sm2/coll_sm2_module.c

@@ -33,6 +33,7 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/mca/coll/coll.h"
 #include "opal/util/show_help.h"
+#include "opal/util/output.h"
 #include "coll_sm2.h"
 #include "ompi/mca/coll/base/base.h"
 #include "ompi/mca/dpm/dpm.h"

ompi/mca/coll/tuned/coll_tuned_component.c

@@ -25,15 +25,14 @@
  */
 
 #include "ompi_config.h"
+#include "opal/util/output.h"
 #include "coll_tuned.h"
 
 #include "mpi.h"
 #include "ompi/mca/coll/coll.h"
 #include "coll_tuned.h"
 
-#include "orte/util/show_help.h"
 
-#include "orte/util/show_help.h"
 
 /*
  * Public string showing the coll ompi_tuned component version number

ompi/mca/coll/tuned/coll_tuned_dynamic_file.c

@@ -26,7 +26,6 @@
 #include "ompi/mca/coll/coll.h"
 #include "ompi/request/request.h"
 #include "ompi/mca/pml/pml.h"
-#include "orte/util/show_help.h"
 #include "coll_tuned.h"
 
 /* need to include our own topo prototypes so we can malloc data on the comm correctly */

ompi/mca/common/mx/common_mx.c

@@ -20,7 +20,6 @@
  */
 
 #include "ompi_config.h"
-#include "orte/util/show_help.h"
 #include "ompi/constants.h"
 #include "common_mx.h"
 
@@ -29,6 +28,7 @@
 #include <malloc.h>
 #endif
 #include "opal/memoryhooks/memory.h"
+#include "opal/util/output.h"
 #include "opal/mca/base/mca_base_param.h"
 #include "ompi/runtime/params.h"
 #include "ompi/mca/mpool/mpool.h"

ompi/mca/common/portals/common_portals_cray_xt_modex.c

@@ -22,7 +22,7 @@
 #include "common_portals.h"
 #include "ompi/constants.h"
 #include "opal/mca/base/base.h"
-#include "orte/util/show_help.h"
+#include "opal/util/output.h"
 #include "ompi/runtime/ompi_module_exchange.h"
 
 

ompi/mca/common/portals/common_portals_crayxt3.c

@@ -18,10 +18,10 @@
 
 #include <catamount/cnos_mpi_os.h>
 
-#include "orte/util/show_help.h"
 #include "ompi/constants.h"
 #include "ompi/proc/proc.h"
 #include "opal/mca/base/base.h"
+#include "opal/util/output.h"
 
 static bool use_accelerated;
 

ompi/mca/common/portals/common_portals_utcp.c

@@ -21,7 +21,7 @@
 #include <p3api/debug.h>
 
 #include "opal/mca/mca.h"
-#include "orte/util/show_help.h"
+#include "opal/util/output.h"
 #include "opal/mca/base/mca_base_param.h"
 #include "ompi/proc/proc.h"
 #include "ompi/constants.h"

ompi/mca/common/sm/common_sm_mmap.c

@@ -46,7 +46,7 @@
 #include "ompi/proc/proc.h"
 #include "common_sm_mmap.h"
 #include "opal/util/basename.h"
-#include "orte/util/show_help.h"
+#include "opal/util/output.h"
 #include "opal/align.h"
 #include "orte/util/proc_info.h"
 #include "orte/mca/rml/rml_types.h"

ompi/mca/crcp/base/crcp_base_close.c

@@ -19,7 +19,6 @@
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 
-#include "orte/util/show_help.h"
 #include "opal/mca/base/mca_base_param.h"
 
 #include "ompi/mca/crcp/crcp.h"

ompi/mca/crcp/base/crcp_base_fns.c

@@ -28,7 +28,6 @@
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 
-#include "orte/util/show_help.h"
 #include "opal/util/os_dirpath.h"
 
 #include "ompi/communicator/communicator.h"

ompi/mca/crcp/base/crcp_base_open.c

@@ -17,12 +17,11 @@
 #include "ompi_config.h"
 
 #include "opal/mca/mca.h"
+#include "opal/util/output.h"
 #include "opal/mca/base/base.h"
 
-#include "orte/util/show_help.h"
 #include "opal/mca/base/mca_base_param.h"
 
-#include "orte/util/show_help.h"
 
 #include "ompi/mca/crcp/crcp.h"
 #include "ompi/mca/crcp/base/base.h"

ompi/mca/crcp/base/crcp_base_select.c

@@ -17,9 +17,9 @@
 #include "ompi_config.h"
 
 #include "opal/mca/mca.h"
+#include "opal/util/output.h"
 #include "opal/mca/base/base.h"
 
-#include "orte/util/show_help.h"
 #include "opal/mca/base/mca_base_param.h"
 
 #include "ompi/mca/crcp/crcp.h"

ompi/mca/dpm/base/dpm_base_close.c

@@ -19,7 +19,6 @@
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 
-#include "orte/util/show_help.h"
 #include "opal/mca/base/mca_base_param.h"
 
 #include "ompi/mca/dpm/dpm.h"

ompi/mca/dpm/base/dpm_base_open.c

@@ -17,12 +17,11 @@
 #include "ompi_config.h"
 
 #include "opal/mca/mca.h"
+#include "opal/util/output.h"
 #include "opal/mca/base/base.h"
 
-#include "orte/util/show_help.h"
 #include "opal/mca/base/mca_base_param.h"
 
-#include "orte/util/show_help.h"
 
 #include "ompi/mca/dpm/dpm.h"
 #include "ompi/mca/dpm/base/base.h"

ompi/mca/dpm/base/dpm_base_select.c

@@ -19,7 +19,6 @@
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 
-#include "orte/util/show_help.h"
 #include "opal/mca/base/mca_base_param.h"
 #include "opal/mca/base/mca_base_component_repository.h"
 

ompi/mca/dpm/orte/dpm_orte.c

@@ -25,7 +25,6 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include "orte/util/show_help.h"
 #include "opal/util/argv.h"
 #include "opal/util/opal_getcwd.h"
 
@@ -34,6 +33,7 @@
 #include "orte/mca/grpcomm/grpcomm.h"
 #include "orte/mca/plm/plm.h"
 #include "orte/mca/rml/rml.h"
+#include "orte/mca/rml/rml_types.h"
 #include "orte/mca/rml/base/rml_contact.h"
 #include "orte/mca/routed/routed.h"
 #include "orte/util/name_fns.h"

ompi/mca/io/base/io_base_delete.c

@@ -27,7 +27,7 @@
 #include "ompi/file/file.h"
 #include "opal/class/opal_list.h"
 #include "opal/util/argv.h"
-#include "orte/util/show_help.h"
+#include "opal/util/output.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "ompi/mca/io/io.h"

ompi/mca/io/base/io_base_file_select.c

@@ -26,7 +26,7 @@
 #include "mpi.h"
 #include "ompi/file/file.h"
 #include "opal/util/argv.h"
-#include "orte/util/show_help.h"
+#include "opal/util/output.h"
 #include "opal/class/opal_list.h"
 #include "opal/class/opal_object.h"
 #include "opal/mca/mca.h"

ompi/mca/io/base/io_base_find_available.c

@@ -25,7 +25,7 @@
 #include "mpi.h"
 #include "ompi/constants.h"
 #include "opal/class/opal_list.h"
-#include "orte/util/show_help.h"
+#include "opal/util/output.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "opal/mca/base/mca_base_component_repository.h"

ompi/mca/io/base/io_base_open.c

@@ -21,12 +21,11 @@
 #include <stdio.h>
 
 #include "ompi/class/ompi_free_list.h"
-#include "orte/util/show_help.h"
 #include "opal/mca/mca.h"
+#include "opal/util/output.h"
 #include "opal/mca/base/base.h"
 #include "opal/mca/base/mca_base_param.h"
 
-#include "orte/util/show_help.h"
 
 #include "ompi/mca/io/io.h"
 #include "ompi/mca/io/base/base.h"