diff --git a/cmake/printSummary.cmake b/cmake/printSummary.cmake
index 98ba8c1f..15f9bbda 100644
--- a/cmake/printSummary.cmake
+++ b/cmake/printSummary.cmake
@@ -69,9 +69,3 @@ OptionOutput( "Building unit tests:                " EXIV2_BUILD_UNIT_TESTS
 OptionOutput( "Building doc:                       " EXIV2_BUILD_DOC                 )
 OptionOutput( "Building with coverage flags:       " BUILD_WITH_COVERAGE             )
 OptionOutput( "Using ccache:                       " BUILD_WITH_CCACHE               )
-
-message( STATUS "------------------------------------------------------------------" )
-
-message(STATUS " WARNING: Deprecated features: EPS, Video, Ssh")
-
-message( STATUS "------------------------------------------------------------------" )
diff --git a/include/exiv2/datasets.hpp b/include/exiv2/datasets.hpp
index 52b1c910..01f43ba0 100644
--- a/include/exiv2/datasets.hpp
+++ b/include/exiv2/datasets.hpp
@@ -366,10 +366,6 @@ namespace Exiv2 {
       @brief typedef for Dictionary*
      */
     typedef Dictionary*                                       Dictionary_p;
-    /*!
-      @brief typedef for Dictionary iterator
-     */
-    typedef Dictionary::const_iterator                        Dictionary_i;
 
     /*!
       @brief typedef for string set (unique strings)
diff --git a/src/basicio.cpp b/src/basicio.cpp
index 2e991099..fc31c926 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -2100,7 +2100,7 @@ namespace Exiv2 {
             throw Error(kerFileOpenFailed, "http",Exiv2::Internal::stringFormat("%d",serverCode), hostInfo_.Path);
         }
 
-        Exiv2::Dictionary_i lengthIter = response.find("Content-Length");
+        auto lengthIter = response.find("Content-Length");
         return (lengthIter == response.end()) ? -1 : atol((lengthIter->second).c_str());
     }
 
diff --git a/src/version.cpp b/src/version.cpp
index a533ec8f..cd41d1bb 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -557,9 +557,9 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys)
 
     Exiv2::Dictionary ns;
     Exiv2::XmpProperties::registeredNamespaces(ns);
-    for ( Exiv2::Dictionary_i it = ns.begin(); it != ns.end() ; ++it ) {
-        std::string xmlns = (*it).first;
-        std::string uri   = (*it).second;
+    for ( auto it = ns.begin(); it != ns.end() ; ++it ) {
+        std::string xmlns = it->first;
+        std::string uri   = it->second;
         output(os,keys,name,xmlns+":"+uri);
     }
 #endif
diff --git a/src/xmpsidecar.cpp b/src/xmpsidecar.cpp
index 7f19e00f..01def479 100644
--- a/src/xmpsidecar.cpp
+++ b/src/xmpsidecar.cpp
@@ -153,7 +153,7 @@ namespace Exiv2 {
             }
 
             // #1112 - restore dates if they lost their TZ info
-            for ( Exiv2::Dictionary_i it = dates_.begin() ; it != dates_.end() ; ++it ) {
+            for ( auto it = dates_.begin() ; it != dates_.end() ; ++it ) {
                 std::string   sKey = it->first;
                 Exiv2::XmpKey key(sKey);
                 if ( xmpData_.findKey(key) != xmpData_.end() ) {