- For the upcoming header cleanup commit,

several header files (previously included by header-files)
   now have to be moved "upward".
   This is mainly system headers such as string.h, stdio.h and for
   networking, but also some orte headers.

This commit was SVN r21095.

ompi/info/info.c

@@ -20,7 +20,6 @@
  */
 
 #include "ompi_config.h"
-#include "opal/util/output.h"
 
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -32,6 +31,8 @@
 #include <limits.h>
 #include <ctype.h>
 
+#include "opal/util/output.h"
+#include "opal/util/strncpy.h"
 #include "ompi/constants.h"
 #include "ompi/info/info.h"
 #include "ompi/runtime/params.h"

ompi/mca/btl/openib/btl_openib.h

@@ -35,6 +35,7 @@
 /* Open MPI includes */
 #include "ompi/class/ompi_free_list.h"
 #include "opal/class/opal_pointer_array.h"
+#include "opal/class/opal_hash_table.h"
 #include "opal/util/output.h"
 #include "opal/event/event.h"
 #include "ompi/mca/btl/btl.h"

ompi/mca/pml/v/mca/vprotocol/base/vprotocol_base_select.c

@@ -9,6 +9,11 @@
  */
 
 #include "ompi_config.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 #include "base.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"

ompi/runtime/ompi_mpi_params.c

@@ -29,6 +29,7 @@
 #endif  /* HAVE_TIME_H */
 
 #include "ompi/constants.h"
+#include "ompi/datatype/datatype.h"
 #include "ompi/runtime/mpiruntime.h"
 #include "ompi/runtime/params.h"
 #include "ompi/datatype/datatype.h"

ompi/tools/ompi-probe/ompi-probe.c

@@ -20,6 +20,7 @@
  */
 
 #include "ompi_config.h"
+#include "ompi/constants.h"
 #include "mpi.h"
 
 #include <stdio.h>

ompi/tools/ompi-server/ompi-server.c

@@ -22,6 +22,10 @@
 #include "orte_config.h"
 #include "orte/constants.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 #include <stdio.h>
 #include <ctype.h>
 #ifdef HAVE_UNISTD_H

opal/util/sys_limits.c

@@ -22,6 +22,10 @@
 
 #include "opal_config.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 #include <errno.h>
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>

orte/mca/ess/slurm/ess_slurm_module.c

@@ -21,6 +21,16 @@
 #include "orte_config.h"
 #include "orte/constants.h"
 
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif  /* HAVE_UNISTD_H */

orte/mca/grpcomm/bad/grpcomm_bad_module.c

@@ -31,6 +31,7 @@
 #include "opal/dss/dss.h"
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/mca/odls/base/base.h"
+#include "orte/mca/odls/odls_types.h"
 #include "orte/mca/ess/ess.h"
 #include "orte/mca/rml/rml.h"
 #include "orte/mca/rml/rml_types.h"

orte/mca/grpcomm/basic/grpcomm_basic_module.c

@@ -33,6 +33,7 @@
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/mca/ess/ess.h"
 #include "orte/mca/odls/base/base.h"
+#include "orte/mca/odls/odls_types.h"
 #include "orte/mca/rml/rml.h"
 #include "orte/mca/rml/rml_types.h"
 #include "orte/mca/routed/routed.h"

orte/mca/odls/base/odls_base_open.c

@@ -20,6 +20,10 @@
 #include "orte_config.h"
 #include "orte/constants.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 #if !ORTE_DISABLE_FULL_SUPPORT
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"

orte/mca/plm/base/plm_base_orted_cmds.c

@@ -20,6 +20,9 @@
 #include "orte_config.h"
 #include "orte/constants.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif

orte/mca/plm/tm/plm_tm_module.c

@@ -29,6 +29,10 @@
 #include "orte/constants.h"
 #include "orte/types.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif

orte/mca/rmaps/base/rmaps_base_open.c

@@ -20,6 +20,10 @@
 #include "orte_config.h"
 #include "orte/constants.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 #if !ORTE_DISABLE_FULL_SUPPORT
 
 #include "opal/mca/mca.h"

orte/mca/rml/base/rml_base_receive.c

@@ -26,6 +26,11 @@
  * includes
  */
 #include "orte_config.h"
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 #include "orte/constants.h"
 #include "orte/types.h"
 

orte/mca/rml/oob/rml_oob_component.c

@@ -20,6 +20,10 @@
 #include "orte_config.h"
 #include "orte/constants.h"
 
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
 #include "opal/mca/base/base.h"
 #include "opal/util/output.h"
 #include "opal/mca/base/mca_base_param.h"

orte/runtime/data_type_support/orte_dt_compare_fns.c

@@ -16,6 +16,10 @@
 
 #include "orte_config.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 #include <sys/types.h>
 
 #include "opal/dss/dss.h"

orte/runtime/orte_data_server.c

@@ -21,6 +21,10 @@
 #include "orte/constants.h"
 #include "orte/types.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif

orte/tools/orterun/orterun.h

@@ -23,6 +23,7 @@
 #include "orte_config.h"
 
 #include "opal/threads/condition.h"
+#include "opal/threads/mutex.h"
 #include "opal/util/cmd_line.h"
 
 #include "orte/runtime/orte_globals.h"

orte/util/parse_options.c

@@ -20,6 +20,7 @@
 #include "orte_config.h"
 #include "orte/constants.h"
 
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H