Remove windows.h include from opencv2/core/internal.hpp to avoid conflicts with TBB library.

modules/highgui/src/precomp.hpp

@@ -49,11 +49,6 @@
 #include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/core/internal.hpp"
 
-#if defined WIN32 || defined _WIN32
-//required windows.h has to be included by the opencv2/core/internal.hpp
-void  FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin );
-#endif
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -61,6 +56,14 @@ void  FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origi
 #include <ctype.h>
 #include <assert.h>
 
+#if defined WIN32 || defined WINCE
+    #include <windows.h>
+    #undef small
+    #undef min
+    #undef max
+    #undef abs
+#endif
+
 #ifdef HAVE_TEGRA_OPTIMIZATION
 #include "opencv2/highgui/highgui_tegra.hpp"
 #endif