--- a/src/mingw-w64-1-float-h.patch	Fri Dec 14 08:25:27 2018 -0500
+++ b/src/mingw-w64-1-float-h.patch	Fri Dec 14 17:11:46 2018 -0500
@@ -1,13 +1,17 @@
-This file is part of MXE.
-See index.html for further information.
+This file is part of MXE. See LICENSE.md for licensing information.
 
-workaround for -isystem flag messing up include order
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Sun, 29 Mar 2015 14:36:38 +0200
+Subject: [PATCH 1/2] workaround for -isystem flag messing up include order
+
 https://bugzilla.redhat.com/show_bug.cgi?id=843436
 
-diff -ur a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h
---- a/mingw-w64-headers/crt/float.h	2014-01-11 21:38:50.640418500 +1100
-+++ b/mingw-w64-headers/crt/float.h	2014-01-11 21:44:08.528393903 +1100
-@@ -105,6 +105,15 @@
+diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h
+index 1111111..2222222 100644
+--- a/mingw-w64-headers/crt/float.h
++++ b/mingw-w64-headers/crt/float.h
+@@ -114,6 +114,15 @@
  	#define DBL_MAX_10_EXP	__DBL_MAX_10_EXP__
  	#define LDBL_MAX_10_EXP	__LDBL_MAX_10_EXP__
  
@@ -23,3 +27,35 @@
  	/* Addition rounds to 0: zero, 1: nearest, 2: +inf, 3: -inf, -1: unknown.  */
  	/* ??? This is supposed to change with calls to fesetround in <fenv.h>.  */
  	#undef FLT_ROUNDS
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jonathan Yong <10walls@gmail.com>
+Date: Fri, 22 Dec 2017 13:01:03 +0000
+Subject: [PATCH 2/2] dwmapi.def: Regenegerate from Windows 10
+
+Remove ordinals from x86 library too.
+
+Signed-off-by: Jonathan Yong <10walls@gmail.com>
+
+Taken from: https://sourceforge.net/p/mingw-w64/mailman/message/36166386/
+
+diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h
+index 1111111..2222222 100644
+--- a/mingw-w64-headers/crt/float.h
++++ b/mingw-w64-headers/crt/float.h
+@@ -114,6 +114,15 @@
+ 	#define DBL_MAX_10_EXP	__DBL_MAX_10_EXP__
+ 	#define LDBL_MAX_10_EXP	__LDBL_MAX_10_EXP__
+ 
++    /* The difference between 1 and the least value greater than 1 that is
++    representable in the given floating point type, b**1-p.  */
++    #undef FLT_EPSILON
++    #undef DBL_EPSILON
++    #undef LDBL_EPSILON
++    #define FLT_EPSILON __FLT_EPSILON__
++    #define DBL_EPSILON __DBL_EPSILON__
++    #define LDBL_EPSILON    __LDBL_EPSILON__
++
+     /* The difference between 1 and the least value greater than 1 that is
+     representable in the given floating point type, b**1-p.  */
+     #undef FLT_EPSILON