diff --git a/src/core/sqlrow.cpp b/src/core/sqlrow.cpp
index 06a24189b..317e660ce 100644
--- a/src/core/sqlrow.cpp
+++ b/src/core/sqlrow.cpp
@@ -32,7 +32,7 @@ void SqlRow::Init(const SqlQuery &query) {
 
 }
 
-const QVariant SqlRow::value(const int n) const {
+QVariant SqlRow::value(const int n) const {
 
   Q_ASSERT(n < record_.count());
 
diff --git a/src/core/sqlrow.h b/src/core/sqlrow.h
index 7666e4593..675a42ad5 100644
--- a/src/core/sqlrow.h
+++ b/src/core/sqlrow.h
@@ -35,7 +35,7 @@ class SqlRow {
 
   int columns() const { return record_.count(); }
   const QSqlRecord &record() const { return record_; }
-  const QVariant value(const int n) const;
+  QVariant value(const int n) const;
 
  private:
   void Init(const SqlQuery &query);
diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp
index 1b50a2adf..b450ddb14 100644
--- a/src/playlist/playlist.cpp
+++ b/src/playlist/playlist.cpp
@@ -484,7 +484,7 @@ int Playlist::current_row() const {
   return current_item_index_.isValid() ? current_item_index_.row() : -1;
 }
 
-const QModelIndex Playlist::current_index() const {
+QModelIndex Playlist::current_index() const {
   return current_item_index_;
 }
 
diff --git a/src/playlist/playlist.h b/src/playlist/playlist.h
index 82f3a6d2f..29445cd98 100644
--- a/src/playlist/playlist.h
+++ b/src/playlist/playlist.h
@@ -186,7 +186,7 @@ class Playlist : public QAbstractListModel {
   int next_row(const bool ignore_repeat_track = false);
   int previous_row(const bool ignore_repeat_track = false);
 
-  const QModelIndex current_index() const;
+  QModelIndex current_index() const;
 
   bool stop_after_current() const;
   bool is_dynamic() const { return static_cast<bool>(dynamic_playlist_); }