Cleanup: Prepare for sorted headers on windows

To prepare for D6811 small changes were needed.
we can no longer undefine near/far since the windows
headers use those extensively.

some of the imbuf files need to include the windows
headers explicitly to make sure it builds.

3 files changed, 7 insertions, 6 deletions

diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c
index 232a9998ebf..6a5a97e24e4 100644
--- a/source/blender/imbuf/intern/anim_movie.c
+++ b/source/blender/imbuf/intern/anim_movie.c
@@ -22,12 +22,7 @@
  */
 
 #ifdef _WIN32
-#  define INC_OLE2
-#  include <windows.h>
-#  include <windowsx.h>
-#  include <mmsystem.h>
-#  include <memory.h>
-#  include <commdlg.h>
+#  include "BLI_winstuff.h"
 #  include <vfw.h>
 
 #  undef AVIIF_KEYFRAME /* redefined in AVI_avi.h */
diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c
index 46095b7eedc..6589b784ec0 100644
--- a/source/blender/imbuf/intern/indexer.c
+++ b/source/blender/imbuf/intern/indexer.c
@@ -30,6 +30,9 @@
 #include "BLI_string.h"
 #include "BLI_fileops.h"
 #include "BLI_ghash.h"
+#ifdef _WIN32
+#  include "BLI_winstuff.h"
+#endif
 
 #include "IMB_indexer.h"
 #include "IMB_anim.h"
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c
index 27b566e25a2..a8aabf384c8 100644
--- a/source/blender/imbuf/intern/util.c
+++ b/source/blender/imbuf/intern/util.c
@@ -31,6 +31,9 @@
 #include "BLI_utildefines.h"
 #include "BLI_path_util.h"
 #include "BLI_fileops.h"
+#ifdef _WIN32
+#  include "BLI_winstuff.h"
+#endif
 
 #include "imbuf.h"
 #include "IMB_imbuf_types.h"