diff --git a/ompi/mca/allocator/Makefile.am b/ompi/mca/allocator/Makefile.am
index 6f3a8b68bc..0da2a4da05 100644
--- a/ompi/mca/allocator/Makefile.am
+++ b/ompi/mca/allocator/Makefile.am
@@ -25,7 +25,7 @@ headers = allocator.h
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/opal/mca/allocator
+ompidir = $(includedir)/openmpi/ompi/mca/allocator
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)
diff --git a/ompi/mca/allocator/base/Makefile.am b/ompi/mca/allocator/base/Makefile.am
index e1297cab70..90bd8da58d 100644
--- a/ompi/mca/allocator/base/Makefile.am
+++ b/ompi/mca/allocator/base/Makefile.am
@@ -31,7 +31,7 @@ libmca_allocator_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/allocator/base
+ompidir = $(includedir)/openmpi/ompi/mca/allocator/base
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)
diff --git a/ompi/mca/mpool/Makefile.am b/ompi/mca/mpool/Makefile.am
index 02f7cb06f9..32445751d9 100644
--- a/ompi/mca/mpool/Makefile.am
+++ b/ompi/mca/mpool/Makefile.am
@@ -25,7 +25,7 @@ headers = mpool.h
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/opal/mca/mpool
+ompidir = $(includedir)/openmpi/ompi/mca/mpool
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)
diff --git a/ompi/mca/mpool/base/Makefile.am b/ompi/mca/mpool/base/Makefile.am
index 840c531b52..68da25805a 100644
--- a/ompi/mca/mpool/base/Makefile.am
+++ b/ompi/mca/mpool/base/Makefile.am
@@ -36,7 +36,7 @@ libmca_mpool_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/mpool/base
+ompidir = $(includedir)/openmpi/ompi/mca/mpool/base
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)
diff --git a/ompi/mca/rcache/Makefile.am b/ompi/mca/rcache/Makefile.am
index e5ccec3672..93c2ed3607 100644
--- a/ompi/mca/rcache/Makefile.am
+++ b/ompi/mca/rcache/Makefile.am
@@ -23,7 +23,7 @@ headers = rcache.h
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/opal/mca/rcache
+ompidir = $(includedir)/openmpi/ompi/mca/rcache
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)
diff --git a/ompi/mca/rcache/base/Makefile.am b/ompi/mca/rcache/base/Makefile.am
index a6abe9cbf1..5dc6f57ff5 100644
--- a/ompi/mca/rcache/base/Makefile.am
+++ b/ompi/mca/rcache/base/Makefile.am
@@ -32,7 +32,7 @@ libmca_rcache_base_la_SOURCES = \
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/rcache/base
+ompidir = $(includedir)/openmpi/ompi/mca/rcache/base
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)
diff --git a/opal/mca/timer/base/Makefile.am b/opal/mca/timer/base/Makefile.am
index b4b7c202d4..eb871bb3dc 100644
--- a/opal/mca/timer/base/Makefile.am
+++ b/opal/mca/timer/base/Makefile.am
@@ -32,8 +32,10 @@ libmca_timer_base_la_SOURCES = \
 if WANT_INSTALL_HEADERS
 ompidir = $(includedir)/openmpi/opal/mca/timer/base
 ompi_HEADERS = $(headers)
+nodist_ompi_HEADERS = base_impl.h
 else
 ompidir = $(includedir)
+nodist_ompi_HEADERS = 
 endif
 
 distclean-local: