diff --git a/luabinding/applicationbinder.cpp b/luabinding/applicationbinder.cpp
index 7333d8029..fe3eb2c33 100644
--- a/luabinding/applicationbinder.cpp
+++ b/luabinding/applicationbinder.cpp
@@ -9,6 +9,7 @@
 #include <gapplication.h>
 #include <luautil.h>
 #include <gideros.h>
+#include <algorithm>
 
 #define PORTRAIT "portrait"
 #define PORTRAIT_UPSIDE_DOWN "portraitUpsideDown"
@@ -24,6 +25,12 @@
 #define FIT_WIDTH "fitWidth"
 #define FIT_HEIGHT "fitHeight"
 
+#ifdef WINSTORE
+#undef max
+#undef min
+#endif
+
+
 ApplicationBinder::ApplicationBinder(lua_State* L)
 {
 	Binder binder(L);
diff --git a/luabinding/audiobinder.cpp b/luabinding/audiobinder.cpp
index 719558e12..2e6252ba1 100644
--- a/luabinding/audiobinder.cpp
+++ b/luabinding/audiobinder.cpp
@@ -4,10 +4,10 @@
 #include <gaudio.h>
 #include <gpath.h>
 #include <sys/stat.h>
-#include <stackchecker.h>
+#include "stackchecker.h"
 #include <gstdio.h>
 #include <completeevent.h>
-#include <luaapplication.h>
+#include "luaapplication.h"
 
 static char keyStrong = ' ';
 static char keySound = ' ';