diff --git a/plugins/GSdx/GSCrc.cpp b/plugins/GSdx/GSCrc.cpp
index 820bebe0c8..d268cf0199 100644
--- a/plugins/GSdx/GSCrc.cpp
+++ b/plugins/GSdx/GSCrc.cpp
@@ -516,7 +516,7 @@ CRC::Game CRC::m_games[] =
 	{0x4653CA3E, HarleyDavidson, NoRegion, 0},
 };
 
-map<uint32, CRC::Game*> CRC::m_map;
+std::map<uint32, CRC::Game*> CRC::m_map;
 
 std::string ToLower( std::string str )
 {
diff --git a/plugins/GSdx/GSCrc.h b/plugins/GSdx/GSCrc.h
index 80c4a0e048..82a81570f9 100644
--- a/plugins/GSdx/GSCrc.h
+++ b/plugins/GSdx/GSCrc.h
@@ -209,7 +209,7 @@ public:
 
 private:
 	static Game m_games[];
-	static map<uint32, Game*> m_map;
+	static std::map<uint32, Game*> m_map;
 
 public:
 	static Game Lookup(uint32 crc);
diff --git a/plugins/GSdx/GSRendererOGL.cpp b/plugins/GSdx/GSRendererOGL.cpp
index 866fea57b9..c7a892e2a2 100644
--- a/plugins/GSdx/GSRendererOGL.cpp
+++ b/plugins/GSdx/GSRendererOGL.cpp
@@ -1006,7 +1006,7 @@ void GSRendererOGL::SendDraw()
 
 #if defined(_DEBUG)
 		// Check how draw call is split.
-		map<size_t, size_t> frequency;
+		std::map<size_t, size_t> frequency;
 		for (const auto& it: m_drawlist)
 			++frequency[it];
 
diff --git a/plugins/GSdx/GSdx.cpp b/plugins/GSdx/GSdx.cpp
index acf33122ad..6f68192be2 100644
--- a/plugins/GSdx/GSdx.cpp
+++ b/plugins/GSdx/GSdx.cpp
@@ -147,14 +147,13 @@ bool GSdxApp::WritePrivateProfileString(const char* lpAppName, const char* lpKey
 
 	if (f == NULL) return false; // FIXME print a nice message
 
-	map<std::string,std::string>::iterator it;
-	for (it = m_configuration_map.begin(); it != m_configuration_map.end(); ++it) {
+	for (const auto& entry : m_configuration_map) {
 		// Do not save the inifile key which is not an option
-		if (it->first.compare("inifile") == 0) continue;
+		if (entry.first.compare("inifile") == 0) continue;
 
 		// Only keep option that have a default value (allow to purge old option of the GSdx.ini)
-		if (!it->second.empty() && m_default_configuration.find(it->first) != m_default_configuration.end())
-			fprintf(f, "%s = %s\n", it->first.c_str(), it->second.c_str());
+		if (!entry.second.empty() && m_default_configuration.find(entry.first) != m_default_configuration.end())
+			fprintf(f, "%s = %s\n", entry.first.c_str(), entry.second.c_str());
 	}
 	fclose(f);
 
diff --git a/plugins/GSdx/PSX/GPURenderer.cpp b/plugins/GSdx/PSX/GPURenderer.cpp
index 1cad120e3d..3de626ae48 100644
--- a/plugins/GSdx/PSX/GPURenderer.cpp
+++ b/plugins/GSdx/PSX/GPURenderer.cpp
@@ -25,7 +25,7 @@
 
 #ifdef _WIN32
 
-map<HWND, GPURenderer*> GPURenderer::m_wnd2gpu;
+std::map<HWND, GPURenderer*> GPURenderer::m_wnd2gpu;
 
 #endif
 
@@ -231,7 +231,7 @@ bool GPURenderer::MakeSnapshot(const std::string& path)
 
 LRESULT CALLBACK GPURenderer::WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-	map<HWND, GPURenderer*>::iterator i = m_wnd2gpu.find(hWnd);
+	auto i = m_wnd2gpu.find(hWnd);
 
 	if(i != m_wnd2gpu.end())
 	{
diff --git a/plugins/GSdx/PSX/GPURenderer.h b/plugins/GSdx/PSX/GPURenderer.h
index 680cc45a70..631346d887 100644
--- a/plugins/GSdx/PSX/GPURenderer.h
+++ b/plugins/GSdx/PSX/GPURenderer.h
@@ -50,7 +50,7 @@ protected:
 
 	HWND m_hWnd;
 	WNDPROC m_wndproc;
-	static map<HWND, GPURenderer*> m_wnd2gpu;
+	static std::map<HWND, GPURenderer*> m_wnd2gpu;
 
 	static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 	LRESULT OnMessage(UINT message, WPARAM wParam, LPARAM lParam);