diff --git a/src/mca/lam/Makefile.am b/src/mca/lam/Makefile.am
deleted file mode 100644
index 62fb64b410..0000000000
--- a/src/mca/lam/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# $HEADER$
-#
-
-include $(top_srcdir)/config/Makefile.options
-
-# base should be listed first because it should be built first
-# (probably not for any technical rason, but it makes sense to build
-# the base first).  common_lam must be second, however, because
-# modules under there may be statically linked to other modules.
-
-SUBDIRS = base common_lam oob pcm registry 
-
-# Library
-
-noinst_LTLIBRARIES = libmca_lam_convenience.la
-libmca_lam_convenience_la_SOURCES =
-libmca_lam_convenience_la_LIBADD = \
-        base/libmca_lam_base.la \
-        oob/libmca_oob.la \
-        pcm/libmca_pcm.la \
-        registry/libmca_registry.la
-# Add base, common_lam, oob, pcm, registry as required
-libmca_lam_convenience_la_DEPENDENCIES = $(libmca_lam_convenience_la_LIBADD)
diff --git a/src/mca/mpi/Makefile.am b/src/mca/mpi/Makefile.am
deleted file mode 100644
index a819112054..0000000000
--- a/src/mca/mpi/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# $HEADER$
-#
-
-include $(top_srcdir)/config/Makefile.options
-
-# base should be listed first because it should be built first
-# (probably not for any technical rason, but it makes sense to build
-# the base first).  common_mpi must be second, however, because
-# modules under there may be statically linked to other modules.
-
-SUBDIRS = base common_mpi coll io one pml ptl 
-
-# Library
-
-noinst_LTLIBRARIES = libmca_mpi_convenience.la
-libmca_mpi_convenience_la_SOURCES =
-libmca_mpi_convenience_la_LIBADD = \
-        base/libmca_mpi_base.la \
-        coll/libmca_mpi_coll.la \
-        pml/libmca_mpi_pml.la \
-        ptl/libmca_mpi_ptl.la
-libmca_mpi_convenience_la_DEPENDENCIES = $(libmca_mpi_convenience_la_LIBADD)
diff --git a/src/mca/mpi/base/Makefile.am b/src/mca/mpi/base/Makefile.am
deleted file mode 100644
index 2fde0c6110..0000000000
--- a/src/mca/mpi/base/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# $HEADER$
-#
-
-include $(top_srcdir)/config/Makefile.options
-
-noinst_LTLIBRARIES = libmca_mpi_base.la
-
-headers = \
-        base.h
-
-libmca_mpi_base_la_SOURCES = \
-        $(headers) \
-        mca_mpi_base_open.c \
-        mca_mpi_init_select_modules.c \
-        mca_mpi_mem.c
-
-# Conditionally install the header files
-
-if WANT_INSTALL_HEADERS
-lamdir = $(includedir)/lam/mca/mpi/base
-lam_HEADERS = $(headers)
-else
-lamdir = $(includedir)
-endif