diff --git a/repos/base/include/base/id_space.h b/repos/base/include/base/id_space.h
index fd0ea79f7..984f997bc 100644
--- a/repos/base/include/base/id_space.h
+++ b/repos/base/include/base/id_space.h
@@ -65,12 +65,12 @@ class Genode::Id_space : public Noncopyable
 				void _for_each(FUNC const &fn) const
 				{
 					if (Avl_node<Element>::child(Avl_node_base::LEFT))
-						Avl_node<Element>::child(Avl_node_base::LEFT)->_for_each<ARG>(fn);
+						Avl_node<Element>::child(Avl_node_base::LEFT)->template _for_each<ARG>(fn);
 
 					fn(static_cast<ARG &>(_obj));
 
 					if (Avl_node<Element>::child(Avl_node_base::RIGHT))
-						Avl_node<Element>::child(Avl_node_base::RIGHT)->_for_each<ARG>(fn);
+						Avl_node<Element>::child(Avl_node_base::RIGHT)->template _for_each<ARG>(fn);
 				}
 
 			public:
diff --git a/repos/base/include/base/rpc_client.h b/repos/base/include/base/rpc_client.h
index f2406c7bd..1054c115c 100644
--- a/repos/base/include/base/rpc_client.h
+++ b/repos/base/include/base/rpc_client.h
@@ -189,13 +189,13 @@ class Genode::Rpc_client : public RPC_INTERFACE
 		template <typename IF, typename... ARGS>
 		typename IF::Ret_type call(ARGS &&...args)
 		{
-			return _cap.call<IF>(args...);
+			return _cap.template call<IF>(args...);
 		}
 
 		template <typename IF, typename... ARGS>
 		typename IF::Ret_type call(ARGS &&...args) const
 		{
-			return _cap.call<IF>(args...);
+			return _cap.template call<IF>(args...);
 		}
 
 		/**