diff --git a/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/mpi/window.hpp b/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/mpi/window.hpp
index e990af1e2..69056f5b0 100644
--- a/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/mpi/window.hpp
+++ b/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/mpi/window.hpp
@@ -52,7 +52,9 @@ namespace mpi
         private:
             std::vector<T>      buffer_;
             int                 rank_;
+#ifndef VTKM_DIY_NO_MPI
             MPI_Win             window_;
+#endif
     };
 } // mpi
 } // diy
diff --git a/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/resolve.hpp b/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/resolve.hpp
index db01a807c..dae88c6f8 100644
--- a/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/resolve.hpp
+++ b/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/resolve.hpp
@@ -7,11 +7,11 @@
 namespace diy
 {
     // record master gids in assigner and then lookup the procs for all gids in the links
-    void    fix_links(diy::Master& master, diy::DynamicAssigner& assigner);
+    inline void    fix_links(diy::Master& master, diy::DynamicAssigner& assigner);
 
     // auxiliary functions; could stick them into detail namespace, but they might be useful on their own
-    void    record_local_gids(const diy::Master& master, diy::DynamicAssigner& assigner);
-    void    update_links(diy::Master& master, const diy::DynamicAssigner& assigner);
+    inline void    record_local_gids(const diy::Master& master, diy::DynamicAssigner& assigner);
+    inline void    update_links(diy::Master& master, const diy::DynamicAssigner& assigner);
 }
 
 void