diff --git a/ompi/communicator/comm_init.c b/ompi/communicator/comm_init.c
index a1ba39d20c..ed43583081 100644
--- a/ompi/communicator/comm_init.c
+++ b/ompi/communicator/comm_init.c
@@ -33,7 +33,7 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/attribute/attribute.h"
 #include "ompi/mca/topo/topo.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 /*
 ** Table for Fortran <-> C communicator handle conversion
diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_component.c b/ompi/mca/osc/pt2pt/osc_pt2pt_component.c
index 14d81d7c2a..9c2d9457b2 100644
--- a/ompi/mca/osc/pt2pt/osc_pt2pt_component.c
+++ b/ompi/mca/osc/pt2pt/osc_pt2pt_component.c
@@ -35,7 +35,7 @@
 #include "ompi/mca/osc/base/osc_base_obj_convert.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/datatype/dt_arch.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 static int component_open(void);
 static void component_fragment_cb(ompi_osc_pt2pt_mpireq_t *mpireq);
diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_data_move.c b/ompi/mca/osc/pt2pt/osc_pt2pt_data_move.c
index 2acb9c0b6e..389d36ca33 100644
--- a/ompi/mca/osc/pt2pt/osc_pt2pt_data_move.c
+++ b/ompi/mca/osc/pt2pt/osc_pt2pt_data_move.c
@@ -29,7 +29,7 @@
 #include "ompi/datatype/dt_arch.h"
 #include "ompi/mca/osc/base/base.h"
 #include "ompi/mca/osc/base/osc_base_obj_convert.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 
 static inline int32_t
diff --git a/ompi/mca/pml/base/pml_base_request.h b/ompi/mca/pml/base/pml_base_request.h
index 5715df948a..afabbe1332 100644
--- a/ompi/mca/pml/base/pml_base_request.h
+++ b/ompi/mca/pml/base/pml_base_request.h
@@ -25,7 +25,7 @@
 #include "ompi/class/ompi_free_list.h"
 #include "ompi/request/request.h"
 #include "ompi/datatype/convertor.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 BEGIN_C_DECLS
 
diff --git a/ompi/mca/pml/ob1/pml_ob1_recvreq.c b/ompi/mca/pml/ob1/pml_ob1_recvreq.c
index 21de2a7a94..c6a5357c29 100644
--- a/ompi/mca/pml/ob1/pml_ob1_recvreq.c
+++ b/ompi/mca/pml/ob1/pml_ob1_recvreq.c
@@ -30,7 +30,7 @@
 #include "ompi/mca/bml/base/base.h" 
 #include "orte/mca/errmgr/errmgr.h"
 #include "ompi/datatype/dt_arch.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 void mca_pml_ob1_recv_request_process_pending(void)
 {
diff --git a/ompi/mca/pml/ob1/pml_ob1_sendreq.c b/ompi/mca/pml/ob1/pml_ob1_sendreq.c
index eabf889156..4604a582a7 100644
--- a/ompi/mca/pml/ob1/pml_ob1_sendreq.c
+++ b/ompi/mca/pml/ob1/pml_ob1_sendreq.c
@@ -30,7 +30,7 @@
 #include "pml_ob1_rdmafrag.h"
 #include "pml_ob1_recvreq.h"
 #include "ompi/mca/bml/base/base.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 OBJ_CLASS_INSTANCE(mca_pml_ob1_send_range_t, ompi_free_list_item_t,
         NULL, NULL);
diff --git a/ompi/mca/pml/ob1/pml_ob1_start.c b/ompi/mca/pml/ob1/pml_ob1_start.c
index 2eedb2bb12..1f43762088 100644
--- a/ompi/mca/pml/ob1/pml_ob1_start.c
+++ b/ompi/mca/pml/ob1/pml_ob1_start.c
@@ -22,7 +22,7 @@
 #include "pml_ob1.h"
 #include "pml_ob1_recvreq.h"
 #include "pml_ob1_sendreq.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 
 int mca_pml_ob1_start(size_t count, ompi_request_t** requests)
diff --git a/ompi/mpi/c/abort.c b/ompi/mpi/c/abort.c
index ed1a0020f2..f54fe0186d 100644
--- a/ompi/mpi/c/abort.c
+++ b/ompi/mpi/c/abort.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/runtime/mpiruntime.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 #include "ompi/communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
diff --git a/ompi/mpi/c/accumulate.c b/ompi/mpi/c/accumulate.c
index 1a555065d9..1dedfd8229 100644
--- a/ompi/mpi/c/accumulate.c
+++ b/ompi/mpi/c/accumulate.c
@@ -24,7 +24,7 @@
 #include "ompi/op/op.h"
 #include "ompi/datatype/datatype.h"
 #include "ompi/datatype/datatype_internal.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Accumulate = PMPI_Accumulate
diff --git a/ompi/mpi/c/allgather.c b/ompi/mpi/c/allgather.c
index e7e158f084..3a7a9635a5 100644
--- a/ompi/mpi/c/allgather.c
+++ b/ompi/mpi/c/allgather.c
@@ -22,7 +22,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Allgather = PMPI_Allgather
diff --git a/ompi/mpi/c/allgatherv.c b/ompi/mpi/c/allgatherv.c
index 1260f4f9e5..c6c1a870c2 100644
--- a/ompi/mpi/c/allgatherv.c
+++ b/ompi/mpi/c/allgatherv.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Allgatherv = PMPI_Allgatherv
diff --git a/ompi/mpi/c/allreduce.c b/ompi/mpi/c/allreduce.c
index 24e9f89d6a..4cf5251006 100644
--- a/ompi/mpi/c/allreduce.c
+++ b/ompi/mpi/c/allreduce.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
 #include "ompi/op/op.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Allreduce = PMPI_Allreduce
diff --git a/ompi/mpi/c/alltoall.c b/ompi/mpi/c/alltoall.c
index 745b78e413..25dc354078 100644
--- a/ompi/mpi/c/alltoall.c
+++ b/ompi/mpi/c/alltoall.c
@@ -22,7 +22,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Alltoall = PMPI_Alltoall
diff --git a/ompi/mpi/c/alltoallv.c b/ompi/mpi/c/alltoallv.c
index 444a4d0bf5..a3f766ad00 100644
--- a/ompi/mpi/c/alltoallv.c
+++ b/ompi/mpi/c/alltoallv.c
@@ -22,7 +22,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Alltoallv = PMPI_Alltoallv
diff --git a/ompi/mpi/c/alltoallw.c b/ompi/mpi/c/alltoallw.c
index 20c2af1b9f..0f98532a5d 100644
--- a/ompi/mpi/c/alltoallw.c
+++ b/ompi/mpi/c/alltoallw.c
@@ -22,7 +22,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Alltoallw = PMPI_Alltoallw
diff --git a/ompi/mpi/c/attr_delete.c b/ompi/mpi/c/attr_delete.c
index 7340c167fa..2b2d6fc3f8 100644
--- a/ompi/mpi/c/attr_delete.c
+++ b/ompi/mpi/c/attr_delete.c
@@ -22,7 +22,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/attribute/attribute.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Attr_delete = PMPI_Attr_delete
diff --git a/ompi/mpi/c/attr_get.c b/ompi/mpi/c/attr_get.c
index 3ce29b5d5f..e21fecee76 100644
--- a/ompi/mpi/c/attr_get.c
+++ b/ompi/mpi/c/attr_get.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/attribute/attribute.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Attr_get = PMPI_Attr_get
diff --git a/ompi/mpi/c/attr_put.c b/ompi/mpi/c/attr_put.c
index f60d7adcae..a4fe0ce861 100644
--- a/ompi/mpi/c/attr_put.c
+++ b/ompi/mpi/c/attr_put.c
@@ -22,7 +22,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/attribute/attribute.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Attr_put = PMPI_Attr_put
diff --git a/ompi/mpi/c/barrier.c b/ompi/mpi/c/barrier.c
index 4c16b25d28..cc17b4448f 100644
--- a/ompi/mpi/c/barrier.c
+++ b/ompi/mpi/c/barrier.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Barrier = PMPI_Barrier
diff --git a/ompi/mpi/c/bcast.c b/ompi/mpi/c/bcast.c
index 155bcfc3e9..765e024d69 100644
--- a/ompi/mpi/c/bcast.c
+++ b/ompi/mpi/c/bcast.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Bcast = PMPI_Bcast
diff --git a/ompi/mpi/c/bsend.c b/ompi/mpi/c/bsend.c
index 9aa7935473..de4b8efdd2 100644
--- a/ompi/mpi/c/bsend.c
+++ b/ompi/mpi/c/bsend.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/pml/base/pml_base_bsend.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Bsend = PMPI_Bsend
diff --git a/ompi/mpi/c/bsend_init.c b/ompi/mpi/c/bsend_init.c
index 53584e0fe1..b9d96617dc 100644
--- a/ompi/mpi/c/bsend_init.c
+++ b/ompi/mpi/c/bsend_init.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/pml/base/pml_base_bsend.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Bsend_init = PMPI_Bsend_init
diff --git a/ompi/mpi/c/cancel.c b/ompi/mpi/c/cancel.c
index 271718c7ca..d45077a7b9 100644
--- a/ompi/mpi/c/cancel.c
+++ b/ompi/mpi/c/cancel.c
@@ -25,7 +25,7 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/request/request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Cancel = PMPI_Cancel
diff --git a/ompi/mpi/c/cart_coords.c b/ompi/mpi/c/cart_coords.c
index b2dd9e1c08..dffd1b542a 100644
--- a/ompi/mpi/c/cart_coords.c
+++ b/ompi/mpi/c/cart_coords.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/topo/topo.h"
 #include "ompi/group/group.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Cart_coords = PMPI_Cart_coords
