diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules
index 811981e8f5..d168fdb08c 100644
--- a/build/jam/MainBuildRules
+++ b/build/jam/MainBuildRules
@@ -622,14 +622,6 @@ rule BuildPlatformObjects
 	Objects $(sources) ;
 }
 
-actions Win32ExtensionFix
-{
-	if test -f $(1).exe ; then
-		rm -f $(1)
-		mv $(1).exe $(1)
-	fi
-}
-
 rule BuildPlatformMain
 {
 	# Usage BuildPlatformMain <target> : <sources> : <libraries> ;
@@ -659,15 +651,6 @@ rule BuildPlatformMain
 
 	Main $(target) : $(sources) ;
 	LinkAgainst $(target) : $(libs) ;
-	if $(HOST_PLATFORM) = mingw {
-		# MinGW GCC adds the ".exe" extension. We cannot force
-		# jam to use SUFEXE as haiku target executables are not
-		# supposed to have this extension, thus finding
-		# dependencies will fail for these.
-		# The hack is to remove the extension after a successful
-		# build of the Target.
-		Win32ExtensionFix $(target) ;
-	}
 }
 
 rule BuildPlatformSharedLibrary
diff --git a/src/tools/fs_shell/unistd.cpp b/src/tools/fs_shell/unistd.cpp
index ec9b4f4959..00be045a7b 100644
--- a/src/tools/fs_shell/unistd.cpp
+++ b/src/tools/fs_shell/unistd.cpp
@@ -28,7 +28,7 @@
 #		ifndef HAIKU_HOST_PLATFORM_DARWIN
 #			include <sys/disklabel.h>
 #		endif
-#	elif defined(HAIKU_HOST_PLATFORM_CYGWIN)
+#	elif defined(HAIKU_HOST_PLATFORM_MSYS)
 #		include <sys/ioctl.h>
 #		include <sys/stat.h>
 #	elif defined(HAIKU_HOST_PLATFORM_LINUX)