diff --git a/Multiplayer/connect.h b/Multiplayer/connect.h
index f5eff451..d216fb30 100644
--- a/Multiplayer/connect.h
+++ b/Multiplayer/connect.h
@@ -6,6 +6,7 @@
 #include "Event Pump.h"
 #include "Bullets.h"
 #include "builddefines.h"
+#include "Strategic Movement.h"
 
 extern bool isOwnTeamWipedOut;
 
diff --git a/Utils/popup_class.cpp b/Utils/popup_class.cpp
index bb360724..b8a53b78 100644
--- a/Utils/popup_class.cpp
+++ b/Utils/popup_class.cpp
@@ -21,8 +21,8 @@
  //	functions and variable declarations for binding the class with C callbacks
 //////////////////////////////////////////////////////////////////
 
-vector<PopupIndex>	gPopupRegionIndex;
-vector<POPUP*>		gPopupIndex;	
+std::vector<PopupIndex>	gPopupRegionIndex;
+std::vector<POPUP*>		gPopupIndex;
 UINT32			gPopupRegionIndexCounter = 0;
 UINT32			gPopupIndexCounter = 0;
 UINT32			POPUP::nextid = 0;
@@ -237,19 +237,19 @@ BOOLEAN POPUP_OPTION::forceRun()
 //////////////////////////////////////////////////////////////////
 
 // constructor
-POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(void) : POPUP_OPTION(new wstring(L"Unnamed subPopup"),NULL)	//TODO: possible memmory leak!
+POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(void) : POPUP_OPTION(new std::wstring(L"Unnamed subPopup"),NULL)	//TODO: possible memmory leak!
 {
 	this->parent = NULL;
 	this->initSubPopup();
 }
 
-POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(wstring* name) : POPUP_OPTION(name, NULL)
+POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(std::wstring* name) : POPUP_OPTION(name, NULL)
 {
 	this->parent = NULL;
 	this->initSubPopup();
 }
 
-POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(wstring* newName, const POPUP * parent) : POPUP_OPTION(newName, NULL)
+POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(std::wstring* newName, const POPUP * parent) : POPUP_OPTION(newName, NULL)
 {
 	this->parent = parent;
 	this->initSubPopup();
@@ -342,7 +342,7 @@ static void unShadeOpenSubPopup( POPUP_SUB_POPUP_OPTION * opt ){
 
 void POPUP_SUB_POPUP_OPTION::initSubPopup()
 {
-	this->subPopup = new POPUP( (CHAR*) wstring(this->name).c_str() );
+	this->subPopup = new POPUP( (CHAR*) std::wstring(this->name).c_str() );
 	this->subPopup->setCallback(POPUP_CALLBACK_SHOW,new popupCallbackFunction<void,POPUP_SUB_POPUP_OPTION*>( &shadeOpenSubPopup, this ));
 	this->subPopup->setCallback(POPUP_CALLBACK_HIDE,new popupCallbackFunction<void,POPUP_SUB_POPUP_OPTION*>( &unShadeOpenSubPopup, this ));
 
@@ -563,7 +563,7 @@ void POPUP::setInitialValues(void)
 
 // setup functions
 
-POPUP_OPTION *  POPUP::addOption(wstring * name, popupCallback* action)
+POPUP_OPTION *  POPUP::addOption(std::wstring * name, popupCallback* action)
 {	
 	if (this->optionCount < POPUP_MAX_OPTIONS)
 	{
@@ -606,7 +606,7 @@ POPUP_OPTION * POPUP::getOption(UINT16 n)
 	return NULL;
 }
 
-POPUP * POPUP::addSubMenuOption(wstring * name)
+POPUP * POPUP::addSubMenuOption(std::wstring * name)
 {
 	if (this->subPopupOptionCount < POPUP_MAX_SUB_POPUPS)
 	{