diff --git a/ompi/mpi/c/cart_create.c b/ompi/mpi/c/cart_create.c
index ee114a107a..7a6024499f 100644
--- a/ompi/mpi/c/cart_create.c
+++ b/ompi/mpi/c/cart_create.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/topo/topo.h"
 #include "ompi/mca/topo/base/base.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Cart_create = PMPI_Cart_create
diff --git a/ompi/mpi/c/cart_get.c b/ompi/mpi/c/cart_get.c
index d4c116eedc..3a05641c7b 100644
--- a/ompi/mpi/c/cart_get.c
+++ b/ompi/mpi/c/cart_get.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/topo/topo.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Cart_get = PMPI_Cart_get
diff --git a/ompi/mpi/c/cart_map.c b/ompi/mpi/c/cart_map.c
index 91356b1f92..54732d95ff 100644
--- a/ompi/mpi/c/cart_map.c
+++ b/ompi/mpi/c/cart_map.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/topo/topo.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Cart_map = PMPI_Cart_map
diff --git a/ompi/mpi/c/cart_rank.c b/ompi/mpi/c/cart_rank.c
index aefa151a27..ddb95a8d09 100644
--- a/ompi/mpi/c/cart_rank.c
+++ b/ompi/mpi/c/cart_rank.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/topo/topo.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Cart_rank = PMPI_Cart_rank
diff --git a/ompi/mpi/c/cart_shift.c b/ompi/mpi/c/cart_shift.c
index 3795ae012c..e0f3fe93d8 100644
--- a/ompi/mpi/c/cart_shift.c
+++ b/ompi/mpi/c/cart_shift.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/topo/topo.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Cart_shift = PMPI_Cart_shift
diff --git a/ompi/mpi/c/cart_sub.c b/ompi/mpi/c/cart_sub.c
index 172129da91..0a03542376 100644
--- a/ompi/mpi/c/cart_sub.c
+++ b/ompi/mpi/c/cart_sub.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/topo/topo.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Cart_sub = PMPI_Cart_sub
diff --git a/ompi/mpi/c/cartdim_get.c b/ompi/mpi/c/cartdim_get.c
index 9371d5ac1a..ae49cb9724 100644
--- a/ompi/mpi/c/cartdim_get.c
+++ b/ompi/mpi/c/cartdim_get.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/topo/topo.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Cartdim_get = PMPI_Cartdim_get
diff --git a/ompi/mpi/c/comm_accept.c b/ompi/mpi/c/comm_accept.c
index 4037ec01d2..edea6b6245 100644
--- a/ompi/mpi/c/comm_accept.c
+++ b/ompi/mpi/c/comm_accept.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/info/info.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_accept = PMPI_Comm_accept
diff --git a/ompi/mpi/c/comm_c2f.c b/ompi/mpi/c/comm_c2f.c
index 8d7d64926d..ef4a29e429 100644
--- a/ompi/mpi/c/comm_c2f.c
+++ b/ompi/mpi/c/comm_c2f.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mpi/f77/fint_2_int.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_c2f = PMPI_Comm_c2f
diff --git a/ompi/mpi/c/comm_call_errhandler.c b/ompi/mpi/c/comm_call_errhandler.c
index 97ba0b7f32..a53a7cf0d2 100644
--- a/ompi/mpi/c/comm_call_errhandler.c
+++ b/ompi/mpi/c/comm_call_errhandler.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_call_errhandler = PMPI_Comm_call_errhandler
diff --git a/ompi/mpi/c/comm_compare.c b/ompi/mpi/c/comm_compare.c
index a27ba82708..98e5add228 100644
--- a/ompi/mpi/c/comm_compare.c
+++ b/ompi/mpi/c/comm_compare.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_compare = PMPI_Comm_compare
diff --git a/ompi/mpi/c/comm_connect.c b/ompi/mpi/c/comm_connect.c
index 777da4ca21..4e097f0b6d 100644
--- a/ompi/mpi/c/comm_connect.c
+++ b/ompi/mpi/c/comm_connect.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/info/info.h"
 #include "orte/mca/ns/ns.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_connect = PMPI_Comm_connect
diff --git a/ompi/mpi/c/comm_create.c b/ompi/mpi/c/comm_create.c
index ebe244143c..3df34ee0d2 100644
--- a/ompi/mpi/c/comm_create.c
+++ b/ompi/mpi/c/comm_create.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_create = PMPI_Comm_create
diff --git a/ompi/mpi/c/comm_delete_attr.c b/ompi/mpi/c/comm_delete_attr.c
index 219e5aa2d0..8326606630 100644
--- a/ompi/mpi/c/comm_delete_attr.c
+++ b/ompi/mpi/c/comm_delete_attr.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/attribute/attribute.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_delete_attr = PMPI_Comm_delete_attr
diff --git a/ompi/mpi/c/comm_disconnect.c b/ompi/mpi/c/comm_disconnect.c
index 07e4aad3f2..1d2dbc2420 100644
--- a/ompi/mpi/c/comm_disconnect.c
+++ b/ompi/mpi/c/comm_disconnect.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_disconnect = PMPI_Comm_disconnect
diff --git a/ompi/mpi/c/comm_dup.c b/ompi/mpi/c/comm_dup.c
index d1da107052..60d6c31beb 100644
--- a/ompi/mpi/c/comm_dup.c
+++ b/ompi/mpi/c/comm_dup.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_dup = PMPI_Comm_dup
diff --git a/ompi/mpi/c/comm_free.c b/ompi/mpi/c/comm_free.c
index aae342b56c..38baef577b 100644
--- a/ompi/mpi/c/comm_free.c
+++ b/ompi/mpi/c/comm_free.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_free = PMPI_Comm_free
diff --git a/ompi/mpi/c/comm_get_attr.c b/ompi/mpi/c/comm_get_attr.c
index 41d1db6959..83bc24d35f 100644
--- a/ompi/mpi/c/comm_get_attr.c
+++ b/ompi/mpi/c/comm_get_attr.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/attribute/attribute.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_get_attr = PMPI_Comm_get_attr
diff --git a/ompi/mpi/c/comm_get_errhandler.c b/ompi/mpi/c/comm_get_errhandler.c
index bb53c2e4d9..5c623c73b5 100644
--- a/ompi/mpi/c/comm_get_errhandler.c
+++ b/ompi/mpi/c/comm_get_errhandler.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_get_errhandler = PMPI_Comm_get_errhandler
diff --git a/ompi/mpi/c/comm_get_name.c b/ompi/mpi/c/comm_get_name.c
index 27039c65f3..92be44ad81 100644
--- a/ompi/mpi/c/comm_get_name.c
+++ b/ompi/mpi/c/comm_get_name.c
@@ -25,7 +25,7 @@
 #include "opal/util/strncpy.h"
 #include "ompi/totalview.h"
 #include "opal/threads/mutex.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_get_name = PMPI_Comm_get_name
