diff --git a/source/blender/blenlib/BLI_arithb.h b/source/blender/blenlib/BLI_arithb.h
index 1e86f8fe5b3..54999b1f72b 100644
--- a/source/blender/blenlib/BLI_arithb.h
+++ b/source/blender/blenlib/BLI_arithb.h
@@ -55,7 +55,9 @@ extern "C" {
 #endif
 
 #ifdef WIN32
-    #define isnan(n) _isnan(n)
+	#ifndef FREE_WINDOWS
+		#define isnan(n) _isnan(n)
+	#endif
 #endif
 
 #define MAT4_UNITY {{ 1.0, 0.0, 0.0, 0.0},\
diff --git a/source/blender/src/drawimasel.c b/source/blender/src/drawimasel.c
index 257c5831813..88b6beb54c5 100644
--- a/source/blender/src/drawimasel.c
+++ b/source/blender/src/drawimasel.c
@@ -51,10 +51,11 @@
 #include "DNA_material_types.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_storage_types.h"
 #ifdef WIN32
 #include "BLI_winstuff.h"
 #endif
-#include "BLI_storage_types.h"
+
 
 #include "BKE_global.h"
 #include "BKE_library.h"
diff --git a/source/blender/src/filesel.c b/source/blender/src/filesel.c
index 599c6d5aae2..4789cc1d7bb 100644
--- a/source/blender/src/filesel.c
+++ b/source/blender/src/filesel.c
@@ -34,6 +34,12 @@
 #include <string.h>
 #include <math.h>
 
+#include <sys/stat.h>
+#include <sys/types.h>
+#include "MEM_guardedalloc.h"
+
+#include "BMF_Api.h"
+
 #ifdef WIN32
 #include <io.h>
 #include <direct.h>
@@ -43,12 +49,6 @@
 #include <sys/times.h>
 #endif   
 
-#include <sys/stat.h>
-#include <sys/types.h>
-#include "MEM_guardedalloc.h"
-
-#include "BMF_Api.h"
-
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
 #include "BLI_linklist.h"