diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4c51b25..f2a8e174 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 Version 132:
 
 * Tidy up project folders in CMakeLists.txt
+* Rename Cmake variables for clarity
 
 --------------------------------------------------------------------------------
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f5e362c..9c84f30b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -173,19 +173,15 @@ if (OPENSSL_FOUND)
     include_directories (${OPENSSL_INCLUDE_DIR})
 endif()
 
-file (GLOB_RECURSE BOOST_BEAST_INCLUDES
+file (GLOB_RECURSE BOOST_BEAST_FILES
     ${PROJECT_SOURCE_DIR}/include/boost/beast/*.hpp
     ${PROJECT_SOURCE_DIR}/include/boost/beast/*.ipp
 )
 
-file (GLOB_RECURSE COMMON_INCLUDES
+file (GLOB_RECURSE COMMON_FILES
     ${PROJECT_SOURCE_DIR}/example/common/*.hpp
   )
 
-file (GLOB_RECURSE EXAMPLE_INCLUDES
-    ${PROJECT_SOURCE_DIR}/example/*.hpp
-  )
-
 if (Beast_BUILD_EXAMPLES AND
     (NOT "${VARIANT}" STREQUAL "coverage") AND
     (NOT "${VARIANT}" STREQUAL "ubasan"))
diff --git a/example/advanced/server-flex/CMakeLists.txt b/example/advanced/server-flex/CMakeLists.txt
index f2da0f05..21b5f9cb 100644
--- a/example/advanced/server-flex/CMakeLists.txt
+++ b/example/advanced/server-flex/CMakeLists.txt
@@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
     GroupSources(example/advanced/server-flex "/")
 
     add_executable (advanced-server-flex
-        ${BOOST_BEAST_INCLUDES}
+        ${BOOST_BEAST_FILES}
         ${PROJECT_SOURCE_DIR}/example/common/detect_ssl.hpp
         ${PROJECT_SOURCE_DIR}/example/common/server_certificate.hpp
         ${PROJECT_SOURCE_DIR}/example/common/ssl_stream.hpp
diff --git a/example/advanced/server/CMakeLists.txt b/example/advanced/server/CMakeLists.txt
index c00f7cb9..5d0b710c 100644
--- a/example/advanced/server/CMakeLists.txt
+++ b/example/advanced/server/CMakeLists.txt
@@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
 GroupSources(example/advanced/server "/")
 
 add_executable (advanced-server
-    ${BOOST_BEAST_INCLUDES}
+    ${BOOST_BEAST_FILES}
     Jamfile
     advanced_server.cpp
 )
diff --git a/example/echo-op/CMakeLists.txt b/example/echo-op/CMakeLists.txt
index 75e20fd7..2f01a601 100644
--- a/example/echo-op/CMakeLists.txt
+++ b/example/echo-op/CMakeLists.txt
@@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
 GroupSources(example/echo-op "/")
 
 add_executable (echo-op
-    ${BOOST_BEAST_INCLUDES}
+    ${BOOST_BEAST_FILES}
     Jamfile
     echo_op.cpp
 )
diff --git a/example/http/client/async-ssl/CMakeLists.txt b/example/http/client/async-ssl/CMakeLists.txt
index 9392cefa..87eb2fed 100644
--- a/example/http/client/async-ssl/CMakeLists.txt
+++ b/example/http/client/async-ssl/CMakeLists.txt
@@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
     GroupSources(example/http/client/async-ssl "/")
 
     add_executable (http-client-async-ssl
-        ${BOOST_BEAST_INCLUDES}
+        ${BOOST_BEAST_FILES}
         ${PROJECT_SOURCE_DIR}/example/common/root_certificates.hpp
         Jamfile
         http_client_async_ssl.cpp
diff --git a/example/http/client/async/CMakeLists.txt b/example/http/client/async/CMakeLists.txt
index 917b3c9e..6bde0bf4 100644
--- a/example/http/client/async/CMakeLists.txt
+++ b/example/http/client/async/CMakeLists.txt
@@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
 GroupSources(example/http/client/async "/")
 
 add_executable (http-client-async
-    ${BOOST_BEAST_INCLUDES}
+    ${BOOST_BEAST_FILES}
     Jamfile
     http_client_async.cpp
 )
diff --git a/example/http/client/coro-ssl/CMakeLists.txt b/example/http/client/coro-ssl/CMakeLists.txt
index 1a821af7..3ff78360 100644
--- a/example/http/client/coro-ssl/CMakeLists.txt
+++ b/example/http/client/coro-ssl/CMakeLists.txt
@@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
     GroupSources(example/http/client/coro-ssl "/")
 
     add_executable (http-client-coro-ssl
-        ${BOOST_BEAST_INCLUDES}
+        ${BOOST_BEAST_FILES}
         ${PROJECT_SOURCE_DIR}/example/common/root_certificates.hpp
         Jamfile
         http_client_coro_ssl.cpp
diff --git a/example/http/client/coro/CMakeLists.txt b/example/http/client/coro/CMakeLists.txt
index 20863167..073cce5d 100644
--- a/example/http/client/coro/CMakeLists.txt
+++ b/example/http/client/coro/CMakeLists.txt
@@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
 GroupSources(example/http/client/coro "/")
 
 add_executable (http-client-coro
-    ${BOOST_BEAST_INCLUDES}
+    ${BOOST_BEAST_FILES}
     Jamfile
     http_client_coro.cpp
     )
diff --git a/example/http/client/crawl/CMakeLists.txt b/example/http/client/crawl/CMakeLists.txt
index 3b22fc74..dc87484c 100644
--- a/example/http/client/crawl/CMakeLists.txt
+++ b/example/http/client/crawl/CMakeLists.txt
@@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
 GroupSources(example/http/client/crawl "/")
 
 add_executable (http-crawl
-    ${BOOST_BEAST_INCLUDES}
+    ${BOOST_BEAST_FILES}
     Jamfile
     urls_large_data.hpp
     urls_large_data.cpp
diff --git a/example/http/client/sync-ssl/CMakeLists.txt b/example/http/client/sync-ssl/CMakeLists.txt
index b287c6a8..9683e62d 100644
--- a/example/http/client/sync-ssl/CMakeLists.txt
+++ b/example/http/client/sync-ssl/CMakeLists.txt
@@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
     GroupSources(example/http/client/sync-ssl "/")
 
     add_executable (http-client-sync-ssl
-        ${BOOST_BEAST_INCLUDES}
+        ${BOOST_BEAST_FILES}
         ${PROJECT_SOURCE_DIR}/example/common/root_certificates.hpp
         Jamfile
         http_client_sync_ssl.cpp
diff --git a/example/http/client/sync/CMakeLists.txt b/example/http/client/sync/CMakeLists.txt
index a137647e..399e61ce 100644
--- a/example/http/client/sync/CMakeLists.txt
+++ b/example/http/client/sync/CMakeLists.txt
@@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
 GroupSources(example/http/client/sync "/")
 
 add_executable (http-client-sync
-    ${BOOST_BEAST_INCLUDES}
+    ${BOOST_BEAST_FILES}
     Jamfile
     http_client_sync.cpp
 )
diff --git a/example/http/server/async-ssl/CMakeLists.txt b/example/http/server/async-ssl/CMakeLists.txt
index dcaff761..130f4550 100644
--- a/example/http/server/async-ssl/CMakeLists.txt
+++ b/example/http/server/async-ssl/CMakeLists.txt
@@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
     GroupSources(example/http/server/async-ssl "/")
 
     add_executable (http-server-async-ssl
-        ${BOOST_BEAST_INCLUDES}
+        ${BOOST_BEAST_FILES}
         ${PROJECT_SOURCE_DIR}/example/common/server_certificate.hpp
         Jamfile
         http_server_async_ssl.cpp
diff --git a/example/http/server/async/CMakeLists.txt b/example/http/server/async/CMakeLists.txt
index 95098ff9..dda889b7 100644
--- a/example/http/server/async/CMakeLists.txt
+++ b/example/http/server/async/CMakeLists.txt
@@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
 GroupSources(example/http/server/async "/")
 
 add_executable (http-server-async
-    ${BOOST_BEAST_INCLUDES}
+    ${BOOST_BEAST_FILES}
     Jamfile
     http_server_async.cpp
 )
diff --git a/example/http/server/coro-ssl/CMakeLists.txt b/example/http/server/coro-ssl/CMakeLists.txt
index c5da6e34..b5787459 100644
--- a/example/http/server/coro-ssl/CMakeLists.txt
+++ b/example/http/server/coro-ssl/CMakeLists.txt
@@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
     GroupSources(example/http/server/coro-ssl "/")
 
     add_executable (http-server-coro-ssl
-        ${BOOST_BEAST_INCLUDES}
+        ${BOOST_BEAST_FILES}
         ${PROJECT_SOURCE_DIR}/example/common/server_certificate.hpp
         Jamfile
         http_server_coro_ssl.cpp
diff --git a/example/http/server/coro/CMakeLists.txt b/example/http/server/coro/CMakeLists.txt
index 6b4cf735..46d3c235 100644
--- a/example/http/server/coro/CMakeLists.txt
+++ b/example/http/server/coro/CMakeLists.txt
@@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
 GroupSources(example/http/server/coro "/")
 
 add_executable (http-server-coro
-    ${BOOST_BEAST_INCLUDES}
+    ${BOOST_BEAST_FILES}
     Jamfile
     http_server_coro.cpp
 )
diff --git a/example/http/server/fast/CMakeLists.txt b/example/http/server/fast/CMakeLists.txt
index cb8581ab..f041eb40 100644
--- a/example/http/server/fast/CMakeLists.txt
+++ b/example/http/server/fast/CMakeLists.txt
@@ -12,8 +12,8 @@ GroupSources(example/common common)
 GroupSources(example/http/server/fast "/")
 
 add_executable (http-server-fast
-    ${BOOST_BEAST_INCLUDES}
-    ${COMMON_INCLUDES}
+    ${BOOST_BEAST_FILES}
+    ${COMMON_FILES}
     Jamfile
     fields_alloc.hpp
     http_server_fast.cpp
diff --git a/example/http/server/flex/CMakeLists.txt b/example/http/server/flex/CMakeLists.txt
index 54cc8dc8..3011e6df 100644
--- a/example/http/server/flex/CMakeLists.txt
+++ b/example/http/server/flex/CMakeLists.txt
@@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
     GroupSources(example/http/server/flex "/")
 
     add_executable (http-server-flex
-        ${BOOST_BEAST_INCLUDES}
+        ${BOOST_BEAST_FILES}
         ${PROJECT_SOURCE_DIR}/example/common/detect_ssl.hpp
         ${PROJECT_SOURCE_DIR}/example/common/server_certificate.hpp
         Jamfile
diff --git a/example/http/server/small/CMakeLists.txt b/example/http/server/small/CMakeLists.txt
index 4e4ced1b..b6eb7f25 100644
--- a/example/http/server/small/CMakeLists.txt
+++ b/example/http/server/small/CMakeLists.txt
@@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
 GroupSources(example/http/server/small "/")
 
 add_executable (http-server-small
-    ${BOOST_BEAST_INCLUDES}
+    ${BOOST_BEAST_FILES}
     Jamfile
     http_server_small.cpp
 )
diff --git a/example/http/server/stackless-ssl/CMakeLists.txt b/example/http/server/stackless-ssl/CMakeLists.txt
index 0df45a3c..edf31338 100644
--- a/example/http/server/stackless-ssl/CMakeLists.txt
+++ b/example/http/server/stackless-ssl/CMakeLists.txt
@@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
     GroupSources(example/http/server/stackless-ssl "/")
 
     add_executable (http-server-stackless-ssl
-        ${BOOST_BEAST_INCLUDES}
+        ${BOOST_BEAST_FILES}
         ${PROJECT_SOURCE_DIR}/example/common/server_certificate.hpp
         Jamfile
         http_server_stackless_ssl.cpp
diff --git a/example/http/server/stackless/CMakeLists.txt b/example/http/server/stackless/CMakeLists.txt
index 44fe6e70..c1ee6ecb 100644
--- a/example/http/server/stackless/CMakeLists.txt
+++ b/example/http/server/stackless/CMakeLists.txt
@@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
 GroupSources(example/http/server/stackless "/")
 
 add_executable (http-server-stackless
-    ${BOOST_BEAST_INCLUDES}
+    ${BOOST_BEAST_FILES}
     Jamfile
     http_server_stackless.cpp
 )
diff --git a/example/http/server/sync-ssl/CMakeLists.txt b/example/http/server/sync-ssl/CMakeLists.txt
index 2848b1ca..792cef82 100644
--- a/example/http/server/sync-ssl/CMakeLists.txt
+++ b/example/http/server/sync-ssl/CMakeLists.txt
@@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
     GroupSources(example/http/server/sync-ssl "/")
 
     add_executable (http-server-sync-ssl
-        ${BOOST_BEAST_INCLUDES}
+        ${BOOST_BEAST_FILES}
         ${PROJECT_SOURCE_DIR}/example/common/server_certificate.hpp
         Jamfile
         http_server_sync_ssl.cpp
diff --git a/example/http/server/sync/CMakeLists.txt b/example/http/server/sync/CMakeLists.txt
index 998f6c8e..ced30da8 100644
--- a/example/http/server/sync/CMakeLists.txt
+++ b/example/http/server/sync/CMakeLists.txt
@@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
 GroupSources(example/http/server/sync "/")
 
 add_executable (http-server-sync
-    ${BOOST_BEAST_INCLUDES}
+    ${BOOST_BEAST_FILES}
     Jamfile
     http_server_sync.cpp
 )
diff --git a/example/websocket/client/async-ssl/CMakeLists.txt b/example/websocket/client/async-ssl/CMakeLists.txt
index 8572fe0c..c02f4d06 100644
--- a/example/websocket/client/async-ssl/CMakeLists.txt
+++ b/example/websocket/client/async-ssl/CMakeLists.txt
@@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
     GroupSources(example/websocket/client/async-ssl "/")
 
     add_executable (websocket-client-async-ssl
-        ${BOOST_BEAST_INCLUDES}
+        ${BOOST_BEAST_FILES}
         ${PROJECT_SOURCE_DIR}/example/common/root_certificates.hpp
         Jamfile
         websocket_client_async_ssl.cpp
diff --git a/example/websocket/client/async/CMakeLists.txt b/example/websocket/client/async/CMakeLists.txt
index 5017a587..73f2c07b 100644
--- a/example/websocket/client/async/CMakeLists.txt
+++ b/example/websocket/client/async/CMakeLists.txt
@@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
 GroupSources(example/websocket/client/async "/")
 
 add_executable (websocket-client-async
-    ${BOOST_BEAST_INCLUDES}
+    ${BOOST_BEAST_FILES}
     Jamfile
     websocket_client_async.cpp
 )
diff --git a/example/websocket/client/coro-ssl/CMakeLists.txt b/example/websocket/client/coro-ssl/CMakeLists.txt
index beccf868..7b9f167a 100644
--- a/example/websocket/client/coro-ssl/CMakeLists.txt
+++ b/example/websocket/client/coro-ssl/CMakeLists.txt
@@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
     GroupSources(example/websocket/client/coro-ssl "/")
 
     add_executable (websocket-client-coro-ssl
-        ${BOOST_BEAST_INCLUDES}
+        ${BOOST_BEAST_FILES}
         ${PROJECT_SOURCE_DIR}/example/common/root_certificates.hpp
         Jamfile
         websocket_client_coro_ssl.cpp
diff --git a/example/websocket/client/coro/CMakeLists.txt b/example/websocket/client/coro/CMakeLists.txt
index e9de3436..1bdcf6c6 100644
--- a/example/websocket/client/coro/CMakeLists.txt
+++ b/example/websocket/client/coro/CMakeLists.txt
@@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
 GroupSources(example/websocket/client/coro "/")
 
 add_executable (websocket-client-coro
-    ${BOOST_BEAST_INCLUDES}
+    ${BOOST_BEAST_FILES}
     Jamfile
     websocket_client_coro.cpp
 )
diff --git a/example/websocket/client/sync-ssl/CMakeLists.txt b/example/websocket/client/sync-ssl/CMakeLists.txt
index cc86b8a5..11c5f030 100644
--- a/example/websocket/client/sync-ssl/CMakeLists.txt
+++ b/example/websocket/client/sync-ssl/CMakeLists.txt
@@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
     GroupSources(example/websocket/client/sync-ssl "/")
 
     add_executable (websocket-client-sync-ssl
-        ${BOOST_BEAST_INCLUDES}
+        ${BOOST_BEAST_FILES}
         ${PROJECT_SOURCE_DIR}/example/common/root_certificates.hpp
         Jamfile
         websocket_client_sync_ssl.cpp
diff --git a/example/websocket/client/sync/CMakeLists.txt b/example/websocket/client/sync/CMakeLists.txt
index a298b0f5..8196f0da 100644
--- a/example/websocket/client/sync/CMakeLists.txt
+++ b/example/websocket/client/sync/CMakeLists.txt
@@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
 GroupSources(example/websocket/client/sync "/")
 
 add_executable (websocket-client-sync
-    ${BOOST_BEAST_INCLUDES}
+    ${BOOST_BEAST_FILES}
     Jamfile
     websocket_client_sync.cpp
 )
diff --git a/example/websocket/server/async-ssl/CMakeLists.txt b/example/websocket/server/async-ssl/CMakeLists.txt
index 4d16f7c5..09496800 100644
--- a/example/websocket/server/async-ssl/CMakeLists.txt
+++ b/example/websocket/server/async-ssl/CMakeLists.txt
@@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
     GroupSources(example/websocket/server/async-ssl "/")
 
     add_executable (websocket-server-async-ssl
-        ${BOOST_BEAST_INCLUDES}
+        ${BOOST_BEAST_FILES}
         ${PROJECT_SOURCE_DIR}/example/common/server_certificate.hpp
         Jamfile
         websocket_server_async_ssl.cpp
diff --git a/example/websocket/server/async/CMakeLists.txt b/example/websocket/server/async/CMakeLists.txt
index 9d9be2d1..d9fb1093 100644
--- a/example/websocket/server/async/CMakeLists.txt
+++ b/example/websocket/server/async/CMakeLists.txt
@@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
 GroupSources(example/websocket/server/async "/")
 
 add_executable (websocket-server-async
-    ${BOOST_BEAST_INCLUDES}
+    ${BOOST_BEAST_FILES}
     Jamfile
     websocket_server_async.cpp
 )
diff --git a/example/websocket/server/coro-ssl/CMakeLists.txt b/example/websocket/server/coro-ssl/CMakeLists.txt
index 3cda9b9b..2d9d7120 100644
--- a/example/websocket/server/coro-ssl/CMakeLists.txt
+++ b/example/websocket/server/coro-ssl/CMakeLists.txt
@@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
     GroupSources(example/websocket/server/coro-ssl "/")
 
     add_executable (websocket-server-coro-ssl
-        ${BOOST_BEAST_INCLUDES}
+        ${BOOST_BEAST_FILES}
         ${PROJECT_SOURCE_DIR}/example/common/server_certificate.hpp
         Jamfile
         websocket_server_coro_ssl.cpp
diff --git a/example/websocket/server/coro/CMakeLists.txt b/example/websocket/server/coro/CMakeLists.txt
index 0e4fe351..bf4c5a36 100644
--- a/example/websocket/server/coro/CMakeLists.txt
+++ b/example/websocket/server/coro/CMakeLists.txt
@@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
 GroupSources(example/websocket/server/coro "/")
 
 add_executable (websocket-server-coro
-    ${BOOST_BEAST_INCLUDES}
+    ${BOOST_BEAST_FILES}
     Jamfile
     websocket_server_coro.cpp
 )
diff --git a/example/websocket/server/fast/CMakeLists.txt b/example/websocket/server/fast/CMakeLists.txt
index ebb3b21a..df44e5e9 100644
--- a/example/websocket/server/fast/CMakeLists.txt
+++ b/example/websocket/server/fast/CMakeLists.txt
@@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
 GroupSources(example/websocket/server/fast "/")
 
 add_executable (websocket-server-fast
-    ${BOOST_BEAST_INCLUDES}
+    ${BOOST_BEAST_FILES}
     Jamfile
     websocket_server_fast.cpp
 )
diff --git a/example/websocket/server/stackless-ssl/CMakeLists.txt b/example/websocket/server/stackless-ssl/CMakeLists.txt
index a05ddb56..bd0e8828 100644
--- a/example/websocket/server/stackless-ssl/CMakeLists.txt
+++ b/example/websocket/server/stackless-ssl/CMakeLists.txt
@@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
     GroupSources(example/websocket/server/stackless-ssl "/")
 
     add_executable (websocket-server-stackless-ssl
-        ${BOOST_BEAST_INCLUDES}
+        ${BOOST_BEAST_FILES}
         ${PROJECT_SOURCE_DIR}/example/common/server_certificate.hpp
         Jamfile
         websocket_server_stackless_ssl.cpp
diff --git a/example/websocket/server/stackless/CMakeLists.txt b/example/websocket/server/stackless/CMakeLists.txt
index e708309b..b5f51b21 100644
--- a/example/websocket/server/stackless/CMakeLists.txt
+++ b/example/websocket/server/stackless/CMakeLists.txt
@@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
 GroupSources(example/websocket/server/stackless "/")
 
 add_executable (websocket-server-stackless
-    ${BOOST_BEAST_INCLUDES}
+    ${BOOST_BEAST_FILES}
     Jamfile
     websocket_server_stackless.cpp
 )
diff --git a/example/websocket/server/sync-ssl/CMakeLists.txt b/example/websocket/server/sync-ssl/CMakeLists.txt
index e5a2ebed..3a7e32fe 100644
--- a/example/websocket/server/sync-ssl/CMakeLists.txt
+++ b/example/websocket/server/sync-ssl/CMakeLists.txt
@@ -13,7 +13,7 @@ if (OPENSSL_FOUND)
     GroupSources(example/websocket/server/sync-ssl "/")
 
     add_executable (websocket-server-sync-ssl
-        ${BOOST_BEAST_INCLUDES}
+        ${BOOST_BEAST_FILES}
         ${PROJECT_SOURCE_DIR}/example/common/server_certificate.hpp
         Jamfile
         websocket_server_sync_ssl.cpp
diff --git a/example/websocket/server/sync/CMakeLists.txt b/example/websocket/server/sync/CMakeLists.txt
index f492f90b..357a3b6a 100644
--- a/example/websocket/server/sync/CMakeLists.txt
+++ b/example/websocket/server/sync/CMakeLists.txt
@@ -11,7 +11,7 @@ GroupSources(include/boost/beast beast)
 GroupSources(example/websocket/server/sync "/")
 
 add_executable (websocket-server-sync
-    ${BOOST_BEAST_INCLUDES}
+    ${BOOST_BEAST_FILES}
     Jamfile
     websocket_server_sync.cpp
 )
diff --git a/test/beast/CMakeLists.txt b/test/beast/CMakeLists.txt
index 430fa498..5ee064d4 100644
--- a/test/beast/CMakeLists.txt
+++ b/test/beast/CMakeLists.txt
@@ -13,8 +13,8 @@ GroupSources(subtree/unit_test/include/boost/beast extras)
 GroupSources(test/beast "/")
 
 add_executable (tests-beast
-    ${BOOST_BEAST_INCLUDES}
-    ${EXTRAS_INCLUDES}
+    ${BOOST_BEAST_FILES}
+    ${EXTRAS_FILES}
     ${TEST_MAIN}
     Jamfile
     core.cpp
diff --git a/test/beast/core/CMakeLists.txt b/test/beast/core/CMakeLists.txt
index 7db74482..11d20ad6 100644
--- a/test/beast/core/CMakeLists.txt
+++ b/test/beast/core/CMakeLists.txt
@@ -13,8 +13,8 @@ GroupSources(include/boost/beast beast)
 GroupSources(test/beast/core "/")
 
 add_executable (tests-beast-core
-    ${BOOST_BEAST_INCLUDES}
-    ${EXTRAS_INCLUDES}
+    ${BOOST_BEAST_FILES}
+    ${EXTRAS_FILES}
     ${TEST_MAIN}
     Jamfile
     buffer_test.hpp
diff --git a/test/beast/http/CMakeLists.txt b/test/beast/http/CMakeLists.txt
index c9e07fe7..8837355d 100644
--- a/test/beast/http/CMakeLists.txt
+++ b/test/beast/http/CMakeLists.txt
@@ -13,8 +13,8 @@ GroupSources(include/boost/beast beast)
 GroupSources(test/beast/http "/")
 
 add_executable (tests-beast-http
-    ${BOOST_BEAST_INCLUDES}
-    ${EXTRAS_INCLUDES}
+    ${BOOST_BEAST_FILES}
+    ${EXTRAS_FILES}
     ${TEST_MAIN}
     Jamfile
     message_fuzz.hpp
diff --git a/test/beast/websocket/CMakeLists.txt b/test/beast/websocket/CMakeLists.txt
index 04cc3990..3ac8cc6c 100644
--- a/test/beast/websocket/CMakeLists.txt
+++ b/test/beast/websocket/CMakeLists.txt
@@ -13,8 +13,8 @@ GroupSources(include/boost/beast beast)
 GroupSources(test/beast/websocket "/")
 
 add_executable (tests-beast-websocket
-    ${BOOST_BEAST_INCLUDES}
-    ${EXTRAS_INCLUDES}
+    ${BOOST_BEAST_FILES}
+    ${EXTRAS_FILES}
     ${TEST_MAIN}
     Jamfile
     test.hpp
diff --git a/test/beast/zlib/CMakeLists.txt b/test/beast/zlib/CMakeLists.txt
index 5c2eb99e..31da3e59 100644
--- a/test/beast/zlib/CMakeLists.txt
+++ b/test/beast/zlib/CMakeLists.txt
@@ -18,8 +18,8 @@ if (MSVC)
 endif()
 
 add_executable (tests-beast-zlib
-    ${BOOST_BEAST_INCLUDES}
-    ${EXTRAS_INCLUDES}
+    ${BOOST_BEAST_FILES}
+    ${EXTRAS_FILES}
     ${ZLIB_SOURCES}
     ${TEST_MAIN}
     Jamfile
diff --git a/test/bench/buffers/CMakeLists.txt b/test/bench/buffers/CMakeLists.txt
index d8a398fc..7609b6ef 100644
--- a/test/bench/buffers/CMakeLists.txt
+++ b/test/bench/buffers/CMakeLists.txt
@@ -13,8 +13,8 @@ GroupSources(include/boost/beast beast)
 GroupSources(test/bench/buffers "/")
 
 add_executable (bench-buffers
-    ${BOOST_BEAST_INCLUDES}
-    ${EXTRAS_INCLUDES}
+    ${BOOST_BEAST_FILES}
+    ${EXTRAS_FILES}
     ${TEST_MAIN}
     Jamfile
     bench_buffers.cpp
diff --git a/test/bench/parser/CMakeLists.txt b/test/bench/parser/CMakeLists.txt
index e83a7ddf..7141000a 100644
--- a/test/bench/parser/CMakeLists.txt
+++ b/test/bench/parser/CMakeLists.txt
@@ -14,8 +14,8 @@ GroupSources(test/beast/http "/")
 GroupSources(test/bench/parser "/")
 
 add_executable (bench-parser
-    ${BOOST_BEAST_INCLUDES}
-    ${EXTRAS_INCLUDES}
+    ${BOOST_BEAST_FILES}
+    ${EXTRAS_FILES}
     ${TEST_MAIN}
     Jamfile
     ${PROJECT_SOURCE_DIR}/test/beast/http/message_fuzz.hpp
diff --git a/test/bench/utf8_checker/CMakeLists.txt b/test/bench/utf8_checker/CMakeLists.txt
index 4a9d0e72..6b0f27d3 100644
--- a/test/bench/utf8_checker/CMakeLists.txt
+++ b/test/bench/utf8_checker/CMakeLists.txt
@@ -13,8 +13,8 @@ GroupSources(include/boost/beast beast)
 GroupSources(test/bench/utf8_checker "/")
 
 add_executable (bench-utf8-checker
-    ${BOOST_BEAST_INCLUDES}
-    ${EXTRAS_INCLUDES}
+    ${BOOST_BEAST_FILES}
+    ${EXTRAS_FILES}
     ${TEST_MAIN}
     Jamfile
     bench_utf8_checker.cpp
diff --git a/test/bench/wsload/CMakeLists.txt b/test/bench/wsload/CMakeLists.txt
index 22813bf3..4976c2e2 100644
--- a/test/bench/wsload/CMakeLists.txt
+++ b/test/bench/wsload/CMakeLists.txt
@@ -14,9 +14,9 @@ GroupSources(subtree/unit_test/include/boost/beast extras)
 GroupSources(test/bench/wsload "/")
 
 add_executable (bench-wsload
-    ${BOOST_BEAST_INCLUDES}
-    ${COMMON_INCLUDES}
-    ${EXTRAS_INCLUDES}
+    ${BOOST_BEAST_FILES}
+    ${COMMON_FILES}
+    ${EXTRAS_FILES}
     Jamfile
     wsload.cpp
     )
diff --git a/test/bench/zlib/CMakeLists.txt b/test/bench/zlib/CMakeLists.txt
index e0c9e1ee..802b0627 100644
--- a/test/bench/zlib/CMakeLists.txt
+++ b/test/bench/zlib/CMakeLists.txt
@@ -18,8 +18,8 @@ if (MSVC)
 endif()
 
 add_executable (bench-zlib
-    ${BOOST_BEAST_INCLUDES}
-    ${EXTRAS_INCLUDES}
+    ${BOOST_BEAST_FILES}
+    ${EXTRAS_FILES}
     ${ZLIB_SOURCES}
     ${TEST_MAIN}
     Jamfile
diff --git a/test/doc/CMakeLists.txt b/test/doc/CMakeLists.txt
index 9eba1208..e700b106 100644
--- a/test/doc/CMakeLists.txt
+++ b/test/doc/CMakeLists.txt
@@ -14,9 +14,8 @@ GroupSources(include/boost/beast beast)
 GroupSources(test/doc "/")
 
 add_executable (tests-doc
-    ${BOOST_BEAST_INCLUDES}
-    ${EXAMPLE_INCLUDES}
-    ${EXTRAS_INCLUDES}
+    ${BOOST_BEAST_FILES}
+    ${EXTRAS_FILES}
     ${TEST_MAIN}
     Jamfile
     core_examples.cpp
diff --git a/test/example/common/CMakeLists.txt b/test/example/common/CMakeLists.txt
index 66b45ea9..2e3ee447 100644
--- a/test/example/common/CMakeLists.txt
+++ b/test/example/common/CMakeLists.txt
@@ -14,8 +14,8 @@ GroupSources(include/boost/beast beast)
 GroupSources(test/example/common "/")
 
 add_executable (tests-example-common
-    ${BOOST_BEAST_INCLUDES}
-    ${COMMON_INCLUDES}
+    ${BOOST_BEAST_FILES}
+    ${COMMON_FILES}
     Jamfile
     detect_ssl.cpp
     root_certificates.cpp