diff --git a/include/mxx/datatypes.hpp b/include/mxx/datatypes.hpp
index aff3e89..93574a4 100644
--- a/include/mxx/datatypes.hpp
+++ b/include/mxx/datatypes.hpp
@@ -78,7 +78,6 @@ class is_builtin_type : public std::false_type {};
 
 class datatype;
 
-// TODO: there has to be a better way for this
 } // namespace mxx
 
 std::false_type make_datatype();
diff --git a/include/mxx/env.hpp b/include/mxx/env.hpp
index 7ce8051..48cfac0 100644
--- a/include/mxx/env.hpp
+++ b/include/mxx/env.hpp
@@ -30,7 +30,7 @@
 
 namespace mxx {
 
-void my_mpi_errorhandler(MPI_Comm* comm, int* error_code, ...) {
+inline void my_mpi_errorhandler(MPI_Comm* comm, int* error_code, ...) {
     char buf[MPI_MAX_ERROR_STRING];
     int strlen;
     int error_class;