diff --git a/ompi/mca/pml/base/Makefile.am b/ompi/mca/pml/base/Makefile.am
index aefdb001c6..86c1142ab0 100644
--- a/ompi/mca/pml/base/Makefile.am
+++ b/ompi/mca/pml/base/Makefile.am
@@ -27,6 +27,7 @@ AM_CPPFLAGS = -I$(top_builddir)/src
 headers = \
         base.h \
         pml_base_bsend.h \
+        pml_base_module_exchange.h \
         pml_base_request.h \
         pml_base_recvreq.h \
         pml_base_sendreq.h
@@ -35,10 +36,11 @@ libmca_pml_base_la_SOURCES = \
         $(headers) \
         pml_base_bsend.c \
         pml_base_close.c \
-        pml_base_request.c \
+        pml_base_module_exchange.h \
         pml_base_open.c \
-        pml_base_select.c \
         pml_base_recvreq.c \
+        pml_base_request.c \
+        pml_base_select.c \
         pml_base_sendreq.c
 
 # Conditionally install the header files
diff --git a/orte/util/orte_module_exchange.c b/ompi/mca/pml/base/pml_base_module_exchange.c
similarity index 100%
rename from orte/util/orte_module_exchange.c
rename to ompi/mca/pml/base/pml_base_module_exchange.c
diff --git a/orte/util/orte_module_exchange.h b/ompi/mca/pml/base/pml_base_module_exchange.h
similarity index 100%
rename from orte/util/orte_module_exchange.h
rename to ompi/mca/pml/base/pml_base_module_exchange.h
diff --git a/orte/util/Makefile.am b/orte/util/Makefile.am
index 664ff5ef8a..03244f0919 100644
--- a/orte/util/Makefile.am
+++ b/orte/util/Makefile.am
@@ -23,7 +23,6 @@ noinst_LTLIBRARIES = liborteutil.la
 # Source code files
 
 headers = \
-        orte_module_exchange.h \
         proc_info.h \
         session_dir.h \
         universe_setup_file_io.h \
@@ -31,7 +30,6 @@ headers = \
 
 liborteutil_la_SOURCES = \
         $(headers) \
-        orte_module_exchange.c \
         proc_info.c \
         session_dir.c \
         universe_setup_file_io.c \