diff --git a/cmake/templates/hpx.ixx.in b/cmake/templates/hpx.ixx.in
index b31141b6b76..b60b04b585d 100644
--- a/cmake/templates/hpx.ixx.in
+++ b/cmake/templates/hpx.ixx.in
@@ -1,5 +1,5 @@
 //  Copyright (c) 2025 Haokun Wu
-//  Copyright (c) 2025 Hartmut Kaiser
+//  Copyright (c) 2025-@HPX_COPYRIGHT_YEAR@ Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
diff --git a/components/component_storage/include/hpx/components/component_storage/server/component_storage.hpp b/components/component_storage/include/hpx/components/component_storage/server/component_storage.hpp
index 9a5bb87cb0b..5aacafadf51 100644
--- a/components/component_storage/include/hpx/components/component_storage/server/component_storage.hpp
+++ b/components/component_storage/include/hpx/components/component_storage/server/component_storage.hpp
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/naming_base.hpp>
diff --git a/components/component_storage/src/component_module.cpp b/components/component_storage/src/component_module.cpp
index 0171a6e44fa..b23c1e33a22 100644
--- a/components/component_storage/src/component_module.cpp
+++ b/components/component_storage/src/component_module.cpp
@@ -5,6 +5,7 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <hpx/config.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/components_base.hpp>
diff --git a/components/containers/partitioned_vector/include/hpx/components/containers/partitioned_vector/partitioned_vector_component_decl.hpp b/components/containers/partitioned_vector/include/hpx/components/containers/partitioned_vector/partitioned_vector_component_decl.hpp
index 967ee9aa4cb..ac8af57d32a 100644
--- a/components/containers/partitioned_vector/include/hpx/components/containers/partitioned_vector/partitioned_vector_component_decl.hpp
+++ b/components/containers/partitioned_vector/include/hpx/components/containers/partitioned_vector/partitioned_vector_component_decl.hpp
@@ -17,7 +17,7 @@
 /// classes are asynchronous API which return the futures.
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
 #include <hpx/components/client_base.hpp>
 #include <hpx/modules/actions_base.hpp>
diff --git a/components/containers/unordered/include/hpx/components/containers/unordered/partition_unordered_map_component.hpp b/components/containers/unordered/include/hpx/components/containers/unordered/partition_unordered_map_component.hpp
index 1fb205edcb2..34b8da5d77d 100644
--- a/components/containers/unordered/include/hpx/components/containers/unordered/partition_unordered_map_component.hpp
+++ b/components/containers/unordered/include/hpx/components/containers/unordered/partition_unordered_map_component.hpp
@@ -17,8 +17,8 @@
 /// classes are asynchronous API which return the futures.
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/assert.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
 #include <hpx/components/client_base.hpp>
 #include <hpx/components/get_ptr.hpp>
diff --git a/components/iostreams/include/hpx/components/iostreams/server/output_stream.hpp b/components/iostreams/include/hpx/components/iostreams/server/output_stream.hpp
index aa7f1e6649c..d194462b08c 100644
--- a/components/iostreams/include/hpx/components/iostreams/server/output_stream.hpp
+++ b/components/iostreams/include/hpx/components/iostreams/server/output_stream.hpp
@@ -8,7 +8,7 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/components_base.hpp>
diff --git a/components/iostreams/src/component_module.cpp b/components/iostreams/src/component_module.cpp
index 0f2a54c67a5..554be20f5a1 100644
--- a/components/iostreams/src/component_module.cpp
+++ b/components/iostreams/src/component_module.cpp
@@ -11,6 +11,7 @@
 #include <hpx/components/iostreams/server/output_stream.hpp>
 #include <hpx/components/iostreams/standard_streams.hpp>
 
