diff --git a/src/libslic3r/TriangleMesh.hpp b/src/libslic3r/TriangleMesh.hpp
index 1fc512893..5dd2597a5 100644
--- a/src/libslic3r/TriangleMesh.hpp
+++ b/src/libslic3r/TriangleMesh.hpp
@@ -196,6 +196,7 @@ TriangleMesh make_sphere(double rho, double fa=(2*PI/360));
 }
 
 // Serialization through the Cereal library
+#include <cereal/access.hpp>
 namespace cereal {
 	template <class Archive> struct specialize<Archive, Slic3r::TriangleMesh, cereal::specialization::non_member_load_save> {};
 	template<class Archive> void load(Archive &archive, Slic3r::TriangleMesh &mesh) {
diff --git a/src/slic3r/Utils/UndoRedo.cpp b/src/slic3r/Utils/UndoRedo.cpp
index d5da0c618..ca40c6939 100644
--- a/src/slic3r/Utils/UndoRedo.cpp
+++ b/src/slic3r/Utils/UndoRedo.cpp
@@ -555,7 +555,8 @@ template<typename T> std::shared_ptr<const T>& 	ImmutableObjectHistory<T>::share
 		std::istringstream iss(m_serialized);
 		{
 			Slic3r::UndoRedo::InputArchive archive(stack, iss);
-			std::unique_ptr<std::remove_const<T>::type> mesh(new std::remove_const<T>::type());
+			typedef typename std::remove_const<T>::type Type;
+			std::unique_ptr<Type> mesh(new Type());
 			archive(*mesh.get());
 			m_shared_object = std::move(mesh);
 		}