diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
index 3dac6eaef..c25917dd9 100644
--- a/src/ap/hostapd.h
+++ b/src/ap/hostapd.h
@@ -44,7 +44,9 @@ struct hapd_interfaces {
 	int global_ctrl_sock;
 	char *global_iface_path;
 	char *global_iface_name;
+#ifndef CONFIG_NATIVE_WINDOWS
 	gid_t ctrl_iface_group;
+#endif /* CONFIG_NATIVE_WINDOWS */
 	struct hostapd_iface **iface;
 	struct hostapd_dynamic_iface **dynamic_iface;
 
diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
index 3c5863465..7e1056c90 100644
--- a/src/crypto/tls_openssl.c
+++ b/src/crypto/tls_openssl.c
@@ -1136,6 +1136,7 @@ static int tls_match_altsubject(X509 *cert, const char *match)
 }
 
 
+#ifndef CONFIG_NATIVE_WINDOWS
 static int domain_suffix_match(const u8 *val, size_t len, const char *match)
 {
 	size_t i, match_len;
@@ -1165,10 +1166,15 @@ static int domain_suffix_match(const u8 *val, size_t len, const char *match)
 	wpa_printf(MSG_DEBUG, "TLS: Reject due to incomplete label match");
 	return 0;
 }
+#endif /* CONFIG_NATIVE_WINDOWS */
 
 
 static int tls_match_suffix(X509 *cert, const char *match)
 {
+#ifdef CONFIG_NATIVE_WINDOWS
+	/* wincrypt.h has conflicting X509_NAME definition */
+	return -1;
+#else /* CONFIG_NATIVE_WINDOWS */
 	GENERAL_NAME *gen;
 	void *ext;
 	int i;
@@ -1224,6 +1230,7 @@ static int tls_match_suffix(X509 *cert, const char *match)
 
 	wpa_printf(MSG_DEBUG, "TLS: No CommonName suffix match found");
 	return 0;
+#endif /* CONFIG_NATIVE_WINDOWS */
 }