diff --git a/src/DownloadContext.cc b/src/DownloadContext.cc
index 5620cc5f..0a76bbf5 100644
--- a/src/DownloadContext.cc
+++ b/src/DownloadContext.cc
@@ -150,7 +150,7 @@ void DownloadContext::setFileFilter(SegList<int>& sgl)
 }
 
 void DownloadContext::setAttribute
-(ContextAttributeType key, std::unique_ptr<ContextAttribute>&& value)
+(ContextAttributeType key, std::unique_ptr<ContextAttribute> value)
 {
   assert(key < MAX_CTX_ATTR);
   attrs_[key] = std::move(value);
diff --git a/src/DownloadContext.h b/src/DownloadContext.h
index ddac615d..e1d9020a 100644
--- a/src/DownloadContext.h
+++ b/src/DownloadContext.h
@@ -204,7 +204,7 @@ public:
   }
 
   void setAttribute
-  (ContextAttributeType key, std::unique_ptr<ContextAttribute>&& value);
+  (ContextAttributeType key, std::unique_ptr<ContextAttribute> value);
 
   ContextAttribute* getAttribute(ContextAttributeType key);
 
diff --git a/src/OptionHandlerImpl.cc b/src/OptionHandlerImpl.cc
index 6ac425ac..e231fe82 100644
--- a/src/OptionHandlerImpl.cc
+++ b/src/OptionHandlerImpl.cc
@@ -394,7 +394,7 @@ ParameterOptionHandler::ParameterOptionHandler
 (const Pref* pref,
  const char* description,
  const std::string& defaultValue,
- std::vector<std::string>&& validParamValues,
+ std::vector<std::string> validParamValues,
  char shortName)
   : AbstractOptionHandler(pref, description, defaultValue,
                           OptionHandler::REQ_ARG, shortName),
diff --git a/src/OptionHandlerImpl.h b/src/OptionHandlerImpl.h
index b2c5817f..eb699f85 100644
--- a/src/OptionHandlerImpl.h
+++ b/src/OptionHandlerImpl.h
@@ -181,7 +181,7 @@ public:
   ParameterOptionHandler(const Pref* pref,
                          const char* description,
                          const std::string& defaultValue,
-                         std::vector<std::string>&& validParamValues,
+                         std::vector<std::string> validParamValues,
                          char shortName = 0);
   virtual ~ParameterOptionHandler();
   virtual void parseArg(Option& option, const std::string& optarg) const;
diff --git a/src/SingletonHolder.h b/src/SingletonHolder.h
index be9a4854..e37cc4ac 100644
--- a/src/SingletonHolder.h
+++ b/src/SingletonHolder.h
@@ -55,7 +55,7 @@ public:
     return instance_.get();
   }
 
-  static void instance(std::unique_ptr<T>&& ptr)
+  static void instance(std::unique_ptr<T> ptr)
   {
     instance_ = std::move(ptr);
   }