diff --git a/ompi/attribute/attribute.c b/ompi/attribute/attribute.c
index 00436820e5..75bcdf8eae 100644
--- a/ompi/attribute/attribute.c
+++ b/ompi/attribute/attribute.c
@@ -191,7 +191,7 @@
 
 #include "attribute/attribute.h"
 #include "opal/threads/mutex.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "datatype/datatype.h"
 #include "communicator/communicator.h"
 #include "win/win.h"
diff --git a/ompi/attribute/attribute.h b/ompi/attribute/attribute.h
index ed97c55ca2..19f5fa1c95 100644
--- a/ompi/attribute/attribute.h
+++ b/ompi/attribute/attribute.h
@@ -27,7 +27,7 @@
 #include "mpi.h"
 
 #include "ompi_config.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/class/opal_object.h"
 #include "class/ompi_bitmap.h"
 #include "class/opal_hash_table.h"
diff --git a/ompi/class/ompi_bitmap.c b/ompi/class/ompi_bitmap.c
index f7ee3b83a1..39aebe1043 100644
--- a/ompi/class/ompi_bitmap.c
+++ b/ompi/class/ompi_bitmap.c
@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "class/ompi_bitmap.h"
 
 
diff --git a/ompi/class/ompi_circular_buffer_fifo.h b/ompi/class/ompi_circular_buffer_fifo.h
index ac7b96226d..0f48b8ff01 100644
--- a/ompi/class/ompi_circular_buffer_fifo.h
+++ b/ompi/class/ompi_circular_buffer_fifo.h
@@ -17,7 +17,7 @@
 #ifndef _OMPI_CIRCULAR_BUFFER_FIFO
 #define _OMPI_CIRCULAR_BUFFER_FIFO
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "include/sys/cache.h"
 #include "include/sys/atomic.h"
 #include "mca/mpool/mpool.h"
diff --git a/ompi/class/ompi_fifo.h b/ompi/class/ompi_fifo.h
index 9ba14bf2e6..f23fe83bde 100644
--- a/ompi/class/ompi_fifo.h
+++ b/ompi/class/ompi_fifo.h
@@ -17,7 +17,7 @@
 #ifndef _OMPI_FIFO
 #define _OMPI_FIFO
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "include/sys/cache.h"
 #include "include/sys/atomic.h"
 #include "mca/mpool/mpool.h"
diff --git a/ompi/class/ompi_free_list.h b/ompi/class/ompi_free_list.h
index 2316123bdd..7b4eaa37ce 100644
--- a/ompi/class/ompi_free_list.h
+++ b/ompi/class/ompi_free_list.h
@@ -21,7 +21,7 @@
 #include "opal/class/opal_list.h"
 #include "opal/threads/thread.h"
 #include "opal/threads/condition.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "mca/mpool/mpool.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/ompi/class/ompi_pointer_array.c b/ompi/class/ompi_pointer_array.c
index 960e53f0a5..f94a77f2fd 100644
--- a/ompi/class/ompi_pointer_array.c
+++ b/ompi/class/ompi_pointer_array.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "class/ompi_pointer_array.h"
 #include "opal/util/output.h"
 
diff --git a/ompi/class/ompi_rb_tree.h b/ompi/class/ompi_rb_tree.h
index e742b17783..d8fd8e59c6 100644
--- a/ompi/class/ompi_rb_tree.h
+++ b/ompi/class/ompi_rb_tree.h
@@ -24,7 +24,7 @@
 #define OMPI_RB_TREE_H
 
 #include <stdlib.h>
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/class/opal_object.h"
 #include "class/ompi_free_list.h"
 
diff --git a/ompi/communicator/comm.c b/ompi/communicator/comm.c
index 6c8ea38b43..a8703077db 100644
--- a/ompi/communicator/comm.c
+++ b/ompi/communicator/comm.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include "mpi.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "dps/dps.h"
 #include "proc/proc.h"
 #include "opal/threads/mutex.h"
diff --git a/ompi/communicator/comm_cid.c b/ompi/communicator/comm_cid.c
index 36e52b6481..b415df5901 100644
--- a/ompi/communicator/comm_cid.c
+++ b/ompi/communicator/comm_cid.c
@@ -22,7 +22,7 @@
 #include "mca/ns/ns_types.h"
 #include "communicator/communicator.h"
 #include "proc/proc.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "class/ompi_pointer_array.h"
 #include "opal/class/opal_list.h"
 #include "mca/pml/pml.h"
diff --git a/ompi/communicator/comm_dyn.c b/ompi/communicator/comm_dyn.c
index 040115bfb6..32924abf43 100644
--- a/ompi/communicator/comm_dyn.c
+++ b/ompi/communicator/comm_dyn.c
@@ -35,7 +35,7 @@
 #include "util/proc_info.h"
 #include "opal/util/bit_ops.h"
 #include "opal/util/argv.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "mca/pml/pml.h"
 #include "mca/ns/ns.h"
 #include "mca/gpr/gpr.h"
diff --git a/ompi/communicator/comm_init.c b/ompi/communicator/comm_init.c
index ee29c96993..5031a984ee 100644
--- a/ompi/communicator/comm_init.c
+++ b/ompi/communicator/comm_init.c
@@ -21,7 +21,7 @@
 #include "mpi.h"
 
 #include "opal/util/bit_ops.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "mca/pml/pml.h"
 #include "mca/coll/base/base.h"
 #include "mca/topo/base/base.h"
diff --git a/ompi/communicator/comm_publish.c b/ompi/communicator/comm_publish.c
index 8d7d5a11d4..cb62fa43e1 100644
--- a/ompi/communicator/comm_publish.c
+++ b/ompi/communicator/comm_publish.c
@@ -20,7 +20,7 @@
 #include "mpi.h"
 
 #include "communicator/communicator.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 
 #include "mca/errmgr/errmgr.h"
 #include "mca/pml/pml.h"
diff --git a/ompi/datatype/convertor.h b/ompi/datatype/convertor.h
index 63ff9de72a..3e0a97aa5b 100644
--- a/ompi/datatype/convertor.h
+++ b/ompi/datatype/convertor.h
@@ -19,7 +19,7 @@
 #define CONVERTOR_H_HAS_BEEN_INCLUDED
 
 #include "ompi_config.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
diff --git a/ompi/datatype/datatype.h b/ompi/datatype/datatype.h
index 36a780945f..118c82b98f 100644
--- a/ompi/datatype/datatype.h
+++ b/ompi/datatype/datatype.h
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #endif
 #include <string.h>
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/class/opal_object.h"
 #include "class/opal_hash_table.h"
 #include "class/ompi_pointer_array.h"
diff --git a/ompi/datatype/dt_arch.h b/ompi/datatype/dt_arch.h
index 2bd497317f..31017ffc23 100644
--- a/ompi/datatype/dt_arch.h
+++ b/ompi/datatype/dt_arch.h
@@ -20,7 +20,7 @@
 #include "ompi_config.h"
 #include <float.h>
 #include <assert.h>
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 
 /***************************************************
 ** This file tries to classify the most relevant
diff --git a/ompi/errhandler/errclass.c b/ompi/errhandler/errclass.c
index 43c3f28d75..47cdcc5ea5 100644
--- a/ompi/errhandler/errclass.c
+++ b/ompi/errhandler/errclass.c
@@ -20,7 +20,7 @@
 #include "mpi.h"
 
 #include "errhandler/errclass.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 
 /* Table holding all error codes */
 ompi_pointer_array_t ompi_errclasses;
diff --git a/ompi/errhandler/errcode-internal.h b/ompi/errhandler/errcode-internal.h
index 20fe6168f9..8f938d7f84 100644
--- a/ompi/errhandler/errcode-internal.h
+++ b/ompi/errhandler/errcode-internal.h
@@ -21,7 +21,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/class/opal_object.h"
 #include "class/ompi_pointer_array.h"
 
diff --git a/ompi/errhandler/errcode.c b/ompi/errhandler/errcode.c
index 09c5464428..ece22a59a3 100644
--- a/ompi/errhandler/errcode.c
+++ b/ompi/errhandler/errcode.c
@@ -21,7 +21,7 @@
 #include "mpi.h"
 
 #include "errhandler/errcode.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 
 /* Table holding all error codes */
 ompi_pointer_array_t ompi_mpi_errcodes;
