diff --git a/classes/auto-package-libs.oeclass b/classes/auto-package-libs.oeclass
index 4309f53..3f8c5fe 100644
--- a/classes/auto-package-libs.oeclass
+++ b/classes/auto-package-libs.oeclass
@@ -39,7 +39,7 @@ AUTO_PACKAGE_LIBS_DEPENDS ?= ""
 AUTO_PACKAGE_LIBS_RDEPENDS ?= ""
 AUTO_PACKAGE_LIBS_FILES ?= "${SOLIBS}"
 AUTO_PACKAGE_LIBS_DEV_FILES ?= "${SOLIBSDEV},.la,.a"
-AUTO_PACKAGE_LIBS_DEV_FILES:>HOST_OS_mingw32 = ",.def,.lib"
+AUTO_PACKAGE_LIBS_DEV_FILES:>HOST_LIBC_mingw = ",.def,.lib"
 
 META_EMIT_PREFIX += "package:AUTO_PACKAGE_LIBS split:AUTO_PACKAGE_LIBS"
 
diff --git a/classes/c.oeclass b/classes/c.oeclass
index 4538dce..b236d99 100644
--- a/classes/c.oeclass
+++ b/classes/c.oeclass
@@ -100,9 +100,11 @@ HOST_LDFLAGS_HASH_STYLE:sdk		= "${SDK_HOST_LDFLAGS_HASH_STYLE}"
 HOST_LDFLAGS_HASH_STYLE:canadian-cross	= "${SDK_HOST_LDFLAGS_HASH_STYLE}"
 HOST_LDFLAGS_HASH_STYLE:HOST_KERNEL_darwin = ""
 MACHINE_HOST_LDFLAGS_HASH_STYLE = "-Wl,--hash-style=${MACHINE_LINK_HASH_STYLE}"
-MACHINE_HOST_LDFLAGS_HASH_STYLE:HOST_OS_mingw32 = ""
+MACHINE_HOST_LDFLAGS_HASH_STYLE:HOST_LIBC_mingw = ""
+MACHINE_HOST_LDFLAGS_HASH_STYLE:HOST_KERNEL_darwin = ""
 SDK_HOST_LDFLAGS_HASH_STYLE = "-Wl,--hash-style=${SDK_LINK_HASH_STYLE}"
-SDK_HOST_LDFLAGS_HASH_STYLE:HOST_OS_mingw32 = ""
+SDK_HOST_LDFLAGS_HASH_STYLE:HOST_LIBC_mingw = ""
+SDK_HOST_LDFLAGS_HASH_STYLE:HOST_KERNEL_darwin = ""
 
 TARGET_LDFLAGS_HASH_STYLE = "-Wl,--hash-style=${BUILD_LINK_HASH_STYLE}"
 TARGET_LDFLAGS_HASH_STYLE:cross		= "${MACHINE_TARGET_LDFLAGS_HASH_STYLE}"
@@ -111,9 +113,11 @@ TARGET_LDFLAGS_HASH_STYLE:canadian-cross= "${MACHINE_TARGET_LDFLAGS_HASH_STYLE}"
 TARGET_LDFLAGS_HASH_STYLE:sdk		= "${SDK_TARGET_LDFLAGS_HASH_STYLE}"
 TARGET_LDFLAGS_HASH_STYLE:sdk-cross	= "${SDK_TARGET_LDFLAGS_HASH_STYLE}"
 MACHINE_TARGET_LDFLAGS_HASH_STYLE = "-Wl,--hash-style=${MACHINE_LINK_HASH_STYLE}"
-MACHINE_TARGET_LDFLAGS_HASH_STYLE:TARGET_OS_mingw32 = ""
+MACHINE_TARGET_LDFLAGS_HASH_STYLE:TARGET_LIBC_mingw = ""
+MACHINE_TARGET_LDFLAGS_HASH_STYLE:TARGET_KERNEL_darwin = ""
 SDK_TARGET_LDFLAGS_HASH_STYLE = "-Wl,--hash-style=${SDK_LINK_HASH_STYLE}"
-SDK_TARGET_LDFLAGS_HASH_STYLE:TARGET_OS_mingw32 = ""
+SDK_TARGET_LDFLAGS_HASH_STYLE:TARGET_LIBC_mingw = ""
+SDK_TARGET_LDFLAGS_HASH_STYLE:TARGET_KERNEL_darwin = ""
 
 inherit chrpath
 
diff --git a/classes/sdk-image.oeclass b/classes/sdk-image.oeclass
index 3f89006..f96e7fe 100644
--- a/classes/sdk-image.oeclass
+++ b/classes/sdk-image.oeclass
@@ -15,10 +15,10 @@ RECIPE_TYPES ?= "canadian-cross"
 inherit archive-image
 IMAGE_BASENAME ?= "oe-lite-sdk-${HOST_ARCH}-${TARGET_ARCH}"
 ARCHIVE_IMAGE_DIRNAME ?= "sdk"
-ARCHIVE_IMAGE_FORMATS:HOST_OS_mingw32 = "zip"
+ARCHIVE_IMAGE_FORMATS:HOST_LIBC_mingw = "zip"
 
 IMAGE_PREPROCESS_NETFILTER = ""