+#include <hpx/modules/actions.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/components_base.hpp>
diff --git a/components/process/include/hpx/components/process/server/child.hpp b/components/process/include/hpx/components/process/server/child.hpp
index e87ea97c4a1..a23ca719045 100644
--- a/components/process/include/hpx/components/process/server/child.hpp
+++ b/components/process/include/hpx/components/process/server/child.hpp
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/components_base.hpp>
diff --git a/libs/full/actions/CMakeLists.txt b/libs/full/actions/CMakeLists.txt
index c22e8464ea6..c65c971afa4 100644
--- a/libs/full/actions/CMakeLists.txt
+++ b/libs/full/actions/CMakeLists.txt
@@ -16,6 +16,7 @@ set(actions_headers
     hpx/actions/actions_fwd.hpp
     hpx/actions/base_action.hpp
     hpx/actions/invoke_function.hpp
+    hpx/actions/macros.hpp
     hpx/actions/post_helper_fwd.hpp
     hpx/actions/post_helper.hpp
     hpx/actions/register_action.hpp
@@ -23,6 +24,8 @@ set(actions_headers
     hpx/actions/transfer_action.hpp
 )
 
+set(actions_macro_headers hpx/actions/macros.hpp)
+
 # Default location is $HPX_ROOT/libs/actions/include_compatibility
 # cmake-format: off
 set(actions_compat_headers
@@ -43,8 +46,10 @@ include(HPX_AddModule)
 add_hpx_module(
   full actions
   GLOBAL_HEADER_GEN ON
+  GLOBAL_HEADER_MODULE_GEN ON
   SOURCES ${actions_sources}
   HEADERS ${actions_headers}
+  MACRO_HEADERS ${actions_macro_headers}
   COMPAT_HEADERS ${actions_compat_headers}
   MODULE_DEPENDENCIES hpx_actions_base hpx_components_base hpx_naming_base
                       hpx_parcelset_base
diff --git a/libs/full/actions/include/hpx/actions/actions_fwd.hpp b/libs/full/actions/include/hpx/actions/actions_fwd.hpp
index 0e2825a483f..9092055804f 100644
--- a/libs/full/actions/include/hpx/actions/actions_fwd.hpp
+++ b/libs/full/actions/include/hpx/actions/actions_fwd.hpp
@@ -15,14 +15,14 @@ namespace hpx::actions {
 
     /// \cond NOINTERNAL
 
-    struct base_action;
-    struct HPX_EXPORT base_action_data;
+    HPX_CXX_EXPORT struct base_action;
+    HPX_CXX_EXPORT struct HPX_EXPORT base_action_data;
 
     ///////////////////////////////////////////////////////////////////////////
-    template <typename Action>
+    HPX_CXX_EXPORT template <typename Action>
     struct transfer_action;
 
-    template <typename Action>
+    HPX_CXX_EXPORT template <typename Action>
     struct transfer_continuation_action;
     /// \endcond
 }    // namespace hpx::actions
diff --git a/libs/full/actions/include/hpx/actions/base_action.hpp b/libs/full/actions/include/hpx/actions/base_action.hpp
index 379e2dea7fc..880836d631d 100644
--- a/libs/full/actions/include/hpx/actions/base_action.hpp
+++ b/libs/full/actions/include/hpx/actions/base_action.hpp
@@ -41,7 +41,7 @@ namespace hpx::actions {
     // The \a base_action class is an abstract class used as the base class
     // for all action types. It's main purpose is to allow polymorphic
     // serialization of action instances through a unique_ptr.
-    struct base_action
+    HPX_CXX_EXPORT struct base_action
     {
         /// Destructor
         virtual ~base_action();
@@ -138,7 +138,7 @@ namespace hpx::actions {
     };
 
     ///////////////////////////////////////////////////////////////////////////
-    struct base_action_data : base_action
+    HPX_CXX_EXPORT struct base_action_data : base_action
     {
         base_action_data() = default;
 
@@ -184,119 +184,17 @@ namespace hpx::actions {
 // serialization support for basic_action
 namespace hpx::serialization {
 
-    template <typename Archive, typename Component, typename R,
+    HPX_CXX_EXPORT template <typename Archive, typename Component, typename R,
         typename... Args, typename Derived>
-    HPX_FORCEINLINE void serialize(Archive& /* ar */,
-        ::hpx::actions::basic_action<Component, R(Args...), Derived>& /* t */,
-        unsigned int const /* version */ = 0)
+    constexpr void serialize(Archive&,
+        ::hpx::actions::basic_action<Component, R(Args...), Derived>&,
+        unsigned int const) noexcept
     {
     }
 }    // namespace hpx::serialization
 
 #include <hpx/config/warnings_suffix.hpp>
-
-// Helper macro for action serialization, each of the defined actions needs to
-// be registered with the serialization library
-#define HPX_DEFINE_GET_ACTION_NAME(action)                                     \
-    HPX_DEFINE_GET_ACTION_NAME_(action, action)                                \
-    /**/
-
-#define HPX_DEFINE_GET_ACTION_NAME_(action, actionname)                        \
-    HPX_DEFINE_GET_ACTION_NAME_ITT(action, actionname)                         \
-    namespace hpx::actions::detail {                                           \
-        template <>                                                            \
-        HPX_ALWAYS_EXPORT char const* get_action_name</**/ action>() noexcept  \
-        {                                                                      \
-            return HPX_PP_STRINGIZE(actionname);                               \
-        }                                                                      \
-    }                                                                          \
-    /**/
-/**/
-
-///////////////////////////////////////////////////////////////////////////////
-#if defined(HPX_HAVE_ITTNOTIFY) && HPX_HAVE_ITTNOTIFY != 0 &&                  \
-    !defined(HPX_HAVE_APEX)
-#define HPX_DEFINE_GET_ACTION_NAME_ITT(action, actionname)                     \
-    namespace hpx::actions::detail {                                           \
-        template <>                                                            \
-        HPX_ALWAYS_EXPORT util::itt::string_handle const&                      \
-        get_action_name_itt</**/ action>() noexcept                            \
-        {                                                                      \
-            static util::itt::string_handle sh(HPX_PP_STRINGIZE(actionname));  \
-            return sh;                                                         \
-        }                                                                      \
-    }                                                                          \
-    /**/
-
-#define HPX_REGISTER_ACTION_DECLARATION_NO_DEFAULT_GUID_ITT(action)            \
-    namespace hpx::actions::detail {                                           \
-        template <>                                                            \
-        HPX_ALWAYS_EXPORT util::itt::string_handle const&                      \
-        get_action_name_itt</**/ action>() noexcept;                           \
-    }                                                                          \
-/**/
-#else    // HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
-#define HPX_DEFINE_GET_ACTION_NAME_ITT(action, actionname)          /**/
-#define HPX_REGISTER_ACTION_DECLARATION_NO_DEFAULT_GUID_ITT(action) /**/
-#endif    // HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
-
-#define HPX_REGISTER_ACTION_DECLARATION_NO_DEFAULT_GUID(action)                \
-    HPX_REGISTER_ACTION_DECLARATION_NO_DEFAULT_GUID_ITT(action)                \
-    namespace hpx::actions::detail {                                           \
-        template <>                                                            \
-        HPX_ALWAYS_EXPORT char const* get_action_name<action>() noexcept;      \
-    }                                                                          \
-    HPX_REGISTER_ACTION_EXTERN_DECLARATION(action)                             \
-                                                                               \
-    namespace hpx::traits {                                                    \
-        template <>                                                            \
-        struct is_action</**/ action> : std::true_type                         \
-        {                                                                      \
-        };                                                                     \
-        template <>                                                            \
-        struct needs_automatic_registration</**/ action> : std::false_type     \
-        {                                                                      \
-        };                                                                     \
-    }                                                                          \
-    /**/
-
-#define HPX_REGISTER_ACTION_DECLARATION_2(action, actionname)                  \
-    HPX_REGISTER_ACTION_DECLARATION_NO_DEFAULT_GUID(action)                    \
-    /**/
-
-#if defined(HPX_MSVC) || defined(HPX_MINGW)
-#define HPX_REGISTER_ACTION_2(action, actionname)                              \
-    HPX_DEFINE_GET_ACTION_NAME_(action, actionname)                            \
-    HPX_REGISTER_ACTION_INVOCATION_COUNT(action)                               \
-    HPX_REGISTER_PER_ACTION_DATA_COUNTER_TYPES(action)                         \
-    namespace hpx::actions {                                                   \
-        template struct HPX_ALWAYS_EXPORT transfer_action</**/ action>;        \
-        template struct HPX_ALWAYS_EXPORT                                      \
-            transfer_continuation_action</**/ action>;                         \
-    }                                                                          \
-/**/
-#define HPX_REGISTER_ACTION_EXTERN_DECLARATION(action) /**/
-
-#else    // defined(HPX_MSVC) || defined(HPX_MINGW)
-
-#define HPX_REGISTER_ACTION_2(action, actionname)                              \
-    HPX_DEFINE_GET_ACTION_NAME_(action, actionname)                            \
-    HPX_REGISTER_ACTION_INVOCATION_COUNT(action)                               \
-    HPX_REGISTER_PER_ACTION_DATA_COUNTER_TYPES(action)                         \
-    namespace hpx::actions {                                                   \
-        template struct transfer_action</**/ action>;                          \
-        template struct transfer_continuation_action</**/ action>;             \
-    }                                                                          \
-/**/
-#define HPX_REGISTER_ACTION_EXTERN_DECLARATION(action)                         \
-    namespace hpx::actions {                                                   \
-        extern template struct HPX_ALWAYS_IMPORT transfer_action</**/ action>; \
-        extern template struct HPX_ALWAYS_IMPORT                               \
-            transfer_continuation_action</**/ action>;                         \
-    }                                                                          \
-    /**/
-
-#endif    // defined(HPX_MSVC) || defined(HPX_MINGW)
+#include <hpx/actions/macros.hpp>
 
 HPX_TRAITS_SERIALIZED_WITH_ID(hpx::actions::base_action)
 HPX_TRAITS_SERIALIZED_WITH_ID(hpx::actions::base_action_data)
diff --git a/libs/full/actions/include/hpx/actions/invoke_function.hpp b/libs/full/actions/include/hpx/actions/invoke_function.hpp
index 1563cca647b..fbadc736ae7 100644
--- a/libs/full/actions/include/hpx/actions/invoke_function.hpp
+++ b/libs/full/actions/include/hpx/actions/invoke_function.hpp
@@ -30,7 +30,7 @@ namespace hpx::components::server {
 
     ///////////////////////////////////////////////////////////////////////////
     // action definition exposing invoke_function<>
-    template <typename F, typename... Ts>
+    HPX_CXX_EXPORT template <typename F, typename... Ts>
     struct invoke_function_action
       : ::hpx::actions::action<util::invoke_result_t<F, Ts...> (*)(F, Ts...),
             &detail::invoke_function<F, Ts...>::call,
diff --git a/libs/full/actions/include/hpx/actions/macros.hpp b/libs/full/actions/include/hpx/actions/macros.hpp
new file mode 100644
index 00000000000..a5247a6ccf6
--- /dev/null
+++ b/libs/full/actions/include/hpx/actions/macros.hpp
@@ -0,0 +1,120 @@
+//  Copyright (c)      2026 Arpit Khandelwal
+//
+//  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/actions_base/macros.hpp>
+#include <hpx/modules/preprocessor.hpp>
+
+#include <type_traits>
+
+#if defined(HPX_HAVE_NETWORKING)
+
+// Helper macro for action serialization; each of the defined actions needs to
+// be registered with the serialization library.
+
+#define HPX_DEFINE_GET_ACTION_NAME(action)                                     \
+    HPX_DEFINE_GET_ACTION_NAME_(action, action)                                \
+    /**/
+
+#define HPX_DEFINE_GET_ACTION_NAME_(action, actionname)                        \
+    HPX_DEFINE_GET_ACTION_NAME_ITT(action, actionname)                         \
+    namespace hpx::actions::detail {                                           \
+        template <>                                                            \
+        HPX_ALWAYS_EXPORT char const* get_action_name</**/ action>() noexcept  \
+        {                                                                      \
+            return HPX_PP_STRINGIZE(actionname);                               \
+        }                                                                      \
+    }                                                                          \
+    /**/
+
+///////////////////////////////////////////////////////////////////////////////
+#if defined(HPX_HAVE_ITTNOTIFY) && HPX_HAVE_ITTNOTIFY != 0 &&                  \
+    !defined(HPX_HAVE_APEX)
+#define HPX_DEFINE_GET_ACTION_NAME_ITT(action, actionname)                     \
+    namespace hpx::actions::detail {                                           \
+        template <>                                                            \
+        HPX_ALWAYS_EXPORT util::itt::string_handle const&                      \
+        get_action_name_itt</**/ action>() noexcept                            \
+        {                                                                      \
+            static util::itt::string_handle sh(HPX_PP_STRINGIZE(actionname));  \
+            return sh;                                                         \
+        }                                                                      \
+    }                                                                          \
+    /**/
+
+#define HPX_REGISTER_ACTION_DECLARATION_NO_DEFAULT_GUID_ITT(action)            \
+    namespace hpx::actions::detail {                                           \
+        template <>                                                            \
+        HPX_ALWAYS_EXPORT util::itt::string_handle const&                      \
+        get_action_name_itt</**/ action>() noexcept;                           \
+    }                                                                          \
+/**/
+#else    // HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
+#define HPX_DEFINE_GET_ACTION_NAME_ITT(action, actionname)          /**/
+#define HPX_REGISTER_ACTION_DECLARATION_NO_DEFAULT_GUID_ITT(action) /**/
+#endif    // HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX)
+
+#define HPX_REGISTER_ACTION_DECLARATION_NO_DEFAULT_GUID(action)                \
+    HPX_REGISTER_ACTION_DECLARATION_NO_DEFAULT_GUID_ITT(action)                \
+    namespace hpx::actions::detail {                                           \
+        template <>                                                            \
+        HPX_ALWAYS_EXPORT char const* get_action_name<action>() noexcept;      \
+    }                                                                          \
+    HPX_REGISTER_ACTION_EXTERN_DECLARATION(action)                             \
+                                                                               \
+    namespace hpx::traits {                                                    \
+        template <>                                                            \
+        struct is_action</**/ action> : std::true_type                         \
+        {                                                                      \
+        };                                                                     \
+        template <>                                                            \
+        struct needs_automatic_registration</**/ action> : std::false_type     \
+        {                                                                      \
+        };                                                                     \
+    }                                                                          \
+    /**/
+
+#define HPX_REGISTER_ACTION_DECLARATION_2(action, actionname)                  \
+    HPX_REGISTER_ACTION_DECLARATION_NO_DEFAULT_GUID(action)                    \
+    /**/
+
+#if defined(HPX_MSVC) || defined(HPX_MINGW)
+#define HPX_REGISTER_ACTION_2(action, actionname)                              \
+    HPX_DEFINE_GET_ACTION_NAME_(action, actionname)                            \
+    HPX_REGISTER_ACTION_INVOCATION_COUNT(action)                               \
+    HPX_REGISTER_PER_ACTION_DATA_COUNTER_TYPES(action)                         \
+    namespace hpx::actions {                                                   \
+        template struct HPX_ALWAYS_EXPORT transfer_action</**/ action>;        \
+        template struct HPX_ALWAYS_EXPORT                                      \
+            transfer_continuation_action</**/ action>;                         \
+    }                                                                          \
+/**/
+#define HPX_REGISTER_ACTION_EXTERN_DECLARATION(action) /**/
+
+#else    // defined(HPX_MSVC) || defined(HPX_MINGW)
+
+#define HPX_REGISTER_ACTION_2(action, actionname)                              \
+    HPX_DEFINE_GET_ACTION_NAME_(action, actionname)                            \
+    HPX_REGISTER_ACTION_INVOCATION_COUNT(action)                               \
+    HPX_REGISTER_PER_ACTION_DATA_COUNTER_TYPES(action)                         \
+    namespace hpx::actions {                                                   \
+        template struct transfer_action</**/ action>;                          \
+        template struct transfer_continuation_action</**/ action>;             \
+    }                                                                          \
+/**/
+#define HPX_REGISTER_ACTION_EXTERN_DECLARATION(action)                         \
+    namespace hpx::actions {                                                   \
+        extern template struct HPX_ALWAYS_IMPORT transfer_action</**/ action>; \
+        extern template struct HPX_ALWAYS_IMPORT                               \
+            transfer_continuation_action</**/ action>;                         \
+    }                                                                          \
+    /**/
+
+#endif    // defined(HPX_MSVC) || defined(HPX_MINGW)
+
+#endif    // HPX_HAVE_NETWORKING
diff --git a/libs/full/actions/include/hpx/actions/post_helper.hpp b/libs/full/actions/include/hpx/actions/post_helper.hpp
index 901607cad30..51613dd5b47 100644
--- a/libs/full/actions/include/hpx/actions/post_helper.hpp
+++ b/libs/full/actions/include/hpx/actions/post_helper.hpp
@@ -24,7 +24,7 @@
 namespace hpx::detail {
 
     ///////////////////////////////////////////////////////////////////////////
-    template <typename Action, typename... Ts>
+    HPX_CXX_EXPORT template <typename Action, typename... Ts>
     void call_async(threads::thread_init_data&& data,
         hpx::id_type const& target, naming::address::address_type lva,
         naming::address::component_type comptype, Ts&&... vs)
@@ -52,7 +52,8 @@ namespace hpx::detail {
         traits::action_schedule_thread<Action>::call(lva, comptype, data);
     }
 
-    template <typename Action, typename Continuation, typename... Ts>
+    HPX_CXX_EXPORT template <typename Action, typename Continuation,
+        typename... Ts>
     void call_async(threads::thread_init_data&& data, Continuation&& cont,
         hpx::id_type const& target, naming::address::address_type lva,
         naming::address::component_type comptype, Ts&&... vs)
@@ -74,14 +75,15 @@ namespace hpx::detail {
         traits::action_schedule_thread<Action>::call(lva, comptype, data);
     }
 
-    template <typename Action, typename... Ts>
+    HPX_CXX_EXPORT template <typename Action, typename... Ts>
     HPX_FORCEINLINE void call_sync(naming::address::address_type lva,
         naming::address::component_type comptype, Ts&&... vs)
     {
         Action::execute_function(lva, comptype, HPX_FORWARD(Ts, vs)...);
     }
 
-    template <typename Action, typename Continuation, typename... Ts>
+    HPX_CXX_EXPORT template <typename Action, typename Continuation,
+        typename... Ts>
     HPX_FORCEINLINE void call_sync(Continuation&& cont,
         naming::address::address_type lva,
         naming::address::component_type comptype, Ts&&... vs)
@@ -100,7 +102,7 @@ namespace hpx::detail {
     }
 
     ///////////////////////////////////////////////////////////////////////////
-    template <typename Action>
+    HPX_CXX_EXPORT template <typename Action>
     struct post_helper<Action, /*DirectExecute=*/false>
     {
         template <typename... Ts>
@@ -149,7 +151,7 @@ namespace hpx::detail {
     };
 
     ///////////////////////////////////////////////////////////////////////////
-    template <typename Action>
+    HPX_CXX_EXPORT template <typename Action>
     struct post_helper<Action, /*DirectExecute=*/true>
     {
         // If local and to be directly executed, just call the function
diff --git a/libs/full/actions/include/hpx/actions/post_helper_fwd.hpp b/libs/full/actions/include/hpx/actions/post_helper_fwd.hpp
index d1243634de2..06423373e43 100644
--- a/libs/full/actions/include/hpx/actions/post_helper_fwd.hpp
+++ b/libs/full/actions/include/hpx/actions/post_helper_fwd.hpp
@@ -15,29 +15,31 @@
 namespace hpx::detail {
 
     ///////////////////////////////////////////////////////////////////////////
-    template <typename Action, typename... Ts>
+    HPX_CXX_EXPORT template <typename Action, typename... Ts>
     void call_async(threads::thread_init_data&& data,
         hpx::id_type const& target, naming::address::address_type lva,
         naming::address::component_type comptype,
         threads::thread_priority priority, Ts&&... vs);
 
-    template <typename Action, typename Continuation, typename... Ts>
+    HPX_CXX_EXPORT template <typename Action, typename Continuation,
+        typename... Ts>
     void call_async(threads::thread_init_data&& data, Continuation&& cont,
         hpx::id_type const& target, naming::address::address_type lva,
         naming::address::component_type comptype,
         threads::thread_priority priority, Ts&&... vs);
 
-    template <typename Action, typename... Ts>
+    HPX_CXX_EXPORT template <typename Action, typename... Ts>
     HPX_FORCEINLINE void call_sync(naming::address::address_type lva,
         naming::address::component_type comptype, Ts&&... vs);
 
-    template <typename Action, typename Continuation, typename... Ts>
+    HPX_CXX_EXPORT template <typename Action, typename Continuation,
+        typename... Ts>
     HPX_FORCEINLINE void call_sync(Continuation&& cont,
         naming::address::address_type lva,
         naming::address::component_type comptype, Ts&&... vs);
 
     ///////////////////////////////////////////////////////////////////////////
-    template <typename Action,
+    HPX_CXX_EXPORT template <typename Action,
         bool DirectExecute = Action::direct_execution::value>
     struct post_helper;
 }    // namespace hpx::detail
diff --git a/libs/full/actions/include/hpx/actions/register_action.hpp b/libs/full/actions/include/hpx/actions/register_action.hpp
index 0eb3b09d838..64faedd580e 100644
--- a/libs/full/actions/include/hpx/actions/register_action.hpp
+++ b/libs/full/actions/include/hpx/actions/register_action.hpp
@@ -16,7 +16,7 @@
 
 namespace hpx::actions::detail {
 
-    template <typename Action>
+    HPX_CXX_EXPORT template <typename Action>
     struct register_action
     {
         register_action(register_action const&) = delete;
diff --git a/libs/full/actions/include/hpx/actions/transfer_action.hpp b/libs/full/actions/include/hpx/actions/transfer_action.hpp
index 5b3933f7bf5..1354da4598e 100644
--- a/libs/full/actions/include/hpx/actions/transfer_action.hpp
+++ b/libs/full/actions/include/hpx/actions/transfer_action.hpp
@@ -35,7 +35,7 @@ namespace hpx::actions {
     /// \cond NOINTERNAL
 
     ///////////////////////////////////////////////////////////////////////////
-    template <typename Action>
+    HPX_CXX_EXPORT template <typename Action>
     struct transfer_action final : transfer_base_action<Action>
     {
         transfer_action(transfer_action const&) = delete;
diff --git a/libs/full/actions/include/hpx/actions/transfer_base_action.hpp b/libs/full/actions/include/hpx/actions/transfer_base_action.hpp
index 342d5bd086f..27dc22a4bfd 100644
--- a/libs/full/actions/include/hpx/actions/transfer_base_action.hpp
+++ b/libs/full/actions/include/hpx/actions/transfer_base_action.hpp
@@ -91,14 +91,14 @@ namespace hpx::actions {
 
 namespace hpx {
 
-    template <std::size_t I, typename Args>
+    HPX_CXX_EXPORT template <std::size_t I, typename Args>
     constexpr HPX_HOST_DEVICE HPX_FORCEINLINE hpx::tuple_element_t<I, Args>&
     get(hpx::actions::detail::argument_holder<Args>& t)
     {
         return hpx::tuple_element<I, Args>::get(t.data());
     }
 
-    template <std::size_t I, typename Args>
+    HPX_CXX_EXPORT template <std::size_t I, typename Args>
     constexpr HPX_HOST_DEVICE HPX_FORCEINLINE
         hpx::tuple_element_t<I, Args> const&
         get(hpx::actions::detail::argument_holder<Args> const& t)
@@ -106,7 +106,7 @@ namespace hpx {
         return hpx::tuple_element<I, Args>::get(t.data());
     }
 
-    template <std::size_t I, typename Args>
+    HPX_CXX_EXPORT template <std::size_t I, typename Args>
     constexpr HPX_HOST_DEVICE HPX_FORCEINLINE hpx::tuple_element_t<I, Args>&&
     get(hpx::actions::detail::argument_holder<Args>&& t)
     {
@@ -114,7 +114,7 @@ namespace hpx {
             hpx::get<I>(t.data()));
     }
 
-    template <std::size_t I, typename Args>
+    HPX_CXX_EXPORT template <std::size_t I, typename Args>
     constexpr HPX_HOST_DEVICE HPX_FORCEINLINE
         hpx::tuple_element_t<I, Args> const&&
         get(hpx::actions::detail::argument_holder<Args> const&& t)
@@ -127,7 +127,7 @@ namespace hpx {
 namespace hpx::actions {
 
     ///////////////////////////////////////////////////////////////////////////
-    template <typename Action>
+    HPX_CXX_EXPORT template <typename Action>
     struct transfer_base_action : base_action_data
     {
         transfer_base_action(transfer_base_action const&) = delete;
@@ -329,7 +329,7 @@ namespace hpx::actions {
     }    // namespace detail
 
     ///////////////////////////////////////////////////////////////////////////
-    template <std::size_t N, typename Action>
+    HPX_CXX_EXPORT template <std::size_t N, typename Action>
     constexpr hpx::tuple_element_t<N,
         typename transfer_action<Action>::arguments_type> const&
     get(transfer_base_action<Action> const& args)
@@ -343,7 +343,7 @@ namespace hpx::actions {
 #include <hpx/modules/actions_base.hpp>
 
 /// \cond NOINTERNAL
-template <typename Action>
+HPX_CXX_EXPORT template <typename Action>
 void hpx::actions::detail::register_per_action_data_counter_types(
     hpx::actions::detail::per_action_data_counter_registry& registry)
 {
diff --git a/libs/full/agas_base/include/hpx/agas_base/server/component_namespace.hpp b/libs/full/agas_base/include/hpx/agas_base/server/component_namespace.hpp
index 6c5b3dea0a2..50c754e2745 100644
--- a/libs/full/agas_base/include/hpx/agas_base/server/component_namespace.hpp
+++ b/libs/full/agas_base/include/hpx/agas_base/server/component_namespace.hpp
@@ -8,10 +8,10 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/agas_base/agas_fwd.hpp>
 #include <hpx/async_distributed/base_lco_with_value.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/components_base.hpp>
 #include <hpx/modules/errors.hpp>
diff --git a/libs/full/agas_base/include/hpx/agas_base/server/locality_namespace.hpp b/libs/full/agas_base/include/hpx/agas_base/server/locality_namespace.hpp
index 0672f636853..da67d88ec48 100644
--- a/libs/full/agas_base/include/hpx/agas_base/server/locality_namespace.hpp
+++ b/libs/full/agas_base/include/hpx/agas_base/server/locality_namespace.hpp
@@ -9,10 +9,10 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/agas_base/agas_fwd.hpp>
 #include <hpx/async_distributed/base_lco_with_value.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/components_base.hpp>
 #include <hpx/modules/errors.hpp>
diff --git a/libs/full/agas_base/include/hpx/agas_base/server/primary_namespace.hpp b/libs/full/agas_base/include/hpx/agas_base/server/primary_namespace.hpp
index a6fa6e9d0b7..8e1a0a778bd 100644
--- a/libs/full/agas_base/include/hpx/agas_base/server/primary_namespace.hpp
+++ b/libs/full/agas_base/include/hpx/agas_base/server/primary_namespace.hpp
@@ -11,11 +11,11 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/agas_base/agas_fwd.hpp>
 #include <hpx/agas_base/gva.hpp>
 #include <hpx/async_distributed/base_lco_with_value.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/allocator_support.hpp>
 #include <hpx/modules/components_base.hpp>
diff --git a/libs/full/agas_base/include/hpx/agas_base/server/symbol_namespace.hpp b/libs/full/agas_base/include/hpx/agas_base/server/symbol_namespace.hpp
index 641112a826e..81f74853498 100644
--- a/libs/full/agas_base/include/hpx/agas_base/server/symbol_namespace.hpp
+++ b/libs/full/agas_base/include/hpx/agas_base/server/symbol_namespace.hpp
@@ -9,10 +9,10 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/agas_base/agas_fwd.hpp>
 #include <hpx/async_distributed/base_lco_with_value.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/components_base.hpp>
 #include <hpx/modules/errors.hpp>
diff --git a/libs/full/agas_base/src/component_namespace.cpp b/libs/full/agas_base/src/component_namespace.cpp
index 58457713119..7a228bd6eea 100644
--- a/libs/full/agas_base/src/component_namespace.cpp
+++ b/libs/full/agas_base/src/component_namespace.cpp
@@ -11,6 +11,7 @@
 #include <hpx/async_distributed/base_lco_with_value.hpp>
 #include <hpx/async_distributed/detail/post.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/serialization.hpp>
 
diff --git a/libs/full/async_distributed/include/hpx/async_distributed/base_lco.hpp b/libs/full/async_distributed/include/hpx/async_distributed/base_lco.hpp
index 32609786baf..3143ded17a2 100644
--- a/libs/full/async_distributed/include/hpx/async_distributed/base_lco.hpp
+++ b/libs/full/async_distributed/include/hpx/async_distributed/base_lco.hpp
@@ -7,9 +7,9 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/async_distributed/lcos_fwd.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/components_base.hpp>
 #include <hpx/modules/naming_base.hpp>
diff --git a/libs/full/async_distributed/include/hpx/async_distributed/base_lco_with_value.hpp b/libs/full/async_distributed/include/hpx/async_distributed/base_lco_with_value.hpp
index 457296b3eae..2293041c77c 100644
--- a/libs/full/async_distributed/include/hpx/async_distributed/base_lco_with_value.hpp
+++ b/libs/full/async_distributed/include/hpx/async_distributed/base_lco_with_value.hpp
@@ -8,11 +8,11 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/assert.hpp>
 #include <hpx/async_distributed/base_lco.hpp>
 #include <hpx/async_distributed/lcos_fwd.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/components_base.hpp>
 #include <hpx/modules/errors.hpp>
diff --git a/libs/full/async_distributed/include/hpx/async_distributed/detail/post.hpp b/libs/full/async_distributed/include/hpx/async_distributed/detail/post.hpp
index 17887c1d364..2e2d187af3d 100644
--- a/libs/full/async_distributed/include/hpx/async_distributed/detail/post.hpp
+++ b/libs/full/async_distributed/include/hpx/async_distributed/detail/post.hpp
@@ -8,12 +8,12 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/post_helper.hpp>
 #include <hpx/assert.hpp>
 #include <hpx/async_distributed/continuation.hpp>
 #include <hpx/async_distributed/detail/post_implementations_fwd.hpp>
 #include <hpx/async_distributed/put_parcel_fwd.hpp>
 #include <hpx/components/client_base.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/async_base.hpp>
 #include <hpx/modules/async_local.hpp>
diff --git a/libs/full/async_distributed/include/hpx/async_distributed/put_parcel.hpp b/libs/full/async_distributed/include/hpx/async_distributed/put_parcel.hpp
index f6e9a4999d0..2a75ae6a1bc 100644
--- a/libs/full/async_distributed/include/hpx/async_distributed/put_parcel.hpp
+++ b/libs/full/async_distributed/include/hpx/async_distributed/put_parcel.hpp
@@ -19,10 +19,9 @@
 #include <hpx/modules/runtime_local.hpp>
 #include <hpx/modules/type_support.hpp>
 
-#include <hpx/actions/actions_fwd.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/async_distributed/put_parcel_fwd.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/parcelset/parcel.hpp>
 #include <hpx/parcelset/parcelhandler.hpp>
 #include <hpx/parcelset/parcelset_fwd.hpp>
diff --git a/libs/full/async_distributed/include/hpx/async_distributed/transfer_continuation_action.hpp b/libs/full/async_distributed/include/hpx/async_distributed/transfer_continuation_action.hpp
index c8beae230cc..86a7b049b69 100644
--- a/libs/full/async_distributed/include/hpx/async_distributed/transfer_continuation_action.hpp
+++ b/libs/full/async_distributed/include/hpx/async_distributed/transfer_continuation_action.hpp
@@ -12,12 +12,9 @@
 
 #include <hpx/config.hpp>
 
-#include <hpx/actions/base_action.hpp>
-#include <hpx/actions/post_helper.hpp>
-#include <hpx/actions/register_action.hpp>
-#include <hpx/actions/transfer_base_action.hpp>
 #include <hpx/async_distributed/continuation.hpp>
 #include <hpx/async_distributed/traits/action_trigger_continuation.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 
 #if defined(HPX_HAVE_NETWORKING)
diff --git a/libs/full/async_distributed/include/hpx/async_distributed/trigger_lco.hpp b/libs/full/async_distributed/include/hpx/async_distributed/trigger_lco.hpp
index c6bdf1490fb..f1a4dae6fb3 100644
--- a/libs/full/async_distributed/include/hpx/async_distributed/trigger_lco.hpp
+++ b/libs/full/async_distributed/include/hpx/async_distributed/trigger_lco.hpp
@@ -9,13 +9,13 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/actions_fwd.hpp>
 #include <hpx/assert.hpp>
 #include <hpx/async_distributed/continuation_fwd.hpp>
 #include <hpx/async_distributed/detail/post_continue_fwd.hpp>
 #include <hpx/async_distributed/detail/post_implementations_fwd.hpp>
 #include <hpx/async_distributed/lcos_fwd.hpp>
 #include <hpx/async_distributed/trigger_lco_fwd.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/components_base.hpp>
 #include <hpx/modules/naming_base.hpp>
diff --git a/libs/full/async_distributed/src/base_lco.cpp b/libs/full/async_distributed/src/base_lco.cpp
index 2efb1a1a177..f5d34163f46 100644
--- a/libs/full/async_distributed/src/base_lco.cpp
+++ b/libs/full/async_distributed/src/base_lco.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/actions/transfer_action.hpp>
 #include <hpx/async_distributed/base_lco.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/components_base.hpp>
 #include <hpx/modules/naming_base.hpp>
diff --git a/libs/full/async_distributed/src/continuation.cpp b/libs/full/async_distributed/src/continuation.cpp
index f6cb51b94c5..145cfe4a92e 100644
--- a/libs/full/async_distributed/src/continuation.cpp
+++ b/libs/full/async_distributed/src/continuation.cpp
@@ -6,10 +6,10 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/async_distributed/continuation.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
 #include <hpx/async_distributed/trigger_lco.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/errors.hpp>
 #include <hpx/modules/naming.hpp>
diff --git a/libs/full/collectives/include/hpx/collectives/broadcast_direct.hpp b/libs/full/collectives/include/hpx/collectives/broadcast_direct.hpp
index 0b8c0839eba..41b7338b2cc 100644
--- a/libs/full/collectives/include/hpx/collectives/broadcast_direct.hpp
+++ b/libs/full/collectives/include/hpx/collectives/broadcast_direct.hpp
@@ -128,12 +128,12 @@ namespace hpx { namespace lcos {
 
 #include <hpx/config.hpp>
 #if !defined(HPX_COMPUTE_DEVICE_CODE)
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/assert.hpp>
 #include <hpx/async_colocated/async_colocated.hpp>
 #include <hpx/async_colocated/post_colocated.hpp>
 #include <hpx/async_distributed/post.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/async_combinators.hpp>
 #include <hpx/modules/datastructures.hpp>
diff --git a/libs/full/collectives/include/hpx/collectives/detail/latch.hpp b/libs/full/collectives/include/hpx/collectives/detail/latch.hpp
index de2af35d257..56d11045503 100644
--- a/libs/full/collectives/include/hpx/collectives/detail/latch.hpp
+++ b/libs/full/collectives/include/hpx/collectives/detail/latch.hpp
@@ -7,9 +7,9 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/async_distributed/base_lco_with_value.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/components_base.hpp>
 #include <hpx/modules/errors.hpp>
diff --git a/libs/full/collectives/include/hpx/collectives/fold.hpp b/libs/full/collectives/include/hpx/collectives/fold.hpp
index b242cffee9e..b7a5922733a 100644
--- a/libs/full/collectives/include/hpx/collectives/fold.hpp
+++ b/libs/full/collectives/include/hpx/collectives/fold.hpp
@@ -158,10 +158,10 @@ namespace hpx { namespace lcos {
 #else
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/assert.hpp>
 #include <hpx/async_colocated/async_colocated.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/async_combinators.hpp>
 #include <hpx/modules/datastructures.hpp>
diff --git a/libs/full/collectives/include/hpx/collectives/reduce_direct.hpp b/libs/full/collectives/include/hpx/collectives/reduce_direct.hpp
index 3dcdceaa95e..f57e3fd17e6 100644
--- a/libs/full/collectives/include/hpx/collectives/reduce_direct.hpp
+++ b/libs/full/collectives/include/hpx/collectives/reduce_direct.hpp
@@ -74,10 +74,10 @@ namespace hpx { namespace lcos {
 #else
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/assert.hpp>
 #include <hpx/async_colocated/async_colocated.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/async_combinators.hpp>
 #include <hpx/modules/datastructures.hpp>
diff --git a/libs/full/collectives/src/latch.cpp b/libs/full/collectives/src/latch.cpp
index 69c424be160..44e7ad67043 100644
--- a/libs/full/collectives/src/latch.cpp
+++ b/libs/full/collectives/src/latch.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/actions/transfer_action.hpp>
 #include <hpx/assert.hpp>
 #include <hpx/async_distributed/continuation.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
 #include <hpx/collectives/latch.hpp>
 #include <hpx/components/client_base.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/async_distributed.hpp>
 #include <hpx/modules/futures.hpp>
diff --git a/libs/full/executors_distributed/include/hpx/executors_distributed/distribution_policy_executor.hpp b/libs/full/executors_distributed/include/hpx/executors_distributed/distribution_policy_executor.hpp
index 527a87f4c9d..2cdc0003882 100644
--- a/libs/full/executors_distributed/include/hpx/executors_distributed/distribution_policy_executor.hpp
+++ b/libs/full/executors_distributed/include/hpx/executors_distributed/distribution_policy_executor.hpp
@@ -9,8 +9,8 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/invoke_function.hpp>
 #include <hpx/async_distributed/async.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/execution.hpp>
 #include <hpx/modules/execution_base.hpp>
diff --git a/libs/full/include/include/hpx/include/actions.hpp b/libs/full/include/include/hpx/include/actions.hpp
index 2f48f4fdf19..715466a8c97 100644
--- a/libs/full/include/include/hpx/include/actions.hpp
+++ b/libs/full/include/include/hpx/include/actions.hpp
@@ -8,9 +8,9 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/async_distributed/base_lco_with_value.hpp>
 #include <hpx/async_distributed/continuation.hpp>
 #include <hpx/async_distributed/make_continuation.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
diff --git a/libs/full/include/include/hpx/include/components.hpp b/libs/full/include/include/hpx/include/components.hpp
index 2c727ef6ba9..232fc0cb612 100644
--- a/libs/full/include/include/hpx/include/components.hpp
+++ b/libs/full/include/include/hpx/include/components.hpp
@@ -18,7 +18,7 @@
 
 #include <hpx/async_colocated/server/destroy_component.hpp>
 
-#include <hpx/actions/invoke_function.hpp>
+#include <hpx/modules/actions.hpp>
 
 #include <hpx/components/client.hpp>
 #include <hpx/components/client_base.hpp>
diff --git a/libs/full/lcos_distributed/include/hpx/lcos_distributed/server/channel.hpp b/libs/full/lcos_distributed/include/hpx/lcos_distributed/server/channel.hpp
index a315393f429..a6fc4bb0bb7 100644
--- a/libs/full/lcos_distributed/include/hpx/lcos_distributed/server/channel.hpp
+++ b/libs/full/lcos_distributed/include/hpx/lcos_distributed/server/channel.hpp
@@ -7,9 +7,9 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/async_distributed/base_lco_with_value.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/components_base.hpp>
 #include <hpx/modules/futures.hpp>
diff --git a/libs/full/parcelset/include/hpx/parcelset/parcel.hpp b/libs/full/parcelset/include/hpx/parcelset/parcel.hpp
index 8f3a742c176..ec082b066c7 100644
--- a/libs/full/parcelset/include/hpx/parcelset/parcel.hpp
+++ b/libs/full/parcelset/include/hpx/parcelset/parcel.hpp
@@ -13,7 +13,7 @@
 #include <hpx/modules/serialization.hpp>
 #include <hpx/modules/threading_base.hpp>
 
-#include <hpx/actions/base_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/naming_base.hpp>
 #include <hpx/modules/parcelset_base.hpp>
 
diff --git a/libs/full/parcelset/src/detail/parcel_await.cpp b/libs/full/parcelset/src/detail/parcel_await.cpp
index a50aa1bddf8..8a81ec3816b 100644
--- a/libs/full/parcelset/src/detail/parcel_await.cpp
+++ b/libs/full/parcelset/src/detail/parcel_await.cpp
@@ -14,7 +14,7 @@
 #include <hpx/modules/parcelset_base.hpp>
 #include <hpx/modules/serialization.hpp>
 
-#include <hpx/actions/actions_fwd.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/parcelset/detail/parcel_await.hpp>
 #include <hpx/parcelset/parcelset_fwd.hpp>
 
diff --git a/libs/full/parcelset/src/parcel.cpp b/libs/full/parcelset/src/parcel.cpp
index fbd877dfb56..f2f32fc394d 100644
--- a/libs/full/parcelset/src/parcel.cpp
+++ b/libs/full/parcelset/src/parcel.cpp
@@ -22,7 +22,7 @@
 #include <hpx/modules/threading_base.hpp>
 #include <hpx/modules/timing.hpp>
 
-#include <hpx/actions/transfer_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/parcelset/parcel.hpp>
 #include <hpx/parcelset/parcelhandler.hpp>
 
diff --git a/libs/full/performance_counters/include/hpx/performance_counters/server/base_performance_counter.hpp b/libs/full/performance_counters/include/hpx/performance_counters/server/base_performance_counter.hpp
index 083e9556c89..a664033ad3c 100644
--- a/libs/full/performance_counters/include/hpx/performance_counters/server/base_performance_counter.hpp
+++ b/libs/full/performance_counters/include/hpx/performance_counters/server/base_performance_counter.hpp
@@ -7,9 +7,9 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/async_distributed/base_lco_with_value.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/components_base.hpp>
 #include <hpx/modules/thread_support.hpp>
diff --git a/libs/full/performance_counters/include/hpx/performance_counters/server/component_namespace_counters.hpp b/libs/full/performance_counters/include/hpx/performance_counters/server/component_namespace_counters.hpp
index 7bec379f314..d508704d4f8 100644
--- a/libs/full/performance_counters/include/hpx/performance_counters/server/component_namespace_counters.hpp
+++ b/libs/full/performance_counters/include/hpx/performance_counters/server/component_namespace_counters.hpp
@@ -9,8 +9,8 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 
 #include <string>
diff --git a/libs/full/performance_counters/include/hpx/performance_counters/server/locality_namespace_counters.hpp b/libs/full/performance_counters/include/hpx/performance_counters/server/locality_namespace_counters.hpp
index d5b7e945d0c..cdafaf43e98 100644
--- a/libs/full/performance_counters/include/hpx/performance_counters/server/locality_namespace_counters.hpp
+++ b/libs/full/performance_counters/include/hpx/performance_counters/server/locality_namespace_counters.hpp
@@ -9,8 +9,8 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 
 #include <string>
diff --git a/libs/full/performance_counters/include/hpx/performance_counters/server/primary_namespace_counters.hpp b/libs/full/performance_counters/include/hpx/performance_counters/server/primary_namespace_counters.hpp
index b8d22384caf..ae126c40973 100644
--- a/libs/full/performance_counters/include/hpx/performance_counters/server/primary_namespace_counters.hpp
+++ b/libs/full/performance_counters/include/hpx/performance_counters/server/primary_namespace_counters.hpp
@@ -9,8 +9,8 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 
 #include <string>
diff --git a/libs/full/performance_counters/include/hpx/performance_counters/server/symbol_namespace_counters.hpp b/libs/full/performance_counters/include/hpx/performance_counters/server/symbol_namespace_counters.hpp
index 3da18ed6a0c..50707eaa5e2 100644
--- a/libs/full/performance_counters/include/hpx/performance_counters/server/symbol_namespace_counters.hpp
+++ b/libs/full/performance_counters/include/hpx/performance_counters/server/symbol_namespace_counters.hpp
@@ -9,8 +9,8 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 
 #include <string>
diff --git a/libs/full/performance_counters/src/counter_creators.cpp b/libs/full/performance_counters/src/counter_creators.cpp
index 94f24b63469..72c9ec827db 100644
--- a/libs/full/performance_counters/src/counter_creators.cpp
+++ b/libs/full/performance_counters/src/counter_creators.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/actions/transfer_action.hpp>
 #include <hpx/agas/agas_fwd.hpp>
 #include <hpx/assert.hpp>
 #include <hpx/async_distributed/async.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/components_base.hpp>
 #include <hpx/modules/errors.hpp>
diff --git a/libs/full/performance_counters/src/counters.cpp b/libs/full/performance_counters/src/counters.cpp
index 9dcdeddbe6c..91ad36016e1 100644
--- a/libs/full/performance_counters/src/counters.cpp
+++ b/libs/full/performance_counters/src/counters.cpp
@@ -10,6 +10,7 @@
 #include <hpx/async_distributed/continuation.hpp>
 #include <hpx/async_distributed/detail/post.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/components_base.hpp>
 #include <hpx/modules/errors.hpp>
diff --git a/libs/full/performance_counters/src/server/base_performance_counter.cpp b/libs/full/performance_counters/src/server/base_performance_counter.cpp
index 13da08c4f99..61d2acc6ae2 100644
--- a/libs/full/performance_counters/src/server/base_performance_counter.cpp
+++ b/libs/full/performance_counters/src/server/base_performance_counter.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/actions/transfer_action.hpp>
 #include <hpx/async_distributed/base_lco_with_value.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/components_base.hpp>
 #include <hpx/modules/errors.hpp>
diff --git a/libs/full/runtime_components/include/hpx/runtime_components/distributed_metadata_base.hpp b/libs/full/runtime_components/include/hpx/runtime_components/distributed_metadata_base.hpp
index fa727a45fbc..ca7ec94aa58 100644
--- a/libs/full/runtime_components/include/hpx/runtime_components/distributed_metadata_base.hpp
+++ b/libs/full/runtime_components/include/hpx/runtime_components/distributed_metadata_base.hpp
@@ -7,10 +7,10 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/assert.hpp>
 #include <hpx/async_distributed/base_lco_with_value.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/components_base.hpp>
 #include <hpx/modules/preprocessor.hpp>
diff --git a/libs/full/runtime_components/include/hpx/runtime_components/server/console_error_sink.hpp b/libs/full/runtime_components/include/hpx/runtime_components/server/console_error_sink.hpp
index cb1afe59f39..40cac7b915e 100644
--- a/libs/full/runtime_components/include/hpx/runtime_components/server/console_error_sink.hpp
+++ b/libs/full/runtime_components/include/hpx/runtime_components/server/console_error_sink.hpp
@@ -7,8 +7,8 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/components_base.hpp>
 
diff --git a/libs/full/runtime_components/include/hpx/runtime_components/server/console_logging.hpp b/libs/full/runtime_components/include/hpx/runtime_components/server/console_logging.hpp
index 4917069dac2..0057950e1d4 100644
--- a/libs/full/runtime_components/include/hpx/runtime_components/server/console_logging.hpp
+++ b/libs/full/runtime_components/include/hpx/runtime_components/server/console_logging.hpp
@@ -8,8 +8,8 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/components_base.hpp>
 #include <hpx/modules/datastructures.hpp>
diff --git a/libs/full/runtime_components/src/server/console_error_sink_server.cpp b/libs/full/runtime_components/src/server/console_error_sink_server.cpp
index 30123b98132..2c561b5d905 100644
--- a/libs/full/runtime_components/src/server/console_error_sink_server.cpp
+++ b/libs/full/runtime_components/src/server/console_error_sink_server.cpp
@@ -6,10 +6,10 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/async_distributed/base_lco_with_value.hpp>
 #include <hpx/async_distributed/continuation.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/errors.hpp>
 #include <hpx/modules/ini.hpp>
diff --git a/libs/full/runtime_components/src/server/console_logging_server.cpp b/libs/full/runtime_components/src/server/console_logging_server.cpp
index dacbbe8a61d..97ade062b16 100644
--- a/libs/full/runtime_components/src/server/console_logging_server.cpp
+++ b/libs/full/runtime_components/src/server/console_logging_server.cpp
@@ -6,9 +6,9 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/async_distributed/continuation.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/concurrency.hpp>
 #include <hpx/modules/datastructures.hpp>
 #include <hpx/modules/ini.hpp>
diff --git a/libs/full/runtime_distributed/include/hpx/runtime_distributed/server/runtime_support.hpp b/libs/full/runtime_distributed/include/hpx/runtime_distributed/server/runtime_support.hpp
index ede89fa24aa..f4bc1826354 100644
--- a/libs/full/runtime_distributed/include/hpx/runtime_distributed/server/runtime_support.hpp
+++ b/libs/full/runtime_distributed/include/hpx/runtime_distributed/server/runtime_support.hpp
@@ -9,10 +9,10 @@
 #pragma once
 
 #include <hpx/config.hpp>
-#include <hpx/actions/transfer_action.hpp>
 #include <hpx/agas/agas_fwd.hpp>
 #include <hpx/assert.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/actions.hpp>
 #include <hpx/modules/actions_base.hpp>
 #include <hpx/modules/components_base.hpp>
 #include <hpx/modules/errors.hpp>
diff --git a/wrap/src/hpx_wrap.cpp b/wrap/src/hpx_wrap.cpp
index c019dcaa9d1..e57177f5cc1 100644
--- a/wrap/src/hpx_wrap.cpp
+++ b/wrap/src/hpx_wrap.cpp
@@ -32,7 +32,7 @@ namespace hpx_start {
 #endif
     // The default application name is populated by including hpx/hpx_main.hpp
     // or if HPX_AUTO_WRAP_MAIN_ACTIVATE is defined.
-    HPX_SYMBOL_EXPORT extern const char* app_name_libhpx_wrap;
+    HPX_SYMBOL_EXPORT extern char const* app_name_libhpx_wrap;
     HPX_SYMBOL_EXPORT const char* app_name_libhpx_wrap __attribute__((weak)) =
         HPX_APPLICATION_STRING;