diff --git a/src/h5core/Makefile.am b/src/h5core/Makefile.am
index a047e4c..2ed0fcc 100644
--- a/src/h5core/Makefile.am
+++ b/src/h5core/Makefile.am
@@ -54,7 +54,6 @@ libH5hut_la_SOURCES =				\
 	h5_hsearch.c				\
 	h5_maps.c				\
 	h5_model.c				\
-	h5_mpi.c				\
 	h5_openclose.c				\
 	h5_qsort.c				\
 	h5_qsort_r.c				\
diff --git a/src/h5core/h5_mpi.c b/src/h5core/h5_mpi.c
deleted file mode 100644
index d7642b8..0000000
--- a/src/h5core/h5_mpi.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
-  Copyright (c) 2006-2015, The Regents of the University of California,
-  through Lawrence Berkeley National Laboratory (subject to receipt of any
-  required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
-  Institut (Switzerland).  All rights reserved.
-
-  License: see file COPYING in top level of source distribution.
-*/
-
-#include "h5core/h5.h"
-#include "h5core/h5_types.h"
-#include "h5_debug_private.h"
-
-#ifdef PARALLEL_IO
-
-// barrier
-h5_err_t
-h5priv_mpi_barrier (
-        const MPI_Comm comm
-        ) {
-	MPI_WRAPPER_ENTER (h5_err_t, "comm=%p",&comm);
-	int err = MPI_Barrier(comm);
-	if (err != MPI_SUCCESS)
-		MPI_WRAPPER_LEAVE (
-		        h5_error (
-		                H5_ERR_MPI,
-		                "MPI Barrier was not successful"));
-	MPI_WRAPPER_RETURN (H5_SUCCESS);
-}
-
-// communication routines
-h5_err_t
-h5priv_mpi_recv(
-        void* buf,
-        const int count,
-        const MPI_Datatype type,
-        const int from,
-        const int tag,
-        const MPI_Comm comm
-        ) {
-	MPI_WRAPPER_ENTER (h5_err_t,
-	                   "buf=%p, count=%d, type=?, from=%d, tag=%d, comm=?",
-	                   buf, count, from, tag);
-	int err = MPI_Recv(
-	        buf,
-	        count,
-	        type,
-	        from,
-	        tag,
-	        comm,
-	        MPI_STATUS_IGNORE
-	        );
-	if (err != MPI_SUCCESS)
-		MPI_WRAPPER_LEAVE (h5_error (H5_ERR_MPI, "Cannot receive data"));
-	MPI_WRAPPER_RETURN (H5_SUCCESS);
-}
-
-h5_err_t
-h5priv_mpi_send(
-        void* buf,
-        const int count,
-        const MPI_Datatype type,
-        const int to,
-        const int tag,
-        const MPI_Comm comm
-        ) {
-	MPI_WRAPPER_ENTER (h5_err_t,
-	                   "buf=%p, count=%d, type=?, to=%d, tag=%d, comm=?",
-	                   buf, count, to, tag);
-	int err = MPI_Send(
-	        buf,
-	        count,
-	        type,
-	        to,
-	        tag,
-	        comm
-	        );
-	if (err != MPI_SUCCESS)
-		MPI_WRAPPER_LEAVE (h5_error (H5_ERR_MPI, "Cannot send data"));
-	MPI_WRAPPER_RETURN (H5_SUCCESS);
-}
-
-h5_err_t
-h5priv_mpi_bcast (
-        void* buf,
-        const int count,
-        const MPI_Datatype type,
-        const int root,
-        const MPI_Comm comm
-        ) {
-	MPI_WRAPPER_ENTER (h5_err_t,
-	                   "buf=%p, count=%d, type=?, root=%d, comm=?",
-	                   buf, count, root);
-	int err = MPI_Bcast(
-	        buf,
-	        count,
-	        type,
-	        root,
-	        comm
-	        );
-	if (err != MPI_SUCCESS)
-		MPI_WRAPPER_LEAVE (h5_error (H5_ERR_MPI, "Cannot perform broadcast"));
-	MPI_WRAPPER_RETURN (H5_SUCCESS);
-}
-
-
-
-h5_err_t
-h5priv_mpi_sum (
-        void* sendbuf,
-        void* recvbuf,
-        const int count,
-        const MPI_Datatype type,
-        const MPI_Comm comm
-        ) {
-	MPI_WRAPPER_ENTER (h5_err_t,
-	                   "sendbuf=%p, recvbuf=%p, count=%d, type=?, comm=?",
-	                   sendbuf, recvbuf, count);
-	int err = MPI_Allreduce(
-	        sendbuf,
-	        recvbuf,
-	        count,
-	        type,
-	        MPI_SUM,
-	        comm
-	        );
-	if (err != MPI_SUCCESS)
-		MPI_WRAPPER_LEAVE (h5_error (H5_ERR_MPI, "Cannot perform sum reduction"));
-	MPI_WRAPPER_RETURN (H5_SUCCESS);
-}
-
-h5_err_t
-h5priv_mpi_prefix_sum (
-        void* sendbuf,
-        void* recvbuf,
-        const int count,
-        const MPI_Datatype type,
-        const MPI_Comm comm
-        ) {
-	MPI_WRAPPER_ENTER (h5_err_t,
-	                   "sendbuf=%p, recvbuf=%p, count=%d, type=?, comm=?",
-	                   sendbuf, recvbuf, count);
-	int err = MPI_Scan(
-	        sendbuf,
-	        recvbuf,
-	        count,
-	        type,
-	        MPI_SUM,
-	        comm
-	        );
-	if (err != MPI_SUCCESS)
-		MPI_WRAPPER_LEAVE (h5_error (H5_ERR_MPI, "Cannot perform prefix sum"));
-	MPI_WRAPPER_RETURN (H5_SUCCESS);
-}
-
-
-//
-h5_err_t
-h5priv_mpi_comm_size (
-        MPI_Comm comm,
-        int* size
-        ) {
-	MPI_WRAPPER_ENTER (h5_err_t, "comm=?, size=%p", size);
-	int err = MPI_Comm_size (comm, size);
-	if (err != MPI_SUCCESS)
-		MPI_WRAPPER_LEAVE (h5_error (H5_ERR_MPI, "Cannot get communicator size"));
-	MPI_WRAPPER_RETURN (H5_SUCCESS);
-}
-
-
-h5_err_t
-h5priv_mpi_comm_rank (
-        MPI_Comm comm,
-        int* rank
-        ) {
-	MPI_WRAPPER_ENTER (h5_err_t, "comm=?, rank=%p", rank);
-	int err = MPI_Comm_rank (comm, rank);
-	if (err != MPI_SUCCESS)
-		MPI_WRAPPER_LEAVE (h5_error (H5_ERR_MPI, "Cannot get this task's rank"));
-	MPI_WRAPPER_RETURN (H5_SUCCESS);
-}
-
-h5_err_t
-h5priv_mpi_type_contiguous (
-        const size_t nelems,
-        const MPI_Datatype oldtype,
-        MPI_Datatype *const newtype
-        ) {
-	MPI_WRAPPER_ENTER (h5_err_t, "nelems=%lu, oldtype=?, newtype=?", (long unsigned)nelems);
-	int err;
-	err = MPI_Type_contiguous ( nelems, oldtype, newtype );
-	if (err != MPI_SUCCESS)
-		MPI_WRAPPER_LEAVE (h5_error (H5_ERR_MPI, "Cannot create new MPI type"));
-	err = MPI_Type_commit ( newtype );
-	if (err != MPI_SUCCESS)
-		MPI_WRAPPER_LEAVE (h5_error (H5_ERR_MPI, "Cannot commit new MPI type"));
-	MPI_WRAPPER_RETURN (H5_SUCCESS);
-}
-
-h5_err_t
-h5priv_mpi_type_free (
-        MPI_Datatype *type
-        ) {
-	MPI_WRAPPER_ENTER (h5_err_t, "type=%p", type);
-	int err = MPI_Type_free( type );
-	if (err != MPI_SUCCESS)
-		MPI_WRAPPER_LEAVE (h5_error(H5_ERR_MPI, "Cannot free MPI type"));
-	MPI_WRAPPER_RETURN (H5_SUCCESS);
-}
-
-h5_err_t
-h5priv_mpi_cart_create (
-        MPI_Comm old_comm,
-        int ndims,
-        int *dims,
-        int *period,
-        int reorder,
-        MPI_Comm *new_comm
-        ) {
-	MPI_WRAPPER_ENTER (h5_err_t, "old_comm=?, ndims=%d, dims=%p, period=%p, "
-	                   "reorder=%d, new_comm=%p",
-	                   ndims, dims, period, reorder, new_comm);
-	int err = MPI_Cart_create(
-	        old_comm, ndims, dims, period, reorder, new_comm);
-	if (err != MPI_SUCCESS)
-		MPI_WRAPPER_LEAVE (h5_error(H5_ERR_MPI, "Cannot create cartesian grid"));
-	MPI_WRAPPER_RETURN (H5_SUCCESS);
-}
-
-h5_err_t
-h5priv_mpi_cart_coords (
-        MPI_Comm comm,
-        int rank,
-        int maxdim,
-        int *coords
-        ) {
-	MPI_WRAPPER_ENTER (h5_err_t, "comm=?, rank=%d, maxdim=%d, coords=%p",
-	                   rank, maxdim, coords);
-	int err = MPI_Cart_coords( comm, rank, maxdim, coords );
-	if (err != MPI_SUCCESS)
-		MPI_WRAPPER_LEAVE (h5_error(H5_ERR_MPI, "Cannot create cartesian grid"));
-	MPI_WRAPPER_RETURN (H5_SUCCESS);
-}
-
-#endif // PARALLEL_IO
-
diff --git a/src/h5core/h5_mpi_private.h b/src/h5core/h5_mpi_private.h
index 7b6f694..2426945 100644
--- a/src/h5core/h5_mpi_private.h
+++ b/src/h5core/h5_mpi_private.h
@@ -82,14 +82,23 @@ h5priv_mpi_alltoallv (
 	MPI_WRAPPER_RETURN (H5_SUCCESS);
 }
 
-
-h5_err_t
+// barrier
+static inline h5_err_t
 h5priv_mpi_barrier (
         const MPI_Comm comm
-        );
+        ) {
+	MPI_WRAPPER_ENTER (h5_err_t, "comm=%p",&comm);
+	int err = MPI_Barrier(comm);
+	if (err != MPI_SUCCESS)
+		MPI_WRAPPER_LEAVE (
+		        h5_error (
+		                H5_ERR_MPI,
+		                "MPI Barrier was not successful"));
+	MPI_WRAPPER_RETURN (H5_SUCCESS);
+}
 
