diff --git a/xs/src/admesh/portable_endian.h b/xs/src/admesh/portable_endian.h
index 6853a0c93..5c837a6bf 100644
--- a/xs/src/admesh/portable_endian.h
+++ b/xs/src/admesh/portable_endian.h
@@ -12,7 +12,7 @@
 #ifndef PORTABLE_ENDIAN_H__
 #define PORTABLE_ENDIAN_H__
 
-#if (defined(_WIN16) || defined(_WIN32) || defined(_WIN64)) && !defined(__WINDOWS__)
+#if (defined(_MSC_VER) || defined(_WIN16) || defined(_WIN32) || defined(_WIN64)) && !defined(__WINDOWS__)
 
 #	define __WINDOWS__
 
@@ -66,7 +66,7 @@
 #elif defined(__WINDOWS__)
 
 /* #	include <winsock2.h> */
-#	include <sys/param.h>
+/* #	include <sys/param.h> */
 
 #	if BYTE_ORDER == LITTLE_ENDIAN
 
diff --git a/xs/src/libslic3r/Fill/FillGyroid.cpp b/xs/src/libslic3r/Fill/FillGyroid.cpp
index 01c652c5c..eddc00bb5 100644
--- a/xs/src/libslic3r/Fill/FillGyroid.cpp
+++ b/xs/src/libslic3r/Fill/FillGyroid.cpp
@@ -1,6 +1,7 @@
 #include "../ClipperUtils.hpp"
 #include "../PolylineCollection.hpp"
 #include "../Surface.hpp"
+#define _USE_MATH_DEFINES
 #include <cmath>
 #include <algorithm>
 #include <iostream>
diff --git a/xs/src/libslic3r/SlicingAdaptive.cpp b/xs/src/libslic3r/SlicingAdaptive.cpp
index 7cd25a0f4..6cb1082bf 100644
--- a/xs/src/libslic3r/SlicingAdaptive.cpp
+++ b/xs/src/libslic3r/SlicingAdaptive.cpp
@@ -1,4 +1,5 @@
 #include "libslic3r.h"
+#include <limits>
 #include "TriangleMesh.hpp"
 #include "SlicingAdaptive.hpp"
 
diff --git a/xs/src/libslic3r/TriangleMesh.cpp b/xs/src/libslic3r/TriangleMesh.cpp
index d0b316412..ed2c9c995 100644
--- a/xs/src/libslic3r/TriangleMesh.cpp
+++ b/xs/src/libslic3r/TriangleMesh.cpp
@@ -490,9 +490,9 @@ TriangleMesh::stats() const {
 }
 
 BoundingBoxf3 TriangleMesh::bb3() const {
-    Pointf3 min(this->stl.stats.min.x, this->stl.stats.min.y, this->stl.stats.min.z);
-    Pointf3 max(this->stl.stats.max.x, this->stl.stats.max.y, this->stl.stats.max.z);
-    return BoundingBoxf3(min, max);
+    Pointf3 pmin(this->stl.stats.min.x, this->stl.stats.min.y, this->stl.stats.min.z);
+    Pointf3 pmax(this->stl.stats.max.x, this->stl.stats.max.y, this->stl.stats.max.z);
+    return BoundingBoxf3(pmin, pmax);
 }
 
 
diff --git a/xs/src/libslic3r/libslic3r.h b/xs/src/libslic3r/libslic3r.h
index 18e1d0acd..878af5fec 100644
--- a/xs/src/libslic3r/libslic3r.h
+++ b/xs/src/libslic3r/libslic3r.h
@@ -4,6 +4,7 @@
 // this needs to be included early for MSVC (listing it in Build.PL is not enough)
 #include <ostream>
 #include <iostream>
+#define _USE_MATH_DEFINES
 #include <math.h>
 #include <queue>
 #include <sstream>
@@ -11,6 +12,10 @@
 #include <boost/thread.hpp>
 #include <cstdint>
 
+#ifdef _MSC_VER
+#include <limits>
+#define NOMINMAX
+#endif
 /* Implementation of CONFESS("foo"): */
 #ifdef _MSC_VER
 	#define CONFESS(...) confess_at(__FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)