diff --git a/ompi/mpi/c/comm_group.c b/ompi/mpi/c/comm_group.c
index 68d03bd191..d3a67d26d5 100644
--- a/ompi/mpi/c/comm_group.c
+++ b/ompi/mpi/c/comm_group.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_group = PMPI_Comm_group
diff --git a/ompi/mpi/c/comm_rank.c b/ompi/mpi/c/comm_rank.c
index 8676e63d55..14d7ae9fbe 100644
--- a/ompi/mpi/c/comm_rank.c
+++ b/ompi/mpi/c/comm_rank.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_rank = PMPI_Comm_rank
diff --git a/ompi/mpi/c/comm_remote_group.c b/ompi/mpi/c/comm_remote_group.c
index 69f13d9c95..e51333eaa6 100644
--- a/ompi/mpi/c/comm_remote_group.c
+++ b/ompi/mpi/c/comm_remote_group.c
@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_remote_group = PMPI_Comm_remote_group
diff --git a/ompi/mpi/c/comm_remote_size.c b/ompi/mpi/c/comm_remote_size.c
index 7ff4214865..4f2fb2d653 100644
--- a/ompi/mpi/c/comm_remote_size.c
+++ b/ompi/mpi/c/comm_remote_size.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_remote_size = PMPI_Comm_remote_size
diff --git a/ompi/mpi/c/comm_set_attr.c b/ompi/mpi/c/comm_set_attr.c
index 10f86b938e..7b59191da6 100644
--- a/ompi/mpi/c/comm_set_attr.c
+++ b/ompi/mpi/c/comm_set_attr.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/attribute/attribute.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_set_attr = PMPI_Comm_set_attr
diff --git a/ompi/mpi/c/comm_set_errhandler.c b/ompi/mpi/c/comm_set_errhandler.c
index 913d22acf6..11797fb5c8 100644
--- a/ompi/mpi/c/comm_set_errhandler.c
+++ b/ompi/mpi/c/comm_set_errhandler.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_set_errhandler = PMPI_Comm_set_errhandler
diff --git a/ompi/mpi/c/comm_set_name.c b/ompi/mpi/c/comm_set_name.c
index 68948ac59f..48405c7a00 100644
--- a/ompi/mpi/c/comm_set_name.c
+++ b/ompi/mpi/c/comm_set_name.c
@@ -24,7 +24,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "opal/util/strncpy.h"
 #include "ompi/totalview.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES 
 #pragma weak MPI_Comm_set_name = PMPI_Comm_set_name
diff --git a/ompi/mpi/c/comm_size.c b/ompi/mpi/c/comm_size.c
index 8396b3159e..408acb8e4d 100644
--- a/ompi/mpi/c/comm_size.c
+++ b/ompi/mpi/c/comm_size.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_size = PMPI_Comm_size
diff --git a/ompi/mpi/c/comm_spawn.c b/ompi/mpi/c/comm_spawn.c
index cb09c1fdf2..5913951e6d 100644
--- a/ompi/mpi/c/comm_spawn.c
+++ b/ompi/mpi/c/comm_spawn.c
@@ -22,7 +22,7 @@
 #include "opal/util/show_help.h"
 #include "ompi/info/info.h"
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_spawn = PMPI_Comm_spawn
diff --git a/ompi/mpi/c/comm_spawn_multiple.c b/ompi/mpi/c/comm_spawn_multiple.c
index 35de63aadc..f5cd3bbcc8 100644
--- a/ompi/mpi/c/comm_spawn_multiple.c
+++ b/ompi/mpi/c/comm_spawn_multiple.c
@@ -22,7 +22,7 @@
 #include "opal/util/show_help.h"
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/info/info.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_spawn_multiple = PMPI_Comm_spawn_multiple
diff --git a/ompi/mpi/c/comm_split.c b/ompi/mpi/c/comm_split.c
index d1d63cc911..b03215523b 100644
--- a/ompi/mpi/c/comm_split.c
+++ b/ompi/mpi/c/comm_split.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_split = PMPI_Comm_split
diff --git a/ompi/mpi/c/comm_test_inter.c b/ompi/mpi/c/comm_test_inter.c
index 9be874a388..873c67090a 100644
--- a/ompi/mpi/c/comm_test_inter.c
+++ b/ompi/mpi/c/comm_test_inter.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Comm_test_inter = PMPI_Comm_test_inter
diff --git a/ompi/mpi/c/errhandler_get.c b/ompi/mpi/c/errhandler_get.c
index 943aa26296..a52d2040be 100644
--- a/ompi/mpi/c/errhandler_get.c
+++ b/ompi/mpi/c/errhandler_get.c
@@ -19,7 +19,7 @@
 #include "ompi_config.h"
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Errhandler_get = PMPI_Errhandler_get
diff --git a/ompi/mpi/c/errhandler_set.c b/ompi/mpi/c/errhandler_set.c
index 5a053376cd..17202b56cc 100644
--- a/ompi/mpi/c/errhandler_set.c
+++ b/ompi/mpi/c/errhandler_set.c
@@ -19,7 +19,7 @@
 #include "ompi_config.h"
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Errhandler_set = PMPI_Errhandler_set
diff --git a/ompi/mpi/c/exscan.c b/ompi/mpi/c/exscan.c
index 5f556b8de5..2035113ce8 100644
--- a/ompi/mpi/c/exscan.c
+++ b/ompi/mpi/c/exscan.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
 #include "ompi/op/op.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Exscan = PMPI_Exscan
diff --git a/ompi/mpi/c/file_get_type_extent.c b/ompi/mpi/c/file_get_type_extent.c
index a8419f0ec9..0be26a9b3c 100644
--- a/ompi/mpi/c/file_get_type_extent.c
+++ b/ompi/mpi/c/file_get_type_extent.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/file/file.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_get_type_extent = PMPI_File_get_type_extent
diff --git a/ompi/mpi/c/file_iread.c b/ompi/mpi/c/file_iread.c
index 18207a08fa..e21f2626b9 100644
--- a/ompi/mpi/c/file_iread.c
+++ b/ompi/mpi/c/file_iread.c
@@ -23,7 +23,7 @@
 #include "ompi/file/file.h"
 #include "ompi/mca/io/io.h"
 #include "ompi/mca/io/base/io_base_request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_iread = PMPI_File_iread
diff --git a/ompi/mpi/c/file_iread_at.c b/ompi/mpi/c/file_iread_at.c
index aed179aaf8..59e5a514c1 100644
--- a/ompi/mpi/c/file_iread_at.c
+++ b/ompi/mpi/c/file_iread_at.c
@@ -23,7 +23,7 @@
 #include "ompi/file/file.h"
 #include "ompi/mca/io/io.h"
 #include "ompi/mca/io/base/io_base_request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_iread_at = PMPI_File_iread_at
diff --git a/ompi/mpi/c/file_iread_shared.c b/ompi/mpi/c/file_iread_shared.c
index 06a90d1621..6330e8d0ed 100644
--- a/ompi/mpi/c/file_iread_shared.c
+++ b/ompi/mpi/c/file_iread_shared.c
@@ -23,7 +23,7 @@
 #include "ompi/file/file.h"
 #include "ompi/mca/io/io.h"
 #include "ompi/mca/io/base/io_base_request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_iread_shared = PMPI_File_iread_shared
