diff --git a/src/mpi/interface/c/comm_get_name.c b/src/mpi/interface/c/comm_get_name.c
index f26bb450c8..121dc4c1de 100644
--- a/src/mpi/interface/c/comm_get_name.c
+++ b/src/mpi/interface/c/comm_get_name.c
@@ -6,11 +6,11 @@
 
 #include <string.h>
 
+#include "lam/util/strncpy.h"
+#include "lam/totalview.h"
 #include "mpi.h"
 #include "mpi/interface/c/bindings.h"
-#include "lam/util/strncpy.h"
-#include "lam/communicator.h"
-#include "lam/totalview.h"
+#include "mpi/communicator/communicator.h"
 
 #if LAM_WANT_MPI_PROFILING && LAM_HAVE_WEAK_SYMBOLS
 #pragma weak PMPI_Comm_get_name = MPI_Comm_get_name
diff --git a/src/mpi/interface/c/comm_set_name.c b/src/mpi/interface/c/comm_set_name.c
index 41bd92c8d2..2b54c208d7 100644
--- a/src/mpi/interface/c/comm_set_name.c
+++ b/src/mpi/interface/c/comm_set_name.c
@@ -6,11 +6,11 @@
 
 #include <string.h>
 
+#include "lam/util/strncpy.h"
+#include "lam/totalview.h"
 #include "mpi.h"
 #include "mpi/interface/c/bindings.h"
-#include "lam/util/strncpy.h"
-#include "lam/communicator.h"
-#include "lam/totalview.h"
+#include "mpi/communicator/communicator.h"
 
 #if LAM_WANT_MPI_PROFILING && LAM_HAVE_WEAK_SYMBOLS
 #pragma weak PMPI_Comm_set_name = MPI_Comm_set_name