diff --git a/opal/mca/base/Makefile.am b/opal/mca/base/Makefile.am
index c229c0cfad..9fe4254ade 100644
--- a/opal/mca/base/Makefile.am
+++ b/opal/mca/base/Makefile.am
@@ -20,7 +20,6 @@
 # (by default)
 
 AM_CPPFLAGS = \
-        $(OPAL_LTDL_CPPFLAGS) \
         -DOMPI_PKGLIBDIR=\"$(pkglibdir)\" \
         -DOMPI_SYSCONFDIR=\"$(sysconfdir)\"
 AM_LFLAGS = -Pmca_base_yy
diff --git a/opal/mca/base/mca_base_component_find.c b/opal/mca/base/mca_base_component_find.c
index 38ded6e028..cafdf58a35 100644
--- a/opal/mca/base/mca_base_component_find.c
+++ b/opal/mca/base/mca_base_component_find.c
@@ -24,9 +24,7 @@
 #include <stdlib.h>
 
 #if OMPI_WANT_LIBLTDL
-/* Ensure to get the right <ltdl.h> -- a -I should be setup in this
-   directory's Makefile.am to get opal/libltdl */ 
-#include "ltdl.h"
+#include "opal/libltdl/ltdl.h"
 #endif
 
 #include "opal/util/output.h"
diff --git a/opal/mca/base/mca_base_component_repository.c b/opal/mca/base/mca_base_component_repository.c
index 497ee0ab79..44c079b018 100644
--- a/opal/mca/base/mca_base_component_repository.c
+++ b/opal/mca/base/mca_base_component_repository.c
@@ -26,9 +26,7 @@
 #include <stdio.h>
 
 #if OMPI_WANT_LIBLTDL
-/* Ensure to get the right <ltdl.h> -- a -I should be setup in this
-   directory's Makefile.am to get opal/libltdl */ 
-#include "ltdl.h"
+#include "opal/libltdl/ltdl.h"
 #endif
 
 #include "opal/class/opal_list.h"
diff --git a/opal/mca/base/mca_base_component_repository.h b/opal/mca/base/mca_base_component_repository.h
index 5754c6205a..884c7562b3 100644
--- a/opal/mca/base/mca_base_component_repository.h
+++ b/opal/mca/base/mca_base_component_repository.h
@@ -22,9 +22,7 @@
 #include "ompi_config.h"
 
 #if OMPI_WANT_LIBLTDL
-/* Ensure to get the right <ltdl.h> -- a -I should be setup in this
-   directory's Makefile.am to get opal/libltdl */ 
-#include "ltdl.h"
+#include "opal/libltdl/ltdl.h"
 #else
 /* if we don't have libltdl, provide dummy handle type */
 typedef void* lt_dlhandle;
diff --git a/test/support/Makefile.am b/test/support/Makefile.am
index 42fe9d14b9..932233be78 100644
--- a/test/support/Makefile.am
+++ b/test/support/Makefile.am
@@ -17,7 +17,6 @@
 #
 
 AM_CPPFLAGS = \
-        $(OPAL_LTDL_CPPFLAGS) \
         -DBUILDDIR=\"$(OMPI_TOP_BUILDDIR)\" \
         -DSRCDIR=\"$(OMPI_TOP_SRCDIR)\"
 
diff --git a/test/support/components.c b/test/support/components.c
index 2655b83b64..372f13a3b8 100644
--- a/test/support/components.c
+++ b/test/support/components.c
@@ -23,9 +23,7 @@
 #include "ompi/include/constants.h"
 #include "opal/include/constants.h"
 #include "opal/mca/mca.h"
-/* Ensure to get the right <ltdl.h> -- a -I should be setup in this
-   directory's Makefile.am to get opal/libltdl */ 
-#include "ltdl.h"
+#include "opal/libltdl/ltdl.h"
 
 #include "components.h"
 
diff --git a/test/support/components.h b/test/support/components.h
index 4693a5c30b..1021cbbcac 100644
--- a/test/support/components.h
+++ b/test/support/components.h
@@ -20,8 +20,8 @@
 #ifndef OMPI_SUPPORT_COMPONENTS_H
 #define OMPI_SUPPORT_COMPONENTS_H
 
-#include "libltdl/ltdl.h"
-#include "mca/mca.h"
+#include "opal/libltdl/ltdl.h"
+#include "opal/mca/mca.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {