diff --git a/CMakeLists.txt b/CMakeLists.txt
index 442472853..7e28b7ac0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1509,6 +1509,7 @@ message(" PLUGINS = ${PLUGINS_LIST}")
 message(" LWS_WITH_ACCESS_LOG = ${LWS_WITH_ACCESS_LOG}")
 message(" LWS_WITH_SERVER_STATUS = ${LWS_WITH_SERVER_STATUS}")
 message(" LWS_WITH_LEJP = ${LWS_WITH_LEJP}")
+message(" LWS_WITH_GENERIC_SESSIONS = ${LWS_WITH_GENERIC_SESSIONS}")
 message("---------------------------------------------------------------------")
 
 # These will be available to parent projects including libwebsockets using add_subdirectory()
diff --git a/plugin-standalone/protocol_example_standalone.c b/plugin-standalone/protocol_example_standalone.c
index c74bbf948..36172d43b 100644
--- a/plugin-standalone/protocol_example_standalone.c
+++ b/plugin-standalone/protocol_example_standalone.c
@@ -21,7 +21,11 @@
  * "example-standalone-protocol", to show how to build protocol plugins
  * outside the library easily.
  */
+
+#define LWS_DLL
+#define LWS_INTERNAL
 #include "../lib/libwebsockets.h"
+
 #include <string.h>
 
 struct per_vhost_data__dumb_increment {
diff --git a/plugins/protocol_client_loopback_test.c b/plugins/protocol_client_loopback_test.c
index d03aae6de..6468aa1ad 100644
--- a/plugins/protocol_client_loopback_test.c
+++ b/plugins/protocol_client_loopback_test.c
@@ -17,6 +17,9 @@
  * may be proprietary.  So unlike the library itself, they are licensed
  * Public Domain.
  */
+
+#define LWS_DLL
+#define LWS_INTERNAL
 #include "../lib/libwebsockets.h"
 #include <string.h>
 
@@ -169,7 +172,7 @@ static const struct lws_protocols protocols[] = {
 	},
 };
 
