diff --git a/configure.ac b/configure.ac
index b7eaa78d..db106e86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,8 +54,9 @@ AC_CHECK_SIZEOF(unsigned long)
 AC_CHECK_SIZEOF(unsigned long long)
 AC_CHECK_SIZEOF(int *)
 
-dnl Require compiler with C++11 support, do not use GNU extensions.
-AX_CXX_COMPILE_STDCXX_11(noext, mandatory)
+dnl Require compiler with C++11 support.
+dnl Allow GNU extensions to work around MinGW bugs around POSIX compatibility.
+AX_CXX_COMPILE_STDCXX_11(ext, mandatory)
 
 dnl some semi complex check for sys/socket so it works on darwin as well
 AC_CHECK_HEADERS([stdlib.h sys/types.h])
diff --git a/src/dos/drive_local.cpp b/src/dos/drive_local.cpp
index 21a622a9..55702d52 100644
--- a/src/dos/drive_local.cpp
+++ b/src/dos/drive_local.cpp
@@ -19,16 +19,16 @@
 // Uncomment to enable file-open diagnostic messages
 // #define DEBUG 1
 
-#include <stdio.h>
+#include "drives.h"
+
+#include <cstdio>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <errno.h>
 
-#include "dosbox.h"
 #include "dos_inc.h"
 #include "dos_mscdex.h"
-#include "drives.h"
 #include "support.h"
 #include "cross.h"
 #include "inout.h"