diff --git a/ompi/mpi/c/file_iwrite.c b/ompi/mpi/c/file_iwrite.c
index 4d1126daec..a7822d281a 100644
--- a/ompi/mpi/c/file_iwrite.c
+++ b/ompi/mpi/c/file_iwrite.c
@@ -23,7 +23,7 @@
 #include "ompi/file/file.h"
 #include "ompi/mca/io/io.h"
 #include "ompi/mca/io/base/io_base_request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_iwrite = PMPI_File_iwrite
diff --git a/ompi/mpi/c/file_iwrite_at.c b/ompi/mpi/c/file_iwrite_at.c
index fcfe213c7b..d9d1af0c3d 100644
--- a/ompi/mpi/c/file_iwrite_at.c
+++ b/ompi/mpi/c/file_iwrite_at.c
@@ -23,7 +23,7 @@
 #include "ompi/file/file.h"
 #include "ompi/mca/io/io.h"
 #include "ompi/mca/io/base/io_base_request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_iwrite_at = PMPI_File_iwrite_at
diff --git a/ompi/mpi/c/file_iwrite_shared.c b/ompi/mpi/c/file_iwrite_shared.c
index 3825a93c08..7f406d4fa3 100644
--- a/ompi/mpi/c/file_iwrite_shared.c
+++ b/ompi/mpi/c/file_iwrite_shared.c
@@ -23,7 +23,7 @@
 #include "ompi/file/file.h"
 #include "ompi/mca/io/io.h"
 #include "ompi/mca/io/base/io_base_request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_iwrite_shared = PMPI_File_iwrite_shared
diff --git a/ompi/mpi/c/file_open.c b/ompi/mpi/c/file_open.c
index fb41b4482e..91090d2a59 100644
--- a/ompi/mpi/c/file_open.c
+++ b/ompi/mpi/c/file_open.c
@@ -23,7 +23,7 @@
 #include "ompi/file/file.h"
 #include "ompi/mca/io/io.h"
 #include "ompi/mca/io/base/base.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_open = PMPI_File_open
diff --git a/ompi/mpi/c/file_read.c b/ompi/mpi/c/file_read.c
index 96c244903d..5ca360bcd4 100644
--- a/ompi/mpi/c/file_read.c
+++ b/ompi/mpi/c/file_read.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/file/file.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_read = PMPI_File_read
diff --git a/ompi/mpi/c/file_read_all.c b/ompi/mpi/c/file_read_all.c
index cd597aa231..cf07759d55 100644
--- a/ompi/mpi/c/file_read_all.c
+++ b/ompi/mpi/c/file_read_all.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/file/file.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_read_all = PMPI_File_read_all
diff --git a/ompi/mpi/c/file_read_all_begin.c b/ompi/mpi/c/file_read_all_begin.c
index d3e026da0a..76e8f4d5ee 100644
--- a/ompi/mpi/c/file_read_all_begin.c
+++ b/ompi/mpi/c/file_read_all_begin.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/file/file.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_read_all_begin = PMPI_File_read_all_begin
diff --git a/ompi/mpi/c/file_read_at.c b/ompi/mpi/c/file_read_at.c
index 1678192b23..eaf1924385 100644
--- a/ompi/mpi/c/file_read_at.c
+++ b/ompi/mpi/c/file_read_at.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/file/file.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_read_at = PMPI_File_read_at
diff --git a/ompi/mpi/c/file_read_at_all.c b/ompi/mpi/c/file_read_at_all.c
index 956d5135b9..1a2136456b 100644
--- a/ompi/mpi/c/file_read_at_all.c
+++ b/ompi/mpi/c/file_read_at_all.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/file/file.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_read_at_all = PMPI_File_read_at_all
diff --git a/ompi/mpi/c/file_read_at_all_begin.c b/ompi/mpi/c/file_read_at_all_begin.c
index 7146df6a24..cf56e2a4a5 100644
--- a/ompi/mpi/c/file_read_at_all_begin.c
+++ b/ompi/mpi/c/file_read_at_all_begin.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/file/file.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_read_at_all_begin = PMPI_File_read_at_all_begin
diff --git a/ompi/mpi/c/file_read_ordered_begin.c b/ompi/mpi/c/file_read_ordered_begin.c
index eba1fe50b6..0ac314cde1 100644
--- a/ompi/mpi/c/file_read_ordered_begin.c
+++ b/ompi/mpi/c/file_read_ordered_begin.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/file/file.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_read_ordered_begin = PMPI_File_read_ordered_begin
diff --git a/ompi/mpi/c/file_read_shared.c b/ompi/mpi/c/file_read_shared.c
index eaa933be95..9ad9c0360d 100644
--- a/ompi/mpi/c/file_read_shared.c
+++ b/ompi/mpi/c/file_read_shared.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/file/file.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_read_shared = PMPI_File_read_shared
diff --git a/ompi/mpi/c/file_set_view.c b/ompi/mpi/c/file_set_view.c
index 4e8b774745..34474ddd11 100644
--- a/ompi/mpi/c/file_set_view.c
+++ b/ompi/mpi/c/file_set_view.c
@@ -22,7 +22,7 @@
 #include "ompi/datatype/datatype.h"
 #include "ompi/info/info.h"
 #include "ompi/file/file.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_set_view = PMPI_File_set_view
diff --git a/ompi/mpi/c/file_write.c b/ompi/mpi/c/file_write.c
index 8020821c9d..fc4f772469 100644
--- a/ompi/mpi/c/file_write.c
+++ b/ompi/mpi/c/file_write.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/file/file.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_write = PMPI_File_write
diff --git a/ompi/mpi/c/file_write_all.c b/ompi/mpi/c/file_write_all.c
index 0c3d885215..cea48b1731 100644
--- a/ompi/mpi/c/file_write_all.c
+++ b/ompi/mpi/c/file_write_all.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/file/file.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_write_all = PMPI_File_write_all
diff --git a/ompi/mpi/c/file_write_all_begin.c b/ompi/mpi/c/file_write_all_begin.c
index ae231b7153..3ac31d7f52 100644
--- a/ompi/mpi/c/file_write_all_begin.c
+++ b/ompi/mpi/c/file_write_all_begin.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/file/file.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_write_all_begin = PMPI_File_write_all_begin
diff --git a/ompi/mpi/c/file_write_at.c b/ompi/mpi/c/file_write_at.c
index 58d1affbc1..6da5ccaffb 100644
--- a/ompi/mpi/c/file_write_at.c
+++ b/ompi/mpi/c/file_write_at.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/file/file.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_write_at = PMPI_File_write_at
diff --git a/ompi/mpi/c/file_write_at_all.c b/ompi/mpi/c/file_write_at_all.c
index 4c3ae0b76d..93efcb9c57 100644
--- a/ompi/mpi/c/file_write_at_all.c
+++ b/ompi/mpi/c/file_write_at_all.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/file/file.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_write_at_all = PMPI_File_write_at_all
diff --git a/ompi/mpi/c/file_write_at_all_begin.c b/ompi/mpi/c/file_write_at_all_begin.c
index 6317a4730e..112124e16a 100644
--- a/ompi/mpi/c/file_write_at_all_begin.c
+++ b/ompi/mpi/c/file_write_at_all_begin.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/file/file.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_write_at_all_begin = PMPI_File_write_at_all_begin
diff --git a/ompi/mpi/c/file_write_ordered.c b/ompi/mpi/c/file_write_ordered.c
index 1bd454e53a..71b4496b87 100644
--- a/ompi/mpi/c/file_write_ordered.c
+++ b/ompi/mpi/c/file_write_ordered.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/file/file.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_write_ordered = PMPI_File_write_ordered
diff --git a/ompi/mpi/c/file_write_ordered_begin.c b/ompi/mpi/c/file_write_ordered_begin.c
index 249bb76dba..bdf290c9bf 100644
--- a/ompi/mpi/c/file_write_ordered_begin.c
+++ b/ompi/mpi/c/file_write_ordered_begin.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/file/file.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_write_ordered_begin = PMPI_File_write_ordered_begin
diff --git a/ompi/mpi/c/file_write_shared.c b/ompi/mpi/c/file_write_shared.c
index 417238c09a..2e8a085014 100644
--- a/ompi/mpi/c/file_write_shared.c
+++ b/ompi/mpi/c/file_write_shared.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/file/file.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_write_shared = PMPI_File_write_shared
diff --git a/ompi/mpi/c/gather.c b/ompi/mpi/c/gather.c
index 3c7b788f73..8bce5bac59 100644
--- a/ompi/mpi/c/gather.c
+++ b/ompi/mpi/c/gather.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Gather = PMPI_Gather
diff --git a/ompi/mpi/c/gatherv.c b/ompi/mpi/c/gatherv.c
index 8233189409..20b7fc73ee 100644
--- a/ompi/mpi/c/gatherv.c
+++ b/ompi/mpi/c/gatherv.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Gatherv = PMPI_Gatherv
diff --git a/ompi/mpi/c/get.c b/ompi/mpi/c/get.c
index 822ccb2e0e..58d8e8b77d 100644
--- a/ompi/mpi/c/get.c
+++ b/ompi/mpi/c/get.c
@@ -22,7 +22,7 @@
 #include "ompi/win/win.h"
 #include "ompi/mca/osc/osc.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Get = PMPI_Get
