Fixes after the merge of changes by @alexrj.

xs/src/libslic3r/SupportMaterial.cpp

@@ -8,7 +8,6 @@
 #include "EdgeGrid.hpp"
 
 #include <cmath>
-#include <cassert>
 #include <memory>
 #include <boost/log/trivial.hpp>
 #include <unordered_set>
@@ -21,6 +20,8 @@
     #include "SVG.hpp"
 #endif
 
+#include <cassert>
+
 namespace Slic3r {
 
 // Increment used to reach MARGIN in steps to avoid trespassing thin objects