diff --git a/.clang-tidy b/.clang-tidy
index a41fa60a21e5..4a01e6c89116 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -11,6 +11,7 @@ Checks: >
     -bugprone-exception-escape,
     -bugprone-forward-declaration-namespace,
     -bugprone-macro-parentheses,
+    -bugprone-branch-clone,
     modernize-use-nullptr,
     misc-assert-side-effect
     misc-dangling-handle
diff --git a/cmake/templates/HPXConfig.cmake.in b/cmake/templates/HPXConfig.cmake.in
index d97e32388089..81ab41a40b07 100644
--- a/cmake/templates/HPXConfig.cmake.in
+++ b/cmake/templates/HPXConfig.cmake.in
@@ -104,6 +104,13 @@ set(HPX_CXX_COMPILER_VERSION
 # ##############################################################################
 # Setup the imported libraries (publicly linked) #
 
+# Propagate Amplifier settings, if needed
+if(HPX_WITH_ITTNOTIFY)
+  set(AMPLIFIER_INCLUDE_DIR "@AMPLIFIER_INCLUDE_DIR@")
+  set(AMPLIFIER_LIBRARY "@AMPLIFIER_LIBRARY@")
+  set(AMPLIFIER_ROOT "@AMPLIFIER_ROOT@")
+endif()
+
 # Allocator
 set(HPX_JEMALLOC_ROOT "@JEMALLOC_ROOT@")
 set(HPX_TCMALLOC_ROOT "@TCMALLOC_ROOT@")
diff --git a/components/parcel_plugins/coalescing/src/performance_counters.cpp b/components/parcel_plugins/coalescing/src/performance_counters.cpp
index 91b31970ed19..722367e78075 100644
--- a/components/parcel_plugins/coalescing/src/performance_counters.cpp
+++ b/components/parcel_plugins/coalescing/src/performance_counters.cpp
@@ -92,7 +92,6 @@ namespace hpx::plugins::parcel {
     {
         switch (info.type_)
         {
-        // NOLINTNEXTLINE(bugprone-branch-clone)
         case performance_counters::counter_type::monotonically_increasing:
         {
             performance_counters::counter_path_elements paths;
@@ -176,7 +175,6 @@ namespace hpx::plugins::parcel {
     {
         switch (info.type_)
         {
-        // NOLINTNEXTLINE(bugprone-branch-clone)
         case performance_counters::counter_type::monotonically_increasing:
         {
             performance_counters::counter_path_elements paths;
@@ -261,7 +259,6 @@ namespace hpx::plugins::parcel {
     {
         switch (info.type_)
         {
-        // NOLINTNEXTLINE(bugprone-branch-clone)
         case performance_counters::counter_type::average_count:
         {
             performance_counters::counter_path_elements paths;
diff --git a/examples/1d_stencil/1d_stencil_1.cpp b/examples/1d_stencil/1d_stencil_1.cpp
index a026498c447d..0837a5967322 100644
--- a/examples/1d_stencil/1d_stencil_1.cpp
+++ b/examples/1d_stencil/1d_stencil_1.cpp
@@ -11,8 +11,8 @@
 // This example provides a serial base line implementation. No parallelization
 // is performed.
 
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/examples/1d_stencil/1d_stencil_2.cpp b/examples/1d_stencil/1d_stencil_2.cpp
index 2cd9e8c01662..f4738d506cba 100644
--- a/examples/1d_stencil/1d_stencil_2.cpp
+++ b/examples/1d_stencil/1d_stencil_2.cpp
@@ -19,9 +19,9 @@
 // overheads.
 
 #include <hpx/assert.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/examples/1d_stencil/1d_stencil_3.cpp b/examples/1d_stencil/1d_stencil_3.cpp
index f7308f67f0f6..c9cdd05f490f 100644
--- a/examples/1d_stencil/1d_stencil_3.cpp
+++ b/examples/1d_stencil/1d_stencil_3.cpp
@@ -14,9 +14,9 @@
 // example is still fully serial, no parallelization is performed.
 
 #include <hpx/assert.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/examples/1d_stencil/1d_stencil_4.cpp b/examples/1d_stencil/1d_stencil_4.cpp
index f80e4a57a2cd..de59844927af 100644
--- a/examples/1d_stencil/1d_stencil_4.cpp
+++ b/examples/1d_stencil/1d_stencil_4.cpp
@@ -15,11 +15,11 @@
 // computation. This example is still fully local but demonstrates nice
 // scalability on SMP machines.
 
+#include <hpx/algorithm.hpp>
 #include <hpx/assert.hpp>
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/synchronization.hpp>
 
diff --git a/examples/1d_stencil/1d_stencil_4_parallel.cpp b/examples/1d_stencil/1d_stencil_4_parallel.cpp
index df8b697035e6..eb8c102255a6 100644
--- a/examples/1d_stencil/1d_stencil_4_parallel.cpp
+++ b/examples/1d_stencil/1d_stencil_4_parallel.cpp
@@ -14,10 +14,10 @@
 // computation. This example is still fully local but demonstrates nice
 // scalability on SMP machines.
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
 
 #if !defined(HPX_HAVE_CXX17_SHARED_PTR_ARRAY)
diff --git a/examples/1d_stencil/1d_stencil_channel.cpp b/examples/1d_stencil/1d_stencil_channel.cpp
index 7997b2e0c5d2..2d460386cf62 100644
--- a/examples/1d_stencil/1d_stencil_channel.cpp
+++ b/examples/1d_stencil/1d_stencil_channel.cpp
@@ -12,18 +12,15 @@
 
 #include <hpx/config.hpp>
 #if !defined(HPX_COMPUTE_DEVICE_CODE)
-#include "communicator.hpp"
-#include "stencil.hpp"
-
 #include <hpx/algorithm.hpp>
+#include <hpx/compute.hpp>
 #include <hpx/hpx_init.hpp>
 #include <hpx/include/async.hpp>
 #include <hpx/include/components.hpp>
-#include <hpx/include/compute.hpp>
 #include <hpx/include/lcos.hpp>
 #include <hpx/include/util.hpp>
 #include <hpx/iterator_support/counting_shape.hpp>
-#include <hpx/program_options/options_description.hpp>
+#include <hpx/program_options.hpp>
 
 #include <algorithm>
 #include <array>
@@ -32,6 +29,9 @@
 #include <string>
 #include <vector>
 
+#include "communicator.hpp"
+#include "stencil.hpp"
+
 using communication_type = double;
 
 HPX_REGISTER_CHANNEL_DECLARATION(communication_type, stencil_communication)
diff --git a/examples/1d_stencil/stencil.hpp b/examples/1d_stencil/stencil.hpp
index f4c9fcb2e0da..665bd679ceb6 100644
--- a/examples/1d_stencil/stencil.hpp
+++ b/examples/1d_stencil/stencil.hpp
@@ -6,11 +6,11 @@
 
 #pragma once
 
+#include <hpx/algorithm.hpp>
+#include <hpx/compute.hpp>
 #include <hpx/include/async.hpp>
 #include <hpx/include/components.hpp>
-#include <hpx/include/compute.hpp>
 #include <hpx/include/lcos.hpp>
-#include <hpx/include/parallel_algorithm.hpp>
 #include <hpx/include/util.hpp>
 
 #include <algorithm>
diff --git a/examples/balancing/hpx_thread_phase.cpp b/examples/balancing/hpx_thread_phase.cpp
index 0ae7bed2ab6d..78e26058d838 100644
--- a/examples/balancing/hpx_thread_phase.cpp
+++ b/examples/balancing/hpx_thread_phase.cpp
@@ -5,12 +5,12 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/barrier.hpp>
-#include <hpx/local/functional.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/mutex.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/barrier.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/concurrency.hpp>
+#include <hpx/mutex.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <cstddef>
diff --git a/examples/balancing/os_thread_num.cpp b/examples/balancing/os_thread_num.cpp
index 947e3cb524a4..de24c628042b 100644
--- a/examples/balancing/os_thread_num.cpp
+++ b/examples/balancing/os_thread_num.cpp
@@ -4,13 +4,13 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/barrier.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/runtime.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/barrier.hpp>
+#include <hpx/format.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/allocator_support.hpp>
 #include <hpx/modules/concurrency.hpp>
-#include <hpx/modules/format.hpp>
+#include <hpx/runtime.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/examples/future_reduce/rnd_future_reduce.cpp b/examples/future_reduce/rnd_future_reduce.cpp
index 39a820f59ee9..fbc0dac57487 100644
--- a/examples/future_reduce/rnd_future_reduce.cpp
+++ b/examples/future_reduce/rnd_future_reduce.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/runtime.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/runtime.hpp>
 //
 #include <iostream>
 #include <random>
diff --git a/examples/hello_world_component/hello_world_client.cpp b/examples/hello_world_component/hello_world_client.cpp
index b07efdbaeb5e..990ad72df960 100644
--- a/examples/hello_world_component/hello_world_client.cpp
+++ b/examples/hello_world_component/hello_world_client.cpp
@@ -33,7 +33,7 @@ int main()
 #endif
 //]
 #else
-#include <hpx/local/thread.hpp>
+#include <hpx/thread.hpp>
 #include <hpx/wrap_main.hpp>
 
 #include <iostream>
diff --git a/examples/jacobi/jacobi.cpp b/examples/jacobi/jacobi.cpp
index 6cb6d77661d9..fa6d1545084e 100644
--- a/examples/jacobi/jacobi.cpp
+++ b/examples/jacobi/jacobi.cpp
@@ -7,8 +7,8 @@
 
 #include <hpx/config.hpp>
 #if !defined(HPX_COMPUTE_DEVICE_CODE)
+#include <hpx/chrono.hpp>
 #include <hpx/init.hpp>
-#include <hpx/local/chrono.hpp>
 
 #include "jacobi_component/grid.hpp"
 #include "jacobi_component/solver.hpp"
diff --git a/examples/jacobi_smp/jacobi.cpp b/examples/jacobi_smp/jacobi.cpp
index 9a0a40ca2e2b..951b7f5b7020 100644
--- a/examples/jacobi_smp/jacobi.cpp
+++ b/examples/jacobi_smp/jacobi.cpp
@@ -6,10 +6,10 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #if !defined(JACOBI_SMP_NO_HPX)
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #endif
 
-#include <hpx/modules/program_options.hpp>
+#include <hpx/program_options.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/examples/jacobi_smp/jacobi_hpx.cpp b/examples/jacobi_smp/jacobi_hpx.cpp
index 603cb1181ddf..ce8172fe5eac 100644
--- a/examples/jacobi_smp/jacobi_hpx.cpp
+++ b/examples/jacobi_smp/jacobi_hpx.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
 
 #include "jacobi.hpp"
 
diff --git a/examples/jacobi_smp/jacobi_nonuniform.cpp b/examples/jacobi_smp/jacobi_nonuniform.cpp
index a6819a776344..497d78a0b7d9 100644
--- a/examples/jacobi_smp/jacobi_nonuniform.cpp
+++ b/examples/jacobi_smp/jacobi_nonuniform.cpp
@@ -6,10 +6,10 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #if !defined(JACOBI_SMP_NO_HPX)
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #endif
 
-#include <hpx/modules/program_options.hpp>
+#include <hpx/program_options.hpp>
 
 #include <boost/phoenix.hpp>
 #include <boost/spirit/include/qi_action.hpp>
diff --git a/examples/jacobi_smp/jacobi_nonuniform_hpx.cpp b/examples/jacobi_smp/jacobi_nonuniform_hpx.cpp
index d40043f4c801..c9437857ef65 100644
--- a/examples/jacobi_smp/jacobi_nonuniform_hpx.cpp
+++ b/examples/jacobi_smp/jacobi_nonuniform_hpx.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/functional.hpp>
-#include <hpx/local/future.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/future.hpp>
 
 #include "jacobi_nonuniform.hpp"
 
diff --git a/examples/jacobi_smp/jacobi_nonuniform_omp.hpp b/examples/jacobi_smp/jacobi_nonuniform_omp.hpp
index 8d8f559d9fcd..70028035b7cf 100644
--- a/examples/jacobi_smp/jacobi_nonuniform_omp.hpp
+++ b/examples/jacobi_smp/jacobi_nonuniform_omp.hpp
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <hpx/local/chrono.hpp>
+#include <hpx/chrono.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/examples/jacobi_smp/jacobi_omp.hpp b/examples/jacobi_smp/jacobi_omp.hpp
index c56c54a0caef..19cfa0567ecd 100644
--- a/examples/jacobi_smp/jacobi_omp.hpp
+++ b/examples/jacobi_smp/jacobi_omp.hpp
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <hpx/local/chrono.hpp>
+#include <hpx/chrono.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/examples/qt/qt.cpp b/examples/qt/qt.cpp
index 59d2e9fed4db..b9ec0114492c 100644
--- a/examples/qt/qt.cpp
+++ b/examples/qt/qt.cpp
@@ -55,7 +55,7 @@ void qt_main(int argc, char** argv)
     app.exec();
 }
 
-int hpx_main(int argc, char** argv)
+int hpx_main(int argc, char* argv[])
 {
     {
         // Get a reference to one of the main thread
diff --git a/examples/quickstart/barrier_docs.cpp b/examples/quickstart/barrier_docs.cpp
index 967bfe68ddf3..f89fb05aa165 100644
--- a/examples/quickstart/barrier_docs.cpp
+++ b/examples/quickstart/barrier_docs.cpp
@@ -7,9 +7,9 @@
 // This example is meant for inclusion in the documentation.
 
 //[barrier_docs
-#include <hpx/local/barrier.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/barrier.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 
diff --git a/examples/quickstart/composable_guard.cpp b/examples/quickstart/composable_guard.cpp
index ff66fddee1ae..2dc80f8a3ab4 100644
--- a/examples/quickstart/composable_guard.cpp
+++ b/examples/quickstart/composable_guard.cpp
@@ -3,7 +3,7 @@
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/lcos_local.hpp>
 
 #include <atomic>
diff --git a/examples/quickstart/condition_variable_docs.cpp b/examples/quickstart/condition_variable_docs.cpp
index 0b382037c635..ffe1677a3044 100644
--- a/examples/quickstart/condition_variable_docs.cpp
+++ b/examples/quickstart/condition_variable_docs.cpp
@@ -7,10 +7,10 @@
 // This example is meant for inclusion in the documentation.
 
 //[condition_variable_docs
-#include <hpx/local/condition_variable.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/mutex.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/condition_variable.hpp>
+#include <hpx/init.hpp>
+#include <hpx/mutex.hpp>
+#include <hpx/thread.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/examples/quickstart/counting_semaphore_docs.cpp b/examples/quickstart/counting_semaphore_docs.cpp
index 09adda9c246f..488771f52872 100644
--- a/examples/quickstart/counting_semaphore_docs.cpp
+++ b/examples/quickstart/counting_semaphore_docs.cpp
@@ -7,9 +7,9 @@
 // This example is meant for inclusion in the documentation.
 
 //[counting_semaphore_docs
-#include <hpx/local/init.hpp>
-#include <hpx/local/semaphore.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/init.hpp>
+#include <hpx/semaphore.hpp>
+#include <hpx/thread.hpp>
 
 #include <iostream>
 
diff --git a/examples/quickstart/customize_async.cpp b/examples/quickstart/customize_async.cpp
index 0346de7d4c54..1b466e0ea36a 100644
--- a/examples/quickstart/customize_async.cpp
+++ b/examples/quickstart/customize_async.cpp
@@ -9,9 +9,9 @@
 // processing unit) for a thread which is created by calling hpx::post() or
 // hpx::async().
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 
 #include <algorithm>
 #include <iostream>
diff --git a/examples/quickstart/enumerate_threads.cpp b/examples/quickstart/enumerate_threads.cpp
index 01c1ea74e856..51cc39bf12a8 100644
--- a/examples/quickstart/enumerate_threads.cpp
+++ b/examples/quickstart/enumerate_threads.cpp
@@ -6,9 +6,9 @@
 
 //[threads_docs
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/thread.hpp>
 
 #include <functional>
 #include <iostream>
diff --git a/examples/quickstart/event_synchronization.cpp b/examples/quickstart/event_synchronization.cpp
index 5147e44b3d40..c610fee9d060 100644
--- a/examples/quickstart/event_synchronization.cpp
+++ b/examples/quickstart/event_synchronization.cpp
@@ -7,8 +7,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <hpx/assert.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/synchronization.hpp>
 
 #include <cstddef>
diff --git a/examples/quickstart/fibonacci_await.cpp b/examples/quickstart/fibonacci_await.cpp
index 90eb0a7f1d3d..c6d5fe42883e 100644
--- a/examples/quickstart/fibonacci_await.cpp
+++ b/examples/quickstart/fibonacci_await.cpp
@@ -9,10 +9,10 @@
 // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3564.pdf). The
 // necessary transformations are performed by hand.
 
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/functional.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/examples/quickstart/fibonacci_dataflow.cpp b/examples/quickstart/fibonacci_dataflow.cpp
index ef4cdbefb861..cdd63e0c37a8 100644
--- a/examples/quickstart/fibonacci_dataflow.cpp
+++ b/examples/quickstart/fibonacci_dataflow.cpp
@@ -10,10 +10,10 @@
 // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3564.pdf). The
 // necessary transformations are performed by hand.
 
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/modules/format.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/format.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 
 #include <cstdint>
 #include <iostream>
diff --git a/examples/quickstart/fibonacci_futures.cpp b/examples/quickstart/fibonacci_futures.cpp
index b70288b3df07..9897948b532e 100644
--- a/examples/quickstart/fibonacci_futures.cpp
+++ b/examples/quickstart/fibonacci_futures.cpp
@@ -7,10 +7,10 @@
 // This is a purely local version demonstrating different versions of making
 // the calculation of a fibonacci asynchronous.
 
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/modules/format.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/format.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/examples/quickstart/fibonacci_local.cpp b/examples/quickstart/fibonacci_local.cpp
index f1beb42307f9..910a6f5285ab 100644
--- a/examples/quickstart/fibonacci_local.cpp
+++ b/examples/quickstart/fibonacci_local.cpp
@@ -11,10 +11,10 @@
 // fibonacci_futures.cpp. This example is mainly intended to demonstrate async,
 // futures and get for the documentation.
 
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/modules/format.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/format.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 
 #include <cstdint>
 #include <iostream>
diff --git a/examples/quickstart/file_serialization.cpp b/examples/quickstart/file_serialization.cpp
index 47db3b5303dc..1f9437e43d12 100644
--- a/examples/quickstart/file_serialization.cpp
+++ b/examples/quickstart/file_serialization.cpp
@@ -7,7 +7,7 @@
 // This example demonstrates how the HPX serialization archives could be used
 // to directly store/load to/from a file.
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/serialization.hpp>
 
 #include <cstddef>
diff --git a/examples/quickstart/for_each_docs.cpp b/examples/quickstart/for_each_docs.cpp
index 9e1c76512704..78f06b388fb9 100644
--- a/examples/quickstart/for_each_docs.cpp
+++ b/examples/quickstart/for_each_docs.cpp
@@ -7,9 +7,9 @@
 // This example is meant for inclusion in the documentation.
 
 //[for_each_docs
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <vector>
diff --git a/examples/quickstart/hello_world_2.cpp b/examples/quickstart/hello_world_2.cpp
index d919db9b1390..a13bac6dfb35 100644
--- a/examples/quickstart/hello_world_2.cpp
+++ b/examples/quickstart/hello_world_2.cpp
@@ -12,7 +12,7 @@
 #include <hpx/hpx_init.hpp>
 #include <hpx/iostream.hpp>
 
-int hpx_main(int, char**)
+int hpx_main(int, char*[])
 {
     // Say hello to the world!
     hpx::cout << "Hello World!\n" << std::flush;
diff --git a/examples/quickstart/hello_world_3.cpp b/examples/quickstart/hello_world_3.cpp
index 76afe9b7337f..eaf71c68bd34 100644
--- a/examples/quickstart/hello_world_3.cpp
+++ b/examples/quickstart/hello_world_3.cpp
@@ -9,11 +9,11 @@
 // explicitly and execute a HPX-thread printing "Hello World!" once. That's all.
 
 //[hello_world_3_getting_started
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 
-int hpx_main(int, char**)
+int hpx_main(int, char*[])
 {
     // Say hello to the world!
     std::cout << "Hello World!\n" << std::flush;
diff --git a/examples/quickstart/init_globally.cpp b/examples/quickstart/init_globally.cpp
index 3c42d6159af1..75d941b581e7 100644
--- a/examples/quickstart/init_globally.cpp
+++ b/examples/quickstart/init_globally.cpp
@@ -17,13 +17,12 @@
 // This scheme is generally useful if HPX should be initialized from a shared
 // library and the main executable might not even be aware of this.
 
+#include <hpx/condition_variable.hpp>
+#include <hpx/functional.hpp>
 #include <hpx/init.hpp>
-#include <hpx/local/condition_variable.hpp>
-#include <hpx/local/functional.hpp>
-#include <hpx/local/mutex.hpp>
-#include <hpx/local/runtime.hpp>
-#include <hpx/local/thread.hpp>
-#include <hpx/runtime_local/run_as_hpx_thread.hpp>
+#include <hpx/modules/runtime_local.hpp>
+#include <hpx/mutex.hpp>
+#include <hpx/thread.hpp>
 
 #include <mutex>
 #include <string>
diff --git a/examples/quickstart/interval_timer.cpp b/examples/quickstart/interval_timer.cpp
index 6030f1fdb249..40504c31b948 100644
--- a/examples/quickstart/interval_timer.cpp
+++ b/examples/quickstart/interval_timer.cpp
@@ -8,9 +8,9 @@
 // make_ready_future_after to orchestrate timed operations with 'normal'
 // asynchronous work.
 
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/runtime_local.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <iostream>
diff --git a/examples/quickstart/latch_local.cpp b/examples/quickstart/latch_local.cpp
index ba0a40617949..8ee34046da9c 100644
--- a/examples/quickstart/latch_local.cpp
+++ b/examples/quickstart/latch_local.cpp
@@ -6,9 +6,9 @@
 
 // Demonstrate the use of hpx::latch
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/latch.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/latch.hpp>
 
 #include <cstddef>
 #include <functional>
diff --git a/examples/quickstart/local_channel.cpp b/examples/quickstart/local_channel.cpp
index b3bf87707155..2e18a6241ed7 100644
--- a/examples/quickstart/local_channel.cpp
+++ b/examples/quickstart/local_channel.cpp
@@ -7,9 +7,9 @@
 // This example demonstrates the use of a channel which is very similar to the
 // equally named feature in the Go language.
 
-#include <hpx/local/channel.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/channel.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <numeric>
diff --git a/examples/quickstart/local_channel_docs.cpp b/examples/quickstart/local_channel_docs.cpp
index 39cd8ef358df..76f5ee7af6eb 100644
--- a/examples/quickstart/local_channel_docs.cpp
+++ b/examples/quickstart/local_channel_docs.cpp
@@ -7,8 +7,8 @@
 // This example is meant for inclusion in the documentation.
 
 #include <hpx/assert.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/synchronization.hpp>
 
 #include <iostream>
diff --git a/examples/quickstart/matrix_multiplication.cpp b/examples/quickstart/matrix_multiplication.cpp
index 5ff70e6fd734..3453286d1788 100644
--- a/examples/quickstart/matrix_multiplication.cpp
+++ b/examples/quickstart/matrix_multiplication.cpp
@@ -8,9 +8,9 @@
 
 // Parallel implementation of matrix multiplication
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/examples/quickstart/mutex_docs.cpp b/examples/quickstart/mutex_docs.cpp
index 34e6d315b71f..e3ff72bf3ed9 100644
--- a/examples/quickstart/mutex_docs.cpp
+++ b/examples/quickstart/mutex_docs.cpp
@@ -7,9 +7,9 @@
 // This example is meant for inclusion in the documentation.
 
 //[mutex_docs
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/mutex.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/mutex.hpp>
 
 #include <iostream>
 
diff --git a/examples/quickstart/pipeline1.cpp b/examples/quickstart/pipeline1.cpp
index 2e7ec1f578af..84ad47d260c5 100644
--- a/examples/quickstart/pipeline1.cpp
+++ b/examples/quickstart/pipeline1.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/string_util.hpp>
 
 #include <iostream>
diff --git a/examples/quickstart/potpourri.cpp b/examples/quickstart/potpourri.cpp
index de178e7073e4..325c1fb7a6d4 100644
--- a/examples/quickstart/potpourri.cpp
+++ b/examples/quickstart/potpourri.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <random>
diff --git a/examples/quickstart/safe_object.cpp b/examples/quickstart/safe_object.cpp
index e7d4a7994448..6f7dba27e2d1 100644
--- a/examples/quickstart/safe_object.cpp
+++ b/examples/quickstart/safe_object.cpp
@@ -4,11 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
 #include <hpx/assert.hpp>
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/runtime.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
+#include <hpx/runtime.hpp>
 
 #include <cstddef>
 #include <cstdlib>
diff --git a/examples/quickstart/shared_mutex.cpp b/examples/quickstart/shared_mutex.cpp
index 55cb9f4d51dd..86125e40156d 100644
--- a/examples/quickstart/shared_mutex.cpp
+++ b/examples/quickstart/shared_mutex.cpp
@@ -7,10 +7,10 @@
 // This example was released to the public domain by Stephan T. Lavavej
 // (see: https://channel9.msdn.com/Shows/C9-GoingNative/GoingNative-40-Updated-STL-in-VS-2015-feat-STL)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/shared_mutex.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/shared_mutex.hpp>
+#include <hpx/thread.hpp>
 #include <hpx/type_support/unused.hpp>
 
 #include <atomic>
diff --git a/examples/quickstart/simple_future_continuation.cpp b/examples/quickstart/simple_future_continuation.cpp
index ccbab0a4db0f..2926b5f22e7c 100644
--- a/examples/quickstart/simple_future_continuation.cpp
+++ b/examples/quickstart/simple_future_continuation.cpp
@@ -4,11 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/runtime.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/runtime.hpp>
+#include <hpx/thread.hpp>
 
 #include <iostream>
 
diff --git a/examples/quickstart/sort_by_key_demo.cpp b/examples/quickstart/sort_by_key_demo.cpp
index 3098cc0f4ef2..ac8c747be7cb 100644
--- a/examples/quickstart/sort_by_key_demo.cpp
+++ b/examples/quickstart/sort_by_key_demo.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/parallel/algorithms/sort_by_key.hpp>
 
 #include <cstddef>
diff --git a/examples/quickstart/task_group_docs.cpp b/examples/quickstart/task_group_docs.cpp
index aca5357ff301..28526bd01b47 100644
--- a/examples/quickstart/task_group_docs.cpp
+++ b/examples/quickstart/task_group_docs.cpp
@@ -8,8 +8,9 @@
 
 //[task_group_docs
 
-#include <hpx/local/init.hpp>
-#include <hpx/parallel/task_group.hpp>
+#include <hpx/experimental/task_group.hpp>
+#include <hpx/init.hpp>
+
 #include <iostream>
 
 void task1()
diff --git a/examples/quickstart/timed_futures.cpp b/examples/quickstart/timed_futures.cpp
index a55ab694f4ad..f754ed7cf4cc 100644
--- a/examples/quickstart/timed_futures.cpp
+++ b/examples/quickstart/timed_futures.cpp
@@ -8,9 +8,9 @@
 // make_ready_future_after to orchestrate timed operations with 'normal'
 // asynchronous work.
 
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 
 #include <chrono>
 #include <iostream>
diff --git a/examples/quickstart/timed_wake.cpp b/examples/quickstart/timed_wake.cpp
index 2ddc0d9bd2ee..3f4bbfc18d69 100644
--- a/examples/quickstart/timed_wake.cpp
+++ b/examples/quickstart/timed_wake.cpp
@@ -5,9 +5,9 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <hpx/config.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/init.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <iostream>
diff --git a/examples/quickstart/use_main_thread.cpp b/examples/quickstart/use_main_thread.cpp
index 58a62fc8eea3..8a8cfa40bb2e 100644
--- a/examples/quickstart/use_main_thread.cpp
+++ b/examples/quickstart/use_main_thread.cpp
@@ -7,7 +7,7 @@
 // The purpose of this demo is to show how it is possible to start HPX without
 // blocking the main thread.
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 
diff --git a/examples/quickstart/vector_counting_dotproduct.cpp b/examples/quickstart/vector_counting_dotproduct.cpp
index a7c6c761a95b..b854cdbabfaf 100644
--- a/examples/quickstart/vector_counting_dotproduct.cpp
+++ b/examples/quickstart/vector_counting_dotproduct.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/numeric.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
+#include <hpx/numeric.hpp>
 
 #include <algorithm>
 #include <iostream>
diff --git a/examples/quickstart/vector_zip_dotproduct.cpp b/examples/quickstart/vector_zip_dotproduct.cpp
index 334425ec2b0f..5cfc7ffb827a 100644
--- a/examples/quickstart/vector_zip_dotproduct.cpp
+++ b/examples/quickstart/vector_zip_dotproduct.cpp
@@ -4,11 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/numeric.hpp>
-#include <hpx/local/tuple.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
+#include <hpx/numeric.hpp>
+#include <hpx/tuple.hpp>
 
 #include <iostream>
 #include <iterator>
diff --git a/examples/quickstart/wait_composition.cpp b/examples/quickstart/wait_composition.cpp
index c1db2de20b66..30cd6e1e487f 100644
--- a/examples/quickstart/wait_composition.cpp
+++ b/examples/quickstart/wait_composition.cpp
@@ -6,9 +6,9 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/tuple.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/tuple.hpp>
 
 #include <iostream>
 
diff --git a/examples/transpose/transpose_serial.cpp b/examples/transpose/transpose_serial.cpp
index a1927b20f559..7beab1125e5c 100644
--- a/examples/transpose/transpose_serial.cpp
+++ b/examples/transpose/transpose_serial.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/init.hpp>
 
 #include <algorithm>
 #include <cstdint>
diff --git a/examples/transpose/transpose_serial_block.cpp b/examples/transpose/transpose_serial_block.cpp
index e8ee6614b116..220e6db0920e 100644
--- a/examples/transpose/transpose_serial_block.cpp
+++ b/examples/transpose/transpose_serial_block.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/init.hpp>
 
 #include <algorithm>
 #include <cstdint>
diff --git a/examples/transpose/transpose_serial_vector.cpp b/examples/transpose/transpose_serial_vector.cpp
index 4fd1c1540455..40d0d0559468 100644
--- a/examples/transpose/transpose_serial_vector.cpp
+++ b/examples/transpose/transpose_serial_vector.cpp
@@ -8,9 +8,9 @@
 #include <hpx/config.hpp>
 
 #if !defined(HPX_COMPUTE_DEVICE_CODE)
+#include <hpx/chrono.hpp>
 #include <hpx/include/partitioned_vector.hpp>
 #include <hpx/init.hpp>
-#include <hpx/local/chrono.hpp>
 
 #include <algorithm>
 #include <cstdint>
diff --git a/examples/transpose/transpose_smp.cpp b/examples/transpose/transpose_smp.cpp
index d92afeb4200e..d2ee25167451 100644
--- a/examples/transpose/transpose_smp.cpp
+++ b/examples/transpose/transpose_smp.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/numeric.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
+#include <hpx/numeric.hpp>
 
 #include <algorithm>
 #include <cstdint>
diff --git a/examples/transpose/transpose_smp_block.cpp b/examples/transpose/transpose_smp_block.cpp
index 05f8016af145..eb5258620cd0 100644
--- a/examples/transpose/transpose_smp_block.cpp
+++ b/examples/transpose/transpose_smp_block.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/numeric.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
+#include <hpx/numeric.hpp>
 
 #include <algorithm>
 #include <cstdint>
diff --git a/init/CMakeLists.txt b/init/CMakeLists.txt
index 159b6c356c1b..a7d08a65e0eb 100644
--- a/init/CMakeLists.txt
+++ b/init/CMakeLists.txt
@@ -18,6 +18,7 @@ set(hpx_init_SOURCES
 list(
   APPEND
   hpx_init_SOURCES
+  hpx_init.cpp
   hpx_main.cpp
   hpx_main_argc_argv.cpp
   hpx_main_variables_map.cpp
diff --git a/init/src/hpx_init.cpp b/init/src/hpx_init.cpp
new file mode 100644
index 000000000000..9f66e5004e19
--- /dev/null
+++ b/init/src/hpx_init.cpp
@@ -0,0 +1,26 @@
+//  Copyright (c) 2023 Hartmut Kaiser
+//
+//  SPDX-License-Identifier: BSL-1.0
+//  Distributed under the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#include <hpx/hpx_init.hpp>
+#include <hpx/program_options/variables_map.hpp>
+
+#include <functional>
+
+///////////////////////////////////////////////////////////////////////////////
+int hpx_main(hpx::program_options::variables_map& vm);
+
+///////////////////////////////////////////////////////////////////////////////
+namespace hpx_startup {
+
+    std::function<int(hpx::program_options::variables_map&)> const&
+    get_main_func()
+    {
+        static std::function main_f(
+            static_cast<hpx::hpx_main_type>(::hpx_main));
+
+        return main_f;
+    }
+}    // namespace hpx_startup
diff --git a/init/src/hpx_main.cpp b/init/src/hpx_main.cpp
index 4eef547c3189..2fa3e540ebd5 100644
--- a/init/src/hpx_main.cpp
+++ b/init/src/hpx_main.cpp
@@ -1,4 +1,4 @@
-//  Copyright (c) 2007-2012 Hartmut Kaiser
+//  Copyright (c) 2007-2023 Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -15,12 +15,16 @@
 #include <vector>
 
 ///////////////////////////////////////////////////////////////////////////////
+int hpx_main(int argc, char* argv[]);
+
+//////////////////////////////////////////////////////////////////////////////
 // Forwarding of hpx_main, if necessary. This has to be in a separate
 // translation unit to ensure the linker can pick or ignore this function,
 // depending on whether the main executable defines this symbol or not.
 HPX_WEAK_SYMBOL int hpx_main()
 {
-    std::string cmdline(hpx::get_config_entry("hpx.reconstructed_cmd_line", ""));
+    std::string cmdline(
+        hpx::get_config_entry("hpx.reconstructed_cmd_line", ""));
 
     using namespace hpx::program_options;
 #if defined(HPX_WINDOWS)
@@ -29,30 +33,30 @@ HPX_WEAK_SYMBOL int hpx_main()
     std::vector<std::string> args = split_unix(cmdline);
 #endif
 
-    constexpr char const hpx_prefix[] = "--hpx:";
-    constexpr char const hpx_prefix_len =
-        (sizeof(hpx_prefix) / sizeof(hpx_prefix[0])) - 1;
+    constexpr char hpx_prefix[] = "--hpx:";
+    constexpr std::size_t hpx_prefix_len = std::size(hpx_prefix) - 1;
 
-    constexpr char const hpx_positional[] = "positional";
-    constexpr char const hpx_positional_len =
-        (sizeof(hpx_positional) / sizeof(hpx_positional[0])) - 1;
+    constexpr char hpx_positional[] = "positional";
+    constexpr std::size_t hpx_positional_len = std::size(hpx_positional) - 1;
 
     // Copy all arguments which are not hpx related to a temporary array
-    std::vector<char*> argv(args.size()+1);
+    std::vector<char*> argv(args.size() + 1);
     std::size_t argcount = 0;
-    for (auto& arg : args)
+    for (auto& argument : args)
     {
-        if (0 != arg.compare(0, hpx_prefix_len, hpx_prefix))
+        if (0 != argument.compare(0, hpx_prefix_len, hpx_prefix))
         {
-            argv[argcount++] = const_cast<char*>(arg.data());
+            argv[argcount++] = const_cast<char*>(argument.data());
         }
         else if (0 ==
-            arg.compare(hpx_prefix_len, hpx_positional_len, hpx_positional))
+            argument.compare(
+                hpx_prefix_len, hpx_positional_len, hpx_positional))
         {
-            std::string::size_type p = arg.find_first_of("=");
-            if (p != std::string::npos) {
-                arg = arg.substr(p+1);
-                argv[argcount++] = const_cast<char*>(arg.data());
+            std::string::size_type const p = argument.find_first_of('=');
+            if (p != std::string::npos)
+            {
+                argument = argument.substr(p + 1);
+                argv[argcount++] = const_cast<char*>(argument.data());
             }
         }
     }
diff --git a/init/src/hpx_main_argc_argv.cpp b/init/src/hpx_main_argc_argv.cpp
index 7308109a4d30..c8ea4a421f37 100644
--- a/init/src/hpx_main_argc_argv.cpp
+++ b/init/src/hpx_main_argc_argv.cpp
@@ -11,10 +11,10 @@
 // Forwarding of hpx_main, if necessary. This has to be in a separate
 // translation unit to ensure the linker can pick or ignore this function,
 // depending on whether the main executable defines this symbol or not.
-int hpx_main(int argc, char** argv)
+int hpx_main(int argc, char* argv[])
 {
     // Invoke hpx_startup::user_main
-    int result = hpx_startup::user_main(argc, argv);
+    int const result = hpx_startup::user_main(argc, argv);
     hpx::finalize();
     return result;
 }
diff --git a/init/src/hpx_main_variables_map.cpp b/init/src/hpx_main_variables_map.cpp
index a74edc25b09e..b950ae11389d 100644
--- a/init/src/hpx_main_variables_map.cpp
+++ b/init/src/hpx_main_variables_map.cpp
@@ -1,4 +1,4 @@
-//  Copyright (c) 2007-2012 Hartmut Kaiser
+//  Copyright (c) 2007-2023 Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -8,6 +8,9 @@
 
 #include <hpx/program_options/variables_map.hpp>
 
+///////////////////////////////////////////////////////////////////////////////
+int hpx_main();
+
 ///////////////////////////////////////////////////////////////////////////////
 // Forwarding of hpx_main, if necessary. This has to be in a separate
 // translation unit to ensure the linker can pick or ignore this function,
diff --git a/libs/core/affinity/tests/unit/parse_affinity_options.cpp b/libs/core/affinity/tests/unit/parse_affinity_options.cpp
index 1d2186707579..3265afe00482 100644
--- a/libs/core/affinity/tests/unit/parse_affinity_options.cpp
+++ b/libs/core/affinity/tests/unit/parse_affinity_options.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/affinity/parse_affinity_options.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/modules/affinity.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/include/hpx/parallel/container_numeric.hpp b/libs/core/algorithms/include/hpx/parallel/container_numeric.hpp
index d224525a30da..5257d8a445af 100644
--- a/libs/core/algorithms/include/hpx/parallel/container_numeric.hpp
+++ b/libs/core/algorithms/include/hpx/parallel/container_numeric.hpp
@@ -13,4 +13,5 @@
 #include <hpx/parallel/container_algorithms/inclusive_scan.hpp>
 #include <hpx/parallel/container_algorithms/reduce.hpp>
 #include <hpx/parallel/container_algorithms/transform_exclusive_scan.hpp>
+#include <hpx/parallel/container_algorithms/transform_inclusive_scan.hpp>
 #include <hpx/parallel/container_algorithms/transform_reduce.hpp>
diff --git a/libs/core/algorithms/include/hpx/parallel/unseq/reduce_helpers.hpp b/libs/core/algorithms/include/hpx/parallel/unseq/reduce_helpers.hpp
index c1a4707a8b5b..4f89171ee642 100644
--- a/libs/core/algorithms/include/hpx/parallel/unseq/reduce_helpers.hpp
+++ b/libs/core/algorithms/include/hpx/parallel/unseq/reduce_helpers.hpp
@@ -11,6 +11,7 @@
 #include <hpx/functional/detail/invoke.hpp>
 #include <hpx/type_support/construct_at.hpp>
 
+#include <algorithm>
 #include <cstddef>
 #include <cstdint>
 #include <memory>
@@ -406,7 +407,8 @@ namespace hpx::parallel::util::detail {
         reduce(Iter1 it1, Iter2 it2, std::size_t count, T init, Reduce r,
             Convert conv)
         {
-            constexpr std::size_t block_size = HPX_LANE_SIZE / (sizeof(T) * 8);
+            constexpr std::size_t block_size = (std::max)(
+                HPX_LANE_SIZE / (sizeof(T) * 8), static_cast<std::size_t>(1));
 
             // To small, just run sequential
             if (count <= 2 * block_size)
diff --git a/libs/core/algorithms/tests/performance/benchmark_inplace_merge.cpp b/libs/core/algorithms/tests/performance/benchmark_inplace_merge.cpp
index 8dc4be7631ba..9fbdcc93b27a 100644
--- a/libs/core/algorithms/tests/performance/benchmark_inplace_merge.cpp
+++ b/libs/core/algorithms/tests/performance/benchmark_inplace_merge.cpp
@@ -6,15 +6,12 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/format.hpp>
-#include <hpx/modules/program_options.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/format.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/timing.hpp>
-#include <hpx/parallel/algorithms/copy.hpp>
-#include <hpx/parallel/algorithms/generate.hpp>
-#include <hpx/parallel/algorithms/merge.hpp>
-#include <hpx/parallel/algorithms/sort.hpp>
+#include <hpx/program_options.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/performance/benchmark_is_heap.cpp b/libs/core/algorithms/tests/performance/benchmark_is_heap.cpp
index d77f15c42a35..8083e506637d 100644
--- a/libs/core/algorithms/tests/performance/benchmark_is_heap.cpp
+++ b/libs/core/algorithms/tests/performance/benchmark_is_heap.cpp
@@ -6,13 +6,12 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/format.hpp>
-#include <hpx/modules/program_options.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/format.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/timing.hpp>
-#include <hpx/parallel/algorithms/generate.hpp>
-#include <hpx/parallel/algorithms/is_heap.hpp>
+#include <hpx/program_options.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/performance/benchmark_is_heap_until.cpp b/libs/core/algorithms/tests/performance/benchmark_is_heap_until.cpp
index 217abdd29414..be347a6d384e 100644
--- a/libs/core/algorithms/tests/performance/benchmark_is_heap_until.cpp
+++ b/libs/core/algorithms/tests/performance/benchmark_is_heap_until.cpp
@@ -6,13 +6,12 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/format.hpp>
-#include <hpx/modules/program_options.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/format.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/timing.hpp>
-#include <hpx/parallel/algorithms/generate.hpp>
-#include <hpx/parallel/algorithms/is_heap.hpp>
+#include <hpx/program_options.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/performance/benchmark_merge.cpp b/libs/core/algorithms/tests/performance/benchmark_merge.cpp
index 9318669ee64c..af8b609f921b 100644
--- a/libs/core/algorithms/tests/performance/benchmark_merge.cpp
+++ b/libs/core/algorithms/tests/performance/benchmark_merge.cpp
@@ -6,14 +6,12 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/format.hpp>
-#include <hpx/modules/program_options.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/format.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/timing.hpp>
-#include <hpx/parallel/algorithms/generate.hpp>
-#include <hpx/parallel/algorithms/merge.hpp>
-#include <hpx/parallel/algorithms/sort.hpp>
+#include <hpx/program_options.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/performance/benchmark_nth_element.cpp b/libs/core/algorithms/tests/performance/benchmark_nth_element.cpp
index 9e9923bc7602..08388a0f5a8a 100644
--- a/libs/core/algorithms/tests/performance/benchmark_nth_element.cpp
+++ b/libs/core/algorithms/tests/performance/benchmark_nth_element.cpp
@@ -8,15 +8,15 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //-----------------------------------------------------------------------------
+#include <hpx/algorithm.hpp>
 #include <hpx/assert.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/modules/program_options.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <chrono>
-#include <ciso646>
+#include <hpx/program_options.hpp>
 
-#include <hpx/parallel/algorithms/nth_element.hpp>
 #include <algorithm>
+#include <chrono>
+#include <ciso646>
 #include <iostream>
 #include <random>
 #include <stdio.h>
diff --git a/libs/core/algorithms/tests/performance/benchmark_nth_element_parallel.cpp b/libs/core/algorithms/tests/performance/benchmark_nth_element_parallel.cpp
index 8a08807f29f2..37279a760188 100644
--- a/libs/core/algorithms/tests/performance/benchmark_nth_element_parallel.cpp
+++ b/libs/core/algorithms/tests/performance/benchmark_nth_element_parallel.cpp
@@ -8,15 +8,15 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //-----------------------------------------------------------------------------
+#include <hpx/algorithm.hpp>
 #include <hpx/assert.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/modules/program_options.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <chrono>
-#include <ciso646>
+#include <hpx/program_options.hpp>
 
-#include <hpx/parallel/algorithms/nth_element.hpp>
 #include <algorithm>
+#include <chrono>
+#include <ciso646>
 #include <iostream>
 #include <random>
 #include <stdio.h>
diff --git a/libs/core/algorithms/tests/performance/benchmark_partial_sort.cpp b/libs/core/algorithms/tests/performance/benchmark_partial_sort.cpp
index d613cae0f94b..6556dadeb8cf 100644
--- a/libs/core/algorithms/tests/performance/benchmark_partial_sort.cpp
+++ b/libs/core/algorithms/tests/performance/benchmark_partial_sort.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/parallel/algorithms/partial_sort.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 
 #include <algorithm>
 #include <chrono>
diff --git a/libs/core/algorithms/tests/performance/benchmark_partial_sort_parallel.cpp b/libs/core/algorithms/tests/performance/benchmark_partial_sort_parallel.cpp
index fb8a1bbfed1e..78c2e5ff8553 100644
--- a/libs/core/algorithms/tests/performance/benchmark_partial_sort_parallel.cpp
+++ b/libs/core/algorithms/tests/performance/benchmark_partial_sort_parallel.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/parallel/algorithms/partial_sort.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 
 #include <algorithm>
 #include <chrono>
diff --git a/libs/core/algorithms/tests/performance/benchmark_partition.cpp b/libs/core/algorithms/tests/performance/benchmark_partition.cpp
index bec05ae5c8f5..b471e315c84a 100644
--- a/libs/core/algorithms/tests/performance/benchmark_partition.cpp
+++ b/libs/core/algorithms/tests/performance/benchmark_partition.cpp
@@ -6,14 +6,12 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/format.hpp>
-#include <hpx/modules/program_options.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/format.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/timing.hpp>
-#include <hpx/parallel/algorithms/copy.hpp>
-#include <hpx/parallel/algorithms/generate.hpp>
-#include <hpx/parallel/algorithms/partition.hpp>
+#include <hpx/program_options.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/performance/benchmark_partition_copy.cpp b/libs/core/algorithms/tests/performance/benchmark_partition_copy.cpp
index bc55a3cf51d8..0dfe31c3e926 100644
--- a/libs/core/algorithms/tests/performance/benchmark_partition_copy.cpp
+++ b/libs/core/algorithms/tests/performance/benchmark_partition_copy.cpp
@@ -6,13 +6,12 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/format.hpp>
-#include <hpx/modules/program_options.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/format.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/timing.hpp>
-#include <hpx/parallel/algorithms/generate.hpp>
-#include <hpx/parallel/algorithms/partition.hpp>
+#include <hpx/program_options.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/performance/benchmark_remove.cpp b/libs/core/algorithms/tests/performance/benchmark_remove.cpp
index 07f56db005f6..2b9479c7a5e7 100644
--- a/libs/core/algorithms/tests/performance/benchmark_remove.cpp
+++ b/libs/core/algorithms/tests/performance/benchmark_remove.cpp
@@ -6,14 +6,12 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/format.hpp>
-#include <hpx/modules/program_options.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/format.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/timing.hpp>
-#include <hpx/parallel/algorithms/copy.hpp>
-#include <hpx/parallel/algorithms/generate.hpp>
-#include <hpx/parallel/algorithms/remove.hpp>
+#include <hpx/program_options.hpp>
 
 #include <algorithm>
 #include <array>
diff --git a/libs/core/algorithms/tests/performance/benchmark_remove_if.cpp b/libs/core/algorithms/tests/performance/benchmark_remove_if.cpp
index d2f662676305..6ea46a9f5a32 100644
--- a/libs/core/algorithms/tests/performance/benchmark_remove_if.cpp
+++ b/libs/core/algorithms/tests/performance/benchmark_remove_if.cpp
@@ -6,14 +6,12 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/format.hpp>
-#include <hpx/modules/program_options.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/format.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/timing.hpp>
-#include <hpx/parallel/algorithms/copy.hpp>
-#include <hpx/parallel/algorithms/generate.hpp>
-#include <hpx/parallel/algorithms/remove.hpp>
+#include <hpx/program_options.hpp>
 
 #include <algorithm>
 #include <array>
diff --git a/libs/core/algorithms/tests/performance/benchmark_scan_algorithms.cpp b/libs/core/algorithms/tests/performance/benchmark_scan_algorithms.cpp
index efd6578fc477..21a94efc1651 100644
--- a/libs/core/algorithms/tests/performance/benchmark_scan_algorithms.cpp
+++ b/libs/core/algorithms/tests/performance/benchmark_scan_algorithms.cpp
@@ -4,15 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/program_options.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/copy.hpp>
-#include <hpx/parallel/algorithms/exclusive_scan.hpp>
-#include <hpx/parallel/algorithms/inclusive_scan.hpp>
-#include <hpx/parallel/algorithms/transform_exclusive_scan.hpp>
-#include <hpx/parallel/algorithms/transform_inclusive_scan.hpp>
-#include <hpx/parallel/algorithms/unique.hpp>
+#include <hpx/numeric.hpp>
+#include <hpx/program_options.hpp>
 
 #include <array>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/performance/benchmark_unique.cpp b/libs/core/algorithms/tests/performance/benchmark_unique.cpp
index b1c81059bd39..8b469a17a139 100644
--- a/libs/core/algorithms/tests/performance/benchmark_unique.cpp
+++ b/libs/core/algorithms/tests/performance/benchmark_unique.cpp
@@ -6,14 +6,12 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/format.hpp>
-#include <hpx/modules/program_options.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/format.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/timing.hpp>
-#include <hpx/parallel/algorithms/copy.hpp>
-#include <hpx/parallel/algorithms/generate.hpp>
-#include <hpx/parallel/algorithms/unique.hpp>
+#include <hpx/program_options.hpp>
 
 #include <algorithm>
 #include <array>
diff --git a/libs/core/algorithms/tests/performance/benchmark_unique_copy.cpp b/libs/core/algorithms/tests/performance/benchmark_unique_copy.cpp
index f6c71a71887c..20efa151e4a2 100644
--- a/libs/core/algorithms/tests/performance/benchmark_unique_copy.cpp
+++ b/libs/core/algorithms/tests/performance/benchmark_unique_copy.cpp
@@ -6,13 +6,12 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/format.hpp>
-#include <hpx/modules/program_options.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/format.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/timing.hpp>
-#include <hpx/parallel/algorithms/generate.hpp>
-#include <hpx/parallel/algorithms/unique.hpp>
+#include <hpx/program_options.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/performance/foreach_report.cpp b/libs/core/algorithms/tests/performance/foreach_report.cpp
index 24c07a0c42ad..9d91491271ec 100644
--- a/libs/core/algorithms/tests/performance/foreach_report.cpp
+++ b/libs/core/algorithms/tests/performance/foreach_report.cpp
@@ -9,11 +9,11 @@
 #include <hpx/config.hpp>
 
 #if !defined(HPX_COMPUTE_DEVICE_CODE)
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/modules/compute_local.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/compute.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include "foreach_scaling_helpers.hpp"
diff --git a/libs/core/algorithms/tests/performance/foreach_scaling.cpp b/libs/core/algorithms/tests/performance/foreach_scaling.cpp
index dff47968af19..1a98161d0ada 100644
--- a/libs/core/algorithms/tests/performance/foreach_scaling.cpp
+++ b/libs/core/algorithms/tests/performance/foreach_scaling.cpp
@@ -8,10 +8,10 @@
 #include <hpx/config.hpp>
 
 #if !defined(HPX_COMPUTE_DEVICE_CODE)
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 
 #include "foreach_scaling_helpers.hpp"
 
diff --git a/libs/core/algorithms/tests/performance/foreach_scaling_helpers.hpp b/libs/core/algorithms/tests/performance/foreach_scaling_helpers.hpp
index 02bd18949327..6c218c333fa3 100644
--- a/libs/core/algorithms/tests/performance/foreach_scaling_helpers.hpp
+++ b/libs/core/algorithms/tests/performance/foreach_scaling_helpers.hpp
@@ -10,10 +10,10 @@
 #include <hpx/config.hpp>
 
 #if !defined(HPX_COMPUTE_DEVICE_CODE)
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 
 #include "worker_timed.hpp"
 
@@ -66,12 +66,12 @@ struct disable_stealing_parameter
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_executor_parameters<disable_stealing_parameter> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 ///////////////////////////////////////////////////////////////////////////////
 void measure_plain_for(std::vector<std::size_t> const& data_representation)
diff --git a/libs/core/algorithms/tests/performance/transform_reduce_scaling.cpp b/libs/core/algorithms/tests/performance/transform_reduce_scaling.cpp
index f60823764b58..734aed1ffc95 100644
--- a/libs/core/algorithms/tests/performance/transform_reduce_scaling.cpp
+++ b/libs/core/algorithms/tests/performance/transform_reduce_scaling.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/numeric.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/init.hpp>
+#include <hpx/numeric.hpp>
 
 #include "worker_timed.hpp"
 
diff --git a/libs/core/algorithms/tests/regressions/count_3646.cpp b/libs/core/algorithms/tests/regressions/count_3646.cpp
index 1282591f928d..53871c8a59bb 100644
--- a/libs/core/algorithms/tests/regressions/count_3646.cpp
+++ b/libs/core/algorithms/tests/regressions/count_3646.cpp
@@ -6,10 +6,10 @@
 
 // #3646: Parallel algorithms should accept iterator/sentinel pairs
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/count.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/core/algorithms/tests/regressions/fill_executor_5016.cpp b/libs/core/algorithms/tests/regressions/fill_executor_5016.cpp
index bc77c02b46e8..a4c92314939b 100644
--- a/libs/core/algorithms/tests/regressions/fill_executor_5016.cpp
+++ b/libs/core/algorithms/tests/regressions/fill_executor_5016.cpp
@@ -9,10 +9,10 @@
 // suppress deprecation warnings for algorithms
 #define HPX_HAVE_DEPRECATION_WARNINGS_V1_6 0
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/fill.hpp>
 
 #include <algorithm>
 #include <vector>
diff --git a/libs/core/algorithms/tests/regressions/for_each_annotated_function.cpp b/libs/core/algorithms/tests/regressions/for_each_annotated_function.cpp
index 7cc1201724c5..564d3c0b8635 100644
--- a/libs/core/algorithms/tests/regressions/for_each_annotated_function.cpp
+++ b/libs/core/algorithms/tests/regressions/for_each_annotated_function.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/regressions/for_each_datapar.cpp b/libs/core/algorithms/tests/regressions/for_each_datapar.cpp
index 0b3262bc7560..88b0c51564f0 100644
--- a/libs/core/algorithms/tests/regressions/for_each_datapar.cpp
+++ b/libs/core/algorithms/tests/regressions/for_each_datapar.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/datapar.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/regressions/for_loop_2281.cpp b/libs/core/algorithms/tests/regressions/for_loop_2281.cpp
index 9ab21efe8cda..d52ae4dcab7a 100644
--- a/libs/core/algorithms/tests/regressions/for_loop_2281.cpp
+++ b/libs/core/algorithms/tests/regressions/for_loop_2281.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/regressions/for_loop_5735.cpp b/libs/core/algorithms/tests/regressions/for_loop_5735.cpp
index a2b7f30e0192..0bf4da2d3c62 100644
--- a/libs/core/algorithms/tests/regressions/for_loop_5735.cpp
+++ b/libs/core/algorithms/tests/regressions/for_loop_5735.cpp
@@ -6,9 +6,9 @@
 
 // fixes #5735: hpx::for_loop executes without checking start and end bounds
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 
diff --git a/libs/core/algorithms/tests/regressions/for_loop_with_auto_chunk_size.cpp b/libs/core/algorithms/tests/regressions/for_loop_with_auto_chunk_size.cpp
index ea3daadabf42..8ba9b380fc9f 100644
--- a/libs/core/algorithms/tests/regressions/for_loop_with_auto_chunk_size.cpp
+++ b/libs/core/algorithms/tests/regressions/for_loop_with_auto_chunk_size.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 
 #include <chrono>
 
diff --git a/libs/core/algorithms/tests/regressions/minimal_findend.cpp b/libs/core/algorithms/tests/regressions/minimal_findend.cpp
index 54d158cdda6a..2512610611cb 100644
--- a/libs/core/algorithms/tests/regressions/minimal_findend.cpp
+++ b/libs/core/algorithms/tests/regressions/minimal_findend.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/find.hpp>
 
 #include <cstddef>
 #include <iterator>
diff --git a/libs/core/algorithms/tests/regressions/reduce_3641.cpp b/libs/core/algorithms/tests/regressions/reduce_3641.cpp
index 97b77502f2fe..bae24964b7e5 100644
--- a/libs/core/algorithms/tests/regressions/reduce_3641.cpp
+++ b/libs/core/algorithms/tests/regressions/reduce_3641.cpp
@@ -8,10 +8,10 @@
 // #3641: Trouble with using ranges-v3 and hpx::parallel::reduce
 // #3646: Parallel algorithms should accept iterator/sentinel pairs
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/reduce.hpp>
 
 #include <cstdint>
 
diff --git a/libs/core/algorithms/tests/regressions/scan_different_inits.cpp b/libs/core/algorithms/tests/regressions/scan_different_inits.cpp
index 94ab7646e276..47b5a949361d 100644
--- a/libs/core/algorithms/tests/regressions/scan_different_inits.cpp
+++ b/libs/core/algorithms/tests/regressions/scan_different_inits.cpp
@@ -4,12 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/exclusive_scan.hpp>
-#include <hpx/parallel/algorithms/inclusive_scan.hpp>
-#include <hpx/parallel/algorithms/transform_exclusive_scan.hpp>
-#include <hpx/parallel/algorithms/transform_inclusive_scan.hpp>
+#include <hpx/numeric.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/regressions/scan_non_commutative.cpp b/libs/core/algorithms/tests/regressions/scan_non_commutative.cpp
index 2fc5d07285cc..2b5227162241 100644
--- a/libs/core/algorithms/tests/regressions/scan_non_commutative.cpp
+++ b/libs/core/algorithms/tests/regressions/scan_non_commutative.cpp
@@ -5,10 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/exclusive_scan.hpp>
-#include <hpx/parallel/algorithms/inclusive_scan.hpp>
+#include <hpx/numeric.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/regressions/scan_shortlength.cpp b/libs/core/algorithms/tests/regressions/scan_shortlength.cpp
index f57960f78949..30e90eceba64 100644
--- a/libs/core/algorithms/tests/regressions/scan_shortlength.cpp
+++ b/libs/core/algorithms/tests/regressions/scan_shortlength.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/remove_copy.hpp>
-#include <hpx/parallel/container_algorithms/copy.hpp>
+#include <hpx/numeric.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/regressions/search_zerolength.cpp b/libs/core/algorithms/tests/regressions/search_zerolength.cpp
index 6111a21195b4..979813b07b3f 100644
--- a/libs/core/algorithms/tests/regressions/search_zerolength.cpp
+++ b/libs/core/algorithms/tests/regressions/search_zerolength.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/search.hpp>
 
 #include <numeric>
 #include <string>
diff --git a/libs/core/algorithms/tests/regressions/set_operations_3442.cpp b/libs/core/algorithms/tests/regressions/set_operations_3442.cpp
index a579d55679d9..67e86f9b43c5 100644
--- a/libs/core/algorithms/tests/regressions/set_operations_3442.cpp
+++ b/libs/core/algorithms/tests/regressions/set_operations_3442.cpp
@@ -4,10 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/set_difference.hpp>
-#include <hpx/parallel/algorithms/set_intersection.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/regressions/stable_merge_2964.cpp b/libs/core/algorithms/tests/regressions/stable_merge_2964.cpp
index 853f10c96ce3..50c3331876f7 100644
--- a/libs/core/algorithms/tests/regressions/stable_merge_2964.cpp
+++ b/libs/core/algorithms/tests/regressions/stable_merge_2964.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/regressions/static_chunker_2282.cpp b/libs/core/algorithms/tests/regressions/static_chunker_2282.cpp
index efa7e4100dcc..772d026db97b 100644
--- a/libs/core/algorithms/tests/regressions/static_chunker_2282.cpp
+++ b/libs/core/algorithms/tests/regressions/static_chunker_2282.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/fill.hpp>
 
 int main()
 {
diff --git a/libs/core/algorithms/tests/regressions/transform_inclusive_scan_4786.cpp b/libs/core/algorithms/tests/regressions/transform_inclusive_scan_4786.cpp
index d771a137b6ce..c5735e84f2ae 100644
--- a/libs/core/algorithms/tests/regressions/transform_inclusive_scan_4786.cpp
+++ b/libs/core/algorithms/tests/regressions/transform_inclusive_scan_4786.cpp
@@ -7,9 +7,10 @@
 // see #4786: transform_inclusive_scan tries to implicitly convert between
 //            types, instead of using the provided `conv` function
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/transform_inclusive_scan.hpp>
+#include <hpx/numeric.hpp>
 
 #include <vector>
 
diff --git a/libs/core/algorithms/tests/regressions/transform_inclusive_scan_4787.cpp b/libs/core/algorithms/tests/regressions/transform_inclusive_scan_4787.cpp
index 41ba7ee6b546..78b3bf392f95 100644
--- a/libs/core/algorithms/tests/regressions/transform_inclusive_scan_4787.cpp
+++ b/libs/core/algorithms/tests/regressions/transform_inclusive_scan_4787.cpp
@@ -7,9 +7,10 @@
 // see #4787: `transform_inclusive_scan` gives incorrect results for
 //            non-commutative operator
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/transform_inclusive_scan.hpp>
+#include <hpx/numeric.hpp>
 
 #include <vector>
 
diff --git a/libs/core/algorithms/tests/unit/algorithms/adjacentdifference.cpp b/libs/core/algorithms/tests/unit/algorithms/adjacentdifference.cpp
index 4767e59e0f6a..ba9768b7c8e3 100644
--- a/libs/core/algorithms/tests/unit/algorithms/adjacentdifference.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/adjacentdifference.cpp
@@ -6,8 +6,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
+
 #include <iostream>
 #include <string>
 #include <vector>
diff --git a/libs/core/algorithms/tests/unit/algorithms/adjacentdifference_bad_alloc.cpp b/libs/core/algorithms/tests/unit/algorithms/adjacentdifference_bad_alloc.cpp
index a9b48effdf3e..69b75cd53abf 100644
--- a/libs/core/algorithms/tests/unit/algorithms/adjacentdifference_bad_alloc.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/adjacentdifference_bad_alloc.cpp
@@ -4,10 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/adjacent_difference.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/adjacentdifference_exception.cpp b/libs/core/algorithms/tests/unit/algorithms/adjacentdifference_exception.cpp
index a6bfc40b5d7f..b1867ee99284 100644
--- a/libs/core/algorithms/tests/unit/algorithms/adjacentdifference_exception.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/adjacentdifference_exception.cpp
@@ -4,10 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/adjacent_difference.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/adjacentdifference_sender.cpp b/libs/core/algorithms/tests/unit/algorithms/adjacentdifference_sender.cpp
index c89f03cffea1..f884e64a0df7 100644
--- a/libs/core/algorithms/tests/unit/algorithms/adjacentdifference_sender.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/adjacentdifference_sender.cpp
@@ -7,7 +7,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/adjacentdifference_tests.hpp b/libs/core/algorithms/tests/unit/algorithms/adjacentdifference_tests.hpp
index af1cea2e2085..d6469ec8d497 100644
--- a/libs/core/algorithms/tests/unit/algorithms/adjacentdifference_tests.hpp
+++ b/libs/core/algorithms/tests/unit/algorithms/adjacentdifference_tests.hpp
@@ -7,10 +7,9 @@
 
 #pragma once
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/adjacent_difference.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/adjacentfind.cpp b/libs/core/algorithms/tests/unit/algorithms/adjacentfind.cpp
index 2b0fc1427b03..5c542f213d3c 100644
--- a/libs/core/algorithms/tests/unit/algorithms/adjacentfind.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/adjacentfind.cpp
@@ -5,7 +5,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/adjacentfind_bad_alloc.cpp b/libs/core/algorithms/tests/unit/algorithms/adjacentfind_bad_alloc.cpp
index 34bcae822954..d11f62d3145b 100644
--- a/libs/core/algorithms/tests/unit/algorithms/adjacentfind_bad_alloc.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/adjacentfind_bad_alloc.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/adjacentfind_binary.cpp b/libs/core/algorithms/tests/unit/algorithms/adjacentfind_binary.cpp
index 4e72adf97811..c957d07c370d 100644
--- a/libs/core/algorithms/tests/unit/algorithms/adjacentfind_binary.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/adjacentfind_binary.cpp
@@ -5,7 +5,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/adjacentfind_binary_bad_alloc.cpp b/libs/core/algorithms/tests/unit/algorithms/adjacentfind_binary_bad_alloc.cpp
index 40627f18393c..fe02f49c94ca 100644
--- a/libs/core/algorithms/tests/unit/algorithms/adjacentfind_binary_bad_alloc.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/adjacentfind_binary_bad_alloc.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/adjacentfind_binary_exception.cpp b/libs/core/algorithms/tests/unit/algorithms/adjacentfind_binary_exception.cpp
index 5bbd8db54c3e..a56138e914be 100644
--- a/libs/core/algorithms/tests/unit/algorithms/adjacentfind_binary_exception.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/adjacentfind_binary_exception.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/adjacentfind_binary_tests.hpp b/libs/core/algorithms/tests/unit/algorithms/adjacentfind_binary_tests.hpp
index ae54258a3424..5c57e0e62754 100644
--- a/libs/core/algorithms/tests/unit/algorithms/adjacentfind_binary_tests.hpp
+++ b/libs/core/algorithms/tests/unit/algorithms/adjacentfind_binary_tests.hpp
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/adjacent_find.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/adjacentfind_exception.cpp b/libs/core/algorithms/tests/unit/algorithms/adjacentfind_exception.cpp
index 1b905e685668..f436f8b3443c 100644
--- a/libs/core/algorithms/tests/unit/algorithms/adjacentfind_exception.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/adjacentfind_exception.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/adjacentfind_tests.hpp b/libs/core/algorithms/tests/unit/algorithms/adjacentfind_tests.hpp
index d4f870967c3a..ff5f6fd11b21 100644
--- a/libs/core/algorithms/tests/unit/algorithms/adjacentfind_tests.hpp
+++ b/libs/core/algorithms/tests/unit/algorithms/adjacentfind_tests.hpp
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/adjacent_find.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/all_of.cpp b/libs/core/algorithms/tests/unit/algorithms/all_of.cpp
index 20e5ae39f2c5..eb4f2b8b2042 100644
--- a/libs/core/algorithms/tests/unit/algorithms/all_of.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/all_of.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/any_of.cpp b/libs/core/algorithms/tests/unit/algorithms/any_of.cpp
index d07006a48f0b..87cf477b5cb0 100644
--- a/libs/core/algorithms/tests/unit/algorithms/any_of.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/any_of.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/any_of_tests.hpp b/libs/core/algorithms/tests/unit/algorithms/any_of_tests.hpp
index 436d4ce0693f..25308ce6be04 100644
--- a/libs/core/algorithms/tests/unit/algorithms/any_of_tests.hpp
+++ b/libs/core/algorithms/tests/unit/algorithms/any_of_tests.hpp
@@ -6,10 +6,9 @@
 
 #pragma once
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/all_any_none.hpp>
-#include <hpx/parallel/container_algorithms/all_any_none.hpp>
 #include <hpx/type_support/identity.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/copy.cpp b/libs/core/algorithms/tests/unit/algorithms/copy.cpp
index 4c364d9aee48..793f0162d53c 100644
--- a/libs/core/algorithms/tests/unit/algorithms/copy.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/copy.cpp
@@ -5,7 +5,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/copyif_bad_alloc.cpp b/libs/core/algorithms/tests/unit/algorithms/copyif_bad_alloc.cpp
index d803e940ed4c..ee0f3677dedb 100644
--- a/libs/core/algorithms/tests/unit/algorithms/copyif_bad_alloc.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/copyif_bad_alloc.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/copy.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/copyif_exception.cpp b/libs/core/algorithms/tests/unit/algorithms/copyif_exception.cpp
index 1f2f6feeb62e..6156e31b9d2f 100644
--- a/libs/core/algorithms/tests/unit/algorithms/copyif_exception.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/copyif_exception.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/copy.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/copyif_forward.cpp b/libs/core/algorithms/tests/unit/algorithms/copyif_forward.cpp
index 80d37167c60e..1729a53eb29b 100644
--- a/libs/core/algorithms/tests/unit/algorithms/copyif_forward.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/copyif_forward.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/copy.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/copyif_random.cpp b/libs/core/algorithms/tests/unit/algorithms/copyif_random.cpp
index 33b65577c7d2..9d82f35bd7b9 100644
--- a/libs/core/algorithms/tests/unit/algorithms/copyif_random.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/copyif_random.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/copy.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/copyn.cpp b/libs/core/algorithms/tests/unit/algorithms/copyn.cpp
index cdb857d2e461..36f1d1d852ca 100644
--- a/libs/core/algorithms/tests/unit/algorithms/copyn.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/copyn.cpp
@@ -5,7 +5,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/copyn_tests.hpp b/libs/core/algorithms/tests/unit/algorithms/copyn_tests.hpp
index 70800b3aa0af..cf00cbe47e43 100644
--- a/libs/core/algorithms/tests/unit/algorithms/copyn_tests.hpp
+++ b/libs/core/algorithms/tests/unit/algorithms/copyn_tests.hpp
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/copy.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/count.cpp b/libs/core/algorithms/tests/unit/algorithms/count.cpp
index 58a80ebafe4b..439753820b3a 100644
--- a/libs/core/algorithms/tests/unit/algorithms/count.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/count.cpp
@@ -5,7 +5,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/countif.cpp b/libs/core/algorithms/tests/unit/algorithms/countif.cpp
index e50faa357fc8..34f4b700112c 100644
--- a/libs/core/algorithms/tests/unit/algorithms/countif.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/countif.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/destroy.cpp b/libs/core/algorithms/tests/unit/algorithms/destroy.cpp
index a6174aee05fb..0643bbe1af80 100644
--- a/libs/core/algorithms/tests/unit/algorithms/destroy.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/destroy.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/destroy_tests.hpp b/libs/core/algorithms/tests/unit/algorithms/destroy_tests.hpp
index 242a26445607..984ca68bfb36 100644
--- a/libs/core/algorithms/tests/unit/algorithms/destroy_tests.hpp
+++ b/libs/core/algorithms/tests/unit/algorithms/destroy_tests.hpp
@@ -6,9 +6,10 @@
 
 #pragma once
 
-#include <hpx/local/execution.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/destroy.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/destroyn.cpp b/libs/core/algorithms/tests/unit/algorithms/destroyn.cpp
index 526d946ac194..e4ad12ff63f6 100644
--- a/libs/core/algorithms/tests/unit/algorithms/destroyn.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/destroyn.cpp
@@ -4,9 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/destroy.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/detail/test_insertion_sort.cpp b/libs/core/algorithms/tests/unit/algorithms/detail/test_insertion_sort.cpp
index 5e3e4b059f7b..7413399e5635 100644
--- a/libs/core/algorithms/tests/unit/algorithms/detail/test_insertion_sort.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/detail/test_insertion_sort.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/detail/insertion_sort.hpp>
 
 #include <cstdint>
 #include <cstdlib>
diff --git a/libs/core/algorithms/tests/unit/algorithms/detail/test_parallel_stable_sort.cpp b/libs/core/algorithms/tests/unit/algorithms/detail/test_parallel_stable_sort.cpp
index 0f589bfcbccc..213ed291fc1f 100644
--- a/libs/core/algorithms/tests/unit/algorithms/detail/test_parallel_stable_sort.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/detail/test_parallel_stable_sort.cpp
@@ -5,11 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-
-#include <hpx/local/execution.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/detail/parallel_stable_sort.hpp>
 
 #include <algorithm>
 #include <cstdint>
diff --git a/libs/core/algorithms/tests/unit/algorithms/detail/test_sample_sort.cpp b/libs/core/algorithms/tests/unit/algorithms/detail/test_sample_sort.cpp
index 0dfc27c8ac31..d92bf14c880d 100644
--- a/libs/core/algorithms/tests/unit/algorithms/detail/test_sample_sort.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/detail/test_sample_sort.cpp
@@ -5,11 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-
-#include <hpx/local/execution.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/detail/sample_sort.hpp>
 
 #include <algorithm>
 #include <cstdint>
diff --git a/libs/core/algorithms/tests/unit/algorithms/detail/test_spin_sort.cpp b/libs/core/algorithms/tests/unit/algorithms/detail/test_spin_sort.cpp
index 798bc152d468..d33354d1d486 100644
--- a/libs/core/algorithms/tests/unit/algorithms/detail/test_spin_sort.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/detail/test_spin_sort.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/detail/spin_sort.hpp>
 
 #include <algorithm>
 #include <cstdint>
diff --git a/libs/core/algorithms/tests/unit/algorithms/ends_with.cpp b/libs/core/algorithms/tests/unit/algorithms/ends_with.cpp
index 51ca3a0d27a6..96251adfe739 100644
--- a/libs/core/algorithms/tests/unit/algorithms/ends_with.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/ends_with.cpp
@@ -5,10 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/ends_with.hpp>
-#include <hpx/parallel/container_algorithms/ends_with.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/equal.cpp b/libs/core/algorithms/tests/unit/algorithms/equal.cpp
index 7cc6ec754980..ca8f7e3b76cf 100644
--- a/libs/core/algorithms/tests/unit/algorithms/equal.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/equal.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/equal_binary.cpp b/libs/core/algorithms/tests/unit/algorithms/equal_binary.cpp
index 9b0efa8b67b0..cf2f64421f99 100644
--- a/libs/core/algorithms/tests/unit/algorithms/equal_binary.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/equal_binary.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/exclusive_scan.cpp b/libs/core/algorithms/tests/unit/algorithms/exclusive_scan.cpp
index 1731211f1310..1bd2e25a3d68 100644
--- a/libs/core/algorithms/tests/unit/algorithms/exclusive_scan.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/exclusive_scan.cpp
@@ -4,9 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/exclusive_scan.hpp>
+#include <hpx/numeric.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/exclusive_scan2.cpp b/libs/core/algorithms/tests/unit/algorithms/exclusive_scan2.cpp
index ef37c3928fb6..9702bd545baf 100644
--- a/libs/core/algorithms/tests/unit/algorithms/exclusive_scan2.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/exclusive_scan2.cpp
@@ -4,9 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/exclusive_scan.hpp>
+#include <hpx/numeric.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/exclusive_scan_bad_alloc.cpp b/libs/core/algorithms/tests/unit/algorithms/exclusive_scan_bad_alloc.cpp
index 339619760d79..9c41a954a2a6 100644
--- a/libs/core/algorithms/tests/unit/algorithms/exclusive_scan_bad_alloc.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/exclusive_scan_bad_alloc.cpp
@@ -4,9 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/exclusive_scan.hpp>
+#include <hpx/numeric.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/exclusive_scan_exception.cpp b/libs/core/algorithms/tests/unit/algorithms/exclusive_scan_exception.cpp
index 385845690523..52dba2048815 100644
--- a/libs/core/algorithms/tests/unit/algorithms/exclusive_scan_exception.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/exclusive_scan_exception.cpp
@@ -4,9 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/exclusive_scan.hpp>
+#include <hpx/numeric.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/exclusive_scan_validate.cpp b/libs/core/algorithms/tests/unit/algorithms/exclusive_scan_validate.cpp
index a23e38f540b2..f210780f9ab3 100644
--- a/libs/core/algorithms/tests/unit/algorithms/exclusive_scan_validate.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/exclusive_scan_validate.cpp
@@ -4,10 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/exclusive_scan.hpp>
+#include <hpx/numeric.hpp>
 
 #include <iostream>
 #include <iterator>
diff --git a/libs/core/algorithms/tests/unit/algorithms/fill.cpp b/libs/core/algorithms/tests/unit/algorithms/fill.cpp
index 72c736c0cbcc..0fd81f82db62 100644
--- a/libs/core/algorithms/tests/unit/algorithms/fill.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/fill.cpp
@@ -6,7 +6,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/filln.cpp b/libs/core/algorithms/tests/unit/algorithms/filln.cpp
index dab0edbe7969..b44c473be2d8 100644
--- a/libs/core/algorithms/tests/unit/algorithms/filln.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/filln.cpp
@@ -6,7 +6,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/find.cpp b/libs/core/algorithms/tests/unit/algorithms/find.cpp
index c6561a105eda..dc321f3563b7 100644
--- a/libs/core/algorithms/tests/unit/algorithms/find.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/find.cpp
@@ -5,7 +5,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/find_sender.cpp b/libs/core/algorithms/tests/unit/algorithms/find_sender.cpp
index 3b60aa1e2418..3d0edd8cd6ad 100644
--- a/libs/core/algorithms/tests/unit/algorithms/find_sender.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/find_sender.cpp
@@ -6,7 +6,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/find_tests.hpp b/libs/core/algorithms/tests/unit/algorithms/find_tests.hpp
index c4df47a08916..b4a78427d482 100644
--- a/libs/core/algorithms/tests/unit/algorithms/find_tests.hpp
+++ b/libs/core/algorithms/tests/unit/algorithms/find_tests.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/find.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/findend.cpp b/libs/core/algorithms/tests/unit/algorithms/findend.cpp
index 8279db6d6fc9..8f7d59044469 100644
--- a/libs/core/algorithms/tests/unit/algorithms/findend.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/findend.cpp
@@ -5,7 +5,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/findfirstof.cpp b/libs/core/algorithms/tests/unit/algorithms/findfirstof.cpp
index 0dd11284c8df..1bc0d4ce4d3e 100644
--- a/libs/core/algorithms/tests/unit/algorithms/findfirstof.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/findfirstof.cpp
@@ -5,7 +5,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/findfirstof_binary.cpp b/libs/core/algorithms/tests/unit/algorithms/findfirstof_binary.cpp
index 42959384a4b5..dc119b7d3d09 100644
--- a/libs/core/algorithms/tests/unit/algorithms/findfirstof_binary.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/findfirstof_binary.cpp
@@ -4,10 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithm.hpp>
-#include <hpx/parallel/algorithms/find.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/findif.cpp b/libs/core/algorithms/tests/unit/algorithms/findif.cpp
index 20f04f42727e..965a0530ac12 100644
--- a/libs/core/algorithms/tests/unit/algorithms/findif.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/findif.cpp
@@ -5,7 +5,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/findifnot.cpp b/libs/core/algorithms/tests/unit/algorithms/findifnot.cpp
index b728215e40aa..1835150d97a3 100644
--- a/libs/core/algorithms/tests/unit/algorithms/findifnot.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/findifnot.cpp
@@ -5,7 +5,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/findifnot_bad_alloc.cpp b/libs/core/algorithms/tests/unit/algorithms/findifnot_bad_alloc.cpp
index de2c07556b24..c6137d51367e 100644
--- a/libs/core/algorithms/tests/unit/algorithms/findifnot_bad_alloc.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/findifnot_bad_alloc.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/find.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/findifnot_exception.cpp b/libs/core/algorithms/tests/unit/algorithms/findifnot_exception.cpp
index 7ca2269c634a..91d94136b203 100644
--- a/libs/core/algorithms/tests/unit/algorithms/findifnot_exception.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/findifnot_exception.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/find.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/for_loop.cpp b/libs/core/algorithms/tests/unit/algorithms/for_loop.cpp
index d39f710a92ca..0c45462a834b 100644
--- a/libs/core/algorithms/tests/unit/algorithms/for_loop.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/for_loop.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/algorithms/for_loop_exception.cpp b/libs/core/algorithms/tests/unit/algorithms/for_loop_exception.cpp
index b6a4ab818367..1a66c4b547b1 100644
--- a/libs/core/algorithms/tests/unit/algorithms/for_loop_exception.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/for_loop_exception.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/algorithms/for_loop_induction.cpp b/libs/core/algorithms/tests/unit/algorithms/for_loop_induction.cpp
index 62fdde5fe9ce..f54e8bcc3df8 100644
--- a/libs/core/algorithms/tests/unit/algorithms/for_loop_induction.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/for_loop_induction.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/algorithms/for_loop_induction_async.cpp b/libs/core/algorithms/tests/unit/algorithms/for_loop_induction_async.cpp
index 870eed8b7641..45bc96115975 100644
--- a/libs/core/algorithms/tests/unit/algorithms/for_loop_induction_async.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/for_loop_induction_async.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/algorithms/for_loop_n.cpp b/libs/core/algorithms/tests/unit/algorithms/for_loop_n.cpp
index 1f7b90d17ee4..e2e5113cb8fd 100644
--- a/libs/core/algorithms/tests/unit/algorithms/for_loop_n.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/for_loop_n.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/algorithms/for_loop_n_strided.cpp b/libs/core/algorithms/tests/unit/algorithms/for_loop_n_strided.cpp
index 97e4ea05dea2..d5b166e555e9 100644
--- a/libs/core/algorithms/tests/unit/algorithms/for_loop_n_strided.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/for_loop_n_strided.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/algorithms/for_loop_reduction.cpp b/libs/core/algorithms/tests/unit/algorithms/for_loop_reduction.cpp
index a89bd468b413..be73ce5e6641 100644
--- a/libs/core/algorithms/tests/unit/algorithms/for_loop_reduction.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/for_loop_reduction.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/algorithms/for_loop_reduction_async.cpp b/libs/core/algorithms/tests/unit/algorithms/for_loop_reduction_async.cpp
index 95ee104b18b7..bf7b6530af14 100644
--- a/libs/core/algorithms/tests/unit/algorithms/for_loop_reduction_async.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/for_loop_reduction_async.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/algorithms/for_loop_sender.cpp b/libs/core/algorithms/tests/unit/algorithms/for_loop_sender.cpp
index 5c9a5c018e6e..c09defd81c9f 100644
--- a/libs/core/algorithms/tests/unit/algorithms/for_loop_sender.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/for_loop_sender.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/algorithms/for_loop_strided.cpp b/libs/core/algorithms/tests/unit/algorithms/for_loop_strided.cpp
index be488e152389..de8e8faaa4c2 100644
--- a/libs/core/algorithms/tests/unit/algorithms/for_loop_strided.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/for_loop_strided.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/algorithms/foreach.cpp b/libs/core/algorithms/tests/unit/algorithms/foreach.cpp
index 3bf220b58501..a68b0e433a10 100644
--- a/libs/core/algorithms/tests/unit/algorithms/foreach.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/foreach.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/executors/execution_policy.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/foreach_executors.cpp b/libs/core/algorithms/tests/unit/algorithms/foreach_executors.cpp
index 74451ecd845a..f9372940b045 100644
--- a/libs/core/algorithms/tests/unit/algorithms/foreach_executors.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/foreach_executors.cpp
@@ -4,8 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/executors/execution_policy.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/foreach_prefetching.cpp b/libs/core/algorithms/tests/unit/algorithms/foreach_prefetching.cpp
index a504d541349b..b68c225847ff 100644
--- a/libs/core/algorithms/tests/unit/algorithms/foreach_prefetching.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/foreach_prefetching.cpp
@@ -5,7 +5,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/foreach_scheduler.cpp b/libs/core/algorithms/tests/unit/algorithms/foreach_scheduler.cpp
index f92736fb4737..b5976d912eaf 100644
--- a/libs/core/algorithms/tests/unit/algorithms/foreach_scheduler.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/foreach_scheduler.cpp
@@ -4,13 +4,13 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/async_base.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/for_each.hpp>
+#include <hpx/thread.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/foreach_sender.cpp b/libs/core/algorithms/tests/unit/algorithms/foreach_sender.cpp
index 8685e651edaa..a85c7991fccd 100644
--- a/libs/core/algorithms/tests/unit/algorithms/foreach_sender.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/foreach_sender.cpp
@@ -4,13 +4,13 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/async_base.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/for_each.hpp>
+#include <hpx/thread.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/foreach_std_policies.cpp b/libs/core/algorithms/tests/unit/algorithms/foreach_std_policies.cpp
index 2d19743e00a4..9116d4c34b70 100644
--- a/libs/core/algorithms/tests/unit/algorithms/foreach_std_policies.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/foreach_std_policies.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <execution>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/foreach_tests.hpp b/libs/core/algorithms/tests/unit/algorithms/foreach_tests.hpp
index 13b4056a9098..3c02b4873327 100644
--- a/libs/core/algorithms/tests/unit/algorithms/foreach_tests.hpp
+++ b/libs/core/algorithms/tests/unit/algorithms/foreach_tests.hpp
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <hpx/local/execution.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/for_each.hpp>
 
 #include <cstddef>
 #include <functional>
diff --git a/libs/core/algorithms/tests/unit/algorithms/foreach_tests_prefetching.hpp b/libs/core/algorithms/tests/unit/algorithms/foreach_tests_prefetching.hpp
index dd4da030c79c..9ba9544a8fc8 100644
--- a/libs/core/algorithms/tests/unit/algorithms/foreach_tests_prefetching.hpp
+++ b/libs/core/algorithms/tests/unit/algorithms/foreach_tests_prefetching.hpp
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <hpx/local/execution.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/for_each.hpp>
 #include <hpx/parallel/util/prefetching.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/foreachn.cpp b/libs/core/algorithms/tests/unit/algorithms/foreachn.cpp
index 868c59cb260b..99d939cc5ad5 100644
--- a/libs/core/algorithms/tests/unit/algorithms/foreachn.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/foreachn.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/foreachn_bad_alloc.cpp b/libs/core/algorithms/tests/unit/algorithms/foreachn_bad_alloc.cpp
index bdc67eb8cec9..e4854ba8a30c 100644
--- a/libs/core/algorithms/tests/unit/algorithms/foreachn_bad_alloc.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/foreachn_bad_alloc.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/for_each.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/foreachn_exception.cpp b/libs/core/algorithms/tests/unit/algorithms/foreachn_exception.cpp
index 19e4175937a1..9678ab46392a 100644
--- a/libs/core/algorithms/tests/unit/algorithms/foreachn_exception.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/foreachn_exception.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/for_each.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/generate.cpp b/libs/core/algorithms/tests/unit/algorithms/generate.cpp
index 2fbe729b2197..574689ed6752 100644
--- a/libs/core/algorithms/tests/unit/algorithms/generate.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/generate.cpp
@@ -6,7 +6,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/generate_tests.hpp b/libs/core/algorithms/tests/unit/algorithms/generate_tests.hpp
index 1417d259eb64..e88f041e68d7 100644
--- a/libs/core/algorithms/tests/unit/algorithms/generate_tests.hpp
+++ b/libs/core/algorithms/tests/unit/algorithms/generate_tests.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/generate.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/generaten.cpp b/libs/core/algorithms/tests/unit/algorithms/generaten.cpp
index 4d69b227125d..ff6646f3739f 100644
--- a/libs/core/algorithms/tests/unit/algorithms/generaten.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/generaten.cpp
@@ -6,7 +6,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/generaten_tests.hpp b/libs/core/algorithms/tests/unit/algorithms/generaten_tests.hpp
index c29ba6f982ba..d88109baf641 100644
--- a/libs/core/algorithms/tests/unit/algorithms/generaten_tests.hpp
+++ b/libs/core/algorithms/tests/unit/algorithms/generaten_tests.hpp
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/generate.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/includes.cpp b/libs/core/algorithms/tests/unit/algorithms/includes.cpp
index 5804089402ee..d98e692bf08e 100644
--- a/libs/core/algorithms/tests/unit/algorithms/includes.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/includes.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/includes.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/inclusive_scan.cpp b/libs/core/algorithms/tests/unit/algorithms/inclusive_scan.cpp
index c2b1c7088643..f3600c6225f2 100644
--- a/libs/core/algorithms/tests/unit/algorithms/inclusive_scan.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/inclusive_scan.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/inclusive_scan_tests.hpp b/libs/core/algorithms/tests/unit/algorithms/inclusive_scan_tests.hpp
index 141b775110ec..02f43230127e 100644
--- a/libs/core/algorithms/tests/unit/algorithms/inclusive_scan_tests.hpp
+++ b/libs/core/algorithms/tests/unit/algorithms/inclusive_scan_tests.hpp
@@ -6,10 +6,11 @@
 
 #pragma once
 
-#include <hpx/local/execution.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/inclusive_scan.hpp>
+#include <hpx/numeric.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/inplace_merge.cpp b/libs/core/algorithms/tests/unit/algorithms/inplace_merge.cpp
index 586db5a105be..474e610eea4d 100644
--- a/libs/core/algorithms/tests/unit/algorithms/inplace_merge.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/inplace_merge.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/algorithms/is_heap.cpp b/libs/core/algorithms/tests/unit/algorithms/is_heap.cpp
index 8e53ea065e3e..d7eccfee3a06 100644
--- a/libs/core/algorithms/tests/unit/algorithms/is_heap.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/is_heap.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/algorithms/is_heap_until.cpp b/libs/core/algorithms/tests/unit/algorithms/is_heap_until.cpp
index 1288bb7fda3d..3b779cc13533 100644
--- a/libs/core/algorithms/tests/unit/algorithms/is_heap_until.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/is_heap_until.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/algorithms/is_partitioned.cpp b/libs/core/algorithms/tests/unit/algorithms/is_partitioned.cpp
index 273645df3034..3e025e0f6ca8 100644
--- a/libs/core/algorithms/tests/unit/algorithms/is_partitioned.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/is_partitioned.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/is_partitioned.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/is_sorted.cpp b/libs/core/algorithms/tests/unit/algorithms/is_sorted.cpp
index cb8277984dab..4040d566203b 100644
--- a/libs/core/algorithms/tests/unit/algorithms/is_sorted.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/is_sorted.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/is_sorted_tests.hpp b/libs/core/algorithms/tests/unit/algorithms/is_sorted_tests.hpp
index 379753147c03..605e7b032216 100644
--- a/libs/core/algorithms/tests/unit/algorithms/is_sorted_tests.hpp
+++ b/libs/core/algorithms/tests/unit/algorithms/is_sorted_tests.hpp
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <hpx/local/execution.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/is_sorted.hpp>
 
 #include <cstddef>
 #include <iterator>
diff --git a/libs/core/algorithms/tests/unit/algorithms/is_sorted_until.cpp b/libs/core/algorithms/tests/unit/algorithms/is_sorted_until.cpp
index e848a92a8ae9..00b168d93cd2 100644
--- a/libs/core/algorithms/tests/unit/algorithms/is_sorted_until.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/is_sorted_until.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/is_sorted.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/lexicographical_compare.cpp b/libs/core/algorithms/tests/unit/algorithms/lexicographical_compare.cpp
index 1e602b433faa..42fd07a04bf2 100644
--- a/libs/core/algorithms/tests/unit/algorithms/lexicographical_compare.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/lexicographical_compare.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/lexicographical_compare.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/make_heap.cpp b/libs/core/algorithms/tests/unit/algorithms/make_heap.cpp
index 6feeff74165c..92316353cf49 100644
--- a/libs/core/algorithms/tests/unit/algorithms/make_heap.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/make_heap.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/make_heap.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/max_element.cpp b/libs/core/algorithms/tests/unit/algorithms/max_element.cpp
index 09a8afee482d..ea32980a7deb 100644
--- a/libs/core/algorithms/tests/unit/algorithms/max_element.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/max_element.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/minmax.hpp>
 
 #include <cstddef>
 #include <ctime>
diff --git a/libs/core/algorithms/tests/unit/algorithms/merge.cpp b/libs/core/algorithms/tests/unit/algorithms/merge.cpp
index 711a48bfc578..a3f06fb1a249 100644
--- a/libs/core/algorithms/tests/unit/algorithms/merge.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/merge.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/algorithms/min_element.cpp b/libs/core/algorithms/tests/unit/algorithms/min_element.cpp
index 228b2b869431..88f2c6d395c4 100644
--- a/libs/core/algorithms/tests/unit/algorithms/min_element.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/min_element.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/minmax.hpp>
 
 #include <cstddef>
 #include <ctime>
diff --git a/libs/core/algorithms/tests/unit/algorithms/minmax_element.cpp b/libs/core/algorithms/tests/unit/algorithms/minmax_element.cpp
index 74d3b7b8d0d9..f4cd68ad6a63 100644
--- a/libs/core/algorithms/tests/unit/algorithms/minmax_element.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/minmax_element.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/minmax.hpp>
 
 #include <cstddef>
 #include <ctime>
diff --git a/libs/core/algorithms/tests/unit/algorithms/mismatch.cpp b/libs/core/algorithms/tests/unit/algorithms/mismatch.cpp
index 398918df1859..930c75df8013 100644
--- a/libs/core/algorithms/tests/unit/algorithms/mismatch.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/mismatch.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/mismatch_binary.cpp b/libs/core/algorithms/tests/unit/algorithms/mismatch_binary.cpp
index a1cfd9bc4df2..1e55a5c61580 100644
--- a/libs/core/algorithms/tests/unit/algorithms/mismatch_binary.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/mismatch_binary.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/move.cpp b/libs/core/algorithms/tests/unit/algorithms/move.cpp
index 22545f57bfb9..e1e8b6d1aea6 100644
--- a/libs/core/algorithms/tests/unit/algorithms/move.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/move.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/move.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/none_of.cpp b/libs/core/algorithms/tests/unit/algorithms/none_of.cpp
index 813ebfa0580d..b9e498127bc0 100644
--- a/libs/core/algorithms/tests/unit/algorithms/none_of.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/none_of.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/none_of_tests.hpp b/libs/core/algorithms/tests/unit/algorithms/none_of_tests.hpp
index f05f4215f9b7..6dd8b6431446 100644
--- a/libs/core/algorithms/tests/unit/algorithms/none_of_tests.hpp
+++ b/libs/core/algorithms/tests/unit/algorithms/none_of_tests.hpp
@@ -6,10 +6,9 @@
 
 #pragma once
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/all_any_none.hpp>
-#include <hpx/parallel/container_algorithms/all_any_none.hpp>
 #include <hpx/type_support/identity.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/nth_element.cpp b/libs/core/algorithms/tests/unit/algorithms/nth_element.cpp
index 5f04750275cc..09edfa1c533c 100644
--- a/libs/core/algorithms/tests/unit/algorithms/nth_element.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/nth_element.cpp
@@ -6,9 +6,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/nth_element.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/parallel_sort.cpp b/libs/core/algorithms/tests/unit/algorithms/parallel_sort.cpp
index 855c174560e7..66c8f82255fb 100644
--- a/libs/core/algorithms/tests/unit/algorithms/parallel_sort.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/parallel_sort.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/sort.hpp>
 
 #include <algorithm>
 #include <cstdint>
diff --git a/libs/core/algorithms/tests/unit/algorithms/partial_sort.cpp b/libs/core/algorithms/tests/unit/algorithms/partial_sort.cpp
index d366939cb7e3..a45a336396a4 100644
--- a/libs/core/algorithms/tests/unit/algorithms/partial_sort.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/partial_sort.cpp
@@ -5,10 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/partial_sort.hpp>
 
 #include <algorithm>
 #include <cstdint>
diff --git a/libs/core/algorithms/tests/unit/algorithms/partial_sort_copy.cpp b/libs/core/algorithms/tests/unit/algorithms/partial_sort_copy.cpp
index 0519e8de748b..972011b936db 100644
--- a/libs/core/algorithms/tests/unit/algorithms/partial_sort_copy.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/partial_sort_copy.cpp
@@ -8,11 +8,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //-----------------------------------------------------------------------------
+#include <hpx/algorithm.hpp>
 #include <hpx/assert.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/partial_sort_copy.hpp>
 
 #include <algorithm>
 #include <cstdint>
diff --git a/libs/core/algorithms/tests/unit/algorithms/partition.cpp b/libs/core/algorithms/tests/unit/algorithms/partition.cpp
index 876b0977866c..10dfd9d490f1 100644
--- a/libs/core/algorithms/tests/unit/algorithms/partition.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/partition.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/partition_copy.cpp b/libs/core/algorithms/tests/unit/algorithms/partition_copy.cpp
index d37abca3d35f..26220da83c3a 100644
--- a/libs/core/algorithms/tests/unit/algorithms/partition_copy.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/partition_copy.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/reduce_.cpp b/libs/core/algorithms/tests/unit/algorithms/reduce_.cpp
index 2ddd71535c93..e88eb540f061 100644
--- a/libs/core/algorithms/tests/unit/algorithms/reduce_.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/reduce_.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/reduce_by_key.cpp b/libs/core/algorithms/tests/unit/algorithms/reduce_by_key.cpp
index 1ecd4e17edf4..cc2a0d46a9a2 100644
--- a/libs/core/algorithms/tests/unit/algorithms/reduce_by_key.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/reduce_by_key.cpp
@@ -4,12 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithm.hpp>
-#include <hpx/parallel/algorithms/generate.hpp>
 #include <hpx/parallel/algorithms/reduce_by_key.hpp>
-//
+
 #include <iomanip>
 #include <random>
 #include <utility>
diff --git a/libs/core/algorithms/tests/unit/algorithms/remove.cpp b/libs/core/algorithms/tests/unit/algorithms/remove.cpp
index 4c4d0ea54caa..c9ee10a61e78 100644
--- a/libs/core/algorithms/tests/unit/algorithms/remove.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/remove.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/algorithms/remove1.cpp b/libs/core/algorithms/tests/unit/algorithms/remove1.cpp
index d45fcd44de38..297c7874ff1c 100644
--- a/libs/core/algorithms/tests/unit/algorithms/remove1.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/remove1.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/algorithms/remove2.cpp b/libs/core/algorithms/tests/unit/algorithms/remove2.cpp
index 8bc26afa7bae..d556a08e01a0 100644
--- a/libs/core/algorithms/tests/unit/algorithms/remove2.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/remove2.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/algorithms/remove_copy.cpp b/libs/core/algorithms/tests/unit/algorithms/remove_copy.cpp
index 51581e736877..8dca5045c9ab 100644
--- a/libs/core/algorithms/tests/unit/algorithms/remove_copy.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/remove_copy.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/remove_copy.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/remove_copy_if.cpp b/libs/core/algorithms/tests/unit/algorithms/remove_copy_if.cpp
index 140c80cdb5f9..1b61c2c9105e 100644
--- a/libs/core/algorithms/tests/unit/algorithms/remove_copy_if.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/remove_copy_if.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/remove_copy.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/remove_if.cpp b/libs/core/algorithms/tests/unit/algorithms/remove_if.cpp
index 04250b57ca5c..2ee33ff8f5b8 100644
--- a/libs/core/algorithms/tests/unit/algorithms/remove_if.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/remove_if.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/algorithms/remove_if1.cpp b/libs/core/algorithms/tests/unit/algorithms/remove_if1.cpp
index 9a4a522768d8..316b18b0546b 100644
--- a/libs/core/algorithms/tests/unit/algorithms/remove_if1.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/remove_if1.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/algorithms/replace.cpp b/libs/core/algorithms/tests/unit/algorithms/replace.cpp
index d0f2d0928064..7abec26eab21 100644
--- a/libs/core/algorithms/tests/unit/algorithms/replace.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/replace.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/replace.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/replace_copy.cpp b/libs/core/algorithms/tests/unit/algorithms/replace_copy.cpp
index 0581a8694bab..d9259ee8aa74 100644
--- a/libs/core/algorithms/tests/unit/algorithms/replace_copy.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/replace_copy.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/replace.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/replace_copy_if.cpp b/libs/core/algorithms/tests/unit/algorithms/replace_copy_if.cpp
index 4e4e7577c8e6..06f909db7086 100644
--- a/libs/core/algorithms/tests/unit/algorithms/replace_copy_if.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/replace_copy_if.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/replace.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/replace_if.cpp b/libs/core/algorithms/tests/unit/algorithms/replace_if.cpp
index f22bd3c979d8..0799cb82814a 100644
--- a/libs/core/algorithms/tests/unit/algorithms/replace_if.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/replace_if.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/replace.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/reverse.cpp b/libs/core/algorithms/tests/unit/algorithms/reverse.cpp
index c6fa3ac04738..9fb76eb63305 100644
--- a/libs/core/algorithms/tests/unit/algorithms/reverse.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/reverse.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/reverse.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/reverse_copy.cpp b/libs/core/algorithms/tests/unit/algorithms/reverse_copy.cpp
index 2c9bd4b8e99c..cb2352bc1948 100644
--- a/libs/core/algorithms/tests/unit/algorithms/reverse_copy.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/reverse_copy.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/reverse.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/reverse_sender.cpp b/libs/core/algorithms/tests/unit/algorithms/reverse_sender.cpp
index 932262cec63a..177fedf82337 100644
--- a/libs/core/algorithms/tests/unit/algorithms/reverse_sender.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/reverse_sender.cpp
@@ -5,12 +5,12 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/async_base.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/reverse.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/rotate.cpp b/libs/core/algorithms/tests/unit/algorithms/rotate.cpp
index 66f35abbbd46..c6607e349d2f 100644
--- a/libs/core/algorithms/tests/unit/algorithms/rotate.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/rotate.cpp
@@ -5,10 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/execution/traits/is_execution_policy.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/rotate.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/rotate_copy.cpp b/libs/core/algorithms/tests/unit/algorithms/rotate_copy.cpp
index 3388f3bb2bd1..15bb74cc4663 100644
--- a/libs/core/algorithms/tests/unit/algorithms/rotate_copy.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/rotate_copy.cpp
@@ -5,10 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/execution/traits/is_execution_policy.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/rotate.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/rotate_sender.cpp b/libs/core/algorithms/tests/unit/algorithms/rotate_sender.cpp
index 235b3f6a07d6..3c52d08828a2 100644
--- a/libs/core/algorithms/tests/unit/algorithms/rotate_sender.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/rotate_sender.cpp
@@ -10,13 +10,13 @@
 // Clang V11 ICE's on this test
 #if !defined(HPX_CLANG_VERSION) || (HPX_CLANG_VERSION / 10000) != 11
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/async_base.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/rotate.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/search.cpp b/libs/core/algorithms/tests/unit/algorithms/search.cpp
index 3ed0e29f6175..8c57de4b9ae3 100644
--- a/libs/core/algorithms/tests/unit/algorithms/search.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/search.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/search.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/searchn.cpp b/libs/core/algorithms/tests/unit/algorithms/searchn.cpp
index ddef96c73dce..ac8ece39b5af 100644
--- a/libs/core/algorithms/tests/unit/algorithms/searchn.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/searchn.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/search.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/set_difference.cpp b/libs/core/algorithms/tests/unit/algorithms/set_difference.cpp
index 74e1d3709e7a..415cb259f91a 100644
--- a/libs/core/algorithms/tests/unit/algorithms/set_difference.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/set_difference.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/set_difference.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/set_intersection.cpp b/libs/core/algorithms/tests/unit/algorithms/set_intersection.cpp
index eabf10abf540..4fa5ccb8e583 100644
--- a/libs/core/algorithms/tests/unit/algorithms/set_intersection.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/set_intersection.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/set_intersection.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/set_symmetric_difference.cpp b/libs/core/algorithms/tests/unit/algorithms/set_symmetric_difference.cpp
index d1081eb0a030..64214882fc0b 100644
--- a/libs/core/algorithms/tests/unit/algorithms/set_symmetric_difference.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/set_symmetric_difference.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/set_symmetric_difference.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/set_union.cpp b/libs/core/algorithms/tests/unit/algorithms/set_union.cpp
index 2ea6e5d7e693..27bd169878ad 100644
--- a/libs/core/algorithms/tests/unit/algorithms/set_union.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/set_union.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/set_union.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/shift_left.cpp b/libs/core/algorithms/tests/unit/algorithms/shift_left.cpp
index 3dd1ee177b1a..96c0e582cb9c 100644
--- a/libs/core/algorithms/tests/unit/algorithms/shift_left.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/shift_left.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/shift_left.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/shift_right.cpp b/libs/core/algorithms/tests/unit/algorithms/shift_right.cpp
index 8002100d3de4..0bb671c14562 100644
--- a/libs/core/algorithms/tests/unit/algorithms/shift_right.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/shift_right.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/shift_right.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/sort.cpp b/libs/core/algorithms/tests/unit/algorithms/sort.cpp
index 01d758dec14a..eb195fe42d7b 100644
--- a/libs/core/algorithms/tests/unit/algorithms/sort.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/sort.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/sort_by_key.cpp b/libs/core/algorithms/tests/unit/algorithms/sort_by_key.cpp
index af382de05478..725fcdabb93c 100644
--- a/libs/core/algorithms/tests/unit/algorithms/sort_by_key.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/sort_by_key.cpp
@@ -4,13 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithm.hpp>
-#include <hpx/parallel/algorithms/generate.hpp>
 #include <hpx/parallel/algorithms/sort_by_key.hpp>
-#include <hpx/type_support/unused.hpp>
-//
+
 #include <cstdint>
 #include <iomanip>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/sort_exceptions.cpp b/libs/core/algorithms/tests/unit/algorithms/sort_exceptions.cpp
index fa7507c2bae5..85e974a6dab0 100644
--- a/libs/core/algorithms/tests/unit/algorithms/sort_exceptions.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/sort_exceptions.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/stable_partition.cpp b/libs/core/algorithms/tests/unit/algorithms/stable_partition.cpp
index a73ba342e37a..b2413e044d79 100644
--- a/libs/core/algorithms/tests/unit/algorithms/stable_partition.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/stable_partition.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/stable_sort.cpp b/libs/core/algorithms/tests/unit/algorithms/stable_sort.cpp
index 68d92ee2860d..b48a9254b5e2 100644
--- a/libs/core/algorithms/tests/unit/algorithms/stable_sort.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/stable_sort.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/stable_sort_exceptions.cpp b/libs/core/algorithms/tests/unit/algorithms/stable_sort_exceptions.cpp
index f0a09ca3de77..0386d7bacd7b 100644
--- a/libs/core/algorithms/tests/unit/algorithms/stable_sort_exceptions.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/stable_sort_exceptions.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/stable_sort_tests.hpp b/libs/core/algorithms/tests/unit/algorithms/stable_sort_tests.hpp
index 0002392b8226..64597d2eebd0 100644
--- a/libs/core/algorithms/tests/unit/algorithms/stable_sort_tests.hpp
+++ b/libs/core/algorithms/tests/unit/algorithms/stable_sort_tests.hpp
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/format.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/format.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/stable_sort.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/core/algorithms/tests/unit/algorithms/starts_with.cpp b/libs/core/algorithms/tests/unit/algorithms/starts_with.cpp
index bc6d390e203e..e2d8ce80f316 100644
--- a/libs/core/algorithms/tests/unit/algorithms/starts_with.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/starts_with.cpp
@@ -5,10 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/starts_with.hpp>
-#include <hpx/parallel/container_algorithms/starts_with.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/swapranges.cpp b/libs/core/algorithms/tests/unit/algorithms/swapranges.cpp
index 48ceff54691f..7383551f5ffa 100644
--- a/libs/core/algorithms/tests/unit/algorithms/swapranges.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/swapranges.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/swap_ranges.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/test_utils.hpp b/libs/core/algorithms/tests/unit/algorithms/test_utils.hpp
index 001062b0ca4b..1befa9bde1ea 100644
--- a/libs/core/algorithms/tests/unit/algorithms/test_utils.hpp
+++ b/libs/core/algorithms/tests/unit/algorithms/test_utils.hpp
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
 #include <hpx/modules/iterator_support.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/algorithms/transform.cpp b/libs/core/algorithms/tests/unit/algorithms/transform.cpp
index e12cebe744d5..481b4fd5e8f4 100644
--- a/libs/core/algorithms/tests/unit/algorithms/transform.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/transform.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/transform_binary.cpp b/libs/core/algorithms/tests/unit/algorithms/transform_binary.cpp
index c22be7158e79..af1d5979cc80 100644
--- a/libs/core/algorithms/tests/unit/algorithms/transform_binary.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/transform_binary.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/transform_binary2.cpp b/libs/core/algorithms/tests/unit/algorithms/transform_binary2.cpp
index dafc19b97ba6..7dcca0a64723 100644
--- a/libs/core/algorithms/tests/unit/algorithms/transform_binary2.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/transform_binary2.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/transform_exclusive_scan.cpp b/libs/core/algorithms/tests/unit/algorithms/transform_exclusive_scan.cpp
index 3866bf7959cc..14300ea9e429 100644
--- a/libs/core/algorithms/tests/unit/algorithms/transform_exclusive_scan.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/transform_exclusive_scan.cpp
@@ -4,9 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/transform_exclusive_scan.hpp>
+#include <hpx/numeric.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/transform_inclusive_scan.cpp b/libs/core/algorithms/tests/unit/algorithms/transform_inclusive_scan.cpp
index 0cbf05a10cff..51ed7faea640 100644
--- a/libs/core/algorithms/tests/unit/algorithms/transform_inclusive_scan.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/transform_inclusive_scan.cpp
@@ -4,9 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/transform_inclusive_scan.hpp>
+#include <hpx/numeric.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/algorithms/transform_reduce.cpp b/libs/core/algorithms/tests/unit/algorithms/transform_reduce.cpp
index 764c4213831c..61b5f7946198 100644
--- a/libs/core/algorithms/tests/unit/algorithms/transform_reduce.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/transform_reduce.cpp
@@ -4,9 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/transform_reduce.hpp>
+#include <hpx/numeric.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/transform_reduce_binary.cpp b/libs/core/algorithms/tests/unit/algorithms/transform_reduce_binary.cpp
index 67c0855e7b58..0bd1e764efb2 100644
--- a/libs/core/algorithms/tests/unit/algorithms/transform_reduce_binary.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/transform_reduce_binary.cpp
@@ -5,7 +5,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/transform_reduce_binary_bad_alloc.cpp b/libs/core/algorithms/tests/unit/algorithms/transform_reduce_binary_bad_alloc.cpp
index 7cfd67c0afd0..ab81117f8015 100644
--- a/libs/core/algorithms/tests/unit/algorithms/transform_reduce_binary_bad_alloc.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/transform_reduce_binary_bad_alloc.cpp
@@ -5,9 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/transform_reduce.hpp>
+#include <hpx/numeric.hpp>
 
 #include <cstddef>
 #include <ctime>
diff --git a/libs/core/algorithms/tests/unit/algorithms/transform_reduce_binary_exception.cpp b/libs/core/algorithms/tests/unit/algorithms/transform_reduce_binary_exception.cpp
index 11c8711bbb21..2f9377e8a306 100644
--- a/libs/core/algorithms/tests/unit/algorithms/transform_reduce_binary_exception.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/transform_reduce_binary_exception.cpp
@@ -5,9 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/transform_reduce.hpp>
+#include <hpx/numeric.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/transform_reduce_binary_tests.hpp b/libs/core/algorithms/tests/unit/algorithms/transform_reduce_binary_tests.hpp
index 6709c6049073..e22be56bfa8e 100644
--- a/libs/core/algorithms/tests/unit/algorithms/transform_reduce_binary_tests.hpp
+++ b/libs/core/algorithms/tests/unit/algorithms/transform_reduce_binary_tests.hpp
@@ -6,7 +6,9 @@
 
 #pragma once
 
+#include <hpx/algorithm.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/numeric.hpp>
 #include <hpx/parallel/algorithms/transform_reduce.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/algorithms/uninitialized_copy.cpp b/libs/core/algorithms/tests/unit/algorithms/uninitialized_copy.cpp
index f76bc4e46f25..4c8f2d7ce3f9 100644
--- a/libs/core/algorithms/tests/unit/algorithms/uninitialized_copy.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/uninitialized_copy.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/uninitialized_copy_tests.hpp b/libs/core/algorithms/tests/unit/algorithms/uninitialized_copy_tests.hpp
index 89fd129e0bc5..4d711d2dc252 100644
--- a/libs/core/algorithms/tests/unit/algorithms/uninitialized_copy_tests.hpp
+++ b/libs/core/algorithms/tests/unit/algorithms/uninitialized_copy_tests.hpp
@@ -6,9 +6,10 @@
 
 #pragma once
 
-#include <hpx/local/execution.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/uninitialized_copy.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/uninitialized_copyn.cpp b/libs/core/algorithms/tests/unit/algorithms/uninitialized_copyn.cpp
index 4484cf98250a..bae46dfe5b9a 100644
--- a/libs/core/algorithms/tests/unit/algorithms/uninitialized_copyn.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/uninitialized_copyn.cpp
@@ -4,9 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/uninitialized_copy.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/uninitialized_default_construct.cpp b/libs/core/algorithms/tests/unit/algorithms/uninitialized_default_construct.cpp
index 7c2e215fab02..20a57c70d89f 100644
--- a/libs/core/algorithms/tests/unit/algorithms/uninitialized_default_construct.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/uninitialized_default_construct.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/uninitialized_default_construct_tests.hpp b/libs/core/algorithms/tests/unit/algorithms/uninitialized_default_construct_tests.hpp
index 4a22e3e4670a..07115b812f0e 100644
--- a/libs/core/algorithms/tests/unit/algorithms/uninitialized_default_construct_tests.hpp
+++ b/libs/core/algorithms/tests/unit/algorithms/uninitialized_default_construct_tests.hpp
@@ -6,9 +6,10 @@
 
 #pragma once
 
-#include <hpx/local/execution.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/uninitialized_default_construct.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/uninitialized_default_constructn.cpp b/libs/core/algorithms/tests/unit/algorithms/uninitialized_default_constructn.cpp
index 8238b5ceb069..30c94beada1c 100644
--- a/libs/core/algorithms/tests/unit/algorithms/uninitialized_default_constructn.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/uninitialized_default_constructn.cpp
@@ -4,9 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/uninitialized_default_construct.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/uninitialized_fill.cpp b/libs/core/algorithms/tests/unit/algorithms/uninitialized_fill.cpp
index 9bebf26ee427..bd78e8b3941f 100644
--- a/libs/core/algorithms/tests/unit/algorithms/uninitialized_fill.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/uninitialized_fill.cpp
@@ -4,9 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/uninitialized_fill.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/uninitialized_filln.cpp b/libs/core/algorithms/tests/unit/algorithms/uninitialized_filln.cpp
index 838f0f7538c9..84916542367b 100644
--- a/libs/core/algorithms/tests/unit/algorithms/uninitialized_filln.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/uninitialized_filln.cpp
@@ -4,9 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/uninitialized_fill.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/uninitialized_move.cpp b/libs/core/algorithms/tests/unit/algorithms/uninitialized_move.cpp
index e308f66e243c..aa981b9361db 100644
--- a/libs/core/algorithms/tests/unit/algorithms/uninitialized_move.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/uninitialized_move.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/uninitialized_move_tests.hpp b/libs/core/algorithms/tests/unit/algorithms/uninitialized_move_tests.hpp
index aa94c2ed7b08..536e4e5c0e0b 100644
--- a/libs/core/algorithms/tests/unit/algorithms/uninitialized_move_tests.hpp
+++ b/libs/core/algorithms/tests/unit/algorithms/uninitialized_move_tests.hpp
@@ -6,9 +6,10 @@
 
 #pragma once
 
-#include <hpx/local/execution.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/uninitialized_move.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/uninitialized_moven.cpp b/libs/core/algorithms/tests/unit/algorithms/uninitialized_moven.cpp
index 3449fa827245..6e8a569b4d54 100644
--- a/libs/core/algorithms/tests/unit/algorithms/uninitialized_moven.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/uninitialized_moven.cpp
@@ -4,9 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/uninitialized_move.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/uninitialized_value_construct.cpp b/libs/core/algorithms/tests/unit/algorithms/uninitialized_value_construct.cpp
index 094cab24ba2f..434379f1924b 100644
--- a/libs/core/algorithms/tests/unit/algorithms/uninitialized_value_construct.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/uninitialized_value_construct.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/algorithms/uninitialized_value_construct_tests.hpp b/libs/core/algorithms/tests/unit/algorithms/uninitialized_value_construct_tests.hpp
index c89b2fac9ed0..1fe7aa108d42 100644
--- a/libs/core/algorithms/tests/unit/algorithms/uninitialized_value_construct_tests.hpp
+++ b/libs/core/algorithms/tests/unit/algorithms/uninitialized_value_construct_tests.hpp
@@ -6,9 +6,10 @@
 
 #pragma once
 
-#include <hpx/local/execution.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/uninitialized_value_construct.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/uninitialized_value_constructn.cpp b/libs/core/algorithms/tests/unit/algorithms/uninitialized_value_constructn.cpp
index 43f96b0b1078..84d2bff216ac 100644
--- a/libs/core/algorithms/tests/unit/algorithms/uninitialized_value_constructn.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/uninitialized_value_constructn.cpp
@@ -4,9 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/uninitialized_value_construct.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/algorithms/unique.cpp b/libs/core/algorithms/tests/unit/algorithms/unique.cpp
index c9d89eafd5fa..ffb235dce683 100644
--- a/libs/core/algorithms/tests/unit/algorithms/unique.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/unique.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/algorithms/unique_copy.cpp b/libs/core/algorithms/tests/unit/algorithms/unique_copy.cpp
index 21b2442605cd..86ac4b13ab2f 100644
--- a/libs/core/algorithms/tests/unit/algorithms/unique_copy.cpp
+++ b/libs/core/algorithms/tests/unit/algorithms/unique_copy.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/block/spmd_block.cpp b/libs/core/algorithms/tests/unit/block/spmd_block.cpp
index a35fb2fcbdee..6500c0fedb54 100644
--- a/libs/core/algorithms/tests/unit/block/spmd_block.cpp
+++ b/libs/core/algorithms/tests/unit/block/spmd_block.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/executors/execution_policy.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 #include <hpx/parallel/spmd_block.hpp>
 
diff --git a/libs/core/algorithms/tests/unit/block/task_block.cpp b/libs/core/algorithms/tests/unit/block/task_block.cpp
index 2213b4a0e931..65d1a9649242 100644
--- a/libs/core/algorithms/tests/unit/block/task_block.cpp
+++ b/libs/core/algorithms/tests/unit/block/task_block.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/local/task_block.hpp>
+#include <hpx/init.hpp>
+#include <hpx/modules/runtime_local.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/runtime_local/custom_exception_info.hpp>
+#include <hpx/task_block.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/block/task_block_executor.cpp b/libs/core/algorithms/tests/unit/block/task_block_executor.cpp
index 530cc34314a9..5b30f037eacd 100644
--- a/libs/core/algorithms/tests/unit/block/task_block_executor.cpp
+++ b/libs/core/algorithms/tests/unit/block/task_block_executor.cpp
@@ -4,11 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/task_block.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 #include <hpx/runtime_local/custom_exception_info.hpp>
+#include <hpx/task_block.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/block/task_block_par.cpp b/libs/core/algorithms/tests/unit/block/task_block_par.cpp
index 1ab0b2583e7f..53c88e46a147 100644
--- a/libs/core/algorithms/tests/unit/block/task_block_par.cpp
+++ b/libs/core/algorithms/tests/unit/block/task_block_par.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/local/task_block.hpp>
+#include <hpx/init.hpp>
+#include <hpx/modules/runtime_local.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/runtime_local/custom_exception_info.hpp>
+#include <hpx/task_block.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/block/task_group.cpp b/libs/core/algorithms/tests/unit/block/task_group.cpp
index 79e56199b2b0..c32e936697cc 100644
--- a/libs/core/algorithms/tests/unit/block/task_group.cpp
+++ b/libs/core/algorithms/tests/unit/block/task_group.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/experimental/task_group.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/task_group.hpp>
 
 #include <cstddef>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/adjacentdifference_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/adjacentdifference_range.cpp
index 78312ccd14e4..8cd67ecd9de1 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/adjacentdifference_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/adjacentdifference_range.cpp
@@ -5,10 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/adjacent_difference.hpp>
+
 #include <cstddef>
 #include <iostream>
 #include <iterator>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/adjacentdifference_range_sender.cpp b/libs/core/algorithms/tests/unit/container_algorithms/adjacentdifference_range_sender.cpp
index 007e536da0cb..efc9df553e8a 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/adjacentdifference_range_sender.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/adjacentdifference_range_sender.cpp
@@ -6,11 +6,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/adjacent_difference.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_bad_alloc_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_bad_alloc_range.cpp
index 15a6b24e7a32..b5d21506bd39 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_bad_alloc_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_bad_alloc_range.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_binary_bad_alloc_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_binary_bad_alloc_range.cpp
index c08f67e3345c..2baa67a95c80 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_binary_bad_alloc_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_binary_bad_alloc_range.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_binary_exception_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_binary_exception_range.cpp
index a9956fc2265a..31ecc19f1c85 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_binary_exception_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_binary_exception_range.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_binary_projection_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_binary_projection_range.cpp
index 24856aa4aef9..3e7c9520b114 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_binary_projection_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_binary_projection_range.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_binary_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_binary_range.cpp
index 35f9df92f4d8..706e1827d507 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_binary_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_binary_range.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_exception_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_exception_range.cpp
index 2fd2ac36a22a..c188bc536acd 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_exception_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_exception_range.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_range.cpp
index 64de288a3e40..724b18f22c02 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/adjacentfind_range.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/all_of_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/all_of_range.cpp
index 93691fa22d61..36273a7f85d7 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/all_of_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/all_of_range.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/all_any_none.hpp>
 #include <hpx/type_support/identity.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/any_of_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/any_of_range.cpp
index b743da4e40e3..4668c186a543 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/any_of_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/any_of_range.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/all_any_none.hpp>
 #include <hpx/type_support/identity.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/copy_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/copy_range.cpp
index 1bf6eb0662c5..0d070ef4eda8 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/copy_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/copy_range.cpp
@@ -5,10 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/copy.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/copyif_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/copyif_range.cpp
index be36239b9040..9ab01acf344a 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/copyif_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/copyif_range.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/copy.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/copyn_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/copyn_range.cpp
index bef3119096ba..482e9b538835 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/copyn_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/copyn_range.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/copy.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/count_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/count_range.cpp
index d6ff8914d144..cf6192b08ef8 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/count_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/count_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/count.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/countif_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/countif_range.cpp
index 6d9912ce9c7d..0f7c6297ab86 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/countif_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/countif_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/count.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/destroy_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/destroy_range.cpp
index 7fd06b55fa46..7281fefbc5d0 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/destroy_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/destroy_range.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/destroy_range_tests.hpp b/libs/core/algorithms/tests/unit/container_algorithms/destroy_range_tests.hpp
index 6c66964cb9c5..aca0946ae038 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/destroy_range_tests.hpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/destroy_range_tests.hpp
@@ -6,9 +6,10 @@
 
 #pragma once
 
-#include <hpx/local/execution.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/destroy.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/destroyn_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/destroyn_range.cpp
index fab18de25101..8e9a229cf172 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/destroyn_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/destroyn_range.cpp
@@ -4,9 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/destroy.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/ends_with_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/ends_with_range.cpp
index 50d28837ee35..4224c38180bb 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/ends_with_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/ends_with_range.cpp
@@ -5,10 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/ends_with.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/equal_binary_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/equal_binary_range.cpp
index bb692805de34..b2207165bb02 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/equal_binary_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/equal_binary_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/equal.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/equal_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/equal_range.cpp
index 9cd020050e75..96c10fa1da45 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/equal_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/equal_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/equal.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/exclusive_scan_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/exclusive_scan_range.cpp
index 2e3c5111b99d..229948ba8cf8 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/exclusive_scan_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/exclusive_scan_range.cpp
@@ -6,10 +6,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/exclusive_scan.hpp>
+#include <hpx/numeric.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/fill_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/fill_range.cpp
index 052d5fe20aca..52d466c578de 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/fill_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/fill_range.cpp
@@ -5,10 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/fill.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/filln_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/filln_range.cpp
index 9f52b164b720..350d5aa3f466 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/filln_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/filln_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/fill.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/find_end_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/find_end_range.cpp
index 609c7f43cf79..c5134d363400 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/find_end_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/find_end_range.cpp
@@ -6,9 +6,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/find.hpp>
 
 #include <cstddef>
 #include <functional>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/find_end_range2.cpp b/libs/core/algorithms/tests/unit/container_algorithms/find_end_range2.cpp
index 40afb81c5917..563e140297b8 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/find_end_range2.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/find_end_range2.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/find.hpp>
 
 #include <cstddef>
 #include <functional>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/find_first_of_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/find_first_of_range.cpp
index 90f04972cb13..99465aff3e88 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/find_first_of_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/find_first_of_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/find.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/find_first_of_range2.cpp b/libs/core/algorithms/tests/unit/container_algorithms/find_first_of_range2.cpp
index 3aa288c39196..308c6ff95fff 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/find_first_of_range2.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/find_first_of_range2.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/find.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/find_if_not_exception_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/find_if_not_exception_range.cpp
index 87c06841d127..be5241ac3375 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/find_if_not_exception_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/find_if_not_exception_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/find.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/find_if_not_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/find_if_not_range.cpp
index 9b19717d9b2f..60f8c83db4f2 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/find_if_not_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/find_if_not_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/find.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/find_if_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/find_if_range.cpp
index f5e9ebcd8262..f97f169e250f 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/find_if_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/find_if_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/find.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/find_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/find_range.cpp
index 2f86fb46f843..e0da69f910b4 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/find_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/find_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/find.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/for_loop_exception_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/for_loop_exception_range.cpp
index 3adc0008d79d..54ef4c841a3d 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/for_loop_exception_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/for_loop_exception_range.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/for_loop_induction_async_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/for_loop_induction_async_range.cpp
index ea9a0d062ce4..a99448c95d8c 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/for_loop_induction_async_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/for_loop_induction_async_range.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/for_loop_induction_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/for_loop_induction_range.cpp
index d66137520351..0f4b6bad4c61 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/for_loop_induction_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/for_loop_induction_range.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/for_loop_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/for_loop_range.cpp
index c781b7c9c288..889b4a6cd443 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/for_loop_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/for_loop_range.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/for_loop_range_generator.cpp b/libs/core/algorithms/tests/unit/container_algorithms/for_loop_range_generator.cpp
index 7e5e7a905cf7..43e8ea48ba24 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/for_loop_range_generator.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/for_loop_range_generator.cpp
@@ -10,9 +10,9 @@
 #if defined(HPX_HAVE_CXX20_COROUTINES) &&                                      \
     (!defined(HPX_CLANG_VERSION) || HPX_CLANG_VERSION >= 130000)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/generator.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/generator.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/for_loop_reduction_async_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/for_loop_reduction_async_range.cpp
index 065dd4b1a574..d3bcf93fa001 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/for_loop_reduction_async_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/for_loop_reduction_async_range.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/for_loop_reduction_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/for_loop_reduction_range.cpp
index 6e4174f90423..0546e39b1987 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/for_loop_reduction_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/for_loop_reduction_range.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/for_loop_strided_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/for_loop_strided_range.cpp
index f50c744d9da8..6120649131f7 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/for_loop_strided_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/for_loop_strided_range.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/foreach_adapt.cpp b/libs/core/algorithms/tests/unit/container_algorithms/foreach_adapt.cpp
index 972c8fb9dc17..23e807c2b5a8 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/foreach_adapt.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/foreach_adapt.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/for_each.hpp>
 
 #include <cstdint>
 
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/foreach_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/foreach_range.cpp
index 174a2aa2df72..8551cb97a7ec 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/foreach_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/foreach_range.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/init.hpp>
+#include <hpx/thread.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/foreach_range_projection.cpp b/libs/core/algorithms/tests/unit/container_algorithms/foreach_range_projection.cpp
index 4fdd2f6f0f71..5019d6a7662f 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/foreach_range_projection.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/foreach_range_projection.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/init.hpp>
+#include <hpx/thread.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/foreach_range_sender.cpp b/libs/core/algorithms/tests/unit/container_algorithms/foreach_range_sender.cpp
index 78ab46b2a06a..f39f60d1a7fd 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/foreach_range_sender.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/foreach_range_sender.cpp
@@ -4,12 +4,12 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/for_each.hpp>
+#include <hpx/thread.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/generate_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/generate_range.cpp
index d994bec43cbb..455dcd5c1189 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/generate_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/generate_range.cpp
@@ -4,11 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/generate.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/includes_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/includes_range.cpp
index 61fa0e1ad086..ec78ac6874d5 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/includes_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/includes_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/includes.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/inclusive_scan_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/inclusive_scan_range.cpp
index 8ea9e328f48c..de8cc4e23faa 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/inclusive_scan_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/inclusive_scan_range.cpp
@@ -6,10 +6,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/inclusive_scan.hpp>
+#include <hpx/numeric.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/inplace_merge_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/inplace_merge_range.cpp
index b754f4f3ab45..97fd05e54a1f 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/inplace_merge_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/inplace_merge_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/merge.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/is_heap_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/is_heap_range.cpp
index fbb2fb6c39c3..2bf285d6ad34 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/is_heap_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/is_heap_range.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/is_heap.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/is_heap_until_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/is_heap_until_range.cpp
index 304f3889c8d6..34b822e5b623 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/is_heap_until_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/is_heap_until_range.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/is_heap.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/is_partitioned_projection_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/is_partitioned_projection_range.cpp
index 6bb382b4741c..d4230610c215 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/is_partitioned_projection_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/is_partitioned_projection_range.cpp
@@ -5,8 +5,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/is_partitioned_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/is_partitioned_range.cpp
index 5abf2699b16f..e6c75b988c84 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/is_partitioned_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/is_partitioned_range.cpp
@@ -5,8 +5,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/is_sorted_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/is_sorted_range.cpp
index 5e01611955e0..b8409b225e87 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/is_sorted_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/is_sorted_range.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/is_sorted_range_tests.hpp b/libs/core/algorithms/tests/unit/container_algorithms/is_sorted_range_tests.hpp
index ef4ae37d98d6..d9e7ad300788 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/is_sorted_range_tests.hpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/is_sorted_range_tests.hpp
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <hpx/local/execution.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/is_sorted.hpp>
 
 #include <cstddef>
 #include <functional>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/is_sorted_until_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/is_sorted_until_range.cpp
index 10df84eecc01..bb40a007a334 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/is_sorted_until_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/is_sorted_until_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/is_sorted.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/lexicographical_compare_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/lexicographical_compare_range.cpp
index b4bb9f446262..5a5d2f7330c9 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/lexicographical_compare_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/lexicographical_compare_range.cpp
@@ -5,10 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/lexicographical_compare.hpp>
 
 #include <algorithm>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/make_heap_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/make_heap_range.cpp
index ffbc0d755462..dd9f362268a3 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/make_heap_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/make_heap_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/make_heap.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/max_element_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/max_element_range.cpp
index d78c7f7fb72d..3f902566d41c 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/max_element_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/max_element_range.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/minmax.hpp>
 
 #include <cstddef>
 #include <ctime>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/merge_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/merge_range.cpp
index e90cb0a5636a..ac8c86c802bd 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/merge_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/merge_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/merge.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/min_element_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/min_element_range.cpp
index 2901802bcdec..7882a9428867 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/min_element_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/min_element_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/minmax.hpp>
 
 #include <cstddef>
 #include <ctime>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/minmax_element_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/minmax_element_range.cpp
index b29f466ef4b5..7e054a1eb5c1 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/minmax_element_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/minmax_element_range.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/minmax.hpp>
 
 #include <cstddef>
 #include <ctime>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/mismatch_binary_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/mismatch_binary_range.cpp
index b6b11c2b6e36..80973e704878 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/mismatch_binary_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/mismatch_binary_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/mismatch.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/mismatch_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/mismatch_range.cpp
index ed5f40b1d999..6eead3adc0f7 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/mismatch_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/mismatch_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/mismatch.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/move_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/move_range.cpp
index dcd123dc2412..8ac49bcc1dec 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/move_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/move_range.cpp
@@ -6,10 +6,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/move.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/none_of_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/none_of_range.cpp
index 027acb3458d6..58b6d287494b 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/none_of_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/none_of_range.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/all_any_none.hpp>
 #include <hpx/type_support/identity.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/nth_element_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/nth_element_range.cpp
index 1027dc5183f3..51f0809a59ed 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/nth_element_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/nth_element_range.cpp
@@ -7,10 +7,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/nth_element.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/partial_sort_copy_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/partial_sort_copy_range.cpp
index 5fe7d9a92c8d..4bd0a4b12ff0 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/partial_sort_copy_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/partial_sort_copy_range.cpp
@@ -5,12 +5,12 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
 #include <hpx/assert.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/partial_sort_copy.hpp>
 
 #include <algorithm>
 #include <cstdint>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/partial_sort_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/partial_sort_range.cpp
index 8eeaeebde3e3..f1b0cc3217f1 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/partial_sort_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/partial_sort_range.cpp
@@ -5,11 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/partial_sort.hpp>
 
 #include <algorithm>
 #include <cstdint>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/partition_copy_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/partition_copy_range.cpp
index fd6a6ddd8e2d..12f130fce536 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/partition_copy_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/partition_copy_range.cpp
@@ -5,10 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/partition.hpp>
 #include <hpx/type_support/unused.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/partition_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/partition_range.cpp
index 1cdabcb878b6..d9f2ef3c1ade 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/partition_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/partition_range.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/partition.hpp>
 #include <hpx/type_support/unused.hpp>
 
 #include <algorithm>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/reduce_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/reduce_range.cpp
index 4348f144a18f..40333397b4ac 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/reduce_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/reduce_range.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/reduce.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/remove_copy_if_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/remove_copy_if_range.cpp
index 2da0ddae56a7..bba044a42073 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/remove_copy_if_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/remove_copy_if_range.cpp
@@ -5,10 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/remove_copy.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/remove_copy_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/remove_copy_range.cpp
index 38d3a87794d9..ae575cc647e1 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/remove_copy_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/remove_copy_range.cpp
@@ -5,11 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/remove_copy.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/remove_if_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/remove_if_range.cpp
index 155bb44dd378..ebfb9bbd7b7d 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/remove_if_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/remove_if_range.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/remove.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/remove_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/remove_range.cpp
index 7a12caeb9248..45196f9431b3 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/remove_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/remove_range.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/remove.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/replace_copy_if_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/replace_copy_if_range.cpp
index b1745d17dc0d..baaf1e952dfa 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/replace_copy_if_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/replace_copy_if_range.cpp
@@ -5,11 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/replace.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/replace_copy_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/replace_copy_range.cpp
index 1547e7ec2323..a79165f1e851 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/replace_copy_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/replace_copy_range.cpp
@@ -5,11 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/replace.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/replace_if_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/replace_if_range.cpp
index a7c86bf443c0..ddd8ba2c0a44 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/replace_if_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/replace_if_range.cpp
@@ -5,11 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/replace.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/replace_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/replace_range.cpp
index 5aa8c864b9ca..a4ab638db646 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/replace_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/replace_range.cpp
@@ -5,11 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/replace.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/reverse_copy_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/reverse_copy_range.cpp
index 0a0dff6418e6..c31191cc8e6a 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/reverse_copy_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/reverse_copy_range.cpp
@@ -5,11 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/reverse.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/reverse_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/reverse_range.cpp
index 0eae9483d2f8..447ad533f93f 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/reverse_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/reverse_range.cpp
@@ -5,11 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/reverse.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/rotate_copy_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/rotate_copy_range.cpp
index 1fffb02f2fbb..d2ba973d4ca2 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/rotate_copy_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/rotate_copy_range.cpp
@@ -5,12 +5,12 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/execution/traits/is_execution_policy.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/rotate.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/rotate_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/rotate_range.cpp
index 5440f5627a26..337e5c7a0bbb 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/rotate_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/rotate_range.cpp
@@ -5,12 +5,12 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/execution/traits/is_execution_policy.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/rotate.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/search_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/search_range.cpp
index 2a483dd7bb06..02f2aa7383d9 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/search_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/search_range.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/search.hpp>
 #include <hpx/program_options.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/searchn_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/searchn_range.cpp
index 760c7f464d66..d4821e3239e8 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/searchn_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/searchn_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/search.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/set_difference_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/set_difference_range.cpp
index f3706b465b44..445db386f07e 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/set_difference_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/set_difference_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/set_difference.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/set_intersection_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/set_intersection_range.cpp
index 60928f2356d4..8cdfe7971ded 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/set_intersection_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/set_intersection_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/set_intersection.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/set_symmetric_difference_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/set_symmetric_difference_range.cpp
index f41e8f4b536b..867847cf1149 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/set_symmetric_difference_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/set_symmetric_difference_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/set_symmetric_difference.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/set_union_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/set_union_range.cpp
index 13792f38eab3..e645423f3723 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/set_union_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/set_union_range.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/set_union.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/shift_left_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/shift_left_range.cpp
index b1f80eb5253b..208e60994737 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/shift_left_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/shift_left_range.cpp
@@ -6,10 +6,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/shift_left.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/shift_right_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/shift_right_range.cpp
index 98d918e70a4a..d7bb96d2a137 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/shift_right_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/shift_right_range.cpp
@@ -6,10 +6,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/shift_right.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/sort_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/sort_range.cpp
index c49f9ae17475..60b6e18e1e94 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/sort_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/sort_range.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/stable_partition_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/stable_partition_range.cpp
index e7d16123f582..fd4aae02f89a 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/stable_partition_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/stable_partition_range.cpp
@@ -5,11 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/partition.hpp>
-#include <hpx/type_support/unused.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/stable_sort_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/stable_sort_range.cpp
index 971c518a68b1..ddbc31c9ddbd 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/stable_sort_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/stable_sort_range.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/starts_with_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/starts_with_range.cpp
index fec628c89a9d..97143f626253 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/starts_with_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/starts_with_range.cpp
@@ -5,10 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/starts_with.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/swap_ranges_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/swap_ranges_range.cpp
index f3dde6884047..4515dd176b7c 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/swap_ranges_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/swap_ranges_range.cpp
@@ -6,10 +6,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/swap_ranges.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/test_utils.hpp b/libs/core/algorithms/tests/unit/container_algorithms/test_utils.hpp
index ea4d63cd97da..e99a71befb1f 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/test_utils.hpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/test_utils.hpp
@@ -9,13 +9,12 @@
 #pragma once
 
 #include <hpx/concepts/concepts.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/runtime.hpp>
+#include <hpx/execution.hpp>
 #include <hpx/modules/iterator_support.hpp>
+#include <hpx/runtime.hpp>
 
 #include <atomic>
 #include <cstddef>
-#include <iostream>
 #include <numeric>
 #include <random>
 #include <utility>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/transform_exclusive_scan_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/transform_exclusive_scan_range.cpp
index 5261bcf7f3a5..b6d2bb75fb8f 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/transform_exclusive_scan_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/transform_exclusive_scan_range.cpp
@@ -6,10 +6,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/transform_exclusive_scan.hpp>
+#include <hpx/numeric.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/transform_inclusive_scan_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/transform_inclusive_scan_range.cpp
index d104523a51d6..ee8f69b8815c 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/transform_inclusive_scan_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/transform_inclusive_scan_range.cpp
@@ -6,10 +6,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/transform_inclusive_scan.hpp>
+#include <hpx/numeric.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/transform_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/transform_range.cpp
index f79ee46b64d3..fbe5c118b18d 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/transform_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/transform_range.cpp
@@ -5,10 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/transform.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/transform_range2.cpp b/libs/core/algorithms/tests/unit/container_algorithms/transform_range2.cpp
index c9c767cf23a8..11b081c8f645 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/transform_range2.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/transform_range2.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/transform.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/transform_range_binary.cpp b/libs/core/algorithms/tests/unit/container_algorithms/transform_range_binary.cpp
index f06bf30065d0..e83e793005a5 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/transform_range_binary.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/transform_range_binary.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/transform.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/transform_range_binary2.cpp b/libs/core/algorithms/tests/unit/container_algorithms/transform_range_binary2.cpp
index 182d514b6c77..673c5c7e26cf 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/transform_range_binary2.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/transform_range_binary2.cpp
@@ -5,10 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/transform.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/transform_reduce_binary_bad_alloc_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/transform_reduce_binary_bad_alloc_range.cpp
index be1137046fbe..6138432d0a99 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/transform_reduce_binary_bad_alloc_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/transform_reduce_binary_bad_alloc_range.cpp
@@ -5,9 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/transform_reduce.hpp>
+#include <hpx/numeric.hpp>
 
 #include <cstddef>
 #include <ctime>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/transform_reduce_binary_exception_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/transform_reduce_binary_exception_range.cpp
index 5db3cab1166a..69315f0a3e2e 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/transform_reduce_binary_exception_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/transform_reduce_binary_exception_range.cpp
@@ -5,9 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/transform_reduce.hpp>
+#include <hpx/numeric.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/transform_reduce_binary_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/transform_reduce_binary_range.cpp
index d08302802eda..91c8c15a1630 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/transform_reduce_binary_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/transform_reduce_binary_range.cpp
@@ -5,7 +5,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/transform_reduce_binary_tests_range.hpp b/libs/core/algorithms/tests/unit/container_algorithms/transform_reduce_binary_tests_range.hpp
index 2a1be4a8c014..38ac441e0d32 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/transform_reduce_binary_tests_range.hpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/transform_reduce_binary_tests_range.hpp
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/transform_reduce.hpp>
+#include <hpx/numeric.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/transform_reduce_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/transform_reduce_range.cpp
index e8104e2b402a..83fc2f654771 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/transform_reduce_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/transform_reduce_range.cpp
@@ -5,9 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/transform_reduce.hpp>
+#include <hpx/numeric.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_copy_n_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_copy_n_range.cpp
index d1f5aed33c40..373ba643b44c 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_copy_n_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_copy_n_range.cpp
@@ -5,10 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/uninitialized_copy.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_copy_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_copy_range.cpp
index cb7a0fd2e63c..261bf1bd3a27 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_copy_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_copy_range.cpp
@@ -5,10 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/uninitialized_copy.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_default_construct_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_default_construct_range.cpp
index eeae277a9ace..ce8757462407 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_default_construct_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_default_construct_range.cpp
@@ -5,10 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/uninitialized_default_construct.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_default_constructn_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_default_constructn_range.cpp
index 02d60512d3c6..a7f6bf2cd0ea 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_default_constructn_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_default_constructn_range.cpp
@@ -5,10 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/uninitialized_default_construct.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_fill_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_fill_range.cpp
index da5a7528990e..2962a0ed84da 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_fill_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_fill_range.cpp
@@ -5,10 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/uninitialized_fill.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_filln_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_filln_range.cpp
index 455298ab0b3e..148a1f8412f5 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_filln_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_filln_range.cpp
@@ -5,10 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/uninitialized_fill.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_move_n_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_move_n_range.cpp
index fae0b0549ce7..7056916ea93e 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_move_n_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_move_n_range.cpp
@@ -5,10 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/uninitialized_move.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_move_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_move_range.cpp
index 5dc4d934bed7..71abbfc9fbcd 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_move_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_move_range.cpp
@@ -5,10 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/uninitialized_move.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_value_construct_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_value_construct_range.cpp
index ee2608b1e256..6c03eda3dc4c 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_value_construct_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_value_construct_range.cpp
@@ -5,10 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/uninitialized_value_construct.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_value_constructn_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_value_constructn_range.cpp
index b3e7d60ae3d1..9165e8ef40f3 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_value_constructn_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/uninitialized_value_constructn_range.cpp
@@ -5,10 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/memory.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/uninitialized_value_construct.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/unique_copy_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/unique_copy_range.cpp
index fba3128d1880..ef2d45eaee9a 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/unique_copy_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/unique_copy_range.cpp
@@ -5,10 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/unique.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/container_algorithms/unique_range.cpp b/libs/core/algorithms/tests/unit/container_algorithms/unique_range.cpp
index da2f7ec19cd0..b0f17a473ea1 100644
--- a/libs/core/algorithms/tests/unit/container_algorithms/unique_range.cpp
+++ b/libs/core/algorithms/tests/unit/container_algorithms/unique_range.cpp
@@ -5,10 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iter_sent.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/container_algorithms/unique.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/adjacentdifference_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/adjacentdifference_datapar.cpp
index ff12c7a77832..2187bbb796a6 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/adjacentdifference_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/adjacentdifference_datapar.cpp
@@ -5,8 +5,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/include/datapar.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/adjacentfind_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/adjacentfind_datapar.cpp
index e8da18f1202d..c66a49180e3b 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/adjacentfind_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/adjacentfind_datapar.cpp
@@ -5,8 +5,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/parallel/datapar.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/all_of_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/all_of_datapar.cpp
index 266ee5219fc0..c4b904d9f967 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/all_of_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/all_of_datapar.cpp
@@ -5,8 +5,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/include/datapar.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/any_of_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/any_of_datapar.cpp
index b0673af4699e..97a8b119ed10 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/any_of_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/any_of_datapar.cpp
@@ -5,8 +5,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/include/datapar.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/copy_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/copy_datapar.cpp
index bbfbee1a3d00..129847c4d5b5 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/copy_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/copy_datapar.cpp
@@ -5,8 +5,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/parallel/datapar.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/copyn_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/copyn_datapar.cpp
index d90e48a0dffe..dd7589f27873 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/copyn_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/copyn_datapar.cpp
@@ -5,8 +5,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/parallel/datapar.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/count_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/count_datapar.cpp
index a9e2793499fa..ac09d2b91754 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/count_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/count_datapar.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/parallel/datapar.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/countif_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/countif_datapar.cpp
index ebc987ff832e..472a7e77d4b4 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/countif_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/countif_datapar.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/parallel/datapar.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/equal_binary_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/equal_binary_datapar.cpp
index 1047bc66c49c..2fdc24ebbd77 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/equal_binary_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/equal_binary_datapar.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/include/datapar.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/equal_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/equal_datapar.cpp
index 7dcfa00842a5..a30bdaf91aea 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/equal_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/equal_datapar.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/include/datapar.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/fill_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/fill_datapar.cpp
index 4b15b673110f..35d12a44099c 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/fill_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/fill_datapar.cpp
@@ -6,8 +6,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/include/datapar.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/filln_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/filln_datapar.cpp
index f1ece454349c..9b9f72c6a26c 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/filln_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/filln_datapar.cpp
@@ -6,8 +6,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/include/datapar.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/find_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/find_datapar.cpp
index 57200fbe4dd3..c5aab6ebc87d 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/find_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/find_datapar.cpp
@@ -5,8 +5,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/parallel/datapar.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/findend_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/findend_datapar.cpp
index f81219d24506..d5eeeebe8d91 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/findend_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/findend_datapar.cpp
@@ -5,8 +5,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/parallel/datapar.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/findfirstof_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/findfirstof_datapar.cpp
index c5f6726d6480..d007d08a2cc0 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/findfirstof_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/findfirstof_datapar.cpp
@@ -5,8 +5,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/parallel/datapar.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/findif_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/findif_datapar.cpp
index bffc9b5936c0..78b0c1c91ce9 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/findif_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/findif_datapar.cpp
@@ -5,8 +5,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/parallel/datapar.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/findifnot_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/findifnot_datapar.cpp
index 4e2926fd8405..6ea8f7cffb17 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/findifnot_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/findifnot_datapar.cpp
@@ -5,8 +5,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/parallel/datapar.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/foreach_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/foreach_datapar.cpp
index f58d8d57419f..a99d01046a30 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/foreach_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/foreach_datapar.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/parallel/datapar.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/foreach_datapar_zipiter.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/foreach_datapar_zipiter.cpp
index ca39116083ac..0e0f15772065 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/foreach_datapar_zipiter.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/foreach_datapar_zipiter.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/for_each.hpp>
-#include <hpx/parallel/datapar.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/foreachn_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/foreachn_datapar.cpp
index ccb7c95a6b21..41ac2e746368 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/foreachn_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/foreachn_datapar.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/parallel/datapar.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/generate_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/generate_datapar.cpp
index a7a7675c3bb6..27921d481632 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/generate_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/generate_datapar.cpp
@@ -6,8 +6,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/include/datapar.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/generate_tests.hpp b/libs/core/algorithms/tests/unit/datapar_algorithms/generate_tests.hpp
index 15f7a551b2ed..6ef9124bf013 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/generate_tests.hpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/generate_tests.hpp
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include <hpx/execution/traits/vector_pack_type.hpp>
-#include <hpx/include/datapar.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/generate.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/generaten_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/generaten_datapar.cpp
index 61ca3cab939d..cffc78fe6f0d 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/generaten_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/generaten_datapar.cpp
@@ -6,8 +6,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/include/datapar.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/generaten_tests.hpp b/libs/core/algorithms/tests/unit/datapar_algorithms/generaten_tests.hpp
index b0e7dc0f5eb8..6ffa03861d89 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/generaten_tests.hpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/generaten_tests.hpp
@@ -7,11 +7,11 @@
 
 #pragma once
 
-#include <hpx/execution/traits/vector_pack_type.hpp>
-#include <hpx/include/datapar.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/generate.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/mismatch_binary_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/mismatch_binary_datapar.cpp
index faa1dddaaf62..959158d592b3 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/mismatch_binary_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/mismatch_binary_datapar.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/include/datapar.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/mismatch_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/mismatch_datapar.cpp
index ea31e307bd85..02576c030a0f 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/mismatch_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/mismatch_datapar.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/include/datapar.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/none_of_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/none_of_datapar.cpp
index 8138f9d3190d..2232d24022c9 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/none_of_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/none_of_datapar.cpp
@@ -5,8 +5,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/include/datapar.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/reduce_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/reduce_datapar.cpp
index a0ea3456efbc..45b38f2f3b41 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/reduce_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/reduce_datapar.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/include/datapar.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/replace_copy_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/replace_copy_datapar.cpp
index 03fdd259cc6f..9c416b5cf5cd 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/replace_copy_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/replace_copy_datapar.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/include/datapar.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/replace.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/replace_copy_if_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/replace_copy_if_datapar.cpp
index 5410e0c8b011..992842515ab9 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/replace_copy_if_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/replace_copy_if_datapar.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/include/datapar.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/replace.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/replace_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/replace_datapar.cpp
index 4c462be731d2..c26e06f83137 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/replace_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/replace_datapar.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/include/datapar.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/replace.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/replace_if_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/replace_if_datapar.cpp
index d93e57178a0f..17fa2c8a260b 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/replace_if_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/replace_if_datapar.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/include/datapar.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/replace.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/transform_binary2_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/transform_binary2_datapar.cpp
index e66879abad00..5826df0ed6f9 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/transform_binary2_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/transform_binary2_datapar.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/parallel/datapar.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/transform_binary_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/transform_binary_datapar.cpp
index 0fac4c9c912a..9b6173317ef0 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/transform_binary_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/transform_binary_datapar.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/parallel/datapar.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/transform_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/transform_datapar.cpp
index 35da5418bf14..091ba032141c 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/transform_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/transform_datapar.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/parallel/datapar.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/transform_reduce_binary_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/transform_reduce_binary_datapar.cpp
index d4f5839ee2b2..23639d2ed958 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/transform_reduce_binary_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/transform_reduce_binary_datapar.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/parallel/datapar.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/datapar_algorithms/transform_reduce_datapar.cpp b/libs/core/algorithms/tests/unit/datapar_algorithms/transform_reduce_datapar.cpp
index 5b090fa0c9a7..01a6e3b798e6 100644
--- a/libs/core/algorithms/tests/unit/datapar_algorithms/transform_reduce_datapar.cpp
+++ b/libs/core/algorithms/tests/unit/datapar_algorithms/transform_reduce_datapar.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/include/datapar.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/algorithms/transform_reduce.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/unseq_algorithms/foreach_unseq.cpp b/libs/core/algorithms/tests/unit/unseq_algorithms/foreach_unseq.cpp
index 13cf1348ada5..3d1f325b3312 100644
--- a/libs/core/algorithms/tests/unit/unseq_algorithms/foreach_unseq.cpp
+++ b/libs/core/algorithms/tests/unit/unseq_algorithms/foreach_unseq.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/unseq_algorithms/foreach_unseq_zipiter.cpp b/libs/core/algorithms/tests/unit/unseq_algorithms/foreach_unseq_zipiter.cpp
index af8495ff4252..266d5f135ee3 100644
--- a/libs/core/algorithms/tests/unit/unseq_algorithms/foreach_unseq_zipiter.cpp
+++ b/libs/core/algorithms/tests/unit/unseq_algorithms/foreach_unseq_zipiter.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstddef>
diff --git a/libs/core/algorithms/tests/unit/unseq_algorithms/foreachn_unseq.cpp b/libs/core/algorithms/tests/unit/unseq_algorithms/foreachn_unseq.cpp
index eefe10ba5356..c30b4e74f18c 100644
--- a/libs/core/algorithms/tests/unit/unseq_algorithms/foreachn_unseq.cpp
+++ b/libs/core/algorithms/tests/unit/unseq_algorithms/foreachn_unseq.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/unseq_algorithms/reduce_unseq.cpp b/libs/core/algorithms/tests/unit/unseq_algorithms/reduce_unseq.cpp
index 10f9c0c4a3fc..e94547d0f107 100644
--- a/libs/core/algorithms/tests/unit/unseq_algorithms/reduce_unseq.cpp
+++ b/libs/core/algorithms/tests/unit/unseq_algorithms/reduce_unseq.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/algorithms/tests/unit/unseq_algorithms/transform_binary2_unseq.cpp b/libs/core/algorithms/tests/unit/unseq_algorithms/transform_binary2_unseq.cpp
index 3c567fac8c62..0b42c4c04faa 100644
--- a/libs/core/algorithms/tests/unit/unseq_algorithms/transform_binary2_unseq.cpp
+++ b/libs/core/algorithms/tests/unit/unseq_algorithms/transform_binary2_unseq.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/unseq_algorithms/transform_binary_unseq.cpp b/libs/core/algorithms/tests/unit/unseq_algorithms/transform_binary_unseq.cpp
index a0e6bf9d7a4c..a5316de8c778 100644
--- a/libs/core/algorithms/tests/unit/unseq_algorithms/transform_binary_unseq.cpp
+++ b/libs/core/algorithms/tests/unit/unseq_algorithms/transform_binary_unseq.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/unseq_algorithms/transform_reduce_binary_unseq.cpp b/libs/core/algorithms/tests/unit/unseq_algorithms/transform_reduce_binary_unseq.cpp
index 13009b1e2d3c..b50b12006e7d 100644
--- a/libs/core/algorithms/tests/unit/unseq_algorithms/transform_reduce_binary_unseq.cpp
+++ b/libs/core/algorithms/tests/unit/unseq_algorithms/transform_reduce_binary_unseq.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/algorithms/tests/unit/unseq_algorithms/transform_reduce_unseq.cpp b/libs/core/algorithms/tests/unit/unseq_algorithms/transform_reduce_unseq.cpp
index b3ef77e40940..e529a02c05db 100644
--- a/libs/core/algorithms/tests/unit/unseq_algorithms/transform_reduce_unseq.cpp
+++ b/libs/core/algorithms/tests/unit/unseq_algorithms/transform_reduce_unseq.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/numeric.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/numeric.hpp>
 
 #include <iostream>
 #include <iterator>
diff --git a/libs/core/algorithms/tests/unit/unseq_algorithms/transform_unseq.cpp b/libs/core/algorithms/tests/unit/unseq_algorithms/transform_unseq.cpp
index f73ace788aca..3ddb2617d954 100644
--- a/libs/core/algorithms/tests/unit/unseq_algorithms/transform_unseq.cpp
+++ b/libs/core/algorithms/tests/unit/unseq_algorithms/transform_unseq.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/libs/core/async_combinators/tests/regressions/split_future_2246.cpp b/libs/core/async_combinators/tests/regressions/split_future_2246.cpp
index 58ee983999ac..97d691757daf 100644
--- a/libs/core/async_combinators/tests/regressions/split_future_2246.cpp
+++ b/libs/core/async_combinators/tests/regressions/split_future_2246.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <iostream>
diff --git a/libs/core/async_combinators/tests/regressions/wait_all_std_array_2035.cpp b/libs/core/async_combinators/tests/regressions/wait_all_std_array_2035.cpp
index 00f84ca6839c..db60eeaf4b79 100644
--- a/libs/core/async_combinators/tests/regressions/wait_all_std_array_2035.cpp
+++ b/libs/core/async_combinators/tests/regressions/wait_all_std_array_2035.cpp
@@ -6,8 +6,8 @@
 
 // This compile-only test case verifies that #2035 remains fixed
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <array>
diff --git a/libs/core/async_combinators/tests/regressions/when_all_vectors_1623.cpp b/libs/core/async_combinators/tests/regressions/when_all_vectors_1623.cpp
index bca975785d83..67aa7b24ae29 100644
--- a/libs/core/async_combinators/tests/regressions/when_all_vectors_1623.cpp
+++ b/libs/core/async_combinators/tests/regressions/when_all_vectors_1623.cpp
@@ -7,8 +7,8 @@
 // This test case demonstrates the issue described in #1623: hpx::wait_all()
 // invoked with two vector<future<T>> fails
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <vector>
diff --git a/libs/core/async_combinators/tests/unit/split_shared_future.cpp b/libs/core/async_combinators/tests/unit/split_shared_future.cpp
index 94a4ecc99641..e7409c0e9b86 100644
--- a/libs/core/async_combinators/tests/unit/split_shared_future.cpp
+++ b/libs/core/async_combinators/tests/unit/split_shared_future.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <array>
 #include <chrono>
diff --git a/libs/core/async_combinators/tests/unit/wait_all.cpp b/libs/core/async_combinators/tests/unit/wait_all.cpp
index 26c67eb39dc1..8726fb0fd0a2 100644
--- a/libs/core/async_combinators/tests/unit/wait_all.cpp
+++ b/libs/core/async_combinators/tests/unit/wait_all.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <stdexcept>
diff --git a/libs/core/async_combinators/tests/unit/wait_all_std_array.cpp b/libs/core/async_combinators/tests/unit/wait_all_std_array.cpp
index 636bb1cce67e..807b09dcffec 100644
--- a/libs/core/async_combinators/tests/unit/wait_all_std_array.cpp
+++ b/libs/core/async_combinators/tests/unit/wait_all_std_array.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <array>
 #include <chrono>
diff --git a/libs/core/async_combinators/tests/unit/wait_any.cpp b/libs/core/async_combinators/tests/unit/wait_any.cpp
index c044857d0113..59b1bf821d78 100644
--- a/libs/core/async_combinators/tests/unit/wait_any.cpp
+++ b/libs/core/async_combinators/tests/unit/wait_any.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <stdexcept>
diff --git a/libs/core/async_combinators/tests/unit/wait_any_std_array.cpp b/libs/core/async_combinators/tests/unit/wait_any_std_array.cpp
index 4e6a44fa27a5..064374ded7a6 100644
--- a/libs/core/async_combinators/tests/unit/wait_any_std_array.cpp
+++ b/libs/core/async_combinators/tests/unit/wait_any_std_array.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <array>
 #include <chrono>
diff --git a/libs/core/async_combinators/tests/unit/wait_each.cpp b/libs/core/async_combinators/tests/unit/wait_each.cpp
index 24a1687363cb..2dc050edb2e6 100644
--- a/libs/core/async_combinators/tests/unit/wait_each.cpp
+++ b/libs/core/async_combinators/tests/unit/wait_each.cpp
@@ -6,10 +6,10 @@
 //  accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <cstddef>
diff --git a/libs/core/async_combinators/tests/unit/wait_some.cpp b/libs/core/async_combinators/tests/unit/wait_some.cpp
index f4ae165db33d..f03852cc51e4 100644
--- a/libs/core/async_combinators/tests/unit/wait_some.cpp
+++ b/libs/core/async_combinators/tests/unit/wait_some.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <stdexcept>
diff --git a/libs/core/async_combinators/tests/unit/wait_some_std_array.cpp b/libs/core/async_combinators/tests/unit/wait_some_std_array.cpp
index 07ed066bb97a..9f8b73bdcbff 100644
--- a/libs/core/async_combinators/tests/unit/wait_some_std_array.cpp
+++ b/libs/core/async_combinators/tests/unit/wait_some_std_array.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <array>
 #include <chrono>
diff --git a/libs/core/async_combinators/tests/unit/when_all.cpp b/libs/core/async_combinators/tests/unit/when_all.cpp
index 6e916b636ec0..88f20ff5724f 100644
--- a/libs/core/async_combinators/tests/unit/when_all.cpp
+++ b/libs/core/async_combinators/tests/unit/when_all.cpp
@@ -6,10 +6,10 @@
 //  accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <deque>
diff --git a/libs/core/async_combinators/tests/unit/when_all_std_array.cpp b/libs/core/async_combinators/tests/unit/when_all_std_array.cpp
index 405c4e045c3f..82655b77eb68 100644
--- a/libs/core/async_combinators/tests/unit/when_all_std_array.cpp
+++ b/libs/core/async_combinators/tests/unit/when_all_std_array.cpp
@@ -6,12 +6,10 @@
 //  accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/config.hpp>
-
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <array>
 #include <string>
diff --git a/libs/core/async_combinators/tests/unit/when_any.cpp b/libs/core/async_combinators/tests/unit/when_any.cpp
index 24397cd3bdce..5f7851bd885f 100644
--- a/libs/core/async_combinators/tests/unit/when_any.cpp
+++ b/libs/core/async_combinators/tests/unit/when_any.cpp
@@ -6,10 +6,10 @@
 //  accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <deque>
diff --git a/libs/core/async_combinators/tests/unit/when_any_std_array.cpp b/libs/core/async_combinators/tests/unit/when_any_std_array.cpp
index ce4bc4c6efc4..2edff5be3636 100644
--- a/libs/core/async_combinators/tests/unit/when_any_std_array.cpp
+++ b/libs/core/async_combinators/tests/unit/when_any_std_array.cpp
@@ -6,12 +6,10 @@
 //  accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/config.hpp>
-
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <array>
 #include <string>
diff --git a/libs/core/async_combinators/tests/unit/when_each.cpp b/libs/core/async_combinators/tests/unit/when_each.cpp
index 93c22d5e5e92..da79d31c4a6e 100644
--- a/libs/core/async_combinators/tests/unit/when_each.cpp
+++ b/libs/core/async_combinators/tests/unit/when_each.cpp
@@ -5,10 +5,10 @@
 //  accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <cstddef>
diff --git a/libs/core/async_combinators/tests/unit/when_some.cpp b/libs/core/async_combinators/tests/unit/when_some.cpp
index ca5aa1dc338d..c4eb62e35dcc 100644
--- a/libs/core/async_combinators/tests/unit/when_some.cpp
+++ b/libs/core/async_combinators/tests/unit/when_some.cpp
@@ -6,10 +6,10 @@
 //  accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <list>
diff --git a/libs/core/async_combinators/tests/unit/when_some_std_array.cpp b/libs/core/async_combinators/tests/unit/when_some_std_array.cpp
index c60cfa51153a..d584ae25523b 100644
--- a/libs/core/async_combinators/tests/unit/when_some_std_array.cpp
+++ b/libs/core/async_combinators/tests/unit/when_some_std_array.cpp
@@ -6,12 +6,10 @@
 //  accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/config.hpp>
-
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <array>
 #include <string>
diff --git a/libs/core/async_cuda/tests/performance/cuda_executor_throughput.cpp b/libs/core/async_cuda/tests/performance/cuda_executor_throughput.cpp
index e93304cff21e..f20a83e2bfe6 100644
--- a/libs/core/async_cuda/tests/performance/cuda_executor_throughput.cpp
+++ b/libs/core/async_cuda/tests/performance/cuda_executor_throughput.cpp
@@ -25,15 +25,12 @@
 // Currently, nvcc does not handle lambda functions properly and it is simpler to use
 // cudaMalloc/cudaMemcpy etc, so we do not #define HPX_CUBLAS_DEMO_WITH_ALLOCATOR
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/async_cuda.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/timing.hpp>
-#include <hpx/parallel/algorithms/copy.hpp>
-#include <hpx/parallel/algorithms/for_each.hpp>
-#include <hpx/parallel/algorithms/for_loop.hpp>
 
 #include <algorithm>
 #include <cmath>
diff --git a/libs/core/async_cuda/tests/performance/synchronize.cu b/libs/core/async_cuda/tests/performance/synchronize.cu
index bfbbc26e84b5..359a59568f42 100644
--- a/libs/core/async_cuda/tests/performance/synchronize.cu
+++ b/libs/core/async_cuda/tests/performance/synchronize.cu
@@ -9,9 +9,9 @@
 // NVCC fails unceremoniously with this test at least until V11.5
 #if !defined(HPX_CUDA_VERSION) || (HPX_CUDA_VERSION > 1105)
 
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/async_cuda.hpp>
 
 #include <cstddef>
diff --git a/libs/core/async_cuda/tests/unit/cublas_matmul.cpp b/libs/core/async_cuda/tests/unit/cublas_matmul.cpp
index 4338a971bbda..f989b46728d1 100644
--- a/libs/core/async_cuda/tests/unit/cublas_matmul.cpp
+++ b/libs/core/async_cuda/tests/unit/cublas_matmul.cpp
@@ -25,14 +25,12 @@
 // Currently, nvcc does not handle lambda functions properly and it is simpler to use
 // cudaMalloc/cudaMemcpy etc, so we do not #define HPX_CUBLAS_DEMO_WITH_ALLOCATOR
 
+#include <hpx/algorithm.hpp>
 #include <hpx/assert.hpp>
-#include <hpx/async_cuda/custom_blas_api.hpp>
-#include <hpx/async_cuda/custom_gpu_api.hpp>
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/async_cuda.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/async_cuda/tests/unit/cuda_future.cpp b/libs/core/async_cuda/tests/unit/cuda_future.cpp
index bb3c4d77ada6..2f3077718c27 100644
--- a/libs/core/async_cuda/tests/unit/cuda_future.cpp
+++ b/libs/core/async_cuda/tests/unit/cuda_future.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/async_cuda.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/async_cuda/tests/unit/saxpy.cu b/libs/core/async_cuda/tests/unit/saxpy.cu
index 9972bfbdb0dd..347c494a18c9 100644
--- a/libs/core/async_cuda/tests/unit/saxpy.cu
+++ b/libs/core/async_cuda/tests/unit/saxpy.cu
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
+#include <hpx/future.hpp>
 
 #include <hpx/async_cuda/cuda_executor.hpp>
 #include <hpx/async_cuda/custom_gpu_api.hpp>
diff --git a/libs/core/async_cuda/tests/unit/transform_stream.cu b/libs/core/async_cuda/tests/unit/transform_stream.cu
index 65dcf730cba8..b27f197822c6 100644
--- a/libs/core/async_cuda/tests/unit/transform_stream.cu
+++ b/libs/core/async_cuda/tests/unit/transform_stream.cu
@@ -9,10 +9,9 @@
 // NVCC fails unceremoniously with this test at least until V11.5
 #if !defined(HPX_CUDA_VERSION) || (HPX_CUDA_VERSION > 1105)
 
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/async_cuda.hpp>
-#include <hpx/modules/execution.hpp>
-#include <hpx/modules/executors.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <atomic>
diff --git a/libs/core/async_local/tests/unit/apply_local.cpp b/libs/core/async_local/tests/unit/apply_local.cpp
index 5ae6bbdbb98e..a4f5d0a92b8f 100644
--- a/libs/core/async_local/tests/unit/apply_local.cpp
+++ b/libs/core/async_local/tests/unit/apply_local.cpp
@@ -5,11 +5,11 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <hpx/config.hpp>
-#include <hpx/local/condition_variable.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/mutex.hpp>
+#include <hpx/condition_variable.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/mutex.hpp>
 
 #include <atomic>
 #include <chrono>
diff --git a/libs/core/async_local/tests/unit/apply_local_executor.cpp b/libs/core/async_local/tests/unit/apply_local_executor.cpp
index 103ec16782c6..41b514933a75 100644
--- a/libs/core/async_local/tests/unit/apply_local_executor.cpp
+++ b/libs/core/async_local/tests/unit/apply_local_executor.cpp
@@ -5,12 +5,12 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <hpx/config.hpp>
-#include <hpx/local/condition_variable.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/mutex.hpp>
+#include <hpx/condition_variable.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/mutex.hpp>
 
 #include <atomic>
 #include <chrono>
diff --git a/libs/core/async_local/tests/unit/async_local.cpp b/libs/core/async_local/tests/unit/async_local.cpp
index 55aa7a56ac22..943c651be600 100644
--- a/libs/core/async_local/tests/unit/async_local.cpp
+++ b/libs/core/async_local/tests/unit/async_local.cpp
@@ -4,9 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/config.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <atomic>
diff --git a/libs/core/async_local/tests/unit/async_local_executor.cpp b/libs/core/async_local/tests/unit/async_local_executor.cpp
index b3c0c25ea522..a31a0a5e8a75 100644
--- a/libs/core/async_local/tests/unit/async_local_executor.cpp
+++ b/libs/core/async_local/tests/unit/async_local_executor.cpp
@@ -5,9 +5,9 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <hpx/config.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstdint>
diff --git a/libs/core/async_local/tests/unit/async_local_executor_additional_arguments.cpp b/libs/core/async_local/tests/unit/async_local_executor_additional_arguments.cpp
index 7ca813a52644..91c3283c5a48 100644
--- a/libs/core/async_local/tests/unit/async_local_executor_additional_arguments.cpp
+++ b/libs/core/async_local/tests/unit/async_local_executor_additional_arguments.cpp
@@ -5,10 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/config.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstdint>
@@ -43,12 +42,12 @@ struct additional_argument_executor
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_two_way_executor<additional_argument_executor> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 ///////////////////////////////////////////////////////////////////////////////
 std::int32_t increment(additional_argument, std::int32_t i)
diff --git a/libs/core/async_mpi/tests/unit/algorithm_transform_mpi.cpp b/libs/core/async_mpi/tests/unit/algorithm_transform_mpi.cpp
index a1c3a4851582..f8e5de1ba41b 100644
--- a/libs/core/async_mpi/tests/unit/algorithm_transform_mpi.cpp
+++ b/libs/core/async_mpi/tests/unit/algorithm_transform_mpi.cpp
@@ -4,14 +4,12 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/datastructures/tuple.hpp>
-#include <hpx/datastructures/variant.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/async_mpi.hpp>
 #include <hpx/modules/errors.hpp>
-#include <hpx/modules/execution.hpp>
-#include <hpx/modules/executors.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/tuple.hpp>
 
 #include "algorithm_test_utils.hpp"
 
diff --git a/libs/core/async_mpi/tests/unit/mpi_ring_async_executor.cpp b/libs/core/async_mpi/tests/unit/mpi_ring_async_executor.cpp
index ef92a5afc1b0..d059e184a76c 100644
--- a/libs/core/async_mpi/tests/unit/mpi_ring_async_executor.cpp
+++ b/libs/core/async_mpi/tests/unit/mpi_ring_async_executor.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/async_mpi.hpp>
 #include <hpx/modules/testing.hpp>
 #include <hpx/program_options.hpp>
diff --git a/libs/core/async_sycl/tests/unit/sycl_stream.cpp b/libs/core/async_sycl/tests/unit/sycl_stream.cpp
index 07bf8762c7bb..65a3b69893e1 100644
--- a/libs/core/async_sycl/tests/unit/sycl_stream.cpp
+++ b/libs/core/async_sycl/tests/unit/sycl_stream.cpp
@@ -1,4 +1,4 @@
-//  Copyright (c) 2022 Gregor Daiß
+//  Copyright (c) 2022 Gregor Daiß
 //
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -6,6 +6,14 @@
 //
 // hpxinspect:noascii
 
+#include <hpx/config.hpp>
+#include <hpx/future.hpp>
+#include <hpx/hpx_init.hpp>
+
+#if defined(HPX_HAVE_SYCL)
+#include <hpx/async_sycl/sycl_executor.hpp>
+#include <hpx/async_sycl/sycl_future.hpp>
+
 #include <algorithm>
 #include <cstddef>
 #include <exception>
@@ -13,13 +21,6 @@
 #include <string>
 #include <vector>
 
-#include <hpx/futures/future.hpp>
-#include <hpx/hpx_init.hpp>
-#include <hpx/local/future.hpp>
-#if defined(HPX_HAVE_SYCL)
-#include <hpx/async_sycl/sycl_executor.hpp>
-#include <hpx/async_sycl/sycl_future.hpp>
-
 #include "common/sycl_vector_add_test_utils.hpp"
 
 #include <CL/sycl.hpp>
@@ -27,7 +28,7 @@
 constexpr size_t vectorsize = 200000000;
 constexpr size_t num_bytes = vectorsize * sizeof(float);
 
-int hpx_main(int, char**)
+int hpx_main(int, char*[])
 {
     // Enable polling for the future
     hpx::sycl::experimental::detail::register_polling(
@@ -144,6 +145,8 @@ int main(int argc, char* argv[])
     return hpx::init(argc, argv);
 }
 #else
+#include <iostream>
+
 // Handle none-sycl builds
 int main()
 {
diff --git a/libs/core/async_sycl/tests/unit/sycl_vector_add_concurrent_executors.cpp b/libs/core/async_sycl/tests/unit/sycl_vector_add_concurrent_executors.cpp
index 7a47ec3accb3..0296d46cfa82 100644
--- a/libs/core/async_sycl/tests/unit/sycl_vector_add_concurrent_executors.cpp
+++ b/libs/core/async_sycl/tests/unit/sycl_vector_add_concurrent_executors.cpp
@@ -1,4 +1,4 @@
-//  Copyright (c) 2022 Gregor Daiß
+//  Copyright (c) 2022 Gregor Daiß
 //
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -6,18 +6,20 @@
 //
 // hpxinspect:noascii
 
+#include <hpx/config.hpp>
+#include <hpx/future.hpp>
+#include <hpx/hpx_init.hpp>
+
+#if defined(HPX_HAVE_SYCL)
+#include <hpx/async_sycl/sycl_executor.hpp>
+#include <hpx/async_sycl/sycl_future.hpp>
+
 #include <atomic>
 #include <exception>
 #include <iostream>
 #include <string>
 #include <vector>
 
-#include <hpx/futures/future.hpp>
-#include <hpx/hpx_init.hpp>
-#include <hpx/local/future.hpp>
-#if defined(HPX_HAVE_SYCL)
-#include <hpx/async_sycl/sycl_executor.hpp>
-#include <hpx/async_sycl/sycl_future.hpp>
 #include <CL/sycl.hpp>
 
 #include "common/sycl_vector_add_test_utils.hpp"
@@ -111,7 +113,7 @@ void VectorAdd(std::vector<size_t> const& a_vector,
     }
 }
 
-int hpx_main(int, char**)
+int hpx_main(int, char*[])
 {
     // Enable polling for the future
     hpx::sycl::experimental::detail::register_polling(
@@ -142,6 +144,8 @@ int main(int argc, char* argv[])
     return hpx::init(argc, argv);
 }
 #else
+#include <iostream>
+
 // Handle none-sycl builds
 int main()
 {
diff --git a/libs/core/async_sycl/tests/unit/sycl_vector_add_executor.cpp b/libs/core/async_sycl/tests/unit/sycl_vector_add_executor.cpp
index 41f86d5d2458..686d843a86a5 100644
--- a/libs/core/async_sycl/tests/unit/sycl_vector_add_executor.cpp
+++ b/libs/core/async_sycl/tests/unit/sycl_vector_add_executor.cpp
@@ -1,4 +1,4 @@
-//  Copyright (c) 2022 Gregor Daiß
+//  Copyright (c) 2022 Gregor Daiß
 //
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -6,19 +6,20 @@
 //
 // hpxinspect:noascii
 
+#include <hpx/config.hpp>
+#include <hpx/future.hpp>
+#include <hpx/hpx_init.hpp>
+
+#if defined(HPX_HAVE_SYCL)
+#include <hpx/async_sycl/sycl_executor.hpp>
+#include <hpx/async_sycl/sycl_future.hpp>
+
 #include <algorithm>
 #include <exception>
 #include <iostream>
 #include <string>
 #include <vector>
 
-#include <hpx/futures/future.hpp>
-#include <hpx/hpx_init.hpp>
-#include <hpx/local/future.hpp>
-#if defined(HPX_HAVE_SYCL)
-#include <hpx/async_sycl/sycl_executor.hpp>
-#include <hpx/async_sycl/sycl_future.hpp>
-
 #include "common/sycl_vector_add_test_utils.hpp"
 
 #include <CL/sycl.hpp>
@@ -249,7 +250,7 @@ void VectorAdd_test4(std::vector<size_t> const& a_vector,
     my_manual_fut.get();
 }
 
-int hpx_main(int, char**)
+int hpx_main(int, char*[])
 {
     static_assert(vector_size >= 6, "vector_size unreasonably small");
     // Enable polling for the future
@@ -303,6 +304,8 @@ int main(int argc, char* argv[])
     return hpx::init(argc, argv);
 }
 #else
+#include <iostream>
+
 // Handle none-sycl builds
 int main()
 {
diff --git a/libs/core/async_sycl/tests/unit/sycl_vector_add_get_future.cpp b/libs/core/async_sycl/tests/unit/sycl_vector_add_get_future.cpp
index ff6a5ca7a06b..326a0e3e14cb 100644
--- a/libs/core/async_sycl/tests/unit/sycl_vector_add_get_future.cpp
+++ b/libs/core/async_sycl/tests/unit/sycl_vector_add_get_future.cpp
@@ -1,4 +1,4 @@
-//  Copyright (c) 2022 Gregor Daiß
+//  Copyright (c) 2022 Gregor Daiß
 //
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -6,18 +6,19 @@
 //
 // hpxinspect:noascii
 
+#include <hpx/config.hpp>
+#include <hpx/future.hpp>
+#include <hpx/hpx_init.hpp>
+
+#if defined(HPX_HAVE_SYCL)
+#include <hpx/async_sycl/sycl_future.hpp>
+
 #include <algorithm>
 #include <exception>
 #include <iostream>
 #include <string>
 #include <vector>
 
-#include <hpx/futures/future.hpp>
-#include <hpx/hpx_init.hpp>
-#include <hpx/local/future.hpp>
-#if defined(HPX_HAVE_SYCL)
-#include <hpx/async_sycl/sycl_future.hpp>
-
 #include "common/sycl_vector_add_test_utils.hpp"
 
 #include <CL/sycl.hpp>
@@ -153,7 +154,7 @@ void VectorAdd(cl::sycl::queue& q, std::vector<size_t> const& a_vector,
     }
 }
 
-int hpx_main(int, char**)
+int hpx_main(int, char*[])
 {
     // Enable polling for the future
     hpx::sycl::experimental::detail::register_polling(
@@ -210,6 +211,8 @@ int main(int argc, char* argv[])
     return hpx::init(argc, argv);
 }
 #else
+#include <iostream>
+
 // Handle none-sycl builds
 int main()
 {
diff --git a/libs/core/command_line_handling_local/src/command_line_handling_local.cpp b/libs/core/command_line_handling_local/src/command_line_handling_local.cpp
index 6dab0322fed0..9a7c15f81bf4 100644
--- a/libs/core/command_line_handling_local/src/command_line_handling_local.cpp
+++ b/libs/core/command_line_handling_local/src/command_line_handling_local.cpp
@@ -562,7 +562,6 @@ namespace hpx::local::detail {
         pu_offset_ =
             detail::handle_pu_offset(cfgmap, vm, static_cast<std::size_t>(-1));
 
-        // NOLINTNEXTLINE(bugprone-branch-clone)
         if (pu_offset_ != static_cast<std::size_t>(-1))
         {
 #if defined(__APPLE__)
diff --git a/libs/core/command_line_handling_local/tests/regressions/ignore_aliases_local.cpp b/libs/core/command_line_handling_local/tests/regressions/ignore_aliases_local.cpp
index 155ed476e247..73593df5d58d 100644
--- a/libs/core/command_line_handling_local/tests/regressions/ignore_aliases_local.cpp
+++ b/libs/core/command_line_handling_local/tests/regressions/ignore_aliases_local.cpp
@@ -5,7 +5,7 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <hpx/config.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <string>
diff --git a/libs/core/compute_local/CMakeLists.txt b/libs/core/compute_local/CMakeLists.txt
index 5fff3e86b037..b4c112efb880 100644
--- a/libs/core/compute_local/CMakeLists.txt
+++ b/libs/core/compute_local/CMakeLists.txt
@@ -28,10 +28,10 @@ set(compute_local_headers
 
 # cmake-format: off
 set(compute_local_compat_headers
-    hpx/compute/vector.hpp => hpx/modules/compute_local.hpp
-    hpx/compute/traits/allocator_traits.hpp => hpx/modules/compute_local.hpp
-    hpx/compute/host/numa_allocator.hpp => hpx/local/compute.hpp
-    hpx/compute/host/numa_binding_allocator.hpp => hpx/local/compute.hpp
+    hpx/compute/vector.hpp => hpx/compute.hpp
+    hpx/compute/traits/allocator_traits.hpp => hpx/compute.hpp
+    hpx/compute/host/numa_allocator.hpp => hpx/compute.hpp
+    hpx/compute/host/numa_binding_allocator.hpp => hpx/compute.hpp
 )
 # cmake-format: on
 
diff --git a/libs/core/compute_local/tests/regressions/for_each_value_proxy.cpp b/libs/core/compute_local/tests/regressions/for_each_value_proxy.cpp
index 100640b96553..51dc5f61b867 100644
--- a/libs/core/compute_local/tests/regressions/for_each_value_proxy.cpp
+++ b/libs/core/compute_local/tests/regressions/for_each_value_proxy.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
 #include <hpx/algorithms/traits/is_value_proxy.hpp>
 #include <hpx/init.hpp>
-#include <hpx/local/algorithm.hpp>
 #include <hpx/modules/compute.hpp>
 #include <hpx/modules/testing.hpp>
 
@@ -55,7 +55,7 @@ class test_value_proxy
     T* p_;
 };
 
-namespace hpx { namespace traits {
+namespace hpx::traits {
     template <typename T>
     struct is_value_proxy<test_value_proxy<T>> : std::true_type
     {
@@ -66,7 +66,7 @@ namespace hpx { namespace traits {
     {
         using type = T;
     };
-}}    // namespace hpx::traits
+}    // namespace hpx::traits
 
 template <typename T>
 struct test_allocator
diff --git a/libs/core/compute_local/tests/regressions/parallel_fill_4132.cpp b/libs/core/compute_local/tests/regressions/parallel_fill_4132.cpp
index 0171c21aae0e..215d1332201d 100644
--- a/libs/core/compute_local/tests/regressions/parallel_fill_4132.cpp
+++ b/libs/core/compute_local/tests/regressions/parallel_fill_4132.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
 #include <hpx/init.hpp>
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
 #include <hpx/modules/compute_local.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/compute_local/tests/unit/block_fork_join_executor.cpp b/libs/core/compute_local/tests/unit/block_fork_join_executor.cpp
index 810464277826..3d97c68369dc 100644
--- a/libs/core/compute_local/tests/unit/block_fork_join_executor.cpp
+++ b/libs/core/compute_local/tests/unit/block_fork_join_executor.cpp
@@ -5,13 +5,13 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
-#include <hpx/modules/compute_local.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/compute.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <algorithm>
 #include <atomic>
diff --git a/libs/core/compute_local/tests/unit/numa_allocator.cpp b/libs/core/compute_local/tests/unit/numa_allocator.cpp
index 5afb52e41c2e..5435f8d51f42 100644
--- a/libs/core/compute_local/tests/unit/numa_allocator.cpp
+++ b/libs/core/compute_local/tests/unit/numa_allocator.cpp
@@ -12,13 +12,13 @@
 #define NUMA_BINDING_ALLOCATOR_DEBUG true
 #define NUMA_BINDING_ALLOCATOR_INIT_MEMORY true
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/runtime.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
+#include <hpx/modules/resource_partitioner.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/resource_partitioner/partitioner.hpp>
-#include <hpx/thread_pools/scheduled_thread_pool_impl.hpp>
-#include <hpx/topology/cpu_mask.hpp>
+#include <hpx/modules/thread_pools.hpp>
+#include <hpx/modules/topology.hpp>
+#include <hpx/runtime.hpp>
 
 #include <cmath>
 #include <cstddef>
diff --git a/libs/core/concurrency/tests/unit/contiguous_index_queue.cpp b/libs/core/concurrency/tests/unit/contiguous_index_queue.cpp
index 1440ceb1921f..3bda97b432e5 100644
--- a/libs/core/concurrency/tests/unit/contiguous_index_queue.cpp
+++ b/libs/core/concurrency/tests/unit/contiguous_index_queue.cpp
@@ -7,12 +7,12 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
+#include <hpx/barrier.hpp>
 #include <hpx/concurrency/detail/contiguous_index_queue.hpp>
-#include <hpx/local/barrier.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/optional.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/optional.hpp>
 #include <hpx/program_options.hpp>
 
 #include <algorithm>
diff --git a/libs/core/concurrency/tests/unit/freelist.cpp b/libs/core/concurrency/tests/unit/freelist.cpp
index c9fb1fde8724..fd3fae75b986 100644
--- a/libs/core/concurrency/tests/unit/freelist.cpp
+++ b/libs/core/concurrency/tests/unit/freelist.cpp
@@ -5,12 +5,13 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
-#include <hpx/modules/algorithms.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/experimental/task_group.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/concurrency.hpp>
 #include <hpx/modules/testing.hpp>
 #include <hpx/program_options.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/concurrency/tests/unit/non_contiguous_index_queue.cpp b/libs/core/concurrency/tests/unit/non_contiguous_index_queue.cpp
index 434de073ed6a..0f3280bca64e 100644
--- a/libs/core/concurrency/tests/unit/non_contiguous_index_queue.cpp
+++ b/libs/core/concurrency/tests/unit/non_contiguous_index_queue.cpp
@@ -5,12 +5,12 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/barrier.hpp>
 #include <hpx/concurrency/detail/non_contiguous_index_queue.hpp>
-#include <hpx/local/barrier.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/optional.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/optional.hpp>
 #include <hpx/program_options.hpp>
 
 #include <algorithm>
diff --git a/libs/core/concurrency/tests/unit/queue_stress.cpp b/libs/core/concurrency/tests/unit/queue_stress.cpp
index 8b45e65bac53..fd9aaa1a1d97 100644
--- a/libs/core/concurrency/tests/unit/queue_stress.cpp
+++ b/libs/core/concurrency/tests/unit/queue_stress.cpp
@@ -5,7 +5,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/concurrency.hpp>
 #include <hpx/modules/testing.hpp>
 #include <hpx/program_options.hpp>
diff --git a/libs/core/concurrency/tests/unit/stack_stress.cpp b/libs/core/concurrency/tests/unit/stack_stress.cpp
index 5e2eeef83b14..adcd2d95ec6a 100644
--- a/libs/core/concurrency/tests/unit/stack_stress.cpp
+++ b/libs/core/concurrency/tests/unit/stack_stress.cpp
@@ -5,7 +5,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/concurrency.hpp>
 #include <hpx/modules/testing.hpp>
 #include <hpx/program_options.hpp>
diff --git a/libs/core/coroutines/tests/regressions/coroutine_function_destructor_yield_4800.cpp b/libs/core/coroutines/tests/regressions/coroutine_function_destructor_yield_4800.cpp
index b892bee4666b..4bf9d34e8897 100644
--- a/libs/core/coroutines/tests/regressions/coroutine_function_destructor_yield_4800.cpp
+++ b/libs/core/coroutines/tests/regressions/coroutine_function_destructor_yield_4800.cpp
@@ -6,11 +6,10 @@
 
 // This test verifies that the destructor of a thread function may yield.
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/threading.hpp>
+#include <hpx/thread.hpp>
 
 #include <utility>
 
diff --git a/libs/core/datastructures/include/hpx/datastructures/tuple.hpp b/libs/core/datastructures/include/hpx/datastructures/tuple.hpp
index f9dd126b1621..5b8ef33d0c23 100644
--- a/libs/core/datastructures/include/hpx/datastructures/tuple.hpp
+++ b/libs/core/datastructures/include/hpx/datastructures/tuple.hpp
@@ -401,6 +401,7 @@ namespace hpx {
                 std::enable_if_t<!std::is_same_v<tuple, std::decay_t<UTuple>>>,
             typename EnableCompatible = std::enable_if_t<
                 hpx::detail::are_tuples_compatible<tuple, UTuple>::value>>
+        // NOLINTNEXTLINE(bugprone-forwarding-reference-overload)
         constexpr HPX_HOST_DEVICE tuple(UTuple&& other)
           : tuple(index_pack{}, HPX_FORWARD(UTuple, other))
         {
diff --git a/libs/core/datastructures/tests/performance/small_vector_benchmark.cpp b/libs/core/datastructures/tests/performance/small_vector_benchmark.cpp
index 3bc02538d002..964a3aa75c0a 100644
--- a/libs/core/datastructures/tests/performance/small_vector_benchmark.cpp
+++ b/libs/core/datastructures/tests/performance/small_vector_benchmark.cpp
@@ -5,10 +5,10 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <hpx/config.hpp>
+#include <hpx/chrono.hpp>
 #include <hpx/datastructures/detail/small_vector.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/functional.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/init.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/core/datastructures/tests/regressions/non_default_constructible_tuple_5886.cpp b/libs/core/datastructures/tests/regressions/non_default_constructible_tuple_5886.cpp
index c2797603d984..bdb41fac4044 100644
--- a/libs/core/datastructures/tests/regressions/non_default_constructible_tuple_5886.cpp
+++ b/libs/core/datastructures/tests/regressions/non_default_constructible_tuple_5886.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 #include <hpx/datastructures/serialization/tuple.hpp>
 #include <hpx/modules/datastructures.hpp>
diff --git a/libs/core/datastructures/tests/unit/any_serialization.cpp b/libs/core/datastructures/tests/unit/any_serialization.cpp
index adc96ce0ae31..b3b3b28070d7 100644
--- a/libs/core/datastructures/tests/unit/any_serialization.cpp
+++ b/libs/core/datastructures/tests/unit/any_serialization.cpp
@@ -6,7 +6,10 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#include <hpx/config.hpp>
+#include <hpx/datastructures/serialization/serializable_any.hpp>
+#include <hpx/init.hpp>
+#include <hpx/modules/testing.hpp>
+#include <hpx/serialization/serialize.hpp>
 
 #include <cstddef>
 #include <cstdio>    // remove
@@ -14,11 +17,6 @@
 #include <typeinfo>
 #include <vector>
 
-#include <hpx/datastructures/serialization/serializable_any.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/modules/testing.hpp>
-#include <hpx/serialization/serialize.hpp>
-
 #include "small_big_object.hpp"
 
 using hpx::program_options::options_description;
diff --git a/libs/core/datastructures/tests/unit/serialization_raw_pointer_tuple.cpp b/libs/core/datastructures/tests/unit/serialization_raw_pointer_tuple.cpp
index 38ca2bea54c2..07bb2df4c66e 100644
--- a/libs/core/datastructures/tests/unit/serialization_raw_pointer_tuple.cpp
+++ b/libs/core/datastructures/tests/unit/serialization_raw_pointer_tuple.cpp
@@ -11,12 +11,11 @@
 #define HPX_SERIALIZATION_HAVE_ALLOW_CONST_TUPLE_MEMBERS
 
 #include <hpx/config.hpp>
-#include <hpx/datastructures/serialization/tuple.hpp>
-#include <hpx/datastructures/tuple.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/serialization/input_archive.hpp>
 #include <hpx/serialization/output_archive.hpp>
 #include <hpx/serialization/serialize.hpp>
+#include <hpx/tuple.hpp>
 
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/execution/include/hpx/execution/algorithms/sync_wait.hpp b/libs/core/execution/include/hpx/execution/algorithms/sync_wait.hpp
index eb061e809a93..8c44918b155e 100644
--- a/libs/core/execution/include/hpx/execution/algorithms/sync_wait.hpp
+++ b/libs/core/execution/include/hpx/execution/algorithms/sync_wait.hpp
@@ -192,6 +192,7 @@ namespace hpx::execution::experimental::detail {
                     // this means that none of set_value/set_error/set_stopped was
                     // called.
                     HPX_ASSERT(hpx::holds_alternative<stopped_type>(value));
+
                     if constexpr (Type == sync_wait_type::single)
                     {
                         using single_result_type = make_decayed_pack_t<
@@ -214,6 +215,7 @@ namespace hpx::execution::experimental::detail {
                 set_error_t, type&& r, Error&& error) noexcept
             {
                 using error_t = std::decay_t<Error>;
+
                 if constexpr (std::is_same_v<error_t, std::exception_ptr>)
                 {
                     r.state.value.template emplace<error_type>(
diff --git a/libs/core/execution/tests/regressions/annotated_minmax_2593.cpp b/libs/core/execution/tests/regressions/annotated_minmax_2593.cpp
index 86bd8df443b7..b9e1c4449cc9 100644
--- a/libs/core/execution/tests/regressions/annotated_minmax_2593.cpp
+++ b/libs/core/execution/tests/regressions/annotated_minmax_2593.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <vector>
diff --git a/libs/core/execution/tests/regressions/chunk_size_4118.cpp b/libs/core/execution/tests/regressions/chunk_size_4118.cpp
index d2c26e591ad5..f3f8bbad1d6b 100644
--- a/libs/core/execution/tests/regressions/chunk_size_4118.cpp
+++ b/libs/core/execution/tests/regressions/chunk_size_4118.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/numeric.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/numeric.hpp>
 
 #include <cstddef>
 #include <random>
@@ -33,12 +33,12 @@ struct test_async_executor : hpx::execution::parallel_executor
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_two_way_executor<test_async_executor> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 int hpx_main()
 {
diff --git a/libs/core/execution/tests/regressions/fibonacci_sr.cpp b/libs/core/execution/tests/regressions/fibonacci_sr.cpp
index dd91d654d386..b58408fd4292 100644
--- a/libs/core/execution/tests/regressions/fibonacci_sr.cpp
+++ b/libs/core/execution/tests/regressions/fibonacci_sr.cpp
@@ -9,8 +9,8 @@
 // Clang V11 ICE's on this test
 #if !defined(HPX_CLANG_VERSION) || (HPX_CLANG_VERSION / 10000) != 11
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 namespace ex = hpx::execution::experimental;
diff --git a/libs/core/execution/tests/regressions/is_executor_1691.cpp b/libs/core/execution/tests/regressions/is_executor_1691.cpp
index 5263580baeb2..3184f83b7721 100644
--- a/libs/core/execution/tests/regressions/is_executor_1691.cpp
+++ b/libs/core/execution/tests/regressions/is_executor_1691.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 
 #include <type_traits>
 #include <vector>
@@ -16,7 +16,7 @@ struct my_executor : hpx::execution::parallel_executor
 {
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_one_way_executor<my_executor> : std::true_type
     {
@@ -31,7 +31,7 @@ namespace hpx { namespace parallel { namespace execution {
     struct is_bulk_two_way_executor<my_executor> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 ///////////////////////////////////////////////////////////////////////////////
 int hpx_main()
diff --git a/libs/core/execution/tests/regressions/lambda_arguments_2403.cpp b/libs/core/execution/tests/regressions/lambda_arguments_2403.cpp
index 3f06a781c771..09e0a4d9b4c5 100644
--- a/libs/core/execution/tests/regressions/lambda_arguments_2403.cpp
+++ b/libs/core/execution/tests/regressions/lambda_arguments_2403.cpp
@@ -4,11 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/datapar.hpp>
 
 #include <cstddef>
 #include <vector>
diff --git a/libs/core/execution/tests/regressions/lambda_return_type_2402.cpp b/libs/core/execution/tests/regressions/lambda_return_type_2402.cpp
index b9019060107a..24dcb5e76196 100644
--- a/libs/core/execution/tests/regressions/lambda_return_type_2402.cpp
+++ b/libs/core/execution/tests/regressions/lambda_return_type_2402.cpp
@@ -4,11 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/datapar.hpp>
 
 #include <cstddef>
 #include <type_traits>
diff --git a/libs/core/execution/tests/regressions/rebind_par_simd.cpp b/libs/core/execution/tests/regressions/rebind_par_simd.cpp
index 269a891ce8d5..4fd2d65aecfd 100644
--- a/libs/core/execution/tests/regressions/rebind_par_simd.cpp
+++ b/libs/core/execution/tests/regressions/rebind_par_simd.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/libs/core/execution/tests/unit/algorithm_as_sender.cpp b/libs/core/execution/tests/unit/algorithm_as_sender.cpp
index 23761b9ace82..a84293884ed5 100644
--- a/libs/core/execution/tests/unit/algorithm_as_sender.cpp
+++ b/libs/core/execution/tests/unit/algorithm_as_sender.cpp
@@ -5,8 +5,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include "algorithm_test_utils.hpp"
diff --git a/libs/core/execution/tests/unit/algorithm_run_loop.cpp b/libs/core/execution/tests/unit/algorithm_run_loop.cpp
index c369a00e0581..b35851d69e33 100644
--- a/libs/core/execution/tests/unit/algorithm_run_loop.cpp
+++ b/libs/core/execution/tests/unit/algorithm_run_loop.cpp
@@ -10,14 +10,14 @@
 // Clang V11 ICE's on this test
 #if !defined(HPX_CLANG_VERSION) || (HPX_CLANG_VERSION / 10000) != 11
 
-#include <hpx/local/condition_variable.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/functional.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/mutex.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/condition_variable.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/preprocessor.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/mutex.hpp>
+#include <hpx/thread.hpp>
 
 #include "algorithm_test_utils.hpp"
 
diff --git a/libs/core/execution/tests/unit/algorithm_sync_wait.cpp b/libs/core/execution/tests/unit/algorithm_sync_wait.cpp
index e5e4f5a860a3..5157b4e73988 100644
--- a/libs/core/execution/tests/unit/algorithm_sync_wait.cpp
+++ b/libs/core/execution/tests/unit/algorithm_sync_wait.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include "algorithm_test_utils.hpp"
diff --git a/libs/core/execution/tests/unit/algorithm_sync_wait_with_variant.cpp b/libs/core/execution/tests/unit/algorithm_sync_wait_with_variant.cpp
index 232a64217549..99d7d02c2fb1 100644
--- a/libs/core/execution/tests/unit/algorithm_sync_wait_with_variant.cpp
+++ b/libs/core/execution/tests/unit/algorithm_sync_wait_with_variant.cpp
@@ -5,7 +5,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/execution.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/execution/tests/unit/algorithm_then.cpp b/libs/core/execution/tests/unit/algorithm_then.cpp
index 43288868dd78..17ddb1cb0d27 100644
--- a/libs/core/execution/tests/unit/algorithm_then.cpp
+++ b/libs/core/execution/tests/unit/algorithm_then.cpp
@@ -5,11 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/execution.hpp>
-#include <hpx/modules/futures.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/threading.hpp>
+#include <hpx/thread.hpp>
 
 #include "algorithm_test_utils.hpp"
 
diff --git a/libs/core/execution/tests/unit/bulk_async.cpp b/libs/core/execution/tests/unit/bulk_async.cpp
index 8484ac6a6c5a..ee5e54cd876d 100644
--- a/libs/core/execution/tests/unit/bulk_async.cpp
+++ b/libs/core/execution/tests/unit/bulk_async.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/functional/deferred_call.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/execution/tests/unit/executor_parameters.cpp b/libs/core/execution/tests/unit/executor_parameters.cpp
index 403f18bb11f3..2187d1fd2072 100644
--- a/libs/core/execution/tests/unit/executor_parameters.cpp
+++ b/libs/core/execution/tests/unit/executor_parameters.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
@@ -181,12 +181,12 @@ struct timer_hooks_parameters
     std::string name_;
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_executor_parameters<timer_hooks_parameters> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 void test_combined_hooks()
 {
diff --git a/libs/core/execution/tests/unit/executor_parameters_dispatching.cpp b/libs/core/execution/tests/unit/executor_parameters_dispatching.cpp
index 066e2c0dc2b2..0947189d345f 100644
--- a/libs/core/execution/tests/unit/executor_parameters_dispatching.cpp
+++ b/libs/core/execution/tests/unit/executor_parameters_dispatching.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/timing.hpp>
 
 #include <atomic>
 #include <cstddef>
@@ -42,12 +42,12 @@ struct test_executor_get_chunk_size : hpx::execution::parallel_executor
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_two_way_executor<test_executor_get_chunk_size> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 struct test_chunk_size
 {
@@ -61,14 +61,14 @@ struct test_chunk_size
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     /// \cond NOINTERNAL
     template <>
     struct is_executor_parameters<test_chunk_size> : std::true_type
     {
     };
     /// \endcond
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 ///////////////////////////////////////////////////////////////////////////////
 void test_get_chunk_size()
@@ -136,12 +136,12 @@ struct test_executor_measure_iteration : hpx::execution::parallel_executor
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_two_way_executor<test_executor_measure_iteration> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 struct test_measure_iteration
 {
@@ -153,14 +153,14 @@ struct test_measure_iteration
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     /// \cond NOINTERNAL
     template <>
     struct is_executor_parameters<test_measure_iteration> : std::true_type
     {
     };
     /// \endcond
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 ///////////////////////////////////////////////////////////////////////////////
 void test_get_measure_iteration()
@@ -210,13 +210,13 @@ struct test_executor_maximal_number_of_chunks
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_two_way_executor<test_executor_maximal_number_of_chunks>
       : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 struct test_number_of_chunks
 {
@@ -229,12 +229,12 @@ struct test_number_of_chunks
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_executor_parameters<test_number_of_chunks> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 ///////////////////////////////////////////////////////////////////////////////
 void test_maximal_number_of_chunks()
@@ -281,13 +281,13 @@ struct test_executor_reset_thread_distribution
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_two_way_executor<test_executor_reset_thread_distribution>
       : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 struct test_thread_distribution
 {
@@ -298,12 +298,12 @@ struct test_thread_distribution
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_executor_parameters<test_thread_distribution> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 ///////////////////////////////////////////////////////////////////////////////
 void test_reset_thread_distribution()
@@ -351,13 +351,13 @@ struct test_executor_processing_units_count : hpx::execution::parallel_executor
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_two_way_executor<test_executor_processing_units_count>
       : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 struct test_processing_units
 {
@@ -370,12 +370,12 @@ struct test_processing_units
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_executor_parameters<test_processing_units> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 ///////////////////////////////////////////////////////////////////////////////
 void test_processing_units_count()
@@ -471,12 +471,12 @@ struct test_executor_begin_end : hpx::execution::parallel_executor
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_two_way_executor<test_executor_begin_end> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 struct test_begin_end
 {
@@ -499,12 +499,12 @@ struct test_begin_end
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_executor_parameters<test_begin_end> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 ///////////////////////////////////////////////////////////////////////////////
 void test_mark_begin_execution()
diff --git a/libs/core/execution/tests/unit/executor_parameters_timer_hooks.cpp b/libs/core/execution/tests/unit/executor_parameters_timer_hooks.cpp
index a513344444b2..f863266398fd 100644
--- a/libs/core/execution/tests/unit/executor_parameters_timer_hooks.cpp
+++ b/libs/core/execution/tests/unit/executor_parameters_timer_hooks.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <atomic>
@@ -89,12 +89,12 @@ struct timer_hooks_parameters
     std::atomic<std::size_t> count_;
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_executor_parameters<timer_hooks_parameters> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 void test_timer_hooks()
 {
diff --git a/libs/core/execution/tests/unit/foreach_tests.hpp b/libs/core/execution/tests/unit/foreach_tests.hpp
index e28e5760ea4c..5b4ed48c992a 100644
--- a/libs/core/execution/tests/unit/foreach_tests.hpp
+++ b/libs/core/execution/tests/unit/foreach_tests.hpp
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstddef>
diff --git a/libs/core/execution/tests/unit/future_then_executor.cpp b/libs/core/execution/tests/unit/future_then_executor.cpp
index 34ce8b31b05d..6560d6994f90 100644
--- a/libs/core/execution/tests/unit/future_then_executor.cpp
+++ b/libs/core/execution/tests/unit/future_then_executor.cpp
@@ -7,11 +7,11 @@
 //  accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <memory>
diff --git a/libs/core/execution/tests/unit/minimal_async_executor.cpp b/libs/core/execution/tests/unit/minimal_async_executor.cpp
index e46df137dc52..f9c5db8453a0 100644
--- a/libs/core/execution/tests/unit/minimal_async_executor.cpp
+++ b/libs/core/execution/tests/unit/minimal_async_executor.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
@@ -158,12 +158,12 @@ struct test_async_executor1
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_two_way_executor<test_async_executor1> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 struct test_async_executor2 : test_async_executor1
 {
@@ -180,12 +180,12 @@ struct test_async_executor2 : test_async_executor1
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_two_way_executor<test_async_executor2> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 struct test_async_executor3 : test_async_executor1
 {
@@ -206,12 +206,12 @@ struct test_async_executor3 : test_async_executor1
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_two_way_executor<test_async_executor3> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 struct test_async_executor4 : test_async_executor1
 {
@@ -232,7 +232,7 @@ struct test_async_executor4 : test_async_executor1
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_two_way_executor<test_async_executor4> : std::true_type
     {
@@ -242,7 +242,7 @@ namespace hpx { namespace parallel { namespace execution {
     struct is_bulk_two_way_executor<test_async_executor4> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 struct test_async_executor5 : test_async_executor1
 {
@@ -257,12 +257,12 @@ struct test_async_executor5 : test_async_executor1
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_two_way_executor<test_async_executor5> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 ///////////////////////////////////////////////////////////////////////////////
 int hpx_main()
diff --git a/libs/core/execution/tests/unit/minimal_sync_executor.cpp b/libs/core/execution/tests/unit/minimal_sync_executor.cpp
index f7ef5b90211a..d910a8725a7f 100644
--- a/libs/core/execution/tests/unit/minimal_sync_executor.cpp
+++ b/libs/core/execution/tests/unit/minimal_sync_executor.cpp
@@ -4,11 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <algorithm>
 #include <array>
@@ -252,12 +252,12 @@ struct test_sync_executor1
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_one_way_executor<test_sync_executor1> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 struct test_sync_executor2 : test_sync_executor1
 {
@@ -292,7 +292,7 @@ struct test_sync_executor2 : test_sync_executor1
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_one_way_executor<test_sync_executor2> : std::true_type
     {
@@ -302,7 +302,7 @@ namespace hpx { namespace parallel { namespace execution {
     struct is_bulk_one_way_executor<test_sync_executor2> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 ///////////////////////////////////////////////////////////////////////////////
 int hpx_main()
diff --git a/libs/core/execution/tests/unit/persistent_executor_parameters.cpp b/libs/core/execution/tests/unit/persistent_executor_parameters.cpp
index 5d419e48460f..05ebd03b8b42 100644
--- a/libs/core/execution/tests/unit/persistent_executor_parameters.cpp
+++ b/libs/core/execution/tests/unit/persistent_executor_parameters.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/execution/tests/unit/test_utils.hpp b/libs/core/execution/tests/unit/test_utils.hpp
index 39093f3f4036..ff4accd28b2f 100644
--- a/libs/core/execution/tests/unit/test_utils.hpp
+++ b/libs/core/execution/tests/unit/test_utils.hpp
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <hpx/local/execution.hpp>
+#include <hpx/execution.hpp>
 #include <hpx/modules/iterator_support.hpp>
 
 #include <algorithm>
diff --git a/libs/core/execution_base/tests/unit/any_sender.cpp b/libs/core/execution_base/tests/unit/any_sender.cpp
index ce0e24a5ed63..bb705cb41a12 100644
--- a/libs/core/execution_base/tests/unit/any_sender.cpp
+++ b/libs/core/execution_base/tests/unit/any_sender.cpp
@@ -4,11 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/execution_base/any_sender.hpp>
-#include <hpx/execution_base/sender.hpp>
-#include <hpx/functional/bind_front.hpp>
-#include <hpx/functional/invoke_fused.hpp>
-#include <hpx/local/execution.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/functional.hpp>
 #include <hpx/modules/errors.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/executors/examples/disable_thread_stealing_executor.cpp b/libs/core/executors/examples/disable_thread_stealing_executor.cpp
index c09ee6799a86..4a3e952a40df 100644
--- a/libs/core/executors/examples/disable_thread_stealing_executor.cpp
+++ b/libs/core/executors/examples/disable_thread_stealing_executor.cpp
@@ -9,10 +9,10 @@
 // thread stealing for the duration of the execution of a parallel algorithm
 // it is used with.
 
+#include <hpx/algorithm.hpp>
 #include <hpx/assert.hpp>
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 
 #include <algorithm>
 #include <atomic>
@@ -76,7 +76,7 @@ namespace executor_example {
 
 ///////////////////////////////////////////////////////////////////////////////
 // simple forwarding implementations of executor traits
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
 
     template <typename BaseExecutor>
     struct is_one_way_executor<
@@ -112,7 +112,7 @@ namespace hpx { namespace parallel { namespace execution {
       : is_bulk_two_way_executor<std::decay_t<BaseExecutor>>
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 int hpx_main()
 {
diff --git a/libs/core/executors/examples/executor_with_thread_hooks.cpp b/libs/core/executors/examples/executor_with_thread_hooks.cpp
index 50fdb6d80e2b..19a5db048b82 100644
--- a/libs/core/executors/examples/executor_with_thread_hooks.cpp
+++ b/libs/core/executors/examples/executor_with_thread_hooks.cpp
@@ -10,10 +10,10 @@
 // to associate custom thread data with the tasks that are created by the
 // underlying executor.
 
+#include <hpx/algorithm.hpp>
 #include <hpx/assert.hpp>
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 
 #include <algorithm>
 #include <atomic>
@@ -183,7 +183,7 @@ namespace executor_example {
 
 ///////////////////////////////////////////////////////////////////////////////
 // simple forwarding implementations of executor traits
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
 
     template <typename BaseExecutor>
     struct is_one_way_executor<
@@ -219,7 +219,7 @@ namespace hpx { namespace parallel { namespace execution {
       : is_bulk_two_way_executor<std::decay_t<BaseExecutor>>
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 int hpx_main()
 {
diff --git a/libs/core/executors/tests/regressions/bulk_sync_wait.cpp b/libs/core/executors/tests/regressions/bulk_sync_wait.cpp
index 0860560ca110..1b1fb595ae0a 100644
--- a/libs/core/executors/tests/regressions/bulk_sync_wait.cpp
+++ b/libs/core/executors/tests/regressions/bulk_sync_wait.cpp
@@ -6,8 +6,8 @@
 
 // sync_wait() did not compile when used with an lvalue sender involving bulk
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <atomic>
diff --git a/libs/core/executors/tests/regressions/bulk_then_execute_3182.cpp b/libs/core/executors/tests/regressions/bulk_then_execute_3182.cpp
index dc728a063c9d..fd13e3c9a6da 100644
--- a/libs/core/executors/tests/regressions/bulk_then_execute_3182.cpp
+++ b/libs/core/executors/tests/regressions/bulk_then_execute_3182.cpp
@@ -6,9 +6,9 @@
 
 // #3182: bulk_then_execute has unexpected return type/does not compile
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/executors/tests/regressions/future_then_async_executor.cpp b/libs/core/executors/tests/regressions/future_then_async_executor.cpp
index b3d23f56da4d..649c85f60bce 100644
--- a/libs/core/executors/tests/regressions/future_then_async_executor.cpp
+++ b/libs/core/executors/tests/regressions/future_then_async_executor.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <type_traits>
@@ -25,12 +25,12 @@ struct test_async_executor
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_two_way_executor<test_async_executor> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 int hpx_main()
 {
diff --git a/libs/core/executors/tests/regressions/parallel_executor_1781.cpp b/libs/core/executors/tests/regressions/parallel_executor_1781.cpp
index 07518c5f87f1..31a3452e128e 100644
--- a/libs/core/executors/tests/regressions/parallel_executor_1781.cpp
+++ b/libs/core/executors/tests/regressions/parallel_executor_1781.cpp
@@ -4,10 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 
 #include <vector>
 
diff --git a/libs/core/executors/tests/regressions/pu_count_6184.cpp b/libs/core/executors/tests/regressions/pu_count_6184.cpp
index d08380e97709..825e4a65b959 100644
--- a/libs/core/executors/tests/regressions/pu_count_6184.cpp
+++ b/libs/core/executors/tests/regressions/pu_count_6184.cpp
@@ -6,8 +6,8 @@
 
 // #6184: Wrong processing_units_count of restricted_thread_pool_executor
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstddef>
diff --git a/libs/core/executors/tests/regressions/wrapping_executor.cpp b/libs/core/executors/tests/regressions/wrapping_executor.cpp
index 0d3d6f4c74f9..c5ae72964cf7 100644
--- a/libs/core/executors/tests/regressions/wrapping_executor.cpp
+++ b/libs/core/executors/tests/regressions/wrapping_executor.cpp
@@ -8,10 +8,10 @@
 // Verify that a wrapping executor does not go out of scope prematurely when
 // used with a seq(task) execution policy.
 
+#include <hpx/algorithm.hpp>
 #include <hpx/assert.hpp>
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 
 #include <algorithm>
 #include <atomic>
@@ -137,7 +137,7 @@ namespace test {
 
 ///////////////////////////////////////////////////////////////////////////////
 // simple forwarding implementations of executor traits
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
 
     template <typename BaseExecutor>
     struct is_one_way_executor<test::wrapping_executor<BaseExecutor>>
@@ -169,7 +169,7 @@ namespace hpx { namespace parallel { namespace execution {
       : is_bulk_two_way_executor<std::decay_t<BaseExecutor>>
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 int hpx_main()
 {
diff --git a/libs/core/executors/tests/unit/annotating_executor.cpp b/libs/core/executors/tests/unit/annotating_executor.cpp
index 1e159b8afdff..529b090e8e07 100644
--- a/libs/core/executors/tests/unit/annotating_executor.cpp
+++ b/libs/core/executors/tests/unit/annotating_executor.cpp
@@ -7,13 +7,13 @@
 #include <hpx/config.hpp>
 
 #if defined(HPX_HAVE_THREAD_DESCRIPTION)
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/latch.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/latch.hpp>
 #include <hpx/modules/properties.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstdlib>
 #include <functional>
@@ -466,12 +466,12 @@ struct test_async_executor
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_two_way_executor<test_async_executor> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 int hpx_main()
 {
diff --git a/libs/core/executors/tests/unit/annotation_property.cpp b/libs/core/executors/tests/unit/annotation_property.cpp
index 91065fc5eeda..f9b043a957b2 100644
--- a/libs/core/executors/tests/unit/annotation_property.cpp
+++ b/libs/core/executors/tests/unit/annotation_property.cpp
@@ -7,13 +7,13 @@
 #include <hpx/config.hpp>
 
 #if defined(HPX_HAVE_THREAD_DESCRIPTION)
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/latch.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/latch.hpp>
 #include <hpx/modules/properties.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstdlib>
 #include <functional>
diff --git a/libs/core/executors/tests/unit/created_executor.cpp b/libs/core/executors/tests/unit/created_executor.cpp
index 756b54e6b902..910bdf399399 100644
--- a/libs/core/executors/tests/unit/created_executor.cpp
+++ b/libs/core/executors/tests/unit/created_executor.cpp
@@ -5,11 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/functional/deferred_call.hpp>
-#include <hpx/iterator_support/iterator_range.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
@@ -57,7 +57,7 @@ struct void_parallel_executor : hpx::execution::parallel_executor
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_bulk_one_way_executor<void_parallel_executor> : std::true_type
     {
@@ -67,7 +67,7 @@ namespace hpx { namespace parallel { namespace execution {
     struct is_bulk_two_way_executor<void_parallel_executor> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 ////////////////////////////////////////////////////////////////////////////////
 // Tests to void_parallel_executor behavior for the bulk executes
diff --git a/libs/core/executors/tests/unit/execution_policy_mappings.cpp b/libs/core/executors/tests/unit/execution_policy_mappings.cpp
index 857d9d882162..b2c4be42e9de 100644
--- a/libs/core/executors/tests/unit/execution_policy_mappings.cpp
+++ b/libs/core/executors/tests/unit/execution_policy_mappings.cpp
@@ -4,13 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/executors/execution_policy.hpp>
-#if defined(HPX_HAVE_DATAPAR)
-#include <hpx/executors/datapar/execution_policy.hpp>
-#endif
-#include <hpx/local/init.hpp>
-#include <hpx/modules/program_options.hpp>
+#include <hpx/datapar.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/program_options.hpp>
 
 #include <type_traits>
 
diff --git a/libs/core/executors/tests/unit/explicit_scheduler_executor.cpp b/libs/core/executors/tests/unit/explicit_scheduler_executor.cpp
index 66199a6b73f0..1db990fab81b 100644
--- a/libs/core/executors/tests/unit/explicit_scheduler_executor.cpp
+++ b/libs/core/executors/tests/unit/explicit_scheduler_executor.cpp
@@ -10,12 +10,12 @@
 #if !defined(HPX_CLANG_VERSION) ||                                             \
     ((HPX_CLANG_VERSION / 10000) != 11 && (HPX_CLANG_VERSION / 10000) != 8)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/latch.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/latch.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstdlib>
 #include <functional>
diff --git a/libs/core/executors/tests/unit/fork_join_executor.cpp b/libs/core/executors/tests/unit/fork_join_executor.cpp
index c572643f42f3..4d1d9baa80e6 100644
--- a/libs/core/executors/tests/unit/fork_join_executor.cpp
+++ b/libs/core/executors/tests/unit/fork_join_executor.cpp
@@ -5,12 +5,12 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <algorithm>
 #include <atomic>
diff --git a/libs/core/executors/tests/unit/limiting_executor.cpp b/libs/core/executors/tests/unit/limiting_executor.cpp
index c09d75460e78..cbd9a88bc690 100644
--- a/libs/core/executors/tests/unit/limiting_executor.cpp
+++ b/libs/core/executors/tests/unit/limiting_executor.cpp
@@ -4,10 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/executors/limiting_executor.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <atomic>
diff --git a/libs/core/executors/tests/unit/parallel_executor.cpp b/libs/core/executors/tests/unit/parallel_executor.cpp
index 49ab699e561c..5912b9ee154f 100644
--- a/libs/core/executors/tests/unit/parallel_executor.cpp
+++ b/libs/core/executors/tests/unit/parallel_executor.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/executors/tests/unit/parallel_executor_parameters.cpp b/libs/core/executors/tests/unit/parallel_executor_parameters.cpp
index ff25c0704307..7822d93193a0 100644
--- a/libs/core/executors/tests/unit/parallel_executor_parameters.cpp
+++ b/libs/core/executors/tests/unit/parallel_executor_parameters.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstddef>
diff --git a/libs/core/executors/tests/unit/parallel_fork_executor.cpp b/libs/core/executors/tests/unit/parallel_fork_executor.cpp
index c85dca008c90..9ebb07cd1e17 100644
--- a/libs/core/executors/tests/unit/parallel_fork_executor.cpp
+++ b/libs/core/executors/tests/unit/parallel_fork_executor.cpp
@@ -4,11 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <algorithm>
 #include <cstdlib>
diff --git a/libs/core/executors/tests/unit/parallel_policy_executor.cpp b/libs/core/executors/tests/unit/parallel_policy_executor.cpp
index 390a4c04c069..c3f1ed7c04f2 100644
--- a/libs/core/executors/tests/unit/parallel_policy_executor.cpp
+++ b/libs/core/executors/tests/unit/parallel_policy_executor.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/executors/tests/unit/polymorphic_executor.cpp b/libs/core/executors/tests/unit/polymorphic_executor.cpp
index afe2c2457ead..ed6bc6cbd9d0 100644
--- a/libs/core/executors/tests/unit/polymorphic_executor.cpp
+++ b/libs/core/executors/tests/unit/polymorphic_executor.cpp
@@ -4,11 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/functional/bind.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/modules/execution.hpp>
-#include <hpx/modules/executors.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
diff --git a/libs/core/executors/tests/unit/scheduler_executor.cpp b/libs/core/executors/tests/unit/scheduler_executor.cpp
index b5c1056606bd..2767502c3785 100644
--- a/libs/core/executors/tests/unit/scheduler_executor.cpp
+++ b/libs/core/executors/tests/unit/scheduler_executor.cpp
@@ -10,12 +10,12 @@
 #if !defined(HPX_CLANG_VERSION) ||                                             \
     ((HPX_CLANG_VERSION / 10000) != 11 && (HPX_CLANG_VERSION / 10000) != 8)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/latch.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/latch.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstdlib>
 #include <functional>
diff --git a/libs/core/executors/tests/unit/sequenced_executor.cpp b/libs/core/executors/tests/unit/sequenced_executor.cpp
index a5d44362beb7..a3b6c099cda6 100644
--- a/libs/core/executors/tests/unit/sequenced_executor.cpp
+++ b/libs/core/executors/tests/unit/sequenced_executor.cpp
@@ -4,11 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <algorithm>
 #include <cstdlib>
diff --git a/libs/core/executors/tests/unit/service_executors.cpp b/libs/core/executors/tests/unit/service_executors.cpp
index 471f59acdbb9..0b267df79833 100644
--- a/libs/core/executors/tests/unit/service_executors.cpp
+++ b/libs/core/executors/tests/unit/service_executors.cpp
@@ -4,11 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/runtime.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/runtime.hpp>
 
 #include <algorithm>
 #include <cstdlib>
diff --git a/libs/core/executors/tests/unit/shared_parallel_executor.cpp b/libs/core/executors/tests/unit/shared_parallel_executor.cpp
index 2c76fc745fd7..35d55dee611b 100644
--- a/libs/core/executors/tests/unit/shared_parallel_executor.cpp
+++ b/libs/core/executors/tests/unit/shared_parallel_executor.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <algorithm>
@@ -31,12 +31,12 @@ struct shared_parallel_executor
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_two_way_executor<shared_parallel_executor> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 ///////////////////////////////////////////////////////////////////////////////
 hpx::thread::id test(int passed_through)
diff --git a/libs/core/executors/tests/unit/standalone_thread_pool_executor.cpp b/libs/core/executors/tests/unit/standalone_thread_pool_executor.cpp
index c76692490308..29233111906e 100644
--- a/libs/core/executors/tests/unit/standalone_thread_pool_executor.cpp
+++ b/libs/core/executors/tests/unit/standalone_thread_pool_executor.cpp
@@ -11,12 +11,12 @@
 // HPX runtime*. This test fails if thread pools, schedulers etc. assume that
 // the global runtime (configuration, thread manager, etc.) always exists.
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
 #include <hpx/modules/schedulers.hpp>
 #include <hpx/modules/testing.hpp>
 #include <hpx/modules/thread_pools.hpp>
+#include <hpx/thread.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/executors/tests/unit/std_execution_policies.cpp b/libs/core/executors/tests/unit/std_execution_policies.cpp
index ed7bb894261e..21e08e8ca0b8 100644
--- a/libs/core/executors/tests/unit/std_execution_policies.cpp
+++ b/libs/core/executors/tests/unit/std_execution_policies.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/libs/core/executors/tests/unit/thread_pool_scheduler.cpp b/libs/core/executors/tests/unit/thread_pool_scheduler.cpp
index 85567b34e5af..0d1fa4d9121c 100644
--- a/libs/core/executors/tests/unit/thread_pool_scheduler.cpp
+++ b/libs/core/executors/tests/unit/thread_pool_scheduler.cpp
@@ -11,13 +11,13 @@
 #if !defined(HPX_CLANG_VERSION) ||                                             \
     ((HPX_CLANG_VERSION / 10000) != 11 && (HPX_CLANG_VERSION / 10000) != 8)
 
-#include <hpx/local/condition_variable.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/functional.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/mutex.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/condition_variable.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/mutex.hpp>
+#include <hpx/thread.hpp>
 
 #include <array>
 #include <atomic>
diff --git a/libs/core/format/include/hpx/modules/format.hpp b/libs/core/format/include/hpx/modules/format.hpp
index 5d7dfc9fe302..73427ee3c115 100644
--- a/libs/core/format/include/hpx/modules/format.hpp
+++ b/libs/core/format/include/hpx/modules/format.hpp
@@ -13,6 +13,7 @@
 #include <cstddef>
 #include <cstdio>
 #include <ctime>
+#include <ios>
 #include <ostream>
 #include <stdexcept>
 #include <string>
@@ -28,7 +29,7 @@ namespace hpx::util {
         template <typename T>
         struct type_specifier
         {
-            static char const* value() noexcept;
+            static char const* value() noexcept = delete;
         };
 
 #define DECL_TYPE_SPECIFIER(Type, Spec)                                        \
@@ -81,8 +82,13 @@ namespace hpx::util {
 
                 // copy spec to a null terminated buffer
                 char format[16];
-                std::sprintf(format, "%%%.*s%s", static_cast<int>(spec.size()),
-                    spec.data(), conv_spec);
+                int const len =
+                    std::snprintf(format, sizeof(format), "%%%.*s%s",
+                        static_cast<int>(spec.size()), spec.data(), conv_spec);
+                if (len < 0 || len >= static_cast<int>(sizeof(format)))
+                {
+                    throw std::runtime_error("Not a valid format specifier");
+                }
 
                 T const& value = *static_cast<T const*>(ptr);    //-V206
                 std::size_t length = std::snprintf(nullptr, 0, format, value);
@@ -138,8 +144,13 @@ namespace hpx::util {
                 {
                     // copy spec to a null terminated buffer
                     char format[16];
-                    std::sprintf(format, "%%%.*ss",
-                        static_cast<int>(spec.size()), spec.data());
+                    int const len = std::snprintf(format, sizeof(format),
+                        "%%%.*ss", static_cast<int>(spec.size()), spec.data());
+                    if (len <= 0 || len >= static_cast<int>(sizeof(format)))
+                    {
+                        throw std::runtime_error(
+                            "Not a valid format specifier");
+                    }
 
                     std::size_t length =
                         std::snprintf(nullptr, 0, format, value);
@@ -165,7 +176,8 @@ namespace hpx::util {
 
                 if (spec.empty() || spec == "s")
                 {
-                    os.write(value.data(), value.size());
+                    os.write(value.data(),
+                        static_cast<std::streamsize>(value.size()));
                 }
                 else
                 {
@@ -189,7 +201,7 @@ namespace hpx::util {
                 // copy spec to a null terminated buffer
                 std::string const format(spec);
 
-                std::size_t length = 0;
+                std::size_t length;
                 std::vector<char> buffer(1);
                 buffer.resize(buffer.capacity());
                 do
diff --git a/libs/core/functional/include/hpx/functional/detail/basic_function.hpp b/libs/core/functional/include/hpx/functional/detail/basic_function.hpp
index 6f7fb98f80c4..842f8eb57387 100644
--- a/libs/core/functional/include/hpx/functional/detail/basic_function.hpp
+++ b/libs/core/functional/include/hpx/functional/detail/basic_function.hpp
@@ -17,7 +17,6 @@
 #include <hpx/functional/traits/get_function_address.hpp>
 #include <hpx/functional/traits/get_function_annotation.hpp>
 #include <hpx/functional/traits/is_invocable.hpp>
-#include <hpx/type_support/construct_at.hpp>
 
 #include <cstddef>
 #include <cstring>
@@ -186,8 +185,7 @@ namespace hpx::util::detail {
                     buffer = vtable::template allocate<T>(
                         storage, function_storage_size);
                 }
-                object = hpx::construct_at(
-                    static_cast<T*>(buffer), HPX_FORWARD(F, f));
+                object = ::new (buffer) T(HPX_FORWARD(F, f));
             }
             else
             {
diff --git a/libs/core/functional/tests/regressions/protect_with_nullary_pfo.cpp b/libs/core/functional/tests/regressions/protect_with_nullary_pfo.cpp
index 56247e19e494..42e39936f416 100644
--- a/libs/core/functional/tests/regressions/protect_with_nullary_pfo.cpp
+++ b/libs/core/functional/tests/regressions/protect_with_nullary_pfo.cpp
@@ -5,12 +5,10 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/config.hpp>
-#include <hpx/functional/bind.hpp>
-#include <hpx/functional/protect.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/futures/include/hpx/futures/future.hpp b/libs/core/futures/include/hpx/futures/future.hpp
index 8cdec07b98cd..297a302362ae 100644
--- a/libs/core/futures/include/hpx/futures/future.hpp
+++ b/libs/core/futures/include/hpx/futures/future.hpp
@@ -63,7 +63,6 @@ namespace hpx::lcos::detail {
 
         future_state state = future_state::invalid;
         ar >> state;
-        // NOLINTNEXTLINE(bugprone-branch-clone)
         if (state == future_state::has_value)
         {
             if constexpr (std::is_default_constructible_v<value_type>)
@@ -92,7 +91,6 @@ namespace hpx::lcos::detail {
                 f = hpx::traits::future_access<Future>::create(HPX_MOVE(p));
             }
         }
-        // NOLINTNEXTLINE(bugprone-branch-clone)
         else if (state == future_state::has_exception)
         {
             std::exception_ptr exception;
@@ -103,7 +101,6 @@ namespace hpx::lcos::detail {
 
             f = hpx::traits::future_access<Future>::create(HPX_MOVE(p));
         }
-        // NOLINTNEXTLINE(bugprone-branch-clone)
         else if (state == future_state::invalid)
         {
             f = Future();
diff --git a/libs/core/futures/tests/regressions/exception_from_continuation_1613.cpp b/libs/core/futures/tests/regressions/exception_from_continuation_1613.cpp
index 3e97a9e892a7..0bc75910588f 100644
--- a/libs/core/futures/tests/regressions/exception_from_continuation_1613.cpp
+++ b/libs/core/futures/tests/regressions/exception_from_continuation_1613.cpp
@@ -7,8 +7,8 @@
 // This test case demonstrates the issue described in #1613: Dataflow causes
 // stack overflow
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <atomic>
diff --git a/libs/core/futures/tests/regressions/fail_future_2667.cpp b/libs/core/futures/tests/regressions/fail_future_2667.cpp
index 15eec8f1ad27..a5ea5f6509b6 100644
--- a/libs/core/futures/tests/regressions/fail_future_2667.cpp
+++ b/libs/core/futures/tests/regressions/fail_future_2667.cpp
@@ -9,8 +9,8 @@
 //
 // This test is supposed to fail compiling.
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 
 #include <chrono>
 #include <utility>
diff --git a/libs/core/futures/tests/regressions/future_2667.cpp b/libs/core/futures/tests/regressions/future_2667.cpp
index 56a0b6c7d72e..ee16467c893c 100644
--- a/libs/core/futures/tests/regressions/future_2667.cpp
+++ b/libs/core/futures/tests/regressions/future_2667.cpp
@@ -7,10 +7,10 @@
 // This test case demonstrates the issue described in #2667: Ambiguity of
 // nested hpx::future<void>'s
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <chrono>
diff --git a/libs/core/futures/tests/regressions/future_790.cpp b/libs/core/futures/tests/regressions/future_790.cpp
index 1bd7c7bc5aaf..880a8805fb07 100644
--- a/libs/core/futures/tests/regressions/future_790.cpp
+++ b/libs/core/futures/tests/regressions/future_790.cpp
@@ -7,8 +7,8 @@
 // This test case demonstrates the issue described in #790: wait_for() doesn't
 // compile
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <chrono>
diff --git a/libs/core/futures/tests/regressions/future_range_ambiguity_2032.cpp b/libs/core/futures/tests/regressions/future_range_ambiguity_2032.cpp
index 1a51f14741e1..ee0ce33bbaaa 100644
--- a/libs/core/futures/tests/regressions/future_range_ambiguity_2032.cpp
+++ b/libs/core/futures/tests/regressions/future_range_ambiguity_2032.cpp
@@ -6,8 +6,8 @@
 
 // This tests verifies that #2032 remains fixed
 
+#include <hpx/future.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
-#include <hpx/local/future.hpp>
 
 #include <vector>
 
diff --git a/libs/core/futures/tests/regressions/future_unwrap_1182.cpp b/libs/core/futures/tests/regressions/future_unwrap_1182.cpp
index e53bd739f15d..601a03c06ca1 100644
--- a/libs/core/futures/tests/regressions/future_unwrap_1182.cpp
+++ b/libs/core/futures/tests/regressions/future_unwrap_1182.cpp
@@ -5,8 +5,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <iostream>
diff --git a/libs/core/futures/tests/regressions/future_unwrap_878.cpp b/libs/core/futures/tests/regressions/future_unwrap_878.cpp
index 12d4ab0a291e..389e3b6fe672 100644
--- a/libs/core/futures/tests/regressions/future_unwrap_878.cpp
+++ b/libs/core/futures/tests/regressions/future_unwrap_878.cpp
@@ -7,8 +7,8 @@
 // This test case demonstrates the issue described in #878: `future::unwrap`
 // triggers assertion
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <exception>
diff --git a/libs/core/futures/tests/regressions/set_hpx_limit_798.cpp b/libs/core/futures/tests/regressions/set_hpx_limit_798.cpp
index 5b83997c01c5..04a541561e07 100644
--- a/libs/core/futures/tests/regressions/set_hpx_limit_798.cpp
+++ b/libs/core/futures/tests/regressions/set_hpx_limit_798.cpp
@@ -9,10 +9,10 @@
 
 #include <hpx/config.hpp>
 #if !defined(HPX_COMPUTE_DEVICE_CODE)
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/pack_traversal/unwrap.hpp>
+#include <hpx/unwrap.hpp>
 
 // define large action
 double func(double x1, double, double, double, double, double, double)
diff --git a/libs/core/futures/tests/regressions/shared_future_continuation_order.cpp b/libs/core/futures/tests/regressions/shared_future_continuation_order.cpp
index c2731fdf52d7..1fe2b34c27f6 100644
--- a/libs/core/futures/tests/regressions/shared_future_continuation_order.cpp
+++ b/libs/core/futures/tests/regressions/shared_future_continuation_order.cpp
@@ -7,8 +7,8 @@
 // Making sure the continuations of a shared_future are invoked in the same
 // order as they have been attached.
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <atomic>
diff --git a/libs/core/futures/tests/regressions/shared_future_then_2166.cpp b/libs/core/futures/tests/regressions/shared_future_then_2166.cpp
index 30f6fbdafb88..b9eebabb22c6 100644
--- a/libs/core/futures/tests/regressions/shared_future_then_2166.cpp
+++ b/libs/core/futures/tests/regressions/shared_future_then_2166.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/libs/core/futures/tests/regressions/wait_for_1751.cpp b/libs/core/futures/tests/regressions/wait_for_1751.cpp
index 5912a7c5b7d8..b1460ebb764e 100644
--- a/libs/core/futures/tests/regressions/wait_for_1751.cpp
+++ b/libs/core/futures/tests/regressions/wait_for_1751.cpp
@@ -7,8 +7,8 @@
 // This test case demonstrates the issue described in #1751:
 // hpx::future::wait_for fails a simple test
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <chrono>
diff --git a/libs/core/futures/tests/unit/await.cpp b/libs/core/futures/tests/unit/await.cpp
index fde1b70147ff..30de297e421b 100644
--- a/libs/core/futures/tests/unit/await.cpp
+++ b/libs/core/futures/tests/unit/await.cpp
@@ -10,10 +10,10 @@
 #error "This test requires compiler support for C++20 coroutines"
 #endif
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <string>
diff --git a/libs/core/futures/tests/unit/future.cpp b/libs/core/futures/tests/unit/future.cpp
index f54e41b3e27b..e0bdf9732d3b 100644
--- a/libs/core/futures/tests/unit/future.cpp
+++ b/libs/core/futures/tests/unit/future.cpp
@@ -6,10 +6,10 @@
 //  accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <functional>
diff --git a/libs/core/futures/tests/unit/future_ref.cpp b/libs/core/futures/tests/unit/future_ref.cpp
index 35cc14f17ba1..bfc36f7134dc 100644
--- a/libs/core/futures/tests/unit/future_ref.cpp
+++ b/libs/core/futures/tests/unit/future_ref.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <chrono>
diff --git a/libs/core/futures/tests/unit/future_then.cpp b/libs/core/futures/tests/unit/future_then.cpp
index c62b2740582e..276a485f0aa2 100644
--- a/libs/core/futures/tests/unit/future_then.cpp
+++ b/libs/core/futures/tests/unit/future_then.cpp
@@ -6,10 +6,10 @@
 //  accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <chrono>
diff --git a/libs/core/futures/tests/unit/local_promise_allocator.cpp b/libs/core/futures/tests/unit/local_promise_allocator.cpp
index 32ab18782c17..b249a4c41666 100644
--- a/libs/core/futures/tests/unit/local_promise_allocator.cpp
+++ b/libs/core/futures/tests/unit/local_promise_allocator.cpp
@@ -5,8 +5,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <memory>
diff --git a/libs/core/futures/tests/unit/local_use_allocator.cpp b/libs/core/futures/tests/unit/local_use_allocator.cpp
index e7fc81061cde..ee28e7fb5c25 100644
--- a/libs/core/futures/tests/unit/local_use_allocator.cpp
+++ b/libs/core/futures/tests/unit/local_use_allocator.cpp
@@ -5,7 +5,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
+#include <hpx/future.hpp>
 
 #include <memory>
 
diff --git a/libs/core/futures/tests/unit/make_future.cpp b/libs/core/futures/tests/unit/make_future.cpp
index 66da47bddefb..6efdfcf3db2d 100644
--- a/libs/core/futures/tests/unit/make_future.cpp
+++ b/libs/core/futures/tests/unit/make_future.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/execution.hpp>
-#include <hpx/modules/futures.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <string>
diff --git a/libs/core/futures/tests/unit/make_ready_future.cpp b/libs/core/futures/tests/unit/make_ready_future.cpp
index 6ff7e023dd5d..cb7d48662462 100644
--- a/libs/core/futures/tests/unit/make_ready_future.cpp
+++ b/libs/core/futures/tests/unit/make_ready_future.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <functional>
diff --git a/libs/core/futures/tests/unit/shared_future.cpp b/libs/core/futures/tests/unit/shared_future.cpp
index 8ea0ae385a56..477e27a3d3eb 100644
--- a/libs/core/futures/tests/unit/shared_future.cpp
+++ b/libs/core/futures/tests/unit/shared_future.cpp
@@ -6,10 +6,10 @@
 //  accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <functional>
diff --git a/libs/core/include_local/CMakeLists.txt b/libs/core/include_local/CMakeLists.txt
index 48c64f220fcf..6ff50767efd4 100644
--- a/libs/core/include_local/CMakeLists.txt
+++ b/libs/core/include_local/CMakeLists.txt
@@ -1,46 +1,92 @@
-# Copyright (c) 2019-2021 The STE||AR-Group
+# Copyright (c) 2019-2023 The STE||AR-Group
 #
 # SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 set(include_local_headers
-    hpx/local/algorithm.hpp
-    hpx/local/any.hpp
-    hpx/local/barrier.hpp
-    hpx/local/channel.hpp
-    hpx/local/chrono.hpp
-    hpx/local/compute.hpp
-    hpx/local/condition_variable.hpp
-    hpx/local/datapar.hpp
-    hpx/local/exception.hpp
-    hpx/local/execution.hpp
-    hpx/local/functional.hpp
-    hpx/local/future.hpp
-    hpx/local/generator.hpp
-    hpx/local/latch.hpp
-    hpx/local/memory.hpp
-    hpx/local/mutex.hpp
-    hpx/local/numeric.hpp
-    hpx/local/optional.hpp
-    hpx/local/runtime.hpp
-    hpx/local/semaphore.hpp
-    hpx/local/shared_mutex.hpp
-    hpx/local/source_location.hpp
-    hpx/local/stop_token.hpp
-    hpx/local/system_error.hpp
-    hpx/local/task_block.hpp
-    hpx/local/thread.hpp
-    hpx/local/tuple.hpp
-    hpx/local/type_traits.hpp
-    hpx/local/unwrap.hpp
+    hpx/any.hpp
+    hpx/bit.hpp
+    hpx/channel.hpp
+    hpx/chrono.hpp
+    hpx/condition_variable.hpp
+    hpx/datapar.hpp
+    hpx/exception.hpp
+    hpx/execution.hpp
+    hpx/format.hpp
+    hpx/functional.hpp
+    hpx/generator.hpp
+    hpx/memory.hpp
+    hpx/mutex.hpp
+    hpx/numeric.hpp
+    hpx/optional.hpp
+    hpx/semaphore.hpp
+    hpx/shared_mutex.hpp
+    hpx/source_location.hpp
+    hpx/stop_token.hpp
+    hpx/system_error.hpp
+    hpx/task_block.hpp
+    hpx/thread.hpp
+    hpx/tuple.hpp
+    hpx/type_traits.hpp
+    hpx/unwrap.hpp
+    hpx/experimental/task_group.hpp
 )
 
+if(NOT HPX_WITH_DISTRIBUTED_RUNTIME)
+  set(include_local_headers
+      ${include_local_headers}
+      hpx/algorithm.hpp
+      hpx/barrier.hpp
+      hpx/channel.hpp
+      hpx/compute.hpp
+      hpx/future.hpp
+      hpx/latch.hpp
+      hpx/runtime.hpp
+  )
+endif()
+
+# The headers in hpx/local/ were deprecated in HPX V1.9.0
+# cmake-format: off
+set(include_local_compat_headers
+    hpx/local/algorithm.hpp => hpx/algorithm.hpp
+    hpx/local/any.hpp => hpx/any.hpp
+    hpx/local/barrier.hpp => hpx/barrier.hpp
+    hpx/local/channel.hpp => hpx/channel.hpp
+    hpx/local/chrono.hpp => hpx/chrono.hpp
+    hpx/local/compute.hpp => hpx/compute.hpp
+    hpx/local/condition_variable.hpp => hpx/condition_variable.hpp
+    hpx/local/datapar.hpp => hpx/datapar.hpp
+    hpx/local/exception.hpp => hpx/exception.hpp
+    hpx/local/execution.hpp => hpx/execution.hpp
+    hpx/local/functional.hpp => hpx/functional.hpp
+    hpx/local/future.hpp => hpx/future.hpp
+    hpx/local/generator.hpp => hpx/generator.hpp
+    hpx/local/latch.hpp => hpx/latch.hpp
+    hpx/local/memory.hpp => hpx/memory.hpp
+    hpx/local/mutex.hpp => hpx/mutex.hpp
+    hpx/local/numeric.hpp => hpx/numeric.hpp
+    hpx/local/optional.hpp => hpx/optional.hpp
+    hpx/local/runtime.hpp => hpx/runtime.hpp
+    hpx/local/semaphore.hpp => hpx/semaphore.hpp
+    hpx/local/shared_mutex.hpp => hpx/shared_mutex.hpp
+    hpx/local/source_location.hpp => hpx/source_location.hpp
+    hpx/local/stop_token.hpp => hpx/stop_token.hpp
+    hpx/local/system_error.hpp => hpx/system_error.hpp
+    hpx/local/task_block.hpp => hpx/task_block.hpp
+    hpx/local/thread.hpp => hpx/thread.hpp
+    hpx/local/tuple.hpp => hpx/tuple.hpp
+    hpx/local/type_traits.hpp => hpx/type_traits.hpp
+    hpx/local/unwrap.hpp => hpx/unwrap.hpp
+)
+# cmake-format: on
+
 include(HPX_AddModule)
 add_hpx_module(
   core include_local
   GLOBAL_HEADER_GEN OFF
   HEADERS ${include_local_headers}
+  COMPAT_HEADERS ${include_local_compat_headers}
   MODULE_DEPENDENCIES
     hpx_algorithms
     hpx_async_base
@@ -49,9 +95,17 @@ add_hpx_module(
     hpx_compute_local
     hpx_errors
     hpx_execution
+    hpx_execution_base
     hpx_executors
+    hpx_format
     hpx_futures
     hpx_lcos_local
+    hpx_memory
     hpx_runtime_local
+    hpx_synchronization
+    hpx_threading
+    hpx_threading_base
+    hpx_timed_execution
+    hpx_timing
   CMAKE_SUBDIRS examples tests
 )
diff --git a/libs/core/include_local/include/hpx/local/algorithm.hpp b/libs/core/include_local/include/hpx/algorithm.hpp
similarity index 100%
rename from libs/core/include_local/include/hpx/local/algorithm.hpp
rename to libs/core/include_local/include/hpx/algorithm.hpp
diff --git a/libs/full/include/include/hpx/any.hpp b/libs/core/include_local/include/hpx/any.hpp
similarity index 89%
rename from libs/full/include/include/hpx/any.hpp
rename to libs/core/include_local/include/hpx/any.hpp
index de6ac18abb34..b84b39e9c622 100644
--- a/libs/full/include/include/hpx/any.hpp
+++ b/libs/core/include_local/include/hpx/any.hpp
@@ -6,5 +6,5 @@
 
 #pragma once
 
+#include <hpx/datastructures/any.hpp>
 #include <hpx/datastructures/serialization/serializable_any.hpp>
-#include <hpx/local/any.hpp>
diff --git a/libs/core/include_local/include/hpx/local/barrier.hpp b/libs/core/include_local/include/hpx/barrier.hpp
similarity index 100%
rename from libs/core/include_local/include/hpx/local/barrier.hpp
rename to libs/core/include_local/include/hpx/barrier.hpp
diff --git a/libs/core/include_local/include/hpx/bit.hpp b/libs/core/include_local/include/hpx/bit.hpp
new file mode 100644
index 000000000000..dc3ece8b06b7
--- /dev/null
+++ b/libs/core/include_local/include/hpx/bit.hpp
@@ -0,0 +1,10 @@
+//  Copyright (c) 2023 Hartmut Kaiser
+//
+//  SPDX-License-Identifier: BSL-1.0
+//  Distributed under the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#pragma once
+
+#include <hpx/config.hpp>    // for endian support
+#include <hpx/type_support/bit_cast.hpp>
diff --git a/libs/core/include_local/include/hpx/local/channel.hpp b/libs/core/include_local/include/hpx/channel.hpp
similarity index 77%
rename from libs/core/include_local/include/hpx/local/channel.hpp
rename to libs/core/include_local/include/hpx/channel.hpp
index cb41eb22cc38..a046618eb911 100644
--- a/libs/core/include_local/include/hpx/local/channel.hpp
+++ b/libs/core/include_local/include/hpx/channel.hpp
@@ -6,9 +6,4 @@
 
 #pragma once
 
-#include <hpx/config.hpp>
 #include <hpx/lcos_local/channel.hpp>
-
-namespace hpx {
-    using hpx::lcos::local::channel;
-}
diff --git a/libs/full/include/include/hpx/chrono.hpp b/libs/core/include_local/include/hpx/chrono.hpp
similarity index 87%
rename from libs/full/include/include/hpx/chrono.hpp
rename to libs/core/include_local/include/hpx/chrono.hpp
index 02503c0706fc..8199df0acb11 100644
--- a/libs/full/include/include/hpx/chrono.hpp
+++ b/libs/core/include_local/include/hpx/chrono.hpp
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#include <hpx/local/chrono.hpp>
+#include <hpx/modules/timing.hpp>
diff --git a/libs/full/include/include/hpx/condition_variable.hpp b/libs/core/include_local/include/hpx/compute.hpp
similarity index 71%
rename from libs/full/include/include/hpx/condition_variable.hpp
rename to libs/core/include_local/include/hpx/compute.hpp
index 9e52b7a0097a..be44276499cf 100644
--- a/libs/full/include/include/hpx/condition_variable.hpp
+++ b/libs/core/include_local/include/hpx/compute.hpp
@@ -1,4 +1,4 @@
-//  Copyright (c) 2021 ETH Zurich
+//  Copyright (c) 2016-2022 Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#include <hpx/local/condition_variable.hpp>
+#include <hpx/modules/compute_local.hpp>
diff --git a/libs/core/include_local/include/hpx/local/condition_variable.hpp b/libs/core/include_local/include/hpx/condition_variable.hpp
similarity index 100%
rename from libs/core/include_local/include/hpx/local/condition_variable.hpp
rename to libs/core/include_local/include/hpx/condition_variable.hpp
diff --git a/libs/core/include_local/include/hpx/local/datapar.hpp b/libs/core/include_local/include/hpx/datapar.hpp
similarity index 100%
rename from libs/core/include_local/include/hpx/local/datapar.hpp
rename to libs/core/include_local/include/hpx/datapar.hpp
diff --git a/libs/core/include_local/include/hpx/local/exception.hpp b/libs/core/include_local/include/hpx/exception.hpp
similarity index 100%
rename from libs/core/include_local/include/hpx/local/exception.hpp
rename to libs/core/include_local/include/hpx/exception.hpp
diff --git a/libs/core/include_local/include/hpx/local/execution.hpp b/libs/core/include_local/include/hpx/execution.hpp
similarity index 78%
rename from libs/core/include_local/include/hpx/local/execution.hpp
rename to libs/core/include_local/include/hpx/execution.hpp
index 41236ea88f5d..26b504c25efa 100644
--- a/libs/core/include_local/include/hpx/local/execution.hpp
+++ b/libs/core/include_local/include/hpx/execution.hpp
@@ -7,4 +7,6 @@
 #pragma once
 
 #include <hpx/modules/execution.hpp>
+#include <hpx/modules/execution_base.hpp>
 #include <hpx/modules/executors.hpp>
+#include <hpx/modules/timed_execution.hpp>
diff --git a/libs/core/include_local/include/hpx/local/any.hpp b/libs/core/include_local/include/hpx/experimental/task_group.hpp
similarity index 86%
rename from libs/core/include_local/include/hpx/local/any.hpp
rename to libs/core/include_local/include/hpx/experimental/task_group.hpp
index ce1f6c25d2c9..dfcefff952a6 100644
--- a/libs/core/include_local/include/hpx/local/any.hpp
+++ b/libs/core/include_local/include/hpx/experimental/task_group.hpp
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#include <hpx/datastructures/any.hpp>
+#include <hpx/parallel/task_group.hpp>
diff --git a/libs/full/include/include/hpx/generator.hpp b/libs/core/include_local/include/hpx/format.hpp
similarity index 87%
rename from libs/full/include/include/hpx/generator.hpp
rename to libs/core/include_local/include/hpx/format.hpp
index f88747f9b5a9..0cad59b9f37d 100644
--- a/libs/full/include/include/hpx/generator.hpp
+++ b/libs/core/include_local/include/hpx/format.hpp
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#include <hpx/local/generator.hpp>
+#include <hpx/modules/format.hpp>
diff --git a/libs/core/include_local/include/hpx/local/functional.hpp b/libs/core/include_local/include/hpx/functional.hpp
similarity index 100%
rename from libs/core/include_local/include/hpx/local/functional.hpp
rename to libs/core/include_local/include/hpx/functional.hpp
diff --git a/libs/core/include_local/include/hpx/local/future.hpp b/libs/core/include_local/include/hpx/future.hpp
similarity index 100%
rename from libs/core/include_local/include/hpx/local/future.hpp
rename to libs/core/include_local/include/hpx/future.hpp
diff --git a/libs/core/include_local/include/hpx/local/generator.hpp b/libs/core/include_local/include/hpx/generator.hpp
similarity index 100%
rename from libs/core/include_local/include/hpx/local/generator.hpp
rename to libs/core/include_local/include/hpx/generator.hpp
diff --git a/libs/core/include_local/include/hpx/local/latch.hpp b/libs/core/include_local/include/hpx/latch.hpp
similarity index 100%
rename from libs/core/include_local/include/hpx/local/latch.hpp
rename to libs/core/include_local/include/hpx/latch.hpp
diff --git a/libs/core/include_local/include/hpx/local/chrono.hpp b/libs/core/include_local/include/hpx/local/chrono.hpp
deleted file mode 100644
index b16ed32e397f..000000000000
--- a/libs/core/include_local/include/hpx/local/chrono.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-//  Copyright (c) 2020 ETH Zurich
-//
-//  SPDX-License-Identifier: BSL-1.0
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#pragma once
-
-#include <hpx/timing/high_resolution_clock.hpp>
-#include <hpx/timing/high_resolution_timer.hpp>
-#include <hpx/timing/steady_clock.hpp>
diff --git a/libs/core/include_local/include/hpx/local/compute.hpp b/libs/core/include_local/include/hpx/local/compute.hpp
deleted file mode 100644
index f7d021832794..000000000000
--- a/libs/core/include_local/include/hpx/local/compute.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-//  Copyright (c) 2016-2022 Hartmut Kaiser
-//
-//  SPDX-License-Identifier: BSL-1.0
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#pragma once
-
-#include <hpx/config.hpp>
-#include <hpx/compute_local/host.hpp>
-#include <hpx/compute_local/serialization/vector.hpp>
-#include <hpx/compute_local/vector.hpp>
diff --git a/libs/core/include_local/include/hpx/local/memory.hpp b/libs/core/include_local/include/hpx/memory.hpp
similarity index 80%
rename from libs/core/include_local/include/hpx/local/memory.hpp
rename to libs/core/include_local/include/hpx/memory.hpp
index 083f20fe0063..0893bf15ce84 100644
--- a/libs/core/include_local/include/hpx/local/memory.hpp
+++ b/libs/core/include_local/include/hpx/memory.hpp
@@ -6,5 +6,7 @@
 
 #pragma once
 
+#include <hpx/modules/memory.hpp>
 #include <hpx/parallel/container_memory.hpp>
 #include <hpx/parallel/memory.hpp>
+#include <hpx/type_support/construct_at.hpp>
diff --git a/libs/core/include_local/include/hpx/local/mutex.hpp b/libs/core/include_local/include/hpx/mutex.hpp
similarity index 62%
rename from libs/core/include_local/include/hpx/local/mutex.hpp
rename to libs/core/include_local/include/hpx/mutex.hpp
index 876d018e2d00..fd6d42e0c07b 100644
--- a/libs/core/include_local/include/hpx/local/mutex.hpp
+++ b/libs/core/include_local/include/hpx/mutex.hpp
@@ -6,8 +6,5 @@
 
 #pragma once
 
-#include <hpx/synchronization/mutex.hpp>
-#include <hpx/synchronization/no_mutex.hpp>
-#include <hpx/synchronization/once.hpp>
-#include <hpx/synchronization/recursive_mutex.hpp>
+#include <hpx/modules/synchronization.hpp>
 #include <hpx/thread_support/unlock_guard.hpp>
diff --git a/libs/core/include_local/include/hpx/local/numeric.hpp b/libs/core/include_local/include/hpx/numeric.hpp
similarity index 100%
rename from libs/core/include_local/include/hpx/local/numeric.hpp
rename to libs/core/include_local/include/hpx/numeric.hpp
diff --git a/libs/core/include_local/include/hpx/local/optional.hpp b/libs/core/include_local/include/hpx/optional.hpp
similarity index 100%
rename from libs/core/include_local/include/hpx/local/optional.hpp
rename to libs/core/include_local/include/hpx/optional.hpp
diff --git a/libs/core/include_local/include/hpx/local/runtime.hpp b/libs/core/include_local/include/hpx/runtime.hpp
similarity index 100%
rename from libs/core/include_local/include/hpx/local/runtime.hpp
rename to libs/core/include_local/include/hpx/runtime.hpp
diff --git a/libs/core/include_local/include/hpx/local/semaphore.hpp b/libs/core/include_local/include/hpx/semaphore.hpp
similarity index 100%
rename from libs/core/include_local/include/hpx/local/semaphore.hpp
rename to libs/core/include_local/include/hpx/semaphore.hpp
diff --git a/libs/core/include_local/include/hpx/local/shared_mutex.hpp b/libs/core/include_local/include/hpx/shared_mutex.hpp
similarity index 100%
rename from libs/core/include_local/include/hpx/local/shared_mutex.hpp
rename to libs/core/include_local/include/hpx/shared_mutex.hpp
diff --git a/libs/core/include_local/include/hpx/local/source_location.hpp b/libs/core/include_local/include/hpx/source_location.hpp
similarity index 100%
rename from libs/core/include_local/include/hpx/local/source_location.hpp
rename to libs/core/include_local/include/hpx/source_location.hpp
diff --git a/libs/core/include_local/include/hpx/local/stop_token.hpp b/libs/core/include_local/include/hpx/stop_token.hpp
similarity index 100%
rename from libs/core/include_local/include/hpx/local/stop_token.hpp
rename to libs/core/include_local/include/hpx/stop_token.hpp
diff --git a/libs/core/include_local/include/hpx/local/system_error.hpp b/libs/core/include_local/include/hpx/system_error.hpp
similarity index 100%
rename from libs/core/include_local/include/hpx/local/system_error.hpp
rename to libs/core/include_local/include/hpx/system_error.hpp
diff --git a/libs/core/include_local/include/hpx/local/task_block.hpp b/libs/core/include_local/include/hpx/task_block.hpp
similarity index 100%
rename from libs/core/include_local/include/hpx/local/task_block.hpp
rename to libs/core/include_local/include/hpx/task_block.hpp
diff --git a/libs/full/include/include/hpx/thread.hpp b/libs/core/include_local/include/hpx/thread.hpp
similarity index 75%
rename from libs/full/include/include/hpx/thread.hpp
rename to libs/core/include_local/include/hpx/thread.hpp
index 69218c294e82..1d4155bbd6ff 100644
--- a/libs/full/include/include/hpx/thread.hpp
+++ b/libs/core/include_local/include/hpx/thread.hpp
@@ -6,4 +6,5 @@
 
 #pragma once
 
-#include <hpx/local/thread.hpp>
+#include <hpx/modules/threading.hpp>
+#include <hpx/modules/threading_base.hpp>
diff --git a/libs/core/include_local/include/hpx/local/tuple.hpp b/libs/core/include_local/include/hpx/tuple.hpp
similarity index 84%
rename from libs/core/include_local/include/hpx/local/tuple.hpp
rename to libs/core/include_local/include/hpx/tuple.hpp
index f556acb90380..5bf55c0b4fb5 100644
--- a/libs/core/include_local/include/hpx/local/tuple.hpp
+++ b/libs/core/include_local/include/hpx/tuple.hpp
@@ -6,4 +6,5 @@
 
 #pragma once
 
+#include <hpx/datastructures/serialization/tuple.hpp>
 #include <hpx/datastructures/tuple.hpp>
diff --git a/libs/core/include_local/include/hpx/local/type_traits.hpp b/libs/core/include_local/include/hpx/type_traits.hpp
similarity index 100%
rename from libs/core/include_local/include/hpx/local/type_traits.hpp
rename to libs/core/include_local/include/hpx/type_traits.hpp
diff --git a/libs/core/include_local/include/hpx/local/unwrap.hpp b/libs/core/include_local/include/hpx/unwrap.hpp
similarity index 100%
rename from libs/core/include_local/include/hpx/local/unwrap.hpp
rename to libs/core/include_local/include/hpx/unwrap.hpp
diff --git a/libs/core/init_runtime_local/CMakeLists.txt b/libs/core/init_runtime_local/CMakeLists.txt
index c8048795cbca..13609da7cafa 100644
--- a/libs/core/init_runtime_local/CMakeLists.txt
+++ b/libs/core/init_runtime_local/CMakeLists.txt
@@ -8,19 +8,30 @@ cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
-set(init_runtime_local_headers
-    hpx/init_runtime_local/detail/init_logging.hpp
-    hpx/init_runtime_local/init_runtime_local.hpp hpx/local/init.hpp
+set(init_runtime_local_headers hpx/init_runtime_local/detail/init_logging.hpp
+                               hpx/init_runtime_local/init_runtime_local.hpp
 )
 
+if(NOT HPX_WITH_DISTRIBUTED_RUNTIME)
+  set(init_runtime_local_headers ${init_runtime_local_headers} hpx/init.hpp)
+endif()
+
 set(init_runtime_local_sources init_logging.cpp init_runtime_local.cpp)
 
+# The headers in hpx/local/ were deprecated in HPX V1.9.0
+# cmake-format: off
+set(init_runtime_local_compat_headers
+    hpx/local/init.hpp => hpx/init.hpp
+)
+# cmake-format: on
+
 include(HPX_AddModule)
 add_hpx_module(
   core init_runtime_local
   GLOBAL_HEADER_GEN ON
   SOURCES ${init_runtime_local_sources}
   HEADERS ${init_runtime_local_headers}
+  COMPAT_HEADERS ${init_runtime_local_compat_headers}
   MODULE_DEPENDENCIES
     hpx_algorithms
     hpx_command_line_handling_local
diff --git a/libs/core/init_runtime_local/include/hpx/local/init.hpp b/libs/core/init_runtime_local/include/hpx/init.hpp
similarity index 100%
rename from libs/core/init_runtime_local/include/hpx/local/init.hpp
rename to libs/core/init_runtime_local/include/hpx/init.hpp
diff --git a/libs/core/init_runtime_local/tests/unit/shutdown_suspended_thread_local.cpp b/libs/core/init_runtime_local/tests/unit/shutdown_suspended_thread_local.cpp
index 4244c979b68b..e74ddb25c8e4 100644
--- a/libs/core/init_runtime_local/tests/unit/shutdown_suspended_thread_local.cpp
+++ b/libs/core/init_runtime_local/tests/unit/shutdown_suspended_thread_local.cpp
@@ -7,11 +7,10 @@
 // This test checks that the runtime takes into account suspended threads before
 // initiating full shutdown.
 
-#include <hpx/config.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 
diff --git a/libs/core/iterator_support/tests/performance/stencil3_iterators.cpp b/libs/core/iterator_support/tests/performance/stencil3_iterators.cpp
index e7ef6dc19989..413450e30006 100644
--- a/libs/core/iterator_support/tests/performance/stencil3_iterators.cpp
+++ b/libs/core/iterator_support/tests/performance/stencil3_iterators.cpp
@@ -4,11 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/local/tuple.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/timing.hpp>
+#include <hpx/tuple.hpp>
 
 #include <cstddef>
 #include <cstdint>
@@ -24,7 +24,7 @@ int test_count = 100;
 int partition_size = 10000;
 
 ///////////////////////////////////////////////////////////////////////////////
-namespace hpx { namespace experimental { namespace detail {
+namespace hpx::experimental::detail {
     template <typename Iterator>
     HPX_FORCEINLINE Iterator previous(Iterator it, std::false_type)
     {
@@ -60,11 +60,11 @@ namespace hpx { namespace experimental { namespace detail {
     {
         return next(it, hpx::traits::is_random_access_iterator<Iterator>());
     }
-}}}    // namespace hpx::experimental::detail
+}    // namespace hpx::experimental::detail
 
 ///////////////////////////////////////////////////////////////////////////////
 // Version of stencil3_iterator which handles boundary elements internally
-namespace hpx { namespace experimental {
+namespace hpx::experimental {
     ///////////////////////////////////////////////////////////////////////////
     template <typename Iterator, typename IterBegin = Iterator,
         typename IterValueBegin = Iterator, typename IterEnd = IterBegin,
@@ -255,7 +255,7 @@ namespace hpx { namespace experimental {
             begin, begin, begin_val, detail::previous(end), end_val);
         return std::make_pair(b, make_stencil3_full_iterator<decltype(b)>(end));
     }
-}}    // namespace hpx::experimental
+}    // namespace hpx::experimental
 
 std::uint64_t bench_stencil3_iterator_full()
 {
@@ -281,7 +281,7 @@ std::uint64_t bench_stencil3_iterator_full()
 
 ///////////////////////////////////////////////////////////////////////////////
 // compare with unchecked stencil3_iterator (version 1)
-namespace hpx { namespace experimental {
+namespace hpx::experimental {
     template <typename Iterator>
     class stencil3_iterator_v1
       : public util::detail::zip_iterator_base<
@@ -328,7 +328,7 @@ namespace hpx { namespace experimental {
         return std::make_pair(
             make_stencil3_iterator_v1(begin), make_stencil3_iterator_v1(end));
     }
-}}    // namespace hpx::experimental
+}    // namespace hpx::experimental
 
 std::uint64_t bench_stencil3_iterator_v1()
 {
@@ -358,7 +358,7 @@ std::uint64_t bench_stencil3_iterator_v1()
 
 ///////////////////////////////////////////////////////////////////////////////
 // compare with unchecked stencil3_iterator (version 2)
-namespace hpx { namespace experimental {
+namespace hpx::experimental {
     namespace detail {
         struct stencil_transformer_v2
         {
@@ -437,7 +437,7 @@ namespace hpx { namespace experimental {
         return std::make_pair(
             make_stencil3_iterator_v2(begin), make_stencil3_iterator_v2(end));
     }
-}}    // namespace hpx::experimental
+}    // namespace hpx::experimental
 
 std::uint64_t bench_stencil3_iterator_v2()
 {
diff --git a/libs/core/iterator_support/tests/unit/counting_iterator.cpp b/libs/core/iterator_support/tests/unit/counting_iterator.cpp
index 8484fc410f15..9a6d09c27dc1 100644
--- a/libs/core/iterator_support/tests/unit/counting_iterator.cpp
+++ b/libs/core/iterator_support/tests/unit/counting_iterator.cpp
@@ -7,11 +7,11 @@
 //  This code is based on boost::iterators::counting_iterator
 // (C) Copyright David Abrahams 2001.
 
+#include <hpx/init.hpp>
 #include <hpx/iterator_support/tests/iterator_tests.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
-#include <hpx/modules/program_options.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/program_options.hpp>
 
 #include <algorithm>
 #include <climits>
diff --git a/libs/core/iterator_support/tests/unit/stencil3_iterator.cpp b/libs/core/iterator_support/tests/unit/stencil3_iterator.cpp
index f2d7e91d574a..8da3da4c1cef 100644
--- a/libs/core/iterator_support/tests/unit/stencil3_iterator.cpp
+++ b/libs/core/iterator_support/tests/unit/stencil3_iterator.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/local/tuple.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/tuple.hpp>
 
 #include <iterator>
 #include <numeric>
diff --git a/libs/core/iterator_support/tests/unit/transform_iterator.cpp b/libs/core/iterator_support/tests/unit/transform_iterator.cpp
index 2ccd7274f745..cf7161226875 100644
--- a/libs/core/iterator_support/tests/unit/transform_iterator.cpp
+++ b/libs/core/iterator_support/tests/unit/transform_iterator.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/lcos_local/include/hpx/lcos_local/channel.hpp b/libs/core/lcos_local/include/hpx/lcos_local/channel.hpp
index 56a5836d9778..a92c7a685223 100644
--- a/libs/core/lcos_local/include/hpx/lcos_local/channel.hpp
+++ b/libs/core/lcos_local/include/hpx/lcos_local/channel.hpp
@@ -1197,3 +1197,8 @@ namespace hpx::lcos::local {
     {
     }
 }    // namespace hpx::lcos::local
+
+namespace hpx {
+
+    using hpx::lcos::local::channel;
+}
diff --git a/libs/core/lcos_local/tests/regressions/safely_destroy_promise_1481.cpp b/libs/core/lcos_local/tests/regressions/safely_destroy_promise_1481.cpp
index 69249a93bfe0..9d9f734e4bfe 100644
--- a/libs/core/lcos_local/tests/regressions/safely_destroy_promise_1481.cpp
+++ b/libs/core/lcos_local/tests/regressions/safely_destroy_promise_1481.cpp
@@ -7,10 +7,10 @@
 // This test case demonstrates the issue described in #1481:
 // Sync primitives safe destruction
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 
diff --git a/libs/core/lcos_local/tests/unit/channel_local.cpp b/libs/core/lcos_local/tests/unit/channel_local.cpp
index 7fb243b87ad6..96e7582b268f 100644
--- a/libs/core/lcos_local/tests/unit/channel_local.cpp
+++ b/libs/core/lcos_local/tests/unit/channel_local.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <atomic>
diff --git a/libs/core/lcos_local/tests/unit/local_dataflow.cpp b/libs/core/lcos_local/tests/unit/local_dataflow.cpp
index 6d0feb7f196e..080bb92fd2f8 100644
--- a/libs/core/lcos_local/tests/unit/local_dataflow.cpp
+++ b/libs/core/lcos_local/tests/unit/local_dataflow.cpp
@@ -4,11 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/pack_traversal/unwrap.hpp>
+#include <hpx/thread.hpp>
+#include <hpx/unwrap.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/lcos_local/tests/unit/local_dataflow_executor.cpp b/libs/core/lcos_local/tests/unit/local_dataflow_executor.cpp
index 240d7e94728c..217feab66a84 100644
--- a/libs/core/lcos_local/tests/unit/local_dataflow_executor.cpp
+++ b/libs/core/lcos_local/tests/unit/local_dataflow_executor.cpp
@@ -5,12 +5,12 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/pack_traversal/unwrap.hpp>
+#include <hpx/thread.hpp>
+#include <hpx/unwrap.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/lcos_local/tests/unit/local_dataflow_executor_additional_arguments.cpp b/libs/core/lcos_local/tests/unit/local_dataflow_executor_additional_arguments.cpp
index 1cf2fe54f881..df85939852b1 100644
--- a/libs/core/lcos_local/tests/unit/local_dataflow_executor_additional_arguments.cpp
+++ b/libs/core/lcos_local/tests/unit/local_dataflow_executor_additional_arguments.cpp
@@ -6,13 +6,13 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/pack_traversal/unwrap.hpp>
 #include <hpx/program_options.hpp>
+#include <hpx/thread.hpp>
+#include <hpx/unwrap.hpp>
 
 #include <atomic>
 #include <cstddef>
@@ -67,7 +67,7 @@ struct additional_argument_executor
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_one_way_executor<additional_argument_executor> : std::true_type
     {
@@ -77,7 +77,7 @@ namespace hpx { namespace parallel { namespace execution {
     struct is_two_way_executor<additional_argument_executor> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 std::atomic<std::uint32_t> void_f_count;
 std::atomic<std::uint32_t> int_f_count;
diff --git a/libs/core/lcos_local/tests/unit/local_dataflow_external_future.cpp b/libs/core/lcos_local/tests/unit/local_dataflow_external_future.cpp
index 88f3de96c72a..4fb6cde327a6 100644
--- a/libs/core/lcos_local/tests/unit/local_dataflow_external_future.cpp
+++ b/libs/core/lcos_local/tests/unit/local_dataflow_external_future.cpp
@@ -6,16 +6,16 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/errors/try_catch_exception_ptr.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/functional.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/tuple.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/modules/errors.hpp>
 #include <hpx/modules/memory.hpp>
 #include <hpx/modules/testing.hpp>
 #include <hpx/program_options.hpp>
+#include <hpx/tuple.hpp>
 
 #include <atomic>
 #include <cstddef>
@@ -183,7 +183,7 @@ struct external_future_additional_argument_executor
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_two_way_executor<external_future_executor> : std::true_type
     {
@@ -194,7 +194,7 @@ namespace hpx { namespace parallel { namespace execution {
       : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 int hpx_main()
 {
diff --git a/libs/core/lcos_local/tests/unit/local_dataflow_small_vector.cpp b/libs/core/lcos_local/tests/unit/local_dataflow_small_vector.cpp
index 763cba0815af..7fa7b850348b 100644
--- a/libs/core/lcos_local/tests/unit/local_dataflow_small_vector.cpp
+++ b/libs/core/lcos_local/tests/unit/local_dataflow_small_vector.cpp
@@ -6,11 +6,11 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <hpx/datastructures/detail/small_vector.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/pack_traversal/unwrap.hpp>
+#include <hpx/thread.hpp>
+#include <hpx/unwrap.hpp>
 
 #include <atomic>
 #include <cstddef>
@@ -22,7 +22,7 @@
 #include <vector>
 
 ///////////////////////////////////////////////////////////////////////////////
-namespace hpx { namespace traits {
+namespace hpx::traits {
 
     // support unwrapping of hpx::detail::small_vector
     template <typename NewType, typename OldType, std::size_t Size,
@@ -41,7 +41,7 @@ namespace hpx { namespace traits {
             return hpx::detail::small_vector<NewType, Size, NewAllocator>();
         }
     };
-}}    // namespace hpx::traits
+}    // namespace hpx::traits
 
 template <typename T>
 using small_vector =
diff --git a/libs/core/lcos_local/tests/unit/local_dataflow_std_array.cpp b/libs/core/lcos_local/tests/unit/local_dataflow_std_array.cpp
index 28fccec75076..536aa3046a7e 100644
--- a/libs/core/lcos_local/tests/unit/local_dataflow_std_array.cpp
+++ b/libs/core/lcos_local/tests/unit/local_dataflow_std_array.cpp
@@ -4,13 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/config.hpp>
-
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/pack_traversal/unwrap.hpp>
+#include <hpx/thread.hpp>
+#include <hpx/unwrap.hpp>
 
 #include <array>
 #include <atomic>
diff --git a/libs/core/lcos_local/tests/unit/run_guarded.cpp b/libs/core/lcos_local/tests/unit/run_guarded.cpp
index 01694e88bb7c..69fef2585d36 100644
--- a/libs/core/lcos_local/tests/unit/run_guarded.cpp
+++ b/libs/core/lcos_local/tests/unit/run_guarded.cpp
@@ -3,9 +3,9 @@
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#include <hpx/functional/bind.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/init.hpp>
 #include <hpx/lcos_local/composable_guard.hpp>
-#include <hpx/local/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <atomic>
diff --git a/libs/core/lcos_local/tests/unit/split_future.cpp b/libs/core/lcos_local/tests/unit/split_future.cpp
index 610b84089aab..77a9ea58f88d 100644
--- a/libs/core/lcos_local/tests/unit/split_future.cpp
+++ b/libs/core/lcos_local/tests/unit/split_future.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <array>
 #include <chrono>
diff --git a/libs/core/logging/include/hpx/modules/logging.hpp b/libs/core/logging/include/hpx/modules/logging.hpp
index 3d438adfe43c..ad465ea00a15 100644
--- a/libs/core/logging/include/hpx/modules/logging.hpp
+++ b/libs/core/logging/include/hpx/modules/logging.hpp
@@ -233,7 +233,6 @@ template <typename T>
 bootstrap_logging const& operator<<(
     bootstrap_logging const& l, T const& t)    //-V835
 {
-    // NOLINTNEXTLINE(bugprone-branch-clone)
     LBT_(info) << t;
     LPROGRESS_ << t;
     return l;
diff --git a/libs/core/pack_traversal/tests/unit/unwrap.cpp b/libs/core/pack_traversal/tests/unit/unwrap.cpp
index 3b3ec8aa965f..c58f57e26835 100644
--- a/libs/core/pack_traversal/tests/unit/unwrap.cpp
+++ b/libs/core/pack_traversal/tests/unit/unwrap.cpp
@@ -6,12 +6,12 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
-#include <hpx/local/tuple.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/pack_traversal/unwrap.hpp>
+#include <hpx/thread.hpp>
+#include <hpx/tuple.hpp>
+#include <hpx/unwrap.hpp>
 
 #include <array>
 #include <atomic>
diff --git a/libs/core/program_options/tests/regressions/command_line_arguments_706.cpp b/libs/core/program_options/tests/regressions/command_line_arguments_706.cpp
index 75635d920125..ff5b77dd7f3c 100644
--- a/libs/core/program_options/tests/regressions/command_line_arguments_706.cpp
+++ b/libs/core/program_options/tests/regressions/command_line_arguments_706.cpp
@@ -7,7 +7,7 @@
 // verify #706 is fixed (`hpx::init` removes portions of non-option command
 // line arguments before last `=` sign)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 char const* argv[] = {"command_line_argument_test",
diff --git a/libs/core/program_options/tests/regressions/command_line_required_arguments_2990.cpp b/libs/core/program_options/tests/regressions/command_line_required_arguments_2990.cpp
index 4d6a9d1ec947..cb97583e5beb 100644
--- a/libs/core/program_options/tests/regressions/command_line_required_arguments_2990.cpp
+++ b/libs/core/program_options/tests/regressions/command_line_required_arguments_2990.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/program_options.hpp>
 
 #include <iostream>
diff --git a/libs/core/program_options/tests/regressions/commandline_options_1437.cpp b/libs/core/program_options/tests/regressions/commandline_options_1437.cpp
index 5c25700e04fa..85f89bba1966 100644
--- a/libs/core/program_options/tests/regressions/commandline_options_1437.cpp
+++ b/libs/core/program_options/tests/regressions/commandline_options_1437.cpp
@@ -6,7 +6,7 @@
 //
 // Demonstrating #1437: hpx::init() should strip HPX-related flags from argv
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 bool invoked_main = false;
diff --git a/libs/core/resiliency/examples/1d_stencil_replay_exception.cpp b/libs/core/resiliency/examples/1d_stencil_replay_exception.cpp
index 10f90b3c21af..aba258a77fdb 100644
--- a/libs/core/resiliency/examples/1d_stencil_replay_exception.cpp
+++ b/libs/core/resiliency/examples/1d_stencil_replay_exception.cpp
@@ -7,9 +7,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
-#include <hpx/modules/timing.hpp>
 
 #include <algorithm>
 #include <cmath>
diff --git a/libs/core/resiliency/examples/1d_stencil_replay_validate.cpp b/libs/core/resiliency/examples/1d_stencil_replay_validate.cpp
index 695cd1c83d77..97a93798579f 100644
--- a/libs/core/resiliency/examples/1d_stencil_replay_validate.cpp
+++ b/libs/core/resiliency/examples/1d_stencil_replay_validate.cpp
@@ -7,9 +7,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
-#include <hpx/modules/timing.hpp>
 
 #include <algorithm>
 #include <cmath>
diff --git a/libs/core/resiliency/examples/async_replay.cpp b/libs/core/resiliency/examples/async_replay.cpp
index f8aef221f46b..f2a947731af6 100644
--- a/libs/core/resiliency/examples/async_replay.cpp
+++ b/libs/core/resiliency/examples/async_replay.cpp
@@ -8,11 +8,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/modules/format.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/format.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
-#include <hpx/modules/timing.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/resiliency/examples/async_replicate.cpp b/libs/core/resiliency/examples/async_replicate.cpp
index 1e38404586a5..1af8285d5c96 100644
--- a/libs/core/resiliency/examples/async_replicate.cpp
+++ b/libs/core/resiliency/examples/async_replicate.cpp
@@ -8,9 +8,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
-#include <hpx/modules/timing.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/resiliency/examples/async_replicate_vote.cpp b/libs/core/resiliency/examples/async_replicate_vote.cpp
index d65922c334cc..adff96421ac9 100644
--- a/libs/core/resiliency/examples/async_replicate_vote.cpp
+++ b/libs/core/resiliency/examples/async_replicate_vote.cpp
@@ -6,10 +6,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
-#include <hpx/modules/timing.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/resiliency/examples/dataflow_replicate.cpp b/libs/core/resiliency/examples/dataflow_replicate.cpp
index 9dcb6adee032..6c85bd300301 100644
--- a/libs/core/resiliency/examples/dataflow_replicate.cpp
+++ b/libs/core/resiliency/examples/dataflow_replicate.cpp
@@ -8,7 +8,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
 
 #include <atomic>
diff --git a/libs/core/resiliency/examples/version.cpp b/libs/core/resiliency/examples/version.cpp
index bca069ff9202..19b4f4c8239c 100644
--- a/libs/core/resiliency/examples/version.cpp
+++ b/libs/core/resiliency/examples/version.cpp
@@ -6,7 +6,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/resiliency/tests/performance/replay/1d_stencil.cpp b/libs/core/resiliency/tests/performance/replay/1d_stencil.cpp
index d2a50b8de1ba..6e37da5b482b 100644
--- a/libs/core/resiliency/tests/performance/replay/1d_stencil.cpp
+++ b/libs/core/resiliency/tests/performance/replay/1d_stencil.cpp
@@ -18,9 +18,8 @@
 // computation. This example is still fully local but demonstrates nice
 // scalability on SMP machines.
 
-#include <hpx/local/init.hpp>
-
-#include <hpx/local/algorithm.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/synchronization.hpp>
 
diff --git a/libs/core/resiliency/tests/performance/replay/1d_stencil_checksum.cpp b/libs/core/resiliency/tests/performance/replay/1d_stencil_checksum.cpp
index 35ae3a581a60..c67de2cf4d64 100644
--- a/libs/core/resiliency/tests/performance/replay/1d_stencil_checksum.cpp
+++ b/libs/core/resiliency/tests/performance/replay/1d_stencil_checksum.cpp
@@ -18,8 +18,8 @@
 // computation. This example is still fully local but demonstrates nice
 // scalability on SMP machines.
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/resiliency.hpp>
 #include <hpx/modules/synchronization.hpp>
diff --git a/libs/core/resiliency/tests/performance/replay/1d_stencil_replay.cpp b/libs/core/resiliency/tests/performance/replay/1d_stencil_replay.cpp
index 91add6ea37a6..48438b63079b 100644
--- a/libs/core/resiliency/tests/performance/replay/1d_stencil_replay.cpp
+++ b/libs/core/resiliency/tests/performance/replay/1d_stencil_replay.cpp
@@ -18,8 +18,8 @@
 // computation. This example is still fully local but demonstrates nice
 // scalability on SMP machines.
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/resiliency.hpp>
 #include <hpx/modules/synchronization.hpp>
diff --git a/libs/core/resiliency/tests/performance/replay/async_replay.cpp b/libs/core/resiliency/tests/performance/replay/async_replay.cpp
index 7015b0da6c08..baab05d615f7 100644
--- a/libs/core/resiliency/tests/performance/replay/async_replay.cpp
+++ b/libs/core/resiliency/tests/performance/replay/async_replay.cpp
@@ -6,10 +6,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
-#include <hpx/modules/timing.hpp>
 
 #include <atomic>
 #include <cstdint>
diff --git a/libs/core/resiliency/tests/performance/replay/async_replay_validate.cpp b/libs/core/resiliency/tests/performance/replay/async_replay_validate.cpp
index 47805bda328b..3b4815911f95 100644
--- a/libs/core/resiliency/tests/performance/replay/async_replay_validate.cpp
+++ b/libs/core/resiliency/tests/performance/replay/async_replay_validate.cpp
@@ -6,10 +6,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
-#include <hpx/modules/timing.hpp>
 
 #include <atomic>
 #include <cstdint>
diff --git a/libs/core/resiliency/tests/performance/replay/dataflow_replay.cpp b/libs/core/resiliency/tests/performance/replay/dataflow_replay.cpp
index 18cde504fa1a..b489745bc4d5 100644
--- a/libs/core/resiliency/tests/performance/replay/dataflow_replay.cpp
+++ b/libs/core/resiliency/tests/performance/replay/dataflow_replay.cpp
@@ -18,8 +18,8 @@
 // computation. This example is still fully local but demonstrates nice
 // scalability on SMP machines.
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/resiliency.hpp>
 #include <hpx/modules/synchronization.hpp>
diff --git a/libs/core/resiliency/tests/performance/replay/dataflow_replay_validate.cpp b/libs/core/resiliency/tests/performance/replay/dataflow_replay_validate.cpp
index 3cf3eef60adb..a8746218ed18 100644
--- a/libs/core/resiliency/tests/performance/replay/dataflow_replay_validate.cpp
+++ b/libs/core/resiliency/tests/performance/replay/dataflow_replay_validate.cpp
@@ -18,8 +18,8 @@
 // computation. This example is still fully local but demonstrates nice
 // scalability on SMP machines.
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/resiliency.hpp>
 #include <hpx/modules/synchronization.hpp>
diff --git a/libs/core/resiliency/tests/performance/replay/pure_async_for_replay.cpp b/libs/core/resiliency/tests/performance/replay/pure_async_for_replay.cpp
index 5b426b8f2b42..9fcc31baac65 100644
--- a/libs/core/resiliency/tests/performance/replay/pure_async_for_replay.cpp
+++ b/libs/core/resiliency/tests/performance/replay/pure_async_for_replay.cpp
@@ -6,10 +6,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
-#include <hpx/modules/timing.hpp>
 
 #include <atomic>
 #include <cstdint>
diff --git a/libs/core/resiliency/tests/performance/replay/pure_dataflow.cpp b/libs/core/resiliency/tests/performance/replay/pure_dataflow.cpp
index 3177ff3e9f54..8c59a48645f2 100644
--- a/libs/core/resiliency/tests/performance/replay/pure_dataflow.cpp
+++ b/libs/core/resiliency/tests/performance/replay/pure_dataflow.cpp
@@ -18,10 +18,10 @@
 // computation. This example is still fully local but demonstrates nice
 // scalability on SMP machines.
 
+#include <hpx/algorithm.hpp>
 #include <hpx/assert.hpp>
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/synchronization.hpp>
 
diff --git a/libs/core/resiliency/tests/performance/replicate/1d_stencil_replicate.cpp b/libs/core/resiliency/tests/performance/replicate/1d_stencil_replicate.cpp
index d24275dbbb3d..a3633a478c69 100644
--- a/libs/core/resiliency/tests/performance/replicate/1d_stencil_replicate.cpp
+++ b/libs/core/resiliency/tests/performance/replicate/1d_stencil_replicate.cpp
@@ -18,8 +18,8 @@
 // computation. This example is still fully local but demonstrates nice
 // scalability on SMP machines.
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/resiliency.hpp>
 #include <hpx/modules/synchronization.hpp>
diff --git a/libs/core/resiliency/tests/performance/replicate/1d_stencil_replicate_checksum.cpp b/libs/core/resiliency/tests/performance/replicate/1d_stencil_replicate_checksum.cpp
index 4eae376beb77..76e17b837f59 100644
--- a/libs/core/resiliency/tests/performance/replicate/1d_stencil_replicate_checksum.cpp
+++ b/libs/core/resiliency/tests/performance/replicate/1d_stencil_replicate_checksum.cpp
@@ -18,8 +18,8 @@
 // computation. This example is still fully local but demonstrates nice
 // scalability on SMP machines.
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/iterator_support.hpp>
 #include <hpx/modules/resiliency.hpp>
 #include <hpx/modules/synchronization.hpp>
diff --git a/libs/core/resiliency/tests/performance/replicate/async_replicate.cpp b/libs/core/resiliency/tests/performance/replicate/async_replicate.cpp
index 694ad5887330..eb7c66b1370e 100644
--- a/libs/core/resiliency/tests/performance/replicate/async_replicate.cpp
+++ b/libs/core/resiliency/tests/performance/replicate/async_replicate.cpp
@@ -6,10 +6,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
-#include <hpx/modules/timing.hpp>
 
 #include <atomic>
 #include <cstdint>
diff --git a/libs/core/resiliency/tests/performance/replicate/async_replicate_validate.cpp b/libs/core/resiliency/tests/performance/replicate/async_replicate_validate.cpp
index fbead3b269f1..121f468c48da 100644
--- a/libs/core/resiliency/tests/performance/replicate/async_replicate_validate.cpp
+++ b/libs/core/resiliency/tests/performance/replicate/async_replicate_validate.cpp
@@ -6,10 +6,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
-#include <hpx/modules/timing.hpp>
 
 #include <atomic>
 #include <cstdint>
diff --git a/libs/core/resiliency/tests/performance/replicate/async_replicate_vote.cpp b/libs/core/resiliency/tests/performance/replicate/async_replicate_vote.cpp
index 002bcd6da3ac..850dd928bf31 100644
--- a/libs/core/resiliency/tests/performance/replicate/async_replicate_vote.cpp
+++ b/libs/core/resiliency/tests/performance/replicate/async_replicate_vote.cpp
@@ -6,10 +6,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
-#include <hpx/modules/timing.hpp>
 
 #include <atomic>
 #include <cstdint>
diff --git a/libs/core/resiliency/tests/performance/replicate/async_replicate_vote_validate.cpp b/libs/core/resiliency/tests/performance/replicate/async_replicate_vote_validate.cpp
index da64c9495760..b5d702d01bf2 100644
--- a/libs/core/resiliency/tests/performance/replicate/async_replicate_vote_validate.cpp
+++ b/libs/core/resiliency/tests/performance/replicate/async_replicate_vote_validate.cpp
@@ -6,10 +6,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
-#include <hpx/modules/timing.hpp>
 
 #include <atomic>
 #include <cstdint>
diff --git a/libs/core/resiliency/tests/performance/replicate/pure_async_for_replicate.cpp b/libs/core/resiliency/tests/performance/replicate/pure_async_for_replicate.cpp
index 18602a531ad3..dbe7bca883e2 100644
--- a/libs/core/resiliency/tests/performance/replicate/pure_async_for_replicate.cpp
+++ b/libs/core/resiliency/tests/performance/replicate/pure_async_for_replicate.cpp
@@ -6,10 +6,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
-#include <hpx/modules/timing.hpp>
 
 #include <atomic>
 #include <cstdint>
diff --git a/libs/core/resiliency/tests/unit/async_replay_executor.cpp b/libs/core/resiliency/tests/unit/async_replay_executor.cpp
index 895fed6f6cbf..a2251dbc903d 100644
--- a/libs/core/resiliency/tests/unit/async_replay_executor.cpp
+++ b/libs/core/resiliency/tests/unit/async_replay_executor.cpp
@@ -8,9 +8,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/execution.hpp>
-#include <hpx/modules/futures.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/resiliency/tests/unit/async_replay_plain.cpp b/libs/core/resiliency/tests/unit/async_replay_plain.cpp
index 5f805708c61f..55c7ae6e4b27 100644
--- a/libs/core/resiliency/tests/unit/async_replay_plain.cpp
+++ b/libs/core/resiliency/tests/unit/async_replay_plain.cpp
@@ -8,8 +8,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/futures.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/resiliency/tests/unit/async_replicate_executor.cpp b/libs/core/resiliency/tests/unit/async_replicate_executor.cpp
index e2f04797035c..56067381be94 100644
--- a/libs/core/resiliency/tests/unit/async_replicate_executor.cpp
+++ b/libs/core/resiliency/tests/unit/async_replicate_executor.cpp
@@ -8,9 +8,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/execution.hpp>
-#include <hpx/modules/futures.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/resiliency/tests/unit/async_replicate_plain.cpp b/libs/core/resiliency/tests/unit/async_replicate_plain.cpp
index 1f64d83b2f7f..7a3e18b9c6e7 100644
--- a/libs/core/resiliency/tests/unit/async_replicate_plain.cpp
+++ b/libs/core/resiliency/tests/unit/async_replicate_plain.cpp
@@ -8,8 +8,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/futures.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/resiliency/tests/unit/async_replicate_vote_executor.cpp b/libs/core/resiliency/tests/unit/async_replicate_vote_executor.cpp
index b0331b4a432c..8da74b2a0b1c 100644
--- a/libs/core/resiliency/tests/unit/async_replicate_vote_executor.cpp
+++ b/libs/core/resiliency/tests/unit/async_replicate_vote_executor.cpp
@@ -7,9 +7,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/execution.hpp>
-#include <hpx/modules/futures.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/resiliency/tests/unit/async_replicate_vote_plain.cpp b/libs/core/resiliency/tests/unit/async_replicate_vote_plain.cpp
index 950e8f3ff24b..435a72d199df 100644
--- a/libs/core/resiliency/tests/unit/async_replicate_vote_plain.cpp
+++ b/libs/core/resiliency/tests/unit/async_replicate_vote_plain.cpp
@@ -7,8 +7,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/futures.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/resiliency/tests/unit/dataflow_replay_executor.cpp b/libs/core/resiliency/tests/unit/dataflow_replay_executor.cpp
index 6148e691d707..b4502b0b0ff5 100644
--- a/libs/core/resiliency/tests/unit/dataflow_replay_executor.cpp
+++ b/libs/core/resiliency/tests/unit/dataflow_replay_executor.cpp
@@ -8,9 +8,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/execution.hpp>
-#include <hpx/modules/futures.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/resiliency/tests/unit/dataflow_replay_plain.cpp b/libs/core/resiliency/tests/unit/dataflow_replay_plain.cpp
index 6cd8e92ff557..84e5598368ce 100644
--- a/libs/core/resiliency/tests/unit/dataflow_replay_plain.cpp
+++ b/libs/core/resiliency/tests/unit/dataflow_replay_plain.cpp
@@ -8,8 +8,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/futures.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/resiliency/tests/unit/dataflow_replicate_executor.cpp b/libs/core/resiliency/tests/unit/dataflow_replicate_executor.cpp
index 1fde2d7c7afa..28ba0a254fae 100644
--- a/libs/core/resiliency/tests/unit/dataflow_replicate_executor.cpp
+++ b/libs/core/resiliency/tests/unit/dataflow_replicate_executor.cpp
@@ -8,9 +8,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/execution.hpp>
-#include <hpx/modules/futures.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/resiliency/tests/unit/dataflow_replicate_plain.cpp b/libs/core/resiliency/tests/unit/dataflow_replicate_plain.cpp
index b0fb8e657df7..7a75fa6ee265 100644
--- a/libs/core/resiliency/tests/unit/dataflow_replicate_plain.cpp
+++ b/libs/core/resiliency/tests/unit/dataflow_replicate_plain.cpp
@@ -8,8 +8,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/futures.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/resiliency/tests/unit/replay_executor.cpp b/libs/core/resiliency/tests/unit/replay_executor.cpp
index 3da4943a7a57..52670db6a2c9 100644
--- a/libs/core/resiliency/tests/unit/replay_executor.cpp
+++ b/libs/core/resiliency/tests/unit/replay_executor.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/resiliency/tests/unit/replicate_executor.cpp b/libs/core/resiliency/tests/unit/replicate_executor.cpp
index 3eb96f63340e..48a81d64b01c 100644
--- a/libs/core/resiliency/tests/unit/replicate_executor.cpp
+++ b/libs/core/resiliency/tests/unit/replicate_executor.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resiliency.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/resource_partitioner/examples/async_customization.cpp b/libs/core/resource_partitioner/examples/async_customization.cpp
index afe7ae27738d..93269debc08c 100644
--- a/libs/core/resource_partitioner/examples/async_customization.cpp
+++ b/libs/core/resource_partitioner/examples/async_customization.cpp
@@ -7,14 +7,14 @@
 #define GUIDED_EXECUTOR_DEBUG 1
 
 #include <hpx/debugging/demangle_helper.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/functional.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/tuple.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/modules/pack_traversal.hpp>
 #include <hpx/modules/resource_partitioner.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/pack_traversal/pack_traversal.hpp>
+#include <hpx/tuple.hpp>
 
 #include <chrono>
 #include <complex>
@@ -239,12 +239,12 @@ struct test_async_executor
 // --------------------------------------------------------------------
 // set traits for executor to say it is an async executor
 // --------------------------------------------------------------------
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_two_way_executor<test_async_executor> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 template <typename T>
 T dummy_task(T val)
@@ -430,7 +430,7 @@ struct dummy_tag
 {
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct pool_numa_hint<dummy_tag>
     {
@@ -472,7 +472,7 @@ namespace hpx { namespace parallel { namespace execution {
             return 4;
         }
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 int hpx_main()
 {
diff --git a/libs/core/resource_partitioner/examples/guided_pool_test.cpp b/libs/core/resource_partitioner/examples/guided_pool_test.cpp
index 38e744ab9ad8..d97328d26252 100644
--- a/libs/core/resource_partitioner/examples/guided_pool_test.cpp
+++ b/libs/core/resource_partitioner/examples/guided_pool_test.cpp
@@ -4,13 +4,13 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/runtime.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resource_partitioner.hpp>
 #include <hpx/modules/schedulers.hpp>
+#include <hpx/runtime.hpp>
+#include <hpx/thread.hpp>
 
 #include <cmath>
 #include <cstddef>
@@ -71,7 +71,7 @@ std::string a_function(hpx::future<double>&& df)
     return "The number 2";
 }
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
 
     struct guided_test_tag
     {
@@ -118,7 +118,7 @@ namespace hpx { namespace parallel { namespace execution {
             return 56;
         }
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 using namespace hpx::parallel::execution;
 
diff --git a/libs/core/resource_partitioner/examples/oversubscribing_resource_partitioner.cpp b/libs/core/resource_partitioner/examples/oversubscribing_resource_partitioner.cpp
index 1eb89598c506..93b905138b80 100644
--- a/libs/core/resource_partitioner/examples/oversubscribing_resource_partitioner.cpp
+++ b/libs/core/resource_partitioner/examples/oversubscribing_resource_partitioner.cpp
@@ -6,13 +6,13 @@
 
 #include <hpx/config.hpp>
 #if !defined(HPX_COMPUTE_DEVICE_CODE)
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/runtime.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resource_partitioner.hpp>
 #include <hpx/modules/schedulers.hpp>
+#include <hpx/runtime.hpp>
+#include <hpx/thread.hpp>
 //
 #include <cmath>
 #include <cstddef>
@@ -28,7 +28,7 @@
 // NB
 // this test needs to be updated as it no longer does what it is supposed to do
 
-namespace resource { namespace pools {
+namespace resource::pools {
     enum ids
     {
         DEFAULT = 0,
@@ -36,7 +36,7 @@ namespace resource { namespace pools {
         GPU = 2,
         MATRIX = 3,
     };
-}}    // namespace resource::pools
+}    // namespace resource::pools
 
 static bool use_pools = false;
 static int pool_threads = 1;
diff --git a/libs/core/resource_partitioner/examples/simple_resource_partitioner.cpp b/libs/core/resource_partitioner/examples/simple_resource_partitioner.cpp
index e2885caad324..a963cfcf34e6 100644
--- a/libs/core/resource_partitioner/examples/simple_resource_partitioner.cpp
+++ b/libs/core/resource_partitioner/examples/simple_resource_partitioner.cpp
@@ -7,13 +7,13 @@
 
 #include <hpx/config.hpp>
 #if !defined(HPX_COMPUTE_DEVICE_CODE)
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/runtime.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resource_partitioner.hpp>
 #include <hpx/modules/thread_pools.hpp>
 #include <hpx/modules/topology.hpp>
+#include <hpx/runtime.hpp>
 
 #include <cmath>
 #include <cstddef>
diff --git a/libs/core/resource_partitioner/examples/simplest_resource_partitioner_1.cpp b/libs/core/resource_partitioner/examples/simplest_resource_partitioner_1.cpp
index 79047cc5c3ed..83414345a7dd 100644
--- a/libs/core/resource_partitioner/examples/simplest_resource_partitioner_1.cpp
+++ b/libs/core/resource_partitioner/examples/simplest_resource_partitioner_1.cpp
@@ -8,7 +8,7 @@
 // intended for inclusion in the documentation.
 
 //[body
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 
 int hpx_main()
 {
diff --git a/libs/core/resource_partitioner/examples/simplest_resource_partitioner_2.cpp b/libs/core/resource_partitioner/examples/simplest_resource_partitioner_2.cpp
index 587f3ca79457..d66557cc12e2 100644
--- a/libs/core/resource_partitioner/examples/simplest_resource_partitioner_2.cpp
+++ b/libs/core/resource_partitioner/examples/simplest_resource_partitioner_2.cpp
@@ -9,7 +9,7 @@
 // intended for inclusion in the documentation.
 
 //[body
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resource_partitioner.hpp>
 
 #include <iostream>
diff --git a/libs/core/resource_partitioner/examples/system_characteristics.hpp b/libs/core/resource_partitioner/examples/system_characteristics.hpp
index f4d16b0ea7f6..794ba4b40815 100644
--- a/libs/core/resource_partitioner/examples/system_characteristics.hpp
+++ b/libs/core/resource_partitioner/examples/system_characteristics.hpp
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <hpx/local/runtime.hpp>
 #include <hpx/modules/threadmanager.hpp>
+#include <hpx/runtime.hpp>
 
 #include <iostream>
 
diff --git a/libs/core/resource_partitioner/tests/regressions/help_exit_4317_1.cpp b/libs/core/resource_partitioner/tests/regressions/help_exit_4317_1.cpp
index a5421e1aca18..c8d0d3802213 100644
--- a/libs/core/resource_partitioner/tests/regressions/help_exit_4317_1.cpp
+++ b/libs/core/resource_partitioner/tests/regressions/help_exit_4317_1.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <atomic>
diff --git a/libs/core/resource_partitioner/tests/regressions/help_exit_4317_2.cpp b/libs/core/resource_partitioner/tests/regressions/help_exit_4317_2.cpp
index dd9f583c2f11..a81331c18abb 100644
--- a/libs/core/resource_partitioner/tests/regressions/help_exit_4317_2.cpp
+++ b/libs/core/resource_partitioner/tests/regressions/help_exit_4317_2.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <atomic>
diff --git a/libs/core/resource_partitioner/tests/unit/background_scheduler.cpp b/libs/core/resource_partitioner/tests/unit/background_scheduler.cpp
index 51d6a5915a56..3da2e5d48712 100644
--- a/libs/core/resource_partitioner/tests/unit/background_scheduler.cpp
+++ b/libs/core/resource_partitioner/tests/unit/background_scheduler.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resource_partitioner.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/resource_partitioner/tests/unit/cross_pool_injection.cpp b/libs/core/resource_partitioner/tests/unit/cross_pool_injection.cpp
index 73d98fcf3f2e..a8042d88fb9c 100644
--- a/libs/core/resource_partitioner/tests/unit/cross_pool_injection.cpp
+++ b/libs/core/resource_partitioner/tests/unit/cross_pool_injection.cpp
@@ -13,14 +13,14 @@
 // cross pool injection of tasks does not cause segfaults or other
 // problems such as lockups.
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/functional.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resource_partitioner.hpp>
 #include <hpx/modules/testing.hpp>
 #include <hpx/modules/threadmanager.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/resource_partitioner/tests/unit/named_pool_executor.cpp b/libs/core/resource_partitioner/tests/unit/named_pool_executor.cpp
index 9dd2e3bc7f16..49e6a0324065 100644
--- a/libs/core/resource_partitioner/tests/unit/named_pool_executor.cpp
+++ b/libs/core/resource_partitioner/tests/unit/named_pool_executor.cpp
@@ -8,12 +8,12 @@
 // pool and executor
 
 #include <hpx/assert.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resource_partitioner.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/resource_partitioner/tests/unit/resource_partitioner_info.cpp b/libs/core/resource_partitioner/tests/unit/resource_partitioner_info.cpp
index 5a3aa4fe994b..2672fbb1f470 100644
--- a/libs/core/resource_partitioner/tests/unit/resource_partitioner_info.cpp
+++ b/libs/core/resource_partitioner/tests/unit/resource_partitioner_info.cpp
@@ -7,10 +7,10 @@
 // Simple test verifying basic resource_partitioner functionality.
 
 #include <hpx/assert.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resource_partitioner.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <string>
diff --git a/libs/core/resource_partitioner/tests/unit/scheduler_binding_check.cpp b/libs/core/resource_partitioner/tests/unit/scheduler_binding_check.cpp
index ddc019634b79..1db907303f7e 100644
--- a/libs/core/resource_partitioner/tests/unit/scheduler_binding_check.cpp
+++ b/libs/core/resource_partitioner/tests/unit/scheduler_binding_check.cpp
@@ -9,14 +9,14 @@
 // Tasks should always report the right core number when they run.
 
 #include <hpx/debugging/print.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/runtime.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resource_partitioner.hpp>
 #include <hpx/modules/schedulers.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/runtime.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/resource_partitioner/tests/unit/scheduler_priority_check.cpp b/libs/core/resource_partitioner/tests/unit/scheduler_priority_check.cpp
index 33bf9f54cf2b..7be77c7ebeda 100644
--- a/libs/core/resource_partitioner/tests/unit/scheduler_priority_check.cpp
+++ b/libs/core/resource_partitioner/tests/unit/scheduler_priority_check.cpp
@@ -9,13 +9,12 @@
 // The test is intended to be used with a task plotting/profiling
 // tool to verify that high priority tasks run before low ones.
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 #include <hpx/program_options.hpp>
-#include <hpx/threading_base/annotated_function.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/resource_partitioner/tests/unit/shutdown_suspended_pus.cpp b/libs/core/resource_partitioner/tests/unit/shutdown_suspended_pus.cpp
index 90ee9d6bcadd..fa1bafbad5f3 100644
--- a/libs/core/resource_partitioner/tests/unit/shutdown_suspended_pus.cpp
+++ b/libs/core/resource_partitioner/tests/unit/shutdown_suspended_pus.cpp
@@ -7,14 +7,14 @@
 // Simple test verifying basic resource_partitioner functionality.
 
 #include <hpx/assert.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resource_partitioner.hpp>
 #include <hpx/modules/schedulers.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/thread_pool_util/thread_pool_suspension_helpers.hpp>
-#include <hpx/threading_base/scheduler_mode.hpp>
+#include <hpx/modules/thread_pool_util.hpp>
+#include <hpx/modules/threading_base.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <memory>
diff --git a/libs/core/resource_partitioner/tests/unit/suspend_disabled.cpp b/libs/core/resource_partitioner/tests/unit/suspend_disabled.cpp
index 2b79323e79ad..6a5d428c54ac 100644
--- a/libs/core/resource_partitioner/tests/unit/suspend_disabled.cpp
+++ b/libs/core/resource_partitioner/tests/unit/suspend_disabled.cpp
@@ -6,11 +6,11 @@
 
 // Simple test verifying basic resource_partitioner functionality.
 
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resource_partitioner.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/thread_pool_util/thread_pool_suspension_helpers.hpp>
+#include <hpx/modules/thread_pool_util.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <stdexcept>
diff --git a/libs/core/resource_partitioner/tests/unit/suspend_pool.cpp b/libs/core/resource_partitioner/tests/unit/suspend_pool.cpp
index e3f019fd4303..d8dec3d78922 100644
--- a/libs/core/resource_partitioner/tests/unit/suspend_pool.cpp
+++ b/libs/core/resource_partitioner/tests/unit/suspend_pool.cpp
@@ -7,19 +7,17 @@
 // Simple test verifying basic resource_partitioner functionality.
 
 #include <hpx/assert.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/semaphore.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resource_partitioner.hpp>
 #include <hpx/modules/schedulers.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/modules/thread_pool_util.hpp>
 #include <hpx/modules/threadmanager.hpp>
-#include <hpx/thread_pool_util/thread_pool_suspension_helpers.hpp>
-#include <hpx/threading_base/scheduler_mode.hpp>
-#include <hpx/threading_base/thread_helpers.hpp>
+#include <hpx/semaphore.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/resource_partitioner/tests/unit/suspend_pool_external.cpp b/libs/core/resource_partitioner/tests/unit/suspend_pool_external.cpp
index 118f18c47b1d..4eea2224c9e9 100644
--- a/libs/core/resource_partitioner/tests/unit/suspend_pool_external.cpp
+++ b/libs/core/resource_partitioner/tests/unit/suspend_pool_external.cpp
@@ -6,17 +6,15 @@
 
 // Simple test verifying basic resource_partitioner functionality.
 
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/schedulers.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/modules/thread_pool_util.hpp>
 #include <hpx/modules/threadmanager.hpp>
-#include <hpx/thread_pool_util/thread_pool_suspension_helpers.hpp>
-#include <hpx/threading_base/scheduler_mode.hpp>
-#include <hpx/threading_base/thread_helpers.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/resource_partitioner/tests/unit/suspend_runtime.cpp b/libs/core/resource_partitioner/tests/unit/suspend_runtime.cpp
index eb61ef64ace7..a52aa344bb90 100644
--- a/libs/core/resource_partitioner/tests/unit/suspend_runtime.cpp
+++ b/libs/core/resource_partitioner/tests/unit/suspend_runtime.cpp
@@ -6,13 +6,13 @@
 
 // Simple test verifying basic resource_partitioner functionality.
 
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/runtime.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 #include <hpx/modules/threadmanager.hpp>
+#include <hpx/runtime.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <string>
diff --git a/libs/core/resource_partitioner/tests/unit/suspend_thread.cpp b/libs/core/resource_partitioner/tests/unit/suspend_thread.cpp
index f1207d130a37..694cc31be2ea 100644
--- a/libs/core/resource_partitioner/tests/unit/suspend_thread.cpp
+++ b/libs/core/resource_partitioner/tests/unit/suspend_thread.cpp
@@ -7,15 +7,14 @@
 // Simple test verifying basic resource_partitioner functionality.
 
 #include <hpx/assert.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resource_partitioner.hpp>
 #include <hpx/modules/schedulers.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/thread_pool_util/thread_pool_suspension_helpers.hpp>
-#include <hpx/threading_base/scheduler_mode.hpp>
+#include <hpx/modules/thread_pool_util.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <memory>
diff --git a/libs/core/resource_partitioner/tests/unit/suspend_thread_external.cpp b/libs/core/resource_partitioner/tests/unit/suspend_thread_external.cpp
index 4248b3c6f084..0d1c97a020a9 100644
--- a/libs/core/resource_partitioner/tests/unit/suspend_thread_external.cpp
+++ b/libs/core/resource_partitioner/tests/unit/suspend_thread_external.cpp
@@ -7,15 +7,14 @@
 // Simple test verifying basic resource_partitioner functionality.
 
 #include <hpx/assert.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resource_partitioner.hpp>
 #include <hpx/modules/schedulers.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/thread_pool_util/thread_pool_suspension_helpers.hpp>
-#include <hpx/threading_base/scheduler_mode.hpp>
+#include <hpx/modules/thread_pool_util.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <memory>
diff --git a/libs/core/resource_partitioner/tests/unit/suspend_thread_timed.cpp b/libs/core/resource_partitioner/tests/unit/suspend_thread_timed.cpp
index 64baeea26c8c..e82a8e268b98 100644
--- a/libs/core/resource_partitioner/tests/unit/suspend_thread_timed.cpp
+++ b/libs/core/resource_partitioner/tests/unit/suspend_thread_timed.cpp
@@ -7,15 +7,14 @@
 // Simple test verifying basic resource_partitioner functionality.
 
 #include <hpx/assert.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resource_partitioner.hpp>
 #include <hpx/modules/schedulers.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/threading_base/scheduler_mode.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <cstddef>
diff --git a/libs/core/resource_partitioner/tests/unit/used_pus.cpp b/libs/core/resource_partitioner/tests/unit/used_pus.cpp
index 92fad8ec05f3..008dc4df7843 100644
--- a/libs/core/resource_partitioner/tests/unit/used_pus.cpp
+++ b/libs/core/resource_partitioner/tests/unit/used_pus.cpp
@@ -6,10 +6,10 @@
 
 // Simple test verifying basic resource_partitioner functionality.
 
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/resource_partitioner.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <string>
diff --git a/libs/core/runtime_local/tests/unit/thread_mapper.cpp b/libs/core/runtime_local/tests/unit/thread_mapper.cpp
index aa5d50ff8349..bb40ca5b0980 100644
--- a/libs/core/runtime_local/tests/unit/thread_mapper.cpp
+++ b/libs/core/runtime_local/tests/unit/thread_mapper.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/local/runtime.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/runtime.hpp>
 #include <hpx/util/from_string.hpp>
 
 #include <cstddef>
diff --git a/libs/core/schedulers/tests/unit/schedule_last.cpp b/libs/core/schedulers/tests/unit/schedule_last.cpp
index 646aac98ee36..9f53cdf57174 100644
--- a/libs/core/schedulers/tests/unit/schedule_last.cpp
+++ b/libs/core/schedulers/tests/unit/schedule_last.cpp
@@ -4,12 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/schedulers.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/threading_base/scheduler_mode.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <memory>
diff --git a/libs/core/serialization/include/hpx/serialization/array.hpp b/libs/core/serialization/include/hpx/serialization/array.hpp
index 542c95c3c920..5e74c38a2340 100644
--- a/libs/core/serialization/include/hpx/serialization/array.hpp
+++ b/libs/core/serialization/include/hpx/serialization/array.hpp
@@ -54,7 +54,6 @@ namespace hpx::serialization {
         void serialize(Archive& ar, unsigned int)
         {
 #if !defined(HPX_SERIALIZATION_HAVE_ALL_TYPES_ARE_BITWISE_SERIALIZABLE)
-            // NOLINTNEXTLINE(bugprone-branch-clone)
             if (ar.disable_array_optimization() || ar.endianess_differs())
             {
                 // normal serialization
diff --git a/libs/core/serialization/tests/regressions/buffer_overrun_2839.cpp b/libs/core/serialization/tests/regressions/buffer_overrun_2839.cpp
index f838c6359442..79f4209a096b 100644
--- a/libs/core/serialization/tests/regressions/buffer_overrun_2839.cpp
+++ b/libs/core/serialization/tests/regressions/buffer_overrun_2839.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 #include <hpx/serialization/complex.hpp>
 #include <hpx/serialization/vector.hpp>
diff --git a/libs/core/serialization/tests/regressions/non_default_constructible_5886.cpp b/libs/core/serialization/tests/regressions/non_default_constructible_5886.cpp
index 143385bc014a..da5f71ce29a4 100644
--- a/libs/core/serialization/tests/regressions/non_default_constructible_5886.cpp
+++ b/libs/core/serialization/tests/regressions/non_default_constructible_5886.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/serialization.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/serialization/tests/regressions/not_bitwise_shared_ptr_serialization.cpp b/libs/core/serialization/tests/regressions/not_bitwise_shared_ptr_serialization.cpp
index e0beeb06c3f7..ef86215c5092 100644
--- a/libs/core/serialization/tests/regressions/not_bitwise_shared_ptr_serialization.cpp
+++ b/libs/core/serialization/tests/regressions/not_bitwise_shared_ptr_serialization.cpp
@@ -11,7 +11,7 @@
 #define HPX_SERIALIZATION_HAVE_ALLOW_RAW_POINTER_SERIALIZATION
 
 #include <hpx/config.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/serialization.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/serialization/tests/unit/serialization_raw_pointer.cpp b/libs/core/serialization/tests/unit/serialization_raw_pointer.cpp
index 37b102969c2a..de4ea643b03b 100644
--- a/libs/core/serialization/tests/unit/serialization_raw_pointer.cpp
+++ b/libs/core/serialization/tests/unit/serialization_raw_pointer.cpp
@@ -11,7 +11,7 @@
 #define HPX_SERIALIZATION_HAVE_ALLOW_CONST_TUPLE_MEMBERS
 
 #include <hpx/config.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/serialization/input_archive.hpp>
 #include <hpx/serialization/output_archive.hpp>
 #include <hpx/serialization/serialize.hpp>
diff --git a/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp b/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp
index ed7519cd8e31..3058bd06b5fb 100644
--- a/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp
+++ b/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp
@@ -11,7 +11,7 @@
 #include <hpx/assert.hpp>
 #include <hpx/functional/bind_front.hpp>
 #include <hpx/static_reinit/static_reinit.hpp>
-#include <hpx/type_support/unused.hpp>
+#include <hpx/type_support/construct_at.hpp>
 
 #include <cstddef>
 #include <memory>    // for placement new
diff --git a/libs/core/synchronization/tests/performance/channel_mpmc_throughput.cpp b/libs/core/synchronization/tests/performance/channel_mpmc_throughput.cpp
index 506df5ed3388..c08c75858314 100644
--- a/libs/core/synchronization/tests/performance/channel_mpmc_throughput.cpp
+++ b/libs/core/synchronization/tests/performance/channel_mpmc_throughput.cpp
@@ -6,11 +6,11 @@
 
 //  This work is inspired by https://github.com/aprell/tasking-2.0
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/timing.hpp>
-#include <hpx/synchronization/channel_mpmc.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/core/synchronization/tests/performance/channel_mpsc_throughput.cpp b/libs/core/synchronization/tests/performance/channel_mpsc_throughput.cpp
index 2e0cce9564d4..837b33527f12 100644
--- a/libs/core/synchronization/tests/performance/channel_mpsc_throughput.cpp
+++ b/libs/core/synchronization/tests/performance/channel_mpsc_throughput.cpp
@@ -6,11 +6,11 @@
 
 //  This work is inspired by https://github.com/aprell/tasking-2.0
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/timing.hpp>
-#include <hpx/synchronization/channel_mpsc.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/core/synchronization/tests/performance/channel_spsc_throughput.cpp b/libs/core/synchronization/tests/performance/channel_spsc_throughput.cpp
index 86a9d732a2ac..f37435b0a0c1 100644
--- a/libs/core/synchronization/tests/performance/channel_spsc_throughput.cpp
+++ b/libs/core/synchronization/tests/performance/channel_spsc_throughput.cpp
@@ -6,11 +6,11 @@
 
 //  This work is inspired by https://github.com/aprell/tasking-2.0
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/timing.hpp>
-#include <hpx/synchronization/channel_spsc.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/libs/core/synchronization/tests/regressions/ignore_while_locked_1485.cpp b/libs/core/synchronization/tests/regressions/ignore_while_locked_1485.cpp
index 3ab042bd51b8..d0f7e5a0c381 100644
--- a/libs/core/synchronization/tests/regressions/ignore_while_locked_1485.cpp
+++ b/libs/core/synchronization/tests/regressions/ignore_while_locked_1485.cpp
@@ -9,10 +9,10 @@
 // `ignore_all_while_checking` can be used instead to ignore all locks
 // (including the ones that are not supported by `ignore_while_checking`).
 
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <functional>
diff --git a/libs/core/synchronization/tests/regressions/shared_mutex_1702.cpp b/libs/core/synchronization/tests/regressions/shared_mutex_1702.cpp
index ca9e1994965e..54795e20df8a 100644
--- a/libs/core/synchronization/tests/regressions/shared_mutex_1702.cpp
+++ b/libs/core/synchronization/tests/regressions/shared_mutex_1702.cpp
@@ -7,9 +7,9 @@
 // This test case demonstrates the issue described in #1702: Shared_mutex does
 // not compile with no_mutex cond_var
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/synchronization/shared_mutex.hpp>
+#include <hpx/shared_mutex.hpp>
 
 #include <mutex>
 #include <shared_mutex>
diff --git a/libs/core/synchronization/tests/unit/async_rw_mutex.cpp b/libs/core/synchronization/tests/unit/async_rw_mutex.cpp
index c6923d18ee06..a48bf467ca3b 100644
--- a/libs/core/synchronization/tests/unit/async_rw_mutex.cpp
+++ b/libs/core/synchronization/tests/unit/async_rw_mutex.cpp
@@ -5,11 +5,10 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <hpx/assert.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/mutex.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/synchronization/async_rw_mutex.hpp>
+#include <hpx/mutex.hpp>
 
 #include <atomic>
 #include <cstddef>
@@ -201,10 +200,13 @@ void test_multiple_accesses(
     std::atomic<std::size_t> count{0};
 
     // Read-only and read-write access return senders of different types
+    // clang-format off
     using r_sender_type = std::decay_t<decltype(
         rwm.read() | transfer(exec) | then(checker{true, 0, count, 0}))>;
     using rw_sender_type = std::decay_t<decltype(
         rwm.readwrite() | transfer(exec) | then(checker{false, 0, count, 0}))>;
+    // clang-format on
+
     std::vector<r_sender_type> r_senders;
     std::vector<rw_sender_type> rw_senders;
 
diff --git a/libs/core/synchronization/tests/unit/barrier_cpp20.cpp b/libs/core/synchronization/tests/unit/barrier_cpp20.cpp
index 6064c603634e..88725c27bc7a 100644
--- a/libs/core/synchronization/tests/unit/barrier_cpp20.cpp
+++ b/libs/core/synchronization/tests/unit/barrier_cpp20.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/barrier.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/barrier.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/async_local.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/synchronization/tests/unit/binary_semaphore_cpp20.cpp b/libs/core/synchronization/tests/unit/binary_semaphore_cpp20.cpp
index fbed2c5747a9..6b268d6fabe6 100644
--- a/libs/core/synchronization/tests/unit/binary_semaphore_cpp20.cpp
+++ b/libs/core/synchronization/tests/unit/binary_semaphore_cpp20.cpp
@@ -5,10 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/local/semaphore.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/semaphore.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 
diff --git a/libs/core/synchronization/tests/unit/channel_mpmc_fib.cpp b/libs/core/synchronization/tests/unit/channel_mpmc_fib.cpp
index 44705e4268ae..c05f9e27805d 100644
--- a/libs/core/synchronization/tests/unit/channel_mpmc_fib.cpp
+++ b/libs/core/synchronization/tests/unit/channel_mpmc_fib.cpp
@@ -6,11 +6,11 @@
 
 //  This work is inspired by https://github.com/aprell/tasking-2.0
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/synchronization/channel_mpmc.hpp>
+#include <hpx/thread.hpp>
 
 #include <functional>
 #include <utility>
diff --git a/libs/core/synchronization/tests/unit/channel_mpmc_shift.cpp b/libs/core/synchronization/tests/unit/channel_mpmc_shift.cpp
index 2e9371e4ad2c..ee6c40994f64 100644
--- a/libs/core/synchronization/tests/unit/channel_mpmc_shift.cpp
+++ b/libs/core/synchronization/tests/unit/channel_mpmc_shift.cpp
@@ -6,11 +6,11 @@
 
 //  This work is inspired by https://github.com/aprell/tasking-2.0
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/synchronization/channel_mpmc.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <functional>
diff --git a/libs/core/synchronization/tests/unit/channel_mpsc_fib.cpp b/libs/core/synchronization/tests/unit/channel_mpsc_fib.cpp
index 1f1e5e329dd3..f1d15d7e3d04 100644
--- a/libs/core/synchronization/tests/unit/channel_mpsc_fib.cpp
+++ b/libs/core/synchronization/tests/unit/channel_mpsc_fib.cpp
@@ -6,11 +6,11 @@
 
 //  This work is inspired by https://github.com/aprell/tasking-2.0
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/synchronization/channel_mpsc.hpp>
+#include <hpx/thread.hpp>
 
 #include <functional>
 #include <utility>
diff --git a/libs/core/synchronization/tests/unit/channel_mpsc_shift.cpp b/libs/core/synchronization/tests/unit/channel_mpsc_shift.cpp
index 9bc6777be38d..ec2147bd01e3 100644
--- a/libs/core/synchronization/tests/unit/channel_mpsc_shift.cpp
+++ b/libs/core/synchronization/tests/unit/channel_mpsc_shift.cpp
@@ -6,11 +6,11 @@
 
 //  This work is inspired by https://github.com/aprell/tasking-2.0
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/synchronization/channel_mpsc.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <functional>
diff --git a/libs/core/synchronization/tests/unit/channel_spsc_fib.cpp b/libs/core/synchronization/tests/unit/channel_spsc_fib.cpp
index 106546bd9b60..75f896c43ec1 100644
--- a/libs/core/synchronization/tests/unit/channel_spsc_fib.cpp
+++ b/libs/core/synchronization/tests/unit/channel_spsc_fib.cpp
@@ -6,11 +6,11 @@
 
 //  This work is inspired by https://github.com/aprell/tasking-2.0
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/synchronization/channel_spsc.hpp>
+#include <hpx/thread.hpp>
 
 #include <functional>
 #include <utility>
diff --git a/libs/core/synchronization/tests/unit/channel_spsc_shift.cpp b/libs/core/synchronization/tests/unit/channel_spsc_shift.cpp
index 59596eb8bb36..25f9f69f7c12 100644
--- a/libs/core/synchronization/tests/unit/channel_spsc_shift.cpp
+++ b/libs/core/synchronization/tests/unit/channel_spsc_shift.cpp
@@ -6,11 +6,11 @@
 
 //  This work is inspired by https://github.com/aprell/tasking-2.0
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/synchronization/channel_spsc.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <functional>
diff --git a/libs/core/synchronization/tests/unit/condition_variable.cpp b/libs/core/synchronization/tests/unit/condition_variable.cpp
index d06b5928118d..1e172f59de30 100644
--- a/libs/core/synchronization/tests/unit/condition_variable.cpp
+++ b/libs/core/synchronization/tests/unit/condition_variable.cpp
@@ -9,11 +9,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/condition_variable.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/threading.hpp>
-#include <hpx/synchronization/condition_variable.hpp>
-#include <hpx/synchronization/mutex.hpp>
+#include <hpx/mutex.hpp>
+#include <hpx/thread.hpp>
 #include <hpx/topology/topology.hpp>
 
 #include <chrono>
diff --git a/libs/core/synchronization/tests/unit/counting_semaphore.cpp b/libs/core/synchronization/tests/unit/counting_semaphore.cpp
index 79975ebf6e23..6262449085d1 100644
--- a/libs/core/synchronization/tests/unit/counting_semaphore.cpp
+++ b/libs/core/synchronization/tests/unit/counting_semaphore.cpp
@@ -5,12 +5,12 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/semaphore.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/semaphore.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/synchronization/tests/unit/counting_semaphore_cpp20.cpp b/libs/core/synchronization/tests/unit/counting_semaphore_cpp20.cpp
index a575128c313a..059e210458d3 100644
--- a/libs/core/synchronization/tests/unit/counting_semaphore_cpp20.cpp
+++ b/libs/core/synchronization/tests/unit/counting_semaphore_cpp20.cpp
@@ -5,10 +5,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/local/semaphore.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/semaphore.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 
diff --git a/libs/core/synchronization/tests/unit/in_place_stop_token.cpp b/libs/core/synchronization/tests/unit/in_place_stop_token.cpp
index 579ea37ceef0..eeca4fbd4e10 100644
--- a/libs/core/synchronization/tests/unit/in_place_stop_token.cpp
+++ b/libs/core/synchronization/tests/unit/in_place_stop_token.cpp
@@ -9,7 +9,7 @@
 //  Creative Commons Attribution 4.0 International License
 //  (http://creativecommons.org/licenses/by/4.0/).
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/synchronization/tests/unit/in_place_stop_token_cb2.cpp b/libs/core/synchronization/tests/unit/in_place_stop_token_cb2.cpp
index 267dcb55feed..8868a81f8683 100644
--- a/libs/core/synchronization/tests/unit/in_place_stop_token_cb2.cpp
+++ b/libs/core/synchronization/tests/unit/in_place_stop_token_cb2.cpp
@@ -9,7 +9,7 @@
 //  Creative Commons Attribution 4.0 International License
 //  (http://creativecommons.org/licenses/by/4.0/).
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/synchronization/tests/unit/latch_cpp20.cpp b/libs/core/synchronization/tests/unit/latch_cpp20.cpp
index 2d518e3f2630..280bd86bfc05 100644
--- a/libs/core/synchronization/tests/unit/latch_cpp20.cpp
+++ b/libs/core/synchronization/tests/unit/latch_cpp20.cpp
@@ -4,8 +4,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/local/latch.hpp>
+#include <hpx/init.hpp>
+#include <hpx/latch.hpp>
 #include <hpx/modules/async_local.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/synchronization/tests/unit/local_barrier.cpp b/libs/core/synchronization/tests/unit/local_barrier.cpp
index d30ad4b20b36..526f52122c68 100644
--- a/libs/core/synchronization/tests/unit/local_barrier.cpp
+++ b/libs/core/synchronization/tests/unit/local_barrier.cpp
@@ -5,11 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/functional/bind.hpp>
-#include <hpx/local/barrier.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/barrier.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/synchronization/tests/unit/local_barrier_count_up.cpp b/libs/core/synchronization/tests/unit/local_barrier_count_up.cpp
index 06256a42f50b..56680712c42e 100644
--- a/libs/core/synchronization/tests/unit/local_barrier_count_up.cpp
+++ b/libs/core/synchronization/tests/unit/local_barrier_count_up.cpp
@@ -6,12 +6,12 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/functional/bind.hpp>
-#include <hpx/local/barrier.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/barrier.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/synchronization/tests/unit/local_barrier_reset.cpp b/libs/core/synchronization/tests/unit/local_barrier_reset.cpp
index f0e528d6c581..1b207921ade5 100644
--- a/libs/core/synchronization/tests/unit/local_barrier_reset.cpp
+++ b/libs/core/synchronization/tests/unit/local_barrier_reset.cpp
@@ -6,12 +6,12 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/functional/bind.hpp>
-#include <hpx/local/barrier.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/barrier.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/synchronization/tests/unit/local_event.cpp b/libs/core/synchronization/tests/unit/local_event.cpp
index 4374c854c986..42b72db68356 100644
--- a/libs/core/synchronization/tests/unit/local_event.cpp
+++ b/libs/core/synchronization/tests/unit/local_event.cpp
@@ -5,12 +5,12 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/runtime_local.hpp>
 #include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/synchronization/tests/unit/local_latch.cpp b/libs/core/synchronization/tests/unit/local_latch.cpp
index 59f6c0ee72ad..aa72ebe47bc7 100644
--- a/libs/core/synchronization/tests/unit/local_latch.cpp
+++ b/libs/core/synchronization/tests/unit/local_latch.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/latch.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/latch.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <atomic>
diff --git a/libs/core/synchronization/tests/unit/local_mutex.cpp b/libs/core/synchronization/tests/unit/local_mutex.cpp
index e7c193a7ae64..b6f4c415eca3 100644
--- a/libs/core/synchronization/tests/unit/local_mutex.cpp
+++ b/libs/core/synchronization/tests/unit/local_mutex.cpp
@@ -7,13 +7,13 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/functional/bind.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/condition_variable.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/threading.hpp>
 #include <hpx/modules/threadmanager.hpp>
-#include <hpx/synchronization/condition_variable.hpp>
-#include <hpx/synchronization/mutex.hpp>
+#include <hpx/mutex.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <mutex>
diff --git a/libs/core/synchronization/tests/unit/shared_mutex/shared_mutex1.cpp b/libs/core/synchronization/tests/unit/shared_mutex/shared_mutex1.cpp
index f4d3f0aad6ec..a36f3cf9d3af 100644
--- a/libs/core/synchronization/tests/unit/shared_mutex/shared_mutex1.cpp
+++ b/libs/core/synchronization/tests/unit/shared_mutex/shared_mutex1.cpp
@@ -6,12 +6,12 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/async_local/post.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/shared_mutex.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/shared_mutex.hpp>
+#include <hpx/thread.hpp>
 
+#include <hpx/modules/async_local.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <chrono>
diff --git a/libs/core/synchronization/tests/unit/shared_mutex/shared_mutex2.cpp b/libs/core/synchronization/tests/unit/shared_mutex/shared_mutex2.cpp
index f258a0180304..9a0cf5fe6ed5 100644
--- a/libs/core/synchronization/tests/unit/shared_mutex/shared_mutex2.cpp
+++ b/libs/core/synchronization/tests/unit/shared_mutex/shared_mutex2.cpp
@@ -6,10 +6,10 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/shared_mutex.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/shared_mutex.hpp>
+#include <hpx/thread.hpp>
 
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/synchronization/tests/unit/sliding_semaphore.cpp b/libs/core/synchronization/tests/unit/sliding_semaphore.cpp
index 220fa317cd48..fd6876fa9b9a 100644
--- a/libs/core/synchronization/tests/unit/sliding_semaphore.cpp
+++ b/libs/core/synchronization/tests/unit/sliding_semaphore.cpp
@@ -4,11 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/synchronization/tests/unit/stop_token.cpp b/libs/core/synchronization/tests/unit/stop_token.cpp
index a1b24eef68be..8d534d0dfc52 100644
--- a/libs/core/synchronization/tests/unit/stop_token.cpp
+++ b/libs/core/synchronization/tests/unit/stop_token.cpp
@@ -9,7 +9,7 @@
 //  Creative Commons Attribution 4.0 International License
 //  (http://creativecommons.org/licenses/by/4.0/).
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/synchronization/tests/unit/stop_token_cb2.cpp b/libs/core/synchronization/tests/unit/stop_token_cb2.cpp
index 7276ec2e6cd0..754dca8b8ee5 100644
--- a/libs/core/synchronization/tests/unit/stop_token_cb2.cpp
+++ b/libs/core/synchronization/tests/unit/stop_token_cb2.cpp
@@ -9,7 +9,7 @@
 //  Creative Commons Attribution 4.0 International License
 //  (http://creativecommons.org/licenses/by/4.0/).
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/testing.hpp>
 
diff --git a/libs/core/threading/tests/unit/condition_variable2.cpp b/libs/core/threading/tests/unit/condition_variable2.cpp
index 4215afa7e3e4..15ab53c2a8ed 100644
--- a/libs/core/threading/tests/unit/condition_variable2.cpp
+++ b/libs/core/threading/tests/unit/condition_variable2.cpp
@@ -9,11 +9,11 @@
 //  Creative Commons Attribution 4.0 International License
 //  (http://creativecommons.org/licenses/by/4.0/).
 
-#include <hpx/functional/bind_back.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/threading.hpp>
+#include <hpx/thread.hpp>
 
 #include <array>
 #include <chrono>
diff --git a/libs/core/threading/tests/unit/condition_variable3.cpp b/libs/core/threading/tests/unit/condition_variable3.cpp
index 9051afafcd8e..e5369361355f 100644
--- a/libs/core/threading/tests/unit/condition_variable3.cpp
+++ b/libs/core/threading/tests/unit/condition_variable3.cpp
@@ -9,10 +9,10 @@
 //  Creative Commons Attribution 4.0 International License
 //  (http://creativecommons.org/licenses/by/4.0/).
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/threading.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <functional>
diff --git a/libs/core/threading/tests/unit/condition_variable4.cpp b/libs/core/threading/tests/unit/condition_variable4.cpp
index f5fb36c46637..ea150cb67fa2 100644
--- a/libs/core/threading/tests/unit/condition_variable4.cpp
+++ b/libs/core/threading/tests/unit/condition_variable4.cpp
@@ -9,10 +9,10 @@
 //  Creative Commons Attribution 4.0 International License
 //  (http://creativecommons.org/licenses/by/4.0/).
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/threading.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <mutex>
diff --git a/libs/core/threading/tests/unit/condition_variable_race.cpp b/libs/core/threading/tests/unit/condition_variable_race.cpp
index 6df6cecc0a73..567299b79548 100644
--- a/libs/core/threading/tests/unit/condition_variable_race.cpp
+++ b/libs/core/threading/tests/unit/condition_variable_race.cpp
@@ -9,10 +9,10 @@
 //  Creative Commons Attribution 4.0 International License
 //  (http://creativecommons.org/licenses/by/4.0/).
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/threading.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <cstdlib>
diff --git a/libs/core/threading/tests/unit/error_callback.cpp b/libs/core/threading/tests/unit/error_callback.cpp
index 1dc4fe5348cc..d7d95a6314a1 100644
--- a/libs/core/threading/tests/unit/error_callback.cpp
+++ b/libs/core/threading/tests/unit/error_callback.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/local/runtime.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/runtime.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/threading/tests/unit/in_place_stop_token_cb1.cpp b/libs/core/threading/tests/unit/in_place_stop_token_cb1.cpp
index afb865c8333d..fdc04f709439 100644
--- a/libs/core/threading/tests/unit/in_place_stop_token_cb1.cpp
+++ b/libs/core/threading/tests/unit/in_place_stop_token_cb1.cpp
@@ -9,12 +9,12 @@
 //  Creative Commons Attribution 4.0 International License
 //  (http://creativecommons.org/licenses/by/4.0/).
 
-#include <hpx/datastructures/optional.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/threading.hpp>
-#include <hpx/modules/timing.hpp>
+#include <hpx/optional.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <chrono>
diff --git a/libs/core/threading/tests/unit/in_place_stop_token_race.cpp b/libs/core/threading/tests/unit/in_place_stop_token_race.cpp
index 6ce08d01394c..e81d20841a9b 100644
--- a/libs/core/threading/tests/unit/in_place_stop_token_race.cpp
+++ b/libs/core/threading/tests/unit/in_place_stop_token_race.cpp
@@ -9,10 +9,10 @@
 //  Creative Commons Attribution 4.0 International License
 //  (http://creativecommons.org/licenses/by/4.0/).
 
-#include <hpx/datastructures/optional.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/threading.hpp>
+#include <hpx/optional.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <chrono>
diff --git a/libs/core/threading/tests/unit/in_place_stop_token_race2.cpp b/libs/core/threading/tests/unit/in_place_stop_token_race2.cpp
index 4dbd948e7801..cc6f69c02d00 100644
--- a/libs/core/threading/tests/unit/in_place_stop_token_race2.cpp
+++ b/libs/core/threading/tests/unit/in_place_stop_token_race2.cpp
@@ -9,9 +9,9 @@
 //  Creative Commons Attribution 4.0 International License
 //  (http://creativecommons.org/licenses/by/4.0/).
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/threading.hpp>
+#include <hpx/thread.hpp>
 
 #include <iostream>
 
diff --git a/libs/core/threading/tests/unit/jthread1.cpp b/libs/core/threading/tests/unit/jthread1.cpp
index 185d6aa4f80f..fb3169774668 100644
--- a/libs/core/threading/tests/unit/jthread1.cpp
+++ b/libs/core/threading/tests/unit/jthread1.cpp
@@ -9,9 +9,9 @@
 //  Creative Commons Attribution 4.0 International License
 //  (http://creativecommons.org/licenses/by/4.0/).
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/threading.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <chrono>
diff --git a/libs/core/threading/tests/unit/jthread2.cpp b/libs/core/threading/tests/unit/jthread2.cpp
index f46166c34144..bf403014f5b2 100644
--- a/libs/core/threading/tests/unit/jthread2.cpp
+++ b/libs/core/threading/tests/unit/jthread2.cpp
@@ -9,9 +9,9 @@
 //  Creative Commons Attribution 4.0 International License
 //  (http://creativecommons.org/licenses/by/4.0/).
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/threading.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <chrono>
diff --git a/libs/core/threading/tests/unit/stack_check.cpp b/libs/core/threading/tests/unit/stack_check.cpp
index eaf053fc405a..2a0763e6aa48 100644
--- a/libs/core/threading/tests/unit/stack_check.cpp
+++ b/libs/core/threading/tests/unit/stack_check.cpp
@@ -5,9 +5,9 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <hpx/coroutines/detail/get_stack_pointer.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/libs/core/threading/tests/unit/stop_token_cb1.cpp b/libs/core/threading/tests/unit/stop_token_cb1.cpp
index 190b2bf5e70c..697951e37d88 100644
--- a/libs/core/threading/tests/unit/stop_token_cb1.cpp
+++ b/libs/core/threading/tests/unit/stop_token_cb1.cpp
@@ -9,12 +9,12 @@
 //  Creative Commons Attribution 4.0 International License
 //  (http://creativecommons.org/licenses/by/4.0/).
 
-#include <hpx/datastructures/optional.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/threading.hpp>
-#include <hpx/modules/timing.hpp>
+#include <hpx/optional.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <chrono>
diff --git a/libs/core/threading/tests/unit/stop_token_race.cpp b/libs/core/threading/tests/unit/stop_token_race.cpp
index b6afa23e4054..0b4ee8a7d853 100644
--- a/libs/core/threading/tests/unit/stop_token_race.cpp
+++ b/libs/core/threading/tests/unit/stop_token_race.cpp
@@ -9,10 +9,10 @@
 //  Creative Commons Attribution 4.0 International License
 //  (http://creativecommons.org/licenses/by/4.0/).
 
-#include <hpx/datastructures/optional.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/threading.hpp>
+#include <hpx/optional.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <chrono>
diff --git a/libs/core/threading/tests/unit/stop_token_race2.cpp b/libs/core/threading/tests/unit/stop_token_race2.cpp
index 161ef5a23c84..1f2041695d8a 100644
--- a/libs/core/threading/tests/unit/stop_token_race2.cpp
+++ b/libs/core/threading/tests/unit/stop_token_race2.cpp
@@ -9,9 +9,9 @@
 //  Creative Commons Attribution 4.0 International License
 //  (http://creativecommons.org/licenses/by/4.0/).
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/threading.hpp>
+#include <hpx/thread.hpp>
 
 #include <iostream>
 
diff --git a/libs/core/threading/tests/unit/thread.cpp b/libs/core/threading/tests/unit/thread.cpp
index 2cf349395c63..59332e027f62 100644
--- a/libs/core/threading/tests/unit/thread.cpp
+++ b/libs/core/threading/tests/unit/thread.cpp
@@ -6,11 +6,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/barrier.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/barrier.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <functional>
diff --git a/libs/core/threading/tests/unit/thread_id.cpp b/libs/core/threading/tests/unit/thread_id.cpp
index 9dfcb90bfffd..33b5f5a358d4 100644
--- a/libs/core/threading/tests/unit/thread_id.cpp
+++ b/libs/core/threading/tests/unit/thread_id.cpp
@@ -5,11 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/barrier.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/barrier.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <functional>
 #include <memory>
diff --git a/libs/core/threading/tests/unit/thread_launching.cpp b/libs/core/threading/tests/unit/thread_launching.cpp
index cd948156abfb..2f92be6d04e0 100644
--- a/libs/core/threading/tests/unit/thread_launching.cpp
+++ b/libs/core/threading/tests/unit/thread_launching.cpp
@@ -5,9 +5,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <cmath>
 #include <functional>
diff --git a/libs/core/threading/tests/unit/thread_mf.cpp b/libs/core/threading/tests/unit/thread_mf.cpp
index 6199da19531b..52c320d83691 100644
--- a/libs/core/threading/tests/unit/thread_mf.cpp
+++ b/libs/core/threading/tests/unit/thread_mf.cpp
@@ -6,10 +6,10 @@
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt
 
-#include <hpx/local/init.hpp>
-#include <hpx/local/runtime.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/runtime.hpp>
+#include <hpx/thread.hpp>
 
 #include <functional>
 
diff --git a/libs/core/threading/tests/unit/thread_yield.cpp b/libs/core/threading/tests/unit/thread_yield.cpp
index b42db5503b5e..f9dfa697e25f 100644
--- a/libs/core/threading/tests/unit/thread_yield.cpp
+++ b/libs/core/threading/tests/unit/thread_yield.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <string>
diff --git a/libs/core/threading/tests/unit/tss.cpp b/libs/core/threading/tests/unit/tss.cpp
index 69a6f118d8ab..19660df351db 100644
--- a/libs/core/threading/tests/unit/tss.cpp
+++ b/libs/core/threading/tests/unit/tss.cpp
@@ -6,10 +6,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <mutex>
diff --git a/libs/core/threading_base/src/create_thread.cpp b/libs/core/threading_base/src/create_thread.cpp
index 81d6dd4ca554..14e3168baa66 100644
--- a/libs/core/threading_base/src/create_thread.cpp
+++ b/libs/core/threading_base/src/create_thread.cpp
@@ -88,7 +88,6 @@ namespace hpx::threads::detail {
         // create the new thread
         scheduler->create_thread(data, &id, ec);
 
-        // NOLINTNEXTLINE(bugprone-branch-clone)
         LTM_(info)
             .format("create_thread: pool({}), scheduler({}), thread({}), "
                     "initial_state({}), run_now({})",
diff --git a/libs/core/threading_base/src/set_thread_state.cpp b/libs/core/threading_base/src/set_thread_state.cpp
index f7ccada50ac3..7ba34efc4127 100644
--- a/libs/core/threading_base/src/set_thread_state.cpp
+++ b/libs/core/threading_base/src/set_thread_state.cpp
@@ -45,7 +45,6 @@ namespace hpx::threads::detail {
         if (current_state.state() == previous_state.state() &&
             current_state != previous_state)
         {
-            // NOLINTNEXTLINE(bugprone-branch-clone)
             LTM_(warning).format(
                 "set_active_state: thread is still active, however it was "
                 "non-active since the original set_state request was issued, "
@@ -102,7 +101,6 @@ namespace hpx::threads::detail {
             // nothing to do here if the state doesn't change
             if (new_state == previous_state_val)
             {
-                // NOLINTNEXTLINE(bugprone-branch-clone)
                 LTM_(warning).format(
                     "set_thread_state: old thread state is the same as new "
                     "thread state, aborting state change, thread({}), "
@@ -125,7 +123,6 @@ namespace hpx::threads::detail {
                 if (retry_on_active)
                 {
                     // schedule a new thread to set the state
-                    // NOLINTNEXTLINE(bugprone-branch-clone)
                     LTM_(warning).format(
                         "set_thread_state: thread is currently active, "
                         "scheduling new thread, thread({}), description({}), "
@@ -150,7 +147,6 @@ namespace hpx::threads::detail {
                         k, "hpx::threads::detail::set_thread_state");
                     ++k;
 
-                    // NOLINTNEXTLINE(bugprone-branch-clone)
                     LTM_(warning).format(
                         "set_thread_state: thread is currently active, but not "
                         "scheduling new thread because retry_on_active = "
@@ -170,7 +166,6 @@ namespace hpx::threads::detail {
 
             case thread_schedule_state::terminated:
             {
-                // NOLINTNEXTLINE(bugprone-branch-clone)
                 LTM_(warning).format(
                     "set_thread_state: thread is terminated, aborting state "
                     "change, thread({}), description({}), new state({})",
@@ -200,7 +195,6 @@ namespace hpx::threads::detail {
                         thrd, get_thread_id_data(thrd)->get_description(),
                         new_state);
 
-                    // NOLINTNEXTLINE(bugprone-branch-clone)
                     LTM_(fatal) << str;
 
                     HPX_THROWS_IF(ec, hpx::error::bad_parameter,
@@ -230,7 +224,6 @@ namespace hpx::threads::detail {
             // some point will ignore this thread by simply skipping it (if it's
             // not pending anymore).
 
-            // NOLINTNEXTLINE(bugprone-branch-clone)
             LTM_(info).format("set_thread_state: thread({}), description({}), "
                               "new state({}), old state({})",
                 thrd, get_thread_id_data(thrd)->get_description(),
@@ -245,7 +238,6 @@ namespace hpx::threads::detail {
             }
 
             // state has changed since we fetched it from the thread, retry
-            // NOLINTNEXTLINE(bugprone-branch-clone)
             LTM_(warning).format(
                 "set_thread_state: state has been changed since it was "
                 "fetched, retrying, thread({}), description({}), new "
diff --git a/libs/core/threading_base/src/set_thread_state_timed.cpp b/libs/core/threading_base/src/set_thread_state_timed.cpp
index 60cbbfc554ac..7663d028dfcf 100644
--- a/libs/core/threading_base/src/set_thread_state_timed.cpp
+++ b/libs/core/threading_base/src/set_thread_state_timed.cpp
@@ -142,7 +142,6 @@ namespace hpx::threads::detail {
         HPX_ASSERT(statex == thread_restart_state::abort ||
             statex == thread_restart_state::timeout);
 
-        // NOLINTNEXTLINE(bugprone-branch-clone)
         if (thread_restart_state::timeout != statex)    //-V601
         {
             triggered->store(true);
diff --git a/libs/core/threading_base/tests/regressions/thread_local_data.cpp b/libs/core/threading_base/tests/regressions/thread_local_data.cpp
index 3066d8329807..763f7e01732e 100644
--- a/libs/core/threading_base/tests/regressions/thread_local_data.cpp
+++ b/libs/core/threading_base/tests/regressions/thread_local_data.cpp
@@ -4,10 +4,10 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/async_local.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/threading_base.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <cstddef>
diff --git a/libs/core/threading_base/tests/regressions/thread_stacksize_current.cpp b/libs/core/threading_base/tests/regressions/thread_stacksize_current.cpp
index 2e4cee1c4d34..077df205ea9f 100644
--- a/libs/core/threading_base/tests/regressions/thread_stacksize_current.cpp
+++ b/libs/core/threading_base/tests/regressions/thread_stacksize_current.cpp
@@ -10,11 +10,10 @@
 // thread_stacksize::minimal and thread_stacksize::maximal when a thread has been
 // created.
 
-#include <hpx/local/init.hpp>
-
+#include <hpx/init.hpp>
 #include <hpx/modules/async_local.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/threading_base.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/core/timed_execution/tests/unit/minimal_timed_async_executor.cpp b/libs/core/timed_execution/tests/unit/minimal_timed_async_executor.cpp
index 509d0e31bbf5..3a12631aad5d 100644
--- a/libs/core/timed_execution/tests/unit/minimal_timed_async_executor.cpp
+++ b/libs/core/timed_execution/tests/unit/minimal_timed_async_executor.cpp
@@ -4,11 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
-#include <hpx/modules/execution.hpp>
-#include <hpx/modules/executors.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/timed_execution.hpp>
 
 #include <algorithm>
 #include <array>
@@ -183,7 +181,7 @@ struct test_timed_async_executor1 : test_async_executor1
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_two_way_executor<test_async_executor1> : std::true_type
     {
@@ -193,7 +191,7 @@ namespace hpx { namespace parallel { namespace execution {
     struct is_two_way_executor<test_timed_async_executor1> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 struct test_timed_async_executor2 : test_async_executor1
 {
@@ -224,7 +222,7 @@ struct test_timed_async_executor3 : test_timed_async_executor2
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_two_way_executor<test_timed_async_executor2> : std::true_type
     {
@@ -234,7 +232,7 @@ namespace hpx { namespace parallel { namespace execution {
     struct is_two_way_executor<test_timed_async_executor3> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 struct test_timed_async_executor4 : test_async_executor1
 {
@@ -260,7 +258,7 @@ struct test_timed_async_executor5 : test_timed_async_executor4
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_two_way_executor<test_timed_async_executor4> : std::true_type
     {
@@ -270,7 +268,7 @@ namespace hpx { namespace parallel { namespace execution {
     struct is_two_way_executor<test_timed_async_executor5> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 ///////////////////////////////////////////////////////////////////////////////
 int hpx_main()
diff --git a/libs/core/timed_execution/tests/unit/minimal_timed_sync_executor.cpp b/libs/core/timed_execution/tests/unit/minimal_timed_sync_executor.cpp
index 4e6d8831e0cb..d3f42cc0087a 100644
--- a/libs/core/timed_execution/tests/unit/minimal_timed_sync_executor.cpp
+++ b/libs/core/timed_execution/tests/unit/minimal_timed_sync_executor.cpp
@@ -4,10 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/timed_execution.hpp>
 
 #include <algorithm>
 #include <array>
@@ -176,7 +175,7 @@ struct test_timed_sync_executor1 : test_sync_executor1
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_one_way_executor<test_sync_executor1> : std::true_type
     {
@@ -186,7 +185,7 @@ namespace hpx { namespace parallel { namespace execution {
     struct is_one_way_executor<test_timed_sync_executor1> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 struct test_sync_executor2 : test_sync_executor1
 {
@@ -214,7 +213,7 @@ struct test_timed_sync_executor2 : test_sync_executor2
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_one_way_executor<test_sync_executor2> : std::true_type
     {
@@ -224,7 +223,7 @@ namespace hpx { namespace parallel { namespace execution {
     struct is_one_way_executor<test_timed_sync_executor2> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 ///////////////////////////////////////////////////////////////////////////////
 int hpx_main()
diff --git a/libs/core/timed_execution/tests/unit/timed_parallel_executor.cpp b/libs/core/timed_execution/tests/unit/timed_parallel_executor.cpp
index 1fca08e2d9a7..96b931e23492 100644
--- a/libs/core/timed_execution/tests/unit/timed_parallel_executor.cpp
+++ b/libs/core/timed_execution/tests/unit/timed_parallel_executor.cpp
@@ -4,10 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/timed_execution.hpp>
 
 #include <algorithm>
 #include <chrono>
diff --git a/libs/core/type_support/tests/unit/generator.cpp b/libs/core/type_support/tests/unit/generator.cpp
index e7a53c3d9d95..8853532eae61 100644
--- a/libs/core/type_support/tests/unit/generator.cpp
+++ b/libs/core/type_support/tests/unit/generator.cpp
@@ -13,7 +13,7 @@
 #if defined(HPX_HAVE_CXX20_COROUTINES) &&                                      \
     (!defined(HPX_CLANG_VERSION) || HPX_CLANG_VERSION >= 130000)
 
-#include <hpx/local/generator.hpp>
+#include <hpx/generator.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <cstddef>
diff --git a/libs/full/async_distributed/include/hpx/async_distributed/detail/async_unwrap_result_implementations.hpp b/libs/full/async_distributed/include/hpx/async_distributed/detail/async_unwrap_result_implementations.hpp
index 711cbece74b2..59eeff718abc 100644
--- a/libs/full/async_distributed/include/hpx/async_distributed/detail/async_unwrap_result_implementations.hpp
+++ b/libs/full/async_distributed/include/hpx/async_distributed/detail/async_unwrap_result_implementations.hpp
@@ -42,7 +42,6 @@ namespace hpx { namespace detail {
         typedef typename hpx::traits::extract_action<Action>::type action_type;
         typedef typename action_type::local_result_type result_type;
 
-        // NOLINTNEXTLINE(bugprone-branch-clone)
         if (policy == launch::sync || action_type::direct_execution::value)
         {
             return hpx::detail::sync_local_invoke_direct<action_type,
diff --git a/libs/full/command_line_handling/tests/regressions/configuration_1572.cpp b/libs/full/command_line_handling/tests/regressions/configuration_1572.cpp
index fd2cc41a52e0..84957682a452 100644
--- a/libs/full/command_line_handling/tests/regressions/configuration_1572.cpp
+++ b/libs/full/command_line_handling/tests/regressions/configuration_1572.cpp
@@ -4,8 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/config.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 #include <hpx/util/from_string.hpp>
 
diff --git a/libs/full/command_line_handling/tests/regressions/late_commandline_options_5257.cpp b/libs/full/command_line_handling/tests/regressions/late_commandline_options_5257.cpp
index 41a099510570..d6b3ab41618e 100644
--- a/libs/full/command_line_handling/tests/regressions/late_commandline_options_5257.cpp
+++ b/libs/full/command_line_handling/tests/regressions/late_commandline_options_5257.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <atomic>
diff --git a/libs/full/command_line_handling/tests/regressions/options_as_config_3339.cpp b/libs/full/command_line_handling/tests/regressions/options_as_config_3339.cpp
index b85ca2e3c497..8485051a43a8 100644
--- a/libs/full/command_line_handling/tests/regressions/options_as_config_3339.cpp
+++ b/libs/full/command_line_handling/tests/regressions/options_as_config_3339.cpp
@@ -4,7 +4,7 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/init.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include <string>
diff --git a/libs/full/command_line_handling/tests/regressions/use_all_cores_2262.cpp b/libs/full/command_line_handling/tests/regressions/use_all_cores_2262.cpp
index 8e89b596f25a..f11b632db1de 100644
--- a/libs/full/command_line_handling/tests/regressions/use_all_cores_2262.cpp
+++ b/libs/full/command_line_handling/tests/regressions/use_all_cores_2262.cpp
@@ -9,9 +9,9 @@
 
 #include <hpx/config.hpp>
 #if !defined(HPX_COMPUTE_DEVICE_CODE)
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <string>
 #include <vector>
diff --git a/libs/full/compute/CMakeLists.txt b/libs/full/compute/CMakeLists.txt
index 6695a1a89d37..bc0331c91984 100644
--- a/libs/full/compute/CMakeLists.txt
+++ b/libs/full/compute/CMakeLists.txt
@@ -17,9 +17,8 @@ set(compute_headers
 
 # cmake-format: off
 set(compute_compat_headers
-    hpx/compute.hpp => hpx/include/compute.hpp
-    hpx/compute/host/target.hpp => hpx/compute/host/distributed_target.hpp
-    hpx/util/functional/new.hpp => hpx/include/compute.hpp
+    hpx/compute/host/target.hpp => hpx/compute.hpp
+    hpx/util/functional/new.hpp => hpx/compute.hpp
 )
 # cmake-format: on
 
diff --git a/libs/full/include/CMakeLists.txt b/libs/full/include/CMakeLists.txt
index e1c5a025fc24..cb003216fc02 100644
--- a/libs/full/include/CMakeLists.txt
+++ b/libs/full/include/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2022 The STE||AR-Group
+# Copyright (c) 2020-2023 The STE||AR-Group
 #
 # SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -12,17 +12,13 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 set(include_headers
     hpx/algorithm.hpp
-    hpx/any.hpp
     hpx/barrier.hpp
     hpx/channel.hpp
-    hpx/chrono.hpp
-    hpx/condition_variable.hpp
-    hpx/exception.hpp
-    hpx/execution.hpp
-    hpx/functional.hpp
+    hpx/compute.hpp
     hpx/future.hpp
-    hpx/generator.hpp
     hpx/hpx.hpp
+    hpx/latch.hpp
+    hpx/runtime.hpp
     hpx/include/actions.hpp
     hpx/include/agas.hpp
     hpx/include/applier.hpp
@@ -105,27 +101,12 @@ set(include_headers
     hpx/include/traits.hpp
     hpx/include/unseq.hpp
     hpx/include/util.hpp
-    hpx/latch.hpp
-    hpx/memory.hpp
-    hpx/mutex.hpp
-    hpx/numeric.hpp
-    hpx/optional.hpp
-    hpx/runtime.hpp
-    hpx/semaphore.hpp
-    hpx/shared_mutex.hpp
-    hpx/source_location.hpp
-    hpx/stop_token.hpp
-    hpx/system_error.hpp
-    hpx/task_block.hpp
-    hpx/thread.hpp
-    hpx/tuple.hpp
-    hpx/type_traits.hpp
-    hpx/unwrap.hpp
 )
 
 if(HPX_WITH_DISTRIBUTED_RUNTIME)
   set(include_optional_module_dependencies
       hpx_agas
+      hpx_async_colocated
       hpx_async_distributed
       hpx_runtime_components
       hpx_runtime_distributed
diff --git a/libs/full/include/include/hpx/algorithm.hpp b/libs/full/include/include/hpx/algorithm.hpp
index 60b4a3c65229..097be17ddb34 100644
--- a/libs/full/include/include/hpx/algorithm.hpp
+++ b/libs/full/include/include/hpx/algorithm.hpp
@@ -6,5 +6,11 @@
 
 #pragma once
 
-#include <hpx/local/algorithm.hpp>
+#include <hpx/config.hpp>
+#include <hpx/parallel/algorithm.hpp>
+#include <hpx/parallel/container_algorithms.hpp>
+#include <hpx/parallel/unseq.hpp>
+#if defined(HPX_HAVE_DATAPAR)
+#include <hpx/parallel/datapar.hpp>
+#endif
 #include <hpx/parallel/segmented_algorithm.hpp>
diff --git a/libs/full/include/include/hpx/barrier.hpp b/libs/full/include/include/hpx/barrier.hpp
index 2b7813f341c6..6b3eccbe5592 100644
--- a/libs/full/include/include/hpx/barrier.hpp
+++ b/libs/full/include/include/hpx/barrier.hpp
@@ -7,4 +7,4 @@
 #pragma once
 
 #include <hpx/collectives/barrier.hpp>
-#include <hpx/local/barrier.hpp>
+#include <hpx/synchronization/barrier.hpp>
diff --git a/libs/full/include/include/hpx/channel.hpp b/libs/full/include/include/hpx/channel.hpp
index 6dbe9e8efc43..447172e4c33d 100644
--- a/libs/full/include/include/hpx/channel.hpp
+++ b/libs/full/include/include/hpx/channel.hpp
@@ -7,8 +7,4 @@
 #pragma once
 
 #include <hpx/lcos_distributed/channel.hpp>
-#include <hpx/local/channel.hpp>
-
-namespace hpx { namespace distributed {
-    using hpx::lcos::channel;
-}}    // namespace hpx::distributed
+#include <hpx/lcos_local/channel.hpp>
diff --git a/libs/core/include_local/include/hpx/local/thread.hpp b/libs/full/include/include/hpx/compute.hpp
similarity index 64%
rename from libs/core/include_local/include/hpx/local/thread.hpp
rename to libs/full/include/include/hpx/compute.hpp
index 4907caddcb11..a1bd71e59f84 100644
--- a/libs/core/include_local/include/hpx/local/thread.hpp
+++ b/libs/full/include/include/hpx/compute.hpp
@@ -1,4 +1,4 @@
-//  Copyright (c) 2020 Hartmut Kaiser
+//  Copyright (c) 2023 Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -6,5 +6,5 @@
 
 #pragma once
 
-#include <hpx/threading/jthread.hpp>
-#include <hpx/threading/thread.hpp>
+#include <hpx/modules/compute.hpp>
+#include <hpx/modules/compute_local.hpp>
diff --git a/libs/full/include/include/hpx/exception.hpp b/libs/full/include/include/hpx/exception.hpp
deleted file mode 100644
index 164bfa0a19c6..000000000000
--- a/libs/full/include/include/hpx/exception.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//  Copyright (c) 2020 ETH Zurich
-//
-//  SPDX-License-Identifier: BSL-1.0
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#pragma once
-
-#include <hpx/local/exception.hpp>
diff --git a/libs/full/include/include/hpx/execution.hpp b/libs/full/include/include/hpx/execution.hpp
deleted file mode 100644
index e2cd46991dcf..000000000000
--- a/libs/full/include/include/hpx/execution.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//  Copyright (c) 2020 ETH Zurich
-//
-//  SPDX-License-Identifier: BSL-1.0
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#pragma once
-
-#include <hpx/local/execution.hpp>
diff --git a/libs/full/include/include/hpx/functional.hpp b/libs/full/include/include/hpx/functional.hpp
deleted file mode 100644
index bd8e863625f9..000000000000
--- a/libs/full/include/include/hpx/functional.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//  Copyright (c) 2020 ETH Zurich
-//
-//  SPDX-License-Identifier: BSL-1.0
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#pragma once
-
-#include <hpx/local/functional.hpp>
diff --git a/libs/full/include/include/hpx/future.hpp b/libs/full/include/include/hpx/future.hpp
index 3766aa0eaa88..59ed24569e3c 100644
--- a/libs/full/include/include/hpx/future.hpp
+++ b/libs/full/include/include/hpx/future.hpp
@@ -6,10 +6,11 @@
 
 #pragma once
 
-#include <hpx/async_colocated/async_colocated.hpp>
-#include <hpx/async_colocated/async_colocated_callback.hpp>
-#include <hpx/async_distributed/async.hpp>
-#include <hpx/async_distributed/async_callback.hpp>
-#include <hpx/async_distributed/async_continue_callback.hpp>
-#include <hpx/async_distributed/promise.hpp>
-#include <hpx/local/future.hpp>
+#include <hpx/modules/async_base.hpp>
+#include <hpx/modules/async_colocated.hpp>
+#include <hpx/modules/async_combinators.hpp>
+#include <hpx/modules/async_distributed.hpp>
+#include <hpx/modules/async_local.hpp>
+#include <hpx/modules/execution.hpp>
+#include <hpx/modules/futures.hpp>
+#include <hpx/modules/lcos_local.hpp>
diff --git a/libs/full/include/include/hpx/hpx.hpp b/libs/full/include/include/hpx/hpx.hpp
index 488049d0545e..1aa815b444b3 100644
--- a/libs/full/include/include/hpx/hpx.hpp
+++ b/libs/full/include/include/hpx/hpx.hpp
@@ -1,4 +1,4 @@
-//  Copyright (c) 2007-2012 Hartmut Kaiser
+//  Copyright (c) 2007-2023 Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <hpx/config.hpp>
 #include <hpx/algorithm.hpp>
 #include <hpx/any.hpp>
 #include <hpx/chrono.hpp>
@@ -30,4 +29,3 @@
 
 #include <hpx/include/components.hpp>
 #include <hpx/include/performance_counters.hpp>
-#include <hpx/modules/async_distributed.hpp>
diff --git a/libs/full/include/include/hpx/latch.hpp b/libs/full/include/include/hpx/latch.hpp
index e36fad051380..3d9b7a947d25 100644
--- a/libs/full/include/include/hpx/latch.hpp
+++ b/libs/full/include/include/hpx/latch.hpp
@@ -7,4 +7,4 @@
 #pragma once
 
 #include <hpx/collectives/latch.hpp>
-#include <hpx/local/latch.hpp>
+#include <hpx/synchronization/latch.hpp>
diff --git a/libs/full/include/include/hpx/memory.hpp b/libs/full/include/include/hpx/memory.hpp
deleted file mode 100644
index b2f794dd7572..000000000000
--- a/libs/full/include/include/hpx/memory.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//  Copyright (c) 2020 ETH Zurich
-//
-//  SPDX-License-Identifier: BSL-1.0
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#pragma once
-
-#include <hpx/local/memory.hpp>
diff --git a/libs/full/include/include/hpx/mutex.hpp b/libs/full/include/include/hpx/mutex.hpp
deleted file mode 100644
index b0d8e499030c..000000000000
--- a/libs/full/include/include/hpx/mutex.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//  Copyright (c) 2021 ETH Zurich
-//
-//  SPDX-License-Identifier: BSL-1.0
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#pragma once
-
-#include <hpx/local/mutex.hpp>
diff --git a/libs/full/include/include/hpx/numeric.hpp b/libs/full/include/include/hpx/numeric.hpp
deleted file mode 100644
index 7ed904b859aa..000000000000
--- a/libs/full/include/include/hpx/numeric.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//  Copyright (c) 2020 ETH Zurich
-//
-//  SPDX-License-Identifier: BSL-1.0
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#pragma once
-
-#include <hpx/local/numeric.hpp>
diff --git a/libs/full/include/include/hpx/optional.hpp b/libs/full/include/include/hpx/optional.hpp
deleted file mode 100644
index b300a3e42546..000000000000
--- a/libs/full/include/include/hpx/optional.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//  Copyright (c) 2020 ETH Zurich
-//
-//  SPDX-License-Identifier: BSL-1.0
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#pragma once
-
-#include <hpx/local/optional.hpp>
diff --git a/libs/full/include/include/hpx/runtime.hpp b/libs/full/include/include/hpx/runtime.hpp
index 0ec0264e8e97..a51ed7097623 100644
--- a/libs/full/include/include/hpx/runtime.hpp
+++ b/libs/full/include/include/hpx/runtime.hpp
@@ -6,5 +6,6 @@
 
 #pragma once
 
-#include <hpx/local/runtime.hpp>
 #include <hpx/runtime_distributed/runtime_fwd.hpp>
+#include <hpx/runtime_local/runtime_local_fwd.hpp>
+#include <hpx/runtime_local/service_executors.hpp>
diff --git a/libs/full/include/include/hpx/semaphore.hpp b/libs/full/include/include/hpx/semaphore.hpp
deleted file mode 100644
index ccd41e512875..000000000000
--- a/libs/full/include/include/hpx/semaphore.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//  Copyright (c) 2021 ETH Zurich
-//
-//  SPDX-License-Identifier: BSL-1.0
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#pragma once
-
-#include <hpx/local/semaphore.hpp>
diff --git a/libs/full/include/include/hpx/shared_mutex.hpp b/libs/full/include/include/hpx/shared_mutex.hpp
deleted file mode 100644
index 2340b6fa77e0..000000000000
--- a/libs/full/include/include/hpx/shared_mutex.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//  Copyright (c) 2021 ETH Zurich
-//
-//  SPDX-License-Identifier: BSL-1.0
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#pragma once
-
-#include <hpx/local/shared_mutex.hpp>
diff --git a/libs/full/include/include/hpx/source_location.hpp b/libs/full/include/include/hpx/source_location.hpp
deleted file mode 100644
index 53b1b3fdf343..000000000000
--- a/libs/full/include/include/hpx/source_location.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//  Copyright (c) 2022 Hartmut Kaiser
-//
-//  SPDX-License-Identifier: BSL-1.0
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#pragma once
-
-#include <hpx/local/source_location.hpp>
diff --git a/libs/full/include/include/hpx/stop_token.hpp b/libs/full/include/include/hpx/stop_token.hpp
deleted file mode 100644
index 144d7b217c41..000000000000
--- a/libs/full/include/include/hpx/stop_token.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//  Copyright (c) 2021 ETH Zurich
-//
-//  SPDX-License-Identifier: BSL-1.0
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#pragma once
-
-#include <hpx/local/stop_token.hpp>
diff --git a/libs/full/include/include/hpx/system_error.hpp b/libs/full/include/include/hpx/system_error.hpp
deleted file mode 100644
index 50f6e6ce7048..000000000000
--- a/libs/full/include/include/hpx/system_error.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//  Copyright (c) 2020 ETH Zurich
-//
-//  SPDX-License-Identifier: BSL-1.0
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#pragma once
-
-#include <hpx/local/system_error.hpp>
diff --git a/libs/full/include/include/hpx/task_block.hpp b/libs/full/include/include/hpx/task_block.hpp
deleted file mode 100644
index 0f46c8ec1c4a..000000000000
--- a/libs/full/include/include/hpx/task_block.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//  Copyright (c) 2020 ETH Zurich
-//
-//  SPDX-License-Identifier: BSL-1.0
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#pragma once
-
-#include <hpx/local/task_block.hpp>
diff --git a/libs/full/include/include/hpx/tuple.hpp b/libs/full/include/include/hpx/tuple.hpp
deleted file mode 100644
index 282051bbbda5..000000000000
--- a/libs/full/include/include/hpx/tuple.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//  Copyright (c) 2020 ETH Zurich
-//
-//  SPDX-License-Identifier: BSL-1.0
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#pragma once
-
-#include <hpx/local/tuple.hpp>
diff --git a/libs/full/include/include/hpx/type_traits.hpp b/libs/full/include/include/hpx/type_traits.hpp
deleted file mode 100644
index d5921283096f..000000000000
--- a/libs/full/include/include/hpx/type_traits.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//  Copyright (c) 2020 ETH Zurich
-//
-//  SPDX-License-Identifier: BSL-1.0
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#pragma once
-
-#include <hpx/local/type_traits.hpp>
diff --git a/libs/full/include/include/hpx/unwrap.hpp b/libs/full/include/include/hpx/unwrap.hpp
deleted file mode 100644
index 432d2ad7a030..000000000000
--- a/libs/full/include/include/hpx/unwrap.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//  Copyright (c) 2021 ETH Zurich
-//
-//  SPDX-License-Identifier: BSL-1.0
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#pragma once
-
-#include <hpx/local/unwrap.hpp>
diff --git a/libs/full/init_runtime/include/hpx/hpx_init.hpp b/libs/full/init_runtime/include/hpx/hpx_init.hpp
index 7ee3bc2bf961..9d82ccc16a66 100644
--- a/libs/full/init_runtime/include/hpx/hpx_init.hpp
+++ b/libs/full/init_runtime/include/hpx/hpx_init.hpp
@@ -1,5 +1,5 @@
 //  Copyright (c)      2018 Mikael Simberg
-//  Copyright (c) 2007-2016 Hartmut Kaiser
+//  Copyright (c) 2007-2023 Hartmut Kaiser
 //  Copyright (c) 2010-2011 Phillip LeBlanc, Dylan Stark
 //  Copyright (c)      2011 Bryce Lelbach
 //
@@ -14,6 +14,7 @@
 #include <hpx/config.hpp>
 #include <hpx/hpx_finalize.hpp>
 #include <hpx/hpx_init_params.hpp>
+#include <hpx/hpx_main_winsocket.hpp>
 #include <hpx/hpx_suspend.hpp>
 #include <hpx/modules/program_options.hpp>
 #include <hpx/resource_partitioner/partitioner_fwd.hpp>
@@ -23,9 +24,6 @@
 
 #include <cstddef>
 #include <functional>
-#include <memory>
-#include <string>
-#include <vector>
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \namespace hpx
diff --git a/libs/full/init_runtime/include/hpx/hpx_init_impl.hpp b/libs/full/init_runtime/include/hpx/hpx_init_impl.hpp
index afd372b767fc..cc3570264c40 100644
--- a/libs/full/init_runtime/include/hpx/hpx_init_impl.hpp
+++ b/libs/full/init_runtime/include/hpx/hpx_init_impl.hpp
@@ -10,26 +10,20 @@
 
 #include <hpx/assert.hpp>
 #include <hpx/functional/bind_back.hpp>
+#include <hpx/functional/function.hpp>
 #include <hpx/hpx_init.hpp>
-#include <hpx/hpx_main_winsocket.hpp>
 #include <hpx/hpx_user_main_config.hpp>
 #include <hpx/init_runtime/detail/run_or_start.hpp>
 #include <hpx/init_runtime_local/init_runtime_local.hpp>
 #include <hpx/modules/program_options.hpp>
-#include <hpx/prefix/find_prefix.hpp>
 #include <hpx/runtime_configuration/runtime_mode.hpp>
 #include <hpx/runtime_local/runtime_local_fwd.hpp>
 #include <hpx/runtime_local/shutdown_function.hpp>
 #include <hpx/runtime_local/startup_function.hpp>
 
-#include <csignal>
 #include <cstddef>
-#include <cstdlib>
 #include <functional>
-#include <memory>
-#include <string>
 #include <utility>
-#include <vector>
 
 #if defined(__FreeBSD__)
 extern HPX_EXPORT char** freebsd_environ;
@@ -37,6 +31,8 @@ extern char** environ;
 #endif
 
 #if defined(HPX_WINDOWS) && defined(HPX_HAVE_APEX)
+#include <string>
+
 namespace apex {
 
     // force linking of the application with APEX
@@ -44,40 +40,13 @@ namespace apex {
 }    // namespace apex
 #endif
 
-namespace hpx {
-    namespace detail {
-        inline int init_impl(
-            hpx::function<int(hpx::program_options::variables_map&)> const& f,
-            int argc, char** argv, init_params const& params)
-        {
-            if (argc == 0 || argv == nullptr)
-            {
-                argc = hpx::local::detail::dummy_argc;
-                argv = hpx::local::detail::dummy_argv;
-            }
+namespace hpx_startup {
 
-#if defined(HPX_WINDOWS)
-            detail::init_winsocket();
-#if defined(HPX_HAVE_APEX)
-            // artificially force the apex shared library to be loaded by the
-            // application
-            apex::version();
-#endif
-#endif
-            util::set_hpx_prefix(HPX_PREFIX);
-#if defined(__FreeBSD__)
-            freebsd_environ = environ;
-#endif
-            // set a handler for std::abort, std::at_quick_exit, and std::atexit
-            std::signal(SIGABRT, detail::on_abort);
-            std::atexit(detail::on_exit);
-#if defined(HPX_HAVE_CXX11_STD_QUICK_EXIT)
-            std::at_quick_exit(detail::on_exit);
-#endif
-            return detail::run_or_start(f, argc, argv, params, true);
-        }
-    }    // namespace detail
+    extern std::function<int(hpx::program_options::variables_map&)> const&
+    get_main_func();
+}
 
+namespace hpx {
     /// \brief Main entry point for launching the HPX runtime system.
     ///
     /// This is the main entry point for any HPX application. This function
@@ -87,7 +56,7 @@ namespace hpx {
     inline int init(std::function<int(hpx::program_options::variables_map&)> f,
         int argc, char** argv, init_params const& params)
     {
-        return detail::init_impl(HPX_MOVE(f), argc, argv, params);
+        return detail::init_impl(HPX_MOVE(f), argc, argv, params, HPX_PREFIX);
     }
 
     /// \brief Main entry point for launching the HPX runtime system.
@@ -101,7 +70,8 @@ namespace hpx {
     {
         std::function<int(hpx::program_options::variables_map&)> main_f =
             hpx::bind_back(detail::init_helper, HPX_MOVE(f));
-        return detail::init_impl(HPX_MOVE(main_f), argc, argv, params);
+        return detail::init_impl(
+            HPX_MOVE(main_f), argc, argv, params, HPX_PREFIX);
     }
 
     /// \brief Main entry point for launching the HPX runtime system.
@@ -112,9 +82,8 @@ namespace hpx {
     /// function given by \p f as a HPX thread.
     inline int init(int argc, char** argv, init_params const& params)
     {
-        std::function<int(hpx::program_options::variables_map&)> main_f =
-            static_cast<hpx_main_type>(::hpx_main);
-        return detail::init_impl(HPX_MOVE(main_f), argc, argv, params);
+        return detail::init_impl(
+            hpx_startup::get_main_func(), argc, argv, params, HPX_PREFIX);
     }
 
     /// \brief Main entry point for launching the HPX runtime system.
@@ -127,7 +96,8 @@ namespace hpx {
         std::nullptr_t, int argc, char** argv, init_params const& params)
     {
         hpx::function<int(hpx::program_options::variables_map&)> main_f;
-        return detail::init_impl(HPX_MOVE(main_f), argc, argv, params);
+        return detail::init_impl(
+            HPX_MOVE(main_f), argc, argv, params, HPX_PREFIX);
     }
 
     /// \brief Main entry point for launching the HPX runtime system.
@@ -137,10 +107,8 @@ namespace hpx {
     /// console mode or worker mode depending on the command line settings).
     inline int init(init_params const& params)
     {
-        hpx::function<int(hpx::program_options::variables_map&)> main_f =
-            static_cast<hpx_main_type>(::hpx_main);
-        return detail::init_impl(HPX_MOVE(main_f),
+        return detail::init_impl(hpx_startup::get_main_func(),
             hpx::local::detail::dummy_argc, hpx::local::detail::dummy_argv,
-            params);
+            params, HPX_PREFIX);
     }
 }    // namespace hpx
diff --git a/libs/full/init_runtime/include/hpx/hpx_init_params.hpp b/libs/full/init_runtime/include/hpx/hpx_init_params.hpp
index c8b4443920a1..a121c5dd61d6 100644
--- a/libs/full/init_runtime/include/hpx/hpx_init_params.hpp
+++ b/libs/full/init_runtime/include/hpx/hpx_init_params.hpp
@@ -1,5 +1,5 @@
 //  Copyright (c) 2020 ETH Zurich
-//  Copyright (c) 2022 Hartmut Kaiser
+//  Copyright (c) 2022-2023 Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -27,9 +27,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 // One of these functions must be implemented by the application for the
 // console locality.
-int hpx_main();
-int hpx_main(int argc, char** argv);
-int hpx_main(hpx::program_options::variables_map& vm);
+//
+// int hpx_main();
+// int hpx_main(int argc, char* argv[]);
+// int hpx_main(hpx::program_options::variables_map& vm);
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/libs/full/init_runtime/include/hpx/hpx_start.hpp b/libs/full/init_runtime/include/hpx/hpx_start.hpp
index f9a4fc885541..357200ce800a 100644
--- a/libs/full/init_runtime/include/hpx/hpx_start.hpp
+++ b/libs/full/init_runtime/include/hpx/hpx_start.hpp
@@ -1,5 +1,5 @@
 //  Copyright (c)      2018 Mikael Simberg
-//  Copyright (c) 2007-2016 Hartmut Kaiser
+//  Copyright (c) 2007-2023 Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -13,14 +13,14 @@
 #include <hpx/functional/function.hpp>
 #include <hpx/hpx_finalize.hpp>
 #include <hpx/hpx_init_params.hpp>
+#include <hpx/hpx_main_winsocket.hpp>
 #include <hpx/modules/program_options.hpp>
 #include <hpx/runtime_configuration/runtime_mode.hpp>
 #include <hpx/runtime_local/shutdown_function.hpp>
 #include <hpx/runtime_local/startup_function.hpp>
 
 #include <cstddef>
-#include <string>
-#include <vector>
+#include <functional>
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \namespace hpx
diff --git a/libs/full/init_runtime/include/hpx/hpx_start_impl.hpp b/libs/full/init_runtime/include/hpx/hpx_start_impl.hpp
index 95fbd9efeed0..baebdab1b64c 100644
--- a/libs/full/init_runtime/include/hpx/hpx_start_impl.hpp
+++ b/libs/full/init_runtime/include/hpx/hpx_start_impl.hpp
@@ -10,24 +10,18 @@
 #include <hpx/assert.hpp>
 #include <hpx/functional/bind_back.hpp>
 #include <hpx/functional/function.hpp>
-#include <hpx/hpx_main_winsocket.hpp>
 #include <hpx/hpx_start.hpp>
 #include <hpx/hpx_user_main_config.hpp>
 #include <hpx/init_runtime/detail/run_or_start.hpp>
 #include <hpx/init_runtime_local/init_runtime_local.hpp>
 #include <hpx/modules/program_options.hpp>
-#include <hpx/prefix/find_prefix.hpp>
 #include <hpx/runtime_configuration/runtime_mode.hpp>
 #include <hpx/runtime_local/runtime_local_fwd.hpp>
 #include <hpx/runtime_local/shutdown_function.hpp>
 #include <hpx/runtime_local/startup_function.hpp>
 
-#include <csignal>
 #include <cstddef>
-#include <cstdlib>
-#include <string>
 #include <utility>
-#include <vector>
 
 #if defined(__FreeBSD__)
 extern HPX_EXPORT char** freebsd_environ;
@@ -35,6 +29,8 @@ extern char** environ;
 #endif
 
 #if defined(HPX_WINDOWS) && defined(HPX_HAVE_APEX)
+#include <string>
+
 namespace apex {
 
     // force linking of the application with APEX
@@ -42,40 +38,13 @@ namespace apex {
 }    // namespace apex
 #endif
 
-namespace hpx {
-    namespace detail {
-        inline bool start_impl(
-            hpx::function<int(hpx::program_options::variables_map&)> const& f,
-            int argc, char** argv, init_params const& params)
-        {
-            if (argc == 0 || argv == nullptr)
-            {
-                argc = local::detail::dummy_argc;
-                argv = local::detail::dummy_argv;
-            }
+namespace hpx_startup {
 
-#if defined(HPX_WINDOWS)
-            detail::init_winsocket();
-#if defined(HPX_HAVE_APEX)
-            // artificially force the apex shared library to be loaded by the
-            // application
-            apex::version();
-#endif
-#endif
-            util::set_hpx_prefix(HPX_PREFIX);
-#if defined(__FreeBSD__)
-            freebsd_environ = environ;
-#endif
-            // set a handler for std::abort, std::at_quick_exit, and std::atexit
-            std::signal(SIGABRT, detail::on_abort);
-            std::atexit(detail::on_exit);
-#if defined(HPX_HAVE_CXX11_STD_QUICK_EXIT)
-            std::at_quick_exit(detail::on_exit);
-#endif
-            return 0 == detail::run_or_start(f, argc, argv, params, false);
-        }
-    }    // namespace detail
+    extern std::function<int(hpx::program_options::variables_map&)> const&
+    get_main_func();
+}
 
+namespace hpx {
     /// \brief Main non-blocking entry point for launching the HPX runtime system.
     ///
     /// This is the main, non-blocking entry point for any HPX application.
@@ -88,7 +57,7 @@ namespace hpx {
         std::function<int(hpx::program_options::variables_map&)> f, int argc,
         char** argv, init_params const& params)
     {
-        return detail::start_impl(HPX_MOVE(f), argc, argv, params);
+        return detail::start_impl(HPX_MOVE(f), argc, argv, params, HPX_PREFIX);
     }
 
     /// \brief Main non-blocking entry point for launching the HPX runtime system.
@@ -104,7 +73,8 @@ namespace hpx {
     {
         hpx::function<int(hpx::program_options::variables_map&)> main_f =
             hpx::bind_back(detail::init_helper, HPX_MOVE(f));
-        return detail::start_impl(HPX_MOVE(main_f), argc, argv, params);
+        return detail::start_impl(
+            HPX_MOVE(main_f), argc, argv, params, HPX_PREFIX);
     }
 
     /// \brief Main non-blocking entry point for launching the HPX runtime system.
@@ -117,9 +87,8 @@ namespace hpx {
     /// with the runtime system's execution.
     inline bool start(int argc, char** argv, init_params const& params)
     {
-        hpx::function<int(hpx::program_options::variables_map&)> main_f =
-            static_cast<hpx_main_type>(::hpx_main);
-        return detail::start_impl(HPX_MOVE(main_f), argc, argv, params);
+        return detail::start_impl(
+            hpx_startup::get_main_func(), argc, argv, params, HPX_PREFIX);
     }
 
     /// \brief Main non-blocking entry point for launching the HPX runtime system.
@@ -134,7 +103,8 @@ namespace hpx {
         std::nullptr_t, int argc, char** argv, init_params const& params)
     {
         hpx::function<int(hpx::program_options::variables_map&)> main_f;
-        return detail::start_impl(HPX_MOVE(main_f), argc, argv, params);
+        return detail::start_impl(
+            HPX_MOVE(main_f), argc, argv, params, HPX_PREFIX);
     }
 
     /// \brief Main non-blocking entry point for launching the HPX runtime system.
@@ -147,10 +117,8 @@ namespace hpx {
     /// with the runtime system's execution.
     inline bool start(init_params const& params)
     {
-        hpx::function<int(hpx::program_options::variables_map&)> main_f =
-            static_cast<hpx_main_type>(::hpx_main);
-        return detail::start_impl(HPX_MOVE(main_f),
+        return detail::start_impl(hpx_startup::get_main_func(),
             hpx::local::detail::dummy_argc, hpx::local::detail::dummy_argv,
-            params);
+            params, HPX_PREFIX);
     }
 }    // namespace hpx
diff --git a/libs/full/init_runtime/include/hpx/init.hpp b/libs/full/init_runtime/include/hpx/init.hpp
index 7f0038b9ec76..d26d41622461 100644
--- a/libs/full/init_runtime/include/hpx/init.hpp
+++ b/libs/full/init_runtime/include/hpx/init.hpp
@@ -6,6 +6,8 @@
 
 #pragma once
 
+#include <hpx/init_runtime_local/init_runtime_local.hpp>
+
 #include <hpx/hpx_finalize.hpp>
 #include <hpx/hpx_init.hpp>
 #include <hpx/hpx_init_params.hpp>
diff --git a/libs/full/init_runtime/include/hpx/init_runtime/detail/run_or_start.hpp b/libs/full/init_runtime/include/hpx/init_runtime/detail/run_or_start.hpp
index ae9d7f1079e4..14279896ff1e 100644
--- a/libs/full/init_runtime/include/hpx/init_runtime/detail/run_or_start.hpp
+++ b/libs/full/init_runtime/include/hpx/init_runtime/detail/run_or_start.hpp
@@ -13,10 +13,21 @@
 namespace hpx {
     /// \cond NOINTERNAL
     namespace detail {
+
         HPX_EXPORT int run_or_start(
             hpx::function<int(hpx::program_options::variables_map& vm)> const&
                 f,
             int argc, char** argv, init_params const& params, bool blocking);
+
+        HPX_EXPORT int init_impl(
+            hpx::function<int(hpx::program_options::variables_map&)> const& f,
+            int argc, char** argv, init_params const& params,
+            char const* hpx_prefix);
+
+        HPX_EXPORT bool start_impl(
+            hpx::function<int(hpx::program_options::variables_map&)> const& f,
+            int argc, char** argv, init_params const& params,
+            char const* hpx_prefix);
     }    // namespace detail
     /// \endcond
 }    // namespace hpx
diff --git a/libs/full/init_runtime/src/hpx_init.cpp b/libs/full/init_runtime/src/hpx_init.cpp
index e3d07d9104e1..8623d500cc8f 100644
--- a/libs/full/init_runtime/src/hpx_init.cpp
+++ b/libs/full/init_runtime/src/hpx_init.cpp
@@ -18,6 +18,7 @@
 #include <hpx/functional/function.hpp>
 #include <hpx/futures/detail/future_data.hpp>
 #include <hpx/hpx_finalize.hpp>
+#include <hpx/hpx_main_winsocket.hpp>
 #include <hpx/hpx_suspend.hpp>
 #include <hpx/hpx_user_main_config.hpp>
 #include <hpx/init_runtime/detail/init_logging.hpp>
@@ -32,6 +33,7 @@
 #include <hpx/modules/testing.hpp>
 #include <hpx/modules/timing.hpp>
 #include <hpx/parallel/util/detail/handle_exception_termination_handler.hpp>
+#include <hpx/prefix/find_prefix.hpp>
 #include <hpx/program_options/parsers.hpp>
 #include <hpx/program_options/variables_map.hpp>
 #include <hpx/resource_partitioner/partitioner.hpp>
@@ -76,12 +78,9 @@
 #include <hpx/runtime_distributed/runtime_support.hpp>
 #endif
 
-#if defined(HPX_NATIVE_MIC) || defined(__bgq__)
-#include <cstdlib>
-#endif
-
 #include <cmath>
 #include <cstddef>
+#include <cstdlib>
 #include <exception>
 #include <functional>
 #include <iostream>
@@ -101,13 +100,79 @@
 namespace hpx_startup {
     std::vector<std::string> (*user_main_config_function)(
         std::vector<std::string> const&) = nullptr;
-}
+}    // namespace hpx_startup
 
 ///////////////////////////////////////////////////////////////////////////////
 namespace hpx::detail {
 
     // forward declarations only
     void console_print(std::string const&);
+
+    int init_impl(
+        hpx::function<int(hpx::program_options::variables_map&)> const& f,
+        int argc, char** argv, init_params const& params,
+        char const* hpx_prefix)
+    {
+        if (argc == 0 || argv == nullptr)
+        {
+            argc = hpx::local::detail::dummy_argc;
+            argv = hpx::local::detail::dummy_argv;
+        }
+
+#if defined(HPX_WINDOWS)
+        detail::init_winsocket();
+#if defined(HPX_HAVE_APEX)
+        // artificially force the apex shared library to be loaded by the
+        // application
+        apex::version();
+#endif
+#endif
+        util::set_hpx_prefix(hpx_prefix);
+#if defined(__FreeBSD__)
+        freebsd_environ = environ;
+#endif
+        // set a handler for std::abort, std::at_quick_exit, and std::atexit
+        std::signal(SIGABRT, detail::on_abort);
+        std::atexit(detail::on_exit);
+#if defined(HPX_HAVE_CXX11_STD_QUICK_EXIT)
+        [[maybe_unused]] int ret = std::at_quick_exit(detail::on_exit);
+        HPX_ASSERT(ret == 0);
+#endif
+        return detail::run_or_start(f, argc, argv, params, true);
+    }
+
+    bool start_impl(
+        hpx::function<int(hpx::program_options::variables_map&)> const& f,
+        int argc, char** argv, init_params const& params,
+        char const* hpx_prefix)
+    {
+        if (argc == 0 || argv == nullptr)
+        {
+            argc = local::detail::dummy_argc;
+            argv = local::detail::dummy_argv;
+        }
+
+#if defined(HPX_WINDOWS)
+        detail::init_winsocket();
+#if defined(HPX_HAVE_APEX)
+        // artificially force the apex shared library to be loaded by the
+        // application
+        apex::version();
+#endif
+#endif
+        util::set_hpx_prefix(hpx_prefix);
+#if defined(__FreeBSD__)
+        freebsd_environ = environ;
+#endif
+        // set a handler for std::abort, std::at_quick_exit, and std::atexit
+        std::signal(SIGABRT, detail::on_abort);
+        std::atexit(detail::on_exit);
+#if defined(HPX_HAVE_CXX11_STD_QUICK_EXIT)
+        [[maybe_unused]] int ret = std::at_quick_exit(detail::on_exit);
+        HPX_ASSERT(ret == 0);
+#endif
+        return 0 == detail::run_or_start(f, argc, argv, params, false);
+    }
 }    // namespace hpx::detail
 
 #if defined(HPX_HAVE_DISTRIBUTED_RUNTIME)
diff --git a/libs/full/init_runtime/tests/unit/parcel_pool.cpp b/libs/full/init_runtime/tests/unit/parcel_pool.cpp
index 245047793247..8af55dfb0d47 100644
--- a/libs/full/init_runtime/tests/unit/parcel_pool.cpp
+++ b/libs/full/init_runtime/tests/unit/parcel_pool.cpp
@@ -4,11 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
 #include <hpx/init.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/runtime.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/runtime.hpp>
 
 #include <algorithm>
 #include <cstdlib>
diff --git a/libs/full/init_runtime/tests/unit/runtime_type.cpp b/libs/full/init_runtime/tests/unit/runtime_type.cpp
index 93a4d2b63e80..cfcddbc95b19 100644
--- a/libs/full/init_runtime/tests/unit/runtime_type.cpp
+++ b/libs/full/init_runtime/tests/unit/runtime_type.cpp
@@ -5,13 +5,17 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <hpx/init.hpp>
-#include <hpx/local/runtime.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/program_options.hpp>
+#include <hpx/runtime.hpp>
 
 #include <utility>
 
 static bool ran_hpx_main;
 
+// forward declare only (is defined in hpx_init)
+int hpx_main(hpx::program_options::variables_map&);
+
 int hpx_main()
 {
     ran_hpx_main = true;
diff --git a/libs/full/init_runtime/tests/unit/shutdown_suspended_thread.cpp b/libs/full/init_runtime/tests/unit/shutdown_suspended_thread.cpp
index 4244c979b68b..e74ddb25c8e4 100644
--- a/libs/full/init_runtime/tests/unit/shutdown_suspended_thread.cpp
+++ b/libs/full/init_runtime/tests/unit/shutdown_suspended_thread.cpp
@@ -7,11 +7,10 @@
 // This test checks that the runtime takes into account suspended threads before
 // initiating full shutdown.
 
-#include <hpx/config.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 
diff --git a/libs/full/init_runtime/tests/unit/start_stop_callbacks.cpp b/libs/full/init_runtime/tests/unit/start_stop_callbacks.cpp
index b33f4d9f916a..0a3ad35a72c7 100644
--- a/libs/full/init_runtime/tests/unit/start_stop_callbacks.cpp
+++ b/libs/full/init_runtime/tests/unit/start_stop_callbacks.cpp
@@ -5,8 +5,8 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <hpx/init.hpp>
-#include <hpx/local/runtime.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/runtime.hpp>
 #include <hpx/util/from_string.hpp>
 
 #include <algorithm>
diff --git a/libs/full/lcos_distributed/include/hpx/lcos_distributed/channel.hpp b/libs/full/lcos_distributed/include/hpx/lcos_distributed/channel.hpp
index 584002fe47c2..111ebd8e4793 100644
--- a/libs/full/lcos_distributed/include/hpx/lcos_distributed/channel.hpp
+++ b/libs/full/lcos_distributed/include/hpx/lcos_distributed/channel.hpp
@@ -21,7 +21,7 @@
 #include <type_traits>
 #include <utility>
 
-namespace hpx { namespace lcos {
+namespace hpx::lcos {
 
     ///////////////////////////////////////////////////////////////////////////
     template <typename T = void>
@@ -557,5 +557,11 @@ namespace hpx { namespace lcos {
             return close(launch::sync, force_delete_entries);
         }
     };
-}}    // namespace hpx::lcos
+}    // namespace hpx::lcos
+
+namespace hpx::distributed {
+
+    using hpx::lcos::channel;
+}    // namespace hpx::distributed
+
 #endif
diff --git a/libs/full/parcelset/tests/unit/put_parcels.cpp b/libs/full/parcelset/tests/unit/put_parcels.cpp
index fcad0c0b88e7..ec24b7b2f58f 100644
--- a/libs/full/parcelset/tests/unit/put_parcels.cpp
+++ b/libs/full/parcelset/tests/unit/put_parcels.cpp
@@ -6,10 +6,10 @@
 
 #include <hpx/config.hpp>
 #if !defined(HPX_COMPUTE_DEVICE_CODE)
+#include <hpx/experimental/task_group.hpp>
 #include <hpx/hpx.hpp>
 #include <hpx/hpx_init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/parallel/task_group.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/libs/full/runtime_distributed/src/runtime_distributed.cpp b/libs/full/runtime_distributed/src/runtime_distributed.cpp
index 486e3b84d307..9f56911bcf80 100644
--- a/libs/full/runtime_distributed/src/runtime_distributed.cpp
+++ b/libs/full/runtime_distributed/src/runtime_distributed.cpp
@@ -104,7 +104,10 @@ namespace hpx {
 #if defined(HPX_HAVE_NETWORKING)
         void dijkstra_make_black()
         {
-            get_runtime_support_ptr()->dijkstra_make_black();
+            if (auto* rtp = get_runtime_support_ptr(); rtp != nullptr)
+            {
+                rtp->dijkstra_make_black();
+            }
         }
 #endif
 
@@ -172,8 +175,12 @@ namespace hpx {
     ///////////////////////////////////////////////////////////////////////////
     components::server::runtime_support* get_runtime_support_ptr()
     {
-        return static_cast<components::server::runtime_support*>(
-            get_runtime_distributed().get_runtime_support_lva());
+        if (auto const* rt = get_runtime_distributed_ptr(); rt != nullptr)
+        {
+            return static_cast<components::server::runtime_support*>(
+                rt->get_runtime_support_lva());
+        }
+        return nullptr;
     }
 
     ///////////////////////////////////////////////////////////////////////////
diff --git a/libs/full/runtime_distributed/tests/regressions/unhandled_exception_582.cpp b/libs/full/runtime_distributed/tests/regressions/unhandled_exception_582.cpp
index 4ee8d52d0688..35b5cac881e8 100644
--- a/libs/full/runtime_distributed/tests/regressions/unhandled_exception_582.cpp
+++ b/libs/full/runtime_distributed/tests/regressions/unhandled_exception_582.cpp
@@ -6,8 +6,8 @@
 //
 // Checking that #582 was fixed
 
+#include <hpx/exception.hpp>
 #include <hpx/init.hpp>
-#include <hpx/local/exception.hpp>
 #include <hpx/modules/testing.hpp>
 
 int hpx_main()
diff --git a/libs/full/segmented_algorithms/tests/unit/partitioned_vector_target.cpp b/libs/full/segmented_algorithms/tests/unit/partitioned_vector_target.cpp
index ffb934e5be71..8868874e89d3 100644
--- a/libs/full/segmented_algorithms/tests/unit/partitioned_vector_target.cpp
+++ b/libs/full/segmented_algorithms/tests/unit/partitioned_vector_target.cpp
@@ -6,8 +6,8 @@
 
 #include <hpx/config.hpp>
 #if !defined(HPX_COMPUTE_DEVICE_CODE)
+#include <hpx/compute.hpp>
 #include <hpx/hpx_main.hpp>
-#include <hpx/include/compute.hpp>
 #include <hpx/include/partitioned_vector.hpp>
 #include <hpx/include/runtime.hpp>
 #include <hpx/modules/testing.hpp>
diff --git a/tests/performance/local/async_overheads.cpp b/tests/performance/local/async_overheads.cpp
index e33daf479935..830a0a858b24 100644
--- a/tests/performance/local/async_overheads.cpp
+++ b/tests/performance/local/async_overheads.cpp
@@ -4,9 +4,9 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
 #include <hpx/init.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
 #include <hpx/modules/testing.hpp>
 
 #include "worker_timed.hpp"
diff --git a/tests/performance/local/future_overhead.cpp b/tests/performance/local/future_overhead.cpp
index 094382294d1e..2ea3701c48d0 100644
--- a/tests/performance/local/future_overhead.cpp
+++ b/tests/performance/local/future_overhead.cpp
@@ -9,21 +9,17 @@
 #include <hpx/config.hpp>
 #if defined(HPX_HAVE_DISTRIBUTED_RUNTIME) && !defined(HPX_COMPUTE_DEVICE_CODE)
 #include <hpx/actions_base/plain_action.hpp>
-#include <hpx/async_distributed/continuation.hpp>
-#include <hpx/future.hpp>
-#include <hpx/runtime.hpp>
 #endif
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/format.hpp>
+#include <hpx/future.hpp>
 #include <hpx/init.hpp>
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/runtime.hpp>
-#include <hpx/local/thread.hpp>
-#include <hpx/modules/format.hpp>
 #include <hpx/modules/synchronization.hpp>
 #include <hpx/modules/testing.hpp>
 #include <hpx/modules/timing.hpp>
-#include <hpx/threading_base/annotated_function.hpp>
+#include <hpx/runtime.hpp>
+#include <hpx/thread.hpp>
 
 #include <array>
 #include <atomic>
@@ -287,12 +283,12 @@ struct unlimited_number_of_chunks
     }
 };
 
-namespace hpx { namespace parallel { namespace execution {
+namespace hpx::parallel::execution {
     template <>
     struct is_executor_parameters<unlimited_number_of_chunks> : std::true_type
     {
     };
-}}}    // namespace hpx::parallel::execution
+}    // namespace hpx::parallel::execution
 
 template <typename Executor>
 void measure_function_futures_for_loop(std::uint64_t count, bool csv,
diff --git a/tests/performance/local/future_overhead_report.cpp b/tests/performance/local/future_overhead_report.cpp
index f0dc5f5c2ad0..05acfd7af2eb 100644
--- a/tests/performance/local/future_overhead_report.cpp
+++ b/tests/performance/local/future_overhead_report.cpp
@@ -7,11 +7,11 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <hpx/config.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <array>
 #include <cstddef>
diff --git a/tests/performance/local/hpx_heterogeneous_timed_task_spawn.cpp b/tests/performance/local/hpx_heterogeneous_timed_task_spawn.cpp
index 21c223136de5..06e6f14fd203 100644
--- a/tests/performance/local/hpx_heterogeneous_timed_task_spawn.cpp
+++ b/tests/performance/local/hpx_heterogeneous_timed_task_spawn.cpp
@@ -7,11 +7,11 @@
 
 #include <hpx/config.hpp>
 #if !defined(HPX_COMPUTE_DEVICE_CODE)
-#include <hpx/local/functional.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/modules/format.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/format.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/threadmanager.hpp>
-#include <hpx/modules/timing.hpp>
 
 #include <cstdint>
 #include <functional>
diff --git a/tests/performance/local/htts_v2/htts2_hpx.cpp b/tests/performance/local/htts_v2/htts2_hpx.cpp
index 993549014e8d..49624b38ac2d 100644
--- a/tests/performance/local/htts_v2/htts2_hpx.cpp
+++ b/tests/performance/local/htts_v2/htts2_hpx.cpp
@@ -7,11 +7,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/barrier.hpp>
-#include <hpx/local/functional.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
-#include <hpx/modules/format.hpp>
+#include <hpx/barrier.hpp>
+#include <hpx/format.hpp>
+#include <hpx/functional.hpp>
+#include <hpx/init.hpp>
+#include <hpx/thread.hpp>
 
 #include "htts2.hpp"
 
diff --git a/tests/performance/local/parent_vs_child_stealing.cpp b/tests/performance/local/parent_vs_child_stealing.cpp
index f7d27b1dcea7..72edfe0f3745 100644
--- a/tests/performance/local/parent_vs_child_stealing.cpp
+++ b/tests/performance/local/parent_vs_child_stealing.cpp
@@ -6,11 +6,11 @@
 
 #include <hpx/config.hpp>
 #if !defined(HPX_COMPUTE_DEVICE_CODE)
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/modules/format.hpp>
-#include <hpx/modules/program_options.hpp>
-#include <hpx/modules/timing.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/format.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
+#include <hpx/program_options.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/tests/performance/local/resume_suspend.cpp b/tests/performance/local/resume_suspend.cpp
index 4f3b29399882..60bb8102ee10 100644
--- a/tests/performance/local/resume_suspend.cpp
+++ b/tests/performance/local/resume_suspend.cpp
@@ -8,13 +8,12 @@
 // runtime. This is meant to be compared to start_stop and
 // openmp_parallel_region.
 
-#include <hpx/execution_base/this_thread.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
 #include <hpx/init.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
 #include <hpx/modules/testing.hpp>
-
-#include <hpx/modules/program_options.hpp>
+#include <hpx/program_options.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/tests/performance/local/skynet.cpp b/tests/performance/local/skynet.cpp
index 84a084397342..b822f7c2efe2 100644
--- a/tests/performance/local/skynet.cpp
+++ b/tests/performance/local/skynet.cpp
@@ -17,9 +17,9 @@
 // This code implements two versions of the skynet micro benchmark: a 'normal'
 // and a futurized one.
 
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 
 #include <cstdint>
 #include <iostream>
diff --git a/tests/performance/local/start_stop.cpp b/tests/performance/local/start_stop.cpp
index e52d9338d12a..0b479605e9cd 100644
--- a/tests/performance/local/start_stop.cpp
+++ b/tests/performance/local/start_stop.cpp
@@ -7,12 +7,12 @@
 // This example benchmarks the time it takes to start and stop the HPX runtime.
 // This is meant to be compared to resume_suspend and openmp_parallel_region.
 
-#include <hpx/execution_base/this_thread.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/future.hpp>
 #include <hpx/init.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/modules/program_options.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/program_options.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/tests/performance/local/stream.cpp b/tests/performance/local/stream.cpp
index e39f47d4ba18..8e1129e5fa22 100644
--- a/tests/performance/local/stream.cpp
+++ b/tests/performance/local/stream.cpp
@@ -17,13 +17,13 @@
 #define BOOST_NO_CXX11_ALLOCATOR
 #endif
 
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/format.hpp>
 #include <hpx/init.hpp>
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/thread.hpp>
 #include <hpx/modules/compute.hpp>
 #include <hpx/modules/compute_local.hpp>
-#include <hpx/modules/format.hpp>
+#include <hpx/thread.hpp>
 #include <hpx/type_support/unused.hpp>
 #include <hpx/version.hpp>
 
diff --git a/tests/performance/local/stream_report.cpp b/tests/performance/local/stream_report.cpp
index 4bdd3173e4b2..c693daa89681 100644
--- a/tests/performance/local/stream_report.cpp
+++ b/tests/performance/local/stream_report.cpp
@@ -17,13 +17,13 @@
 #define BOOST_NO_CXX11_ALLOCATOR
 #endif
 
+#include <hpx/algorithm.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/format.hpp>
 #include <hpx/init.hpp>
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/thread.hpp>
 #include <hpx/modules/compute.hpp>
-#include <hpx/modules/format.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 #include <hpx/type_support/unused.hpp>
 #include <hpx/version.hpp>
 
diff --git a/tests/performance/local/transform_reduce_binary_scaling.cpp b/tests/performance/local/transform_reduce_binary_scaling.cpp
index 540018af6864..b9445289f98f 100644
--- a/tests/performance/local/transform_reduce_binary_scaling.cpp
+++ b/tests/performance/local/transform_reduce_binary_scaling.cpp
@@ -4,11 +4,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/local/algorithm.hpp>
-#include <hpx/local/chrono.hpp>
-#include <hpx/local/execution.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/numeric.hpp>
+#include <hpx/algorithm.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/execution.hpp>
+#include <hpx/init.hpp>
+#include <hpx/numeric.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/tests/performance/local/wait_all_timings.cpp b/tests/performance/local/wait_all_timings.cpp
index 94dd2875b036..ac0529b9c52e 100644
--- a/tests/performance/local/wait_all_timings.cpp
+++ b/tests/performance/local/wait_all_timings.cpp
@@ -6,12 +6,12 @@
 
 #include <hpx/config.hpp>
 #if !defined(HPX_COMPUTE_DEVICE_CODE)
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/modules/format.hpp>
-#include <hpx/modules/program_options.hpp>
+#include <hpx/chrono.hpp>
+#include <hpx/format.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
-#include <hpx/modules/timing.hpp>
+#include <hpx/program_options.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/tests/regressions/stack_size_config_4543.cpp b/tests/regressions/stack_size_config_4543.cpp
index 5066a15625ce..13abba301415 100644
--- a/tests/regressions/stack_size_config_4543.cpp
+++ b/tests/regressions/stack_size_config_4543.cpp
@@ -5,7 +5,7 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <hpx/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 
diff --git a/tests/regressions/threads/block_os_threads_1036.cpp b/tests/regressions/threads/block_os_threads_1036.cpp
index f122f9a6ece7..a889886cb5e4 100644
--- a/tests/regressions/threads/block_os_threads_1036.cpp
+++ b/tests/regressions/threads/block_os_threads_1036.cpp
@@ -7,13 +7,13 @@
 // This test demonstrates the issue described in #1036: Scheduler hangs when
 // user code attempts to "block" OS-threads
 
-#include <hpx/functional/bind.hpp>
+#include <hpx/barrier.hpp>
+#include <hpx/functional.hpp>
 #include <hpx/init.hpp>
-#include <hpx/local/barrier.hpp>
 #include <hpx/modules/testing.hpp>
 #include <hpx/modules/timing.hpp>
-#include <hpx/threading_base/thread_helpers.hpp>
-#include <hpx/topology/topology.hpp>
+#include <hpx/modules/topology.hpp>
+#include <hpx/thread.hpp>
 
 #include <atomic>
 #include <cstdint>
diff --git a/tests/regressions/threads/run_as_hpx_thread_exceptions_3304.cpp b/tests/regressions/threads/run_as_hpx_thread_exceptions_3304.cpp
index 4326ca1c19a2..0495f868c4a6 100644
--- a/tests/regressions/threads/run_as_hpx_thread_exceptions_3304.cpp
+++ b/tests/regressions/threads/run_as_hpx_thread_exceptions_3304.cpp
@@ -4,12 +4,12 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/condition_variable.hpp>
+#include <hpx/exception.hpp>
+#include <hpx/functional.hpp>
 #include <hpx/init.hpp>
-#include <hpx/local/condition_variable.hpp>
-#include <hpx/local/exception.hpp>
-#include <hpx/local/functional.hpp>
-#include <hpx/local/mutex.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/mutex.hpp>
 #include <hpx/runtime_local/run_as_hpx_thread.hpp>
 
 #include <functional>
diff --git a/tests/regressions/threads/stackless_self_4155.cpp b/tests/regressions/threads/stackless_self_4155.cpp
index 9a23da9ce36b..236351c05c61 100644
--- a/tests/regressions/threads/stackless_self_4155.cpp
+++ b/tests/regressions/threads/stackless_self_4155.cpp
@@ -5,8 +5,8 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <hpx/hpx_main.hpp>
-#include <hpx/local/thread.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 void stackless_thread()
 {
diff --git a/tests/regressions/threads/thread_data_1111.cpp b/tests/regressions/threads/thread_data_1111.cpp
index 49f191827be5..ccce9dae4c31 100644
--- a/tests/regressions/threads/thread_data_1111.cpp
+++ b/tests/regressions/threads/thread_data_1111.cpp
@@ -7,8 +7,8 @@
 // This test illustrates #1111: hpx::threads::get_thread_data always returns zero
 
 #include <hpx/hpx_main.hpp>
-#include <hpx/local/thread.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/tests/regressions/threads/thread_rescheduling.cpp b/tests/regressions/threads/thread_rescheduling.cpp
index 0e98518ce137..abb25eda95e0 100644
--- a/tests/regressions/threads/thread_rescheduling.cpp
+++ b/tests/regressions/threads/thread_rescheduling.cpp
@@ -7,10 +7,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <hpx/datastructures/detail/dynamic_bitset.hpp>
-#include <hpx/local/future.hpp>
-#include <hpx/local/init.hpp>
-#include <hpx/local/thread.hpp>
+#include <hpx/future.hpp>
+#include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <cstdint>
diff --git a/tests/regressions/threads/thread_suspend_duration.cpp b/tests/regressions/threads/thread_suspend_duration.cpp
index 4f1a4302843d..fb1909bcb1e0 100644
--- a/tests/regressions/threads/thread_suspend_duration.cpp
+++ b/tests/regressions/threads/thread_suspend_duration.cpp
@@ -5,11 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/barrier.hpp>
+#include <hpx/functional.hpp>
 #include <hpx/init.hpp>
-#include <hpx/local/barrier.hpp>
-#include <hpx/local/functional.hpp>
-#include <hpx/local/thread.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <chrono>
 #include <cstddef>
diff --git a/tests/regressions/threads/thread_suspend_pending.cpp b/tests/regressions/threads/thread_suspend_pending.cpp
index 98113f79c0a4..76305a6550da 100644
--- a/tests/regressions/threads/thread_suspend_pending.cpp
+++ b/tests/regressions/threads/thread_suspend_pending.cpp
@@ -5,11 +5,11 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <hpx/barrier.hpp>
+#include <hpx/functional.hpp>
 #include <hpx/init.hpp>
-#include <hpx/local/barrier.hpp>
-#include <hpx/local/functional.hpp>
-#include <hpx/local/thread.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <functional>
diff --git a/tests/regressions/threads/threads_all_1422.cpp b/tests/regressions/threads/threads_all_1422.cpp
index 432ff1dc8745..a855720c0580 100644
--- a/tests/regressions/threads/threads_all_1422.cpp
+++ b/tests/regressions/threads/threads_all_1422.cpp
@@ -8,9 +8,9 @@
 // allocates too many os threads
 
 #include <hpx/init.hpp>
-#include <hpx/local/runtime.hpp>
-#include <hpx/local/thread.hpp>
 #include <hpx/modules/testing.hpp>
+#include <hpx/runtime.hpp>
+#include <hpx/thread.hpp>
 
 #include <cstddef>
 #include <iostream>