diff --git a/src/msw/graphicsd2d.cpp b/src/msw/graphicsd2d.cpp
index ad502cc43e..b953deee2f 100644
--- a/src/msw/graphicsd2d.cpp
+++ b/src/msw/graphicsd2d.cpp
@@ -40,6 +40,12 @@
 #include <dwrite.h>
 #include <wincodec.h>
 
+#ifdef __MINGW64_TOOLCHAIN__
+#ifndef DRWITE_E_NOFONT
+#define DWRITE_E_NOFONT _HRESULT_TYPEDEF_(0x88985002)
+#endif
+#endif
+
 #if wxD2D_DEVICE_CONTEXT_SUPPORTED
 #include <D3D11.h>
 #include <D2d1_1.h>
diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 0aa5a0f2a0..cf25b6dd96 100644
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -48,6 +48,8 @@
 
 #if wxUSE_GRAPHICS_DIRECT2D
 #include "ScintillaWX.h"
+#include <float.h>
+#include "wx/dcscreen.h"
 #endif
 
 Point Point::FromLong(long lpoint) {
@@ -732,10 +734,12 @@ SurfaceFontDataD2D::SurfaceFontDataD2D(const FontParameters& fp)
         {
             fontWeight = DWRITE_FONT_WEIGHT_LIGHT;
         }
+#ifndef __MINGW64_TOOLCHAIN__
         else if ( weight <= 350 )
         {
             fontWeight = DWRITE_FONT_WEIGHT_SEMI_LIGHT;
         }
+#endif
         else if ( weight <= 400 )
         {
             fontWeight = DWRITE_FONT_WEIGHT_NORMAL;