diff --git a/lib/framework/crc.cpp b/lib/framework/crc.cpp
index b4d184baad7..de1faabdd93 100644
--- a/lib/framework/crc.cpp
+++ b/lib/framework/crc.cpp
@@ -182,7 +182,7 @@ void Sha256::fromString(std::string const &s)
 	}
 }
 
-void to_json(nlohmann::json& j, const Sha256& k)
+inline void to_json(nlohmann::json& j, const Sha256& k)
 {
 	if (k.isZero())
 	{
diff --git a/lib/framework/geometry.h b/lib/framework/geometry.h
index d3c88b906b1..11a235336b2 100644
--- a/lib/framework/geometry.h
+++ b/lib/framework/geometry.h
@@ -22,6 +22,7 @@
 
 #include "frame.h"
 #include "vector.h"
+#include <algorithm>
 #include <limits>
 
 /**
diff --git a/lib/framework/wzglobal.h b/lib/framework/wzglobal.h
index 3e26f256c28..417f0607db4 100644
--- a/lib/framework/wzglobal.h
+++ b/lib/framework/wzglobal.h
@@ -553,6 +553,7 @@
 #  undef NOMINMAX
 #  define NOMINMAX 1		// disable the min / max macros
 #  include <windows.h>
+#  include <algorithm>
 
 #  if defined(WZ_CC_MSVC)