diff --git a/.hgignore b/.hgignore
index c7845b77..eb8a8e99 100644
--- a/.hgignore
+++ b/.hgignore
@@ -6,6 +6,7 @@ syntax: glob
 *.mode1v3
 *.pbxuser
 *.tm_build_errors
+*.pyd
 conf.yaml
 build
 cocoa/*/Info.plist
@@ -14,6 +15,11 @@ cocoa/*/dg_cocoa.plugin
 qt/base/*_rc.py
 qt/base/*_ui.py
 qt/*/*_ui.py
+qt/*/build
+qt/*/dist
+qt/*/install
+qt/*/logdict*.log
+qt/*/warn*.txt
 help_se/dupeguru_help
 help_me/dupeguru_me_help
 help_pe/dupeguru_pe_help
\ No newline at end of file
diff --git a/core_pe/modules/block.c b/core_pe/modules/block.c
index 858e82cd..9c5941f6 100644
--- a/core_pe/modules/block.c
+++ b/core_pe/modules/block.c
@@ -15,6 +15,8 @@ static PyObject *NoBlocksError;
 /* avgdiff/maxdiff has been called with 2 block lists of different size. */
 static PyObject *DifferentBlockCountError;
 
+/* It seems like MS VC defines min/max already */
+#ifndef _MSC_VER
 static int
 max(int a, int b)
 {
@@ -26,6 +28,7 @@ min(int a, int b)
 {
     return b < a ? b : a;
 }
+#endif
 
 /* Create a tuple out of an array of integers. */
 static PyObject*
diff --git a/qt/pe/modules/block/block.c b/qt/pe/modules/block/block.c
index 7154af88..b79f04ee 100644
--- a/qt/pe/modules/block/block.c
+++ b/qt/pe/modules/block/block.c
@@ -10,6 +10,8 @@
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
+/* It seems like MS VC defines min/max already */
+#ifndef _MSC_VER
 static int
 max(int a, int b)
 {
@@ -21,6 +23,7 @@ min(int a, int b)
 {
     return b < a ? b : a;
 }
+#endif
 
 static PyObject*
 getblock(PyObject *image)