Index: libao2/ao_pcm.c
===================================================================
--- libao2/ao_pcm.c	(revision 33331)
+++ libao2/ao_pcm.c	(working copy)
@@ -38,6 +38,7 @@
 #ifdef __MINGW32__
 // for GetFileType to detect pipes
 #include <windows.h>
+#include <io.h>
 #endif
 
 static const ao_info_t info =
Index: configure
===================================================================
--- configure	(revision 33331)
+++ configure	(working copy)
@@ -3885,6 +3885,9 @@
 echocheck "swab()"
 _swab=no
 define_statement_check "_XOPEN_SOURCE 600" "unistd.h" 'int a, b; swab(&a, &b, 0)' && _swab=yes
+if test "$_swab" != yes ; then
+    define_statement_check "A A" "stdlib.h" 'int a, b; swab(&a, &b, 0)' && _swab=yes
+fi
 if test "$_swab" = yes ; then
   def_swab='#define HAVE_SWAB 1'
   need_swab=no
Index: command.c
===================================================================
--- command.c	(revision 33331)
+++ command.c	(working copy)
@@ -69,6 +69,7 @@
 #include "mp_fifo.h"
 #include "libavutil/avstring.h"
 #include "edl.h"
+#include "osdep/strsep.h"
 
 static void rescale_input_coordinates(int ix, int iy, double *dx, double *dy)
 {
