diff --git a/actions.hpp b/actions.hpp
index c314532..380df8b 100644
--- a/actions.hpp
+++ b/actions.hpp
@@ -71,7 +71,7 @@
  *      to the requested value.
  */
 template <typename T, typename U, typename V>
-decltype(auto) setProperty(
+auto setProperty(
     const char* path, const char* iface,
     U&& member, V&& value)
 {
diff --git a/manager.hpp b/manager.hpp
index 1c060bc..d087b8b 100644
--- a/manager.hpp
+++ b/manager.hpp
@@ -35,7 +35,7 @@
 template <typename T>
 struct MakeInterface
 {
-    static decltype(auto) make(sdbusplus::bus::bus& bus, const char* path)
+    static auto make(sdbusplus::bus::bus& bus, const char* path)
     {
         using HolderType = holder::Holder<std::unique_ptr<T>>;
         return static_cast<std::unique_ptr<holder::Base>>(