diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d3fa986..44247285 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1186,7 +1186,7 @@ if (NOT LWS_WITHOUT_TESTAPPS)
 		set(PLUGIN_SRCS ${MAIN_SRC})
 
 		if (WIN32)
-			list(APPEND PLUGIN_SRCSset_property
+			list(APPEND PLUGIN_SRCS
 				${WIN32_HELPERS_PATH}/getopt.c
 				${WIN32_HELPERS_PATH}/getopt_long.c
 				${WIN32_HELPERS_PATH}/gettimeofday.c
diff --git a/lib/lejp.h b/lib/lejp.h
index f46acb2a..ab3052ef 100644
--- a/lib/lejp.h
+++ b/lib/lejp.h
@@ -140,7 +140,7 @@ enum lejp_callbacks {
  *
  *  LEJPCB_OBJECT_END:	An object ended
  */
-extern char _lejp_callback(struct lejp_ctx *ctx, char reason);
+LWS_EXTERN char _lejp_callback(struct lejp_ctx *ctx, char reason);
 
 typedef char (*lejp_callback)(struct lejp_ctx *ctx, char reason);
 
@@ -213,20 +213,20 @@ struct lejp_ctx {
 	unsigned char wildcount;
 };
 
-LWS_VISIBLE void
+LWS_VISIBLE LWS_EXTERN void
 lejp_construct(struct lejp_ctx *ctx,
 	       char (*callback)(struct lejp_ctx *ctx, char reason), void *user,
 	       const char * const *paths, unsigned char paths_count);
 
-LWS_VISIBLE void
+LWS_VISIBLE LWS_EXTERN void
 lejp_destruct(struct lejp_ctx *ctx);
 
-LWS_VISIBLE int
+LWS_VISIBLE LWS_EXTERN int
 lejp_parse(struct lejp_ctx *ctx, const unsigned char *json, int len);
 
-LWS_VISIBLE void
+LWS_VISIBLE LWS_EXTERN void
 lejp_change_callback(struct lejp_ctx *ctx,
 		       char (*callback)(struct lejp_ctx *ctx, char reason));
 
-LWS_VISIBLE int
+LWS_VISIBLE LWS_EXTERN int
 lejp_get_wildcard(struct lejp_ctx *ctx, int wildcard, char *dest, int len);
diff --git a/lib/libwebsockets.h b/lib/libwebsockets.h
index eb0f6f80..bb364683 100644
--- a/lib/libwebsockets.h
+++ b/lib/libwebsockets.h
@@ -1367,7 +1367,8 @@ struct lws_plugin {
  * If we add more extensions, publish the callback here  ------v
  */
 
-extern int lws_extension_callback_pm_deflate(
+LWS_EXTERN
+int lws_extension_callback_pm_deflate(
 	struct lws_context *context, const struct lws_extension *ext,
 	struct lws *wsi, enum lws_extension_callback_reasons reason,
 	void *user, void *in, size_t len);
diff --git a/lib/private-libwebsockets.h b/lib/private-libwebsockets.h
index 87dc30b5..c6998aa1 100644
--- a/lib/private-libwebsockets.h
+++ b/lib/private-libwebsockets.h
@@ -82,6 +82,7 @@
 #include <in6addr.h>
 #endif
 #include <mstcpip.h>
+#include <io.h>
 
 #ifndef __func__
 #define __func__ __FUNCTION__