diff --git a/ompi/class/ompi_free_list.c b/ompi/class/ompi_free_list.c
index 3f2037cd94..5a8d23741a 100644
--- a/ompi/class/ompi_free_list.c
+++ b/ompi/class/ompi_free_list.c
@@ -21,7 +21,7 @@
 #include "ompi_config.h"
 
 #include "ompi/class/ompi_free_list.h"
-#include "opal/include/opal/align.h"
+#include "opal/align.h"
 #include "opal/util/output.h"
 #include "opal/sys/cache.h"
 #include "ompi/mca/mpool/mpool.h"
diff --git a/ompi/datatype/dt_args.c b/ompi/datatype/dt_args.c
index c267fd3439..14a7850060 100644
--- a/ompi/datatype/dt_args.c
+++ b/ompi/datatype/dt_args.c
@@ -19,7 +19,7 @@
 
 #include "ompi_config.h"
 #include "opal/util/arch.h"
-#include "opal/include/opal/align.h"
+#include "opal/align.h"
 #include "ompi/constants.h"
 
 #include "mpi.h"
diff --git a/ompi/mca/btl/openib/btl_openib_component.c b/ompi/mca/btl/openib/btl_openib_component.c
index 3f1b50feb7..4f7f6d1f78 100644
--- a/ompi/mca/btl/openib/btl_openib_component.c
+++ b/ompi/mca/btl/openib/btl_openib_component.c
@@ -45,7 +45,7 @@ const char *ibv_get_sysfs_path(void);
 
 #include "ompi/constants.h"
 #include "opal/event/event.h"
-#include "opal/include/opal/align.h"
+#include "opal/align.h"
 #include "opal/util/if.h"
 #include "opal/util/output.h"
 #include "opal/util/argv.h"
diff --git a/ompi/mca/btl/udapl/btl_udapl_endpoint.c b/ompi/mca/btl/udapl/btl_udapl_endpoint.c
index d6627c4086..eb6c99e595 100644
--- a/ompi/mca/btl/udapl/btl_udapl_endpoint.c
+++ b/ompi/mca/btl/udapl/btl_udapl_endpoint.c
@@ -26,7 +26,7 @@
 #include <sys/time.h>
 #include <time.h>
 #include "ompi/types.h"
-#include "opal/include/opal/align.h"
+#include "opal/align.h"
 
 #include "orte/mca/rml/rml.h"
 #include "orte/mca/errmgr/errmgr.h"
diff --git a/ompi/mca/mpool/fake/mpool_fake_module.c b/ompi/mca/mpool/fake/mpool_fake_module.c
index e3cf6e99cc..c7ea430765 100644
--- a/ompi/mca/mpool/fake/mpool_fake_module.c
+++ b/ompi/mca/mpool/fake/mpool_fake_module.c
@@ -21,7 +21,7 @@
 
 #define OMPI_DISABLE_ENABLE_MEM_DEBUG 1
 #include "ompi_config.h"
-#include "opal/include/opal/align.h"
+#include "opal/align.h"
 #include "orte/util/name_fns.h"
 #include "orte/runtime/orte_globals.h"
 #include "mpool_fake.h"
diff --git a/ompi/mca/mpool/rdma/mpool_rdma_module.c b/ompi/mca/mpool/rdma/mpool_rdma_module.c
index 3e15ea4016..bbf2114b3b 100644
--- a/ompi/mca/mpool/rdma/mpool_rdma_module.c
+++ b/ompi/mca/mpool/rdma/mpool_rdma_module.c
@@ -23,7 +23,7 @@
 
 #define OMPI_DISABLE_ENABLE_MEM_DEBUG 1
 #include "ompi_config.h"
-#include "opal/include/opal/align.h"
+#include "opal/align.h"
 #include "orte/util/name_fns.h"
 #include "orte/runtime/orte_globals.h"
 #include "ompi/mca/mpool/rdma/mpool_rdma.h"
diff --git a/ompi/mca/mpool/sm/mpool_sm_module.c b/ompi/mca/mpool/sm/mpool_sm_module.c
index 32f1a22967..83a877aa30 100644
--- a/ompi/mca/mpool/sm/mpool_sm_module.c
+++ b/ompi/mca/mpool/sm/mpool_sm_module.c
@@ -23,7 +23,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include "opal/include/opal/align.h"
+#include "opal/align.h"
 #include "opal/mca/maffinity/maffinity.h"
 #include "opal/mca/maffinity/maffinity_types.h"
 #include "opal/mca/maffinity/base/base.h"
diff --git a/opal/mca/crs/base/crs_base_close.c b/opal/mca/crs/base/crs_base_close.c
index 7d600704b0..85991e66e6 100644
--- a/opal/mca/crs/base/crs_base_close.c
+++ b/opal/mca/crs/base/crs_base_close.c
@@ -18,7 +18,7 @@
 
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
-#include "opal/include/opal/constants.h"
+#include "opal/constants.h"
 #include "opal/mca/crs/crs.h"
 #include "opal/mca/crs/base/base.h"
 
diff --git a/opal/mca/crs/base/crs_base_fns.c b/opal/mca/crs/base/crs_base_fns.c
index dbe0691720..4df1fdf453 100644
--- a/opal/mca/crs/base/crs_base_fns.c
+++ b/opal/mca/crs/base/crs_base_fns.c
@@ -33,7 +33,7 @@
 
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
-#include "opal/include/opal/constants.h"
+#include "opal/constants.h"
 #include "opal/util/os_dirpath.h"
 #include "opal/util/output.h"
 #include "opal/util/argv.h"
diff --git a/opal/mca/crs/base/crs_base_open.c b/opal/mca/crs/base/crs_base_open.c
index bb367876c2..1edf3848c9 100644
--- a/opal/mca/crs/base/crs_base_open.c
+++ b/opal/mca/crs/base/crs_base_open.c
@@ -20,7 +20,7 @@
 
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
-#include "opal/include/opal/constants.h"
+#include "opal/constants.h"
 #include "opal/mca/crs/crs.h"
 #include "opal/mca/crs/base/base.h"
 #include "opal/util/output.h"
diff --git a/opal/mca/crs/base/crs_base_select.c b/opal/mca/crs/base/crs_base_select.c
index 186c4abcb5..b4a27e600b 100644
--- a/opal/mca/crs/base/crs_base_select.c
+++ b/opal/mca/crs/base/crs_base_select.c
@@ -22,7 +22,7 @@
 #include "unistd.h"
 #endif
 
-#include "opal/include/opal/constants.h"
+#include "opal/constants.h"
 #include "opal/util/output.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"