diff --git a/src/libslic3r/BoundingBox.hpp b/src/libslic3r/BoundingBox.hpp
index b12ed5551..b1ebdcfbc 100644
--- a/src/libslic3r/BoundingBox.hpp
+++ b/src/libslic3r/BoundingBox.hpp
@@ -161,9 +161,6 @@ inline bool empty(const BoundingBox3Base<VT> &bb)
 
 } // namespace Slic3r
 
-#include <cereal/types/polymorphic.hpp>
-#include <cereal/archives/binary.hpp>
-
 // Serialization through the Cereal library
 namespace cereal {
 	template<class Archive> void serialize(Archive& archive, Slic3r::BoundingBox   &bb) { archive(bb.min, bb.max, bb.defined); }
diff --git a/src/libslic3r/Config.cpp b/src/libslic3r/Config.cpp
index aea3f215c..9d0649a1f 100644
--- a/src/libslic3r/Config.cpp
+++ b/src/libslic3r/Config.cpp
@@ -822,6 +822,7 @@ t_config_option_keys StaticConfig::keys() const
 
 }
 
+#include <cereal/types/polymorphic.hpp>
 CEREAL_REGISTER_TYPE(Slic3r::ConfigOption)
 CEREAL_REGISTER_TYPE(Slic3r::ConfigOptionSingle<double>)
 CEREAL_REGISTER_TYPE(Slic3r::ConfigOptionSingle<int>)
diff --git a/src/libslic3r/Config.hpp b/src/libslic3r/Config.hpp
index 1511c4b28..844287efb 100644
--- a/src/libslic3r/Config.hpp
+++ b/src/libslic3r/Config.hpp
@@ -18,11 +18,8 @@
 #include <boost/format.hpp>
 #include <boost/property_tree/ptree.hpp>
 
-#include <cereal/types/polymorphic.hpp>
-#include <cereal/types/map.hpp> 
-#include <cereal/types/string.hpp> 
-#include <cereal/types/vector.hpp> 
-#include <cereal/archives/binary.hpp>
+#include <cereal/access.hpp>
+#include <cereal/types/base_class.hpp>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Geometry.hpp b/src/libslic3r/Geometry.hpp
index 585dc4b0b..dca1872d8 100644
--- a/src/libslic3r/Geometry.hpp
+++ b/src/libslic3r/Geometry.hpp
@@ -8,8 +8,7 @@
 #include "Polyline.hpp"
 
 // Serialization through the Cereal library
-#include <cereal/types/polymorphic.hpp>
-#include <cereal/archives/binary.hpp>
+#include <cereal/access.hpp>
 
 #include "boost/polygon/voronoi.hpp"
 using boost::polygon::voronoi_builder;
diff --git a/src/libslic3r/ObjectID.hpp b/src/libslic3r/ObjectID.hpp
index c708e5687..fe0bf465f 100644
--- a/src/libslic3r/ObjectID.hpp
+++ b/src/libslic3r/ObjectID.hpp
@@ -1,11 +1,7 @@
 #ifndef slic3r_ObjectID_hpp_
 #define slic3r_ObjectID_hpp_
 
-#include <cereal/types/polymorphic.hpp>
-#include <cereal/types/map.hpp> 
-#include <cereal/types/string.hpp> 
-#include <cereal/types/vector.hpp> 
-#include <cereal/archives/binary.hpp>
+#include <cereal/access.hpp>
 
 namespace Slic3r {
 
diff --git a/src/libslic3r/Point.hpp b/src/libslic3r/Point.hpp
index 8979523b7..994f45e59 100644
--- a/src/libslic3r/Point.hpp
+++ b/src/libslic3r/Point.hpp
@@ -291,9 +291,6 @@ namespace boost { namespace polygon {
 } }
 // end Boost
 
-#include <cereal/types/polymorphic.hpp>
-#include <cereal/archives/binary.hpp>
-
 // Serialization through the Cereal library
 namespace cereal {
 //	template<class Archive> void serialize(Archive& archive, Slic3r::Vec2crd &v) { archive(v.x(), v.y()); }
diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index 97787fff6..638ce38f1 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -3198,5 +3198,6 @@ void DynamicPrintAndCLIConfig::handle_legacy(t_config_option_key &opt_key, std::
 
 }
 
+#include <cereal/types/polymorphic.hpp>
 CEREAL_REGISTER_TYPE(Slic3r::DynamicPrintConfig)
 CEREAL_REGISTER_POLYMORPHIC_RELATION(Slic3r::DynamicConfig, Slic3r::DynamicPrintConfig) 
diff --git a/src/libslic3r/pchheader.hpp b/src/libslic3r/pchheader.hpp
index 54b563def..c0ffe2108 100644
--- a/src/libslic3r/pchheader.hpp
+++ b/src/libslic3r/pchheader.hpp
@@ -102,12 +102,8 @@
 #include <Eigen/Dense>
 #include <Eigen/Geometry>
 
-#include <cereal/types/polymorphic.hpp>
-#include <cereal/types/map.hpp>
-#include <cereal/types/memory.hpp>
-#include <cereal/types/string.hpp>
-#include <cereal/types/vector.hpp>
-#include <cereal/archives/binary.hpp>
+#include <cereal/access.hpp>
+#include <cereal/types/base_class.hpp>
 
 #include "BoundingBox.hpp"
 #include "ClipperUtils.hpp"
diff --git a/xs/src/xsinit.h b/xs/src/xsinit.h
index 8745abdc7..f14e1262d 100644
--- a/xs/src/xsinit.h
+++ b/xs/src/xsinit.h
@@ -87,7 +87,6 @@ extern "C" {
 #endif /* _MSC_VER */
 #undef Zero
 #undef Packet
-#undef ST
 #undef _
 }
 #endif