diff --git a/src/mpi/c/allreduce.c b/src/mpi/c/allreduce.c
index 9326735af2..af53abafb0 100644
--- a/src/mpi/c/allreduce.c
+++ b/src/mpi/c/allreduce.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 
 #include "mpi.h"
+#include "datatype/datatype.h"
 #include "mpi/c/bindings.h"
 #include "mca/coll/coll.h"
 #include "communicator/communicator.h"
diff --git a/src/mpi/c/exscan.c b/src/mpi/c/exscan.c
index e8ea773fda..3c3247839f 100644
--- a/src/mpi/c/exscan.c
+++ b/src/mpi/c/exscan.c
@@ -17,6 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
+#include "datatype/datatype.h"
 #include "mpi/c/bindings.h"
 #include "mca/coll/coll.h"
 #include "errhandler/errhandler.h"
diff --git a/src/mpi/c/file_iread.c b/src/mpi/c/file_iread.c
index 5c8b6b95d5..62cfa74eea 100644
--- a/src/mpi/c/file_iread.c
+++ b/src/mpi/c/file_iread.c
@@ -17,6 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
+#include "datatype/datatype.h"
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
diff --git a/src/mpi/c/file_iread_at.c b/src/mpi/c/file_iread_at.c
index a48216a82f..60982d27e1 100644
--- a/src/mpi/c/file_iread_at.c
+++ b/src/mpi/c/file_iread_at.c
@@ -17,6 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
+#include "datatype/datatype.h"
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
diff --git a/src/mpi/c/file_iread_shared.c b/src/mpi/c/file_iread_shared.c
index 472eb3f34a..f26f2dcefc 100644
--- a/src/mpi/c/file_iread_shared.c
+++ b/src/mpi/c/file_iread_shared.c
@@ -17,6 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
+#include "datatype/datatype.h"
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
diff --git a/src/mpi/c/file_iwrite.c b/src/mpi/c/file_iwrite.c
index c465fa8849..492d605d4b 100644
--- a/src/mpi/c/file_iwrite.c
+++ b/src/mpi/c/file_iwrite.c
@@ -17,6 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
+#include "datatype/datatype.h"
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
diff --git a/src/mpi/c/file_iwrite_at.c b/src/mpi/c/file_iwrite_at.c
index a24b1dccac..eb53a7245c 100644
--- a/src/mpi/c/file_iwrite_at.c
+++ b/src/mpi/c/file_iwrite_at.c
@@ -17,6 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
+#include "datatype/datatype.h"
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
diff --git a/src/mpi/c/file_iwrite_shared.c b/src/mpi/c/file_iwrite_shared.c
index a158d7e8dc..b4051d132c 100644
--- a/src/mpi/c/file_iwrite_shared.c
+++ b/src/mpi/c/file_iwrite_shared.c
@@ -17,6 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
+#include "datatype/datatype.h"
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
diff --git a/src/mpi/c/file_set_view.c b/src/mpi/c/file_set_view.c
index 7d0090baae..ac4b621298 100644
--- a/src/mpi/c/file_set_view.c
+++ b/src/mpi/c/file_set_view.c
@@ -17,6 +17,7 @@
 #include "ompi_config.h"
 
 #include "mpi.h"
+#include "datatype/datatype.h"
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
diff --git a/src/mpi/c/reduce.c b/src/mpi/c/reduce.c
index c987e0f239..f9592e187f 100644
--- a/src/mpi/c/reduce.c
+++ b/src/mpi/c/reduce.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 
 #include "mpi.h"
+#include "datatype/datatype.h"
 #include "mpi/c/bindings.h"
 #include "mca/coll/coll.h"
 #include "errhandler/errhandler.h"
diff --git a/src/mpi/c/reduce_scatter.c b/src/mpi/c/reduce_scatter.c
index 2531564e38..9d8740e7de 100644
--- a/src/mpi/c/reduce_scatter.c
+++ b/src/mpi/c/reduce_scatter.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 
 #include "mpi.h"
+#include "datatype/datatype.h"
 #include "mpi/c/bindings.h"
 #include "mca/coll/coll.h"
 #include "errhandler/errhandler.h"
diff --git a/src/mpi/c/scan.c b/src/mpi/c/scan.c
index 27a0b2a789..85509d0f82 100644
--- a/src/mpi/c/scan.c
+++ b/src/mpi/c/scan.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 
 #include "mpi.h"
+#include "datatype/datatype.h"
 #include "mpi/c/bindings.h"
 #include "mca/coll/coll.h"
 #include "errhandler/errhandler.h"
diff --git a/src/mpi/c/send.c b/src/mpi/c/send.c
index 6bc120bff3..4b61aee0ef 100644
--- a/src/mpi/c/send.c
+++ b/src/mpi/c/send.c
@@ -20,6 +20,7 @@
 #include "mpi/c/bindings.h"
 #include "mca/pml/pml.h"
 #include "errhandler/errhandler.h"
+#include "datatype/datatype.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_Send = PMPI_Send