-LWS_VISIBLE int
+LWS_EXTERN LWS_VISIBLE int
 init_protocol_client_loopback_test(struct lws_context *context,
 				   struct lws_plugin_capability *c)
 {
@@ -187,7 +190,7 @@ init_protocol_client_loopback_test(struct lws_context *context,
 	return 0;
 }
 
-LWS_VISIBLE int
+LWS_EXTERN LWS_VISIBLE int
 destroy_protocol_client_loopback_test(struct lws_context *context)
 {
 	return 0;
diff --git a/plugins/protocol_dumb_increment.c b/plugins/protocol_dumb_increment.c
index ad5837a5a..d8d725795 100644
--- a/plugins/protocol_dumb_increment.c
+++ b/plugins/protocol_dumb_increment.c
@@ -17,6 +17,8 @@
  * may be proprietary.  So unlike the library itself, they are licensed
  * Public Domain.
  */
+#define LWS_DLL
+#define LWS_INTERNAL
 #include "../lib/libwebsockets.h"
 #include <string.h>
 
@@ -119,7 +121,7 @@ static const struct lws_protocols protocols[] = {
 	},
 };
 
-LWS_VISIBLE int
+LWS_EXTERN LWS_VISIBLE int
 init_protocol_dumb_increment(struct lws_context *context,
 			     struct lws_plugin_capability *c)
 {
@@ -137,7 +139,7 @@ init_protocol_dumb_increment(struct lws_context *context,
 	return 0;
 }
 
-LWS_VISIBLE int
+LWS_EXTERN LWS_VISIBLE int
 destroy_protocol_dumb_increment(struct lws_context *context)
 {
 	return 0;
diff --git a/plugins/protocol_lws_mirror.c b/plugins/protocol_lws_mirror.c
index 45a15a5cf..c275ed4fc 100644
--- a/plugins/protocol_lws_mirror.c
+++ b/plugins/protocol_lws_mirror.c
@@ -17,6 +17,8 @@
  * may be proprietary.  So unlike the library itself, they are licensed
  * Public Domain.
  */
+#define LWS_DLL
+#define LWS_INTERNAL
 #include "../lib/libwebsockets.h"
 #include <string.h>
 #include <stdlib.h>
@@ -155,7 +157,7 @@ static const struct lws_protocols protocols[] = {
 	},
 };
 
-LWS_VISIBLE int
+LWS_EXTERN LWS_VISIBLE int
 init_protocol_lws_mirror(struct lws_context *context,
 			     struct lws_plugin_capability *c)
 {
@@ -173,7 +175,7 @@ init_protocol_lws_mirror(struct lws_context *context,
 	return 0;
 }
 
-LWS_VISIBLE int
+LWS_EXTERN LWS_VISIBLE int
 destroy_protocol_lws_mirror(struct lws_context *context)
 {
 	return 0;
diff --git a/plugins/protocol_lws_server_status.c b/plugins/protocol_lws_server_status.c
index e2e27e71a..926623cdc 100644
--- a/plugins/protocol_lws_server_status.c
+++ b/plugins/protocol_lws_server_status.c
@@ -17,6 +17,9 @@
  * may be proprietary.  So unlike the library itself, they are licensed
  * Public Domain.
  */
+
+#define LWS_DLL
+#define LWS_INTERNAL
 #include "../lib/libwebsockets.h"
 #include <string.h>
 #include <stdlib.h>
@@ -122,7 +125,7 @@ static const struct lws_protocols protocols[] = {
 	},
 };
 
-LWS_VISIBLE int
+LWS_EXTERN LWS_VISIBLE int
 init_protocol_lws_server_status(struct lws_context *context,
 			     struct lws_plugin_capability *c)
 {
@@ -140,7 +143,7 @@ init_protocol_lws_server_status(struct lws_context *context,
 	return 0;
 }
 
-LWS_VISIBLE int
+LWS_EXTERN LWS_VISIBLE int
 destroy_protocol_lws_server_status(struct lws_context *context)
 {
 	return 0;
diff --git a/plugins/protocol_lws_status.c b/plugins/protocol_lws_status.c
index 29e1d65fe..817fe76dd 100644
--- a/plugins/protocol_lws_status.c
+++ b/plugins/protocol_lws_status.c
@@ -17,7 +17,11 @@
  * may be proprietary.  So unlike the library itself, they are licensed
  * Public Domain.
  */
+
+#define LWS_DLL
+#define LWS_INTERNAL
 #include "../lib/libwebsockets.h"
+
 #include <time.h>
 #include <string.h>
 #ifdef WIN32
@@ -182,7 +186,7 @@ static const struct lws_protocols protocols[] = {
 	},
 };
 
-LWS_VISIBLE int
+LWS_EXTERN LWS_VISIBLE int
 init_protocol_lws_status(struct lws_context *context,
 			     struct lws_plugin_capability *c)
 {
@@ -200,7 +204,7 @@ init_protocol_lws_status(struct lws_context *context,
 	return 0;
 }
 
-LWS_VISIBLE int
+LWS_EXTERN LWS_VISIBLE int
 destroy_protocol_lws_status(struct lws_context *context)
 {
 	return 0;
diff --git a/plugins/protocol_post_demo.c b/plugins/protocol_post_demo.c
index 29145a63a..e2e0b7326 100644
--- a/plugins/protocol_post_demo.c
+++ b/plugins/protocol_post_demo.c
@@ -17,7 +17,11 @@
  * may be proprietary.  So unlike the library itself, they are licensed
  * Public Domain.
  */
+
+#define LWS_DLL
+#define LWS_INTERNAL
 #include "../lib/libwebsockets.h"
+
 #include <string.h>
 
 struct per_session_data__post_demo {
@@ -114,7 +118,7 @@ static const struct lws_protocols protocols[] = {
 	},
 };
 
-LWS_VISIBLE int
+LWS_EXTERN LWS_VISIBLE int
 init_protocol_post_demo(struct lws_context *context,
 			struct lws_plugin_capability *c)
 {
@@ -132,7 +136,7 @@ init_protocol_post_demo(struct lws_context *context,
 	return 0;
 }
 
-LWS_VISIBLE int
+LWS_EXTERN LWS_VISIBLE int
 destroy_protocol_post_demo(struct lws_context *context)
 {
 	return 0;