diff --git a/intern/ghost/intern/GHOST_WindowManager.cpp b/intern/ghost/intern/GHOST_WindowManager.cpp
index a4b65c78ef9..cf236283b0f 100644
--- a/intern/ghost/intern/GHOST_WindowManager.cpp
+++ b/intern/ghost/intern/GHOST_WindowManager.cpp
@@ -79,7 +79,7 @@ GHOST_TSuccess GHOST_WindowManager::removeWindow(const GHOST_IWindow* window)
 			endFullScreen();
 		}
 		else {
-			vector<GHOST_IWindow*>::iterator result = find(m_windows.begin(), m_windows.end(), window);
+			std::vector<GHOST_IWindow*>::iterator result = find(m_windows.begin(), m_windows.end(), window);
 			if (result != m_windows.end()) {
 				setWindowInactive(window);
 				m_windows.erase(result);
@@ -99,7 +99,7 @@ bool GHOST_WindowManager::getWindowFound(const GHOST_IWindow* window) const
             found = true;
         }
         else {
-            vector<GHOST_IWindow*>::const_iterator result = find(m_windows.begin(), m_windows.end(), window);
+            std::vector<GHOST_IWindow*>::const_iterator result = find(m_windows.begin(), m_windows.end(), window);
             if (result != m_windows.end()) {
                 found = true;
             }
diff --git a/intern/string/STR_String.h b/intern/string/STR_String.h
index cbf9d0c1b3b..2f17b059c8f 100644
--- a/intern/string/STR_String.h
+++ b/intern/string/STR_String.h
@@ -51,8 +51,6 @@
 #include <cstring>
 #include <cstdlib>
 
-using namespace std;
-
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
 #endif
@@ -95,8 +93,10 @@ public:
 	inline void			Clear()										{ Len = pData[0] = 0; }
 	inline const STR_String	& Reverse()
 	{
-		for (int i1=0, i2=Len-1; i1<i2; i1++, i2--)
-			swap(pData[i1], pData[i2]); return *this;
+		for (int i1 = 0, i2 = Len - 1; i1 < i2; i1++, i2--) {
+			std::swap(pData[i1], pData[i2]);
+		}
+		return *this;
 	}
 
 	// Properties
@@ -133,7 +133,7 @@ public:
 	int				FindOneOf(const char *set, int pos = 0) const;
 	int				RFindOneOf(const char *set, int pos = 0) const;
 
-	vector<STR_String>	Explode(char c) const;
+	std::vector<STR_String> Explode(char c) const;
 
 	// Formatting
 	STR_String&			Upper();
diff --git a/intern/string/intern/STR_String.cpp b/intern/string/intern/STR_String.cpp
index e711c4e3260..5ad41c696e3 100644
--- a/intern/string/intern/STR_String.cpp
+++ b/intern/string/intern/STR_String.cpp
@@ -699,23 +699,19 @@ rcSTR_String STR_String::Concat(const char *data, int len)
 }
 
 
-
-
-
-vector<STR_String>	STR_String::Explode(char c) const
+std::vector<STR_String>	STR_String::Explode(char c) const
 {
-	STR_String				lcv	= *this;
-	vector<STR_String>		uc;
+	STR_String              lcv = *this;
+	std::vector<STR_String> uc;
 
 	while (lcv.Length())
 	{
 		int pos = lcv.Find(c);
-		if (pos < 0)
-		{
+		if (pos < 0) {
 			uc.push_back(lcv);
 			lcv.Clear();
-		} else
-		{
+		}
+		else {
 			uc.push_back(lcv.Left(pos));
 			lcv = lcv.Mid(pos+1);
 		}
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.h b/source/gameengine/Converter/KX_BlenderSceneConverter.h
index f9b0d587b81..9c2143d2cab 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.h
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.h
@@ -39,6 +39,8 @@
 #include "KX_ISceneConverter.h"
 #include "KX_IpoConvert.h"
 
+using namespace std;
+
 class KX_WorldInfo;
 class SCA_IActuator;
 class SCA_IController;
diff --git a/source/gameengine/Expressions/Value.h b/source/gameengine/Expressions/Value.h
index 10d8a8abd8f..917cf409198 100644
--- a/source/gameengine/Expressions/Value.h
+++ b/source/gameengine/Expressions/Value.h
@@ -26,6 +26,8 @@
 #include <map>		// array functionality for the propertylist
 #include "STR_String.h"	// STR_String class
 
+using namespace std;
+
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
 #endif
diff --git a/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h b/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
index b03fc8e8e40..729db794dcf 100644
--- a/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
+++ b/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
@@ -32,6 +32,8 @@
 #ifndef NG_LOOPBACKNETWORKDEVICEINTERFACE_H
 #define NG_LOOPBACKNETWORKDEVICEINTERFACE_H
 
+using namespace std;
+
 #include <deque>
 #include "NG_NetworkDeviceInterface.h"
 
diff --git a/source/gameengine/Network/NG_NetworkScene.h b/source/gameengine/Network/NG_NetworkScene.h
index 01a0d184b1c..c0469f21850 100644
--- a/source/gameengine/Network/NG_NetworkScene.h
+++ b/source/gameengine/Network/NG_NetworkScene.h
@@ -45,6 +45,8 @@
 	#undef SendMessage
 #endif
 
+using namespace std;
+
 class NG_NetworkDeviceInterface;
 
 class NG_NetworkScene
diff --git a/source/gameengine/Rasterizer/RAS_ICanvas.h b/source/gameengine/Rasterizer/RAS_ICanvas.h
index 2c2f62c946e..3ca1c992162 100644
--- a/source/gameengine/Rasterizer/RAS_ICanvas.h
+++ b/source/gameengine/Rasterizer/RAS_ICanvas.h
@@ -36,6 +36,8 @@
 #include "MEM_guardedalloc.h"
 #endif
 
+using namespace std;
+
 class RAS_Rect;
 
 /**