diff --git a/src/framework/configmanager.cpp b/src/framework/configmanager.cpp
index e3494357..eca1c6cd 100644
--- a/src/framework/configmanager.cpp
+++ b/src/framework/configmanager.cpp
@@ -111,7 +111,7 @@ void ConfigManager::setValue(const std::string &key, bool value)
 
 const std::string &ConfigManager::getString(const std::string &key)
 {
-    std::map<std::string, std::string>::iterator iter = m_confsMap.find(key);
+    auto iter = m_confsMap.find(key);
     if(iter == m_confsMap.end()) {
         warning("Config value %s not found", key.c_str());
         static std::string emptystr;
@@ -122,7 +122,7 @@ const std::string &ConfigManager::getString(const std::string &key)
 
 float ConfigManager::getFloat(const std::string &key)
 {
-    std::map<std::string, std::string>::iterator iter = m_confsMap.find(key);
+    auto iter = m_confsMap.find(key);
     if(iter == m_confsMap.end()) {
         warning("Config value %s not found", key.c_str());
         return 0;
@@ -132,7 +132,7 @@ float ConfigManager::getFloat(const std::string &key)
 
 bool ConfigManager::getBoolean(const std::string &key)
 {
-    std::map<std::string, std::string>::iterator iter = m_confsMap.find(key);
+    auto iter = m_confsMap.find(key);
     if(iter == m_confsMap.end()) {
         warning("Config value %s not found", key.c_str());
         return 0;
@@ -142,7 +142,7 @@ bool ConfigManager::getBoolean(const std::string &key)
 
 int ConfigManager::getInteger(const std::string &key)
 {
-    std::map<std::string, std::string>::iterator iter = m_confsMap.find(key);
+    auto iter = m_confsMap.find(key);
     if(iter == m_confsMap.end()) {
         warning("Config value %s not found", key.c_str());
         return 0;
diff --git a/src/framework/texturemanager.cpp b/src/framework/texturemanager.cpp
index 1e2c034f..90a6f6fa 100644
--- a/src/framework/texturemanager.cpp
+++ b/src/framework/texturemanager.cpp
@@ -43,7 +43,7 @@ TexturePtr TextureManager::get(const std::string& textureFile)
     TexturePtr texture;
 
     // check if the texture is already loaded
-    TexturesMap::iterator it = m_texturesMap.find(textureFile);
+    auto it = m_texturesMap.find(textureFile);
     if(it != m_texturesMap.end()) {
         if(it->second.expired())
             m_texturesMap.erase(it);