diff --git a/src/mpi.f90 b/src/mpi.f90
index 5dee153..a48ba26 100644
--- a/src/mpi.f90
+++ b/src/mpi.f90
@@ -1,12 +1,7 @@
 module mpi
+    use mpi_c_bindings, only: MPI_HANDLE_KIND
     implicit none
 
-#ifdef OPEN_MPI
-#define MPI_HANDLE_KIND 8
-#else
-#define MPI_HANDLE_KIND 4
-#endif
-
     integer, parameter :: MPI_THREAD_FUNNELED = 1
 
     integer, parameter :: MPI_INTEGER = -10002
diff --git a/src/mpi_c_bindings.f90 b/src/mpi_c_bindings.f90
index eddcc06..6561693 100644
--- a/src/mpi_c_bindings.f90
+++ b/src/mpi_c_bindings.f90
@@ -8,6 +8,7 @@ module mpi_c_bindings
 #define MPI_HANDLE_KIND 4
 #endif
 
+    integer, parameter :: mpi_handle_kind = MPI_HANDLE_KIND
     type(c_ptr), bind(C, name="c_MPI_STATUSES_IGNORE") :: c_mpi_statuses_ignore
     type(c_ptr), bind(C, name="c_MPI_IN_PLACE") :: c_mpi_in_place
     integer(kind=MPI_HANDLE_KIND), bind(C, name="c_MPI_INFO_NULL") :: c_mpi_info_null