diff --git a/configure.ac b/configure.ac
index 7d06ba0..3a0cc6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AM_SILENT_RULES([yes])
 
 AC_LANG([C++])
 AC_PROG_CXX
-CXXFLAGS="$CXXFLAGS -std=c++11 -Wall -Wextra"
+CXXFLAGS="$CXXFLAGS -std=gnu++11 -Wall -Wextra"
 AC_PROG_CXXCPP
 AC_PROG_RANLIB
 AC_PROG_INSTALL
diff --git a/dist/win/bundle.sh b/dist/win/bundle.sh
index 5ed2c4f..f325956 100755
--- a/dist/win/bundle.sh
+++ b/dist/win/bundle.sh
@@ -24,7 +24,7 @@ rm -f dist/win/spek.res
 mkdir -p src/dist/win && cp dist/win/spek.res src/dist/win/
 
 # Compile and strip spek.exe
-LDFLAGS="dist/win/spek.res" ./configure \
+LDFLAGS="dist/win/spek.res" ./autogen.sh \
     --host="$HOST" \
     --with-wx-config="$WX_CONFIG" \
     --prefix=${PWD}/dist/win/build && \
diff --git a/src/spek-pipeline.cc b/src/spek-pipeline.cc
index ff89a83..f5465bb 100644
--- a/src/spek-pipeline.cc
+++ b/src/spek-pipeline.cc
@@ -24,6 +24,7 @@
  */
 
 #define __STDC_LIMIT_MACROS
+#include <wx/intl.h>
 
 #include <assert.h>
 #include <math.h>
@@ -34,8 +35,6 @@
 
 #include <vector>
 
-#include <wx/intl.h>
-
 #include "spek-audio.h"
 #include "spek-fft.h"