diff --git a/src/mca/ptl/elan/Makefile.am b/src/mca/ptl/elan/Makefile.am
index abf4fd6129..8e3759b564 100644
--- a/src/mca/ptl/elan/Makefile.am
+++ b/src/mca/ptl/elan/Makefile.am
@@ -7,9 +7,9 @@
 include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CFLAGS = \
-        -I$(top_lam_builddir)/src/include \
-        -I$(top_lam_srcdir)/src \
-        -I$(top_lam_srcdir)/src/include \
+        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include \
         -lelan -lelanctrl -lrms -lrmscall -lelan4 
 
 SUBDIRS = src
diff --git a/src/mca/ptl/elan/src/Makefile.am b/src/mca/ptl/elan/src/Makefile.am
index 8df405781b..688fbe51a2 100644
--- a/src/mca/ptl/elan/src/Makefile.am
+++ b/src/mca/ptl/elan/src/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS =  \
         -I$(top_ompi_builddir)/src/include \
         -I$(top_ompi_srcdir)/src \
         -I$(top_ompi_srcdir)/src/include
+        -lelan -lelanctrl -lrms -lrmscall -lelan4 
 
 noinst_LTLIBRARIES = libmca_ptl_elan.la
 libmca_ptl_elan_la_SOURCES = \