More dependencies work.

This commit was SVN r7317.

ompi/mca/ptl/base/ptl_base_comm.c

@@ -17,8 +17,9 @@
 #include "ompi_config.h"
 #include <string.h>
 
-#include "mca/pml/pml.h"
-#include "mca/ptl/base/ptl_base_comm.h"
+#include "ompi/include/constants.h"
+#include "ompi/mca/pml/pml.h"
+#include "ompi/mca/ptl/base/ptl_base_comm.h"
 
 static void mca_pml_ptl_comm_construct(mca_pml_ptl_comm_t* comm);
 static void mca_pml_ptl_comm_destruct(mca_pml_ptl_comm_t* comm);

ompi/mca/ptl/self/ptl_self.c

@@ -19,34 +19,25 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <string.h>
 #include <fcntl.h>
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#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
 
 #include "ompi/include/constants.h"
-#include "class/ompi_bitmap.h"
+#include "ompi/class/ompi_bitmap.h"
 #include "opal/event/event.h"
 #include "opal/util/argv.h"
 #include "opal/util/output.h"
-#include "datatype/datatype.h"
-#include "mca/pml/pml.h"
-#include "mca/ptl/ptl.h"
-#include "mca/pml/base/pml_base_sendreq.h"
-#include "mca/ptl/base/ptl_base_sendfrag.h"
-#include "mca/ptl/base/ptl_base_recvfrag.h"
-#include "mca/base/mca_base_param.h"
+#include "opal/mca/base/mca_base_param.h"
+#include "ompi/datatype/datatype.h"
+#include "ompi/mca/pml/pml.h"
+#include "ompi/mca/ptl/ptl.h"
+#include "ompi/mca/pml/base/pml_base_sendreq.h"
+#include "ompi/mca/ptl/base/ptl_base_sendfrag.h"
+#include "ompi/mca/ptl/base/ptl_base_recvfrag.h"
 #include "ptl_self.h"