-
-h5_err_t
+// communication routines
+static inline h5_err_t
 h5priv_mpi_recv(
         void* buf,
         const int count,
@@ -97,9 +106,25 @@ h5priv_mpi_recv(
         const int from,
         const int tag,
         const MPI_Comm comm
-        );
+        ) {
+	MPI_WRAPPER_ENTER (h5_err_t,
+	                   "buf=%p, count=%d, type=?, from=%d, tag=%d, comm=?",
+	                   buf, count, from, tag);
+	int err = MPI_Recv(
+	        buf,
+	        count,
+	        type,
+	        from,
+	        tag,
+	        comm,
+	        MPI_STATUS_IGNORE
+	        );
+	if (err != MPI_SUCCESS)
+		MPI_WRAPPER_LEAVE (h5_error (H5_ERR_MPI, "Cannot receive data"));
+	MPI_WRAPPER_RETURN (H5_SUCCESS);
+}
 
-h5_err_t
+static inline h5_err_t
 h5priv_mpi_send(
         void* buf,
         const int count,
@@ -107,34 +132,117 @@ h5priv_mpi_send(
         const int to,
         const int tag,
         const MPI_Comm comm
-        );
+        ) {
+	MPI_WRAPPER_ENTER (h5_err_t,
+	                   "buf=%p, count=%d, type=?, to=%d, tag=%d, comm=?",
+	                   buf, count, to, tag);
+	int err = MPI_Send(
+	        buf,
+	        count,
+	        type,
+	        to,
+	        tag,
+	        comm
+	        );
+	if (err != MPI_SUCCESS)
+		MPI_WRAPPER_LEAVE (h5_error (H5_ERR_MPI, "Cannot send data"));
+	MPI_WRAPPER_RETURN (H5_SUCCESS);
+}
 