diff --git a/ompi/group/group.c b/ompi/group/group.c
index e906d0fa5c..609d417438 100644
--- a/ompi/group/group.c
+++ b/ompi/group/group.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 #include "group/group.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "mpi.h"
 
 int ompi_group_translate_ranks ( ompi_group_t *group1, 
diff --git a/ompi/group/group_init.c b/ompi/group/group_init.c
index b8782f8e68..2f5ce751d6 100644
--- a/ompi/group/group_init.c
+++ b/ompi/group/group_init.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 #include "group/group.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "mpi.h"
 
 /* define class information */
diff --git a/ompi/group/group_rank.c b/ompi/group/group_rank.c
index f64a2ccf92..383285e7f8 100644
--- a/ompi/group/group_rank.c
+++ b/ompi/group/group_rank.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 #include "group/group.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 
 /*
  * Set group rank in a group structure.
diff --git a/ompi/include/ompi_socket_errno.h b/ompi/include/ompi_socket_errno.h
index 469292abba..748bae2706 100644
--- a/ompi/include/ompi_socket_errno.h
+++ b/ompi/include/ompi_socket_errno.h
@@ -26,7 +26,7 @@
    OF errno FOR COMPATIBILITY  */
 
 #include <errno.h>
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #ifdef WIN32
 #define ompi_socket_errno ompi_get_socket_errno()
 
diff --git a/ompi/info/info.c b/ompi/info/info.c
index 94d893cbf3..328bf202f7 100644
--- a/ompi/info/info.c
+++ b/ompi/info/info.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "info/info.h"
 #include "ompi/runtime/params.h"
 #include "opal/util/output.h"
diff --git a/ompi/mca/allocator/base/allocator_base_close.c b/ompi/mca/allocator/base/allocator_base_close.c
index 847fb97ee3..aaf9aa1edd 100644
--- a/ompi/mca/allocator/base/allocator_base_close.c
+++ b/ompi/mca/allocator/base/allocator_base_close.c
@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "mca/mca.h"
 #include "mca/base/base.h"
 #include "mca/allocator/allocator.h"
diff --git a/ompi/mca/allocator/basic/allocator_basic.c b/ompi/mca/allocator/basic/allocator_basic.c
index 014976f301..b12d9932a5 100644
--- a/ompi/mca/allocator/basic/allocator_basic.c
+++ b/ompi/mca/allocator/basic/allocator_basic.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 #include "opal/util/output.h"
 #include "allocator_basic.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 
 
 
diff --git a/ompi/mca/allocator/bucket/allocator_bucket.c b/ompi/mca/allocator/bucket/allocator_bucket.c
index 0dd35f5c45..90c17e6e43 100644
--- a/ompi/mca/allocator/bucket/allocator_bucket.c
+++ b/ompi/mca/allocator/bucket/allocator_bucket.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 #include "mca/allocator/allocator.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "mca/base/mca_base_param.h"
 #include "mca/allocator/bucket/allocator_bucket_alloc.h"
 #include "mca/mpool/mpool.h" 
diff --git a/ompi/mca/allocator/bucket/allocator_bucket_alloc.c b/ompi/mca/allocator/bucket/allocator_bucket_alloc.c
index 8f1dd916c9..6c92399d7f 100644
--- a/ompi/mca/allocator/bucket/allocator_bucket_alloc.c
+++ b/ompi/mca/allocator/bucket/allocator_bucket_alloc.c
@@ -15,7 +15,7 @@
  */
 
 #include "ompi_config.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "mca/allocator/bucket/allocator_bucket_alloc.h"
 /**
   * The define controls the size in bytes of the 1st bucket and hence every one
diff --git a/ompi/mca/btl/base/btl_base_close.c b/ompi/mca/btl/base/btl_base_close.c
index b2cd211898..b16162b0f8 100644
--- a/ompi/mca/btl/base/btl_base_close.c
+++ b/ompi/mca/btl/base/btl_base_close.c
@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/event/event.h"
 #include "mca/mca.h"
 #include "mca/base/base.h"
diff --git a/ompi/mca/btl/gm/btl_gm_component.c b/ompi/mca/btl/gm/btl_gm_component.c
index 414385752f..15892d70be 100644
--- a/ompi/mca/btl/gm/btl_gm_component.c
+++ b/ompi/mca/btl/gm/btl_gm_component.c
@@ -16,7 +16,7 @@
 
 
 #include "ompi_config.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/event/event.h"
 #include "opal/util/if.h"
 #include "opal/util/argv.h"
diff --git a/ompi/mca/btl/mvapi/btl_mvapi_component.c b/ompi/mca/btl/mvapi/btl_mvapi_component.c
index 0e3c3c1579..c7f88d8293 100644
--- a/ompi/mca/btl/mvapi/btl_mvapi_component.c
+++ b/ompi/mca/btl/mvapi/btl_mvapi_component.c
@@ -16,7 +16,7 @@
 
 
 #include "ompi_config.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/event/event.h"
 #include "opal/util/if.h"
 #include "opal/util/argv.h"
diff --git a/ompi/mca/btl/mx/btl_mx_component.c b/ompi/mca/btl/mx/btl_mx_component.c
index 0413da1caf..ce4c35447f 100644
--- a/ompi/mca/btl/mx/btl_mx_component.c
+++ b/ompi/mca/btl/mx/btl_mx_component.c
@@ -16,7 +16,7 @@
 
 
 #include "ompi_config.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/event/event.h"
 #include "opal/util/if.h"
 #include "opal/util/argv.h"
diff --git a/ompi/mca/btl/openib/btl_openib_component.c b/ompi/mca/btl/openib/btl_openib_component.c
index d06d925970..c3bf60c8a8 100644
--- a/ompi/mca/btl/openib/btl_openib_component.c
+++ b/ompi/mca/btl/openib/btl_openib_component.c
@@ -16,7 +16,7 @@
 
 
 #include "ompi_config.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/event/event.h"
 #include "opal/util/if.h"
 #include "opal/util/argv.h"
diff --git a/ompi/mca/btl/portals/btl_portals.c b/ompi/mca/btl/portals/btl_portals.c
index 05437aaf49..1a14cdcf5e 100644
--- a/ompi/mca/btl/portals/btl_portals.c
+++ b/ompi/mca/btl/portals/btl_portals.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/pml/pml.h"
 #include "mca/btl/btl.h"
diff --git a/ompi/mca/btl/portals/btl_portals_compat_redstorm.c b/ompi/mca/btl/portals/btl_portals_compat_redstorm.c
index 8264d647cb..ee33b450a1 100644
--- a/ompi/mca/btl/portals/btl_portals_compat_redstorm.c
+++ b/ompi/mca/btl/portals/btl_portals_compat_redstorm.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 
 #include "btl_portals.h"
diff --git a/ompi/mca/btl/portals/btl_portals_compat_utcp.c b/ompi/mca/btl/portals/btl_portals_compat_utcp.c
index 381ade1210..ad3ccfd2ca 100644
--- a/ompi/mca/btl/portals/btl_portals_compat_utcp.c
+++ b/ompi/mca/btl/portals/btl_portals_compat_utcp.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <netinet/in.h>
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 
 #include "btl_portals.h"
diff --git a/ompi/mca/btl/portals/btl_portals_component.c b/ompi/mca/btl/portals/btl_portals_component.c
index 9c8d2bd76c..e0d7a69940 100644
--- a/ompi/mca/btl/portals/btl_portals_component.c
+++ b/ompi/mca/btl/portals/btl_portals_component.c
@@ -19,7 +19,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 
 #include "opal/util/output.h"
 #include "opal/threads/thread.h"
diff --git a/ompi/mca/btl/portals/btl_portals_rdma.c b/ompi/mca/btl/portals/btl_portals_rdma.c
index 3ed3d8df20..3985bc858c 100644
--- a/ompi/mca/btl/portals/btl_portals_rdma.c
+++ b/ompi/mca/btl/portals/btl_portals_rdma.c
@@ -17,7 +17,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 
 #include "btl_portals.h"
 #include "btl_portals_frag.h"
diff --git a/ompi/mca/btl/portals/btl_portals_recv.c b/ompi/mca/btl/portals/btl_portals_recv.c
index 8ed69b0481..8326f5363b 100644
--- a/ompi/mca/btl/portals/btl_portals_recv.c
+++ b/ompi/mca/btl/portals/btl_portals_recv.c
@@ -17,7 +17,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 
 #include "btl_portals.h"
 #include "btl_portals_recv.h"
diff --git a/ompi/mca/btl/portals/btl_portals_send.c b/ompi/mca/btl/portals/btl_portals_send.c
index 2a1a557f95..91fc9169b2 100644
--- a/ompi/mca/btl/portals/btl_portals_send.c
+++ b/ompi/mca/btl/portals/btl_portals_send.c
@@ -19,7 +19,7 @@
 
 #include <assert.h>
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 
 #include "btl_portals.h"
 #include "btl_portals_send.h"
diff --git a/ompi/mca/btl/self/btl_self_component.c b/ompi/mca/btl/self/btl_self_component.c
index 2b768419d4..07df87d78d 100644
--- a/ompi/mca/btl/self/btl_self_component.c
+++ b/ompi/mca/btl/self/btl_self_component.c
@@ -22,7 +22,7 @@
 #include <sys/mman.h>
 #include <sys/stat.h>  /* for mkfifo */
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "include/sys/cache.h"
 #include "opal/event/event.h"
 #include "opal/util/if.h"
diff --git a/ompi/mca/btl/sm/btl_sm_component.c b/ompi/mca/btl/sm/btl_sm_component.c
index 3b1e84f654..74b28d1435 100644
--- a/ompi/mca/btl/sm/btl_sm_component.c
+++ b/ompi/mca/btl/sm/btl_sm_component.c
@@ -22,7 +22,7 @@
 #include <sys/mman.h>
 #include <sys/stat.h>  /* for mkfifo */
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "include/sys/cache.h"
 #include "opal/event/event.h"
 #include "opal/util/if.h"
diff --git a/ompi/mca/btl/tcp/btl_tcp_component.c b/ompi/mca/btl/tcp/btl_tcp_component.c
index eed1bafd7a..bb1556e374 100644
--- a/ompi/mca/btl/tcp/btl_tcp_component.c
+++ b/ompi/mca/btl/tcp/btl_tcp_component.c
@@ -34,7 +34,7 @@
 #include <arpa/inet.h>
 #endif
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/event/event.h"
 #include "opal/util/if.h"
 #include "opal/util/argv.h"
diff --git a/ompi/mca/btl/template/btl_template_component.c b/ompi/mca/btl/template/btl_template_component.c
index a138184992..fa82d639c7 100644
--- a/ompi/mca/btl/template/btl_template_component.c
+++ b/ompi/mca/btl/template/btl_template_component.c
@@ -16,7 +16,7 @@
 
 
 #include "ompi_config.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/event/event.h"
 #include "opal/util/if.h"
 #include "opal/util/argv.h"
diff --git a/ompi/mca/coll/base/coll_base_close.c b/ompi/mca/coll/base/coll_base_close.c
index e2f63432da..47fe5ef004 100644
--- a/ompi/mca/coll/base/coll_base_close.c
+++ b/ompi/mca/coll/base/coll_base_close.c
@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "mca/mca.h"
 #include "mca/base/base.h"
 #include "mca/coll/coll.h"
diff --git a/ompi/mca/coll/base/coll_base_find_available.c b/ompi/mca/coll/base/coll_base_find_available.c
index 11ac90539a..746f9d7936 100644
--- a/ompi/mca/coll/base/coll_base_find_available.c
+++ b/ompi/mca/coll/base/coll_base_find_available.c
@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/class/opal_list.h"
 #include "opal/util/output.h"
 #include "opal/util/show_help.h"
diff --git a/ompi/mca/coll/base/coll_base_open.c b/ompi/mca/coll/base/coll_base_open.c
index 0cdda32e15..e0a41e02e0 100644
--- a/ompi/mca/coll/base/coll_base_open.c
+++ b/ompi/mca/coll/base/coll_base_open.c
@@ -18,7 +18,7 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/mca.h"
 #include "mca/base/base.h"
diff --git a/ompi/mca/coll/basic/coll_basic_allgather.c b/ompi/mca/coll/basic/coll_basic_allgather.c
index 203acaadbb..105f3a4e7d 100644
--- a/ompi/mca/coll/basic/coll_basic_allgather.c
+++ b/ompi/mca/coll/basic/coll_basic_allgather.c
@@ -18,7 +18,7 @@
 #include "coll_basic.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "communicator/communicator.h"
 #include "datatype/datatype.h"
 #include "mca/coll/coll.h"
diff --git a/ompi/mca/coll/basic/coll_basic_allgatherv.c b/ompi/mca/coll/basic/coll_basic_allgatherv.c
index 162d7d8865..f6e39a0823 100644
--- a/ompi/mca/coll/basic/coll_basic_allgatherv.c
+++ b/ompi/mca/coll/basic/coll_basic_allgatherv.c
@@ -18,7 +18,7 @@
 #include "coll_basic.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "communicator/communicator.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/coll_tags.h"
diff --git a/ompi/mca/coll/basic/coll_basic_allreduce.c b/ompi/mca/coll/basic/coll_basic_allreduce.c
index ac8db7c7ac..d26c132724 100644
--- a/ompi/mca/coll/basic/coll_basic_allreduce.c
+++ b/ompi/mca/coll/basic/coll_basic_allreduce.c
@@ -18,7 +18,7 @@
 #include "coll_basic.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "communicator/communicator.h"
 #include "datatype/datatype.h"
 #include "op/op.h"
diff --git a/ompi/mca/coll/basic/coll_basic_alltoall.c b/ompi/mca/coll/basic/coll_basic_alltoall.c
index 64090fc05e..f190f25ade 100644
--- a/ompi/mca/coll/basic/coll_basic_alltoall.c
+++ b/ompi/mca/coll/basic/coll_basic_alltoall.c
@@ -18,7 +18,7 @@
 #include "coll_basic.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "datatype/datatype.h"
 #include "communicator/communicator.h"
 #include "mca/coll/coll.h"
diff --git a/ompi/mca/coll/basic/coll_basic_alltoallv.c b/ompi/mca/coll/basic/coll_basic_alltoallv.c
index 1ef9453078..33b795e59e 100644
--- a/ompi/mca/coll/basic/coll_basic_alltoallv.c
+++ b/ompi/mca/coll/basic/coll_basic_alltoallv.c
@@ -18,7 +18,7 @@
 #include "coll_basic.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "datatype/datatype.h"
 #include "communicator/communicator.h"
 #include "mca/coll/coll.h"
diff --git a/ompi/mca/coll/basic/coll_basic_alltoallw.c b/ompi/mca/coll/basic/coll_basic_alltoallw.c
index 9c0abe332f..5746effa04 100644
--- a/ompi/mca/coll/basic/coll_basic_alltoallw.c
+++ b/ompi/mca/coll/basic/coll_basic_alltoallw.c
@@ -18,7 +18,7 @@
 #include "coll_basic.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "datatype/datatype.h"
 #include "communicator/communicator.h"
 #include "mca/coll/coll.h"
diff --git a/ompi/mca/coll/basic/coll_basic_barrier.c b/ompi/mca/coll/basic/coll_basic_barrier.c
index 364de4f0dd..e8fcd2471d 100644
--- a/ompi/mca/coll/basic/coll_basic_barrier.c
+++ b/ompi/mca/coll/basic/coll_basic_barrier.c
@@ -18,7 +18,7 @@
 #include "coll_basic.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "communicator/communicator.h"
 #include "opal/util/bit_ops.h"
 #include "mca/pml/pml.h"
diff --git a/ompi/mca/coll/basic/coll_basic_bcast.c b/ompi/mca/coll/basic/coll_basic_bcast.c
index 8d367abc23..04db166dfa 100644
--- a/ompi/mca/coll/basic/coll_basic_bcast.c
+++ b/ompi/mca/coll/basic/coll_basic_bcast.c
@@ -18,7 +18,7 @@
 #include "coll_basic.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "datatype/datatype.h"
 #include "communicator/communicator.h"
 #include "mca/coll/coll.h"
diff --git a/ompi/mca/coll/basic/coll_basic_exscan.c b/ompi/mca/coll/basic/coll_basic_exscan.c
index 9df72363d9..29598f9bc5 100644
--- a/ompi/mca/coll/basic/coll_basic_exscan.c
+++ b/ompi/mca/coll/basic/coll_basic_exscan.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "op/op.h"
 #include "datatype/datatype.h"
 #include "mca/pml/pml.h"
diff --git a/ompi/mca/coll/basic/coll_basic_gather.c b/ompi/mca/coll/basic/coll_basic_gather.c
index 2f047da91e..7609585e86 100644
--- a/ompi/mca/coll/basic/coll_basic_gather.c
+++ b/ompi/mca/coll/basic/coll_basic_gather.c
@@ -18,7 +18,7 @@
 #include "coll_basic.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "coll_basic.h"
 #include "datatype/datatype.h"
 #include "mca/coll/coll.h"
diff --git a/ompi/mca/coll/basic/coll_basic_gatherv.c b/ompi/mca/coll/basic/coll_basic_gatherv.c
index bf22c35eca..953aed0385 100644
--- a/ompi/mca/coll/basic/coll_basic_gatherv.c
+++ b/ompi/mca/coll/basic/coll_basic_gatherv.c
@@ -18,7 +18,7 @@
 #include "coll_basic.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "datatype/datatype.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/coll_tags.h"
diff --git a/ompi/mca/coll/basic/coll_basic_reduce.c b/ompi/mca/coll/basic/coll_basic_reduce.c
index a63576ac86..d92976050f 100644
--- a/ompi/mca/coll/basic/coll_basic_reduce.c
+++ b/ompi/mca/coll/basic/coll_basic_reduce.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/coll_tags.h"
 #include "op/op.h"
diff --git a/ompi/mca/coll/basic/coll_basic_reduce_scatter.c b/ompi/mca/coll/basic/coll_basic_reduce_scatter.c
index 108d68b1e5..fe65fcbeee 100644
--- a/ompi/mca/coll/basic/coll_basic_reduce_scatter.c
+++ b/ompi/mca/coll/basic/coll_basic_reduce_scatter.c
@@ -21,7 +21,7 @@
 #include <errno.h>
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/coll_tags.h"
 #include "coll_basic.h"
diff --git a/ompi/mca/coll/basic/coll_basic_scan.c b/ompi/mca/coll/basic/coll_basic_scan.c
index a28c7098d9..0178846853 100644
--- a/ompi/mca/coll/basic/coll_basic_scan.c
+++ b/ompi/mca/coll/basic/coll_basic_scan.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "op/op.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/coll_tags.h"
diff --git a/ompi/mca/coll/basic/coll_basic_scatter.c b/ompi/mca/coll/basic/coll_basic_scatter.c
index 5cb60605dc..3aa88798d3 100644
--- a/ompi/mca/coll/basic/coll_basic_scatter.c
+++ b/ompi/mca/coll/basic/coll_basic_scatter.c
@@ -18,7 +18,7 @@
 #include "coll_basic.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "datatype/datatype.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/coll_tags.h"
diff --git a/ompi/mca/coll/basic/coll_basic_scatterv.c b/ompi/mca/coll/basic/coll_basic_scatterv.c
index 7f09bb4606..d9ea2005de 100644
--- a/ompi/mca/coll/basic/coll_basic_scatterv.c
+++ b/ompi/mca/coll/basic/coll_basic_scatterv.c
@@ -18,7 +18,7 @@
 #include "coll_basic.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "datatype/datatype.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/coll_tags.h"
diff --git a/ompi/mca/coll/demo/coll_demo_allgather.c b/ompi/mca/coll/demo/coll_demo_allgather.c
index daf72edd1b..47b85b3ac9 100644
--- a/ompi/mca/coll/demo/coll_demo_allgather.c
+++ b/ompi/mca/coll/demo/coll_demo_allgather.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/base.h"
diff --git a/ompi/mca/coll/demo/coll_demo_allgatherv.c b/ompi/mca/coll/demo/coll_demo_allgatherv.c
index 1696471b06..6a04a48eed 100644
--- a/ompi/mca/coll/demo/coll_demo_allgatherv.c
+++ b/ompi/mca/coll/demo/coll_demo_allgatherv.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/base.h"
diff --git a/ompi/mca/coll/demo/coll_demo_allreduce.c b/ompi/mca/coll/demo/coll_demo_allreduce.c
index c5472e98c6..69695e8279 100644
--- a/ompi/mca/coll/demo/coll_demo_allreduce.c
+++ b/ompi/mca/coll/demo/coll_demo_allreduce.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/base.h"
diff --git a/ompi/mca/coll/demo/coll_demo_alltoall.c b/ompi/mca/coll/demo/coll_demo_alltoall.c
index 83bbdb6f61..1f9b0e2509 100644
--- a/ompi/mca/coll/demo/coll_demo_alltoall.c
+++ b/ompi/mca/coll/demo/coll_demo_alltoall.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/base.h"
diff --git a/ompi/mca/coll/demo/coll_demo_alltoallv.c b/ompi/mca/coll/demo/coll_demo_alltoallv.c
index e370f07b48..5dc3f8626b 100644
--- a/ompi/mca/coll/demo/coll_demo_alltoallv.c
+++ b/ompi/mca/coll/demo/coll_demo_alltoallv.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/base.h"
diff --git a/ompi/mca/coll/demo/coll_demo_alltoallw.c b/ompi/mca/coll/demo/coll_demo_alltoallw.c
index ac097f2e8a..66282caed5 100644
--- a/ompi/mca/coll/demo/coll_demo_alltoallw.c
+++ b/ompi/mca/coll/demo/coll_demo_alltoallw.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/base.h"
diff --git a/ompi/mca/coll/demo/coll_demo_barrier.c b/ompi/mca/coll/demo/coll_demo_barrier.c
index b11a17c4ce..317093b900 100644
--- a/ompi/mca/coll/demo/coll_demo_barrier.c
+++ b/ompi/mca/coll/demo/coll_demo_barrier.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/base.h"
diff --git a/ompi/mca/coll/demo/coll_demo_bcast.c b/ompi/mca/coll/demo/coll_demo_bcast.c
index e0492537a0..b0e34d7147 100644
--- a/ompi/mca/coll/demo/coll_demo_bcast.c
+++ b/ompi/mca/coll/demo/coll_demo_bcast.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/base.h"
diff --git a/ompi/mca/coll/demo/coll_demo_exscan.c b/ompi/mca/coll/demo/coll_demo_exscan.c
index 5787299712..966948203a 100644
--- a/ompi/mca/coll/demo/coll_demo_exscan.c
+++ b/ompi/mca/coll/demo/coll_demo_exscan.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/base.h"
diff --git a/ompi/mca/coll/demo/coll_demo_gather.c b/ompi/mca/coll/demo/coll_demo_gather.c
index 8fb7c8e9d9..cbe19def27 100644
--- a/ompi/mca/coll/demo/coll_demo_gather.c
+++ b/ompi/mca/coll/demo/coll_demo_gather.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/base.h"
diff --git a/ompi/mca/coll/demo/coll_demo_gatherv.c b/ompi/mca/coll/demo/coll_demo_gatherv.c
index ea5a9543fd..6255467aaf 100644
--- a/ompi/mca/coll/demo/coll_demo_gatherv.c
+++ b/ompi/mca/coll/demo/coll_demo_gatherv.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/base.h"
diff --git a/ompi/mca/coll/demo/coll_demo_reduce.c b/ompi/mca/coll/demo/coll_demo_reduce.c
index 0605908cf6..b5d34f696d 100644
--- a/ompi/mca/coll/demo/coll_demo_reduce.c
+++ b/ompi/mca/coll/demo/coll_demo_reduce.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/base.h"
diff --git a/ompi/mca/coll/demo/coll_demo_reduce_scatter.c b/ompi/mca/coll/demo/coll_demo_reduce_scatter.c
index 07553c92f9..6eafb6986c 100644
--- a/ompi/mca/coll/demo/coll_demo_reduce_scatter.c
+++ b/ompi/mca/coll/demo/coll_demo_reduce_scatter.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/base.h"
diff --git a/ompi/mca/coll/demo/coll_demo_scan.c b/ompi/mca/coll/demo/coll_demo_scan.c
index b82437acab..7dc584091e 100644
--- a/ompi/mca/coll/demo/coll_demo_scan.c
+++ b/ompi/mca/coll/demo/coll_demo_scan.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/base.h"
diff --git a/ompi/mca/coll/demo/coll_demo_scatter.c b/ompi/mca/coll/demo/coll_demo_scatter.c
index e5342d930d..fd5c54ba43 100644
--- a/ompi/mca/coll/demo/coll_demo_scatter.c
+++ b/ompi/mca/coll/demo/coll_demo_scatter.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/base.h"
diff --git a/ompi/mca/coll/demo/coll_demo_scatterv.c b/ompi/mca/coll/demo/coll_demo_scatterv.c
index 61007b391f..2f43f7d7e1 100644
--- a/ompi/mca/coll/demo/coll_demo_scatterv.c
+++ b/ompi/mca/coll/demo/coll_demo_scatterv.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/base.h"
diff --git a/ompi/mca/coll/hierarch/coll_hierarch_barrier.c b/ompi/mca/coll/hierarch/coll_hierarch_barrier.c
index f60e533097..de7c9e2e7b 100644
--- a/ompi/mca/coll/hierarch/coll_hierarch_barrier.c
+++ b/ompi/mca/coll/hierarch/coll_hierarch_barrier.c
@@ -18,7 +18,7 @@
 #include "coll_hierarch.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/base.h"
diff --git a/ompi/mca/coll/hierarch/coll_hierarch_bcast.c b/ompi/mca/coll/hierarch/coll_hierarch_bcast.c
index d18889071b..5380cf0d82 100644
--- a/ompi/mca/coll/hierarch/coll_hierarch_bcast.c
+++ b/ompi/mca/coll/hierarch/coll_hierarch_bcast.c
@@ -18,7 +18,7 @@
 #include "coll_hierarch.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/base.h"
diff --git a/ompi/mca/coll/hierarch/coll_hierarch_reduce.c b/ompi/mca/coll/hierarch/coll_hierarch_reduce.c
index 2bb04c18dc..d75fe036b2 100644
--- a/ompi/mca/coll/hierarch/coll_hierarch_reduce.c
+++ b/ompi/mca/coll/hierarch/coll_hierarch_reduce.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/base.h"
diff --git a/ompi/mca/coll/self/coll_self_allgather.c b/ompi/mca/coll/self/coll_self_allgather.c
index 001455f93b..0410087683 100644
--- a/ompi/mca/coll/self/coll_self_allgather.c
+++ b/ompi/mca/coll/self/coll_self_allgather.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "datatype/datatype.h"
 #include "coll_self.h"
 
diff --git a/ompi/mca/coll/self/coll_self_allgatherv.c b/ompi/mca/coll/self/coll_self_allgatherv.c
index 5c66e026ca..4a5887c387 100644
--- a/ompi/mca/coll/self/coll_self_allgatherv.c
+++ b/ompi/mca/coll/self/coll_self_allgatherv.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "datatype/datatype.h"
 #include "coll_self.h"
 
diff --git a/ompi/mca/coll/self/coll_self_allreduce.c b/ompi/mca/coll/self/coll_self_allreduce.c
index 9d4832e280..463177166a 100644
--- a/ompi/mca/coll/self/coll_self_allreduce.c
+++ b/ompi/mca/coll/self/coll_self_allreduce.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "datatype/datatype.h"
 #include "coll_self.h"
 
diff --git a/ompi/mca/coll/self/coll_self_alltoall.c b/ompi/mca/coll/self/coll_self_alltoall.c
index 5a14ff6d77..8dc9754f7d 100644
--- a/ompi/mca/coll/self/coll_self_alltoall.c
+++ b/ompi/mca/coll/self/coll_self_alltoall.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "datatype/datatype.h"
 #include "coll_self.h"
 
diff --git a/ompi/mca/coll/self/coll_self_alltoallv.c b/ompi/mca/coll/self/coll_self_alltoallv.c
index 4166590d12..0fd715be53 100644
--- a/ompi/mca/coll/self/coll_self_alltoallv.c
+++ b/ompi/mca/coll/self/coll_self_alltoallv.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "datatype/datatype.h"
 #include "coll_self.h"
 
diff --git a/ompi/mca/coll/self/coll_self_alltoallw.c b/ompi/mca/coll/self/coll_self_alltoallw.c
index df448cc504..6ecbc67347 100644
--- a/ompi/mca/coll/self/coll_self_alltoallw.c
+++ b/ompi/mca/coll/self/coll_self_alltoallw.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "datatype/datatype.h"
 #include "coll_self.h"
 
diff --git a/ompi/mca/coll/self/coll_self_barrier.c b/ompi/mca/coll/self/coll_self_barrier.c
index 9a075bc8fd..0a0bfdbd06 100644
--- a/ompi/mca/coll/self/coll_self_barrier.c
+++ b/ompi/mca/coll/self/coll_self_barrier.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "coll_self.h"
 
 
diff --git a/ompi/mca/coll/self/coll_self_bcast.c b/ompi/mca/coll/self/coll_self_bcast.c
index 2cdc642984..ea14e52630 100644
--- a/ompi/mca/coll/self/coll_self_bcast.c
+++ b/ompi/mca/coll/self/coll_self_bcast.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "datatype/datatype.h"
 #include "coll_self.h"
 
diff --git a/ompi/mca/coll/self/coll_self_exscan.c b/ompi/mca/coll/self/coll_self_exscan.c
index fdeff5d972..8237872871 100644
--- a/ompi/mca/coll/self/coll_self_exscan.c
+++ b/ompi/mca/coll/self/coll_self_exscan.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "coll_self.h"
 
 
diff --git a/ompi/mca/coll/self/coll_self_gather.c b/ompi/mca/coll/self/coll_self_gather.c
index ced2832cb4..906e19cd66 100644
--- a/ompi/mca/coll/self/coll_self_gather.c
+++ b/ompi/mca/coll/self/coll_self_gather.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "datatype/datatype.h"
 #include "coll_self.h"
 
diff --git a/ompi/mca/coll/self/coll_self_gatherv.c b/ompi/mca/coll/self/coll_self_gatherv.c
index 594cdf8e31..3a7e21f0c5 100644
--- a/ompi/mca/coll/self/coll_self_gatherv.c
+++ b/ompi/mca/coll/self/coll_self_gatherv.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "datatype/datatype.h"
 #include "coll_self.h"
 
diff --git a/ompi/mca/coll/self/coll_self_reduce.c b/ompi/mca/coll/self/coll_self_reduce.c
index aa24c4f498..7b986ee4b4 100644
--- a/ompi/mca/coll/self/coll_self_reduce.c
+++ b/ompi/mca/coll/self/coll_self_reduce.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "datatype/datatype.h"
 #include "coll_self.h"
 
diff --git a/ompi/mca/coll/self/coll_self_reduce_scatter.c b/ompi/mca/coll/self/coll_self_reduce_scatter.c
index c268628394..f5a29ae07f 100644
--- a/ompi/mca/coll/self/coll_self_reduce_scatter.c
+++ b/ompi/mca/coll/self/coll_self_reduce_scatter.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "datatype/datatype.h"
 #include "coll_self.h"
 
diff --git a/ompi/mca/coll/self/coll_self_scan.c b/ompi/mca/coll/self/coll_self_scan.c
index 699f2e097b..5b4783de54 100644
--- a/ompi/mca/coll/self/coll_self_scan.c
+++ b/ompi/mca/coll/self/coll_self_scan.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "datatype/datatype.h"
 #include "coll_self.h"
 
diff --git a/ompi/mca/coll/self/coll_self_scatter.c b/ompi/mca/coll/self/coll_self_scatter.c
index 702e796920..cfe226c90e 100644
--- a/ompi/mca/coll/self/coll_self_scatter.c
+++ b/ompi/mca/coll/self/coll_self_scatter.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "datatype/datatype.h"
 #include "coll_self.h"
 
diff --git a/ompi/mca/coll/self/coll_self_scatterv.c b/ompi/mca/coll/self/coll_self_scatterv.c
index 0d1b2986f4..00155f3662 100644
--- a/ompi/mca/coll/self/coll_self_scatterv.c
+++ b/ompi/mca/coll/self/coll_self_scatterv.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "coll_self.h"
 #include "datatype/datatype.h"
 
diff --git a/ompi/mca/coll/sm/coll_sm_allgather.c b/ompi/mca/coll/sm/coll_sm_allgather.c
index 84a564dae6..03af39b9a4 100644
--- a/ompi/mca/coll/sm/coll_sm_allgather.c
+++ b/ompi/mca/coll/sm/coll_sm_allgather.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "coll_sm.h"
 
 
diff --git a/ompi/mca/coll/sm/coll_sm_allgatherv.c b/ompi/mca/coll/sm/coll_sm_allgatherv.c
index 6d1b97427c..2eecb7c497 100644
--- a/ompi/mca/coll/sm/coll_sm_allgatherv.c
+++ b/ompi/mca/coll/sm/coll_sm_allgatherv.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "coll_sm.h"
 
 
diff --git a/ompi/mca/coll/sm/coll_sm_allreduce.c b/ompi/mca/coll/sm/coll_sm_allreduce.c
index 6a30726a64..28bab43dda 100644
--- a/ompi/mca/coll/sm/coll_sm_allreduce.c
+++ b/ompi/mca/coll/sm/coll_sm_allreduce.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "coll_sm.h"
 
 
diff --git a/ompi/mca/coll/sm/coll_sm_alltoall.c b/ompi/mca/coll/sm/coll_sm_alltoall.c
index 2242a95ffc..3a8902fb75 100644
--- a/ompi/mca/coll/sm/coll_sm_alltoall.c
+++ b/ompi/mca/coll/sm/coll_sm_alltoall.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "coll_sm.h"
 
 
diff --git a/ompi/mca/coll/sm/coll_sm_alltoallv.c b/ompi/mca/coll/sm/coll_sm_alltoallv.c
index f7ddf2cae4..58296df206 100644
--- a/ompi/mca/coll/sm/coll_sm_alltoallv.c
+++ b/ompi/mca/coll/sm/coll_sm_alltoallv.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "coll_sm.h"
 
 
diff --git a/ompi/mca/coll/sm/coll_sm_alltoallw.c b/ompi/mca/coll/sm/coll_sm_alltoallw.c
index 1e4ec94e11..457066a786 100644
--- a/ompi/mca/coll/sm/coll_sm_alltoallw.c
+++ b/ompi/mca/coll/sm/coll_sm_alltoallw.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "coll_sm.h"
 
 
diff --git a/ompi/mca/coll/sm/coll_sm_barrier.c b/ompi/mca/coll/sm/coll_sm_barrier.c
index ba77cd65c1..bf22e1c311 100644
--- a/ompi/mca/coll/sm/coll_sm_barrier.c
+++ b/ompi/mca/coll/sm/coll_sm_barrier.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "coll_sm.h"
 
 
diff --git a/ompi/mca/coll/sm/coll_sm_bcast.c b/ompi/mca/coll/sm/coll_sm_bcast.c
index 2cd6177675..254393104c 100644
--- a/ompi/mca/coll/sm/coll_sm_bcast.c
+++ b/ompi/mca/coll/sm/coll_sm_bcast.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "coll_sm.h"
 
 
diff --git a/ompi/mca/coll/sm/coll_sm_component.c b/ompi/mca/coll/sm/coll_sm_component.c
index 9a65817b70..61c42f9e61 100644
--- a/ompi/mca/coll/sm/coll_sm_component.c
+++ b/ompi/mca/coll/sm/coll_sm_component.c
@@ -22,7 +22,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "mca/coll/coll.h"
 #include "coll_sm.h"
 
diff --git a/ompi/mca/coll/sm/coll_sm_exscan.c b/ompi/mca/coll/sm/coll_sm_exscan.c
index 81235f51ef..b87e20a74f 100644
--- a/ompi/mca/coll/sm/coll_sm_exscan.c
+++ b/ompi/mca/coll/sm/coll_sm_exscan.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "coll_sm.h"
 
 
diff --git a/ompi/mca/coll/sm/coll_sm_gather.c b/ompi/mca/coll/sm/coll_sm_gather.c
index 7ec90af942..e949fdedfc 100644
--- a/ompi/mca/coll/sm/coll_sm_gather.c
+++ b/ompi/mca/coll/sm/coll_sm_gather.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "coll_sm.h"
 
 
diff --git a/ompi/mca/coll/sm/coll_sm_gatherv.c b/ompi/mca/coll/sm/coll_sm_gatherv.c
index 4d418969f4..0afac2c005 100644
--- a/ompi/mca/coll/sm/coll_sm_gatherv.c
+++ b/ompi/mca/coll/sm/coll_sm_gatherv.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "coll_sm.h"
 
 
diff --git a/ompi/mca/coll/sm/coll_sm_reduce.c b/ompi/mca/coll/sm/coll_sm_reduce.c
index a68c40e5cb..9436078632 100644
--- a/ompi/mca/coll/sm/coll_sm_reduce.c
+++ b/ompi/mca/coll/sm/coll_sm_reduce.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "coll_sm.h"
 
 
diff --git a/ompi/mca/coll/sm/coll_sm_reduce_scatter.c b/ompi/mca/coll/sm/coll_sm_reduce_scatter.c
index cfbb0eb55f..11366e337a 100644
--- a/ompi/mca/coll/sm/coll_sm_reduce_scatter.c
+++ b/ompi/mca/coll/sm/coll_sm_reduce_scatter.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "coll_sm.h"
 
 
diff --git a/ompi/mca/coll/sm/coll_sm_scan.c b/ompi/mca/coll/sm/coll_sm_scan.c
index b326d05dfe..99f3585aad 100644
--- a/ompi/mca/coll/sm/coll_sm_scan.c
+++ b/ompi/mca/coll/sm/coll_sm_scan.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "coll_sm.h"
 
 
diff --git a/ompi/mca/coll/sm/coll_sm_scatter.c b/ompi/mca/coll/sm/coll_sm_scatter.c
index c61ea8e23b..2ff267b58b 100644
--- a/ompi/mca/coll/sm/coll_sm_scatter.c
+++ b/ompi/mca/coll/sm/coll_sm_scatter.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "coll_sm.h"
 
 
diff --git a/ompi/mca/coll/sm/coll_sm_scatterv.c b/ompi/mca/coll/sm/coll_sm_scatterv.c
index 065a607c12..5f7d99b6ed 100644
--- a/ompi/mca/coll/sm/coll_sm_scatterv.c
+++ b/ompi/mca/coll/sm/coll_sm_scatterv.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "coll_sm.h"
 
 
diff --git a/ompi/mca/common/sm/common_sm_mmap.c b/ompi/mca/common/sm/common_sm_mmap.c
index 4d5ae964bd..94a5029107 100644
--- a/ompi/mca/common/sm/common_sm_mmap.c
+++ b/ompi/mca/common/sm/common_sm_mmap.c
@@ -31,7 +31,7 @@
 #include <sys/mman.h>
 #endif
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "common_sm_mmap.h"
 #include "opal/util/output.h"
 #include "util/sys_info.h"
diff --git a/ompi/mca/io/base/io_base_close.c b/ompi/mca/io/base/io_base_close.c
index 785e6c0b9a..9255e4161d 100644
--- a/ompi/mca/io/base/io_base_close.c
+++ b/ompi/mca/io/base/io_base_close.c
@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "mca/mca.h"
 #include "mca/base/base.h"
 #include "mca/io/io.h"
diff --git a/ompi/mca/io/base/io_base_find_available.c b/ompi/mca/io/base/io_base_find_available.c
index 300d07b65b..82063f7b8a 100644
--- a/ompi/mca/io/base/io_base_find_available.c
+++ b/ompi/mca/io/base/io_base_find_available.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/class/opal_list.h"
 #include "opal/util/output.h"
 #include "mca/mca.h"
diff --git a/ompi/mca/mpool/base/mpool_base_close.c b/ompi/mca/mpool/base/mpool_base_close.c
index bd69ec4486..ce84662c7a 100644
--- a/ompi/mca/mpool/base/mpool_base_close.c
+++ b/ompi/mca/mpool/base/mpool_base_close.c
@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "mca/mca.h"
 #include "mca/base/base.h"
 #include "mca/mpool/mpool.h"
diff --git a/ompi/mca/mpool/base/mpool_base_open.c b/ompi/mca/mpool/base/mpool_base_open.c
index 25753b6ea0..b760bcd870 100644
--- a/ompi/mca/mpool/base/mpool_base_open.c
+++ b/ompi/mca/mpool/base/mpool_base_open.c
@@ -22,7 +22,7 @@
 #include "mca/base/base.h"
 #include "mca/mpool/mpool.h"
 #include "mca/mpool/base/base.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 
 /*
  * The following file was created by configure.  It contains extern
diff --git a/ompi/mca/pml/base/pml_base_close.c b/ompi/mca/pml/base/pml_base_close.c
index 32d0fc4085..ecf7227bbe 100644
--- a/ompi/mca/pml/base/pml_base_close.c
+++ b/ompi/mca/pml/base/pml_base_close.c
@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "mca/mca.h"
 #include "mca/base/base.h"
 #include "mca/pml/pml.h"
diff --git a/ompi/mca/pml/ob1/pml_ob1_recvfrag.c b/ompi/mca/pml/ob1/pml_ob1_recvfrag.c
index 1ddf9064cd..ea3c7871cb 100644
--- a/ompi/mca/pml/ob1/pml_ob1_recvfrag.c
+++ b/ompi/mca/pml/ob1/pml_ob1_recvfrag.c
@@ -22,7 +22,7 @@
 
 #include "opal/class/opal_list.h"
 #include "opal/threads/mutex.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "communicator/communicator.h"
 #include "mca/pml/pml.h"
 #include "pml_ob1.h"
diff --git a/ompi/mca/pml/ob1/pml_ob1_sendreq.c b/ompi/mca/pml/ob1/pml_ob1_sendreq.c
index 44115f4538..d4d672f7f0 100644
--- a/ompi/mca/pml/ob1/pml_ob1_sendreq.c
+++ b/ompi/mca/pml/ob1/pml_ob1_sendreq.c
@@ -19,7 +19,7 @@
 
 #include "ompi_config.h"
 #include <sched.h>
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "mca/pml/pml.h"
 #include "mca/btl/btl.h"
 #include "mca/errmgr/errmgr.h"
diff --git a/ompi/mca/pml/teg/pml_teg_sendreq.c b/ompi/mca/pml/teg/pml_teg_sendreq.c
index 55af421d22..939514f814 100644
--- a/ompi/mca/pml/teg/pml_teg_sendreq.c
+++ b/ompi/mca/pml/teg/pml_teg_sendreq.c
@@ -18,7 +18,7 @@
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #include "ompi_config.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "mca/pml/pml.h"
 #include "mca/ptl/ptl.h"
 #include "pml_teg.h"
diff --git a/ompi/mca/pml/uniq/pml_uniq_sendreq.c b/ompi/mca/pml/uniq/pml_uniq_sendreq.c
index 3501150774..32a6f44bb7 100644
--- a/ompi/mca/pml/uniq/pml_uniq_sendreq.c
+++ b/ompi/mca/pml/uniq/pml_uniq_sendreq.c
@@ -18,7 +18,7 @@
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #include "ompi_config.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "mca/pml/pml.h"
 #include "mca/ptl/ptl.h"
 #include "pml_uniq.h"
diff --git a/ompi/mca/ptl/base/ptl_base_close.c b/ompi/mca/ptl/base/ptl_base_close.c
index 3069d48437..249157ff8d 100644
--- a/ompi/mca/ptl/base/ptl_base_close.c
+++ b/ompi/mca/ptl/base/ptl_base_close.c
@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/event/event.h"
 #include "mca/mca.h"
 #include "mca/base/base.h"
diff --git a/ompi/mca/ptl/base/ptl_base_match.c b/ompi/mca/ptl/base/ptl_base_match.c
index c8d2285570..99adce0cc1 100644
--- a/ompi/mca/ptl/base/ptl_base_match.c
+++ b/ompi/mca/ptl/base/ptl_base_match.c
@@ -21,7 +21,7 @@
 
 #include "opal/class/opal_list.h"
 #include "opal/threads/mutex.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "communicator/communicator.h"
 #include "mca/pml/pml.h"
 #include "mca/ptl/ptl.h"
diff --git a/ompi/mca/ptl/gm/ptl_gm_component.c b/ompi/mca/ptl/gm/ptl_gm_component.c
index f804de7e76..ddfa337f23 100644
--- a/ompi/mca/ptl/gm/ptl_gm_component.c
+++ b/ompi/mca/ptl/gm/ptl_gm_component.c
@@ -18,7 +18,7 @@
  * $HEADER$
  */
 #include "ompi_config.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/ptl/ptl.h"
 #include "mca/pml/base/pml_base_module_exchange.h"
diff --git a/ompi/mca/ptl/mx/ptl_mx_component.c b/ompi/mca/ptl/mx/ptl_mx_component.c
index 459b5357e9..aa98891955 100644
--- a/ompi/mca/ptl/mx/ptl_mx_component.c
+++ b/ompi/mca/ptl/mx/ptl_mx_component.c
@@ -14,7 +14,7 @@
  * $HEADER$
  */
 #include "ompi_config.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "opal/threads/thread.h"
 #include "ptl_mx.h"
diff --git a/ompi/mca/ptl/mx/ptl_mx_module.c b/ompi/mca/ptl/mx/ptl_mx_module.c
index 00ae0d48f7..5908018056 100644
--- a/ompi/mca/ptl/mx/ptl_mx_module.c
+++ b/ompi/mca/ptl/mx/ptl_mx_module.c
@@ -15,7 +15,7 @@
  */
 
 #include "ptl_mx.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "ptl_mx_peer.h"
 #include "ptl_mx_proc.h"
diff --git a/ompi/mca/ptl/portals/src/ptl_portals.c b/ompi/mca/ptl/portals/src/ptl_portals.c
index 595244a70b..a46f731cb1 100644
--- a/ompi/mca/ptl/portals/src/ptl_portals.c
+++ b/ompi/mca/ptl/portals/src/ptl_portals.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "mca/pml/pml.h"
 #include "mca/ptl/base/ptl_base_sendreq.h"
diff --git a/ompi/mca/ptl/portals/src/ptl_portals_compat_redstorm.c b/ompi/mca/ptl/portals/src/ptl_portals_compat_redstorm.c
index c6ca4f3538..1d42beeef4 100644
--- a/ompi/mca/ptl/portals/src/ptl_portals_compat_redstorm.c
+++ b/ompi/mca/ptl/portals/src/ptl_portals_compat_redstorm.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 #include "portals_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 
 #include "ptl_portals.h"
diff --git a/ompi/mca/ptl/portals/src/ptl_portals_compat_utcp.c b/ompi/mca/ptl/portals/src/ptl_portals_compat_utcp.c
index f7546862f1..f356b1e525 100644
--- a/ompi/mca/ptl/portals/src/ptl_portals_compat_utcp.c
+++ b/ompi/mca/ptl/portals/src/ptl_portals_compat_utcp.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <netinet/in.h>
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 
 #include "ptl_portals.h"
diff --git a/ompi/mca/ptl/portals/src/ptl_portals_component.c b/ompi/mca/ptl/portals/src/ptl_portals_component.c
index b8898772a6..b183141bba 100644
--- a/ompi/mca/ptl/portals/src/ptl_portals_component.c
+++ b/ompi/mca/ptl/portals/src/ptl_portals_component.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 #include "portals_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 
 #include "opal/util/output.h"
 #include "opal/threads/thread.h"
diff --git a/ompi/mca/ptl/self/ptl_self.c b/ompi/mca/ptl/self/ptl_self.c
index 657fb5bad5..2f82f1ef14 100644
--- a/ompi/mca/ptl/self/ptl_self.c
+++ b/ompi/mca/ptl/self/ptl_self.c
@@ -34,7 +34,7 @@
 #include <arpa/inet.h>
 #endif
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "class/ompi_bitmap.h"
 #include "opal/event/event.h"
 #include "opal/util/argv.h"
diff --git a/ompi/mca/ptl/self/ptl_self_component.c b/ompi/mca/ptl/self/ptl_self_component.c
index 55beead506..82bb84194b 100644
--- a/ompi/mca/ptl/self/ptl_self_component.c
+++ b/ompi/mca/ptl/self/ptl_self_component.c
@@ -34,7 +34,7 @@
 #include <arpa/inet.h>
 #endif
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/event/event.h"
 #include "opal/util/if.h"
 #include "opal/util/argv.h"
diff --git a/ompi/mca/ptl/sm/src/ptl_sm_component.c b/ompi/mca/ptl/sm/src/ptl_sm_component.c
index e4f87d5f07..a4ce8ccdec 100644
--- a/ompi/mca/ptl/sm/src/ptl_sm_component.c
+++ b/ompi/mca/ptl/sm/src/ptl_sm_component.c
@@ -22,7 +22,7 @@
 #include <sys/mman.h>
 #include <sys/stat.h>  /* for mkfifo */
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "include/sys/cache.h"
 #include "opal/event/event.h"
 #include "opal/util/if.h"
diff --git a/ompi/mca/ptl/tcp/ptl_tcp_component.c b/ompi/mca/ptl/tcp/ptl_tcp_component.c
index 5c416484b0..e1e20c3270 100644
--- a/ompi/mca/ptl/tcp/ptl_tcp_component.c
+++ b/ompi/mca/ptl/tcp/ptl_tcp_component.c
@@ -33,7 +33,7 @@
 #include <arpa/inet.h>
 #endif
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/event/event.h"
 #include "opal/util/if.h"
 #include "opal/util/argv.h"
diff --git a/ompi/mca/topo/base/topo_base_close.c b/ompi/mca/topo/base/topo_base_close.c
index 590e4e940a..92db709552 100644
--- a/ompi/mca/topo/base/topo_base_close.c
+++ b/ompi/mca/topo/base/topo_base_close.c
@@ -18,7 +18,7 @@
 #include <stdio.h>
 
 #include "opal/util/output.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "mca/mca.h"
 #include "mca/base/base.h"
 #include "mca/topo/topo.h"
diff --git a/ompi/mca/topo/base/topo_base_find_available.c b/ompi/mca/topo/base/topo_base_find_available.c
index adb20d53fd..ba6e06d80a 100644
--- a/ompi/mca/topo/base/topo_base_find_available.c
+++ b/ompi/mca/topo/base/topo_base_find_available.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/class/opal_list.h"
 #include "opal/util/output.h"
 #include "mca/mca.h"
diff --git a/ompi/mca/topo/base/topo_base_open.c b/ompi/mca/topo/base/topo_base_open.c
index cd14304ca2..6513e386e4 100644
--- a/ompi/mca/topo/base/topo_base_open.c
+++ b/ompi/mca/topo/base/topo_base_open.c
@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "opal/class/opal_list.h"
 #include "mca/mca.h"
diff --git a/ompi/mpi/c/init.c b/ompi/mpi/c/init.c
index eb993715c1..8a8151bb5d 100644
--- a/ompi/mpi/c/init.c
+++ b/ompi/mpi/c/init.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "mpi/c/bindings.h"
 #include "errhandler/errhandler.h"
 #include "communicator/communicator.h"
diff --git a/ompi/mpi/c/init_thread.c b/ompi/mpi/c/init_thread.c
index 3aa2c402d1..def95a4de3 100644
--- a/ompi/mpi/c/init_thread.c
+++ b/ompi/mpi/c/init_thread.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "mpi/c/bindings.h"
 #include "errhandler/errhandler.h"
 #include "communicator/communicator.h"
diff --git a/ompi/mpi/f77/comm_get_name_f.c b/ompi/mpi/f77/comm_get_name_f.c
index a57f06f64a..8f9af27241 100644
--- a/ompi/mpi/f77/comm_get_name_f.c
+++ b/ompi/mpi/f77/comm_get_name_f.c
@@ -18,7 +18,7 @@
 
 #include "mpi/f77/bindings.h"
 #include "mpi/f77/strings.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "communicator/communicator.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER
diff --git a/ompi/mpi/f77/comm_set_name_f.c b/ompi/mpi/f77/comm_set_name_f.c
index 2e6571e9de..74003db611 100644
--- a/ompi/mpi/f77/comm_set_name_f.c
+++ b/ompi/mpi/f77/comm_set_name_f.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi/f77/bindings.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "communicator/communicator.h"
 #include "mpi/f77/strings.h"
 
diff --git a/ompi/mpi/f77/strings.c b/ompi/mpi/f77/strings.c
index db806193ab..fdac24ae5c 100644
--- a/ompi/mpi/f77/strings.c
+++ b/ompi/mpi/f77/strings.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/argv.h"
 #include "mpi/f77/strings.h"
 
diff --git a/ompi/mpi/f77/type_get_name_f.c b/ompi/mpi/f77/type_get_name_f.c
index 40e869f3cd..290391c9b2 100644
--- a/ompi/mpi/f77/type_get_name_f.c
+++ b/ompi/mpi/f77/type_get_name_f.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi/f77/bindings.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "errhandler/errhandler.h"
 #include "mpi/f77/strings.h"
 
diff --git a/ompi/mpi/f77/type_set_name_f.c b/ompi/mpi/f77/type_set_name_f.c
index 057fd9cea6..e9cb1144d9 100644
--- a/ompi/mpi/f77/type_set_name_f.c
+++ b/ompi/mpi/f77/type_set_name_f.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi/f77/bindings.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "errhandler/errhandler.h"
 #include "communicator/communicator.h"
 #include "mpi/f77/strings.h"
diff --git a/ompi/mpi/f77/win_get_name_f.c b/ompi/mpi/f77/win_get_name_f.c
index 3d1d885434..4e39bb406b 100644
--- a/ompi/mpi/f77/win_get_name_f.c
+++ b/ompi/mpi/f77/win_get_name_f.c
@@ -17,7 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi/f77/bindings.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "errhandler/errhandler.h"
 #include "mpi/f77/strings.h"
 
diff --git a/ompi/mpi/f77/win_set_name_f.c b/ompi/mpi/f77/win_set_name_f.c
index 5627516854..eae645cd88 100644
--- a/ompi/mpi/f77/win_set_name_f.c
+++ b/ompi/mpi/f77/win_set_name_f.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "mpi/f77/bindings.h"
 #include "mpi/f77/strings.h"
 #include "communicator/communicator.h"
diff --git a/ompi/op/op.c b/ompi/op/op.c
index c7ba09ac67..bd7365e397 100644
--- a/ompi/op/op.c
+++ b/ompi/op/op.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "op/op.h"
 #include "op/op_predefined.h"
 #include "class/ompi_pointer_array.h"
diff --git a/ompi/request/req_test.c b/ompi/request/req_test.c
index 84a7cbfac3..ed5458d349 100644
--- a/ompi/request/req_test.c
+++ b/ompi/request/req_test.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 #include "mpi.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "request/request.h"
 
 
diff --git a/ompi/request/req_wait.c b/ompi/request/req_wait.c
index c4122c77e8..28761c0639 100644
--- a/ompi/request/req_wait.c
+++ b/ompi/request/req_wait.c
@@ -15,7 +15,7 @@
  */
 
 #include "ompi_config.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "request/request.h"
 
 
diff --git a/ompi/request/request.c b/ompi/request/request.c
index 832fb3ad5c..4e719b2610 100644
--- a/ompi/request/request.c
+++ b/ompi/request/request.c
@@ -18,7 +18,7 @@
 
 #include "opal/class/opal_object.h"
 #include "request/request.h"
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 
 ompi_pointer_array_t  ompi_request_f_to_c_table;
 OMPI_DECLSPEC volatile int          ompi_request_waiting = 0;
diff --git a/ompi/runtime/ompi_mpi_finalize.c b/ompi/runtime/ompi_mpi_finalize.c
index 7f67ff820c..e567141208 100644
--- a/ompi/runtime/ompi_mpi_finalize.c
+++ b/ompi/runtime/ompi_mpi_finalize.c
@@ -16,7 +16,7 @@
 
 #include "orte_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "include/orte_constants.h"
 #include "mca/schema/schema.h"
 
diff --git a/ompi/runtime/ompi_mpi_init.c b/ompi/runtime/ompi_mpi_init.c
index 9e4a247f73..bcc47408fc 100644
--- a/ompi/runtime/ompi_mpi_init.c
+++ b/ompi/runtime/ompi_mpi_init.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "ompi/runtime/mpiruntime.h"
 #include "ompi/runtime/params.h"
 #include "orte/runtime/runtime.h"
diff --git a/ompi/runtime/ompi_mpi_params.c b/ompi/runtime/ompi_mpi_params.c
index 286d94f7ab..b30cf17fa6 100644
--- a/ompi/runtime/ompi_mpi_params.c
+++ b/ompi/runtime/ompi_mpi_params.c
@@ -16,7 +16,7 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include "ompi/include/constants.h"
 #include "opal/util/output.h"
 #include "opal/util/show_help.h"
 #include "opal/mca/base/mca_base_param.h"