diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 231b7f565a..284f614032 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -222,7 +222,7 @@ HOST_UNARFLAGS		?= x ;
 
 # check the host platform compatibility
 SetPlatformCompatibilityFlagVariables HOST_PLATFORM : HOST : host
-	: linux openbsd freebsd darwin msys ;
+	: linux openbsd freebsd darwin ;
 HOST_PLATFORM_(host)_COMPATIBLE = 1 ;
 
 if $(HOST_PLATFORM) = linux || $(HOST_PLATFORM) = freebsd
@@ -412,10 +412,7 @@ if $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
 } else {
 	HOST_LINKFLAGS += -lm -ldl ;
 	HOST_LIBSTDC++ = stdc++ ;
-	if $(HOST_PLATFORM) = msys {
-		HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR
-			= "PATH=$PATH:$(HOST_BUILD_COMPATIBILITY_LIB_DIR)" ;
-	} else if $(HOST_PLATFORM) = darwin {
+	if $(HOST_PLATFORM) = darwin {
 		HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR
 			= "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH:$(HOST_BUILD_COMPATIBILITY_LIB_DIR)\"" ;
 	} else {
@@ -649,7 +646,6 @@ switch $(HOST_PLATFORM) {
 	case linux		: HOST_DEFINES	+= HAIKU_HOST_PLATFORM_LINUX ;
 	case freebsd	: HOST_DEFINES	+= HAIKU_HOST_PLATFORM_FREEBSD ;
 	case darwin		: HOST_DEFINES	+= HAIKU_HOST_PLATFORM_DARWIN ;
-	case msys		: HOST_DEFINES	+= HAIKU_HOST_PLATFORM_MSYS ;
 }
 
 # define host platform 64 bit macro
diff --git a/configure b/configure
index a0f9de83d6..db7f610e38 100755
--- a/configure
+++ b/configure
@@ -450,7 +450,7 @@ check_native_xattrs()
 			xattr_set="setextattr"; xattr_set_args="user \$NAME \"\$VALUE\""
 			xattr_get="getextattr"; xattr_get_args="user \$NAME"
 			;;
-		linux|msys)
+		linux)
 			xattr_set="setfattr"; xattr_set_args="-n user.\$NAME -v \"\$VALUE\""
 			xattr_get="getfattr"; xattr_get_args="-n user.\$NAME"
 			;;
@@ -601,7 +601,6 @@ case "${platform}" in
 	Haiku)   HOST_PLATFORM=haiku_host ;;
 	Linux)   HOST_PLATFORM=linux ;;
 	OpenBSD) HOST_PLATFORM=openbsd ;;
-	MSYS*)   HOST_PLATFORM=msys ;;
 	*)       echo Unsupported platform: ${platform}
 	         exit 1 ;;
 esac
diff --git a/headers/build/BeOSBuildCompatibility.h b/headers/build/BeOSBuildCompatibility.h
index 197309ab06..45af40681b 100644
--- a/headers/build/BeOSBuildCompatibility.h
+++ b/headers/build/BeOSBuildCompatibility.h
@@ -18,10 +18,6 @@
 typedef unsigned long	haiku_build_addr_t;
 #define addr_t			haiku_build_addr_t
 
-#if defined(HAIKU_HOST_PLATFORM_MSYS)
-#define __addr_t_defined
-#endif
-
 #include <Errors.h>
 
 #include <fcntl.h>
diff --git a/src/build/libroot/fs_attr_generic.cpp b/src/build/libroot/fs_attr_generic.cpp
index 6c58544857..a86d4d555e 100644
--- a/src/build/libroot/fs_attr_generic.cpp
+++ b/src/build/libroot/fs_attr_generic.cpp
@@ -21,7 +21,7 @@
 // Include the interface to the host platform attributes support, if it shall be
 // used to tag files with unique IDs to identify their attribute directory.
 #if HAIKU_HOST_USE_XATTR_REF
-#	if defined(HAIKU_HOST_PLATFORM_LINUX) || defined(HAIKU_HOST_PLATFORM_MSYS)
+#	if defined(HAIKU_HOST_PLATFORM_LINUX)
 #		include "fs_attr_xattr.h"
 #	elif defined(HAIKU_HOST_PLATFORM_FREEBSD)
 #		include "fs_attr_extattr.h"
diff --git a/src/build/libsolv/Jamfile b/src/build/libsolv/Jamfile
index e087788de9..3cedcf7d79 100644
--- a/src/build/libsolv/Jamfile
+++ b/src/build/libsolv/Jamfile
@@ -33,8 +33,6 @@ switch $(HOST_PLATFORM) {
 		DEFINES += HAVE_STRCHRNUL HAVE_FUNOPEN ;
 	case darwin :
 		DEFINES += HAVE_FUNOPEN HAVE_QSORT_R ;
-	case msys :
-		DEFINES += HAVE_STRCHRNUL HAVE_QSORT_R HAVE_FOPENCOOKIE ;
 	case * :
 		Exit $(SUBDIR)/Jamfile: "Please add a case for your platform"
 			"($(HOST_PLATFORM))!" ;
diff --git a/src/tools/fs_shell/unistd.cpp b/src/tools/fs_shell/unistd.cpp
index 00be045a7b..d24b02c6cc 100644
--- a/src/tools/fs_shell/unistd.cpp
+++ b/src/tools/fs_shell/unistd.cpp
@@ -28,9 +28,6 @@
 #		ifndef HAIKU_HOST_PLATFORM_DARWIN
 #			include <sys/disklabel.h>
 #		endif
-#	elif defined(HAIKU_HOST_PLATFORM_MSYS)
-#		include <sys/ioctl.h>
-#		include <sys/stat.h>
 #	elif defined(HAIKU_HOST_PLATFORM_LINUX)
 #		include <linux/hdreg.h>
 #		include <linux/fs.h>