diff --git a/ompi/mpi/c/get_count.c b/ompi/mpi/c/get_count.c
index 4efe328c5b..d39ee7429d 100644
--- a/ompi/mpi/c/get_count.c
+++ b/ompi/mpi/c/get_count.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Get_count = PMPI_Get_count
diff --git a/ompi/mpi/c/get_elements.c b/ompi/mpi/c/get_elements.c
index 826b60c110..5a238ecacc 100644
--- a/ompi/mpi/c/get_elements.c
+++ b/ompi/mpi/c/get_elements.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Get_elements = PMPI_Get_elements
diff --git a/ompi/mpi/c/graph_create.c b/ompi/mpi/c/graph_create.c
index 9fadf9871d..bf018abff7 100644
--- a/ompi/mpi/c/graph_create.c
+++ b/ompi/mpi/c/graph_create.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/topo/topo.h"
 #include "ompi/mca/topo/base/base.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Graph_create = PMPI_Graph_create
diff --git a/ompi/mpi/c/graph_get.c b/ompi/mpi/c/graph_get.c
index 40d6093190..6ca4fc563b 100644
--- a/ompi/mpi/c/graph_get.c
+++ b/ompi/mpi/c/graph_get.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/topo/topo.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Graph_get = PMPI_Graph_get
diff --git a/ompi/mpi/c/graph_map.c b/ompi/mpi/c/graph_map.c
index 59fe7cd47f..33fafb6a98 100644
--- a/ompi/mpi/c/graph_map.c
+++ b/ompi/mpi/c/graph_map.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/topo/topo.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Graph_map = PMPI_Graph_map
diff --git a/ompi/mpi/c/graph_neighbors.c b/ompi/mpi/c/graph_neighbors.c
index ca7c0d4170..916e02d793 100644
--- a/ompi/mpi/c/graph_neighbors.c
+++ b/ompi/mpi/c/graph_neighbors.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/topo/topo.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Graph_neighbors = PMPI_Graph_neighbors
diff --git a/ompi/mpi/c/graph_neighbors_count.c b/ompi/mpi/c/graph_neighbors_count.c
index 71f193d86b..82510052f6 100644
--- a/ompi/mpi/c/graph_neighbors_count.c
+++ b/ompi/mpi/c/graph_neighbors_count.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/topo/topo.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Graph_neighbors_count = PMPI_Graph_neighbors_count
diff --git a/ompi/mpi/c/graphdims_get.c b/ompi/mpi/c/graphdims_get.c
index 787f66d0c3..a6ded00ebe 100644
--- a/ompi/mpi/c/graphdims_get.c
+++ b/ompi/mpi/c/graphdims_get.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/topo/topo.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Graphdims_get = PMPI_Graphdims_get
diff --git a/ompi/mpi/c/grequest_complete.c b/ompi/mpi/c/grequest_complete.c
index 6ee5f25599..48bc06782e 100644
--- a/ompi/mpi/c/grequest_complete.c
+++ b/ompi/mpi/c/grequest_complete.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/request/grequest.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Grequest_complete = PMPI_Grequest_complete
diff --git a/ompi/mpi/c/ibsend.c b/ompi/mpi/c/ibsend.c
index 2748533718..963b0a9e8a 100644
--- a/ompi/mpi/c/ibsend.c
+++ b/ompi/mpi/c/ibsend.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/pml/base/pml_base_bsend.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Ibsend = PMPI_Ibsend
diff --git a/ompi/mpi/c/intercomm_create.c b/ompi/mpi/c/intercomm_create.c
index 6f14f628f0..0825dc40f8 100644
--- a/ompi/mpi/c/intercomm_create.c
+++ b/ompi/mpi/c/intercomm_create.c
@@ -24,7 +24,7 @@
 #include "ompi/mca/pml/pml.h"
 #include "ompi/communicator/communicator.h"
 #include "ompi/request/request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Intercomm_create = PMPI_Intercomm_create
diff --git a/ompi/mpi/c/intercomm_merge.c b/ompi/mpi/c/intercomm_merge.c
index b880c54823..a619605c6c 100644
--- a/ompi/mpi/c/intercomm_merge.c
+++ b/ompi/mpi/c/intercomm_merge.c
@@ -24,7 +24,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/communicator/communicator.h"
 #include "ompi/proc/proc.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Intercomm_merge = PMPI_Intercomm_merge
diff --git a/ompi/mpi/c/iprobe.c b/ompi/mpi/c/iprobe.c
index e2082af2e2..f827081baa 100644
--- a/ompi/mpi/c/iprobe.c
+++ b/ompi/mpi/c/iprobe.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 #include "ompi/request/request.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
diff --git a/ompi/mpi/c/irecv.c b/ompi/mpi/c/irecv.c
index f31068c680..e41960a848 100644
--- a/ompi/mpi/c/irecv.c
+++ b/ompi/mpi/c/irecv.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Irecv = PMPI_Irecv
diff --git a/ompi/mpi/c/irsend.c b/ompi/mpi/c/irsend.c
index e582cc8822..30091fb4bf 100644
--- a/ompi/mpi/c/irsend.c
+++ b/ompi/mpi/c/irsend.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Irsend = PMPI_Irsend
diff --git a/ompi/mpi/c/isend.c b/ompi/mpi/c/isend.c
index a8211a2a2f..871aea3984 100644
--- a/ompi/mpi/c/isend.c
+++ b/ompi/mpi/c/isend.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Isend = PMPI_Isend
diff --git a/ompi/mpi/c/issend.c b/ompi/mpi/c/issend.c
index 97c421dde0..193d475211 100644
--- a/ompi/mpi/c/issend.c
+++ b/ompi/mpi/c/issend.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Issend = PMPI_Issend
diff --git a/ompi/mpi/c/pack.c b/ompi/mpi/c/pack.c
index c34f01ad42..a34d133552 100644
--- a/ompi/mpi/c/pack.c
+++ b/ompi/mpi/c/pack.c
@@ -24,7 +24,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
 #include "ompi/datatype/convertor.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Pack = PMPI_Pack
diff --git a/ompi/mpi/c/pack_external.c b/ompi/mpi/c/pack_external.c
index 68f466b291..7d3c93e51d 100644
--- a/ompi/mpi/c/pack_external.c
+++ b/ompi/mpi/c/pack_external.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
 #include "ompi/datatype/convertor.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Pack_external = PMPI_Pack_external
diff --git a/ompi/mpi/c/pack_external_size.c b/ompi/mpi/c/pack_external_size.c
index e34cb1ea0b..97124a4dcb 100644
--- a/ompi/mpi/c/pack_external_size.c
+++ b/ompi/mpi/c/pack_external_size.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
 #include "ompi/datatype/convertor.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Pack_external_size = PMPI_Pack_external_size
