diff -Naur coreutils-8.21/lib/Makefile.in coreutils-8.21-msys/lib/Makefile.in
--- coreutils-8.21/Makefile.in	2013-05-01 08:22:57.715820300 +0000
+++ coreutils-8.21-msys/Makefile.in	2013-03-04 08:25:50.146484300 +0000
@@ -392,13 +392,13 @@
 	lib/argmatch.c lib/argv-iter.c lib/argv-iter.h \
 	lib/backupfile.c lib/base64.h lib/base64.c lib/binary-io.h \
 	lib/binary-io.c lib/bitrotate.h lib/bitrotate.c \
-	lib/buffer-lcm.c lib/buffer-lcm.h lib/c-ctype.h lib/c-ctype.c \
+	lib/buffer-lcm.c lib/buffer-lcm.h lib/cygwin.c lib/cygwin.h lib/c-ctype.h lib/c-ctype.c \
 	lib/c-strcase.h lib/c-strcasecmp.c lib/c-strncasecmp.c \
 	lib/c-strtod.c lib/c-strtold.c lib/canon-host.c \
 	lib/canonicalize.c lib/careadlinkat.c lib/cloexec.c \
 	lib/close-stream.c lib/closein.c lib/closeout.c \
 	lib/cygwin.h lib/cygwin.c lib/md5.c \
-	lib/sha1.c lib/sha256.c lib/sha512.c lib/cycle-check.c \
+	lib/sha1.c lib/sha256.c lib/sha512.c lib/cycle-check.c lib/cygwin.c \
 	lib/di-set.c lib/di-set.h lib/diacrit.h lib/diacrit.c \
 	lib/opendir-safer.c lib/dirname.c lib/basename.c \
 	lib/dirname-lgpl.c lib/basename-lgpl.c lib/stripslash.c \
@@ -476,7 +476,7 @@
 	lib/argmatch.$(OBJEXT) lib/argv-iter.$(OBJEXT) \
 	lib/backupfile.$(OBJEXT) lib/base64.$(OBJEXT) \
 	lib/binary-io.$(OBJEXT) lib/bitrotate.$(OBJEXT) \
-	lib/buffer-lcm.$(OBJEXT) lib/c-ctype.$(OBJEXT) \
+	lib/buffer-lcm.$(OBJEXT) lib/cygwin.$(OBJEXT) lib/c-ctype.$(OBJEXT) \
 	lib/c-strcasecmp.$(OBJEXT) lib/c-strncasecmp.$(OBJEXT) \
 	lib/c-strtod.$(OBJEXT) lib/c-strtold.$(OBJEXT) \
 	lib/canon-host.$(OBJEXT) lib/canonicalize.$(OBJEXT) \
@@ -484,7 +484,7 @@
 	lib/close-stream.$(OBJEXT) lib/closein.$(OBJEXT) \
 	lib/closeout.$(OBJEXT) lib/md5.$(OBJEXT) lib/sha1.$(OBJEXT) \
 	lib/sha256.$(OBJEXT) lib/sha512.$(OBJEXT) \
-	lib/cycle-check.$(OBJEXT) lib/di-set.$(OBJEXT) \
+	lib/cycle-check.$(OBJEXT) lib/cygwin.$(OBJEXT) lib/di-set.$(OBJEXT) \
 	lib/diacrit.$(OBJEXT) lib/opendir-safer.$(OBJEXT) \
 	lib/dirname.$(OBJEXT) lib/basename.$(OBJEXT) \
 	lib/dirname-lgpl.$(OBJEXT) lib/basename-lgpl.$(OBJEXT) \
@@ -2889,13 +2889,13 @@
 	lib/areadlink-with-size.c lib/areadlinkat.c lib/argmatch.c \
 	lib/argv-iter.c lib/argv-iter.h lib/backupfile.c lib/base64.h \
 	lib/base64.c lib/binary-io.h lib/binary-io.c lib/bitrotate.h \
-	lib/bitrotate.c lib/buffer-lcm.c lib/buffer-lcm.h \
+	lib/bitrotate.c lib/buffer-lcm.c lib/cygwin.c lib/cygwin.h lib/buffer-lcm.h \
 	lib/c-ctype.h lib/c-ctype.c lib/c-strcase.h lib/c-strcasecmp.c \
 	lib/c-strncasecmp.c lib/c-strtod.c lib/c-strtold.c \
 	lib/canon-host.c lib/canonicalize.c lib/careadlinkat.c \
 	lib/cloexec.c lib/close-stream.c lib/closein.c lib/closeout.c \
 	lib/md5.c lib/sha1.c lib/sha256.c lib/sha512.c \
-	lib/cycle-check.c lib/di-set.c lib/di-set.h lib/diacrit.h \
+	lib/cycle-check.c lib/cygwin.c lib/di-set.c lib/di-set.h lib/diacrit.h \
 	lib/diacrit.c lib/opendir-safer.c lib/dirname.c lib/basename.c \
 	lib/dirname-lgpl.c lib/basename-lgpl.c lib/stripslash.c \
 	lib/dtoastr.c lib/dtotimespec.c lib/exclude.c lib/exitfail.c \
diff -Naur coreutils-8.15/src/install.c coreutils-8.15-msys/src/install.c
--- coreutils-8.21/src/install.c	2013-05-01 05:36:30.586914000 +0000
+++ coreutils-8.21-msys/src/install.c	2013-03-04 10:35:28.122070300 +0000
@@ -44,7 +44,7 @@
 #include "utimens.h"
 #include "xstrtol.h"

-#if __CYGWIN__
+#ifdef __CYGWIN__
 # include "cygwin.h"
 #endif