Simplified the "cereal" includes to not clash with Perl includes

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); }

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>)

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/access.hpp>
-#include <cereal/types/map.hpp> 
+#include <cereal/types/base_class.hpp>
-#include <cereal/types/string.hpp> 
-#include <cereal/types/vector.hpp> 
-#include <cereal/archives/binary.hpp>
 
 namespace Slic3r {
 

src/libslic3r/Geometry.hpp

@@ -8,8 +8,7 @@
 #include "Polyline.hpp"
 
 // Serialization through the Cereal library
-#include <cereal/types/polymorphic.hpp>
+#include <cereal/access.hpp>
-#include <cereal/archives/binary.hpp>
 
 #include "boost/polygon/voronoi.hpp"
 using boost::polygon::voronoi_builder;

src/libslic3r/ObjectID.hpp

@@ -1,11 +1,7 @@
 #ifndef slic3r_ObjectID_hpp_
 #define slic3r_ObjectID_hpp_
 
-#include <cereal/types/polymorphic.hpp>
+#include <cereal/access.hpp>
-#include <cereal/types/map.hpp> 
-#include <cereal/types/string.hpp> 
-#include <cereal/types/vector.hpp> 
-#include <cereal/archives/binary.hpp>
 
 namespace Slic3r {
 

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()); }

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) 

src/libslic3r/pchheader.hpp

@@ -102,12 +102,8 @@
 #include <Eigen/Dense>
 #include <Eigen/Geometry>
 
-#include <cereal/types/polymorphic.hpp>
+#include <cereal/access.hpp>
-#include <cereal/types/map.hpp>
+#include <cereal/types/base_class.hpp>
-#include <cereal/types/memory.hpp>
-#include <cereal/types/string.hpp>
-#include <cereal/types/vector.hpp>
-#include <cereal/archives/binary.hpp>
 
 #include "BoundingBox.hpp"
 #include "ClipperUtils.hpp"

xs/src/xsinit.h

@@ -87,7 +87,6 @@ extern "C" {
 #endif /* _MSC_VER */
 #undef Zero
 #undef Packet
-#undef ST
 #undef _
 }
 #endif