diff --git a/src/render_gl.c b/src/render_gl.c
index 435d43c..3a3642c 100644
--- a/src/render_gl.c
+++ b/src/render_gl.c
@@ -11,18 +11,14 @@
 // Linux
 #elif defined(__unix__)
 	#include <GL/glew.h>
-#elif defined(__MSYS__)
-	#include <GL/glew.h>
-// WINDOWS
-#else
+	
+// Windows
+#elif defined(WIN32)
 	#include <windows.h>
 
 	#define GL3_PROTOTYPES 1
-	#include <glew.h>
-	#pragma comment(lib, "glew32.lib")
-
-	#include <gl/GL.h>
-	#pragma comment(lib, "opengl32.lib")
+	#include <GL/glew.h>
+	#include <GL/gl.h>
 #endif
 
 
diff --git a/src/utils.h b/src/utils.h
index 861ef54..dcebb31 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -4,6 +4,12 @@
 #include <string.h>
 #include "types.h"
 
+#ifdef WIN32
+	#undef min
+	#undef max
+	#undef near
+	#undef far
+#endif
 
 #if !defined(offsetof)
 	#define offsetof(TYPE, ELEMENT) ((size_t)&(((TYPE *)0)->ELEMENT))