13 files changed, 60 insertions, 67 deletions
diff --git a/source/blender/imbuf/intern/anim5.c b/source/blender/imbuf/intern/anim5.c
index 43a6b0d2c5d..b6f29b6a145 100644
--- a/source/blender/imbuf/intern/anim5.c
+++ b/source/blender/imbuf/intern/anim5.c
@@ -31,7 +31,6 @@
 
 #include "BLI_blenlib.h" /* BLI_remlink BLI_filesize BLI_addtail
                             BLI_countlist BLI_stringdec */
-
 #include "imbuf.h"
 #include "imbuf_patch.h"
 
@@ -47,11 +46,6 @@
 
 #include "IMB_anim5.h"
 
-#ifdef _WIN32
-#include <io.h>
-#include "BLI_winstuff.h"
-#endif
-
 typedef struct Anhd{
 	unsigned char type, mask;
 	unsigned short w, h;
@@ -210,12 +204,12 @@ static void anim5decode(struct ImBuf * ibuf, uchar * dlta) {
 	int *ofspoint;
 	uchar **planes;
 
-	/*	composition delta:
-		list with ofsets for delta' s by bitplane (ofspoint)
-		by column in delta (point)
-			number of operations (noops)
+	/*	samenstelling delta:
+		lijst met ofsets voor delta's per bitplane (ofspoint)
+		per kolom in delta (point)
+			aantal handelingen (noops)
 				code
-					associated data
+					bijbehorende data
 				...
 			...
 	*/
diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt
index 8b28086016b..53cd161634b 100644
--- a/source/blender/imbuf/intern/cineon/CMakeLists.txt
+++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt
@@ -27,14 +27,14 @@
 FILE(GLOB SRC *.c)
 
 SET(INC 
-		.
-		../../../blenkernel
-		../../
-		..
-		../../../blenlib
-		intern/include
-		../../../../../intern/guardedalloc
-		../../../makesdna
+    .
+    ../../../blenkernel
+    ../../
+    ..
+    ../../../blenlib
+    intern/include
+    ../../../../../intern/guardedalloc
+    ../../../makesdna
 )
 
 BLENDERLIB(bf_cineon "${SRC}" "${INC}")
diff --git a/source/blender/imbuf/intern/cineon/SConscript b/source/blender/imbuf/intern/cineon/SConscript
index d9c8ab14d35..ef9c44b85c8 100644
--- a/source/blender/imbuf/intern/cineon/SConscript
+++ b/source/blender/imbuf/intern/cineon/SConscript
@@ -14,4 +14,4 @@ incs = ['.',
 
 defs = []
 
-env.BlenderLib ('bf_cineon', source_files, incs, defs, libtype=['core','player'], priority = [220,175])
+env.BlenderLib ('bf_cineon', source_files, incs, defs, libtype=['core','player'], priority = [220, 75])
diff --git a/source/blender/imbuf/intern/dds/CMakeLists.txt b/source/blender/imbuf/intern/dds/CMakeLists.txt
index dc45afb9f5b..842f53bd88b 100644
--- a/source/blender/imbuf/intern/dds/CMakeLists.txt
+++ b/source/blender/imbuf/intern/dds/CMakeLists.txt
@@ -27,18 +27,18 @@
 FILE (GLOB SRC *.cpp)
 
 SET(INC 
-	.
-	../../../blenkernel
-	../../../makesdna
-	../../
-	..
-	../../../blenlib
-	intern/include
-	../../../../../intern/guardedalloc
+  .
+  ../../../blenkernel
+  ../../../makesdna
+  ../../
+  ..
+  ../../../blenlib
+  intern/include
+  ../../../../../intern/guardedalloc
 )
 
 if(WITH_DDS)
-	ADD_DEFINITIONS(-DWITH_DDS)
+  ADD_DEFINITIONS(-DWITH_DDS)
 ENDIF(WITH_DDS)
 
 BLENDERLIB(bf_dds "${SRC}" "${INC}")                 
diff --git a/source/blender/imbuf/intern/dds/SConscript b/source/blender/imbuf/intern/dds/SConscript
index 0b7fd50e317..cec6023648b 100644
--- a/source/blender/imbuf/intern/dds/SConscript
+++ b/source/blender/imbuf/intern/dds/SConscript
@@ -16,4 +16,4 @@ incs = ['.',
 
 defs = ['WITH_DDS']
 
-env.BlenderLib ('bf_dds', source_files, incs, defs, libtype=['core','player'], priority = [230,190])
+env.BlenderLib ('bf_dds', source_files, incs, defs, libtype=['core','player'], priority = [230, 105])
diff --git a/source/blender/imbuf/intern/hamx.c b/source/blender/imbuf/intern/hamx.c
index 258c196fcdf..2f32d155407 100644
--- a/source/blender/imbuf/intern/hamx.c
+++ b/source/blender/imbuf/intern/hamx.c
@@ -31,6 +31,11 @@
 
 #include "BLI_blenlib.h"
 
+#ifdef WIN32
+#include <io.h>
+#endif
+
+
 #include "imbuf.h"
 #include "imbuf_patch.h"
 #include "IMB_imbuf_types.h"
@@ -41,11 +46,6 @@
 #include "IMB_ham.h"
 #include "IMB_hamx.h"
 
-#ifdef WIN32
-#include <io.h>
-#include "BLI_winstuff.h"
-#endif
-
 /* actually hard coded endianness */
 #define GET_BIG_LONG(x) (((uchar *) (x))[0] << 24 | ((uchar *) (x))[1] << 16 | ((uchar *) (x))[2] << 8 | ((uchar *) (x))[3])
 #define GET_LITTLE_LONG(x) (((uchar *) (x))[3] << 24 | ((uchar *) (x))[2] << 16 | ((uchar *) (x))[1] << 8 | ((uchar *) (x))[0])
diff --git a/source/blender/imbuf/intern/iff.c b/source/blender/imbuf/intern/iff.c
index 5fd823e78c1..c3695173068 100644
--- a/source/blender/imbuf/intern/iff.c
+++ b/source/blender/imbuf/intern/iff.c
@@ -29,15 +29,14 @@
  * $Id$
  */
 
+#ifdef WIN32
+#include <io.h>
+#endif
 #include "BLI_blenlib.h"
 #include "imbuf.h"
 #include "imbuf_patch.h"
 #include "IMB_imbuf_types.h"
 #include "IMB_iff.h"
-#ifdef WIN32
-#include <io.h>
-#include "BLI_winstuff.h"
-#endif
 
 unsigned short imb_start_iff(struct ImBuf *ibuf, int file)
 {
diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt
index 33681da55af..21792086774 100644
--- a/source/blender/imbuf/intern/openexr/CMakeLists.txt
+++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt
@@ -27,19 +27,19 @@
 SET(SRC openexr_api.cpp)
 
 SET(INC 
-	.
-	../../../blenkernel
-	../../
-	..
-	../../../blenlib
-	intern/include
-	../../../../../intern/guardedalloc
-	../../../makesdna
-	${OPENEXR_INC}
+  .
+  ../../../blenkernel
+  ../../
+  ..
+  ../../../blenlib
+  intern/include
+  ../../../../../intern/guardedalloc
+  ../../../makesdna
+  ${OPENEXR_INC}
 )
 
 IF(WITH_OPENEXR)
-	ADD_DEFINITIONS(-DWITH_OPENEXR)
+  ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 BLENDERLIB(bf_openexr "${SRC}" "${INC}")                 
diff --git a/source/blender/imbuf/intern/openexr/Makefile b/source/blender/imbuf/intern/openexr/Makefile
index 083089b11d5..f77e3723e8a 100644
--- a/source/blender/imbuf/intern/openexr/Makefile
+++ b/source/blender/imbuf/intern/openexr/Makefile
@@ -35,9 +35,6 @@ include nan_compile.mk
 
 CFLAGS += $(LEVEL_1_C_WARNINGS)
 
-# If compiling the API, WITH_OPENEXR must be set.
-CPPFLAGS += -DWITH_OPENEXR
-
 CPPFLAGS += -I../../../makesdna
 CPPFLAGS += -I../../../blenkernel
 CPPFLAGS += -I../../../blenlib
diff --git a/source/blender/imbuf/intern/openexr/SConscript b/source/blender/imbuf/intern/openexr/SConscript
index f504c503109..aa166a1983c 100644
--- a/source/blender/imbuf/intern/openexr/SConscript
+++ b/source/blender/imbuf/intern/openexr/SConscript
@@ -13,6 +13,6 @@ incs = ['.',
 	'../../../makesdna']
 incs += Split(env['BF_OPENEXR_INC'])
 
-defs = ['WITH_OPENEXR']
+defs = []
 
-env.BlenderLib ('bf_openexr', source_files, incs, defs, libtype=['core','player'], priority = [225,180])
+env.BlenderLib ('bf_openexr', source_files, incs, defs, libtype=['core','player'], priority = [225, 85])
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index a780727b1a2..32d97d79bd7 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -51,6 +51,7 @@ _CRTIMP void __cdecl _invalid_parameter_noinfo(void)
 #include "IMB_imbuf.h"
 #include "IMB_allocimbuf.h"
 
+#define WITH_OPENEXR
 #include "openexr_multi.h"
 }
 
diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c
index 6053c5556f1..86ca43824f3 100644
--- a/source/blender/imbuf/intern/thumbs.c
+++ b/source/blender/imbuf/intern/thumbs.c
@@ -39,15 +39,8 @@
 #include "IMB_thumbs.h"
 #include "IMB_imginfo.h"
 
-#include "md5.h"
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
+#include "md5.h"
 
 #ifdef WIN32
 #include <windows.h> /* need to include windows.h so _WIN32_IE is defined  */
@@ -55,13 +48,22 @@
 #define _WIN32_IE 0x0400 /* minimal requirements for SHGetSpecialFolderPath on MINGW MSVC has this defined already */
 #endif
 #include <shlobj.h> /* for SHGetSpecialFolderPath, has to be done before BLI_winstuff because 'near' is disabled through BLI_windstuff */
+#include "BLI_winstuff.h"
 #include <process.h> /* getpid */
 #include <direct.h> /* chdir */
-#include "BLI_winstuff.h"
 #else
 #include <unistd.h>
 #endif
 
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdio.h>
+
 #define URI_MAX FILE_MAX*3 + 8
 
 static int get_thumb_dir( char* dir , ThumbSize size)
diff --git a/source/blender/imbuf/intern/writeimage.c b/source/blender/imbuf/intern/writeimage.c
index b3af727190a..7e1120bf3e4 100644
--- a/source/blender/imbuf/intern/writeimage.c
+++ b/source/blender/imbuf/intern/writeimage.c
@@ -29,6 +29,10 @@
  * $Id$
  */
 
+#ifdef WIN32
+#include <io.h>
+#endif
+
 #include <stdio.h>
 
 #include "BKE_global.h"
@@ -67,10 +71,6 @@
 #include "IMB_bitplanes.h"
 #include "IMB_divers.h"
 
-#ifdef WIN32
-#include <io.h>
-#include "BLI_winstuff.h"
-#endif
 /* added facility to copy with saving non-float rects */
 
 short IMB_saveiff(struct ImBuf *ibuf, char *name, int flags)