-h5_err_t
+static inline h5_err_t
 h5priv_mpi_bcast (
         void* buf,
         const int count,
         const MPI_Datatype type,
         const int root,
         const MPI_Comm comm
-        );
+        ) {
+	MPI_WRAPPER_ENTER (h5_err_t,
+	                   "buf=%p, count=%d, type=?, root=%d, comm=?",
+	                   buf, count, root);
+	int err = MPI_Bcast(
+	        buf,
+	        count,
+	        type,
+	        root,
+	        comm
+	        );
+	if (err != MPI_SUCCESS)
+		MPI_WRAPPER_LEAVE (h5_error (H5_ERR_MPI, "Cannot perform broadcast"));
+	MPI_WRAPPER_RETURN (H5_SUCCESS);
+}
 
-h5_err_t
+static inline h5_err_t
 h5priv_mpi_sum (
         void* sendbuf,
         void* recvbuf,
         const int count,
         const MPI_Datatype type,
         const MPI_Comm comm
-        );
+        ) {
+	MPI_WRAPPER_ENTER (h5_err_t,
+	                   "sendbuf=%p, recvbuf=%p, count=%d, type=?, comm=?",
+	                   sendbuf, recvbuf, count);
+	int err = MPI_Allreduce(
+	        sendbuf,
+	        recvbuf,
+	        count,
+	        type,
+	        MPI_SUM,
+	        comm
+	        );
+	if (err != MPI_SUCCESS)
+		MPI_WRAPPER_LEAVE (h5_error (H5_ERR_MPI, "Cannot perform MPI_SUM reduction"));
+	MPI_WRAPPER_RETURN (H5_SUCCESS);
+}
 
