diff --git a/src/mca/mpi/ptl/base/Makefile.am b/src/mca/mpi/ptl/base/Makefile.am
index 4a13d96857..91a9694a0e 100644
--- a/src/mca/mpi/ptl/base/Makefile.am
+++ b/src/mca/mpi/ptl/base/Makefile.am
@@ -7,4 +7,4 @@ include $(top_srcdir)/config/Makefile.options
 noinst_LTLIBRARIES = libbase.la
 
 libbase_la_SOURCES = \
-    match.c
+    ptl_base_match.c
diff --git a/src/mca/mpi/ptl/base/ptl_base_match.c b/src/mca/mpi/ptl/base/ptl_base_match.c
index 03f2353710..e0437b9b8e 100644
--- a/src/mca/mpi/ptl/base/ptl_base_match.c
+++ b/src/mca/mpi/ptl/base/ptl_base_match.c
@@ -6,16 +6,16 @@
 
 #include <stdio.h>
 
-#include "mca/mpi/pml/pml.h"
-#include "mca/mpi/pml/base/header.h"
-#include "mca/mpi/pml/base/recvfrag.h"
-#include "mca/mpi/pml/base/recvreq.h"
-#include "lam/threads/mutex.h"
 #include "lam/constants.h"
-#include "mpi/communicator/communicator.h"
-#include "mca/mpi/ptl/base/match.h"
-#include "mca/mpi/pml/teg/comm.h"
 #include "lam/lfc/list.h"
+#include "lam/threads/mutex.h"
+#include "mpi/communicator/communicator.h"
+#include "mca/mpi/pml/pml.h"
+#include "mca/mpi/pml/base/pml_base_header.h"
+#include "mca/mpi/pml/base/pml_base_recvfrag.h"
+#include "mca/mpi/pml/base/pml_base_recvreq.h"
+#include "mca/mpi/pml/base/pml_base_comm.h"
+#include "mca/mpi/ptl/base/ptl_base_match.h"
 
 /**
  * RCS/CTS receive side matching