+#include "ompi/communicator/communicator.h"
 
 mca_ptl_base_module_t mca_ptl_self_module = {
     &mca_ptl_self_component.super,

ompi/mca/ptl/self/ptl_self_component.c

@@ -24,27 +24,19 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#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
 
 #include "ompi/include/constants.h"
 #include "opal/event/event.h"
 #include "opal/util/if.h"
 #include "opal/util/argv.h"
 #include "opal/util/output.h"
-#include "mca/pml/pml.h"
-#include "mca/ptl/ptl.h"
-#include "mca/pml/base/pml_base_sendreq.h"
-#include "mca/ptl/base/ptl_base_recvfrag.h"
-#include "mca/base/mca_base_param.h"
+#include "ompi/mca/pml/pml.h"
+#include "ompi/mca/ptl/ptl.h"
+#include "ompi/mca/pml/base/pml_base_sendreq.h"
+#include "ompi/mca/ptl/base/ptl_base_recvfrag.h"
+#include "opal/mca/base/mca_base_param.h"
 #include "ptl_self.h"
+#include "ompi/proc/proc.h"
 
 mca_ptl_self_component_t mca_ptl_self_component = {
     {

ompi/mca/ptl/sm/ptl_sm.c

@@ -26,28 +26,30 @@
 
 #include "opal/util/output.h"
 #include "opal/util/if.h"
-#include "mca/pml/pml.h"
-#include "mca/ptl/ptl.h"
-#include "mca/ptl/base/ptl_base_sendreq.h"
-#include "mca/ptl/base/ptl_base_recvreq.h"
-#include "mca/ptl/base/ptl_base_header.h"
-#include "mca/ptl/base/ptl_base_sendfrag.h"
-#include "mca/ptl/base/ptl_base_recvfrag.h"
-#include "mca/mpool/base/base.h"
-#include "mca/oob/base/base.h"
+#include "ompi/mca/pml/pml.h"
+#include "ompi/mca/ptl/ptl.h"
+#include "ompi/mca/ptl/base/ptl_base_sendreq.h"
+#include "ompi/mca/ptl/base/ptl_base_recvreq.h"
+#include "ompi/mca/ptl/base/ptl_base_header.h"
+#include "ompi/mca/ptl/base/ptl_base_sendfrag.h"
+#include "ompi/mca/ptl/base/ptl_base_recvfrag.h"
+#include "ompi/mca/mpool/base/base.h"
+#include "orte/mca/oob/base/base.h"
 #include "mca/common/sm/common_sm_mmap.h"
 #include "ptl_sm.h"
 #include "util/sys_info.h"
-#include "mca/ptl/sm/ptl_sm_peer.h"
-#include "mca/common/sm/common_sm_mmap.h"
+#include "ompi/mca/ptl/sm/ptl_sm_peer.h"
+#include "ompi/mca/common/sm/common_sm_mmap.h"
 #include "util/proc_info.h"
 #include "opal/util/printf.h"
-#include "mca/ptl/sm/ptl_sm_sendreq.h"
-#include "class/ompi_fifo.h"
-#include "class/ompi_free_list.h"
+#include "ompi/mca/ptl/sm/ptl_sm_sendreq.h"
+#include "ompi/class/ompi_fifo.h"
+#include "ompi/class/ompi_free_list.h"
 #include "opal/threads/mutex.h"
-#include "datatype/datatype.h"
+#include "ompi/datatype/datatype.h"
 #include "include/sys/atomic.h"
+#include "ompi/proc/proc.h"
+#include "ompi/communicator/communicator.h"
 
 mca_ptl_sm_t mca_ptl_sm[2] = {
     {

ompi/mca/ptl/tcp/ptl_tcp_component.c

@@ -38,13 +38,11 @@
 #include "opal/util/if.h"
 #include "opal/util/argv.h"
 #include "opal/util/output.h"
-#include "mca/pml/pml.h"
-#include "mca/ptl/ptl.h"
-#include "mca/pml/base/pml_base_sendreq.h"
-#include "mca/base/mca_base_param.h"
-#include "mca/ns/ns_types.h"
-
-#include "mca/oob/base/base.h"
+#include "ompi/mca/pml/pml.h"
+#include "ompi/mca/ptl/ptl.h"
+#include "ompi/mca/pml/base/pml_base_sendreq.h"
+#include "opal/mca/base/mca_base_param.h"
+#include "ompi/mca/pml/base/pml_base_module_exchange.h"
 #include "ptl_tcp.h"
 #include "ptl_tcp_addr.h"
 #include "ptl_tcp_proc.h"

ompi/mca/ptl/tcp/ptl_tcp_peer.c

@@ -37,9 +37,9 @@
 #endif
 
 #include "include/types.h"
-#include "mca/pml/base/pml_base_sendreq.h"
+#include "ompi/mca/pml/base/pml_base_sendreq.h"
 #include "mca/ns/ns.h"
-#include "mca/oob/base/base.h"
+#include "opal/util/output.h"
 #include "ptl_tcp.h"
 #include "ptl_tcp_addr.h"
 #include "ptl_tcp_peer.h"

ompi/mca/ptl/tcp/ptl_tcp_proc.c

@@ -19,9 +19,9 @@
 #include <string.h>
 
 #include "include/sys/atomic.h"
-#include "class/orte_proc_table.h"
-#include "mca/pml/base/pml_base_module_exchange.h"
-#include "mca/ns/ns_types.h"
+#include "orte/class/orte_proc_table.h"
+#include "ompi/mca/pml/base/pml_base_module_exchange.h"
+#include "opal/util/output.h"
 #include "ptl_tcp.h"
 #include "ptl_tcp_addr.h"
 #include "ptl_tcp_peer.h"

ompi/mca/ptl/tcp/ptl_tcp_recvfrag.c

@@ -20,8 +20,9 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#include "include/ompi_socket_errno.h"
-#include "mca/ptl/base/ptl_base_sendreq.h"
+#include "ompi/include/ompi_socket_errno.h"
+#include "ompi/mca/ptl/base/ptl_base_sendreq.h"
+#include "opal/util/output.h"
 #include "ptl_tcp.h"
 #include "ptl_tcp_peer.h"
 #include "ptl_tcp_recvfrag.h"

ompi/mca/ptl/tcp/ptl_tcp_sendfrag.c

@@ -20,10 +20,11 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#include "include/ompi_socket_errno.h"
+#include "ompi/include/ompi_socket_errno.h"
 #include "include/types.h"
-#include "datatype/datatype.h"
-#include "mca/pml/base/pml_base_sendreq.h"
+#include "ompi/datatype/datatype.h"
+#include "ompi/mca/pml/base/pml_base_sendreq.h"
+#include "ompi/communicator/communicator.h"
 #include "ptl_tcp.h"
 #include "ptl_tcp_peer.h"
 #include "ptl_tcp_proc.h"