diff --git a/ompi/mpi/c/pack_size.c b/ompi/mpi/c/pack_size.c
index e5b7782ced..f93fe22d68 100644
--- a/ompi/mpi/c/pack_size.c
+++ b/ompi/mpi/c/pack_size.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
 #include "ompi/datatype/convertor.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Pack_size = PMPI_Pack_size
diff --git a/ompi/mpi/c/probe.c b/ompi/mpi/c/probe.c
index 62a5e0cbd0..06d4cd2870 100644
--- a/ompi/mpi/c/probe.c
+++ b/ompi/mpi/c/probe.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 #include "ompi/request/request.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
diff --git a/ompi/mpi/c/put.c b/ompi/mpi/c/put.c
index 41ce03adf9..471b0173b6 100644
--- a/ompi/mpi/c/put.c
+++ b/ompi/mpi/c/put.c
@@ -23,7 +23,7 @@
 #include "ompi/win/win.h"
 #include "ompi/mca/osc/osc.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Put = PMPI_Put
diff --git a/ompi/mpi/c/recv.c b/ompi/mpi/c/recv.c
index a88e00e0d6..4fc9d4aa9c 100644
--- a/ompi/mpi/c/recv.c
+++ b/ompi/mpi/c/recv.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 #include "ompi/request/request.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
diff --git a/ompi/mpi/c/recv_init.c b/ompi/mpi/c/recv_init.c
index 06dc6fc307..1731e221f8 100644
--- a/ompi/mpi/c/recv_init.c
+++ b/ompi/mpi/c/recv_init.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Recv_init = PMPI_Recv_init
diff --git a/ompi/mpi/c/reduce.c b/ompi/mpi/c/reduce.c
index 8044230d76..5ad2f572da 100644
--- a/ompi/mpi/c/reduce.c
+++ b/ompi/mpi/c/reduce.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
 #include "ompi/op/op.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Reduce = PMPI_Reduce
diff --git a/ompi/mpi/c/reduce_scatter.c b/ompi/mpi/c/reduce_scatter.c
index 4289c946e9..a9f2483651 100644
--- a/ompi/mpi/c/reduce_scatter.c
+++ b/ompi/mpi/c/reduce_scatter.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
 #include "ompi/op/op.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Reduce_scatter = PMPI_Reduce_scatter
diff --git a/ompi/mpi/c/request_c2f.c b/ompi/mpi/c/request_c2f.c
index 32e7f3905b..f4763f645d 100644
--- a/ompi/mpi/c/request_c2f.c
+++ b/ompi/mpi/c/request_c2f.c
@@ -23,7 +23,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mpi/f77/fint_2_int.h"
 #include "ompi/request/request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Request_c2f = PMPI_Request_c2f
diff --git a/ompi/mpi/c/request_free.c b/ompi/mpi/c/request_free.c
index 5d69c3dd29..32504a0285 100644
--- a/ompi/mpi/c/request_free.c
+++ b/ompi/mpi/c/request_free.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Request_free = PMPI_Request_free
diff --git a/ompi/mpi/c/request_get_status.c b/ompi/mpi/c/request_get_status.c
index 82e36fa6f2..3467a9650f 100644
--- a/ompi/mpi/c/request_get_status.c
+++ b/ompi/mpi/c/request_get_status.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/request/request.h"
 #include "ompi/request/grequest.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Request_get_status = PMPI_Request_get_status
diff --git a/ompi/mpi/c/rsend.c b/ompi/mpi/c/rsend.c
index b3744ee93d..f37ef475da 100644
--- a/ompi/mpi/c/rsend.c
+++ b/ompi/mpi/c/rsend.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
diff --git a/ompi/mpi/c/rsend_init.c b/ompi/mpi/c/rsend_init.c
index c1520778ea..dcda0cde9b 100644
--- a/ompi/mpi/c/rsend_init.c
+++ b/ompi/mpi/c/rsend_init.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Rsend_init = PMPI_Rsend_init
diff --git a/ompi/mpi/c/scan.c b/ompi/mpi/c/scan.c
index f4b0a9cd00..c9da467c01 100644
--- a/ompi/mpi/c/scan.c
+++ b/ompi/mpi/c/scan.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
 #include "ompi/op/op.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Scan = PMPI_Scan
diff --git a/ompi/mpi/c/scatter.c b/ompi/mpi/c/scatter.c
index 70569f55a9..db05f68ac0 100644
--- a/ompi/mpi/c/scatter.c
+++ b/ompi/mpi/c/scatter.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 /*#include "ompi/mca/coll/coll.h"*/
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Scatter = PMPI_Scatter
diff --git a/ompi/mpi/c/scatterv.c b/ompi/mpi/c/scatterv.c
index eeef7adffc..bfdab5f142 100644
--- a/ompi/mpi/c/scatterv.c
+++ b/ompi/mpi/c/scatterv.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Scatterv = PMPI_Scatterv
diff --git a/ompi/mpi/c/send.c b/ompi/mpi/c/send.c
index c895236cab..330d55d51e 100644
--- a/ompi/mpi/c/send.c
+++ b/ompi/mpi/c/send.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Send = PMPI_Send
diff --git a/ompi/mpi/c/send_init.c b/ompi/mpi/c/send_init.c
index 1f0bbf0792..7f0f6536a2 100644
--- a/ompi/mpi/c/send_init.c
+++ b/ompi/mpi/c/send_init.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Send_init = PMPI_Send_init
diff --git a/ompi/mpi/c/sendrecv.c b/ompi/mpi/c/sendrecv.c
index 4de5df3664..f1183f68cd 100644
--- a/ompi/mpi/c/sendrecv.c
+++ b/ompi/mpi/c/sendrecv.c
@@ -20,7 +20,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Sendrecv = PMPI_Sendrecv
diff --git a/ompi/mpi/c/sendrecv_replace.c b/ompi/mpi/c/sendrecv_replace.c
index 06d7d2337d..71f1f7d171 100644
--- a/ompi/mpi/c/sendrecv_replace.c
+++ b/ompi/mpi/c/sendrecv_replace.c
@@ -22,7 +22,7 @@
 #include "ompi/datatype/convertor.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/proc/proc.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Sendrecv_replace = PMPI_Sendrecv_replace
diff --git a/ompi/mpi/c/ssend.c b/ompi/mpi/c/ssend.c
index 6f4f71329a..98ee05e5f6 100644
--- a/ompi/mpi/c/ssend.c
+++ b/ompi/mpi/c/ssend.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Ssend = PMPI_Ssend
diff --git a/ompi/mpi/c/ssend_init.c b/ompi/mpi/c/ssend_init.c
index 2d4c7de54d..6b37e2dd39 100644
--- a/ompi/mpi/c/ssend_init.c
+++ b/ompi/mpi/c/ssend_init.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Ssend_init = PMPI_Ssend_init
diff --git a/ompi/mpi/c/start.c b/ompi/mpi/c/start.c
index 20442f0fc8..236bc9c4a5 100644
--- a/ompi/mpi/c/start.c
+++ b/ompi/mpi/c/start.c
@@ -23,7 +23,7 @@
 #include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
 #include "ompi/errhandler/errhandler.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Start = PMPI_Start
diff --git a/ompi/mpi/c/startall.c b/ompi/mpi/c/startall.c
index b7ddae83c1..363d574bca 100644
--- a/ompi/mpi/c/startall.c
+++ b/ompi/mpi/c/startall.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Startall = PMPI_Startall
diff --git a/ompi/mpi/c/status_c2f.c b/ompi/mpi/c/status_c2f.c
index 3358ae150a..fb9caf7342 100644
--- a/ompi/mpi/c/status_c2f.c
+++ b/ompi/mpi/c/status_c2f.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mpi/f77/fint_2_int.h"
 #include "ompi/mpi/f77/constants.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Status_c2f = PMPI_Status_c2f
