diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7a2c991c..117f209e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -65,6 +65,6 @@ repos:
     rev: v0.5.2
     hooks:
       - id: beman-tidy
-        args: [".", "--verbose"]
+        args: [".", "--verbose", "--require-all"]
 
 exclude: 'infra/'
diff --git a/README.md b/README.md
index 4555f96f..6ff6f784 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,18 @@
+# beman.execution: Building Block For Asynchronous Programs
 <!--
 SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 -->
-# beman.execution: Building Block For Asynchronous Programs
 
 <!-- markdownlint-disable line-length -->
-[![Library Status](https://raw.githubusercontent.com/bemanproject/beman/refs/heads/main/images/badges/beman_badge-beman_library_under_development.svg)](https://github.com/bemanproject/beman/blob/main/docs/beman_library_maturity_model.md#the-beman-library-maturity-model)
-![Standard Target](https://github.com/bemanproject/beman/blob/main/images/badges/cpp26.svg) [![Coverage](https://coveralls.io/repos/github/bemanproject/execution/badge.svg?branch=main)](https://coveralls.io/github/bemanproject/execution?branch=main)
+[![Library Status](https://raw.githubusercontent.com/bemanproject/beman/refs/heads/main/images/badges/beman_badge-beman_library_under_development.svg)](https://github.com/bemanproject/beman/blob/main/docs/beman_library_maturity_model.md#the-beman-library-maturity-model)![Standard Target](https://github.com/bemanproject/beman/blob/main/images/badges/cpp26.svg)[![Coverage](https://coveralls.io/repos/github/bemanproject/execution/badge.svg?branch=main)](https://coveralls.io/github/bemanproject/execution?branch=main)[![Compiler Explorer Example](https://img.shields.io/badge/Try%20it%20on%20Compiler%20Explorer-grey?logo=compilerexplorer&logoColor=67c52a)](https://godbolt.org/z/9nfa3rTTK)
 <!-- markdownlint-restore -->
 
-`beman.execution` provides the basic vocabulary for asynchronous
-programming as well as important algorithms implemented in terms
-of this vocabulary. The key entities of the vocabulary are:
+
+`beman.execution` provides the basic vocabulary for asynchronous programming as well as important algorithms implemented in terms of this vocabulary.
+
+**Implements**: [`std::execution` (P2300R10)](http://wg21.link/P2300R10).
+
+The key entities of the vocabulary are:
 
 - `scheduler` used to control where operations are executed.
     - The key operation is `schedule(scheduler) -> sender`.
@@ -38,8 +40,6 @@ e.g.:
     completed.
 - `bulk(...)` to executed execute work, potentially concurrently.
 
-**Implements:** [`std::execution` (P2300R10)](http://wg21.link/P2300R10).
-
 **Status**: [Under development and not yet ready for production use.](https://github.com/bemanproject/beman/blob/main/docs/beman_library_maturity_model.md#under-development-and-not-yet-ready-for-production-use)
 
 ## Help Welcome!
diff --git a/docs/code/tst.hpp b/docs/code/tst.hpp
index d7541087..024d3b7b 100644
--- a/docs/code/tst.hpp
+++ b/docs/code/tst.hpp
@@ -4,9 +4,9 @@
 #ifndef INCLUDED_EXAMPLES_TST
 #define INCLUDED_EXAMPLES_TST
 
-#include "tst-config.hpp"
-#include "tst-repeat_effect_until.hpp"
-#include "tst-sync_wait.hpp"
-#include "tst-timer.hpp"
+#include "tst_config.hpp"
+#include "tst_repeat_effect_until.hpp"
+#include "tst_sync_wait.hpp"
+#include "tst_timer.hpp"
 
 #endif
diff --git a/docs/code/tst-basic-timer.cpp b/docs/code/tst_basic_timer.cpp
similarity index 94%
rename from docs/code/tst-basic-timer.cpp
rename to docs/code/tst_basic_timer.cpp
index 7244945b..bf42915a 100644
--- a/docs/code/tst-basic-timer.cpp
+++ b/docs/code/tst_basic_timer.cpp
@@ -1,8 +1,8 @@
-// examples/tst-basic-timer.cpp                                       -*-C++-*-
+// examples/tst_basic_timer.cpp                                       -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // ----------------------------------------------------------------------------
 
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #include <iostream>
 #include "tst.hpp"
 namespace ex = beman::execution;
diff --git a/docs/code/tst-config.hpp b/docs/code/tst_config.hpp
similarity index 78%
rename from docs/code/tst-config.hpp
rename to docs/code/tst_config.hpp
index c25fde48..832a30a0 100644
--- a/docs/code/tst-config.hpp
+++ b/docs/code/tst_config.hpp
@@ -1,4 +1,4 @@
-// docs/code/tst-config.hpp                                           -*-C++-*-
+// docs/code/tst_config.hpp                                           -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #ifndef INCLUDED_DOCS_CODE_TST_CONFIG
@@ -6,7 +6,7 @@
 
 // ----------------------------------------------------------------------------
 
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 namespace tst {
 namespace ex = beman::execution;
 }
diff --git a/docs/code/tst-repeat_effect_until.hpp b/docs/code/tst_repeat_effect_until.hpp
similarity index 97%
rename from docs/code/tst-repeat_effect_until.hpp
rename to docs/code/tst_repeat_effect_until.hpp
index 950584d4..e25c9b58 100644
--- a/docs/code/tst-repeat_effect_until.hpp
+++ b/docs/code/tst_repeat_effect_until.hpp
@@ -1,4 +1,4 @@
-// examples/tst-repeat_effect_until.hpp                               -*-C++-*-
+// examples/tst_repeat_effect_until.hpp                               -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // ----------------------------------------------------------------------------
 
@@ -8,7 +8,7 @@
 #include <optional>
 #include <type_traits>
 #include <utility>
-#include "tst-config.hpp"
+#include "tst_config.hpp"
 
 // ----------------------------------------------------------------------------
 
diff --git a/docs/code/tst-sync_wait.hpp b/docs/code/tst_sync_wait.hpp
similarity index 96%
rename from docs/code/tst-sync_wait.hpp
rename to docs/code/tst_sync_wait.hpp
index 341a4fef..41e33d05 100644
--- a/docs/code/tst-sync_wait.hpp
+++ b/docs/code/tst_sync_wait.hpp
@@ -1,4 +1,4 @@
-// docs/code/tst-sync_wait.hpp                                        -*-C++-*-
+// docs/code/tst_sync_wait.hpp                                        -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // ----------------------------------------------------------------------------
 
@@ -7,7 +7,7 @@
 
 #include <utility>
 #include <type_traits>
-#include "tst-config.hpp"
+#include "tst_config.hpp"
 
 // ----------------------------------------------------------------------------
 
diff --git a/docs/code/tst-timer.hpp b/docs/code/tst_timer.hpp
similarity index 98%
rename from docs/code/tst-timer.hpp
rename to docs/code/tst_timer.hpp
index 032388be..bb86aa9c 100644
--- a/docs/code/tst-timer.hpp
+++ b/docs/code/tst_timer.hpp
@@ -1,4 +1,4 @@
-// docs/code/tst-timer.hpp                                            -*-C++-*-
+// docs/code/tst_timer.hpp                                            -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #ifndef INCLUDED_DOCS_CODE_TST_TIMER
@@ -9,7 +9,7 @@
 #include <chrono>
 #include <queue>
 #include <thread>
-#include "tst-config.hpp"
+#include "tst_config.hpp"
 
 // ----------------------------------------------------------------------------
 
diff --git a/docs/intro-examples.md b/docs/intro_examples.md
similarity index 95%
rename from docs/intro-examples.md
rename to docs/intro_examples.md
index 0ab96501..b1f05fb8 100644
--- a/docs/intro-examples.md
+++ b/docs/intro_examples.md
@@ -8,8 +8,8 @@ This page provides a series of examples showing how to use the
 <details>
 <summary>`"Hello, world"` - synchronous using asynchronous components</summary>
 
-Code: [`examples/intro-1-hello-world.cpp`]()
-@include examples/intro-1-hello-world.cpp
+Code: [`examples/intro_1_hello_world.cpp`]()
+@include examples/intro_1_hello_world.cpp
 
 The first example is a very complicated way to a version of `"Hello,
 world"`: it uses components for dealing with asynchronous work to
@@ -20,10 +20,10 @@ work.
 The components for `std::execution` are declared in the header
 `<execution>`.  This particular implementation implements the
 cmponents in namespace `beman::execution` declared in the header
-`<beman/execution/execution.hpp>`:
+`<beman/execution.hpp>`:
 
 ```cpp
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #include <iostream>
 #include <string>
 #include <tuple>
@@ -126,7 +126,7 @@ The components used in this example do all of that synchronously:
 <details>
 <summary>`"Hello, async"` - a simple asynchronous example</summary>
 
-Code: [`examples/intro-2-hello-async.cpp`]()
-@include examples/intro-2-hello-async.cpp
+Code: [`examples/intro_2_hello_async.cpp`]()
+@include examples/intro_2_hello_async.cpp
 
 </details>
diff --git a/docs/modules.md b/docs/modules.md
index 91736936..4e8e6e78 100644
--- a/docs/modules.md
+++ b/docs/modules.md
@@ -42,7 +42,7 @@ like this:
 ```c++
 module;
 
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 
 export module beman.execution;
 
@@ -181,7 +181,7 @@ though (more [rumination on tests](#modules-vs-testing) below):
   dependent on. Since the corresponding header were actually included
   by a component header things still worked. So, the corresponding
   headers needed to be added.
-- Instead of `#include <beman/execution/execution.hpp>` the tests
+- Instead of `#include <beman/execution.hpp>` the tests
   now use `import beman.execution;` (well, the test really use
   conditional compilation to either use a header or an `import`
   statement). Including any standard library header _after_ the
diff --git a/docs/tutorial.mds b/docs/tutorial.mds
index 12849dad..871eda4d 100644
--- a/docs/tutorial.mds
+++ b/docs/tutorial.mds
@@ -17,7 +17,7 @@ are tested using
 assume the library is made available using code like this together
 with namespace alias `ex` for the namespace for `beman::execution`:
 <details>
-  <summary>`#include <beman/execution/execution.hpp>`</summary>
+  <summary>`#include <beman/execution.hpp>`</summary>
   <p>
     There are or will be multiple implementations of
     [`std::execution`](https://wg21.link/exec) and the examples
@@ -30,7 +30,7 @@ with namespace alias `ex` for the namespace for `beman::execution`:
        the example were tested with this implementation. The examples would start
        with
        <pre>
-         #include <beman/execution/execution.hpp>
+         #include <beman/execution.hpp>
          namespace ex = beman::execution;
        </pre>
        </li>
@@ -64,7 +64,7 @@ collections of components mode available by a header:
    [`std::execution`](https://wg21.link/exec). By default the names from
    [`beman::execution`](https://github.com/bemanproject/execution) are
    used. The used names are set up via
-   [`docs/code/tst-config.hpp`](https://github.com/bemanproject/execution/files/docs/code/tst-config.hpp).
+   [`docs/code/tst_config.hpp`](https://github.com/bemanproject/execution/files/docs/code/tst_config.hpp).
    When trying to use the examples with a different implementation it should be sufficient to adjust
    this header accordingly.
 </details>
@@ -103,7 +103,7 @@ with the kinds of results an asynchronous function can produce:
       <details>
         <summary>`auto[b, i] = *ex::sync_wait(ex::just(true, 1));`</summary>
         <pre name="sync_wait-just">
-  #include <beman/execution/execution.hpp>
+  #include <beman/execution.hpp>
   #include <iostream>
   namespace ex = beman::execution;
 
@@ -129,7 +129,7 @@ with the kinds of results an asynchronous function can produce:
       how it can succeed. How to do that will be shown later in the
       tutorial.
       <pre name="sync_wait-just_error">
-  #include <beman/execution/execution.hpp>
+  #include <beman/execution.hpp>
   #include <iostream>
   #include "tst.hpp"
   namespace ex = beman::execution;
@@ -155,7 +155,7 @@ with the kinds of results an asynchronous function can produce:
       <code>_sndr_</code> doesn't already declare how it can succeed.
       How to do that will be shown later in the tutorial  .
       <pre name="sync_wait-just_stopped">
-  #include <beman/execution/execution.hpp>
+  #include <beman/execution.hpp>
   #include <iostream>
   #include "tst.hpp"
   namespace ex = beman::execution;
@@ -219,7 +219,7 @@ pipe notation.
                    <summary>`ex::just(true, 17) | ex::then([](bool, int i){ return 2 * i; })`</summary>
                    Transform the results by doubling the second element and returning it.
                    <pre name="just-then">
-  #include <beman/execution/execution.hpp>
+  #include <beman/execution.hpp>
   #include <iostream>
   namespace ex = beman::execution;
 
@@ -236,7 +236,7 @@ pipe notation.
                    If the transformation fails with an exception, an error with the caught
                    exception is produced.
                    <pre name="just-then-throw">
-  #include <beman/execution/execution.hpp>
+  #include <beman/execution.hpp>
   #include <iostream>
   namespace ex = beman::execution;
 
@@ -254,7 +254,7 @@ pipe notation.
                   transformed by the function passed to `ex::then`. Instead, the error is passed
                   through.
                   <pre name="just_error-then">
-  #include <beman/execution/execution.hpp>
+  #include <beman/execution.hpp>
   #include <iostream>
   #include "tst.hpp"
   namespace ex = beman::execution;
@@ -278,7 +278,7 @@ pipe notation.
 		  function passed to `ex::then`. Instead, the stopped
 		  completion is passed through.
                   <pre name="just_stopped-then">
-  #include <beman/execution/execution.hpp>
+  #include <beman/execution.hpp>
   #include <iostream>
   #include "tst.hpp"
   namespace ex = beman::execution;
@@ -302,7 +302,7 @@ pipe notation.
                 <details>
                    <summary>`ex:::just_error(17) | ex::upon_error([](int e){ return e; })`</summary>
                    <pre name="upon_error">
-  #include <beman/execution/execution.hpp>
+  #include <beman/execution.hpp>
   #include <iostream>
   namespace ex = beman::execution;
 
@@ -318,7 +318,7 @@ pipe notation.
                    Using both `then` and `upon_error` the result of an
                    operation can be turned into an `std::expected`:
                    <pre name="expected">
-  #include <beman/execution/execution.hpp>
+  #include <beman/execution.hpp>
   #include <expected>
   #include <iostream>
   namespace ex = beman::execution;
@@ -345,7 +345,7 @@ pipe notation.
                 <details>
                    <summary>`ex:::just_stopped() | ex::upon_stopped([](){ return 42; })`</summary>
                    <pre name="upon_stopped">
-  #include <beman/execution/execution.hpp>
+  #include <beman/execution.hpp>
   #include <iostream>
   namespace ex = beman::execution;
 
@@ -393,7 +393,7 @@ pipe notation.
                   a value is returned synchronously but in general the
                   sender can be any asynchronous operation.
                   <pre name="just-let_value">
-  #include <beman/execution/execution.hpp>
+  #include <beman/execution.hpp>
   #include <iostream>
   namespace ex = beman::execution;
 
@@ -415,7 +415,7 @@ pipe notation.
                   throwing an exception; in this case the result is used with
                   `sync_wait` which will still throw an exception).
                   <pre name="just-let_value-just_error">
-  #include <beman/execution/execution.hpp>
+  #include <beman/execution.hpp>
   #include <iostream>
   #include "tst.hpp"
   namespace ex = beman::execution;
@@ -439,7 +439,7 @@ pipe notation.
                   complete the transformed kind of results (`tst::just_error` is like
                   `ex::just_error` but also pretends to complete successful).
                   <pre name="just_error-let_value">
-  #include <beman/execution/execution.hpp>
+  #include <beman/execution.hpp>
   #include <iostream>
   #include "tst.hpp"
   namespace ex = beman::execution;
@@ -462,7 +462,7 @@ pipe notation.
                   the function object still needs to return a sender to satisfy the requirement
                   of `let_value`'s interface.
                   <pre name="just-let_value-throw">
-  #include <beman/execution/execution.hpp>
+  #include <beman/execution.hpp>
   #include <iostream>
   #include "tst.hpp"
   namespace ex = beman::execution;
@@ -489,7 +489,7 @@ pipe notation.
                 <details>
                   <summary>`ex::just_error(17) | ex::let_error([](int e) { return ex::just(e); })`</summary>
                   <pre name="just_error-let_error">
-  #include <beman/execution/execution.hpp>
+  #include <beman/execution.hpp>
   #include <iostream>
   namespace ex = beman::execution;
 
@@ -512,7 +512,7 @@ pipe notation.
                 <details>
                   <summary>`ex::just_stopped() | ex::let_stopped([](int e) { return ex::just(7); })`</summary>
                   <pre name="just_stopped-let_stopped">
-  #include <beman/execution/execution.hpp>
+  #include <beman/execution.hpp>
   #include <iostream>
   namespace ex = beman::execution;
 
@@ -556,7 +556,7 @@ pipe notation.
                   The result of `ex::when_all(ex::just(true), ex::just(), ex::just(17, 2.5))` is
                   a `std::tuple(true, 17, 2.5)`.
   <pre name="when_all">
-  #include <beman/execution/execution.hpp>
+  #include <beman/execution.hpp>
   #include <iostream>
   namespace ex = beman::execution;
 
@@ -577,7 +577,7 @@ pipe notation.
                   `tst::when_all` adapts each sender to pretend that they can complete
                   successfully if it doesn't already.
   <pre name="when_all-error">
-  #include <beman/execution/execution.hpp>
+  #include <beman/execution.hpp>
   #include <iostream>
   #include "tst.hpp"
   namespace ex = beman::execution;
@@ -601,7 +601,7 @@ pipe notation.
                   `tst::when_all` adapts each sender to pretend that they can complete
                   successfully if it doesn't already.
   <pre name="when_all-stopped">
-  #include <beman/execution/execution.hpp>
+  #include <beman/execution.hpp>
   #include <iostream>
   #include "tst.hpp"
   namespace ex = beman::execution;
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index aba158af..effe9928 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -22,23 +22,23 @@ set(TODO suspend_never) #-dk:TODO including that causes ASAN errors
 
 set(EXAMPLES
     allocator
-    doc-just
-    doc-just_error
-    doc-just_stopped
+    doc_just
+    doc_just_error
+    doc_just_stopped
     inspect
-    intro-1-hello-world
-    intro-2-hello-async
-    intro-5-consumer
+    intro_1_hello_world
+    intro_2_hello_async
+    intro_5_consumer
     playground
-    sender-demo
+    sender_demo
     stackoverflow
     stopping
-    when_all-cancel
+    when_all_cancel
 )
 
 if(BEMAN_USE_MODULES)
-    #-dk:TODO gcc doesn't like the modules: list(APPEND EXAMPLES modules modules-and-header)
-    list(APPEND EXAMPLES modules-and-header)
+    #-dk:TODO gcc doesn't like the modules: list(APPEND EXAMPLES modules modules_and_header)
+    list(APPEND EXAMPLES modules_and_header)
 endif()
 
 foreach(EXAMPLE ${EXAMPLES})
diff --git a/examples/allocator.cpp b/examples/allocator.cpp
index 3c00ed07..b14ed5f0 100644
--- a/examples/allocator.cpp
+++ b/examples/allocator.cpp
@@ -10,7 +10,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 namespace ex = beman::execution;
diff --git a/examples/doc-just.cpp b/examples/doc_just.cpp
similarity index 79%
rename from examples/doc-just.cpp
rename to examples/doc_just.cpp
index d25ded01..4979b153 100644
--- a/examples/doc-just.cpp
+++ b/examples/doc_just.cpp
@@ -1,4 +1,4 @@
-// examples/doc-just.cpp                                              -*-C++-*-
+// examples/doc_just.cpp                                              -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <cassert>
@@ -6,7 +6,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 namespace ex = beman::execution;
 using namespace std::string_literals;
diff --git a/examples/doc-just_error.cpp b/examples/doc_just_error.cpp
similarity index 87%
rename from examples/doc-just_error.cpp
rename to examples/doc_just_error.cpp
index 7acba327..48a9f98f 100644
--- a/examples/doc-just_error.cpp
+++ b/examples/doc_just_error.cpp
@@ -1,4 +1,4 @@
-// examples/doc-just_error.cpp                                        -*-C++-*-
+// examples/doc_just_error.cpp                                        -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <system_error>
@@ -6,7 +6,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 namespace ex = beman::execution;
 
diff --git a/examples/doc-just_stopped.cpp b/examples/doc_just_stopped.cpp
similarity index 81%
rename from examples/doc-just_stopped.cpp
rename to examples/doc_just_stopped.cpp
index b4fe76f0..12971e32 100644
--- a/examples/doc-just_stopped.cpp
+++ b/examples/doc_just_stopped.cpp
@@ -1,4 +1,4 @@
-// examples/doc-just_stopped.cpp                                      -*-C++-*-
+// examples/doc_just_stopped.cpp                                      -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <system_error>
@@ -6,7 +6,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 namespace ex = beman::execution;
 
diff --git a/examples/inspect.cpp b/examples/inspect.cpp
index 924a61a4..92d6ade2 100644
--- a/examples/inspect.cpp
+++ b/examples/inspect.cpp
@@ -11,7 +11,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 namespace ex = beman::execution;
diff --git a/examples/intro-1-hello-world.cpp b/examples/intro_1_hello_world.cpp
similarity index 81%
rename from examples/intro-1-hello-world.cpp
rename to examples/intro_1_hello_world.cpp
index 92fb6bc7..aacdd25d 100644
--- a/examples/intro-1-hello-world.cpp
+++ b/examples/intro_1_hello_world.cpp
@@ -1,4 +1,4 @@
-// examples/intro-1-hello-world.cpp                                   -*-C++-*-
+// examples/intro_1_hello_world.cpp                                   -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <iostream>
@@ -9,14 +9,14 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 namespace ex = ::beman::execution;
 using namespace std::string_literals;
 
 // ----------------------------------------------------------------------------
-// Please see the explanation in docs/intro-examples.md for an explanation.
+// Please see the explanation in docs/intro_examples.md for an explanation.
 
 int main() {
     // clang-format off
diff --git a/examples/intro-2-hello-async.cpp b/examples/intro_2_hello_async.cpp
similarity index 86%
rename from examples/intro-2-hello-async.cpp
rename to examples/intro_2_hello_async.cpp
index 58483a0d..e61a4384 100644
--- a/examples/intro-2-hello-async.cpp
+++ b/examples/intro_2_hello_async.cpp
@@ -1,4 +1,4 @@
-// examples/intro-2-hello-async.cpp                                   -*-C++-*-
+// examples/intro_2_hello_async.cpp                                   -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <chrono>
@@ -10,16 +10,16 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
-#include "intro-timer.hpp"
+#include "intro_timer.hpp"
 
 namespace ex = ::beman::execution;
 using namespace std::string_literals;
 using namespace std::chrono_literals;
 
 // ----------------------------------------------------------------------------
-// Please see the explanation in docs/intro-examples.md for an explanation.
+// Please see the explanation in docs/intro_examples.md for an explanation.
 
 int main() {
     std::cout << std::unitbuf;
diff --git a/examples/intro-5-consumer.cpp b/examples/intro_5_consumer.cpp
similarity index 98%
rename from examples/intro-5-consumer.cpp
rename to examples/intro_5_consumer.cpp
index c85802e4..4cabd6eb 100644
--- a/examples/intro-5-consumer.cpp
+++ b/examples/intro_5_consumer.cpp
@@ -1,4 +1,4 @@
-// examples/intro-5-consumer.cpp                                      -*-C++-*-
+// examples/intro_5_consumer.cpp                                      -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <beman/execution/detail/suppress_push.hpp>
@@ -13,7 +13,7 @@
 import beman.execution;
 import beman.execution.detail;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 namespace ex = ::beman::execution;
diff --git a/examples/intro-timer.hpp b/examples/intro_timer.hpp
similarity index 98%
rename from examples/intro-timer.hpp
rename to examples/intro_timer.hpp
index acc79871..25ec0e01 100644
--- a/examples/intro-timer.hpp
+++ b/examples/intro_timer.hpp
@@ -1,4 +1,4 @@
-// examples/intro-timer.hpp                                           -*-C++-*-
+// examples/intro_timer.hpp                                           -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #ifndef INCLUDED_EXAMPLES_INTRO_TIMER
diff --git a/examples/just_stopped.cpp b/examples/just_stopped.cpp
index ec15cf8c..8a6640fc 100644
--- a/examples/just_stopped.cpp
+++ b/examples/just_stopped.cpp
@@ -4,7 +4,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 namespace ex = beman::execution;
 
diff --git a/examples/modules-and-header.cpp b/examples/modules_and_header.cpp
similarity index 77%
rename from examples/modules-and-header.cpp
rename to examples/modules_and_header.cpp
index b531140c..f7ba4c5b 100644
--- a/examples/modules-and-header.cpp
+++ b/examples/modules_and_header.cpp
@@ -1,4 +1,4 @@
-// examples/modules-and-header.cpp                                    -*-C++-*-
+// examples/modules_and_header.cpp                                    -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <tuple>
diff --git a/examples/playground.cpp b/examples/playground.cpp
index f62cdea9..2412f1b6 100644
--- a/examples/playground.cpp
+++ b/examples/playground.cpp
@@ -8,7 +8,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 namespace ex = ::beman::execution;
diff --git a/examples/sender-demo.cpp b/examples/sender_demo.cpp
similarity index 96%
rename from examples/sender-demo.cpp
rename to examples/sender_demo.cpp
index c7522737..a9a4e63f 100644
--- a/examples/sender-demo.cpp
+++ b/examples/sender_demo.cpp
@@ -1,4 +1,4 @@
-// examples/sender-demo.cpp                                           -*-C++-*-
+// examples/sender_demo.cpp                                           -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <iostream>
@@ -11,7 +11,7 @@
 import beman.execution;
 import beman.execution.detail;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 namespace ex = beman::execution;
diff --git a/examples/stackoverflow.cpp b/examples/stackoverflow.cpp
index 71122d7b..5d25f1ac 100644
--- a/examples/stackoverflow.cpp
+++ b/examples/stackoverflow.cpp
@@ -9,7 +9,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 namespace ex = beman::execution;
diff --git a/examples/stop_token.cpp b/examples/stop_token.cpp
index eb546678..c967e377 100644
--- a/examples/stop_token.cpp
+++ b/examples/stop_token.cpp
@@ -10,8 +10,8 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
-#include <beman/execution/stop_token.hpp>
+#include <beman/execution.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 namespace exec = beman::execution;
diff --git a/examples/stopping.cpp b/examples/stopping.cpp
index 4fdfa1dd..124b7856 100644
--- a/examples/stopping.cpp
+++ b/examples/stopping.cpp
@@ -13,8 +13,8 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
-#include <beman/execution/stop_token.hpp>
+#include <beman/execution.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 using namespace std::chrono;
diff --git a/examples/suspend_never.cpp b/examples/suspend_never.cpp
index 059f05bb..f72c8ebe 100644
--- a/examples/suspend_never.cpp
+++ b/examples/suspend_never.cpp
@@ -7,7 +7,7 @@ import std;
 #include <new>
 #include <memory>
 #endif
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 
 namespace ex = beman::execution;
 
diff --git a/examples/when_all-cancel.cpp b/examples/when_all_cancel.cpp
similarity index 97%
rename from examples/when_all-cancel.cpp
rename to examples/when_all_cancel.cpp
index 17d51f06..6c8d58e6 100644
--- a/examples/when_all-cancel.cpp
+++ b/examples/when_all_cancel.cpp
@@ -1,4 +1,4 @@
-// examples/when_all-cancel.cpp                                       -*-C++-*-
+// examples/when_all_cancel.cpp                                       -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <exception>
@@ -13,8 +13,8 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
-#include <beman/execution/stop_token.hpp>
+#include <beman/execution.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 namespace ex = beman::execution;
diff --git a/include/beman/execution.hpp b/include/beman/execution.hpp
new file mode 100644
index 00000000..e2333978
--- /dev/null
+++ b/include/beman/execution.hpp
@@ -0,0 +1,9 @@
+// include/beman/execution.hpp                                        -*-C++-*-
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+#ifndef INCLUDED_BEMAN_EXECUTION
+#define INCLUDED_BEMAN_EXECUTION
+
+#include <beman/execution/execution.hpp>
+
+#endif
diff --git a/include/beman/execution/detail/allocator_aware_move.hpp b/include/beman/execution/detail/allocator_aware_move.hpp
index de12ef6f..3d54585b 100644
--- a/include/beman/execution/detail/allocator_aware_move.hpp
+++ b/include/beman/execution/detail/allocator_aware_move.hpp
@@ -28,7 +28,7 @@ namespace beman::execution::detail {
 template <typename T, typename Context>
 /*!
  * \brief Utility function use to move a possibly allocator aware object with an allocator from an environment.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 auto allocator_aware_move(T&& obj, Context&& context) noexcept -> decltype(auto) {
diff --git a/include/beman/execution/detail/almost_scheduler.hpp b/include/beman/execution/detail/almost_scheduler.hpp
index d8361473..a01d1aa4 100644
--- a/include/beman/execution/detail/almost_scheduler.hpp
+++ b/include/beman/execution/detail/almost_scheduler.hpp
@@ -28,7 +28,7 @@ import beman.execution.detail.sender;
 namespace beman::execution::detail {
 /*!
  * \brief Auxiliary concept used to break cycle for scheduler concept.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  * \concept almost_scheduler
  */
diff --git a/include/beman/execution/detail/apply_sender.hpp b/include/beman/execution/detail/apply_sender.hpp
index da671f29..f93f60c6 100644
--- a/include/beman/execution/detail/apply_sender.hpp
+++ b/include/beman/execution/detail/apply_sender.hpp
@@ -23,7 +23,7 @@ import beman.execution.detail.sender;
 namespace beman::execution {
 /*!
  * \brief Function used to transform a sender and its arguments for a domain.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 template <typename Domain, typename Tag, ::beman::execution::sender Sender, typename... Args>
     requires requires(Domain domain, Tag tag, Sender&& sender, Args&&... args) {
@@ -36,7 +36,7 @@ constexpr auto apply_sender(Domain domain, Tag, Sender&& sender, Args&&... args)
 
 /*!
  * \brief Default function used to transform a second and its arguments.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 template <typename Domain, typename Tag, ::beman::execution::sender Sender, typename... Args>
     requires(not requires(Domain domain, Tag tag, Sender&& sender, Args&&... args) {
diff --git a/include/beman/execution/detail/as_awaitable.hpp b/include/beman/execution/detail/as_awaitable.hpp
index c55571aa..803713aa 100644
--- a/include/beman/execution/detail/as_awaitable.hpp
+++ b/include/beman/execution/detail/as_awaitable.hpp
@@ -79,7 +79,7 @@ concept directly_awaitable = requires {
 namespace beman::execution {
 /*!
  * \brief Turn an entity, e.g., a sender, into an awaitable.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 struct as_awaitable_t {
     template <typename Expr, typename Promise>
diff --git a/include/beman/execution/detail/as_except_ptr.hpp b/include/beman/execution/detail/as_except_ptr.hpp
index e54b3359..5f9ee471 100644
--- a/include/beman/execution/detail/as_except_ptr.hpp
+++ b/include/beman/execution/detail/as_except_ptr.hpp
@@ -21,7 +21,7 @@ import std;
 namespace beman::execution::detail {
 /*!
  * \brief Turn an error into a suitable exception_ptr.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename Error>
diff --git a/include/beman/execution/detail/await_result_type.hpp b/include/beman/execution/detail/await_result_type.hpp
index 6897a9e5..f434f6cb 100644
--- a/include/beman/execution/detail/await_result_type.hpp
+++ b/include/beman/execution/detail/await_result_type.hpp
@@ -21,7 +21,7 @@ import beman.execution.detail.get_awaiter;
 namespace beman::execution::detail {
 /*!
  * \brief Auxiliary type alias to get the result type of an awaiter.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename T, typename Promise> //-dk:TODO detail export
diff --git a/include/beman/execution/detail/await_suspend_result.hpp b/include/beman/execution/detail/await_suspend_result.hpp
index 210c8ecc..fbc5a3be 100644
--- a/include/beman/execution/detail/await_suspend_result.hpp
+++ b/include/beman/execution/detail/await_suspend_result.hpp
@@ -18,14 +18,14 @@ import std;
 namespace beman::execution::detail {
 /*!
  * \brief Auxiliary type trait used to detect specializations of `std::coroutine_handle`.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename>
 struct is_coroutine_handle : ::std::false_type {};
 /*!
  * \brief The actual partial specialization detecting `std::coroutine_handle`.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename T>
@@ -33,7 +33,7 @@ struct is_coroutine_handle<::std::coroutine_handle<T>> : ::std::true_type {};
 
 /*!
  * \brief A concept used to identify valid results for `await_suspend`.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename T>
diff --git a/include/beman/execution/detail/basic_operation.hpp b/include/beman/execution/detail/basic_operation.hpp
index 73a66f0c..aa18fd01 100644
--- a/include/beman/execution/detail/basic_operation.hpp
+++ b/include/beman/execution/detail/basic_operation.hpp
@@ -40,7 +40,7 @@ import beman.execution.detail.valid_specialization;
 namespace beman::execution::detail {
 /*!
  * \brief Class template use to factor out common operation state needs.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 //-dk:TODO the export below shouldn't be needed, but MSVC++ seems to require it (2026-02-01)
diff --git a/include/beman/execution/detail/basic_receiver.hpp b/include/beman/execution/detail/basic_receiver.hpp
index 5a30a1e0..8fb1c09f 100644
--- a/include/beman/execution/detail/basic_receiver.hpp
+++ b/include/beman/execution/detail/basic_receiver.hpp
@@ -45,7 +45,7 @@ import beman.execution.detail.valid_specialization;
 namespace beman::execution::detail {
 /*!
  * \brief Class template used as receiver for child completions for library senders.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename Sender, typename Receiver, typename Index>
diff --git a/include/beman/execution/detail/basic_sender.hpp b/include/beman/execution/detail/basic_sender.hpp
index 2cfb610d..9fe8d449 100644
--- a/include/beman/execution/detail/basic_sender.hpp
+++ b/include/beman/execution/detail/basic_sender.hpp
@@ -60,7 +60,7 @@ inline constexpr sub_apply_t sub_apply{};
 
 /*!
  * \brief Class template used to factor out common sender implementation for library senders.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename Tag, typename Data, typename... Child>
diff --git a/include/beman/execution/detail/basic_state.hpp b/include/beman/execution/detail/basic_state.hpp
index 666af4e0..4ee65eb8 100644
--- a/include/beman/execution/detail/basic_state.hpp
+++ b/include/beman/execution/detail/basic_state.hpp
@@ -28,7 +28,7 @@ import beman.execution.detail.tag_of_t;
 namespace beman::execution::detail {
 /*!
  * \brief Class template used to present the receiver and operation state for library senders.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename Sender, typename Receiver>
diff --git a/include/beman/execution/detail/call_result_t.hpp b/include/beman/execution/detail/call_result_t.hpp
index 19aaa2a6..168510e7 100644
--- a/include/beman/execution/detail/call_result_t.hpp
+++ b/include/beman/execution/detail/call_result_t.hpp
@@ -17,7 +17,7 @@ namespace beman::execution::detail {
 template <typename Fun, typename... Args>
 /*!
  * \brief Type alias used determine the result of function [object] call.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 using call_result_t = decltype(::std::declval<Fun>()(std::declval<Args>()...));
diff --git a/include/beman/execution/detail/callable.hpp b/include/beman/execution/detail/callable.hpp
index 3483fb02..1f43b9de 100644
--- a/include/beman/execution/detail/callable.hpp
+++ b/include/beman/execution/detail/callable.hpp
@@ -16,7 +16,7 @@ import std;
 namespace beman::execution::detail {
 /*!
  * \brief Concept used to detect callable objects.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \concept callable
  * \internal
  */
diff --git a/include/beman/execution/detail/check_type_alias_exist.hpp b/include/beman/execution/detail/check_type_alias_exist.hpp
index e609a8e8..ba0b717a 100644
--- a/include/beman/execution/detail/check_type_alias_exist.hpp
+++ b/include/beman/execution/detail/check_type_alias_exist.hpp
@@ -11,7 +11,7 @@
 namespace beman::execution::detail {
 /*!
  * \brief Auxiliary class template used to detect whether a type alias exist within a class.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <template <typename> class>
diff --git a/include/beman/execution/detail/child_type.hpp b/include/beman/execution/detail/child_type.hpp
index 4843bc67..e4738db4 100644
--- a/include/beman/execution/detail/child_type.hpp
+++ b/include/beman/execution/detail/child_type.hpp
@@ -17,7 +17,7 @@ import std;
 namespace beman::execution::detail {
 /*!
  * \brief Auxiliary type alias used to determine the type of a child sender.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename Sender, ::std::size_t I = 0u>
diff --git a/include/beman/execution/detail/class_type.hpp b/include/beman/execution/detail/class_type.hpp
index 5de3c940..47e41360 100644
--- a/include/beman/execution/detail/class_type.hpp
+++ b/include/beman/execution/detail/class_type.hpp
@@ -21,7 +21,7 @@ import beman.execution.detail.decays_to;
 namespace beman::execution::detail {
 /*!
  * \brief Auxiliary concept used to detect class types. [execution.syn#concept:class-type]
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename Tp>
diff --git a/include/beman/execution/detail/common.hpp b/include/beman/execution/detail/common.hpp
index 2f86f712..ec320358 100644
--- a/include/beman/execution/detail/common.hpp
+++ b/include/beman/execution/detail/common.hpp
@@ -50,7 +50,7 @@
 /*!
  * \namespace beman
  * \brief Namespace for Beman projects http://github.com/bemanproject/beman
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 namespace beman {
 /*!
@@ -61,7 +61,7 @@ namespace beman {
  * The beman::execution namespace contains various components for
  * accessing asynchronous operations.
  *
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 namespace execution {
 
diff --git a/include/beman/execution/detail/completion.hpp b/include/beman/execution/detail/completion.hpp
index 75d82ebf..5d473bfe 100644
--- a/include/beman/execution/detail/completion.hpp
+++ b/include/beman/execution/detail/completion.hpp
@@ -4,7 +4,7 @@
 #ifndef INCLUDED_BEMAN_EXECUTION_DETAIL_COMPLETION
 #define INCLUDED_BEMAN_EXECUTION_DETAIL_COMPLETION
 
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 
 // ----------------------------------------------------------------------------
 
diff --git a/include/beman/execution/detail/completion_signature.hpp b/include/beman/execution/detail/completion_signature.hpp
index b4036b8d..cc972a1a 100644
--- a/include/beman/execution/detail/completion_signature.hpp
+++ b/include/beman/execution/detail/completion_signature.hpp
@@ -45,7 +45,7 @@ struct is_set_value<::beman::execution::set_value_t(Args...)> : ::std::true_type
  * - set_stopped_t() to indicate that operation was cancelled.
  * - set_value_t(A...) for successful completion with a set of argument.
  *
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \concept copmletion_signature
  * \internal
  */
diff --git a/include/beman/execution/detail/completion_signatures.hpp b/include/beman/execution/detail/completion_signatures.hpp
index 20c2f0be..39da7195 100644
--- a/include/beman/execution/detail/completion_signatures.hpp
+++ b/include/beman/execution/detail/completion_signatures.hpp
@@ -22,7 +22,7 @@ import beman.execution.detail.completion_signature;
 namespace beman::execution {
 /*!
  * \brief Class template used to a specify a list of completion signatures
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  *
  * \details
  * This class template is primarily used for type computations and objects of
diff --git a/include/beman/execution/detail/completion_signatures_for.hpp b/include/beman/execution/detail/completion_signatures_for.hpp
index 74e707a3..a31e2148 100644
--- a/include/beman/execution/detail/completion_signatures_for.hpp
+++ b/include/beman/execution/detail/completion_signatures_for.hpp
@@ -26,7 +26,7 @@ import beman.execution.detail.tag_of_t;
 namespace beman::execution::detail {
 /*!
  * \brief Tag type used to determine if completion signatures were defined.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 struct no_completion_signatures_defined_in_sender {};
@@ -36,7 +36,7 @@ struct no_completion_signatures_defined_in_sender {};
  * \note  Extracted into a concept to work around an MSVC bug that occurs only header builds where
  *        'requires' expressions containing dependent types incorrectly evaluate to false when placed
  *        directly inside a function template body.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename Tag, typename Sender, typename... Env>
@@ -44,7 +44,7 @@ concept has_valid_complsig_specialization = requires { Tag::template get_complet
 
 /*!
  * \brief Primary template declaration for the customization of sender completion signatures.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename Sender, typename... Env>
@@ -58,7 +58,7 @@ consteval auto get_completion_signatures_for_helper() {
 
 /*!
  * \brief Type alias used to access a senders completion signatures.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename Sender, typename... Env>
diff --git a/include/beman/execution/detail/completion_signatures_of_t.hpp b/include/beman/execution/detail/completion_signatures_of_t.hpp
index 972cf9f5..7ab641b7 100644
--- a/include/beman/execution/detail/completion_signatures_of_t.hpp
+++ b/include/beman/execution/detail/completion_signatures_of_t.hpp
@@ -22,7 +22,7 @@ import beman.execution.detail.sender_in;
 namespace beman::execution {
 /*!
  * \brief Alias to access the completion signatures of a sender
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 template <typename Sender, typename... Env>
     requires ::beman::execution::sender_in<Sender, Env...>
diff --git a/include/beman/execution/detail/completion_tag.hpp b/include/beman/execution/detail/completion_tag.hpp
index 9d1fb782..4c02be60 100644
--- a/include/beman/execution/detail/completion_tag.hpp
+++ b/include/beman/execution/detail/completion_tag.hpp
@@ -25,7 +25,7 @@ import beman.execution.detail.set_value;
 namespace beman::execution::detail {
 /*!
  * \brief A helper concept used to determine if a type is one of the completion tags.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename Tag>
diff --git a/include/beman/execution/detail/connect.hpp b/include/beman/execution/detail/connect.hpp
index f4642379..ae027701 100644
--- a/include/beman/execution/detail/connect.hpp
+++ b/include/beman/execution/detail/connect.hpp
@@ -29,7 +29,7 @@ import beman.execution.detail.transform_sender;
 namespace beman::execution::detail {
 /*!
  * \brief The actual implementation of the connect customization point type
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 //-dk:TODO this seems to needed for MSVC++ (2026-01-30)
@@ -89,12 +89,12 @@ struct connect_t {
 namespace beman::execution {
 /*!
  * \brief Type of the connect customization point object.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 using connect_t = beman::execution::detail::connect_t;
 /*!
  * \brief Customization point object used to connect a sender and a receiver.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  *
  * \details
  * `connect(sender, receiver)` returns the result of calling `sender.connect(receiver)`.
diff --git a/include/beman/execution/detail/connect_all.hpp b/include/beman/execution/detail/connect_all.hpp
index b4ee21fc..eabac008 100644
--- a/include/beman/execution/detail/connect_all.hpp
+++ b/include/beman/execution/detail/connect_all.hpp
@@ -44,7 +44,7 @@ inline constexpr ::std::size_t get_tuple_size() {
 }
 /*!
  * \brief A helper types whose call operator connects all children of a basic_sender
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 struct connect_all_t {
@@ -141,7 +141,7 @@ struct connect_all_t {
 
 /*!
  * \brief A helper object of type connect_all_t
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 //-dk:TODO the export below shouldn't be needed, but MSVC++ seems to require it (2026-02-01)
diff --git a/include/beman/execution/detail/connect_all_result.hpp b/include/beman/execution/detail/connect_all_result.hpp
index 0b66e01b..8bbfcb32 100644
--- a/include/beman/execution/detail/connect_all_result.hpp
+++ b/include/beman/execution/detail/connect_all_result.hpp
@@ -22,7 +22,7 @@ import beman.execution.detail.indices_for;
 namespace beman::execution::detail {
 /*!
  * \brief Helper type used to determine the state type when connecting all senders in a basic_sender
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename Sender, typename Receiver>
diff --git a/include/beman/execution/detail/connect_awaitable.hpp b/include/beman/execution/detail/connect_awaitable.hpp
index 2d7b6a3b..25e6d9dc 100644
--- a/include/beman/execution/detail/connect_awaitable.hpp
+++ b/include/beman/execution/detail/connect_awaitable.hpp
@@ -40,7 +40,7 @@ import beman.execution.detail.suspend_complete;
 namespace beman::execution::detail {
 /*!
  * \brief A helper template used determine the completion signature for type T which may be void
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename T>
@@ -49,7 +49,7 @@ struct awaiter_set_value {
 };
 /*!
  * \brief Specialization for awaiter_set_value when the type is void
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <>
@@ -59,7 +59,7 @@ struct awaiter_set_value<void> {
 
 /*!
  * \brief A helper template used to determine the completion signature matching an awaiter
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename Awaiter, typename Receiver>
@@ -72,7 +72,7 @@ using awaiter_completion_signatures = ::beman::execution::completion_signatures<
 
 /*!
  * \brief A helper function used to connect an awaiter to a receiver
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename Awaiter, ::beman::execution::receiver Receiver>
diff --git a/include/beman/execution/detail/connect_result_t.hpp b/include/beman/execution/detail/connect_result_t.hpp
index d01cb118..da8ff878 100644
--- a/include/beman/execution/detail/connect_result_t.hpp
+++ b/include/beman/execution/detail/connect_result_t.hpp
@@ -21,7 +21,7 @@ import beman.execution.detail.connect;
 namespace beman::execution {
 /*!
  * \brief Type alias to determine the operation state type returned from `connect()`.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 template <typename Sender, typename Receiver>
 using connect_result_t = decltype(::beman::execution::connect(::std::declval<Sender>(), ::std::declval<Receiver>()));
diff --git a/include/beman/execution/detail/decayed_same_as.hpp b/include/beman/execution/detail/decayed_same_as.hpp
index 38fa74a4..750915ee 100644
--- a/include/beman/execution/detail/decayed_same_as.hpp
+++ b/include/beman/execution/detail/decayed_same_as.hpp
@@ -17,7 +17,7 @@ namespace beman::execution::detail {
 //-dk:TODO thoroughly test the concept
 /*!
  * \brief Helper concept to determine if the result of decaying two types results in the same type
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename T0, typename T1>
diff --git a/include/beman/execution/detail/decayed_tuple.hpp b/include/beman/execution/detail/decayed_tuple.hpp
index 009a0409..e3203804 100644
--- a/include/beman/execution/detail/decayed_tuple.hpp
+++ b/include/beman/execution/detail/decayed_tuple.hpp
@@ -17,7 +17,7 @@ import std;
 namespace beman::execution::detail {
 /*!
  * \brief Helper type alias to get type type of a tuple after decaying the argument types
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename... T>
diff --git a/include/beman/execution/detail/decayed_typeof.hpp b/include/beman/execution/detail/decayed_typeof.hpp
index 91e688e5..c4c67f63 100644
--- a/include/beman/execution/detail/decayed_typeof.hpp
+++ b/include/beman/execution/detail/decayed_typeof.hpp
@@ -16,7 +16,7 @@ import std;
 namespace beman::execution::detail {
 /*!
  * \brief Helper type alias to get the type after decaying the argument
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <auto&& Tag>
diff --git a/include/beman/execution/detail/decays_to.hpp b/include/beman/execution/detail/decays_to.hpp
index 5aa47fb9..0e968809 100644
--- a/include/beman/execution/detail/decays_to.hpp
+++ b/include/beman/execution/detail/decays_to.hpp
@@ -17,7 +17,7 @@ import std;
 namespace beman::execution::detail {
 /*!
  * \brief Helper concept to determine if the first argument decays to the second argument
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename From, typename To>
diff --git a/include/beman/execution/detail/default_impls.hpp b/include/beman/execution/detail/default_impls.hpp
index 00faf6ec..a22aa866 100644
--- a/include/beman/execution/detail/default_impls.hpp
+++ b/include/beman/execution/detail/default_impls.hpp
@@ -39,7 +39,7 @@ import beman.execution.detail.start;
 namespace beman::execution::detail {
 /*!
  * \brief Helper type providing default implementations for basic_sender
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 struct default_impls {
diff --git a/include/beman/execution/detail/emplace_from.hpp b/include/beman/execution/detail/emplace_from.hpp
index a2f2d492..2ff0695f 100644
--- a/include/beman/execution/detail/emplace_from.hpp
+++ b/include/beman/execution/detail/emplace_from.hpp
@@ -24,7 +24,7 @@ import beman.execution.detail.nothrow_callable;
 namespace beman::execution::detail {
 /*!
  * \brief Helper class to get the result of a function which may be only called once.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename Fun>
diff --git a/include/beman/execution/detail/enter_scope_sender.hpp b/include/beman/execution/detail/enter_scope_sender.hpp
index 748cdfb1..a78ff626 100644
--- a/include/beman/execution/detail/enter_scope_sender.hpp
+++ b/include/beman/execution/detail/enter_scope_sender.hpp
@@ -23,7 +23,7 @@ namespace beman::execution {
 template <typename Sender>
 /*!
  * \brief Sender corresponding to the action of entering a scope.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 concept enter_scope_sender = ::beman::execution::sender<Sender>;
 } // namespace beman::execution
diff --git a/include/beman/execution/detail/enter_scope_sender_in.hpp b/include/beman/execution/detail/enter_scope_sender_in.hpp
index 35b39d5a..25da1776 100644
--- a/include/beman/execution/detail/enter_scope_sender_in.hpp
+++ b/include/beman/execution/detail/enter_scope_sender_in.hpp
@@ -22,7 +22,7 @@ import beman.execution.detail.sender_in;
 namespace beman::execution {
 /*!
  * \brief An enter scope sender that can operate in the environment `Env...`.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  *
  * \details
  * Requirements:
diff --git a/include/beman/execution/detail/env_of_t.hpp b/include/beman/execution/detail/env_of_t.hpp
index a69c6382..5d775fa2 100644
--- a/include/beman/execution/detail/env_of_t.hpp
+++ b/include/beman/execution/detail/env_of_t.hpp
@@ -21,7 +21,7 @@ import beman.execution.detail.get_env;
 namespace beman::execution {
 /*!
  * \brief Determine the type of the environment associated with a type
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 template <typename T>
 using env_of_t = decltype(::beman::execution::get_env(::std::declval<T>()));
diff --git a/include/beman/execution/detail/env_promise.hpp b/include/beman/execution/detail/env_promise.hpp
index 58a88ab3..49950e64 100644
--- a/include/beman/execution/detail/env_promise.hpp
+++ b/include/beman/execution/detail/env_promise.hpp
@@ -21,7 +21,7 @@ import beman.execution.detail.with_await_transform;
 namespace beman::execution::detail {
 /*!
  * \brief A helper promise type with an associated environment
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename Env> //-dk:TODO detail export
diff --git a/include/beman/execution/detail/env_type.hpp b/include/beman/execution/detail/env_type.hpp
index c3bddc88..e5896403 100644
--- a/include/beman/execution/detail/env_type.hpp
+++ b/include/beman/execution/detail/env_type.hpp
@@ -24,7 +24,7 @@ import beman.execution.detail.tag_of_t;
 namespace beman::execution::detail {
 /*!
  * \brief Helper alias to determine the environment type associated with sender in a basic_sender
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename Index, typename Sender, typename Receiver>
diff --git a/include/beman/execution/detail/error_types_of.hpp b/include/beman/execution/detail/error_types_of.hpp
index ea130048..b6e5c0fb 100644
--- a/include/beman/execution/detail/error_types_of.hpp
+++ b/include/beman/execution/detail/error_types_of.hpp
@@ -4,7 +4,7 @@
 #ifndef INCLUDED_BEMAN_EXECUTION_DETAIL_CONTEXT_ERROR_TYPES_OF
 #define INCLUDED_BEMAN_EXECUTION_DETAIL_CONTEXT_ERROR_TYPES_OF
 
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #include <exception>
 
 // ----------------------------------------------------------------------------
diff --git a/include/beman/execution/detail/error_types_of_t.hpp b/include/beman/execution/detail/error_types_of_t.hpp
index 5c594320..4d6ac1b6 100644
--- a/include/beman/execution/detail/error_types_of_t.hpp
+++ b/include/beman/execution/detail/error_types_of_t.hpp
@@ -31,7 +31,7 @@ import beman.execution.detail.variant_or_empty;
 namespace beman::execution {
 /*!
  * \brief Type alias to get error types for a sender
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 template <typename Sender,
           typename Env                         = ::beman::execution::env<>,
diff --git a/include/beman/execution/detail/exit_scope_sender.hpp b/include/beman/execution/detail/exit_scope_sender.hpp
index 2c4d6e67..e2be04d3 100644
--- a/include/beman/execution/detail/exit_scope_sender.hpp
+++ b/include/beman/execution/detail/exit_scope_sender.hpp
@@ -22,7 +22,7 @@ import beman.execution.detail.sender;
 namespace beman::execution {
 /*!
  * \brief A sender that does not throw when decay-copied or moved.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 template <typename Sender>
 concept exit_scope_sender =
diff --git a/include/beman/execution/detail/exit_scope_sender_in.hpp b/include/beman/execution/detail/exit_scope_sender_in.hpp
index da4e00a5..4e2c04cf 100644
--- a/include/beman/execution/detail/exit_scope_sender_in.hpp
+++ b/include/beman/execution/detail/exit_scope_sender_in.hpp
@@ -32,7 +32,7 @@ import beman.execution.detail.set_value;
 namespace beman::execution {
 /*!
  * \brief An exit scope sender that can operate in the environment `Env...`.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  *
  * \details
  * Requirements:
diff --git a/include/beman/execution/detail/exit_scope_sender_of_t.hpp b/include/beman/execution/detail/exit_scope_sender_of_t.hpp
index 2673452e..d633808c 100644
--- a/include/beman/execution/detail/exit_scope_sender_of_t.hpp
+++ b/include/beman/execution/detail/exit_scope_sender_of_t.hpp
@@ -29,7 +29,7 @@ namespace beman::execution {
 /*!
  * \brief Represents the type of exit scope sender which an asynchronous operation formed from
  *        `Sender` in `Env...` yield on completion.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  *
  * \details
  * This looks at the completion signatures of `Sender` in `Env...` and finds the unique value completion signature.
diff --git a/include/beman/execution/detail/forward_like.hpp b/include/beman/execution/detail/forward_like.hpp
index a3a9896f..f43894d3 100644
--- a/include/beman/execution/detail/forward_like.hpp
+++ b/include/beman/execution/detail/forward_like.hpp
@@ -65,7 +65,7 @@ auto own_forward_like(U&& u) noexcept -> decltype(auto) {
 
 /*!
  * \brief Helper function to forward a subobject (in case the standard library version is unavailable)
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename T, typename U>
diff --git a/include/beman/execution/detail/forwarding_query.hpp b/include/beman/execution/detail/forwarding_query.hpp
index 00084308..bf22ea34 100644
--- a/include/beman/execution/detail/forwarding_query.hpp
+++ b/include/beman/execution/detail/forwarding_query.hpp
@@ -18,7 +18,7 @@ import std;
 namespace beman::execution::detail {
 /*!
  * \brief Actual implementation of the forwarding_query customization point object
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 struct forwarding_query_t {
@@ -39,12 +39,12 @@ struct forwarding_query_t {
 namespace beman::execution {
 /*!
  * \brief Type of the forwarding_query customization point object
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 using forwarding_query_t = beman::execution::detail::forwarding_query_t;
 /*!
  * \brief The customization point object to determine whether queries should be forwarded
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  *
  * \details
  * The `constexpr` call `forwarding_query(q)` determines whether the query `q` passed
diff --git a/include/beman/execution/detail/fwd_env.hpp b/include/beman/execution/detail/fwd_env.hpp
index 2b349b35..8cc7a291 100644
--- a/include/beman/execution/detail/fwd_env.hpp
+++ b/include/beman/execution/detail/fwd_env.hpp
@@ -23,7 +23,7 @@ import beman.execution.detail.forwarding_query;
 namespace beman::execution::detail {
 /*!
  * \brief A helper class to create environments and taking forwarding_query into account
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <typename Env> //-dk:TODO detail export
diff --git a/include/beman/execution/detail/handle.hpp b/include/beman/execution/detail/handle.hpp
index 60d8ce5b..2d09de8a 100644
--- a/include/beman/execution/detail/handle.hpp
+++ b/include/beman/execution/detail/handle.hpp
@@ -4,7 +4,7 @@
 #ifndef INCLUDED_BEMAN_EXECUTION_DETAIL_HANDLE
 #define INCLUDED_BEMAN_EXECUTION_DETAIL_HANDLE
 
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #include <cassert>
 #include <coroutine>
 #include <memory>
diff --git a/include/beman/execution/detail/just.hpp b/include/beman/execution/detail/just.hpp
index b1fb576c..76e5e72e 100644
--- a/include/beman/execution/detail/just.hpp
+++ b/include/beman/execution/detail/just.hpp
@@ -100,7 +100,7 @@ using just_stopped_t = ::beman::execution::detail::just_t<::beman::execution::se
 
 /*!
  * \brief <code>just(_arg_...)</code> yields a sender completing with <code>set_value_t(_Arg_...)</code>
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  *
  * \details
  * `just` is a callable object of type `just_t`. Invoking <code>just(_arg_...)</code> yields a sender which stores its
@@ -134,8 +134,8 @@ using just_stopped_t = ::beman::execution::detail::just_t<::beman::execution::se
  * `tuple` containing the value copied/moved from the original arguments
  * (an `optional` is returned to indicate cancellation).
  *
- * <pre example="doc-just.cpp">
- * #include <beman/execution/execution.hpp>
+ * <pre example="doc_just.cpp">
+ * #include <beman/execution.hpp>
  * #include <cassert>
  * #include <string>
  * using namespace std::string_literals;
@@ -151,7 +151,7 @@ inline constexpr ::beman::execution::just_t just{};
 
 /*!
  * \brief <code>just_error(_error_)</code> yields a sender completing with <code>set_error_t(_Error_)</code>
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  *
  * \details
  * `just_error` is a callable object of type `just_error_t`. Invoking <code>just_error(_error_)</code> yields a sender
@@ -188,8 +188,8 @@ inline constexpr ::beman::execution::just_t just{};
  * the expected code was produced and also sets the flag `had_error` indicating it was called at all. This flag is
  * checked after waiting for the result in `sync_wait`.
  *
- * <pre example="doc-just_error.cpp">
- * #include <beman/execution/execution.hpp>
+ * <pre example="doc_just_error.cpp">
+ * #include <beman/execution.hpp>
  * #include <system_error>
  * #include <cassert>
  * namespace ex = beman::execution;
@@ -209,7 +209,7 @@ inline constexpr ::beman::execution::just_error_t just_error{};
 
 /*!
  * \brief <code>just_stopped()</code> yields a sender completing with <code>set_stopped_t()</code>
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  *
  * \details
  * `just_stopped` is a callable object of type `just_stopped_t`. Invoking <code>just_stopped()</code> yields a sender
@@ -242,8 +242,8 @@ inline constexpr ::beman::execution::just_error_t just_error{};
  * was called at all. This flag is checked after waiting for the result
  * in `sync_wait`.
  *
- * <pre example="doc-just_error.cpp">
- * #include <beman/execution/execution.hpp>
+ * <pre example="doc_just_error.cpp">
+ * #include <beman/execution.hpp>
  * #include <system_error>
  * #include <cassert>
  * namespace ex = beman::execution;
diff --git a/include/beman/execution/detail/promise_env.hpp b/include/beman/execution/detail/promise_env.hpp
index 9560a0e9..b0a4c6ce 100644
--- a/include/beman/execution/detail/promise_env.hpp
+++ b/include/beman/execution/detail/promise_env.hpp
@@ -4,7 +4,7 @@
 #ifndef INCLUDED_BEMAN_EXECUTION_DETAIL_PROMISE_ENV
 #define INCLUDED_BEMAN_EXECUTION_DETAIL_PROMISE_ENV
 
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #include <utility>
 
 // ----------------------------------------------------------------------------
diff --git a/include/beman/execution/detail/scheduler_tag.hpp b/include/beman/execution/detail/scheduler_tag.hpp
index 9e317e3a..77158746 100644
--- a/include/beman/execution/detail/scheduler_tag.hpp
+++ b/include/beman/execution/detail/scheduler_tag.hpp
@@ -11,7 +11,7 @@
 namespace beman::execution {
 /*!
  * \brief Tag type to indicate a class is a scheduler.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 struct scheduler_tag {};
 
diff --git a/include/beman/execution/detail/sender_adaptor_closure.hpp b/include/beman/execution/detail/sender_adaptor_closure.hpp
index 924e099a..db020fcd 100644
--- a/include/beman/execution/detail/sender_adaptor_closure.hpp
+++ b/include/beman/execution/detail/sender_adaptor_closure.hpp
@@ -39,7 +39,7 @@ import beman.execution.detail.product_type;
 namespace beman::execution::detail::pipeable {
 /*!
  * \brief ADL anchor tag type inherited by sender_adaptor_closure.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 struct closure_t {};
@@ -48,7 +48,7 @@ struct closure_t {};
 namespace beman::execution {
 /*!
  * \brief CRTP base class for pipeable sender adaptor closure objects.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 template <detail::class_type D>
 struct sender_adaptor_closure : detail::pipeable::closure_t {};
@@ -59,7 +59,7 @@ namespace beman::execution::detail {
 
 /*!
  * \brief Helper to detect a unique sender_adaptor_closure base class.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <class T>
@@ -67,7 +67,7 @@ auto get_sender_adaptor_closure_base(const sender_adaptor_closure<T>&) -> T;
 
 /*!
  * \brief Checks that T has exactly one sender_adaptor_closure base where U == decay_t<T>.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <class T>
@@ -77,7 +77,7 @@ concept has_unique_sender_adaptor_closure_base = requires(const T& s) {
 
 /*!
  * \brief Determine if a type is a pipeable sender adaptor closure.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <class T>
@@ -87,7 +87,7 @@ concept is_sender_adaptor_closure =
 
 /*!
  * \brief Checks that Closure is a pipeable sender adaptor closure invocable with Sender.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <class Closure, class Sender>
@@ -98,7 +98,7 @@ concept sender_adaptor_closure_for =
 
 /*!
  * \brief Utility alias to copy cv-ref qualifiers from one type onto another.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <class As, class Reqs>
@@ -106,7 +106,7 @@ using apply_cvref_t = decltype(::beman::execution::detail::forward_like<As>(std:
 
 /*!
  * \brief Perfect forwarding call wrapper produced by closure-closure composition via operator|.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <class Inner, class Outer>
@@ -132,7 +132,7 @@ composed_sender_adaptor_closure(Inner&&, Outer&&)
 
 /*!
  * \brief Perfect forwarding call wrapper produced by adaptor(args...) for multi-argument adaptors.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <class Adaptor, movable_value... BoundArgs>
@@ -159,7 +159,7 @@ bound_sender_adaptor_closure(Tag&&, Args&&...)
 
 /*!
  * \brief Factory function producing a bound_sender_adaptor_closure from an adaptor and arguments.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  * \internal
  */
 template <class Tag, class... Args>
@@ -177,7 +177,7 @@ namespace beman::execution::detail::pipeable {
 
 /*!
  * \brief Pipe operator connecting a sender to a pipeable sender adaptor closure.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 template <sender Sender, detail::sender_adaptor_closure_for<Sender> Closure>
 constexpr auto operator|(Sender&& sndr, Closure&& cl) noexcept(detail::nothrow_callable<Closure, Sender>)
@@ -187,7 +187,7 @@ constexpr auto operator|(Sender&& sndr, Closure&& cl) noexcept(detail::nothrow_c
 
 /*!
  * \brief Pipe operator composing two pipeable sender adaptor closure objects.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 template <detail::is_sender_adaptor_closure Inner, detail::is_sender_adaptor_closure Outer>
     requires std::constructible_from<std::decay_t<Inner>, Inner> && std::constructible_from<std::decay_t<Outer>, Outer>
diff --git a/include/beman/execution/detail/set_error.hpp b/include/beman/execution/detail/set_error.hpp
index bed57e4e..83040252 100644
--- a/include/beman/execution/detail/set_error.hpp
+++ b/include/beman/execution/detail/set_error.hpp
@@ -17,7 +17,7 @@ import std;
 namespace beman::execution {
 /*!
  * \brief Type of the customization point object for error completions.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 struct set_error_t {
     template <typename Receiver, typename Error>
@@ -47,7 +47,7 @@ struct set_error_t {
 
 /*!
  * \brief Customization point object for error completions.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 inline constexpr set_error_t set_error{};
 } // namespace beman::execution
diff --git a/include/beman/execution/detail/set_stopped.hpp b/include/beman/execution/detail/set_stopped.hpp
index 8f5c945a..d0061cab 100644
--- a/include/beman/execution/detail/set_stopped.hpp
+++ b/include/beman/execution/detail/set_stopped.hpp
@@ -17,7 +17,7 @@ import std;
 namespace beman::execution {
 /*!
  * \brief Type of the customization point object for cancellation completions.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 struct set_stopped_t {
     template <typename Receiver>
@@ -43,7 +43,7 @@ struct set_stopped_t {
 
 /*!
  * \brief Customization point object for cancellation completions.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 inline constexpr set_stopped_t set_stopped{};
 } // namespace beman::execution
diff --git a/include/beman/execution/detail/set_value.hpp b/include/beman/execution/detail/set_value.hpp
index addeb648..d3216a84 100644
--- a/include/beman/execution/detail/set_value.hpp
+++ b/include/beman/execution/detail/set_value.hpp
@@ -17,7 +17,7 @@ import std;
 namespace beman::execution {
 /*!
  * \brief Type of the customization point object for successful completions.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 struct set_value_t {
     template <typename Receiver, typename... Args>
@@ -45,7 +45,7 @@ struct set_value_t {
 /*!
  * \var set_value
  * \brief Customization point object for successful completions.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 inline constexpr set_value_t set_value{};
 } // namespace beman::execution
diff --git a/include/beman/execution/detail/state_rep.hpp b/include/beman/execution/detail/state_rep.hpp
index 8d369924..da25b7e9 100644
--- a/include/beman/execution/detail/state_rep.hpp
+++ b/include/beman/execution/detail/state_rep.hpp
@@ -4,7 +4,7 @@
 #ifndef INCLUDED_BEMAN_EXECUTION_DETAIL_STATE_REP
 #define INCLUDED_BEMAN_EXECUTION_DETAIL_STATE_REP
 
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #include <type_traits>
 #include <utility>
 
diff --git a/include/beman/execution/detail/stop_source_of.hpp b/include/beman/execution/detail/stop_source_of.hpp
index 85d6e25e..8c8b8de8 100644
--- a/include/beman/execution/detail/stop_source_of.hpp
+++ b/include/beman/execution/detail/stop_source_of.hpp
@@ -4,7 +4,7 @@
 #ifndef INCLUDED_BEMAN_EXECUTION_DETAIL_STOP_SOURCE_OF
 #define INCLUDED_BEMAN_EXECUTION_DETAIL_STOP_SOURCE_OF
 
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 
 // ----------------------------------------------------------------------------
 
diff --git a/include/beman/execution/detail/sync_wait.hpp b/include/beman/execution/detail/sync_wait.hpp
index 4643aadb..1dabcd11 100644
--- a/include/beman/execution/detail/sync_wait.hpp
+++ b/include/beman/execution/detail/sync_wait.hpp
@@ -138,7 +138,7 @@ namespace beman::execution {
 using sync_wait_t = ::beman::execution::detail::sync_wait_t;
 /*!
  * \brief <code>sync_wait(_sender_)</code> starts <code>_sender_</code> and waits for its completion.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  *
  * \details
  * `sync_wait` is a callable object of type `sync_wait_t`. Invoking
@@ -173,7 +173,7 @@ using sync_wait_t = ::beman::execution::detail::sync_wait_t;
  * of the program represented by <code>_sender_</code>.
  *
  * <pre example="doc-sync_wait.cpp">
- * #include <beman/execution/execution.hpp>
+ * #include <beman/execution.hpp>
  * #include <cassert>
  *
  * int main() {
diff --git a/include/beman/execution/detail/then.hpp b/include/beman/execution/detail/then.hpp
index c59594c4..5b59550c 100644
--- a/include/beman/execution/detail/then.hpp
+++ b/include/beman/execution/detail/then.hpp
@@ -192,23 +192,23 @@ struct then_t : ::beman::execution::sender_adaptor_closure<then_t<Completion>> {
 namespace beman::execution {
 /*!
  * \brief <code>then_t</code> is the type of <code>then</code>.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 using then_t = ::beman::execution::detail::then_t<::beman::execution::set_value_t>;
 /*!
  * \brief <code>upon_error_t</code> is the type of <code>upon_error</code>.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 using upon_error_t = ::beman::execution::detail::then_t<::beman::execution::set_error_t>;
 /*!
  * \brief <code>upon_stopped_t</code> is the type of <code>upon_stopped</code>.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 using upon_stopped_t = ::beman::execution::detail::then_t<::beman::execution::set_stopped_t>;
 
 /*!
  * \brief <code>then(_sender_, _fun_)</code> yields a sender transforming a <code>set_value_t(_A_...)</code> completion
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  *
  * \details
  * `then` is a callable object of type `then_t`. Invoking <code>then(_sender_, _fun_)</code> or
@@ -245,7 +245,7 @@ using upon_stopped_t = ::beman::execution::detail::then_t<::beman::execution::se
  * <h4>Example</h4>
  *
  * <pre example="doc-then.cpp">
- * #include <beman/execution/execution.hpp>
+ * #include <beman/execution.hpp>
  * #include <cassert>
  * namespace ex = beman::execution;
  *
@@ -261,7 +261,7 @@ inline constexpr ::beman::execution::then_t then{};
 /*!
  * \brief <code>upon_error(_sender_, _fun_)</code> yields a sender transforming a <code>set_error_t(_E_)</code>
  * completion
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  *
  * \details
  * `upon_error` is a callable object of type `upon_error_t`. Invoking <code>upon_error(_sender_, _fun_)</code> or
@@ -299,7 +299,7 @@ inline constexpr ::beman::execution::then_t then{};
  * <h4>Example</h4>
  *
  * <pre example="doc-upon_error.cpp">
- * #include <beman/execution/execution.hpp>
+ * #include <beman/execution.hpp>
  * #include <cassert>
  * namespace ex = beman::execution;
  *
@@ -315,7 +315,7 @@ inline constexpr ::beman::execution::upon_error_t upon_error{};
 /*!
  * \brief <code>upon_stopped(_sender_, _fun_)</code> yields a sender transforming a <code>set_stopped_t()</code>
  * completion
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  *
  * \details
  * `upon_stopped` is a callable object of type `upon_stopped_t`. Invoking <code>upon_stopped(_sender_, _fun_)</code> or
@@ -350,7 +350,7 @@ inline constexpr ::beman::execution::upon_error_t upon_error{};
  * <h4>Example</h4>
  *
  * <pre example="doc-upon_stopped.cpp">
- * #include <beman/execution/execution.hpp>
+ * #include <beman/execution.hpp>
  * #include <cassert>
  * namespace ex = beman::execution;
  *
diff --git a/include/beman/execution/detail/within.hpp b/include/beman/execution/detail/within.hpp
index 0ec983c9..52385116 100644
--- a/include/beman/execution/detail/within.hpp
+++ b/include/beman/execution/detail/within.hpp
@@ -355,13 +355,13 @@ struct within_t::state {
 namespace beman::execution {
 /*!
  * \brief `within_t` is the type of `within`.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  */
 using within_t = ::beman::execution::detail::within_t;
 
 /*!
  * \brief `within` is a sender adaptor that runs a work sender within the scope of a scope sender.
- * \headerfile beman/execution/execution.hpp <beman/execution/execution.hpp>
+ * \headerfile beman/execution.hpp <beman/execution.hpp>
  *
  * The `within` sender adaptor takes two senders: a scope sender and a work sender. It runs the work sender within the
  * context of the scope.
diff --git a/include/beman/execution/execution.hpp b/include/beman/execution/execution.hpp
index 43c88858..46860df0 100644
--- a/include/beman/execution/execution.hpp
+++ b/include/beman/execution/execution.hpp
@@ -1,4 +1,4 @@
-// include/beman/execution/execution.hpp -*-C++-*-
+// include/beman/execution.hpp -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #ifndef INCLUDED_BEMAN_EXECUTION_EXECUTION
diff --git a/include/beman/execution/stop_token.hpp b/include/beman/execution/stop_token.hpp
index 10283ca2..6fb0dcdf 100644
--- a/include/beman/execution/stop_token.hpp
+++ b/include/beman/execution/stop_token.hpp
@@ -1,4 +1,4 @@
-// include/beman/execution/stop_token.hpp -*-C++-*-
+// include/beman/stop_token.hpp -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #ifndef INCLUDED_BEMAN_EXECUTION_STOP_TOKEN
diff --git a/include/beman/execution26/execution.hpp b/include/beman/execution26/execution.hpp
index 5b685670..6a946240 100644
--- a/include/beman/execution26/execution.hpp
+++ b/include/beman/execution26/execution.hpp
@@ -4,7 +4,7 @@
 #ifndef INCLUDED_BEMAN_EXECUTION26_EXECUTION
 #define INCLUDED_BEMAN_EXECUTION26_EXECUTION
 
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 
 // ----------------------------------------------------------------------------
 
diff --git a/include/beman/execution26/stop_token.hpp b/include/beman/execution26/stop_token.hpp
index dcd6a7ea..38a3ba1e 100644
--- a/include/beman/execution26/stop_token.hpp
+++ b/include/beman/execution26/stop_token.hpp
@@ -4,7 +4,7 @@
 #ifndef INCLUDED_BEMAN_EXECUTION26_STOP_TOKEN
 #define INCLUDED_BEMAN_EXECUTION26_STOP_TOKEN
 
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 
 // ----------------------------------------------------------------------------
 
diff --git a/include/beman/stop_token.hpp b/include/beman/stop_token.hpp
new file mode 100644
index 00000000..5eeac37b
--- /dev/null
+++ b/include/beman/stop_token.hpp
@@ -0,0 +1,9 @@
+// include/beman/stop_token.hpp                                       -*-C++-*-
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+#ifndef INCLUDED_INCLUDE_BEMAN_STOP_TOKEN
+#define INCLUDED_INCLUDE_BEMAN_STOP_TOKEN
+
+#include <beman/execution/stop_token.hpp>
+
+#endif
diff --git a/src/beman/execution/CMakeLists.txt b/src/beman/execution/CMakeLists.txt
index e70629bd..0a5ddf05 100644
--- a/src/beman/execution/CMakeLists.txt
+++ b/src/beman/execution/CMakeLists.txt
@@ -13,6 +13,8 @@ target_sources(
             TYPE HEADERS
             BASE_DIRS ${PROJECT_SOURCE_DIR}/include
             FILES
+                ${PROJECT_SOURCE_DIR}/include/beman/execution.hpp
+                ${PROJECT_SOURCE_DIR}/include/beman/stop_token.hpp
                 ${PROJECT_SOURCE_DIR}/include/beman/execution/execution.hpp
                 ${PROJECT_SOURCE_DIR}/include/beman/execution/functional.hpp
                 ${PROJECT_SOURCE_DIR}/include/beman/execution/stop_token.hpp
diff --git a/tests/beman/execution/exec-bulk.test.cpp b/tests/beman/execution/exec-bulk.test.cpp
index 01a8b0a7..d9978a2e 100644
--- a/tests/beman/execution/exec-bulk.test.cpp
+++ b/tests/beman/execution/exec-bulk.test.cpp
@@ -19,7 +19,7 @@ import beman.execution;
 import beman.execution.detail.meta.combine;
 import beman.execution.detail.meta.unique;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 namespace {
diff --git a/tests/beman/execution/exec-continues-on.test.cpp b/tests/beman/execution/exec-continues-on.test.cpp
index ddfb39d3..53012fba 100644
--- a/tests/beman/execution/exec-continues-on.test.cpp
+++ b/tests/beman/execution/exec-continues-on.test.cpp
@@ -7,7 +7,7 @@
 import beman.execution;
 #else
 #include <beman/execution/detail/continues_on.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/exec-fwd-env.test.cpp b/tests/beman/execution/exec-fwd-env.test.cpp
index 64dc9682..58d6f95c 100644
--- a/tests/beman/execution/exec-fwd-env.test.cpp
+++ b/tests/beman/execution/exec-fwd-env.test.cpp
@@ -6,7 +6,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/exec-general.test.cpp b/tests/beman/execution/exec-general.test.cpp
index 035e16f0..a763a536 100644
--- a/tests/beman/execution/exec-general.test.cpp
+++ b/tests/beman/execution/exec-general.test.cpp
@@ -11,7 +11,7 @@ import beman.execution.detail.movable_value;
 import beman.execution.detail.matching_sig;
 import beman.execution.detail.as_except_ptr;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #include <beman/execution/detail/movable_value.hpp>
 #include <beman/execution/detail/matching_sig.hpp>
 #include <beman/execution/detail/as_except_ptr.hpp>
diff --git a/tests/beman/execution/exec-get-allocator.test.cpp b/tests/beman/execution/exec-get-allocator.test.cpp
index a87131f4..6a78d23a 100644
--- a/tests/beman/execution/exec-get-allocator.test.cpp
+++ b/tests/beman/execution/exec-get-allocator.test.cpp
@@ -7,7 +7,7 @@
 import beman.execution;
 import beman.execution.detail;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/exec-get-domain.test.cpp b/tests/beman/execution/exec-get-domain.test.cpp
index e0a5eea4..098f8e7f 100644
--- a/tests/beman/execution/exec-get-domain.test.cpp
+++ b/tests/beman/execution/exec-get-domain.test.cpp
@@ -6,7 +6,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/exec-get-env.test.cpp b/tests/beman/execution/exec-get-env.test.cpp
index 4b796ce5..b24e4fee 100644
--- a/tests/beman/execution/exec-get-env.test.cpp
+++ b/tests/beman/execution/exec-get-env.test.cpp
@@ -7,7 +7,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/exec-get-stop-token.test.cpp b/tests/beman/execution/exec-get-stop-token.test.cpp
index 27da8d80..cde278bd 100644
--- a/tests/beman/execution/exec-get-stop-token.test.cpp
+++ b/tests/beman/execution/exec-get-stop-token.test.cpp
@@ -6,8 +6,8 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
-#include <beman/execution/stop_token.hpp>
+#include <beman/execution.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/exec-getcomplsigs.test.cpp b/tests/beman/execution/exec-getcomplsigs.test.cpp
index 7259464f..c1b7d4e5 100644
--- a/tests/beman/execution/exec-getcomplsigs.test.cpp
+++ b/tests/beman/execution/exec-getcomplsigs.test.cpp
@@ -6,7 +6,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/exec-inline-scheduler.test.cpp b/tests/beman/execution/exec-inline-scheduler.test.cpp
index 05add412..0a31322f 100644
--- a/tests/beman/execution/exec-inline-scheduler.test.cpp
+++ b/tests/beman/execution/exec-inline-scheduler.test.cpp
@@ -8,7 +8,7 @@
 import beman.execution;
 import beman.execution.detail;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/exec-opstate-start.test.cpp b/tests/beman/execution/exec-opstate-start.test.cpp
index ab9bdded..45511ef0 100644
--- a/tests/beman/execution/exec-opstate-start.test.cpp
+++ b/tests/beman/execution/exec-opstate-start.test.cpp
@@ -6,7 +6,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/exec-parallel-scheduler.test.cpp b/tests/beman/execution/exec-parallel-scheduler.test.cpp
index b3e07275..3915184c 100644
--- a/tests/beman/execution/exec-parallel-scheduler.test.cpp
+++ b/tests/beman/execution/exec-parallel-scheduler.test.cpp
@@ -23,7 +23,7 @@
 import beman.execution;
 import beman.execution.detail.schedule_result_t;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 namespace {
diff --git a/tests/beman/execution/exec-recv-concepts.test.cpp b/tests/beman/execution/exec-recv-concepts.test.cpp
index 3bd019f7..882c2c2c 100644
--- a/tests/beman/execution/exec-recv-concepts.test.cpp
+++ b/tests/beman/execution/exec-recv-concepts.test.cpp
@@ -9,7 +9,7 @@ import beman.execution.detail;
 #include <beman/execution/detail/receiver_of.hpp>
 #include <beman/execution/detail/has_completions.hpp>
 #include <beman/execution/detail/valid_completion_for.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/exec-recv.test.cpp b/tests/beman/execution/exec-recv.test.cpp
index 64685216..a5796087 100644
--- a/tests/beman/execution/exec-recv.test.cpp
+++ b/tests/beman/execution/exec-recv.test.cpp
@@ -6,7 +6,7 @@
 import beman.execution;
 import beman.execution.detail;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/exec-sender-adaptor-closure.test.cpp b/tests/beman/execution/exec-sender-adaptor-closure.test.cpp
index af86f3da..583ca305 100644
--- a/tests/beman/execution/exec-sender-adaptor-closure.test.cpp
+++ b/tests/beman/execution/exec-sender-adaptor-closure.test.cpp
@@ -9,7 +9,7 @@
 import beman.execution;
 import beman.execution.detail;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 namespace {
diff --git a/tests/beman/execution/exec-set-error.test.cpp b/tests/beman/execution/exec-set-error.test.cpp
index ec6b6276..62f3033b 100644
--- a/tests/beman/execution/exec-set-error.test.cpp
+++ b/tests/beman/execution/exec-set-error.test.cpp
@@ -7,7 +7,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/exec-set-stopped.test.cpp b/tests/beman/execution/exec-set-stopped.test.cpp
index 639bcdb8..49d3c9ce 100644
--- a/tests/beman/execution/exec-set-stopped.test.cpp
+++ b/tests/beman/execution/exec-set-stopped.test.cpp
@@ -7,7 +7,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 namespace {
diff --git a/tests/beman/execution/exec-set-value.test.cpp b/tests/beman/execution/exec-set-value.test.cpp
index 2e3a9e3a..dfad10be 100644
--- a/tests/beman/execution/exec-set-value.test.cpp
+++ b/tests/beman/execution/exec-set-value.test.cpp
@@ -6,7 +6,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/exec-snd-concepts.test.cpp b/tests/beman/execution/exec-snd-concepts.test.cpp
index b1dce03a..41d7dce9 100644
--- a/tests/beman/execution/exec-snd-concepts.test.cpp
+++ b/tests/beman/execution/exec-snd-concepts.test.cpp
@@ -14,7 +14,7 @@ import beman.execution.detail;
 #include <beman/execution/detail/sender_in.hpp>
 #include <beman/execution/detail/tag_of_t.hpp>
 
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/exec-snd-expos.test.cpp b/tests/beman/execution/exec-snd-expos.test.cpp
index 4bebfa6e..fc93c276 100644
--- a/tests/beman/execution/exec-snd-expos.test.cpp
+++ b/tests/beman/execution/exec-snd-expos.test.cpp
@@ -35,7 +35,7 @@ import beman.execution.detail;
 #include <beman/execution/detail/basic_receiver.hpp>
 #include <beman/execution/detail/completion_tag.hpp>
 #include <beman/execution/detail/scheduler.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #include <beman/execution/detail/tag_of_t.hpp>
 
 #include <beman/execution/detail/suppress_push.hpp>
diff --git a/tests/beman/execution/exec-snd-transform.test.cpp b/tests/beman/execution/exec-snd-transform.test.cpp
index 8bc36e90..24621587 100644
--- a/tests/beman/execution/exec-snd-transform.test.cpp
+++ b/tests/beman/execution/exec-snd-transform.test.cpp
@@ -8,7 +8,7 @@
 import beman.execution;
 import beman.execution.detail;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/exec-split.test.cpp b/tests/beman/execution/exec-split.test.cpp
index 511ca11d..d553fec2 100644
--- a/tests/beman/execution/exec-split.test.cpp
+++ b/tests/beman/execution/exec-split.test.cpp
@@ -15,7 +15,7 @@ import beman.execution.detail;
 #include <beman/execution/detail/meta_combine.hpp>
 #include <beman/execution/detail/split.hpp>
 #include <beman/execution/detail/type_list.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/exec-starts-on.test.cpp b/tests/beman/execution/exec-starts-on.test.cpp
index a11d2373..743f0886 100644
--- a/tests/beman/execution/exec-starts-on.test.cpp
+++ b/tests/beman/execution/exec-starts-on.test.cpp
@@ -8,7 +8,7 @@
 import beman.execution;
 #else
 #include <beman/execution/detail/starts_on.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/exec-sync-wait-with-variant.test.cpp b/tests/beman/execution/exec-sync-wait-with-variant.test.cpp
index 169cf255..3d73ca61 100644
--- a/tests/beman/execution/exec-sync-wait-with-variant.test.cpp
+++ b/tests/beman/execution/exec-sync-wait-with-variant.test.cpp
@@ -12,7 +12,7 @@
 import beman.execution;
 import beman.execution.detail;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/exec-sync-wait.test.cpp b/tests/beman/execution/exec-sync-wait.test.cpp
index 864b1ea9..dee72f63 100644
--- a/tests/beman/execution/exec-sync-wait.test.cpp
+++ b/tests/beman/execution/exec-sync-wait.test.cpp
@@ -10,7 +10,7 @@
 import beman.execution;
 import beman.execution.detail;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/exec-utils-cmplsigs.test.cpp b/tests/beman/execution/exec-utils-cmplsigs.test.cpp
index 1961d8c1..028e99f0 100644
--- a/tests/beman/execution/exec-utils-cmplsigs.test.cpp
+++ b/tests/beman/execution/exec-utils-cmplsigs.test.cpp
@@ -15,7 +15,7 @@ import beman.execution.detail;
 #include <beman/execution/detail/gather_signatures.hpp>
 #include <beman/execution/detail/indirect_meta_apply.hpp>
 #include <beman/execution/detail/sender_in.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/exec-when-all.test.cpp b/tests/beman/execution/exec-when-all.test.cpp
index 3ccf01de..0e2127f4 100644
--- a/tests/beman/execution/exec-when-all.test.cpp
+++ b/tests/beman/execution/exec-when-all.test.cpp
@@ -14,7 +14,7 @@ import beman.execution;
 #include <beman/execution/detail/when_all.hpp>
 #include <beman/execution/detail/stop_callback_for_t.hpp>
 #include <beman/execution/detail/when_all_with_variant.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/exec-with-awaitable-senders.test.cpp b/tests/beman/execution/exec-with-awaitable-senders.test.cpp
index b47c8cf4..69ebf6c8 100644
--- a/tests/beman/execution/exec-with-awaitable-senders.test.cpp
+++ b/tests/beman/execution/exec-with-awaitable-senders.test.cpp
@@ -6,7 +6,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // This examples shows how to await on senders
diff --git a/tests/beman/execution/execution-queryable-concept.test.cpp b/tests/beman/execution/execution-queryable-concept.test.cpp
index 8737e915..ea7f11e6 100644
--- a/tests/beman/execution/execution-queryable-concept.test.cpp
+++ b/tests/beman/execution/execution-queryable-concept.test.cpp
@@ -6,7 +6,7 @@
 import beman.execution;
 import beman.execution.detail;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/execution-syn.test.cpp b/tests/beman/execution/execution-syn.test.cpp
index c21897dc..bce5e507 100644
--- a/tests/beman/execution/execution-syn.test.cpp
+++ b/tests/beman/execution/execution-syn.test.cpp
@@ -33,7 +33,7 @@ import beman.execution.detail;
 #include <beman/execution/detail/variant_or_empty.hpp>
 #include <beman/execution/detail/completion_signatures_of_t.hpp>
 #include <beman/execution/detail/as_awaitable.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 
 #include <beman/execution/detail/suppress_push.hpp>
 #endif
diff --git a/tests/beman/execution/function-objects.test.cpp b/tests/beman/execution/function-objects.test.cpp
index bbce2161..53570cb8 100644
--- a/tests/beman/execution/function-objects.test.cpp
+++ b/tests/beman/execution/function-objects.test.cpp
@@ -5,7 +5,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 TEST(function_objects) {
diff --git a/tests/beman/execution/include/test/stop_token.hpp b/tests/beman/execution/include/test/stop_token.hpp
index 610e4811..cff2eea9 100644
--- a/tests/beman/execution/include/test/stop_token.hpp
+++ b/tests/beman/execution/include/test/stop_token.hpp
@@ -30,7 +30,7 @@ import beman.execution;
 #else
 #include <beman/execution/detail/immovable.hpp>
 #include <beman/execution/detail/stoppable_source.hpp>
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/include/test/thread_pool.hpp b/tests/beman/execution/include/test/thread_pool.hpp
index 7fa7a56f..57a33c84 100644
--- a/tests/beman/execution/include/test/thread_pool.hpp
+++ b/tests/beman/execution/include/test/thread_pool.hpp
@@ -15,7 +15,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/issue-144.test.cpp b/tests/beman/execution/issue-144.test.cpp
index a58086aa..a2c8cd70 100644
--- a/tests/beman/execution/issue-144.test.cpp
+++ b/tests/beman/execution/issue-144.test.cpp
@@ -5,7 +5,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 namespace bex = beman::execution;
diff --git a/tests/beman/execution/issue-174.test.cpp b/tests/beman/execution/issue-174.test.cpp
index 0b777fc0..df5eb3f5 100644
--- a/tests/beman/execution/issue-174.test.cpp
+++ b/tests/beman/execution/issue-174.test.cpp
@@ -7,7 +7,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 namespace ex = beman::execution;
diff --git a/tests/beman/execution/issue-186.test.cpp b/tests/beman/execution/issue-186.test.cpp
index e566dc0d..f9729b86 100644
--- a/tests/beman/execution/issue-186.test.cpp
+++ b/tests/beman/execution/issue-186.test.cpp
@@ -5,7 +5,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 namespace ex = beman::execution;
diff --git a/tests/beman/execution/notify.test.cpp b/tests/beman/execution/notify.test.cpp
index f0a298f1..f2139d70 100644
--- a/tests/beman/execution/notify.test.cpp
+++ b/tests/beman/execution/notify.test.cpp
@@ -8,7 +8,7 @@ import beman.execution;
 import beman.execution.detail.notify;
 #else
 #include <beman/execution/detail/notify.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/execution.hpp>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/tests/beman/execution/stopcallback-cons.test.cpp b/tests/beman/execution/stopcallback-cons.test.cpp
index 56e1c5ab..6f0c6c55 100644
--- a/tests/beman/execution/stopcallback-cons.test.cpp
+++ b/tests/beman/execution/stopcallback-cons.test.cpp
@@ -7,7 +7,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 TEST(stopcallback_cons) {
diff --git a/tests/beman/execution/stopcallback-general.test.cpp b/tests/beman/execution/stopcallback-general.test.cpp
index d26d336e..8bc17f27 100644
--- a/tests/beman/execution/stopcallback-general.test.cpp
+++ b/tests/beman/execution/stopcallback-general.test.cpp
@@ -7,7 +7,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 namespace {
diff --git a/tests/beman/execution/stopcallback-inplace-cons.test.cpp b/tests/beman/execution/stopcallback-inplace-cons.test.cpp
index 85903402..3b167967 100644
--- a/tests/beman/execution/stopcallback-inplace-cons.test.cpp
+++ b/tests/beman/execution/stopcallback-inplace-cons.test.cpp
@@ -6,7 +6,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 namespace {
diff --git a/tests/beman/execution/stopcallback-inplace-general.test.cpp b/tests/beman/execution/stopcallback-inplace-general.test.cpp
index a6899781..fe9a62bf 100644
--- a/tests/beman/execution/stopcallback-inplace-general.test.cpp
+++ b/tests/beman/execution/stopcallback-inplace-general.test.cpp
@@ -7,7 +7,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 TEST(stopcallback_inplace_general) {
diff --git a/tests/beman/execution/stopcallback-inplace.test.cpp b/tests/beman/execution/stopcallback-inplace.test.cpp
index 87124880..af25a941 100644
--- a/tests/beman/execution/stopcallback-inplace.test.cpp
+++ b/tests/beman/execution/stopcallback-inplace.test.cpp
@@ -5,7 +5,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 TEST(stopcallback_inplace) {
diff --git a/tests/beman/execution/stopcallback.test.cpp b/tests/beman/execution/stopcallback.test.cpp
index bafe64af..159c574c 100644
--- a/tests/beman/execution/stopcallback.test.cpp
+++ b/tests/beman/execution/stopcallback.test.cpp
@@ -5,7 +5,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 TEST(stopcallback) {
diff --git a/tests/beman/execution/stopsource-cons.test.cpp b/tests/beman/execution/stopsource-cons.test.cpp
index b8d58916..90d9c6e2 100644
--- a/tests/beman/execution/stopsource-cons.test.cpp
+++ b/tests/beman/execution/stopsource-cons.test.cpp
@@ -10,7 +10,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 namespace {
diff --git a/tests/beman/execution/stopsource-general.test.cpp b/tests/beman/execution/stopsource-general.test.cpp
index accb4906..d54dc143 100644
--- a/tests/beman/execution/stopsource-general.test.cpp
+++ b/tests/beman/execution/stopsource-general.test.cpp
@@ -6,7 +6,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 TEST(stopsource_general) {
diff --git a/tests/beman/execution/stopsource-inplace-cons.test.cpp b/tests/beman/execution/stopsource-inplace-cons.test.cpp
index db2231c9..75cc4a45 100644
--- a/tests/beman/execution/stopsource-inplace-cons.test.cpp
+++ b/tests/beman/execution/stopsource-inplace-cons.test.cpp
@@ -6,7 +6,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 TEST(stopsource_inplace_cons) {
diff --git a/tests/beman/execution/stopsource-inplace-general.test.cpp b/tests/beman/execution/stopsource-inplace-general.test.cpp
index e54b9688..50c7ac60 100644
--- a/tests/beman/execution/stopsource-inplace-general.test.cpp
+++ b/tests/beman/execution/stopsource-inplace-general.test.cpp
@@ -6,7 +6,7 @@
 import beman.execution;
 import beman.execution.detail;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 TEST(stopsource_inplace_general) {
diff --git a/tests/beman/execution/stopsource-inplace-mem.test.cpp b/tests/beman/execution/stopsource-inplace-mem.test.cpp
index b5ca35b4..8eca40a2 100644
--- a/tests/beman/execution/stopsource-inplace-mem.test.cpp
+++ b/tests/beman/execution/stopsource-inplace-mem.test.cpp
@@ -5,7 +5,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 namespace {
diff --git a/tests/beman/execution/stopsource-inplace.test.cpp b/tests/beman/execution/stopsource-inplace.test.cpp
index 7dab8cdf..8c258087 100644
--- a/tests/beman/execution/stopsource-inplace.test.cpp
+++ b/tests/beman/execution/stopsource-inplace.test.cpp
@@ -5,7 +5,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 TEST(stopsource_inplace) {
diff --git a/tests/beman/execution/stopsource-mem.test.cpp b/tests/beman/execution/stopsource-mem.test.cpp
index 5a2e4e28..10d9d3aa 100644
--- a/tests/beman/execution/stopsource-mem.test.cpp
+++ b/tests/beman/execution/stopsource-mem.test.cpp
@@ -6,7 +6,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 namespace {
diff --git a/tests/beman/execution/stopsource.test.cpp b/tests/beman/execution/stopsource.test.cpp
index 5084d8b2..f67acd2c 100644
--- a/tests/beman/execution/stopsource.test.cpp
+++ b/tests/beman/execution/stopsource.test.cpp
@@ -5,7 +5,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 TEST(stopsource) {
diff --git a/tests/beman/execution/stoptoken-concepts.test.cpp b/tests/beman/execution/stoptoken-concepts.test.cpp
index 8f83758f..30e35d04 100644
--- a/tests/beman/execution/stoptoken-concepts.test.cpp
+++ b/tests/beman/execution/stoptoken-concepts.test.cpp
@@ -13,7 +13,7 @@ import beman.execution.detail.stop_callback_for_t;
 import beman.execution.detail.stoppable_callback_for;
 import beman.execution.detail.stoppable_source;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 namespace {
diff --git a/tests/beman/execution/stoptoken-general.test.cpp b/tests/beman/execution/stoptoken-general.test.cpp
index c0d9366b..2ababc2e 100644
--- a/tests/beman/execution/stoptoken-general.test.cpp
+++ b/tests/beman/execution/stoptoken-general.test.cpp
@@ -5,7 +5,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 TEST(stoptoken_general) {
diff --git a/tests/beman/execution/stoptoken-inplace-general.test.cpp b/tests/beman/execution/stoptoken-inplace-general.test.cpp
index e9b0a01f..db3d7567 100644
--- a/tests/beman/execution/stoptoken-inplace-general.test.cpp
+++ b/tests/beman/execution/stoptoken-inplace-general.test.cpp
@@ -7,7 +7,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 TEST(stoptoken_inplace_general) {
diff --git a/tests/beman/execution/stoptoken-inplace-members.test.cpp b/tests/beman/execution/stoptoken-inplace-members.test.cpp
index 4d7e7a7c..430816c1 100644
--- a/tests/beman/execution/stoptoken-inplace-members.test.cpp
+++ b/tests/beman/execution/stoptoken-inplace-members.test.cpp
@@ -5,7 +5,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 namespace {
diff --git a/tests/beman/execution/stoptoken-inplace.test.cpp b/tests/beman/execution/stoptoken-inplace.test.cpp
index 3adc807b..93997b16 100644
--- a/tests/beman/execution/stoptoken-inplace.test.cpp
+++ b/tests/beman/execution/stoptoken-inplace.test.cpp
@@ -5,7 +5,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 TEST(stoptoken_inplace) {
diff --git a/tests/beman/execution/stoptoken-mem.test.cpp b/tests/beman/execution/stoptoken-mem.test.cpp
index bc0f53c5..3190945d 100644
--- a/tests/beman/execution/stoptoken-mem.test.cpp
+++ b/tests/beman/execution/stoptoken-mem.test.cpp
@@ -7,7 +7,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 namespace {
diff --git a/tests/beman/execution/stoptoken-never-general.test.cpp b/tests/beman/execution/stoptoken-never-general.test.cpp
index c3c62a56..924bac7e 100644
--- a/tests/beman/execution/stoptoken-never-general.test.cpp
+++ b/tests/beman/execution/stoptoken-never-general.test.cpp
@@ -5,7 +5,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 TEST(stoptoken_never_general) {
diff --git a/tests/beman/execution/stoptoken-never.test.cpp b/tests/beman/execution/stoptoken-never.test.cpp
index e4fe5c72..6bd87610 100644
--- a/tests/beman/execution/stoptoken-never.test.cpp
+++ b/tests/beman/execution/stoptoken-never.test.cpp
@@ -5,7 +5,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 TEST(stoptoken_never) {
diff --git a/tests/beman/execution/stoptoken.test.cpp b/tests/beman/execution/stoptoken.test.cpp
index 0518e6aa..991e2ac6 100644
--- a/tests/beman/execution/stoptoken.test.cpp
+++ b/tests/beman/execution/stoptoken.test.cpp
@@ -5,7 +5,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 TEST(stoptoken) {
diff --git a/tests/beman/execution/thread-stoptoken-intro.test.cpp b/tests/beman/execution/thread-stoptoken-intro.test.cpp
index 9e2e7c7f..191691e7 100644
--- a/tests/beman/execution/thread-stoptoken-intro.test.cpp
+++ b/tests/beman/execution/thread-stoptoken-intro.test.cpp
@@ -7,7 +7,7 @@
 import beman.execution;
 #else
 #include <beman/execution/detail/immovable.hpp>
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 namespace {
diff --git a/tests/beman/execution/thread-stoptoken-syn.compile.test.cpp b/tests/beman/execution/thread-stoptoken-syn.compile.test.cpp
index 21bd2e1a..ed288f1e 100644
--- a/tests/beman/execution/thread-stoptoken-syn.compile.test.cpp
+++ b/tests/beman/execution/thread-stoptoken-syn.compile.test.cpp
@@ -8,7 +8,7 @@ import beman.execution.detail.stoppable_source;
 import beman.execution.detail.stoppable_callback_for;
 import beman.execution.detail.stop_callback_for_t;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 namespace {
diff --git a/tests/beman/execution/thread-stoptoken.test.cpp b/tests/beman/execution/thread-stoptoken.test.cpp
index fe257c21..afcbbad9 100644
--- a/tests/beman/execution/thread-stoptoken.test.cpp
+++ b/tests/beman/execution/thread-stoptoken.test.cpp
@@ -5,7 +5,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 TEST(thread_stoptoken) {
diff --git a/tests/beman/execution/thread.test.cpp b/tests/beman/execution/thread.test.cpp
index d57184e9..5c951952 100644
--- a/tests/beman/execution/thread.test.cpp
+++ b/tests/beman/execution/thread.test.cpp
@@ -5,7 +5,7 @@
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/stop_token.hpp>
+#include <beman/stop_token.hpp>
 #endif
 
 TEST(thread) {