diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d92b2f06..a2e990a20 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -339,7 +339,26 @@ if (NOT LWS_ROLE_WS)
 	set(LWS_WITHOUT_EXTENSIONS 1)
 endif()
 
-include_directories(include plugins)
+if (LWS_WITH_MBEDTLS)
+	include_directories(lib/tls/mbedtls/wrapper/include)
+endif()
+
+include_directories(include plugins lib/core lib/core-net lib/event-libs include/abstract lib/tls lib/roles lib/event-libs/libuv lib/event-libs/poll lib/event-libs/libevent lib/event-libs/libev lib/jose/jwe lib/jose/jws lib/jose lib/misc lib/roles/http lib/roles/http/compression lib/roles/h1 lib/roles/h2 lib/roles/ws lib/roles/cgi lib/roles/dbus lib/roles/raw-proxy)
+
+if (LWS_WITH_ESP32)
+	include_directories(lib/plat/esp32)
+else()
+	if (WIN32)
+		include_directories(lib/plat/windows)
+	else()
+		if (LWS_WITH_OPTEE)
+			include_directories(lib/plat/optee)
+		else()
+			include_directories(lib/plat/unix)
+		endif()
+	endif()
+endif()
+
 
 if (LWS_WITH_LWSWS)
  message(STATUS "LWS_WITH_LWSWS --> Enabling LWS_WITH_PLUGINS and LWS_WITH_LIBUV")
