diff --git a/makefile b/makefile
index c1730ac85f..08103bd11e 100644
--- a/makefile
+++ b/makefile
@@ -136,8 +136,8 @@ ifeq ($(platform),windows)
 		objcopy = i586-mingw32msvc-objcopy
 		strip = i586-mingw32msvc-strip
 	else
-		build-cflags = $(common-cflags) \
-			"-I$(JAVA_HOME)/include/win32" -I$(src) -mthreads
+		common-cflags += "-I$(JAVA_HOME)/include/win32"
+		build-cflags = $(common-cflags) -I$(src) -mthreads
 		ifeq ($(build-platform),cygwin)
 			build-lflags += -mno-cygwin
 			build-cflags += -mno-cygwin
diff --git a/src/compile-x86.S b/src/compile-x86.S
index 1c6e47b771..fa5c6a29f1 100644
--- a/src/compile-x86.S
+++ b/src/compile-x86.S
@@ -80,7 +80,7 @@ LOCAL(test):
 
 #elif defined __i386__
 
-#  if defined __APPLE__ || defined __MINGW32__
+#  if defined __APPLE__ || defined __MINGW32__ || defined __CYGWIN32__
 .globl _vmInvoke
 _vmInvoke: 
 #  else
diff --git a/src/x86.S b/src/x86.S
index b70f978667..7973a460e8 100644
--- a/src/x86.S
+++ b/src/x86.S
@@ -122,7 +122,7 @@ vmJump:
 
 #elif defined __i386__
 
-#  if defined __APPLE__ || defined __MINGW32__
+#  if defined __APPLE__ || defined __MINGW32__ || defined __CYGWIN32__
 .globl _vmNativeCall
 _vmNativeCall: 
 #  else
@@ -199,7 +199,7 @@ LOCAL(exit):
    popl   %ebp
    ret
      
-#  if defined __APPLE__ || defined __MINGW32__
+#  if defined __APPLE__ || defined __MINGW32__ || defined __CYGWIN32__
 .globl _vmJump
 _vmJump:
 #  else