diff --git a/configure.ac b/configure.ac
index 44710d57d913f895bbe34e10c14f96a7399a17de..9bd151820289bfc8d7cf87e025390a6a197a1040 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,6 +49,7 @@ AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
 AM_MAINTAINER_MODE
 
 AC_CANONICAL_HOST
+AC_MINGW32
 AM_PROG_LIBTOOL
 AM_PROG_CC_C_O
 
@@ -209,7 +210,8 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([char foo;])],
 CFLAGS="$saved_CFLAGS $SYMBOL_VISIBILITY"
 AC_SUBST(SYMBOL_VISIBILITY)
 
-ac_build_stack_protector=yes
+ac_build_stack_protector=no
+if test "x$ac_cv_c_compiler_gnu" = "xyes" && test "x$MINGW32" != "xyes" ; then
 AC_ARG_ENABLE(stack-protector,
      AS_HELP_STRING([--disable-stack-protector],[Disable compiler stack hardening]),
      [
@@ -231,6 +233,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([void main(void){char foo;}])],
 CFLAGS="$saved_CFLAGS $STACK_PROTECTOR"
 fi
 fi
+fi
 
 CFLAGS="$CFLAGS -W"
 
diff --git a/win32/config.h b/win32/config.h
index 4b8cb6da4ec106f811277fc2d9b3e0e50ae7ecd7..6d32620f70019d68317ff1208410c9ecebd3d376 100644
--- a/win32/config.h
+++ b/win32/config.h
@@ -3,7 +3,6 @@
 
 #define CELT_BUILD            1
 
-#define restrict
 #define inline __inline
 #define getpid _getpid