-h5_err_t
+static inline h5_err_t
+h5priv_mpi_allreduce_max (
+        void* sendbuf,
+        void* recvbuf,
+        const int count,
+        const MPI_Datatype type,
+        const MPI_Comm comm
+        ) {
+	MPI_WRAPPER_ENTER (h5_err_t,
+	                   "sendbuf=%p, recvbuf=%p, count=%d, type=?, comm=?",
+	                   sendbuf, recvbuf, count);
+	if (MPI_Allreduce(
+		    sendbuf,
+		    recvbuf,
+		    count,
+		    type,
+		    MPI_MAX,
+		    comm
+		    ) != MPI_SUCCESS)
+		MPI_WRAPPER_LEAVE (h5_error (H5_ERR_MPI,
+					     "Cannot perform MPI_MAX reduction"));
+	MPI_WRAPPER_RETURN (H5_SUCCESS);
+}
+
+static inline h5_err_t
 h5priv_mpi_prefix_sum (
         void* sendbuf,
         void* recvbuf,
         const int count,
         const MPI_Datatype type,
         const MPI_Comm comm
-        );
+        ) {
+	MPI_WRAPPER_ENTER (h5_err_t,
+	                   "sendbuf=%p, recvbuf=%p, count=%d, type=?, comm=?",
+	                   sendbuf, recvbuf, count);
+	int err = MPI_Scan(
+	        sendbuf,
+	        recvbuf,
+	        count,
+	        type,
+	        MPI_SUM,
+	        comm
+	        );
+	if (err != MPI_SUCCESS)
+		MPI_WRAPPER_LEAVE (h5_error (H5_ERR_MPI, "Cannot perform prefix sum"));
+	MPI_WRAPPER_RETURN (H5_SUCCESS);
+}
 
 #define h5priv_mpi_allgather mpi_allgather
 static inline h5_err_t
@@ -195,25 +303,48 @@ mpi_allgatherv (
 }
 
 ///
-h5_err_t
+static inline h5_err_t
 h5priv_mpi_comm_size (
         MPI_Comm comm,
         int* size
-        );
+        ) {
+	MPI_WRAPPER_ENTER (h5_err_t, "comm=?, size=%p", size);
+	int err = MPI_Comm_size (comm, size);
+	if (err != MPI_SUCCESS)
+		MPI_WRAPPER_LEAVE (h5_error (H5_ERR_MPI, "Cannot get communicator size"));
+	MPI_WRAPPER_RETURN (H5_SUCCESS);
+}
 
