diff --git a/testApp/misc/testBitSet.cpp b/testApp/misc/testBitSet.cpp
index 9b7c7c5..2d4b2f8 100644
--- a/testApp/misc/testBitSet.cpp
+++ b/testApp/misc/testBitSet.cpp
@@ -6,6 +6,10 @@
  */
 /* Author:  Matej Sekoranja Date: 2010.10.18 */
 
+#ifdef _WIN32
+#define NOMINMAX
+#endif
+
 #include <iostream>
 #include <iomanip>
 #include <stddef.h>
@@ -14,6 +18,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <sstream>
+#include <algorithm>
 
 #include <dbDefs.h>