diff --git a/uppsrc/Core/Core.h b/uppsrc/Core/Core.h
index c9d30fd02..34bd9ae0a 100644
--- a/uppsrc/Core/Core.h
+++ b/uppsrc/Core/Core.h
@@ -103,8 +103,11 @@
 		#endif
 	#endif
 
-	#if defined(COMPILER_MINGW) && !defined(WINVER)
-		#define WINVER 0xFFFF	
+	#if defined(COMPILER_MINGW)
+		#if !defined(WINVER)
+			#define WINVER 0xFFFF
+		#endif
+		#include <float.h>
 	#endif
 
 	#define DIR_SEP  '\\'
diff --git a/uppsrc/Core/Format.cpp b/uppsrc/Core/Format.cpp
index d44ca187d..723145e6f 100644
--- a/uppsrc/Core/Format.cpp
+++ b/uppsrc/Core/Format.cpp
@@ -1,6 +1,5 @@
 #include "Core.h"
 //#BLITZ_APPROVE
-#include <float.h>
 
 NAMESPACE_UPP
 
diff --git a/uppsrc/CtrlLib/CtrlUtil.cpp b/uppsrc/CtrlLib/CtrlUtil.cpp
index f2befdb98..29ff4e117 100644
--- a/uppsrc/CtrlLib/CtrlUtil.cpp
+++ b/uppsrc/CtrlLib/CtrlUtil.cpp
@@ -186,7 +186,7 @@ bool EditNumber(int& n, const char *title, const char *label, int min, int max,
 	return false;
 }
 
-bool EditNumber(int& n, const char *title, const char *label, double min, double max, bool notnull)
+bool EditNumber(double& n, const char *title, const char *label, double min, double max, bool notnull)
 {
 	WithEditDoubleLayout<TopWindow> dlg;
 	CtrlLayoutOKCancel(dlg, title);
diff --git a/uppsrc/Geom/polyalg.cpp b/uppsrc/Geom/polyalg.cpp
index ccf354078..b71ccf53a 100644
--- a/uppsrc/Geom/polyalg.cpp
+++ b/uppsrc/Geom/polyalg.cpp
@@ -1,8 +1,6 @@
 #include "Geom.h"
 #pragma hdrstop
 
-#include <float.h>
-
 NAMESPACE_UPP
 
 #define POLY_TIMING(n) // RTIMING(n)