-h5_err_t
+static inline h5_err_t
 h5priv_mpi_comm_rank (
         MPI_Comm comm,
         int* rank
-        );
+        ) {
+	MPI_WRAPPER_ENTER (h5_err_t, "comm=?, rank=%p", rank);
+	int err = MPI_Comm_rank (comm, rank);
+	if (err != MPI_SUCCESS)
+		MPI_WRAPPER_LEAVE (h5_error (H5_ERR_MPI, "Cannot get this task's rank"));
+	MPI_WRAPPER_RETURN (H5_SUCCESS);
+}
 
-// MPI type wrappers
-h5_err_t
+static inline h5_err_t
 h5priv_mpi_type_contiguous (
         const size_t nelems,
         const MPI_Datatype oldtype,
-        MPI_Datatype *newtype
-        );
+        MPI_Datatype *const newtype
+        ) {
+	MPI_WRAPPER_ENTER (h5_err_t,
+			   "nelems=%lu, oldtype=?, newtype=?",
+			   (long unsigned)nelems);
+	int err;
+	err = MPI_Type_contiguous ( nelems, oldtype, newtype );
+	if (err != MPI_SUCCESS)
+		MPI_WRAPPER_LEAVE (h5_error (H5_ERR_MPI, "Cannot create new MPI type"));
+	err = MPI_Type_commit ( newtype );
+	if (err != MPI_SUCCESS)
+		MPI_WRAPPER_LEAVE (h5_error (H5_ERR_MPI, "Cannot commit new MPI type"));
+	MPI_WRAPPER_RETURN (H5_SUCCESS);
+}
 
 #define h5priv_mpi_get_address mpi_get_address
 static inline h5_err_t
@@ -269,14 +400,19 @@ h5priv_mpi_type_commit (
 	MPI_WRAPPER_RETURN (H5_SUCCESS);
 }
 
-h5_err_t
+
+static inline h5_err_t
 h5priv_mpi_type_free (
         MPI_Datatype *type
-        );
+        ) {
+	MPI_WRAPPER_ENTER (h5_err_t, "type=%p", type);
+	int err = MPI_Type_free( type );
+	if (err != MPI_SUCCESS)
+		MPI_WRAPPER_LEAVE (h5_error(H5_ERR_MPI, "Cannot free MPI type"));
+	MPI_WRAPPER_RETURN (H5_SUCCESS);
+}
 
-
-//
-h5_err_t
+static inline h5_err_t
 h5priv_mpi_cart_create (
         MPI_Comm old_comm,
         int ndims,
@@ -284,16 +420,31 @@ h5priv_mpi_cart_create (
         int *period,
         int reorder,
         MPI_Comm *new_comm
-        );
+        ) {
+	MPI_WRAPPER_ENTER (h5_err_t, "old_comm=?, ndims=%d, dims=%p, period=%p, "
+	                   "reorder=%d, new_comm=%p",
+	                   ndims, dims, period, reorder, new_comm);
+	int err = MPI_Cart_create(
+	        old_comm, ndims, dims, period, reorder, new_comm);
+	if (err != MPI_SUCCESS)
+		MPI_WRAPPER_LEAVE (h5_error(H5_ERR_MPI, "Cannot create cartesian grid"));
+	MPI_WRAPPER_RETURN (H5_SUCCESS);
+}
 
-h5_err_t
+static inline h5_err_t
 h5priv_mpi_cart_coords (
         MPI_Comm comm,
         int rank,
         int maxdim,
         int *coords
-        );
-
+        ) {
+	MPI_WRAPPER_ENTER (h5_err_t, "comm=?, rank=%d, maxdim=%d, coords=%p",
+	                   rank, maxdim, coords);
+	int err = MPI_Cart_coords( comm, rank, maxdim, coords );
+	if (err != MPI_SUCCESS)
+		MPI_WRAPPER_LEAVE (h5_error(H5_ERR_MPI, "Cannot create cartesian grid"));
+	MPI_WRAPPER_RETURN (H5_SUCCESS);
+}
 
 #endif
 #endif