-IMAGE_PREPROCESS_NETFILTER:HOST_OS_mingw32 = "image_preprocess_linux_netfilter_headers"
+IMAGE_PREPROCESS_NETFILTER:HOST_LIBC_mingw = "image_preprocess_linux_netfilter_headers"
 IMAGE_PREPROCESS_FUNCS += "${IMAGE_PREPROCESS_NETFILTER}"
 
 inherit elfwrapper
@@ -85,7 +85,7 @@ RDEPENDS_SDK += "${RDEPENDS_SDK_UBOOT_MKIMAGE}"
 RDEPENDS_SDK_UBOOT_MKIMAGE = ""
 RDEPENDS_SDK_UBOOT_MKIMAGE:USE_sdk_uboot_mkimage = "${UBOOT_MKIMAGE}"
 UBOOT_MKIMAGE = "host:u-boot-tools-mkimage"
-UBOOT_MKIMAGE:HOST_OS_mingw32 = ""
+UBOOT_MKIMAGE:HOST_LIBC_mingw = ""
 
 CLASS_FLAGS += "sdk_archive_formats sdk_archive_tar_ext"
 DEFAULT_USE_sdk_archive_formats = "tar"
diff --git a/conf/package.conf b/conf/package.conf
index d4e53d7..fa2411e 100644
--- a/conf/package.conf
+++ b/conf/package.conf
@@ -14,9 +14,9 @@ MAINTAINER	= "OE Lite community <dev@oe-lite.org>"
 HOMEPAGE	= "unknown"
 
 SOLIBS				= ".so.*"
-SOLIBS:HOST_OS_mingw32		= "-*.dll"
+SOLIBS:HOST_LIBC_mingw		= "-*.dll"
 SOLIBSDEV			= ".so"
-SOLIBSDEV:HOST_OS_mingw32	= ".dll.a"
+SOLIBSDEV:HOST_LIBC_mingw	= ".dll.a"
 
 PACKAGES	= "${PN}-dbg ${PN}-doc ${PN}-dev ${PN}-locale ${PN}"
 
@@ -55,7 +55,7 @@ ${libdir}/pkgconfig
 ${FILES_DEV_MINGW}
 """
 FILES_DEV_MINGW = ""
-FILES_DEV_MINGW:HOST_OS_mingw32 = """
+FILES_DEV_MINGW:HOST_LIBC_mingw = """
 ${base_libdir}/*.def
 ${libdir}/*.def
 ${base_libdir}/*.lib
diff --git a/conf/paths.conf b/conf/paths.conf
index f1e15cd..94df493 100644
--- a/conf/paths.conf
+++ b/conf/paths.conf
@@ -4,11 +4,11 @@ bootdir ?= "/boot"
 kernelsrcdir = "${prefix}/src/linux"
 
 base_sharedlibdir = "${base_libdir}"
-base_sharedlibdir:HOST_OS_mingw32 = "${base_bindir}"
+base_sharedlibdir:HOST_LIBC_mingw = "${base_bindir}"
 sharedlibdir = "${libdir}"
-sharedlibdir:HOST_OS_mingw32 = "${bindir}"
+sharedlibdir:HOST_LIBC_mingw = "${bindir}"
 
 target_base_sharedlibdir = "${target_base_libdir}"
-target_base_sharedlibdir:TARGET_OS_mingw32 = "${target_base_bindir}"
+target_base_sharedlibdir:TARGET_LIBC_mingw = "${target_base_bindir}"
 target_sharedlibdir = "${target_libdir}"
-target_sharedlibdir:TARGET_OS_mingw32 = "${target_bindir}"
+target_sharedlibdir:TARGET_LIBC_mingw = "${target_bindir}"
diff --git a/recipes/readline/readline.inc b/recipes/readline/readline.inc
index 85c6f41..945d26c 100644
--- a/recipes/readline/readline.inc
+++ b/recipes/readline/readline.inc
@@ -11,7 +11,7 @@ inherit auto-package-libs
 AUTO_PACKAGE_LIBS = "readline history"
 AUTO_PACKAGE_LIBS_DEV_DEPENDS = "${PN}-dev"
 
-SOLIBS:HOST_OS_mingw32 = "${@d.get('PV').split('.')[0]}.dll"
+SOLIBS:HOST_LIBC_mingw = "${@d.get('PV').split('.')[0]}.dll"
 
 DEPENDS = "libtermcap"
-DEPENDS:HOST_OS_mingw32 = ""
+DEPENDS:HOST_LIBC_mingw = ""
diff --git a/recipes/readline/readline_6.2.oe b/recipes/readline/readline_6.2.oe
index e94ae2d..d413bb5 100644
--- a/recipes/readline/readline_6.2.oe
+++ b/recipes/readline/readline_6.2.oe
@@ -9,7 +9,7 @@ LICENSE = "GPL-3.0+"
 
 require readline.inc
 
-SRC_URI:>TARGET_OS_darwin = " file://patch-shobj-conf.patch"
+SRC_URI:>TARGET_KERNEL_darwin = " file://patch-shobj-conf.patch"
 
 # Local Variables:
 # mode: python
