diff --git a/.vim-template:cpp b/.vim-template:cpp
deleted file mode 100644
--- a/.vim-template:cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *   Copyright (C) %YEAR% %USER% <%MAIL%>
- *
- *   This library is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU Lesser General Public
- *   License as published by the Free Software Foundation; either
- *   version 2.1 of the License, or (at your option) version 3, or any
- *   later version accepted by the membership of KDE e.V. (or its
- *   successor approved by the membership of KDE e.V.), which shall
- *   act as a proxy defined in Section 6 of version 3 of the license.
- *
- *   This library is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *   Lesser General Public License for more details.
- *
- *   You should have received a copy of the GNU Lesser General Public
- *   License along with this library.
- *   If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "%FILE%.h"
-
-namespace KActivities {
-namespace Stats {
-
-%HERE%
-
-} // namespace Stats
-} // namespace KActivities
-
diff --git a/.vim-template:h b/.vim-template:h
deleted file mode 100644
--- a/.vim-template:h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *   Copyright (C) %YEAR% %USER% <%MAIL%>
- *
- *   This library is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU Lesser General Public
- *   License as published by the Free Software Foundation; either
- *   version 2.1 of the License, or (at your option) version 3, or any
- *   later version accepted by the membership of KDE e.V. (or its
- *   successor approved by the membership of KDE e.V.), which shall
- *   act as a proxy defined in Section 6 of version 3 of the license.
- *
- *   This library is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *   Lesser General Public License for more details.
- *
- *   You should have received a copy of the GNU Lesser General Public
- *   License along with this library.
- *   If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef KACTIVITIES_STATS_%GUARD%
-#define KACTIVITIES_STATS_%GUARD%
-
-namespace KActivities {
-namespace Stats {
-
-%HERE%
-
-} // namespace Stats
-} // namespace KActivities
-
-#endif // KACTIVITIES_STATS_%GUARD%
-
diff --git a/src/resultset.h b/src/resultset.h
--- a/src/resultset.h
+++ b/src/resultset.h
@@ -162,16 +162,16 @@
 
         reference operator[](difference_type n) const;
 
-        friend bool operator==(const const_iterator &left, const const_iterator &right);
-        friend bool operator!=(const const_iterator &left, const const_iterator &right);
+        KACTIVITIESSTATS_EXPORT friend bool operator==(const const_iterator &left, const const_iterator &right);
+        KACTIVITIESSTATS_EXPORT friend bool operator!=(const const_iterator &left, const const_iterator &right);
 
-        friend bool operator<(const const_iterator &left, const const_iterator &right);
-        friend bool operator>(const const_iterator &left, const const_iterator &right);
+        KACTIVITIESSTATS_EXPORT friend bool operator<(const const_iterator &left, const const_iterator &right);
+        KACTIVITIESSTATS_EXPORT friend bool operator>(const const_iterator &left, const const_iterator &right);
 
-        friend bool operator<=(const const_iterator &left, const const_iterator &right);
-        friend bool operator>=(const const_iterator &left, const const_iterator &right);
+        KACTIVITIESSTATS_EXPORT friend bool operator<=(const const_iterator &left, const const_iterator &right);
+        KACTIVITIESSTATS_EXPORT friend bool operator>=(const const_iterator &left, const const_iterator &right);
 
-        friend difference_type operator-(const const_iterator &left, const const_iterator &right);
+        KACTIVITIESSTATS_EXPORT friend difference_type operator-(const const_iterator &left, const const_iterator &right);
 
     private:
         const_iterator(const ResultSet *resultSet, int currentRow);
diff --git a/src/resultset_iterator.cpp b/src/resultset_iterator.cpp
--- a/src/resultset_iterator.cpp
+++ b/src/resultset_iterator.cpp
@@ -72,10 +72,9 @@
     friend void swap(ResultSet_IteratorPrivate &left,
                      ResultSet_IteratorPrivate &right)
     {
-        using namespace std;
-        swap(left.resultSet,    right.resultSet);
-        swap(left.currentRow,   right.currentRow);
-        swap(left.currentValue, right.currentValue);
+        std::swap(left.resultSet,    right.resultSet);
+        std::swap(left.currentRow,   right.currentRow);
+        std::swap(left.currentValue, right.currentValue);
     }
 
     bool operator==(const ResultSet_IteratorPrivate &other) const
diff --git a/src/utils/lazy_val.h b/src/utils/lazy_val.h
--- a/src/utils/lazy_val.h
+++ b/src/utils/lazy_val.h
@@ -38,7 +38,7 @@
     mutable bool valueRetrieved;
 
 public:
-    operator decltype(_f()) () const
+    operator auto() const -> decltype(_f())
     {
         if (!valueRetrieved) {
             valueRetrieved = true;