diff --git a/opal/mca/common/cuda/Makefile.am b/opal/mca/common/cuda/Makefile.am
index f11061cbae..77ed48d1da 100644
--- a/opal/mca/common/cuda/Makefile.am
+++ b/opal/mca/common/cuda/Makefile.am
@@ -85,8 +85,7 @@ lib@OPAL_LIB_PREFIX@mca_common_cuda_la_LDFLAGS = \
         -version-info $(libmca_common_cuda_so_version)
 lib@OPAL_LIB_PREFIX@mca_common_cuda_la_LIBADD = $(common_cuda_LIBS)
 
-lib@OPAL_LIB_PREFIX@mca_common_cuda_noinst_la_SOURCES = \
-        $(lib@OPAL_LIB_PREFIX@mca_common_cuda_la_SOURCES)
+lib@OPAL_LIB_PREFIX@mca_common_cuda_noinst_la_SOURCES = $(headers) $(sources)
 lib@OPAL_LIB_PREFIX@mca_common_cuda_noinst_la_LDFLAGS = $(common_cuda_LDFLAGS)
 lib@OPAL_LIB_PREFIX@mca_common_cuda_noinst_la_LIBADD = $(common_cuda_LIBS)
 
diff --git a/opal/mca/common/ofacm/Makefile.am b/opal/mca/common/ofacm/Makefile.am
index 3f2eab4572..b592f6badf 100644
--- a/opal/mca/common/ofacm/Makefile.am
+++ b/opal/mca/common/ofacm/Makefile.am
@@ -52,8 +52,7 @@ lib@OPAL_LIB_PREFIX@mca_common_ofacm_la_LDFLAGS = \
         -version-info $(libmca_common_ofacm_so_version) \
         $(common_ofacm_LDFLAGS)
 lib@OPAL_LIB_PREFIX@mca_common_ofacm_la_LIBADD = $(common_ofacm_LIBS)
-lib@OPAL_LIB_PREFIX@mca_common_ofacm_noinst_la_SOURCES = \
-        $(lib@OPAL_LIB_PREFIX@mca_common_ofacm_la_SOURCES)
+lib@OPAL_LIB_PREFIX@mca_common_ofacm_noinst_la_SOURCES = $(headers) $(sources)
 
 # Conditionally install the header files
 
diff --git a/opal/mca/common/sm/Makefile.am b/opal/mca/common/sm/Makefile.am
index 419f13f695..e2b116c0f8 100644
--- a/opal/mca/common/sm/Makefile.am
+++ b/opal/mca/common/sm/Makefile.am
@@ -86,7 +86,7 @@ lib@OPAL_LIB_PREFIX@mca_common_sm_la_SOURCES = \
 lib@OPAL_LIB_PREFIX@mca_common_sm_la_LDFLAGS = \
         -version-info $(libmca_common_sm_so_version)
 lib@OPAL_LIB_PREFIX@mca_common_sm_noinst_la_SOURCES = \
-        $(lib@OPAL_LIB_PREFIX@mca_common_sm_la_SOURCES)
+        $(headers) $(sources)
 
 # Conditionally install the header files
 
diff --git a/opal/mca/common/verbs/Makefile.am b/opal/mca/common/verbs/Makefile.am
index af63aeaff4..e410343c9e 100644
--- a/opal/mca/common/verbs/Makefile.am
+++ b/opal/mca/common/verbs/Makefile.am
@@ -52,8 +52,7 @@ lib@OPAL_LIB_PREFIX@mca_common_verbs_la_LDFLAGS =  \
         -version-info $(libmca_common_verbs_so_version) \
         $(common_verbs_LDFLAGS)
 lib@OPAL_LIB_PREFIX@mca_common_verbs_la_LIBADD = $(common_verbs_LIBS)
-lib@OPAL_LIB_PREFIX@mca_common_verbs_noinst_la_SOURCES = \
-        $(lib@OPAL_LIB_PREFIX@mca_common_verbs_la_SOURCES)
+lib@OPAL_LIB_PREFIX@mca_common_verbs_noinst_la_SOURCES = $(headers) $(sources)
 
 # Conditionally install the header files