diff --git a/src/GuillotineBinPack.cpp b/src/GuillotineBinPack.cpp
index 61ac7a4ce..2131ed5db 100644
--- a/src/GuillotineBinPack.cpp
+++ b/src/GuillotineBinPack.cpp
@@ -7,7 +7,7 @@
 */
 
 #include <cassert>
-
+#include "templates.h"
 #include "GuillotineBinPack.h"
 
 using namespace std;
@@ -395,7 +395,7 @@ int GuillotineBinPack::ScoreBestShortSideFit(int width, int height, const Rect &
 {
 	int leftoverHoriz = abs(freeRect.width - width);
 	int leftoverVert = abs(freeRect.height - height);
-	int leftover = min(leftoverHoriz, leftoverVert);
+	int leftover = MIN(leftoverHoriz, leftoverVert);
 	return leftover;
 }
 
@@ -403,7 +403,7 @@ int GuillotineBinPack::ScoreBestLongSideFit(int width, int height, const Rect &f
 {
 	int leftoverHoriz = abs(freeRect.width - width);
 	int leftoverVert = abs(freeRect.height - height);
-	int leftover = max(leftoverHoriz, leftoverVert);
+	int leftover = MAX(leftoverHoriz, leftoverVert);
 	return leftover;
 }
 
diff --git a/src/SkylineBinPack.cpp b/src/SkylineBinPack.cpp
index 578a248a5..33f862043 100644
--- a/src/SkylineBinPack.cpp
+++ b/src/SkylineBinPack.cpp
@@ -7,6 +7,7 @@
 */
 
 #include <cassert>
+#include "templates.h"
 
 #include "SkylineBinPack.h"
 
@@ -131,7 +132,7 @@ bool SkylineBinPack::RectangleFits(int skylineNodeIndex, int width, int height,
 	y = skyLine[skylineNodeIndex].y;
 	while(widthLeft > 0)
 	{
-		y = max(y, skyLine[i].y);
+		y = MAX(y, skyLine[i].y);
 		if (y + height > binHeight)
 			return false;
 		widthLeft -= skyLine[i].width;
@@ -152,7 +153,7 @@ int SkylineBinPack::ComputeWastedArea(int skylineNodeIndex, int width, int heigh
 			break;
 
 		int leftSide = skyLine[skylineNodeIndex].x;
-		int rightSide = min(rectRight, leftSide + skyLine[skylineNodeIndex].width);
+		int rightSide = MIN(rectRight, leftSide + skyLine[skylineNodeIndex].width);
 		assert(y >= skyLine[skylineNodeIndex].y);
 		wastedArea += (rightSide - leftSide) * (y - skyLine[skylineNodeIndex].y);
 	}
@@ -179,7 +180,7 @@ void SkylineBinPack::AddWasteMapArea(int skylineNodeIndex, int width, int height
 			break;
 
 		int leftSide = skyLine[skylineNodeIndex].x;
-		int rightSide = min(rectRight, leftSide + skyLine[skylineNodeIndex].width);
+		int rightSide = MIN(rectRight, leftSide + skyLine[skylineNodeIndex].width);
 		assert(y >= skyLine[skylineNodeIndex].y);
 
 		Rect waste;