diff --git a/ompi/mpi/c/status_set_cancelled.c b/ompi/mpi/c/status_set_cancelled.c
index 26315ac423..ccc0b30cab 100644
--- a/ompi/mpi/c/status_set_cancelled.c
+++ b/ompi/mpi/c/status_set_cancelled.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Status_set_cancelled = PMPI_Status_set_cancelled
diff --git a/ompi/mpi/c/status_set_elements.c b/ompi/mpi/c/status_set_elements.c
index 4bcce82cff..76beb46a19 100644
--- a/ompi/mpi/c/status_set_elements.c
+++ b/ompi/mpi/c/status_set_elements.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Status_set_elements = PMPI_Status_set_elements
diff --git a/ompi/mpi/c/test.c b/ompi/mpi/c/test.c
index b0bddb91d4..c16a4be09c 100644
--- a/ompi/mpi/c/test.c
+++ b/ompi/mpi/c/test.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Test = PMPI_Test
diff --git a/ompi/mpi/c/test_cancelled.c b/ompi/mpi/c/test_cancelled.c
index 816295b630..6d0c81ba96 100644
--- a/ompi/mpi/c/test_cancelled.c
+++ b/ompi/mpi/c/test_cancelled.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Test_cancelled = PMPI_Test_cancelled
diff --git a/ompi/mpi/c/testall.c b/ompi/mpi/c/testall.c
index 40468fdfb9..3310bc4cf3 100644
--- a/ompi/mpi/c/testall.c
+++ b/ompi/mpi/c/testall.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Testall = PMPI_Testall
diff --git a/ompi/mpi/c/testany.c b/ompi/mpi/c/testany.c
index bfd75282a4..ab6f62c02e 100644
--- a/ompi/mpi/c/testany.c
+++ b/ompi/mpi/c/testany.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Testany = PMPI_Testany
diff --git a/ompi/mpi/c/testsome.c b/ompi/mpi/c/testsome.c
index 761d74de12..1a2c07b538 100644
--- a/ompi/mpi/c/testsome.c
+++ b/ompi/mpi/c/testsome.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Testsome = PMPI_Testsome
diff --git a/ompi/mpi/c/topo_test.c b/ompi/mpi/c/topo_test.c
index 0923956ee0..9879bcd4e8 100644
--- a/ompi/mpi/c/topo_test.c
+++ b/ompi/mpi/c/topo_test.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Topo_test = PMPI_Topo_test
diff --git a/ompi/mpi/c/type_c2f.c b/ompi/mpi/c/type_c2f.c
index 8b2773e5f7..0bd17abb00 100644
--- a/ompi/mpi/c/type_c2f.c
+++ b/ompi/mpi/c/type_c2f.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mpi/f77/fint_2_int.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_c2f = PMPI_Type_c2f
diff --git a/ompi/mpi/c/type_commit.c b/ompi/mpi/c/type_commit.c
index d6854acf58..30748c7938 100644
--- a/ompi/mpi/c/type_commit.c
+++ b/ompi/mpi/c/type_commit.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_commit = PMPI_Type_commit
diff --git a/ompi/mpi/c/type_contiguous.c b/ompi/mpi/c/type_contiguous.c
index 51267bdcdc..8a7bb52b49 100644
--- a/ompi/mpi/c/type_contiguous.c
+++ b/ompi/mpi/c/type_contiguous.c
@@ -21,7 +21,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_contiguous = PMPI_Type_contiguous
diff --git a/ompi/mpi/c/type_create_darray.c b/ompi/mpi/c/type_create_darray.c
index 0daed09f64..42cd113702 100644
--- a/ompi/mpi/c/type_create_darray.c
+++ b/ompi/mpi/c/type_create_darray.c
@@ -22,7 +22,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_create_darray = PMPI_Type_create_darray
diff --git a/ompi/mpi/c/type_create_hindexed.c b/ompi/mpi/c/type_create_hindexed.c
index ee2327cf36..93992aae6f 100644
--- a/ompi/mpi/c/type_create_hindexed.c
+++ b/ompi/mpi/c/type_create_hindexed.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_create_hindexed = PMPI_Type_create_hindexed
diff --git a/ompi/mpi/c/type_create_hvector.c b/ompi/mpi/c/type_create_hvector.c
index 7fdad1766f..670db2e702 100644
--- a/ompi/mpi/c/type_create_hvector.c
+++ b/ompi/mpi/c/type_create_hvector.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_create_hvector = PMPI_Type_create_hvector
diff --git a/ompi/mpi/c/type_create_indexed_block.c b/ompi/mpi/c/type_create_indexed_block.c
index d62e5da7b9..42941b9592 100644
--- a/ompi/mpi/c/type_create_indexed_block.c
+++ b/ompi/mpi/c/type_create_indexed_block.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_create_indexed_block = PMPI_Type_create_indexed_block
diff --git a/ompi/mpi/c/type_create_resized.c b/ompi/mpi/c/type_create_resized.c
index 405c4209f7..96de53fcaf 100644
--- a/ompi/mpi/c/type_create_resized.c
+++ b/ompi/mpi/c/type_create_resized.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_create_resized = PMPI_Type_create_resized
diff --git a/ompi/mpi/c/type_create_struct.c b/ompi/mpi/c/type_create_struct.c
index 4fe5d30e5c..56b49197f1 100644
--- a/ompi/mpi/c/type_create_struct.c
+++ b/ompi/mpi/c/type_create_struct.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_create_struct = PMPI_Type_create_struct
diff --git a/ompi/mpi/c/type_create_subarray.c b/ompi/mpi/c/type_create_subarray.c
index 610d7d11b2..6b95678051 100644
--- a/ompi/mpi/c/type_create_subarray.c
+++ b/ompi/mpi/c/type_create_subarray.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_create_subarray = PMPI_Type_create_subarray
diff --git a/ompi/mpi/c/type_delete_attr.c b/ompi/mpi/c/type_delete_attr.c
index f7447a282e..1384323cd1 100644
--- a/ompi/mpi/c/type_delete_attr.c
+++ b/ompi/mpi/c/type_delete_attr.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/attribute/attribute.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_delete_attr = PMPI_Type_delete_attr
diff --git a/ompi/mpi/c/type_dup.c b/ompi/mpi/c/type_dup.c
index 79d5f42f1d..e658f1d65b 100644
--- a/ompi/mpi/c/type_dup.c
+++ b/ompi/mpi/c/type_dup.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
 #include "ompi/attribute/attribute.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_dup = PMPI_Type_dup
