diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3a5c9b81..4309ca83f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -723,7 +723,6 @@ if (NOT LWS_HAVE_GETIFADDRS)
 	set(LWS_BUILTIN_GETIFADDRS 1)
 endif()
 
-CHECK_INCLUDE_FILE(getopt.h LWS_HAS_GETOPT_LONG)
 CHECK_INCLUDE_FILE(dlfcn.h LWS_HAVE_DLFCN_H)
 CHECK_INCLUDE_FILE(fcntl.h LWS_HAVE_FCNTL_H)
 CHECK_INCLUDE_FILE(in6addr.h LWS_HAVE_IN6ADDR_H)
@@ -818,7 +817,7 @@ CHECK_C_SOURCE_COMPILES("#define _GNU_SOURCE
 		return 0;
 	}" LWS_HAS_PTHREAD_SETNAME_NP)
 
-CHECK_C_SOURCE_COMPILES("
+CHECK_C_SOURCE_COMPILES("#include <stddef.h>
 	#include <getopt.h> 
 	int main(void) { 
 		void *p = (void *)getopt_long;
diff --git a/cmake/lws_config.h.in b/cmake/lws_config.h.in
index 254799dc5..87112a931 100644
--- a/cmake/lws_config.h.in
+++ b/cmake/lws_config.h.in
@@ -28,7 +28,6 @@
 #cmakedefine LWS_HAVE_ECDSA_SIG_set0
 #cmakedefine LWS_HAVE_EVP_MD_CTX_free
 #cmakedefine LWS_HAVE_EVP_aes_128_wrap
-#cmakedefine LWS_HAS_GETOPT_LONG
 #cmakedefine LWS_HAVE_LIBCAP
 #cmakedefine LWS_HAVE_MALLOC_H
 #cmakedefine LWS_HAVE_mbedtls_net_init
diff --git a/lib/tls/openssl/x509.c b/lib/tls/openssl/x509.c
index 62a122b9e..269506772 100644
--- a/lib/tls/openssl/x509.c
+++ b/lib/tls/openssl/x509.c
@@ -292,11 +292,11 @@ lws_x509_public_to_jwk(struct lws_jwk *jwk, struct lws_x509_cert *x509,
 	ASN1_OBJECT *obj = NULL;
 	const EC_POINT *ecpoint;
 	const EC_GROUP *ecgroup;
+	EC_KEY *ecpub = NULL;
 	X509_PUBKEY *pubkey;
+	RSA *rsapub = NULL;
 	BIGNUM *mpi[4];
 	EVP_PKEY *pkey;
-	EC_KEY *ecpub;
-	RSA *rsapub;
 
 	memset(jwk, 0, sizeof(*jwk));
 
@@ -480,10 +480,10 @@ lws_x509_jwk_privkey_pem(struct lws_jwk *jwk, void *pem, size_t len,
 	BIO* bio = BIO_new(BIO_s_mem());
 	BIGNUM *mpi, *dummy[4];
 	EVP_PKEY *pkey = NULL;
+	EC_KEY *ecpriv = NULL;
+	RSA *rsapriv = NULL;
 	const BIGNUM *cmpi;
 	int n, m, ret = -1;
-	EC_KEY *ecpriv;
-	RSA *rsapriv;
 
 	BIO_write(bio, pem, len);
 	PEM_read_bio_PrivateKey(bio, &pkey, lws_x509_jwk_privkey_pem_pp_cb,