diff --git a/include/beman/execution26/detail/gather_signatures.hpp b/include/beman/execution26/detail/gather_signatures.hpp
index 7c65a2b3..67545797 100644
--- a/include/beman/execution26/detail/gather_signatures.hpp
+++ b/include/beman/execution26/detail/gather_signatures.hpp
@@ -36,7 +36,7 @@ template <typename R, typename... A, template <typename...> class Transform>
             ::beman::execution26::detail::always_true<R>>::template meta_apply<Transform, A...>;
     }
 struct gather_signatures_apply<R(A...), Transform> {
-    using type = ::beman::execution26::detail::indirect_meta_apply<
+    using type = typename ::beman::execution26::detail::indirect_meta_apply<
         ::beman::execution26::detail::always_true<R>>::template meta_apply<Transform, A...>;
 };
 
@@ -57,7 +57,7 @@ template <typename... Signatures, template <typename...> class Tuple, template <
                 typename ::beman::execution26::detail::gather_signatures_apply<Signatures, Tuple>::type...>;
     }
 struct gather_signatures_helper<::beman::execution26::completion_signatures<Signatures...>, Tuple, Variant> {
-    using type = ::beman::execution26::detail::indirect_meta_apply<
+    using type = typename ::beman::execution26::detail::indirect_meta_apply<
         always_true<typename ::beman::execution26::detail::gather_signatures_apply<Signatures, Tuple>::type...>>::
         template meta_apply<
             Variant,
@@ -74,7 +74,7 @@ template <typename Tag,
             Tuple,
             Variant>::type;
     }
-using gather_signatures = ::beman::execution26::detail::gather_signatures_helper<
+using gather_signatures = typename ::beman::execution26::detail::gather_signatures_helper<
     ::beman::execution26::detail::meta::filter_tag<::beman::execution26::detail::same_tag, Tag, signatures>,
     Tuple,
     Variant>::type;
diff --git a/include/beman/execution26/detail/indices_for.hpp b/include/beman/execution26/detail/indices_for.hpp
index cd3b22ac..54b7b175 100644
--- a/include/beman/execution26/detail/indices_for.hpp
+++ b/include/beman/execution26/detail/indices_for.hpp
@@ -10,7 +10,7 @@
 
 namespace beman::execution26::detail {
 template <typename Sender>
-using indices_for = ::std::remove_reference_t<Sender>::indices_for;
+using indices_for = typename ::std::remove_reference_t<Sender>::indices_for;
 }
 
 // ----------------------------------------------------------------------------