@@ -940,7 +959,7 @@ include_directories("${PROJECT_SOURCE_DIR}/lib")
 # Group headers and sources.
 # Some IDEs use this for nicer file structure.
 set(HDR_PRIVATE
-	lib/core/private.h)
+	lib/core/private-lib-core.h)
 
 set(HDR_PUBLIC
 	"${PROJECT_SOURCE_DIR}/include/libwebsockets.h"
@@ -1119,7 +1138,7 @@ if (NOT LWS_WITHOUT_CLIENT)
 	list(APPEND SOURCES
 		lib/core-net/connect.c
 		lib/core-net/client.c
-		lib/roles/http/client/client.c
+		lib/roles/http/client/client-http.c
 		lib/roles/http/client/client-handshake.c)
 endif()
 
@@ -1185,12 +1204,12 @@ if (LWS_WITH_SSL)
 		
 	if (LWS_WITH_MBEDTLS)
 		list(APPEND SOURCES
-			lib/tls/mbedtls/tls.c
-			lib/tls/mbedtls/x509.c
+			lib/tls/mbedtls/mbedtls-tls.c
+			lib/tls/mbedtls/mbedtls-x509.c
 		)
 		if (LWS_WITH_NETWORK)
 			list(APPEND SOURCES
-				lib/tls/mbedtls/ssl.c
+				lib/tls/mbedtls/mbedtls-ssl.c
 			)
 		endif()
 		if (LWS_WITH_GENCRYPTO)
@@ -1205,12 +1224,12 @@ if (LWS_WITH_SSL)
 		endif()
 	else()
 		list(APPEND SOURCES
-			lib/tls/openssl/tls.c
-			lib/tls/openssl/x509.c
+			lib/tls/openssl/openssl-tls.c
+			lib/tls/openssl/openssl-x509.c
 		)
 		if (LWS_WITH_NETWORK)
 			list(APPEND SOURCES
-				lib/tls/openssl/ssl.c
+				lib/tls/openssl/openssl-ssl.c
 			)
 		endif()
 		if (LWS_WITH_GENCRYPTO)
diff --git a/lib/abstract/abstract.c b/lib/abstract/abstract.c
index 174ca0b27..9f40b8257 100644
--- a/lib/abstract/abstract.c
+++ b/lib/abstract/abstract.c
@@ -22,8 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#include <core/private.h>
-#include <abstract/private.h>
+#include <private-lib-core.h>
+#include <private-lib-abstract.h>
 
 extern const lws_abs_transport_t lws_abs_transport_cli_raw_skt,
 				 lws_abs_transport_cli_unit_test;
diff --git a/lib/abstract/private.h b/lib/abstract/private-lib-abstract.h
similarity index 100%
rename from lib/abstract/private.h
rename to lib/abstract/private-lib-abstract.h
diff --git a/lib/abstract/protocols/smtp/smtp.c b/lib/abstract/protocols/smtp/smtp.c
index 33f40b860..1d7d15424 100644
--- a/lib/abstract/protocols/smtp/smtp.c
+++ b/lib/abstract/protocols/smtp/smtp.c
@@ -22,8 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
-#include "abstract/private.h"
+#include "private-lib-core.h"
+#include "private-lib-abstract.h"
 
 /** enum lwsgs_smtp_states - where we are in SMTP protocol sequence */
 typedef enum lwsgs_smtp_states {
diff --git a/lib/abstract/test-sequencer.c b/lib/abstract/test-sequencer.c
index ec5e197e2..574f4ab08 100644
--- a/lib/abstract/test-sequencer.c
+++ b/lib/abstract/test-sequencer.c
@@ -28,7 +28,7 @@
  * for each test using te
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 struct lws_seq_test_sequencer {
 	lws_abs_t			original_abs;
diff --git a/lib/abstract/transports/raw-skt.c b/lib/abstract/transports/raw-skt.c
index 4113b97b5..55b07ab8a 100644
--- a/lib/abstract/transports/raw-skt.c
+++ b/lib/abstract/transports/raw-skt.c
@@ -22,8 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
-#include "abstract/private.h"
+#include "private-lib-core.h"
+#include "private-lib-abstract.h"
 
 typedef struct lws_abstxp_raw_skt_priv {
 	struct lws_abs *abs;
diff --git a/lib/abstract/transports/unit-test.c b/lib/abstract/transports/unit-test.c
index fb1ad926b..cd37ecc10 100644
--- a/lib/abstract/transports/unit-test.c
+++ b/lib/abstract/transports/unit-test.c
@@ -26,8 +26,8 @@
  * to provided canned packets from an array of test vectors.
  */
 
-#include "core/private.h"
-#include "abstract/private.h"
+#include "private-lib-core.h"
+#include "private-lib-abstract.h"
 
 /* this is the transport priv instantiated at abs->ati */
 
diff --git a/lib/core-net/adopt.c b/lib/core-net/adopt.c
index 67fae87b3..114eaf6de 100644
--- a/lib/core-net/adopt.c
+++ b/lib/core-net/adopt.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 static int
 lws_get_idlest_tsi(struct lws_context *context)
diff --git a/lib/core-net/client.c b/lib/core-net/client.c
index a6ef76992..78fd63e8e 100644
--- a/lib/core-net/client.c
+++ b/lib/core-net/client.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 LWS_VISIBLE int
 lws_set_proxy(struct lws_vhost *vhost, const char *proxy)
diff --git a/lib/core-net/close.c b/lib/core-net/close.c
index 4c1391af7..a65a5df87 100644
--- a/lib/core-net/close.c
+++ b/lib/core-net/close.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 void
 __lws_free_wsi(struct lws *wsi)
diff --git a/lib/core-net/connect.c b/lib/core-net/connect.c
index 5db7f9f1c..e1734a309 100644
--- a/lib/core-net/connect.c
+++ b/lib/core-net/connect.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 void
 lws_client_stash_destroy(struct lws *wsi)
diff --git a/lib/core-net/dummy-callback.c b/lib/core-net/dummy-callback.c
index 0d918f447..978b2bb7f 100644
--- a/lib/core-net/dummy-callback.c
+++ b/lib/core-net/dummy-callback.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #if defined(LWS_WITH_HTTP_PROXY)
 static int
diff --git a/lib/core-net/lws-dsh.c b/lib/core-net/lws-dsh.c
index 19645cd20..fc5183567 100644
--- a/lib/core-net/lws-dsh.c
+++ b/lib/core-net/lws-dsh.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 struct lws_dsh_search {
 	size_t		required;
diff --git a/lib/core-net/network.c b/lib/core-net/network.c
index af1bbd34b..4db42bf87 100644
--- a/lib/core-net/network.c
+++ b/lib/core-net/network.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #if !defined(LWS_WITH_ESP32) && !defined(LWS_PLAT_OPTEE)
 static int
diff --git a/lib/core-net/output.c b/lib/core-net/output.c
index 40cb44f04..9e80f28e9 100644
--- a/lib/core-net/output.c
+++ b/lib/core-net/output.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /*
  * notice this returns number of bytes consumed, or -1
diff --git a/lib/core-net/pollfd.c b/lib/core-net/pollfd.c
index 735cce830..a335fe64c 100644
--- a/lib/core-net/pollfd.c
+++ b/lib/core-net/pollfd.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int
 _lws_change_pollfd(struct lws *wsi, int _and, int _or, struct lws_pollargs *pa)
diff --git a/lib/core-net/private.h b/lib/core-net/private-lib-core-net.h
similarity index 99%
rename from lib/core-net/private.h
rename to lib/core-net/private-lib-core-net.h
index cedfb30c7..b25011d66 100644
--- a/lib/core-net/private.h
+++ b/lib/core-net/private-lib-core-net.h
@@ -29,7 +29,7 @@
 #define _POSIX_C_SOURCE 200112L
 #endif
 
-#include "roles/private.h"
+#include "private-lib-roles.h"
 
 #ifdef LWS_WITH_IPV6
 #if defined(WIN32) || defined(_WIN32)
diff --git a/lib/core-net/sequencer.c b/lib/core-net/sequencer.c
index 38d4128ca..d2da6ba3c 100644
--- a/lib/core-net/sequencer.c
+++ b/lib/core-net/sequencer.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /*
  * per pending event
diff --git a/lib/core-net/server.c b/lib/core-net/server.c
index 85a4df650..d92fdd6a5 100644
--- a/lib/core-net/server.c
+++ b/lib/core-net/server.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #if defined(LWS_WITH_SERVER_STATUS)
 
diff --git a/lib/core-net/service.c b/lib/core-net/service.c
index 87485bc30..708293738 100644
--- a/lib/core-net/service.c
+++ b/lib/core-net/service.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int
 lws_callback_as_writeable(struct lws *wsi)
diff --git a/lib/core-net/sorted-usec-list.c b/lib/core-net/sorted-usec-list.c
index 7ca04fdb7..c54780725 100644
--- a/lib/core-net/sorted-usec-list.c
+++ b/lib/core-net/sorted-usec-list.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 static int
 sul_compare(const lws_dll2_t *d, const lws_dll2_t *i)
diff --git a/lib/core-net/stats.c b/lib/core-net/stats.c
index 9382315ee..bf740be1a 100644
--- a/lib/core-net/stats.c
+++ b/lib/core-net/stats.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #if defined(LWS_WITH_STATS)
 
diff --git a/lib/core-net/vhost.c b/lib/core-net/vhost.c
index 811250620..d4946e3cd 100644
--- a/lib/core-net/vhost.c
+++ b/lib/core-net/vhost.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 const struct lws_role_ops *available_roles[] = {
 #if defined(LWS_ROLE_H2)
diff --git a/lib/core-net/wsi-timeout.c b/lib/core-net/wsi-timeout.c
index 46f9a234d..d5ad2a253 100644
--- a/lib/core-net/wsi-timeout.c
+++ b/lib/core-net/wsi-timeout.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 void
 __lws_wsi_remove_from_sul(struct lws *wsi)
diff --git a/lib/core-net/wsi.c b/lib/core-net/wsi.c
index 4355df42b..2660d4585 100644
--- a/lib/core-net/wsi.c
+++ b/lib/core-net/wsi.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #if defined (_DEBUG)
 void lwsi_set_role(struct lws *wsi, lws_wsi_state_t role)
diff --git a/lib/core/alloc.c b/lib/core/alloc.c
index 09d8882b0..a0738a79e 100644
--- a/lib/core/alloc.c
+++ b/lib/core/alloc.c
@@ -1,4 +1,4 @@
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #if defined(LWS_HAVE_MALLOC_USABLE_SIZE)
 
diff --git a/lib/core/buflist.c b/lib/core/buflist.c
index 463dc4fe9..723bb5bb1 100644
--- a/lib/core/buflist.c
+++ b/lib/core/buflist.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #ifdef LWS_HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/core/context.c b/lib/core/context.c
index 2fa0ce148..a74fc746f 100644
--- a/lib/core/context.c
+++ b/lib/core/context.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #ifndef LWS_BUILD_HASH
 #define LWS_BUILD_HASH "unknown-build-hash"
@@ -152,7 +152,11 @@ lwsl_info("context created\n");
 #endif
 
 #if defined(LWS_WITH_ESP32)
+#if defined(LWS_AMAZON_RTOS)
+	context->last_free_heap = xPortGetFreeHeapSize();
+#else
 	context->last_free_heap = esp_get_free_heap_size();
+#endif
 #endif
 
 	/* default to just the platform fops implementation */
diff --git a/lib/core/libwebsockets.c b/lib/core/libwebsockets.c
index f1b8664fa..f8f5f84e2 100644
--- a/lib/core/libwebsockets.c
+++ b/lib/core/libwebsockets.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #ifdef LWS_HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/core/logs.c b/lib/core/logs.c
index f18d1d569..9e598e031 100644
--- a/lib/core/logs.c
+++ b/lib/core/logs.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #ifdef LWS_HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/core/lws_dll.c b/lib/core/lws_dll.c
index 18e022e8f..09c3ec824 100644
--- a/lib/core/lws_dll.c
+++ b/lib/core/lws_dll.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #ifdef LWS_HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/core/lws_dll2.c b/lib/core/lws_dll2.c
index 3ffebca3f..3ce4104a6 100644
--- a/lib/core/lws_dll2.c
+++ b/lib/core/lws_dll2.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #ifdef LWS_HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/core/private.h b/lib/core/private-lib-core.h
similarity index 98%
rename from lib/core/private.h
rename to lib/core/private-lib-core.h
index a3485c138..6b30b5ca2 100644
--- a/lib/core/private.h
+++ b/lib/core/private-lib-core.h
@@ -111,15 +111,15 @@
   */
 
 #if defined(LWS_WITH_ESP32)
- #include "plat/esp32/private.h"
+ #include "private-lib-plat-esp32.h"
 #else
  #if defined(WIN32) || defined(_WIN32)
-  #include "plat/windows/private.h"
+  #include "private-lib-plat-windows.h"
  #else
   #if defined(LWS_PLAT_OPTEE)
-   #include "plat/optee/private.h"
+   #include "private-lib-plat.h"
   #else
-   #include "plat/unix/private.h"
+   #include "private-lib-plat-unix.h"
   #endif
  #endif
 #endif
@@ -132,7 +132,7 @@
 
 #include "libwebsockets.h"
 
-#include "tls/private.h"
+#include "private-lib-tls.h"
 
 #if defined(WIN32) || defined(_WIN32)
 	 // Visual studio older than 2015 and WIN_CE has only _stricmp
@@ -178,7 +178,7 @@ struct lws_protocols;
 struct lws;
 
 #if defined(LWS_WITH_NETWORK)
-#include "event-libs/private.h"
+#include "private-lib-event-libs.h"
 
 
 struct lws_io_watcher {
@@ -241,7 +241,7 @@ lws_mutex_refcount_unlock(struct lws_mutex_refcount *mr);
 #endif
 
 #if defined(LWS_WITH_NETWORK)
-#include "core-net/private.h"
+#include "private-lib-core-net.h"
 #endif
 
 struct lws_deferred_free
diff --git a/lib/core/vfs.c b/lib/core/vfs.c
index fa837353d..b66a9243c 100644
--- a/lib/core/vfs.c
+++ b/lib/core/vfs.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 LWS_VISIBLE LWS_EXTERN void
 lws_set_fops(struct lws_context *context, const struct lws_plat_file_ops *fops)
diff --git a/lib/event-libs/README.md b/lib/event-libs/README.md
index ccfbb7c50..1fab4f424 100644
--- a/lib/event-libs/README.md
+++ b/lib/event-libs/README.md
@@ -24,7 +24,7 @@ If the event lib is disabled in cmake, nothing in its directory is built or refe
 
 ### Event loop ops struct
 
-The event lib support is defined by `struct lws_event_loop_ops` in `lib/event-libs/private.h`,
+The event lib support is defined by `struct lws_event_loop_ops` in `lib/event-libs/private-lib-event-libs.h`,
 each event lib support instantiates one of these and fills in the appropriate ops
 callbacks to perform its job.  By convention that lives in
 `./lib/event-libs/**lib name**/**lib_name**.c`.
@@ -34,15 +34,15 @@ callbacks to perform its job.  By convention that lives in
 Truly private declarations for the event lib can go in the event-libs directory as you like.
 However when the declarations must be accessible to other things in lws build, eg,
 the event lib support adds members to `struct lws` when enabled, they should be in the
-event lib supporr directory in a file `private.h`.
+event lib support directory in a file `private-lib-event-libs-myeventlib.h`.
 
-Search for "bring in event libs private declarations" in `./lib/core/private.h
+Search for "bring in event libs private declarations" in `./lib/core/private-lib-core.h
 and add your private event lib support file there following the style used for the other
 event libs, eg,
 
 ```
 #if defined(LWS_WITH_LIBUV)
- #include "event-libs/libuv/private.h"
+ #include "event-libs/libuv/private-lib-event-libs-libuv.h"
 #endif
 ```
 
diff --git a/lib/event-libs/libev/libev.c b/lib/event-libs/libev/libev.c
index 75739d5b4..106024901 100644
--- a/lib/event-libs/libev/libev.c
+++ b/lib/event-libs/libev/libev.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 static void
 lws_ev_hrtimer_cb(struct ev_loop *loop, struct ev_timer *watcher, int revents)
diff --git a/lib/event-libs/libev/private.h b/lib/event-libs/libev/private-lib-event-libs-libev.h
similarity index 100%
rename from lib/event-libs/libev/private.h
rename to lib/event-libs/libev/private-lib-event-libs-libev.h
diff --git a/lib/event-libs/libevent/libevent.c b/lib/event-libs/libevent/libevent.c
index 516a8aab5..00720a7ad 100644
--- a/lib/event-libs/libevent/libevent.c
+++ b/lib/event-libs/libevent/libevent.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 static void
 lws_event_hrtimer_cb(int fd, short event, void *p)
diff --git a/lib/event-libs/libevent/private.h b/lib/event-libs/libevent/private-lib-event-libs-libevent.h
similarity index 100%
rename from lib/event-libs/libevent/private.h
rename to lib/event-libs/libevent/private-lib-event-libs-libevent.h
diff --git a/lib/event-libs/libuv/libuv.c b/lib/event-libs/libuv/libuv.c
index b1d60219b..63fcf9d58 100644
--- a/lib/event-libs/libuv/libuv.c
+++ b/lib/event-libs/libuv/libuv.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 static void
 lws_uv_sultimer_cb(uv_timer_t *timer
diff --git a/lib/event-libs/libuv/private.h b/lib/event-libs/libuv/private-lib-event-libs-libuv.h
similarity index 100%
rename from lib/event-libs/libuv/private.h
rename to lib/event-libs/libuv/private-lib-event-libs-libuv.h
diff --git a/lib/event-libs/poll/poll.c b/lib/event-libs/poll/poll.c
index ee5098c21..b31da990d 100644
--- a/lib/event-libs/poll/poll.c
+++ b/lib/event-libs/poll/poll.c
@@ -21,10 +21,10 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  *
- *  This is included from core/private.h if LWS_ROLE_WS
+ *  This is included from private-lib-core.h if LWS_ROLE_WS
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 struct lws_event_loop_ops event_loop_ops_poll = {
 	/* name */			"poll",
diff --git a/lib/event-libs/poll/private.h b/lib/event-libs/poll/private-lib-event-libs-poll.h
similarity index 100%
rename from lib/event-libs/poll/private.h
rename to lib/event-libs/poll/private-lib-event-libs-poll.h
diff --git a/lib/event-libs/private.h b/lib/event-libs/private-lib-event-libs.h
similarity index 92%
rename from lib/event-libs/private.h
rename to lib/event-libs/private-lib-event-libs.h
index 377291cde..d756699fa 100644
--- a/lib/event-libs/private.h
+++ b/lib/event-libs/private-lib-event-libs.h
@@ -21,7 +21,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  *
- *  This is included from core/private.h
+ *  This is included from private-lib-core.h
  */
 
 struct lws_event_loop_ops {
@@ -60,18 +60,18 @@ struct lws_event_loop_ops {
 /* bring in event libs private declarations */
 
 #if defined(LWS_WITH_POLL)
-#include "event-libs/poll/private.h"
+#include "private-lib-event-libs-poll.h"
 #endif
 
 #if defined(LWS_WITH_LIBUV)
-#include "event-libs/libuv/private.h"
+#include "private-lib-event-libs-libuv.h"
 #endif
 
 #if defined(LWS_WITH_LIBEVENT)
-#include "event-libs/libevent/private.h"
+#include "private-lib-event-libs-libevent.h"
 #endif
 
 #if defined(LWS_WITH_LIBEV)
-#include "event-libs/libev/private.h"
+#include "private-lib-event-libs-libev.h"
 #endif
 
diff --git a/lib/jose/jwe/enc/aescbc.c b/lib/jose/jwe/enc/aescbc.c
index fd8479879..e462c5040 100644
--- a/lib/jose/jwe/enc/aescbc.c
+++ b/lib/jose/jwe/enc/aescbc.c
@@ -22,8 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
-#include "jose/jwe/private.h"
+#include "private-lib-core.h"
+#include "private-lib-jose-jwe.h"
 
 int
 lws_jwe_encrypt_cbc_hs(struct lws_jwe *jwe, uint8_t *cek,
diff --git a/lib/jose/jwe/enc/aesgcm.c b/lib/jose/jwe/enc/aesgcm.c
index 957774ea1..28488b08e 100644
--- a/lib/jose/jwe/enc/aesgcm.c
+++ b/lib/jose/jwe/enc/aesgcm.c
@@ -22,8 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
-#include "jose/jwe/private.h"
+#include "private-lib-core.h"
+#include "private-lib-jose-jwe.h"
 
 /*
  * NOTICE this is AESGCM content encryption, it's not AES GCM key wrapping
diff --git a/lib/jose/jwe/enc/aeskw.c b/lib/jose/jwe/enc/aeskw.c
index e5f39aade..28b5636ed 100644
--- a/lib/jose/jwe/enc/aeskw.c
+++ b/lib/jose/jwe/enc/aeskw.c
@@ -22,8 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
-#include "jose/jwe/private.h"
+#include "private-lib-core.h"
+#include "private-lib-jose-jwe.h"
 
 /*
  * RFC3394 Key Wrap uses a 128-bit key, and bloats what it is wrapping by
diff --git a/lib/jose/jwe/jwe-ecdh-es-aeskw.c b/lib/jose/jwe/jwe-ecdh-es-aeskw.c
index 0086826d3..bd33b5f74 100644
--- a/lib/jose/jwe/jwe-ecdh-es-aeskw.c
+++ b/lib/jose/jwe/jwe-ecdh-es-aeskw.c
@@ -22,8 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
-#include "jose/jwe/private.h"
+#include "private-lib-core.h"
+#include "private-lib-jose-jwe.h"
 
 /*
  * From RFC7518 JWA
diff --git a/lib/jose/jwe/jwe-rsa-aescbc.c b/lib/jose/jwe/jwe-rsa-aescbc.c
index 497c30ae7..3a6e92690 100644
--- a/lib/jose/jwe/jwe-rsa-aescbc.c
+++ b/lib/jose/jwe/jwe-rsa-aescbc.c
@@ -22,8 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
-#include "jose/jwe/private.h"
+#include "private-lib-core.h"
+#include "private-lib-jose-jwe.h"
 
 /*
  * Requirements on entry:
diff --git a/lib/jose/jwe/jwe-rsa-aesgcm.c b/lib/jose/jwe/jwe-rsa-aesgcm.c
index 7de7e118c..24814d1ec 100644
--- a/lib/jose/jwe/jwe-rsa-aesgcm.c
+++ b/lib/jose/jwe/jwe-rsa-aesgcm.c
@@ -22,8 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
-#include "jose/jwe/private.h"
+#include "private-lib-core.h"
+#include "private-lib-jose-jwe.h"
 
 #define LWS_AESGCM_IV 12
 
diff --git a/lib/jose/jwe/jwe.c b/lib/jose/jwe/jwe.c
index 805b22d03..5c04d950e 100644
--- a/lib/jose/jwe/jwe.c
+++ b/lib/jose/jwe/jwe.c
@@ -22,9 +22,9 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
-#include "jose/private.h"
-#include "jose/jwe/private.h"
+#include "private-lib-core.h"
+#include "private-lib-jose.h"
+#include "private-lib-jose-jwe.h"
 
 /*
  * Currently only support flattened or compact (implicitly single signature)
diff --git a/lib/jose/jwe/private.h b/lib/jose/jwe/private-lib-jose-jwe.h
similarity index 100%
rename from lib/jose/jwe/private.h
rename to lib/jose/jwe/private-lib-jose-jwe.h
diff --git a/lib/jose/jwk/jwk.c b/lib/jose/jwk/jwk.c
index b2cfd4834..4c0c5a2e0 100644
--- a/lib/jose/jwk/jwk.c
+++ b/lib/jose/jwk/jwk.c
@@ -22,8 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
-#include "jose/private.h"
+#include "private-lib-core.h"
+#include "private-lib-jose.h"
 
 #if !defined(LWS_PLAT_OPTEE) && !defined(OPTEE_DEV_KIT)
 #include <fcntl.h>
diff --git a/lib/jose/jws/jose.c b/lib/jose/jws/jose.c
index 38b0edba9..bf0e63be8 100644
--- a/lib/jose/jws/jose.c
+++ b/lib/jose/jws/jose.c
@@ -25,8 +25,8 @@
  * to specify its JOSE JSON object.  So it lives in ./lib/jose/jws/jose.c.
  */
 
-#include "core/private.h"
-#include "jose/private.h"
+#include "private-lib-core.h"
+#include "jose/private-lib-jose.h"
 
 #include <stdint.h>
 
diff --git a/lib/jose/jws/jws.c b/lib/jose/jws/jws.c
index 1d25fd128..b0aecaccd 100644
--- a/lib/jose/jws/jws.c
+++ b/lib/jose/jws/jws.c
@@ -22,8 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
-#include "private.h"
+#include "private-lib-core.h"
+#include "private-lib-jose-jws.h"
 
 /*
  * Currently only support flattened or compact (implicitly single signature)
diff --git a/lib/jose/jws/private.h b/lib/jose/jws/private-lib-jose-jws.h
similarity index 100%
rename from lib/jose/jws/private.h
rename to lib/jose/jws/private-lib-jose-jws.h
diff --git a/lib/jose/private.h b/lib/jose/private-lib-jose.h
similarity index 100%
rename from lib/jose/private.h
rename to lib/jose/private-lib-jose.h
diff --git a/lib/misc/base64-decode.c b/lib/misc/base64-decode.c
index b46a94242..010cc7d71 100644
--- a/lib/misc/base64-decode.c
+++ b/lib/misc/base64-decode.c
@@ -40,7 +40,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "core/private.h"
+#include "private-lib-core.h"
 
 static const char encode_orig[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 			     "abcdefghijklmnopqrstuvwxyz0123456789+/";
diff --git a/lib/misc/daemonize.c b/lib/misc/daemonize.c
index 52fd6ea05..27076e751 100644
--- a/lib/misc/daemonize.c
+++ b/lib/misc/daemonize.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 pid_t pid_daemon;
 static char *lock_path;
diff --git a/lib/misc/dir.c b/lib/misc/dir.c
index 448c63c8b..7f3f333c7 100644
--- a/lib/misc/dir.c
+++ b/lib/misc/dir.c
@@ -26,7 +26,7 @@
 #define _DARWIN_C_SOURCE
 
 #include <libwebsockets.h>
-#include "core/private.h"
+#include "private-lib-core.h"
 #include <string.h>
 #include <stdio.h>
 
diff --git a/lib/misc/diskcache.c b/lib/misc/diskcache.c
index 0fc98a050..a55463c10 100644
--- a/lib/misc/diskcache.c
+++ b/lib/misc/diskcache.c
@@ -25,7 +25,7 @@
 #define _GNU_SOURCE
 #include <pthread.h>
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #include <string.h>
 #include <stdio.h>
diff --git a/lib/misc/fts/private.h b/lib/misc/fts/private-lib-misc-fts.h
similarity index 100%
rename from lib/misc/fts/private.h
rename to lib/misc/fts/private-lib-misc-fts.h
diff --git a/lib/misc/fts/trie-fd.c b/lib/misc/fts/trie-fd.c
index b95f44ac5..5b418d22c 100644
--- a/lib/misc/fts/trie-fd.c
+++ b/lib/misc/fts/trie-fd.c
@@ -22,8 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
-#include "misc/fts/private.h"
+#include "private-lib-core.h"
+#include "private-lib-misc-fts.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/misc/fts/trie.c b/lib/misc/fts/trie.c
index 39b694d21..792cca0ef 100644
--- a/lib/misc/fts/trie.c
+++ b/lib/misc/fts/trie.c
@@ -33,8 +33,8 @@
  *    having to load it all in memory
  */
 
-#include "core/private.h"
-#include "misc/fts/private.h"
+#include "private-lib-core.h"
+#include "private-lib-misc-fts.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/misc/getifaddrs.c b/lib/misc/getifaddrs.c
index 735b899f4..7daeec844 100644
--- a/lib/misc/getifaddrs.c
+++ b/lib/misc/getifaddrs.c
@@ -43,7 +43,7 @@
 #include <string.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #ifdef LWS_HAVE_SYS_SOCKIO_H
 #include <sys/sockio.h>
diff --git a/lib/misc/lejp.c b/lib/misc/lejp.c
index dab2aacb9..7c639fbf4 100644
--- a/lib/misc/lejp.c
+++ b/lib/misc/lejp.c
@@ -23,7 +23,7 @@
  */
 
 #include <libwebsockets.h>
-#include "core/private.h"
+#include "private-lib-core.h"
 #include <string.h>
 #include <stdio.h>
 
diff --git a/lib/misc/lws-ring.c b/lib/misc/lws-ring.c
index 915efb43b..a7c0d6c6f 100644
--- a/lib/misc/lws-ring.c
+++ b/lib/misc/lws-ring.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 LWS_VISIBLE LWS_EXTERN struct lws_ring *
 lws_ring_create(size_t element_len, size_t count,
diff --git a/lib/misc/lws-struct-lejp.c b/lib/misc/lws-struct-lejp.c
index 463ee5e73..d53cb75ab 100644
--- a/lib/misc/lws-struct-lejp.c
+++ b/lib/misc/lws-struct-lejp.c
@@ -23,7 +23,7 @@
  */
 
 #include <libwebsockets.h>
-#include <core/private.h>
+#include <private-lib-core.h>
 
 #include <assert.h>
 
diff --git a/lib/misc/lws-struct-sqlite.c b/lib/misc/lws-struct-sqlite.c
index 79ea24d24..90e191347 100644
--- a/lib/misc/lws-struct-sqlite.c
+++ b/lib/misc/lws-struct-sqlite.c
@@ -23,7 +23,7 @@
  */
 
 #include <libwebsockets.h>
-#include <core/private.h>
+#include <private-lib-core.h>
 
 #include <sqlite3.h>
 
diff --git a/lib/misc/lwsac/cached-file.c b/lib/misc/lwsac/cached-file.c
index f30508d7b..8476c9483 100644
--- a/lib/misc/lwsac/cached-file.c
+++ b/lib/misc/lwsac/cached-file.c
@@ -24,8 +24,8 @@
 
 #if !defined(LWS_PLAT_OPTEE) && !defined(OPTEE_DEV_KIT)
 
-#include "core/private.h"
-#include "misc/lwsac/private.h"
+#include "private-lib-core.h"
+#include "private-lib-misc-lwsac.h"
 
 /*
  * Helper for caching a file in memory in a lac, but also to check at intervals
diff --git a/lib/misc/lwsac/lwsac.c b/lib/misc/lwsac/lwsac.c
index 889aefc4c..c560269f9 100644
--- a/lib/misc/lwsac/lwsac.c
+++ b/lib/misc/lwsac/lwsac.c
@@ -22,8 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
-#include "misc/lwsac/private.h"
+#include "private-lib-core.h"
+#include "private-lib-misc-lwsac.h"
 
 void
 lws_list_ptr_insert(lws_list_ptr *head, lws_list_ptr *add,
diff --git a/lib/misc/lwsac/private.h b/lib/misc/lwsac/private-lib-misc-lwsac.h
similarity index 100%
rename from lib/misc/lwsac/private.h
rename to lib/misc/lwsac/private-lib-misc-lwsac.h
diff --git a/lib/misc/peer-limits.c b/lib/misc/peer-limits.c
index 19b494913..c84b872f0 100644
--- a/lib/misc/peer-limits.c
+++ b/lib/misc/peer-limits.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /* requires context->lock */
 static void
diff --git a/lib/misc/sha-1.c b/lib/misc/sha-1.c
index c17a43729..b38971ffb 100644
--- a/lib/misc/sha-1.c
+++ b/lib/misc/sha-1.c
@@ -32,7 +32,7 @@
  * implemented by Jun-ichiro itojun Itoh <itojun@itojun.org>
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #ifdef LWS_HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/misc/threadpool/threadpool.c b/lib/misc/threadpool/threadpool.c
index 790ee8461..7ac27e369 100644
--- a/lib/misc/threadpool/threadpool.c
+++ b/lib/misc/threadpool/threadpool.c
@@ -25,7 +25,7 @@
 #define _GNU_SOURCE
 #include <pthread.h>
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #include <string.h>
 #include <stdio.h>
diff --git a/lib/plat/esp32/esp32-fds.c b/lib/plat/esp32/esp32-fds.c
index 29336fc30..a63830960 100644
--- a/lib/plat/esp32/esp32-fds.c
+++ b/lib/plat/esp32/esp32-fds.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 void
 lws_plat_insert_socket_into_fds(struct lws_context *context, struct lws *wsi)
diff --git a/lib/plat/esp32/esp32-file.c b/lib/plat/esp32/esp32-file.c
index 56e389b65..cc5494421 100644
--- a/lib/plat/esp32/esp32-file.c
+++ b/lib/plat/esp32/esp32-file.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int lws_plat_apply_FD_CLOEXEC(int n)
 {
diff --git a/lib/plat/esp32/esp32-helpers.c b/lib/plat/esp32/esp32-helpers.c
index 292b230d2..15fa61d46 100644
--- a/lib/plat/esp32/esp32-helpers.c
+++ b/lib/plat/esp32/esp32-helpers.c
@@ -22,9 +22,9 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
-#include "misc/romfs.h"
+#include "romfs.h"
 #include <esp_ota_ops.h>
 #include <tcpip_adapter.h>
 #include <esp_image_format.h>
diff --git a/lib/plat/esp32/esp32-init.c b/lib/plat/esp32/esp32-init.c
index cacb0dc18..0dc74f710 100644
--- a/lib/plat/esp32/esp32-init.c
+++ b/lib/plat/esp32/esp32-init.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int
 lws_plat_context_early_init(void)
diff --git a/lib/plat/esp32/esp32-misc.c b/lib/plat/esp32/esp32-misc.c
index c66b4b7f9..2c031e660 100644
--- a/lib/plat/esp32/esp32-misc.c
+++ b/lib/plat/esp32/esp32-misc.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 lws_usec_t
 lws_now_usecs(void)
diff --git a/lib/plat/esp32/esp32-pipe.c b/lib/plat/esp32/esp32-pipe.c
index df865d967..92f99fb83 100644
--- a/lib/plat/esp32/esp32-pipe.c
+++ b/lib/plat/esp32/esp32-pipe.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int
 lws_plat_pipe_create(struct lws *wsi)
diff --git a/lib/plat/esp32/esp32-service.c b/lib/plat/esp32/esp32-service.c
index f708fbd9d..c4114e2dc 100644
--- a/lib/plat/esp32/esp32-service.c
+++ b/lib/plat/esp32/esp32-service.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int
 lws_plat_service(struct lws_context *context, int timeout_ms)
diff --git a/lib/plat/esp32/esp32-sockets.c b/lib/plat/esp32/esp32-sockets.c
index d6d44d631..d162266f9 100644
--- a/lib/plat/esp32/esp32-sockets.c
+++ b/lib/plat/esp32/esp32-sockets.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int
 lws_send_pipe_choked(struct lws *wsi)
diff --git a/lib/plat/esp32/private.h b/lib/plat/esp32/private-lib-plat-esp32.h
similarity index 97%
rename from lib/plat/esp32/private.h
rename to lib/plat/esp32/private-lib-plat-esp32.h
index 1771851f3..9158a48fd 100644
--- a/lib/plat/esp32/private.h
+++ b/lib/plat/esp32/private-lib-plat-esp32.h
@@ -21,7 +21,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  *
- * Included from lib/core/private.h if LWS_WITH_ESP32
+ * Included from lib/private-lib-core.h if LWS_WITH_ESP32
  */
 
 #define MSG_NOSIGNAL 0
diff --git a/lib/plat/optee/lws-plat-optee.c b/lib/plat/optee/lws-plat-optee.c
index 96daf8f12..674cda932 100644
--- a/lib/plat/optee/lws-plat-optee.c
+++ b/lib/plat/optee/lws-plat-optee.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #if !defined(LWS_WITH_NETWORK)
 #include <crypto/crypto.h>
diff --git a/lib/plat/optee/network.c b/lib/plat/optee/network.c
index 1ce4cde36..34441701a 100644
--- a/lib/plat/optee/network.c
+++ b/lib/plat/optee/network.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 
 int
diff --git a/lib/plat/optee/private.h b/lib/plat/optee/private-lib-plat-optee.h
similarity index 97%
rename from lib/plat/optee/private.h
rename to lib/plat/optee/private-lib-plat-optee.h
index 1112921d4..9fb570fa0 100644
--- a/lib/plat/optee/private.h
+++ b/lib/plat/optee/private-lib-plat-optee.h
@@ -21,7 +21,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  *
- * Included from lib/core/private.h if LWS_WITH_OPTEE
+ * Included from lib/private-lib-core.h if LWS_WITH_OPTEE
  */
 
  #include <unistd.h>
diff --git a/lib/plat/unix/private.h b/lib/plat/unix/private-lib-plat-unix.h
similarity index 98%
rename from lib/plat/unix/private.h
rename to lib/plat/unix/private-lib-plat-unix.h
index feabf5e54..8cf0b9d53 100644
--- a/lib/plat/unix/private.h
+++ b/lib/plat/unix/private-lib-plat-unix.h
@@ -21,7 +21,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  *
- *  Included from lib/core/private.h if no explicit platform
+ *  Included from lib/private-lib-core.h if no explicit platform
  */
 
 #include <fcntl.h>
diff --git a/lib/plat/unix/unix-caps.c b/lib/plat/unix/unix-caps.c
index 397942ac3..3647071e2 100644
--- a/lib/plat/unix/unix-caps.c
+++ b/lib/plat/unix/unix-caps.c
@@ -23,7 +23,7 @@
  */
 
 #define _GNU_SOURCE
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #include <pwd.h>
 #include <grp.h>
diff --git a/lib/plat/unix/unix-fds.c b/lib/plat/unix/unix-fds.c
index d749630a5..dd7369f64 100644
--- a/lib/plat/unix/unix-fds.c
+++ b/lib/plat/unix/unix-fds.c
@@ -23,7 +23,7 @@
  */
 
 #define _GNU_SOURCE
-#include "core/private.h"
+#include "private-lib-core.h"
 
 struct lws *
 wsi_from_fd(const struct lws_context *context, int fd)
diff --git a/lib/plat/unix/unix-file.c b/lib/plat/unix/unix-file.c
index e07770793..dbcf41cd1 100644
--- a/lib/plat/unix/unix-file.c
+++ b/lib/plat/unix/unix-file.c
@@ -23,7 +23,7 @@
  */
 
 #define _GNU_SOURCE
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #include <pwd.h>
 #include <grp.h>
diff --git a/lib/plat/unix/unix-init.c b/lib/plat/unix/unix-init.c
index ae5593101..235f1b221 100644
--- a/lib/plat/unix/unix-init.c
+++ b/lib/plat/unix/unix-init.c
@@ -23,7 +23,7 @@
  */
 
 #define _GNU_SOURCE
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #include <pwd.h>
 #include <grp.h>
diff --git a/lib/plat/unix/unix-misc.c b/lib/plat/unix/unix-misc.c
index d6e57c0e0..8667746c8 100644
--- a/lib/plat/unix/unix-misc.c
+++ b/lib/plat/unix/unix-misc.c
@@ -23,7 +23,7 @@
  */
 
 #define _GNU_SOURCE
-#include "core/private.h"
+#include "private-lib-core.h"
 
 lws_usec_t
 lws_now_usecs(void)
diff --git a/lib/plat/unix/unix-pipe.c b/lib/plat/unix/unix-pipe.c
index a700da980..dc684a725 100644
--- a/lib/plat/unix/unix-pipe.c
+++ b/lib/plat/unix/unix-pipe.c
@@ -23,7 +23,7 @@
  */
 
 #define _GNU_SOURCE
-#include "core/private.h"
+#include "private-lib-core.h"
 
 
 int
diff --git a/lib/plat/unix/unix-plugins.c b/lib/plat/unix/unix-plugins.c
index f0e82770e..b34cce53c 100644
--- a/lib/plat/unix/unix-plugins.c
+++ b/lib/plat/unix/unix-plugins.c
@@ -23,7 +23,7 @@
  */
 
 #define _GNU_SOURCE
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #include <pwd.h>
 #include <grp.h>
diff --git a/lib/plat/unix/unix-service.c b/lib/plat/unix/unix-service.c
index 8a2d6398a..6db663721 100644
--- a/lib/plat/unix/unix-service.c
+++ b/lib/plat/unix/unix-service.c
@@ -23,7 +23,7 @@
  */
 
 #define _GNU_SOURCE
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int
 lws_poll_listen_fd(struct lws_pollfd *fd)
diff --git a/lib/plat/unix/unix-sockets.c b/lib/plat/unix/unix-sockets.c
index f359de7a3..9925f58bb 100644
--- a/lib/plat/unix/unix-sockets.c
+++ b/lib/plat/unix/unix-sockets.c
@@ -23,7 +23,7 @@
  */
 
 #define _GNU_SOURCE
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #include <pwd.h>
 #include <grp.h>
diff --git a/lib/plat/windows/private.h b/lib/plat/windows/private-lib-plat-windows.h
similarity index 98%
rename from lib/plat/windows/private.h
rename to lib/plat/windows/private-lib-plat-windows.h
index c4ed4da0f..b74475478 100644
--- a/lib/plat/windows/private.h
+++ b/lib/plat/windows/private-lib-plat-windows.h
@@ -21,7 +21,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  *
- * Included from lib/core/private.h if defined(WIN32) || defined(_WIN32)
+ * Included from lib/private-lib-core.h if defined(WIN32) || defined(_WIN32)
  */
 
  #ifndef WIN32_LEAN_AND_MEAN
diff --git a/lib/plat/windows/windows-fds.c b/lib/plat/windows/windows-fds.c
index 28fbdd48c..2e7d6c9a4 100644
--- a/lib/plat/windows/windows-fds.c
+++ b/lib/plat/windows/windows-fds.c
@@ -25,7 +25,7 @@
 #ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
 #define _WINSOCK_DEPRECATED_NO_WARNINGS
 #endif
-#include "core/private.h"
+#include "private-lib-core.h"
 
 struct lws *
 wsi_from_fd(const struct lws_context *context, lws_sockfd_type fd)
diff --git a/lib/plat/windows/windows-file.c b/lib/plat/windows/windows-file.c
index 25e3f2a55..3b9c1462a 100644
--- a/lib/plat/windows/windows-file.c
+++ b/lib/plat/windows/windows-file.c
@@ -25,7 +25,7 @@
 #ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
 #define _WINSOCK_DEPRECATED_NO_WARNINGS
 #endif
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int lws_plat_apply_FD_CLOEXEC(int n)
 {
diff --git a/lib/plat/windows/windows-init.c b/lib/plat/windows/windows-init.c
index f192b2a63..d6139f499 100644
--- a/lib/plat/windows/windows-init.c
+++ b/lib/plat/windows/windows-init.c
@@ -25,7 +25,7 @@
 #ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
 #define _WINSOCK_DEPRECATED_NO_WARNINGS
 #endif
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int
 lws_plat_drop_app_privileges(struct lws_context *context, int actually_set)
diff --git a/lib/plat/windows/windows-misc.c b/lib/plat/windows/windows-misc.c
index f3527a16f..7a7c824bb 100644
--- a/lib/plat/windows/windows-misc.c
+++ b/lib/plat/windows/windows-misc.c
@@ -25,7 +25,7 @@
 #ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
 #define _WINSOCK_DEPRECATED_NO_WARNINGS
 #endif
-#include "core/private.h"
+#include "private-lib-core.h"
 
 
 lws_usec_t
diff --git a/lib/plat/windows/windows-pipe.c b/lib/plat/windows/windows-pipe.c
index ef6af4220..b2bb12e0c 100644
--- a/lib/plat/windows/windows-pipe.c
+++ b/lib/plat/windows/windows-pipe.c
@@ -25,7 +25,7 @@
 #ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
 #define _WINSOCK_DEPRECATED_NO_WARNINGS
 #endif
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int
 lws_plat_pipe_create(struct lws *wsi)
diff --git a/lib/plat/windows/windows-plugins.c b/lib/plat/windows/windows-plugins.c
index 8d03bd15b..c30bd83ec 100644
--- a/lib/plat/windows/windows-plugins.c
+++ b/lib/plat/windows/windows-plugins.c
@@ -25,7 +25,7 @@
 #ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
 #define _WINSOCK_DEPRECATED_NO_WARNINGS
 #endif
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int
 lws_plat_plugins_init(struct lws_context * context, const char * const *d)
diff --git a/lib/plat/windows/windows-service.c b/lib/plat/windows/windows-service.c
index b71281834..4e4212454 100644
--- a/lib/plat/windows/windows-service.c
+++ b/lib/plat/windows/windows-service.c
@@ -25,7 +25,7 @@
 #ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
 #define _WINSOCK_DEPRECATED_NO_WARNINGS
 #endif
-#include "core/private.h"
+#include "private-lib-core.h"
 
 
 LWS_EXTERN int
diff --git a/lib/plat/windows/windows-sockets.c b/lib/plat/windows/windows-sockets.c
index fd82a8db6..5b26bf91d 100644
--- a/lib/plat/windows/windows-sockets.c
+++ b/lib/plat/windows/windows-sockets.c
@@ -25,7 +25,7 @@
 #ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
 #define _WINSOCK_DEPRECATED_NO_WARNINGS
 #endif
-#include "core/private.h"
+#include "private-lib-core.h"
 
 
 LWS_VISIBLE int
diff --git a/lib/roles/README.md b/lib/roles/README.md
index 7905cfa08..d0dd21c40 100644
--- a/lib/roles/README.md
+++ b/lib/roles/README.md
@@ -54,7 +54,7 @@ If the role is disabled in cmake, nothing in its directory is built.
 
 ### Role ops struct
 
-The role is defined by `struct lws_role_ops` in `lib/roles/private.h`,
+The role is defined by `struct lws_role_ops` in `lib/roles/private-lib-roles.h`,
 each role instantiates one of these and fills in the appropriate ops
 callbacks to perform its job.  By convention that lives in
 `./lib/roles/**role name**/ops-**role_name**.c`.
@@ -64,15 +64,15 @@ callbacks to perform its job.  By convention that lives in
 Truly private declarations for the role can go in the role directory as you like.
 However when the declarations must be accessible to other things in lws build, eg,
 the role adds members to `struct lws` when enabled, they should be in the role
-directory in a file `private.h`.
+directory in a file `private-lib-roles-myrole.h`.
 
-Search for "bring in role private declarations" in `./lib/roles/private.h
+Search for "bring in role private declarations" in `./lib/roles/private-lib-roles.h
 and add your private role file there following the style used for the other roles,
 eg,
 
 ```
 #if defined(LWS_ROLE_WS)
- #include "roles/ws/private.h"
+ #include "roles/ws/private-lib-roles-ws.h"
 #else
  #define lwsi_role_ws(wsi) (0)
 #endif
diff --git a/lib/roles/cgi/cgi-server.c b/lib/roles/cgi/cgi-server.c
index 4fc474062..3a2c72298 100644
--- a/lib/roles/cgi/cgi-server.c
+++ b/lib/roles/cgi/cgi-server.c
@@ -24,7 +24,7 @@
 
 #define  _GNU_SOURCE
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #if defined(WIN32) || defined(_WIN32)
 #else
diff --git a/lib/roles/cgi/ops-cgi.c b/lib/roles/cgi/ops-cgi.c
index 8d0335b3e..4479ed811 100644
--- a/lib/roles/cgi/ops-cgi.c
+++ b/lib/roles/cgi/ops-cgi.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 static int
 rops_handle_POLLIN_cgi(struct lws_context_per_thread *pt, struct lws *wsi,
diff --git a/lib/roles/cgi/private.h b/lib/roles/cgi/private-lib-roles-cgi.h
similarity index 97%
rename from lib/roles/cgi/private.h
rename to lib/roles/cgi/private-lib-roles-cgi.h
index 7ca3317bf..bffc706e7 100644
--- a/lib/roles/cgi/private.h
+++ b/lib/roles/cgi/private-lib-roles-cgi.h
@@ -21,7 +21,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  *
- * This is included from core/private.h if LWS_ROLE_WS
+ * This is included from private-lib-core.h if LWS_ROLE_WS
  */
 
 #if defined(LWS_WITH_ZLIB)
diff --git a/lib/roles/dbus/dbus.c b/lib/roles/dbus/dbus.c
index dd6867324..2dbc8f3d5 100644
--- a/lib/roles/dbus/dbus.c
+++ b/lib/roles/dbus/dbus.c
@@ -35,7 +35,7 @@
  * worries we create a new shadow wsi until it looks like it is closing again.
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 #include <libwebsockets/lws-dbus.h>
 
diff --git a/lib/roles/dbus/private.h b/lib/roles/dbus/private-lib-roles-dbus.h
similarity index 96%
rename from lib/roles/dbus/private.h
rename to lib/roles/dbus/private-lib-roles-dbus.h
index afc2d4642..eb75d9fdd 100644
--- a/lib/roles/dbus/private.h
+++ b/lib/roles/dbus/private-lib-roles-dbus.h
@@ -21,7 +21,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  *
- * This is included from core/private.h if LWS_ROLE_DBUS
+ * This is included from private-lib-core.h if LWS_ROLE_DBUS
  */
 
 #include <dbus/dbus.h>
diff --git a/lib/roles/h1/ops-h1.c b/lib/roles/h1/ops-h1.c
index 6ed314b4b..1ba6a66a8 100644
--- a/lib/roles/h1/ops-h1.c
+++ b/lib/roles/h1/ops-h1.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 #ifndef min
 #define min(a, b) ((a) < (b) ? (a) : (b))
diff --git a/lib/roles/h1/private.h b/lib/roles/h1/private-lib-roles-h1.h
similarity index 95%
rename from lib/roles/h1/private.h
rename to lib/roles/h1/private-lib-roles-h1.h
index 216ff1082..7b1ebbffe 100644
--- a/lib/roles/h1/private.h
+++ b/lib/roles/h1/private-lib-roles-h1.h
@@ -21,7 +21,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  *
- *  This is included from core/private.h if LWS_ROLE_H1
+ *  This is included from private-lib-core.h if LWS_ROLE_H1
  *
  *  Most of the h1 business is defined in the h1 / h2 common roles/http dir
  */
diff --git a/lib/roles/h2/hpack.c b/lib/roles/h2/hpack.c
index 8e39296a3..01dd47595 100644
--- a/lib/roles/h2/hpack.c
+++ b/lib/roles/h2/hpack.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /*
  * Official static header table for HPACK
diff --git a/lib/roles/h2/http2.c b/lib/roles/h2/http2.c
index 7bc159a5e..1295a21d0 100644
--- a/lib/roles/h2/http2.c
+++ b/lib/roles/h2/http2.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /*
  * bitmap of control messages that are valid to receive for each http2 state
diff --git a/lib/roles/h2/ops-h2.c b/lib/roles/h2/ops-h2.c
index 8d56f43cc..92f5d59fa 100644
--- a/lib/roles/h2/ops-h2.c
+++ b/lib/roles/h2/ops-h2.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 /*
  * These are the standardized defaults.
diff --git a/lib/roles/h2/private.h b/lib/roles/h2/private-lib-roles-h2.h
similarity index 100%
rename from lib/roles/h2/private.h
rename to lib/roles/h2/private-lib-roles-h2.h
diff --git a/lib/roles/http/client/client-handshake.c b/lib/roles/http/client/client-handshake.c
index 1023c5572..42ac989ec 100644
--- a/lib/roles/http/client/client-handshake.c
+++ b/lib/roles/http/client/client-handshake.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 static int
 lws_getaddrinfo46(struct lws *wsi, const char *ads, struct addrinfo **result)
diff --git a/lib/roles/http/client/client.c b/lib/roles/http/client/client-http.c
similarity index 99%
rename from lib/roles/http/client/client.c
rename to lib/roles/http/client/client-http.c
index a464cd31d..771b42eee 100644
--- a/lib/roles/http/client/client.c
+++ b/lib/roles/http/client/client-http.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 LWS_VISIBLE LWS_EXTERN void
 lws_client_http_body_pending(struct lws *wsi, int something_left_to_send)
diff --git a/lib/roles/http/compression/README.md b/lib/roles/http/compression/README.md
index 8d9d57f85..ad42872a8 100644
--- a/lib/roles/http/compression/README.md
+++ b/lib/roles/http/compression/README.md
@@ -6,7 +6,7 @@ specifically HTTP content streams, after the header, be it h1 or h2.
 
 The compression transforms expose an "ops" type struct and a compressor name
 as used by `content-encoding`... the ops struct definition can be found in
-./private.h.
+./private-lib-roles-http-compression.h.
 
 Because the compression transform depends on being able to send on its output
 before it can process new input, the transform adds a new kind of buflist
diff --git a/lib/roles/http/compression/brotli/brotli.c b/lib/roles/http/compression/brotli/brotli.c
index e491d3e8b..c95f5e029 100644
--- a/lib/roles/http/compression/brotli/brotli.c
+++ b/lib/roles/http/compression/brotli/brotli.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 static int
 lcs_init_compression_brotli(lws_comp_ctx_t *ctx, int decomp)
diff --git a/lib/roles/http/compression/deflate/deflate.c b/lib/roles/http/compression/deflate/deflate.c
index 69921a5bf..d09340619 100644
--- a/lib/roles/http/compression/deflate/deflate.c
+++ b/lib/roles/http/compression/deflate/deflate.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 static int
 lcs_init_compression_deflate(lws_comp_ctx_t *ctx, int decomp)
diff --git a/lib/roles/http/compression/private.h b/lib/roles/http/compression/private-lib-roles-http-compression.h
similarity index 97%
rename from lib/roles/http/compression/private.h
rename to lib/roles/http/compression/private-lib-roles-http-compression.h
index 712e2274b..5226f4aa5 100644
--- a/lib/roles/http/compression/private.h
+++ b/lib/roles/http/compression/private-lib-roles-http-compression.h
@@ -21,7 +21,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  *
- *  This is included from core/private.h if LWS_WITH_HTTP_STREAM_COMPRESSION
+ *  This is included from private-lib-core.h if LWS_WITH_HTTP_STREAM_COMPRESSION
  */
 
 #if defined(LWS_WITH_MINIZ)
diff --git a/lib/roles/http/compression/stream.c b/lib/roles/http/compression/stream.c
index 4f0509294..07761bd36 100644
--- a/lib/roles/http/compression/stream.c
+++ b/lib/roles/http/compression/stream.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /* compression methods listed in order of preference */
 
diff --git a/lib/roles/http/header.c b/lib/roles/http/header.c
index 0516529bc..14fc3ef05 100644
--- a/lib/roles/http/header.c
+++ b/lib/roles/http/header.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 #include "lextable-strings.h"
 
 
diff --git a/lib/roles/http/private.h b/lib/roles/http/private-lib-roles-http.h
similarity index 98%
rename from lib/roles/http/private.h
rename to lib/roles/http/private-lib-roles-http.h
index f59ca50a5..120e7409d 100644
--- a/lib/roles/http/private.h
+++ b/lib/roles/http/private-lib-roles-http.h
@@ -21,7 +21,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  *
- *  This is included from core/private.h if either H1 or H2 roles are
+ *  This is included from private-lib-core.h if either H1 or H2 roles are
  *  enabled
  */
 
@@ -31,7 +31,7 @@
  #endif
 
 #if defined(LWS_WITH_HTTP_STREAM_COMPRESSION)
-#include "roles/http/compression/private.h"
+#include "private-lib-roles-http-compression.h"
 #endif
 
 #define lwsi_role_http(wsi) (lwsi_role_h1(wsi) || lwsi_role_h2(wsi))
diff --git a/lib/roles/http/server/access-log.c b/lib/roles/http/server/access-log.c
index 97a111c78..c76e6564e 100644
--- a/lib/roles/http/server/access-log.c
+++ b/lib/roles/http/server/access-log.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /*
  * Produce Apache-compatible log string for wsi, like this:
diff --git a/lib/roles/http/server/fops-zip.c b/lib/roles/http/server/fops-zip.c
index a9cf01af9..d79dacbec 100644
--- a/lib/roles/http/server/fops-zip.c
+++ b/lib/roles/http/server/fops-zip.c
@@ -33,7 +33,7 @@
  * Somewhat rewritten by AG
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #if defined(LWS_WITH_MINIZ)
 #include <miniz.h>
diff --git a/lib/roles/http/server/lejp-conf.c b/lib/roles/http/server/lejp-conf.c
index 8b70edc1f..9dc4c5ee2 100644
--- a/lib/roles/http/server/lejp-conf.c
+++ b/lib/roles/http/server/lejp-conf.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #ifndef _WIN32
 /* this is needed for Travis CI */
diff --git a/lib/roles/http/server/lws-spa.c b/lib/roles/http/server/lws-spa.c
index 4f13d9bcd..d45e54f76 100644
--- a/lib/roles/http/server/lws-spa.c
+++ b/lib/roles/http/server/lws-spa.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #define LWS_MAX_ELEM_NAME 32
 
diff --git a/lib/roles/http/server/parsers.c b/lib/roles/http/server/parsers.c
index eba53c1ec..4a4864ddd 100644
--- a/lib/roles/http/server/parsers.c
+++ b/lib/roles/http/server/parsers.c
@@ -22,14 +22,10 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 static const unsigned char lextable[] = {
-#if defined(LWS_AMAZON_RTOS) || defined(LWS_AMAZON_LINUX)
-	#include "roles/http/lextable.h"
-#else
-	#include "../lextable.h"
-#endif
+	#include "lextable.h"
 };
 
 #define FAIL_CHAR 0x08
diff --git a/lib/roles/http/server/ranges.c b/lib/roles/http/server/ranges.c
index 2011749f7..e1adddbd4 100644
--- a/lib/roles/http/server/ranges.c
+++ b/lib/roles/http/server/ranges.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /*
  * RFC7233 examples
diff --git a/lib/roles/http/server/rewrite.c b/lib/roles/http/server/rewrite.c
index eca443a24..272fb12f9 100644
--- a/lib/roles/http/server/rewrite.c
+++ b/lib/roles/http/server/rewrite.c
@@ -1,4 +1,4 @@
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #if defined(LWS_WITH_HUBBUB)
 
diff --git a/lib/roles/http/server/server.c b/lib/roles/http/server/server.c
index 0791f6805..8c9a5195c 100644
--- a/lib/roles/http/server/server.c
+++ b/lib/roles/http/server/server.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 const char * const method_names[] = {
 	"GET", "POST", "OPTIONS", "PUT", "PATCH", "DELETE", "CONNECT", "HEAD",
diff --git a/lib/roles/listen/ops-listen.c b/lib/roles/listen/ops-listen.c
index 6e97c022a..be5783313 100644
--- a/lib/roles/listen/ops-listen.c
+++ b/lib/roles/listen/ops-listen.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 static int
 rops_handle_POLLIN_listen(struct lws_context_per_thread *pt, struct lws *wsi,
diff --git a/lib/roles/pipe/ops-pipe.c b/lib/roles/pipe/ops-pipe.c
index d9ba5ea83..5736f54df 100644
--- a/lib/roles/pipe/ops-pipe.c
+++ b/lib/roles/pipe/ops-pipe.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 static int
 rops_handle_POLLIN_pipe(struct lws_context_per_thread *pt, struct lws *wsi,
diff --git a/lib/roles/private.h b/lib/roles/private-lib-roles.h
similarity index 97%
rename from lib/roles/private.h
rename to lib/roles/private-lib-roles.h
index 69bab7f88..898b9a061 100644
--- a/lib/roles/private.h
+++ b/lib/roles/private-lib-roles.h
@@ -274,43 +274,43 @@ extern struct lws_role_ops role_ops_raw_skt, role_ops_raw_file, role_ops_listen,
 /* bring in role private declarations */
 
 #if defined(LWS_ROLE_H1) || defined(LWS_ROLE_H2)
- #include "roles/http/private.h"
+ #include "private-lib-roles-http.h"
 #else
  #define lwsi_role_http(wsi) (0)
 #endif
 
 #if defined(LWS_ROLE_H1)
- #include "roles/h1/private.h"
+ #include "private-lib-roles-h1.h"
 #else
  #define lwsi_role_h1(wsi) (0)
 #endif
 
 #if defined(LWS_ROLE_H2)
- #include "roles/h2/private.h"
+ #include "private-lib-roles-h2.h"
 #else
  #define lwsi_role_h2(wsi) (0)
 #endif
 
 #if defined(LWS_ROLE_WS)
- #include "roles/ws/private.h"
+ #include "private-lib-roles-ws.h"
 #else
  #define lwsi_role_ws(wsi) (0)
 #endif
 
 #if defined(LWS_ROLE_CGI)
- #include "roles/cgi/private.h"
+ #include "private-lib-roles-cgi.h"
 #else
  #define lwsi_role_cgi(wsi) (0)
 #endif
 
 #if defined(LWS_ROLE_DBUS)
- #include "roles/dbus/private.h"
+ #include "private-lib-roles-dbus.h"
 #else
  #define lwsi_role_dbus(wsi) (0)
 #endif
 
 #if defined(LWS_ROLE_RAW_PROXY)
- #include "roles/raw-proxy/private.h"
+ #include "private-lib-roles-raw-proxy.h"
 #else
  #define lwsi_role_raw_proxy(wsi) (0)
 #endif
diff --git a/lib/roles/raw-file/ops-raw-file.c b/lib/roles/raw-file/ops-raw-file.c
index ab6c80fa6..66db9389a 100644
--- a/lib/roles/raw-file/ops-raw-file.c
+++ b/lib/roles/raw-file/ops-raw-file.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 static int
 rops_handle_POLLIN_raw_file(struct lws_context_per_thread *pt, struct lws *wsi,
diff --git a/lib/roles/raw-proxy/ops-raw-proxy.c b/lib/roles/raw-proxy/ops-raw-proxy.c
index 84ea7c928..c57c80d21 100644
--- a/lib/roles/raw-proxy/ops-raw-proxy.c
+++ b/lib/roles/raw-proxy/ops-raw-proxy.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 static int
 rops_handle_POLLIN_raw_proxy(struct lws_context_per_thread *pt, struct lws *wsi,
diff --git a/lib/roles/raw-proxy/private.h b/lib/roles/raw-proxy/private-lib-roles-raw-proxy.h
similarity index 95%
rename from lib/roles/raw-proxy/private.h
rename to lib/roles/raw-proxy/private-lib-roles-raw-proxy.h
index fa49cb128..52fc9cd9e 100644
--- a/lib/roles/raw-proxy/private.h
+++ b/lib/roles/raw-proxy/private-lib-roles-raw-proxy.h
@@ -21,7 +21,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  *
- *  This is included from core/private.h if LWS_ROLE_RAW_PROXY
+ *  This is included from private-lib-core.h if LWS_ROLE_RAW_PROXY
  */
 
 extern struct lws_role_ops role_ops_raw_proxy;
diff --git a/lib/roles/raw-skt/ops-raw-skt.c b/lib/roles/raw-skt/ops-raw-skt.c
index 8d8917cb3..9dff8001a 100644
--- a/lib/roles/raw-skt/ops-raw-skt.c
+++ b/lib/roles/raw-skt/ops-raw-skt.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 static int
 rops_handle_POLLIN_raw_skt(struct lws_context_per_thread *pt, struct lws *wsi,
diff --git a/lib/roles/ws/client-parser-ws.c b/lib/roles/ws/client-parser-ws.c
index 5953b90c3..17c0031b3 100644
--- a/lib/roles/ws/client-parser-ws.c
+++ b/lib/roles/ws/client-parser-ws.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /*
  * parsers.c: lws_ws_rx_sm() needs to be roughly kept in
diff --git a/lib/roles/ws/client-ws.c b/lib/roles/ws/client-ws.c
index b4c879e3b..7d70b6a32 100644
--- a/lib/roles/ws/client-ws.c
+++ b/lib/roles/ws/client-ws.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 /*
  * In-place str to lower case
diff --git a/lib/roles/ws/ext/extension-permessage-deflate.c b/lib/roles/ws/ext/extension-permessage-deflate.c
index 9e4a8d90d..b3c3d13f1 100644
--- a/lib/roles/ws/ext/extension-permessage-deflate.c
+++ b/lib/roles/ws/ext/extension-permessage-deflate.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 #include "extension-permessage-deflate.h"
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/roles/ws/ext/extension.c b/lib/roles/ws/ext/extension.c
index 56c39fd82..576cb140b 100644
--- a/lib/roles/ws/ext/extension.c
+++ b/lib/roles/ws/ext/extension.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #include "extension-permessage-deflate.h"
 
diff --git a/lib/roles/ws/ops-ws.c b/lib/roles/ws/ops-ws.c
index ccfee513c..b960bdef3 100644
--- a/lib/roles/ws/ops-ws.c
+++ b/lib/roles/ws/ops-ws.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 #define LWS_CPYAPP(ptr, str) { strcpy(ptr, str); ptr += strlen(str); }
 
diff --git a/lib/roles/ws/private.h b/lib/roles/ws/private-lib-roles-ws.h
similarity index 98%
rename from lib/roles/ws/private.h
rename to lib/roles/ws/private-lib-roles-ws.h
index b1e2e3488..b1cfd8966 100644
--- a/lib/roles/ws/private.h
+++ b/lib/roles/ws/private-lib-roles-ws.h
@@ -21,7 +21,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  *
- *  This is included from core/private.h if LWS_ROLE_WS
+ *  This is included from private-lib-core.h if LWS_ROLE_WS
  */
 
 extern struct lws_role_ops role_ops_ws;
diff --git a/lib/roles/ws/server-ws.c b/lib/roles/ws/server-ws.c
index af7cb4646..18b26e692 100644
--- a/lib/roles/ws/server-ws.c
+++ b/lib/roles/ws/server-ws.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 #define LWS_CPYAPP(ptr, str) { strcpy(ptr, str); ptr += strlen(str); }
 
diff --git a/lib/tls/lws-gencrypto-common.c b/lib/tls/lws-gencrypto-common.c
index 04bcf34e9..18722f37f 100644
--- a/lib/tls/lws-gencrypto-common.c
+++ b/lib/tls/lws-gencrypto-common.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /*
  * These came from RFC7518 (JSON Web Algorithms) Section 3
diff --git a/lib/tls/lws-genec-common.c b/lib/tls/lws-genec-common.c
index c14d30173..b7fdd7fe9 100644
--- a/lib/tls/lws-genec-common.c
+++ b/lib/tls/lws-genec-common.c
@@ -24,7 +24,7 @@
  *  lws_genec provides an EC abstraction api in lws that works the
  *  same whether you are using openssl or mbedtls crypto functions underneath.
  */
-#include "core/private.h"
+#include "private-lib-core.h"
 
 const struct lws_ec_curves *
 lws_genec_curve(const struct lws_ec_curves *table, const char *name)
diff --git a/lib/tls/mbedtls/lws-genaes.c b/lib/tls/mbedtls/lws-genaes.c
index bd11b3fdb..4314f127a 100644
--- a/lib/tls/mbedtls/lws-genaes.c
+++ b/lib/tls/mbedtls/lws-genaes.c
@@ -24,8 +24,8 @@
  *  lws_genaes provides an abstraction api for AES in lws that works the
  *  same whether you are using openssl or mbedtls hash functions underneath.
  */
-#include "core/private.h"
-#include "../../jose/private.h"
+#include "private-lib-core.h"
+#include "../../jose/private-lib-jose.h"
 
 static int operation_map[] = { MBEDTLS_AES_ENCRYPT, MBEDTLS_AES_DECRYPT };
 
diff --git a/lib/tls/mbedtls/lws-gencrypto.c b/lib/tls/mbedtls/lws-gencrypto.c
index 912cf93b6..fb89ab359 100644
--- a/lib/tls/mbedtls/lws-gencrypto.c
+++ b/lib/tls/mbedtls/lws-gencrypto.c
@@ -24,8 +24,8 @@
  *  lws-gencrypto openssl-specific common code
  */
 
-#include "core/private.h"
-#include "tls/mbedtls/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-mbedtls.h"
 
 mbedtls_md_type_t
 lws_gencrypto_mbedtls_hash_to_MD_TYPE(enum lws_genhash_types hash_type)
diff --git a/lib/tls/mbedtls/lws-genec.c b/lib/tls/mbedtls/lws-genec.c
index efe843acf..e63787337 100644
--- a/lib/tls/mbedtls/lws-genec.c
+++ b/lib/tls/mbedtls/lws-genec.c
@@ -24,8 +24,8 @@
  *  lws_genec provides an EC abstraction api in lws that works the
  *  same whether you are using openssl or mbedtls crypto functions underneath.
  */
-#include "core/private.h"
-#include "tls/mbedtls/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-mbedtls.h"
 
 const struct lws_ec_curves lws_ec_curves[] = {
 	/*
diff --git a/lib/tls/mbedtls/lws-genrsa.c b/lib/tls/mbedtls/lws-genrsa.c
index e4c733d66..2134e001d 100644
--- a/lib/tls/mbedtls/lws-genrsa.c
+++ b/lib/tls/mbedtls/lws-genrsa.c
@@ -24,8 +24,8 @@
  *  lws_genrsa provides an RSA abstraction api in lws that works the
  *  same whether you are using openssl or mbedtls crypto functions underneath.
  */
-#include "core/private.h"
-#include "tls/mbedtls/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-mbedtls.h"
 #include <mbedtls/rsa.h>
 
 LWS_VISIBLE void
diff --git a/lib/tls/mbedtls/mbedtls-client.c b/lib/tls/mbedtls/mbedtls-client.c
index 7e28db3c3..ff96bcae3 100644
--- a/lib/tls/mbedtls/mbedtls-client.c
+++ b/lib/tls/mbedtls/mbedtls-client.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 static int
 OpenSSL_client_verify_callback(int preverify_ok, X509_STORE_CTX *x509_ctx)
diff --git a/lib/tls/mbedtls/mbedtls-server.c b/lib/tls/mbedtls/mbedtls-server.c
index 4ae4e631b..b6829c52f 100644
--- a/lib/tls/mbedtls/mbedtls-server.c
+++ b/lib/tls/mbedtls/mbedtls-server.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 #include <mbedtls/x509_csr.h>
 
 int
diff --git a/lib/tls/mbedtls/ssl.c b/lib/tls/mbedtls/mbedtls-ssl.c
similarity index 99%
rename from lib/tls/mbedtls/ssl.c
rename to lib/tls/mbedtls/mbedtls-ssl.c
index 8d422a27d..a0ca73d4c 100644
--- a/lib/tls/mbedtls/ssl.c
+++ b/lib/tls/mbedtls/mbedtls-ssl.c
@@ -22,8 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
-#include "tls/mbedtls/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-mbedtls.h"
 
 
 LWS_VISIBLE void
diff --git a/lib/tls/mbedtls/tls.c b/lib/tls/mbedtls/mbedtls-tls.c
similarity index 96%
rename from lib/tls/mbedtls/tls.c
rename to lib/tls/mbedtls/mbedtls-tls.c
index 69a2bd0a9..6da053d0d 100644
--- a/lib/tls/mbedtls/tls.c
+++ b/lib/tls/mbedtls/mbedtls-tls.c
@@ -22,8 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
-#include "tls/mbedtls/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-mbedtls.h"
 
 void
 lws_tls_err_describe_clear(void)
diff --git a/lib/tls/mbedtls/x509.c b/lib/tls/mbedtls/mbedtls-x509.c
similarity index 99%
rename from lib/tls/mbedtls/x509.c
rename to lib/tls/mbedtls/mbedtls-x509.c
index 53c9ba877..f137a789c 100644
--- a/lib/tls/mbedtls/x509.c
+++ b/lib/tls/mbedtls/mbedtls-x509.c
@@ -22,8 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
-#include "tls/mbedtls/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-mbedtls.h"
 #include <mbedtls/oid.h>
 
 #if defined(LWS_PLAT_OPTEE) || defined(OPTEE_DEV_KIT)
diff --git a/lib/tls/mbedtls/private.h b/lib/tls/mbedtls/private-lib-tls-mbedtls.h
similarity index 100%
rename from lib/tls/mbedtls/private.h
rename to lib/tls/mbedtls/private-lib-tls-mbedtls.h
diff --git a/lib/tls/mbedtls/wrapper/include/internal/ssl_dbg.h b/lib/tls/mbedtls/wrapper/include/internal/ssl_dbg.h
index ad32cb92f..3b342dbed 100644
--- a/lib/tls/mbedtls/wrapper/include/internal/ssl_dbg.h
+++ b/lib/tls/mbedtls/wrapper/include/internal/ssl_dbg.h
@@ -15,7 +15,7 @@
 #ifndef _SSL_DEBUG_H_
 #define _SSL_DEBUG_H_
 
-#include "platform/ssl_port.h"
+#include "ssl_port.h"
 
 #ifdef __cplusplus
  extern "C" {
diff --git a/lib/tls/mbedtls/wrapper/include/internal/ssl_types.h b/lib/tls/mbedtls/wrapper/include/internal/ssl_types.h
index 1f5f94884..bfd5c2e3f 100644
--- a/lib/tls/mbedtls/wrapper/include/internal/ssl_types.h
+++ b/lib/tls/mbedtls/wrapper/include/internal/ssl_types.h
@@ -19,7 +19,7 @@
  extern "C" {
 #endif
 
-//#include "core/private.h"
+//#include "private-lib-core.h"
 #include <lws_config.h>
 #if defined(LWS_WITH_ESP32)
  /* AMAZON RTOS has its own setting via MTK_MBEDTLS_CONFIG_FILE */
diff --git a/lib/tls/mbedtls/wrapper/include/openssl/ssl.h b/lib/tls/mbedtls/wrapper/include/openssl/ssl.h
index 9427283a3..f01e8c355 100755
--- a/lib/tls/mbedtls/wrapper/include/openssl/ssl.h
+++ b/lib/tls/mbedtls/wrapper/include/openssl/ssl.h
@@ -20,8 +20,8 @@
 #endif
 
 #include <stdlib.h>
-#include "internal/ssl_x509.h"
-#include "internal/ssl_pkey.h"
+#include "ssl_x509.h"
+#include "ssl_pkey.h"
 
 /*
 {
diff --git a/lib/tls/mbedtls/wrapper/library/ssl_lib.c b/lib/tls/mbedtls/wrapper/library/ssl_lib.c
index ec46fd827..825be826f 100644
--- a/lib/tls/mbedtls/wrapper/library/ssl_lib.c
+++ b/lib/tls/mbedtls/wrapper/library/ssl_lib.c
@@ -19,7 +19,7 @@
 #include "ssl_dbg.h"
 #include "ssl_port.h"
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 char *
 lws_strncpy(char *dest, const char *src, size_t size);
diff --git a/lib/tls/mbedtls/wrapper/platform/ssl_pm.c b/lib/tls/mbedtls/wrapper/platform/ssl_pm.c
index dea689493..776abf57f 100755
--- a/lib/tls/mbedtls/wrapper/platform/ssl_pm.c
+++ b/lib/tls/mbedtls/wrapper/platform/ssl_pm.c
@@ -25,7 +25,7 @@
 #include "mbedtls/error.h"
 #include "mbedtls/certs.h"
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #define X509_INFO_STRING_LENGTH 8192
 
diff --git a/lib/tls/openssl/lws-genaes.c b/lib/tls/openssl/lws-genaes.c
index 7e3351c1a..0b5fdaa7a 100644
--- a/lib/tls/openssl/lws-genaes.c
+++ b/lib/tls/openssl/lws-genaes.c
@@ -24,8 +24,8 @@
  *  lws_genaes provides an AES abstraction api in lws that works the
  *  same whether you are using openssl or mbedtls hash functions underneath.
  */
-#include "core/private.h"
-#include "../../jose/private.h"
+#include "private-lib-core.h"
+#include "../../jose/private-lib-jose.h"
 
 /*
  * Care: many openssl apis return 1 for success.  These are translated to the
diff --git a/lib/tls/openssl/lws-gencrypto.c b/lib/tls/openssl/lws-gencrypto.c
index 89d1d9f5b..efd5e2029 100644
--- a/lib/tls/openssl/lws-gencrypto.c
+++ b/lib/tls/openssl/lws-gencrypto.c
@@ -24,8 +24,8 @@
  *  lws-gencrypto openssl-specific common code
  */
 
-#include "core/private.h"
-#include "tls/openssl/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-openssl.h"
 
 /*
  * Care: many openssl apis return 1 for success.  These are translated to the
diff --git a/lib/tls/openssl/lws-genec.c b/lib/tls/openssl/lws-genec.c
index c02d42ada..23df7f7ca 100644
--- a/lib/tls/openssl/lws-genec.c
+++ b/lib/tls/openssl/lws-genec.c
@@ -24,8 +24,8 @@
  *  lws_genec provides an EC abstraction api in lws that works the
  *  same whether you are using openssl or mbedtls crypto functions underneath.
  */
-#include "core/private.h"
-#include "tls/openssl/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-openssl.h"
 
 /*
  * Care: many openssl apis return 1 for success.  These are translated to the
diff --git a/lib/tls/openssl/lws-genrsa.c b/lib/tls/openssl/lws-genrsa.c
index 49d0955c3..66fb0df8b 100644
--- a/lib/tls/openssl/lws-genrsa.c
+++ b/lib/tls/openssl/lws-genrsa.c
@@ -24,8 +24,8 @@
  *  lws_genrsa provides an RSA abstraction api in lws that works the
  *  same whether you are using openssl or mbedtls crypto functions underneath.
  */
-#include "core/private.h"
-#include "tls/openssl/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-openssl.h"
 
 /*
  * Care: many openssl apis return 1 for success.  These are translated to the
diff --git a/lib/tls/openssl/openssl-client.c b/lib/tls/openssl/openssl-client.c
index 31f3576fb..744ccb4fb 100644
--- a/lib/tls/openssl/openssl-client.c
+++ b/lib/tls/openssl/openssl-client.c
@@ -22,9 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
-
-#include "tls/openssl/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-openssl.h"
 
 /*
  * Care: many openssl apis return 1 for success.  These are translated to the
diff --git a/lib/tls/openssl/openssl-server.c b/lib/tls/openssl/openssl-server.c
index 178424953..99205c4b6 100644
--- a/lib/tls/openssl/openssl-server.c
+++ b/lib/tls/openssl/openssl-server.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /*
  * Care: many openssl apis return 1 for success.  These are translated to the
diff --git a/lib/tls/openssl/ssl.c b/lib/tls/openssl/openssl-ssl.c
similarity index 99%
rename from lib/tls/openssl/ssl.c
rename to lib/tls/openssl/openssl-ssl.c
index 634419394..3cc1dacfc 100644
--- a/lib/tls/openssl/ssl.c
+++ b/lib/tls/openssl/openssl-ssl.c
@@ -22,8 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
-#include "tls/openssl/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-openssl.h"
 #include <errno.h>
 
 int openssl_websocket_private_data_index,
diff --git a/lib/tls/openssl/tls.c b/lib/tls/openssl/openssl-tls.c
similarity index 98%
rename from lib/tls/openssl/tls.c
rename to lib/tls/openssl/openssl-tls.c
index 1e0dc0988..0b8bfe558 100644
--- a/lib/tls/openssl/tls.c
+++ b/lib/tls/openssl/openssl-tls.c
@@ -22,8 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
-#include "tls/openssl/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-openssl.h"
 
 extern int openssl_websocket_private_data_index,
 openssl_SSL_CTX_private_data_index;
diff --git a/lib/tls/openssl/x509.c b/lib/tls/openssl/openssl-x509.c
similarity index 99%
rename from lib/tls/openssl/x509.c
rename to lib/tls/openssl/openssl-x509.c
index be3eb4da2..f196f22d6 100644
--- a/lib/tls/openssl/x509.c
+++ b/lib/tls/openssl/openssl-x509.c
@@ -22,8 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
-#include "tls/openssl/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-openssl.h"
 
 #if !defined(LWS_PLAT_OPTEE)
 static int
diff --git a/lib/tls/openssl/private.h b/lib/tls/openssl/private-lib-tls-openssl.h
similarity index 100%
rename from lib/tls/openssl/private.h
rename to lib/tls/openssl/private-lib-tls-openssl.h
diff --git a/lib/tls/private.h b/lib/tls/private-lib-tls.h
similarity index 95%
rename from lib/tls/private.h
rename to lib/tls/private-lib-tls.h
index b3efda67a..3dd63d63d 100644
--- a/lib/tls/private.h
+++ b/lib/tls/private-lib-tls.h
@@ -21,7 +21,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  *
- *  This is included from core/private.h if LWS_WITH_TLS
+ *  This is included from private-lib-core.h if LWS_WITH_TLS
  */
 
 #if !defined(__LWS_TLS_PRIVATE_H__)
@@ -63,7 +63,7 @@
   #include <mbedtls/aes.h>
   #include <mbedtls/gcm.h>
   #include <mbedtls/x509_crt.h>
-  #include "tls/mbedtls/wrapper/include/openssl/ssl.h" /* wrapper !!!! */
+  #include "openssl/ssl.h" /* wrapper !!!! */
  #else /* not esp32 */
   #if defined(LWS_WITH_MBEDTLS)
    #include <mbedtls/ssl.h>
@@ -73,7 +73,7 @@
    #include <mbedtls/x509_csr.h>
    #include <mbedtls/ecp.h>
    #include <mbedtls/ecdsa.h>
-   #include "tls/mbedtls/wrapper/include/openssl/ssl.h" /* wrapper !!!! */
+   #include "openssl/ssl.h" /* wrapper !!!! */
   #else
    #include <openssl/ssl.h>
    #include <openssl/evp.h>
@@ -121,7 +121,7 @@ typedef BIO lws_tls_bio;
 typedef X509 lws_tls_x509;
 
 #if defined(LWS_WITH_NETWORK)
-#include "tls/private-network.h"
+#include "private-network.h"
 #endif
 
 LWS_EXTERN int
diff --git a/lib/tls/private-network.h b/lib/tls/private-network.h
index ca0d19f2f..dcd6b9e67 100644
--- a/lib/tls/private-network.h
+++ b/lib/tls/private-network.h
@@ -21,7 +21,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  *
- *  This is included from core/private.h if LWS_WITH_TLS
+ *  This is included from private-lib-core.h if LWS_WITH_TLS
  */
 
 struct lws_context_per_thread;
diff --git a/lib/tls/tls-client.c b/lib/tls/tls-client.c
index af41a11c6..60e4dbb91 100644
--- a/lib/tls/tls-client.c
+++ b/lib/tls/tls-client.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int
 lws_ssl_client_connect1(struct lws *wsi)
diff --git a/lib/tls/tls-network.c b/lib/tls/tls-network.c
index a907efc45..bf985b09d 100644
--- a/lib/tls/tls-network.c
+++ b/lib/tls/tls-network.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /*
  * fakes POLLIN on all tls guys with buffered rx
diff --git a/lib/tls/tls-server.c b/lib/tls/tls-server.c
index a6bb966f3..23def205d 100644
--- a/lib/tls/tls-server.c
+++ b/lib/tls/tls-server.c
@@ -22,7 +22,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #if defined(LWS_WITH_MBEDTLS) || (defined(OPENSSL_VERSION_NUMBER) && \
 				  OPENSSL_VERSION_NUMBER >= 0x10002000L)
diff --git a/lib/tls/tls.c b/lib/tls/tls.c
index 484508a9e..deacd5eee 100644
--- a/lib/tls/tls.c
+++ b/lib/tls/tls.c
@@ -22,8 +22,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "core/private.h"
-#include "tls/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls.h"
 
 #if !defined(LWS_PLAT_OPTEE) && !defined(OPTEE_DEV_KIT)
 #if defined(LWS_WITH_ESP32) && !defined(LWS_AMAZON_RTOS)
@@ -278,11 +278,11 @@ lws_tls_extant(const char *name)
  * 4) LWS_TLS_EXTANT_YES: The certs are present with the correct name and we
  *    have the rights to read them.
  */
-#if !defined(LWS_AMAZON_RTOS)
+
 enum lws_tls_extant
 lws_tls_use_any_upgrade_check_extant(const char *name)
 {
-#if !defined(LWS_PLAT_OPTEE)
+#if !defined(LWS_PLAT_OPTEE) && !defined(LWS_AMAZON_RTOS)
 
 	int n;
 
@@ -335,5 +335,3 @@ lws_tls_use_any_upgrade_check_extant(const char *name)
 #endif
 	return LWS_TLS_EXTANT_YES;
 }
-#endif
-