diff --git a/ompi/mpi/c/type_extent.c b/ompi/mpi/c/type_extent.c
index 311387e826..cd265f8a92 100644
--- a/ompi/mpi/c/type_extent.c
+++ b/ompi/mpi/c/type_extent.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_extent = PMPI_Type_extent
diff --git a/ompi/mpi/c/type_f2c.c b/ompi/mpi/c/type_f2c.c
index 5d67e2984f..c820bf8ee6 100644
--- a/ompi/mpi/c/type_f2c.c
+++ b/ompi/mpi/c/type_f2c.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mpi/f77/fint_2_int.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_f2c = PMPI_Type_f2c
diff --git a/ompi/mpi/c/type_free.c b/ompi/mpi/c/type_free.c
index 922d4480c6..22dd6a6a90 100644
--- a/ompi/mpi/c/type_free.c
+++ b/ompi/mpi/c/type_free.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_free = PMPI_Type_free
diff --git a/ompi/mpi/c/type_get_attr.c b/ompi/mpi/c/type_get_attr.c
index 2a81ba0e5a..b7f62cbee9 100644
--- a/ompi/mpi/c/type_get_attr.c
+++ b/ompi/mpi/c/type_get_attr.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/attribute/attribute.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_get_attr = PMPI_Type_get_attr
diff --git a/ompi/mpi/c/type_get_contents.c b/ompi/mpi/c/type_get_contents.c
index 7b0096183d..f5645b2f1f 100644
--- a/ompi/mpi/c/type_get_contents.c
+++ b/ompi/mpi/c/type_get_contents.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_get_contents = PMPI_Type_get_contents
diff --git a/ompi/mpi/c/type_get_envelope.c b/ompi/mpi/c/type_get_envelope.c
index 5a53bc6de3..0ae292f08e 100644
--- a/ompi/mpi/c/type_get_envelope.c
+++ b/ompi/mpi/c/type_get_envelope.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_get_envelope = PMPI_Type_get_envelope
diff --git a/ompi/mpi/c/type_get_extent.c b/ompi/mpi/c/type_get_extent.c
index f04f9670da..2913f58d44 100644
--- a/ompi/mpi/c/type_get_extent.c
+++ b/ompi/mpi/c/type_get_extent.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_get_extent = PMPI_Type_get_extent
diff --git a/ompi/mpi/c/type_get_name.c b/ompi/mpi/c/type_get_name.c
index 9c0ffa1caa..355b44d506 100644
--- a/ompi/mpi/c/type_get_name.c
+++ b/ompi/mpi/c/type_get_name.c
@@ -22,7 +22,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_get_name = PMPI_Type_get_name
diff --git a/ompi/mpi/c/type_get_true_extent.c b/ompi/mpi/c/type_get_true_extent.c
index 481622b40a..5aadc46a61 100644
--- a/ompi/mpi/c/type_get_true_extent.c
+++ b/ompi/mpi/c/type_get_true_extent.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_get_true_extent = PMPI_Type_get_true_extent
diff --git a/ompi/mpi/c/type_hindexed.c b/ompi/mpi/c/type_hindexed.c
index 72b17a6f16..b3579fef8a 100644
--- a/ompi/mpi/c/type_hindexed.c
+++ b/ompi/mpi/c/type_hindexed.c
@@ -19,7 +19,7 @@
 #include "ompi_config.h"
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_hindexed = PMPI_Type_hindexed
diff --git a/ompi/mpi/c/type_hvector.c b/ompi/mpi/c/type_hvector.c
index c60eedc6f9..a38a5334ee 100644
--- a/ompi/mpi/c/type_hvector.c
+++ b/ompi/mpi/c/type_hvector.c
@@ -19,7 +19,7 @@
 #include "ompi_config.h"
 
 #include "ompi/mpi/c/bindings.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_hvector = PMPI_Type_hvector
diff --git a/ompi/mpi/c/type_indexed.c b/ompi/mpi/c/type_indexed.c
index 4e251afa98..a2fe923efd 100644
--- a/ompi/mpi/c/type_indexed.c
+++ b/ompi/mpi/c/type_indexed.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_indexed = PMPI_Type_indexed
diff --git a/ompi/mpi/c/type_lb.c b/ompi/mpi/c/type_lb.c
index 234b6bdd5c..3e68455d6d 100644
--- a/ompi/mpi/c/type_lb.c
+++ b/ompi/mpi/c/type_lb.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_lb = PMPI_Type_lb
diff --git a/ompi/mpi/c/type_set_attr.c b/ompi/mpi/c/type_set_attr.c
index 4e6ef5e390..6bdcbcaf02 100644
--- a/ompi/mpi/c/type_set_attr.c
+++ b/ompi/mpi/c/type_set_attr.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/attribute/attribute.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_set_attr = PMPI_Type_set_attr
diff --git a/ompi/mpi/c/type_set_name.c b/ompi/mpi/c/type_set_name.c
index 8c1e456c38..f1e6cc326d 100644
--- a/ompi/mpi/c/type_set_name.c
+++ b/ompi/mpi/c/type_set_name.c
@@ -22,7 +22,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_set_name = PMPI_Type_set_name
diff --git a/ompi/mpi/c/type_size.c b/ompi/mpi/c/type_size.c
index 2c18dee124..5b11c7036a 100644
--- a/ompi/mpi/c/type_size.c
+++ b/ompi/mpi/c/type_size.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_size = PMPI_Type_size
diff --git a/ompi/mpi/c/type_ub.c b/ompi/mpi/c/type_ub.c
index 326aa1879e..3805159520 100644
--- a/ompi/mpi/c/type_ub.c
+++ b/ompi/mpi/c/type_ub.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_ub = PMPI_Type_ub
diff --git a/ompi/mpi/c/type_vector.c b/ompi/mpi/c/type_vector.c
index afe045f8fc..8f028465f3 100644
--- a/ompi/mpi/c/type_vector.c
+++ b/ompi/mpi/c/type_vector.c
@@ -20,7 +20,7 @@
 
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Type_vector = PMPI_Type_vector
diff --git a/ompi/mpi/c/unpack.c b/ompi/mpi/c/unpack.c
index 15c900ca15..3b3af50816 100644
--- a/ompi/mpi/c/unpack.c
+++ b/ompi/mpi/c/unpack.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
 #include "ompi/datatype/convertor.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Unpack = PMPI_Unpack
diff --git a/ompi/mpi/c/unpack_external.c b/ompi/mpi/c/unpack_external.c
index b83bdf9a72..291889ac70 100644
--- a/ompi/mpi/c/unpack_external.c
+++ b/ompi/mpi/c/unpack_external.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/datatype/datatype.h"
 #include "ompi/datatype/convertor.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Unpack_external = PMPI_Unpack_external
diff --git a/ompi/mpi/c/wait.c b/ompi/mpi/c/wait.c
index 20fb80988d..d88599fd13 100644
--- a/ompi/mpi/c/wait.c
+++ b/ompi/mpi/c/wait.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Wait = PMPI_Wait
diff --git a/ompi/mpi/c/waitall.c b/ompi/mpi/c/waitall.c
index 97f2b33916..b624421cea 100644
--- a/ompi/mpi/c/waitall.c
+++ b/ompi/mpi/c/waitall.c
@@ -22,7 +22,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Waitall = PMPI_Waitall
diff --git a/ompi/mpi/c/waitany.c b/ompi/mpi/c/waitany.c
index abbe008a00..cb93f2e29b 100644
--- a/ompi/mpi/c/waitany.c
+++ b/ompi/mpi/c/waitany.c
@@ -24,7 +24,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Waitany = PMPI_Waitany
diff --git a/ompi/mpi/c/waitsome.c b/ompi/mpi/c/waitsome.c
index dae8e8077f..147b830b9e 100644
--- a/ompi/mpi/c/waitsome.c
+++ b/ompi/mpi/c/waitsome.c
@@ -24,7 +24,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/mca/pml/pml.h"
 #include "ompi/request/request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Waitsome = PMPI_Waitsome
diff --git a/ompi/mpi/c/win_create.c b/ompi/mpi/c/win_create.c
index 5ceb2bd6d7..ba00401c80 100644
--- a/ompi/mpi/c/win_create.c
+++ b/ompi/mpi/c/win_create.c
@@ -24,7 +24,7 @@
 #include "ompi/info/info.h"
 #include "ompi/win/win.h"
 #include "ompi/attribute/attribute.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Win_create = PMPI_Win_create
diff --git a/ompi/mpi/c/win_fence.c b/ompi/mpi/c/win_fence.c
index 68b2be7ac3..9cc9226b34 100644
--- a/ompi/mpi/c/win_fence.c
+++ b/ompi/mpi/c/win_fence.c
@@ -21,7 +21,7 @@
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/win/win.h"
 #include "ompi/mca/osc/osc.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Win_fence = PMPI_Win_fence
diff --git a/ompi/request/req_wait.c b/ompi/request/req_wait.c
index 7b811e943e..89d8f73c29 100644
--- a/ompi/request/req_wait.c
+++ b/ompi/request/req_wait.c
@@ -26,7 +26,7 @@
 #include "opal/runtime/opal_cr.h"
 #include "ompi/mca/crcp/crcp.h"
 #include "ompi/mca/pml/base/pml_base_request.h"
-#include "ompi/include/ompi/memchecker.h"
+#include "ompi/memchecker.h"
 
 
 int ompi_request_default_wait(