diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h
index 1972a33ab13..766d6936590 100644
--- a/lib/stdio-impl.h
+++ b/lib/stdio-impl.h
@@ -26,9 +26,7 @@
 # include <sys/param.h>
 #endif
 
-#ifndef __MINGW32__
 #include <errno.h>                             /* For detecting Plan9.  */
-#endif
 
 #if defined __sferror || defined __DragonFly__ || defined __ANDROID__
   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
diff --git a/src/unexw32.c b/src/unexw32.c
index f4183dc976f..54224858a85 100644
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -465,6 +465,7 @@ get_section_info (file_data *p_infile)
       bss_start = min (bss_start, bss_start_static);
       bss_size = max (my_endbss, my_endbss_static) - bss_start;
       bss_section_static = 0;
+      extra_bss_size = max (extra_bss_size, extra_bss_size_static);
       extra_bss_size_static = 0;
     }
 }