diff --git a/include/beman/execution26/detail/meta_combine.hpp b/include/beman/execution26/detail/meta_combine.hpp
index 75443eb5..508d8046 100644
--- a/include/beman/execution26/detail/meta_combine.hpp
+++ b/include/beman/execution26/detail/meta_combine.hpp
@@ -29,7 +29,7 @@ struct combine<L0<T0...>, L1<T1...>, L...> {
 
 namespace beman::execution26::detail::meta {
 template <typename... L>
-using combine = ::beman::execution26::detail::meta::detail::combine<L...>::type;
+using combine = typename ::beman::execution26::detail::meta::detail::combine<L...>::type;
 }
 
 // ----------------------------------------------------------------------------
diff --git a/include/beman/execution26/detail/meta_filter.hpp b/include/beman/execution26/detail/meta_filter.hpp
index d286e2ac..edb60af3 100644
--- a/include/beman/execution26/detail/meta_filter.hpp
+++ b/include/beman/execution26/detail/meta_filter.hpp
@@ -46,10 +46,10 @@ struct filter_tag<Predicate, Tag, List<H, T...>> {
 
 namespace beman::execution26::detail::meta {
 template <template <typename> class Predicate, typename List>
-using filter = ::beman::execution26::detail::meta::detail::filter<Predicate, List>::type;
+using filter = typename ::beman::execution26::detail::meta::detail::filter<Predicate, List>::type;
 
 template <template <typename, typename> class Predicate, typename Tag, typename List>
-using filter_tag = ::beman::execution26::detail::meta::detail::filter_tag<Predicate, Tag, List>::type;
+using filter_tag = typename ::beman::execution26::detail::meta::detail::filter_tag<Predicate, Tag, List>::type;
 } // namespace beman::execution26::detail::meta
 
 // ----------------------------------------------------------------------------
diff --git a/include/beman/execution26/detail/meta_prepend.hpp b/include/beman/execution26/detail/meta_prepend.hpp
index 54f5430a..2290b083 100644
--- a/include/beman/execution26/detail/meta_prepend.hpp
+++ b/include/beman/execution26/detail/meta_prepend.hpp
@@ -18,7 +18,7 @@ struct prepend<H, List<T...>> {
 
 namespace beman::execution26::detail::meta {
 template <typename H, typename Tail>
-using prepend = ::beman::execution26::detail::meta::detail::prepend<H, Tail>::type;
+using prepend = typename ::beman::execution26::detail::meta::detail::prepend<H, Tail>::type;
 }
 
 // ----------------------------------------------------------------------------
diff --git a/include/beman/execution26/detail/meta_unique.hpp b/include/beman/execution26/detail/meta_unique.hpp
index 9e4afc5e..c75f3caf 100644
--- a/include/beman/execution26/detail/meta_unique.hpp
+++ b/include/beman/execution26/detail/meta_unique.hpp
@@ -37,7 +37,7 @@ struct unique<List<T...>> {
 
 namespace beman::execution26::detail::meta {
 template <typename T>
-using unique = ::beman::execution26::detail::meta::detail::unique<T>::type;
+using unique = typename ::beman::execution26::detail::meta::detail::unique<T>::type;
 }
 
 // ----------------------------------------------------------------------------
diff --git a/include/beman/execution26/detail/product_type.hpp b/include/beman/execution26/detail/product_type.hpp
index 1c43e8e8..ff19a1ed 100644
--- a/include/beman/execution26/detail/product_type.hpp
+++ b/include/beman/execution26/detail/product_type.hpp
@@ -120,7 +120,7 @@ constexpr auto sub_apply_helper(Fun&& fun, Tuple&& tuple, ::std::index_sequence<
 
 template <::std::size_t Start, typename Fun, typename Tuple>
 constexpr auto sub_apply(Fun&& fun, Tuple&& tuple) -> decltype(auto) {
-    static constexpr ::std::size_t TSize{::std::tuple_size_v<::std::remove_cvref_t<Tuple>>};
+    constexpr ::std::size_t TSize{::std::tuple_size_v<::std::remove_cvref_t<Tuple>>};
     static_assert(Start <= TSize);
     return sub_apply_helper<Start>(
         ::std::forward<Fun>(fun), ::std::forward<Tuple>(tuple), ::std::make_index_sequence<TSize - Start>());
diff --git a/include/beman/execution26/detail/single_sender_value_type.hpp b/include/beman/execution26/detail/single_sender_value_type.hpp
index a1055426..5802d4fd 100644
--- a/include/beman/execution26/detail/single_sender_value_type.hpp
+++ b/include/beman/execution26/detail/single_sender_value_type.hpp
@@ -50,7 +50,7 @@ struct single_sender_value_type_helper<Sender, Env> {
 };
 
 template <typename Sender, typename Env>
-using single_sender_value_type = single_sender_value_type_helper<Sender, Env>::type;
+using single_sender_value_type = typename single_sender_value_type_helper<Sender, Env>::type;
 } // namespace beman::execution26::detail
 
 // ----------------------------------------------------------------------------
diff --git a/include/beman/execution26/detail/stop_callback_for_t.hpp b/include/beman/execution26/detail/stop_callback_for_t.hpp
index 58dc0eef..1b1d7cdd 100644
--- a/include/beman/execution26/detail/stop_callback_for_t.hpp
+++ b/include/beman/execution26/detail/stop_callback_for_t.hpp
@@ -10,7 +10,7 @@
 
 namespace beman::execution26 {
 template <class Token, class CallbackFun>
-using stop_callback_for_t = Token::template callback_type<CallbackFun>;
+using stop_callback_for_t = typename Token::template callback_type<CallbackFun>;
 }
 
 namespace beman::execution26::detail {