diff --git a/PowerEditor/src/MISC/Common/Sorters.h b/PowerEditor/src/MISC/Common/Sorters.h
index 82290438..388976e5 100644
--- a/PowerEditor/src/MISC/Common/Sorters.h
+++ b/PowerEditor/src/MISC/Common/Sorters.h
@@ -26,8 +26,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef M30_IDE_SORTERS_H
-#define M30_IDE_SORTERS_H
+#ifndef NPP_SORTERS_H
+#define NPP_SORTERS_H
+
+#include <algorithm>
 
 // Base interface for line sorting.
 class ISorter
@@ -259,4 +261,4 @@ protected:
 	}
 };
 
-#endif //M30_IDE_SORTERS_H
+#endif //NPP_SORTERS_H
diff --git a/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h b/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
index 3acce661..dc2912a3 100644
--- a/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
+++ b/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
@@ -29,6 +29,8 @@
 #ifndef NOTEPAD_PLUS_MSGS_H
 #define NOTEPAD_PLUS_MSGS_H
 
+#include <windows.h>
+#include <tchar.h>
 
 enum LangType {L_TEXT, L_PHP , L_C, L_CPP, L_CS, L_OBJC, L_JAVA, L_RC,\
 			   L_HTML, L_XML, L_MAKEFILE, L_PASCAL, L_BATCH, L_INI, L_ASCII, L_USER,\
@@ -541,44 +543,44 @@ enum winVer{WV_UNKNOWN, WV_WIN32S, WV_95, WV_98, WV_ME, WV_NT, WV_W2K, WV_XP, WV
 	//scnNotification->nmhdr.hwndFrom = NULL;
 	//scnNotification->nmhdr.idFrom = BufferID;
 
-	#define NPPN_BEFORESHUTDOWN (NPPN_FIRST + 19)  // To notify plugins that Npp shutdown has been triggered, files have not been closed yet
-	//scnNotification->nmhdr.code = NPPN_BEFORESHUTDOWN;
-	//scnNotification->nmhdr.hwndFrom = hwndNpp;
-	//scnNotification->nmhdr.idFrom = 0;
-
-	#define NPPN_CANCELSHUTDOWN (NPPN_FIRST + 20)  // To notify plugins that Npp shutdown has been cancelled
-	//scnNotification->nmhdr.code = NPPN_CANCELSHUTDOWN;
-	//scnNotification->nmhdr.hwndFrom = hwndNpp;
-	//scnNotification->nmhdr.idFrom = 0;
-
-	#define NPPN_FILEBEFORERENAME (NPPN_FIRST + 21)  // To notify plugins that file is to be renamed
-	//scnNotification->nmhdr.code = NPPN_FILEBEFORERENAME;
-	//scnNotification->nmhdr.hwndFrom = hwndNpp;
-	//scnNotification->nmhdr.idFrom = BufferID;
-
-	#define NPPN_FILERENAMECANCEL (NPPN_FIRST + 22)  // To notify plugins that file rename has been cancelled
-	//scnNotification->nmhdr.code = NPPN_FILERENAMECANCEL;
-	//scnNotification->nmhdr.hwndFrom = hwndNpp;
-	//scnNotification->nmhdr.idFrom = BufferID;
-
-	#define NPPN_FILERENAMED (NPPN_FIRST + 23)  // To notify plugins that file has been renamed
-	//scnNotification->nmhdr.code = NPPN_FILERENAMED;
-	//scnNotification->nmhdr.hwndFrom = hwndNpp;
-	//scnNotification->nmhdr.idFrom = BufferID;
-
-	#define NPPN_FILEBEFOREDELETE (NPPN_FIRST + 24)  // To notify plugins that file is to be deleted
-	//scnNotification->nmhdr.code = NPPN_FILEBEFOREDELETE;
-	//scnNotification->nmhdr.hwndFrom = hwndNpp;
-	//scnNotification->nmhdr.idFrom = BufferID;
-
-	#define NPPN_FILEDELETEFAILED (NPPN_FIRST + 25)  // To notify plugins that file deletion has failed
-	//scnNotification->nmhdr.code = NPPN_FILEDELETEFAILED;
-	//scnNotification->nmhdr.hwndFrom = hwndNpp;
-	//scnNotification->nmhdr.idFrom = BufferID;
-
-	#define NPPN_FILEDELETED (NPPN_FIRST + 26)  // To notify plugins that file has been deleted
-	//scnNotification->nmhdr.code = NPPN_FILEDELETED;
-	//scnNotification->nmhdr.hwndFrom = hwndNpp;
+	#define NPPN_BEFORESHUTDOWN (NPPN_FIRST + 19)  // To notify plugins that Npp shutdown has been triggered, files have not been closed yet
+	//scnNotification->nmhdr.code = NPPN_BEFORESHUTDOWN;
+	//scnNotification->nmhdr.hwndFrom = hwndNpp;
+	//scnNotification->nmhdr.idFrom = 0;
+
+	#define NPPN_CANCELSHUTDOWN (NPPN_FIRST + 20)  // To notify plugins that Npp shutdown has been cancelled
+	//scnNotification->nmhdr.code = NPPN_CANCELSHUTDOWN;
+	//scnNotification->nmhdr.hwndFrom = hwndNpp;
+	//scnNotification->nmhdr.idFrom = 0;
+
+	#define NPPN_FILEBEFORERENAME (NPPN_FIRST + 21)  // To notify plugins that file is to be renamed
+	//scnNotification->nmhdr.code = NPPN_FILEBEFORERENAME;
+	//scnNotification->nmhdr.hwndFrom = hwndNpp;
+	//scnNotification->nmhdr.idFrom = BufferID;
+
+	#define NPPN_FILERENAMECANCEL (NPPN_FIRST + 22)  // To notify plugins that file rename has been cancelled
+	//scnNotification->nmhdr.code = NPPN_FILERENAMECANCEL;
+	//scnNotification->nmhdr.hwndFrom = hwndNpp;
+	//scnNotification->nmhdr.idFrom = BufferID;
+
+	#define NPPN_FILERENAMED (NPPN_FIRST + 23)  // To notify plugins that file has been renamed
+	//scnNotification->nmhdr.code = NPPN_FILERENAMED;
+	//scnNotification->nmhdr.hwndFrom = hwndNpp;
+	//scnNotification->nmhdr.idFrom = BufferID;
+
+	#define NPPN_FILEBEFOREDELETE (NPPN_FIRST + 24)  // To notify plugins that file is to be deleted
+	//scnNotification->nmhdr.code = NPPN_FILEBEFOREDELETE;
+	//scnNotification->nmhdr.hwndFrom = hwndNpp;
+	//scnNotification->nmhdr.idFrom = BufferID;
+
+	#define NPPN_FILEDELETEFAILED (NPPN_FIRST + 25)  // To notify plugins that file deletion has failed
+	//scnNotification->nmhdr.code = NPPN_FILEDELETEFAILED;
+	//scnNotification->nmhdr.hwndFrom = hwndNpp;
+	//scnNotification->nmhdr.idFrom = BufferID;
+
+	#define NPPN_FILEDELETED (NPPN_FIRST + 26)  // To notify plugins that file has been deleted
+	//scnNotification->nmhdr.code = NPPN_FILEDELETED;
+	//scnNotification->nmhdr.hwndFrom = hwndNpp;
 	//scnNotification->nmhdr.idFrom = BufferID;
 
 #endif //NOTEPAD_PLUS_MSGS_H
diff --git a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
index a2966d83..f37a993e 100644
--- a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
+++ b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
@@ -30,6 +30,8 @@
 #include "PluginsManager.h"
 #include "resource.h"
 
+using namespace std;
+
 const TCHAR * USERMSG = TEXT("This plugin is not compatible with current version of Notepad++.\n\n\
 Do you want to remove this plugin from plugins directory to prevent this message from the next launch time?");
 
diff --git a/PowerEditor/src/MISC/PluginsManager/PluginsManager.h b/PowerEditor/src/MISC/PluginsManager/PluginsManager.h
index ecc9e019..cb05f2a3 100644
--- a/PowerEditor/src/MISC/PluginsManager/PluginsManager.h
+++ b/PowerEditor/src/MISC/PluginsManager/PluginsManager.h
@@ -97,7 +97,7 @@ public:
 		_nppData = nppData;
 	};
 
-    int loadPlugin(const TCHAR *pluginFilePath, vector<generic_string> & dll2Remove);
+    int loadPlugin(const TCHAR *pluginFilePath, std::vector<generic_string> & dll2Remove);
 	bool loadPlugins(const TCHAR *dir = NULL);
 	
     bool unloadPlugin(int index, HWND nppHandle);
@@ -129,9 +129,9 @@ private:
 	NppData _nppData;
 	HMENU _hPluginsMenu;
 
-	vector<PluginInfo *> _pluginInfos;
-	vector<PluginCommand> _pluginsCommands;
-	vector<generic_string> _loadedDlls;
+	std::vector<PluginInfo *> _pluginInfos;
+	std::vector<PluginCommand> _pluginsCommands;
+	std::vector<generic_string> _loadedDlls;
 	bool _isDisabled;
 	IDAllocator _dynamicIDAlloc;
 	IDAllocator _markerAlloc;
diff --git a/PowerEditor/src/MISC/Process/Process.h b/PowerEditor/src/MISC/Process/Process.h
index 81d3ca54..2bf7ec23 100644
--- a/PowerEditor/src/MISC/Process/Process.h
+++ b/PowerEditor/src/MISC/Process/Process.h
@@ -29,8 +29,6 @@
 #ifndef PROCESSUS_H
 #define PROCESSUS_H
 
-using namespace std;
-
 enum progType {WIN32_PROG, CONSOLE_PROG};
 
 class Process 
diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
index 74d75cdd..1d455312 100644
--- a/PowerEditor/src/Notepad_plus.cpp
+++ b/PowerEditor/src/Notepad_plus.cpp
@@ -48,6 +48,8 @@
 #include "documentMap.h"
 #include "functionListPanel.h"
 
+using namespace std;
+
 enum tb_stat {tb_saved, tb_unsaved, tb_ro};
 #define DIR_LEFT true
 #define DIR_RIGHT false
diff --git a/PowerEditor/src/Notepad_plus.h b/PowerEditor/src/Notepad_plus.h
index 43fad220..f0d4d607 100644
--- a/PowerEditor/src/Notepad_plus.h
+++ b/PowerEditor/src/Notepad_plus.h
@@ -296,7 +296,7 @@ public:
 	bool findInFiles();
 	bool replaceInFiles();
 	void setFindReplaceFolderFilter(const TCHAR *dir, const TCHAR *filters);
-	vector<generic_string> addNppComponents(const TCHAR *destDir, const TCHAR *extFilterName, const TCHAR *extFilter);
+	std::vector<generic_string> addNppComponents(const TCHAR *destDir, const TCHAR *extFilterName, const TCHAR *extFilter);
     int getHtmlXmlEncoding(const TCHAR *fileName) const;
 	HACCEL getAccTable() const{
 		return _accelerator.getAccTable();
@@ -314,7 +314,7 @@ private:
 	Notepad_plus_Window *_pPublicInterface;
     Window *_pMainWindow;
 	DockingManager _dockingManager;
-	vector<int> _internalFuncIDs;
+	std::vector<int> _internalFuncIDs;
 
 	AutoCompletion _autoCompleteMain;
 	AutoCompletion _autoCompleteSub;	//each Scintilla has its own autoComplete
@@ -358,7 +358,7 @@ private:
 	FindCharsInRangeDlg _findCharsInRangeDlg;
 	
 	// a handle list of all the Notepad++ dialogs
-	vector<HWND> _hModelessDlgs;
+	std::vector<HWND> _hModelessDlgs;
 
 	LastRecentFileList _lastRecentFileList;
 
@@ -422,7 +422,7 @@ private:
 
 	ScintillaCtrls _scintillaCtrls4Plugins;
 
-	vector<pair<int, int> > _hideLinesMarks;
+	std::vector<std::pair<int, int> > _hideLinesMarks;
 	StyleArray _hotspotStyles;
 
 	AnsiCharPanel *_pAnsiCharPanel;
@@ -594,8 +594,8 @@ private:
 	bool findInOpenedFiles();
 	bool findInCurrentFile();
 
-	bool matchInList(const TCHAR *fileName, const vector<generic_string> & patterns);
-	void getMatchedFileNames(const TCHAR *dir, const vector<generic_string> & patterns, vector<generic_string> & fileNames, bool isRecursive, bool isInHiddenDir);
+	bool matchInList(const TCHAR *fileName, const std::vector<generic_string> & patterns);
+	void getMatchedFileNames(const TCHAR *dir, const std::vector<generic_string> & patterns, std::vector<generic_string> & fileNames, bool isRecursive, bool isInHiddenDir);
 
 	void doSynScorll(HWND hW);
 	void setWorkingDir(const TCHAR *dir);
diff --git a/PowerEditor/src/Notepad_plus_Window.cpp b/PowerEditor/src/Notepad_plus_Window.cpp
index 29670d4d..0e9d8169 100644
--- a/PowerEditor/src/Notepad_plus_Window.cpp
+++ b/PowerEditor/src/Notepad_plus_Window.cpp
@@ -159,14 +159,14 @@ void Notepad_plus_Window::init(HINSTANCE hInst, HWND parent, const TCHAR *cmdLin
 		_notepad_plus_plus_core.loadCommandlineParams(cmdLine, cmdLineParams);
     }
 
-	vector<generic_string> fileNames;
-	vector<generic_string> patterns;
+	std::vector<generic_string> fileNames;
+	std::vector<generic_string> patterns;
 	patterns.push_back(TEXT("*.xml"));
 	
 	generic_string nppDir = pNppParams->getNppPath();
 
 	LocalizationSwitcher & localizationSwitcher = pNppParams->getLocalizationSwitcher();
-	wstring localizationDir = nppDir;
+	std::wstring localizationDir = nppDir;
 	PathAppend(localizationDir, TEXT("localization\\"));
 
 	_notepad_plus_plus_core.getMatchedFileNames(localizationDir.c_str(), patterns, fileNames, false, false);
diff --git a/PowerEditor/src/Notepad_plus_Window.h b/PowerEditor/src/Notepad_plus_Window.h
index 4fd1db82..b1766470 100644
--- a/PowerEditor/src/Notepad_plus_Window.h
+++ b/PowerEditor/src/Notepad_plus_Window.h
@@ -99,7 +99,7 @@ private:
 	static const TCHAR _className[32];
 	bool _isPrelaunch;
 	bool _disablePluginsManager;
-	string _userQuote; // keep the availability of this string for thread using 
+	std::string _userQuote; // keep the availability of this string for thread using 
 };
 
 #endif //NOTEPAD_PLUS_WINDOW_H
diff --git a/PowerEditor/src/NppBigSwitch.cpp b/PowerEditor/src/NppBigSwitch.cpp
index 8f25abd2..494238e3 100644
--- a/PowerEditor/src/NppBigSwitch.cpp
+++ b/PowerEditor/src/NppBigSwitch.cpp
@@ -38,6 +38,8 @@
 #include "documentMap.h"
 #include "functionListPanel.h"
 
+using namespace std;
+
 #define WM_DPICHANGED 0x02E0
 
 struct SortTaskListPred
diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp
index 98542483..a75a8186 100644
--- a/PowerEditor/src/NppCommands.cpp
+++ b/PowerEditor/src/NppCommands.cpp
@@ -38,6 +38,7 @@
 #include "Sorters.h"
 #include "LongRunningOperation.h"
 
+using namespace std;
 
 void Notepad_plus::macroPlayback(Macro macro)
 {
diff --git a/PowerEditor/src/NppIO.cpp b/PowerEditor/src/NppIO.cpp
index b430b97f..ee732d1a 100644
--- a/PowerEditor/src/NppIO.cpp
+++ b/PowerEditor/src/NppIO.cpp
@@ -34,6 +34,7 @@
 #include "functionListPanel.h"
 #include <TCHAR.h>
 
+using namespace std;
 
 BufferID Notepad_plus::doOpen(const TCHAR *fileName, bool isRecursive, bool isReadOnly, int encoding, const TCHAR *backupFileName, time_t fileNameTimestamp)
 {
diff --git a/PowerEditor/src/NppNotification.cpp b/PowerEditor/src/NppNotification.cpp
index 99a00790..fcbc5eee 100644
--- a/PowerEditor/src/NppNotification.cpp
+++ b/PowerEditor/src/NppNotification.cpp
@@ -34,6 +34,8 @@
 #include "documentMap.h"
 #include <stack>
 
+using namespace std;
+
 BOOL Notepad_plus::notify(SCNotification *notification)
 {
 	//Important, keep track of which element generated the message
diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp
index c0cff90a..93086e7a 100644
--- a/PowerEditor/src/Parameters.cpp
+++ b/PowerEditor/src/Parameters.cpp
@@ -36,6 +36,8 @@
 #include "UserDefineDialog.h"
 #include "../src/sqlite/sqlite3.h"
 
+using namespace std;
+
 struct WinMenuKeyDefinition {	//more or less matches accelerator table definition, easy copy/paste
 	//const TCHAR * name;	//name retrieved from menu?
 	int vKey;
diff --git a/PowerEditor/src/Parameters.h b/PowerEditor/src/Parameters.h
index eae35abb..86243821 100644
--- a/PowerEditor/src/Parameters.h
+++ b/PowerEditor/src/Parameters.h
@@ -74,8 +74,6 @@
 
 class NativeLangSpeaker;
 
-using namespace std;
-
 const bool POS_VERTICAL = true;
 const bool POS_HORIZOTAL = false;
 
@@ -136,7 +134,7 @@ const TCHAR localConfFile[] = TEXT("doLocalConf.xml");
 const TCHAR allowAppDataPluginsFile[] = TEXT("allowAppDataPlugins.xml");
 const TCHAR notepadStyleFile[] = TEXT("asNotepad.xml");
 
-void cutString(const TCHAR *str2cut, vector<generic_string> & patternVect);
+void cutString(const TCHAR *str2cut, std::vector<generic_string> & patternVect);
 
 
 struct Position
@@ -162,8 +160,8 @@ struct sessionFileInfo : public Position {
 	
 	generic_string _fileName;
 	generic_string	_langName;
-	vector<size_t> _marks;
-	vector<size_t> _foldStates;
+	std::vector<size_t> _marks;
+	std::vector<size_t> _foldStates;
 	int	_encoding;
 
 	generic_string _backupFilePath;
@@ -176,8 +174,8 @@ struct Session {
 	size_t _activeView;
 	size_t _activeMainIndex;
 	size_t _activeSubIndex;
-	vector<sessionFileInfo> _mainViewFiles;
-	vector<sessionFileInfo> _subViewFiles;
+	std::vector<sessionFileInfo> _mainViewFiles;
+	std::vector<sessionFileInfo> _subViewFiles;
 };
 
 struct CmdLineParams {
@@ -258,9 +256,9 @@ struct DockingManagerData {
 
 	DockingManagerData() : _leftWidth(200), _rightWidth(200), _topHeight(200), _bottomHight(200) {};
 
-	vector<FloatingWindowInfo>		_flaotingWindowInfo;
-	vector<PluginDlgDockingInfo>	_pluginDockInfo;
-	vector<ContainerTabInfo>		_containerTabInfo;
+	std::vector<FloatingWindowInfo>		_flaotingWindowInfo;
+	std::vector<PluginDlgDockingInfo>	_pluginDockInfo;
+	std::vector<ContainerTabInfo>		_containerTabInfo;
 
 	bool getFloatingRCFrom(int floatCont, RECT & rc) {
 		for (size_t i = 0, fwiLen = _flaotingWindowInfo.size(); i < fwiLen; ++i)
@@ -648,8 +646,8 @@ private:
 };
 
 struct MatchedPairConf {
-	vector< pair<char, char> > _matchedPairs;
-	vector< pair<char, char> > _matchedPairsInit; // used only on init
+	std::vector< std::pair<char, char> > _matchedPairs;
+	std::vector< std::pair<char, char> > _matchedPairsInit; // used only on init
 	bool _doHtmlXmlTag;
 	bool _doParentheses;
 	bool _doBrackets;
@@ -739,7 +737,7 @@ struct NppGUI
 	NewDocDefaultSettings _newDocDefaultSettings;
 	void setTabReplacedBySpace(bool b) {_tabReplacedBySpace = b;};
 	const NewDocDefaultSettings & getNewDocDefaultSettings() const {return _newDocDefaultSettings;};
-	vector<LangMenuItem> _excludedLangList;
+	std::vector<LangMenuItem> _excludedLangList;
 	bool _isLangMenuCompact;
 
 	PrintSettings _printSettings;
@@ -1024,10 +1022,10 @@ struct FindHistory {
 	int _nbMaxFindHistoryFind;
 	int _nbMaxFindHistoryReplace;
 
-    vector<generic_string> _findHistoryPaths;
-	vector<generic_string> _findHistoryFilters;
-	vector<generic_string> _findHistoryFinds;
-	vector<generic_string> _findHistoryReplaces;
+    std::vector<generic_string> _findHistoryPaths;
+	std::vector<generic_string> _findHistoryFilters;
+	std::vector<generic_string> _findHistoryFinds;
+	std::vector<generic_string> _findHistoryReplaces;
 
 	bool _isMatchWord;
 	bool _isMatchCase;
@@ -1057,19 +1055,19 @@ public :
 		wchar_t *_xmlFileName;
 	};
 
-	bool addLanguageFromXml(wstring xmlFullPath);
-	wstring getLangFromXmlFileName(const wchar_t *fn) const;
+	bool addLanguageFromXml(std::wstring xmlFullPath);
+	std::wstring getLangFromXmlFileName(const wchar_t *fn) const;
 
-	wstring getXmlFilePathFromLangName(const wchar_t *langName) const;
+	std::wstring getXmlFilePathFromLangName(const wchar_t *langName) const;
 	bool switchToLang(wchar_t *lang2switch) const;
 
 	size_t size() const {
 		return _localizationList.size();
 	};
 
-	pair<wstring, wstring> getElementFromIndex(size_t index) {
+	std::pair<std::wstring, std::wstring> getElementFromIndex(size_t index) {
 		if (index >= _localizationList.size())
-			return pair<wstring, wstring>(TEXT(""), TEXT(""));
+			return std::pair<std::wstring, std::wstring>(TEXT(""), TEXT(""));
 		return _localizationList[index];
 	};
 
@@ -1078,14 +1076,14 @@ public :
             _fileName = fn;
     };
 
-    string getFileName() const {
+	std::string getFileName() const {
         return _fileName;
     };
 
 private :
-	vector< pair< wstring, wstring > > _localizationList;
-	wstring _nativeLangPath;
-    string _fileName;
+	std::vector< std::pair< std::wstring, std::wstring > > _localizationList;
+	std::wstring _nativeLangPath;
+	std::string _fileName;
 };
 
 class ThemeSwitcher {
@@ -1095,11 +1093,11 @@ public :
 	ThemeSwitcher(){};
 
 	void addThemeFromXml(generic_string xmlFullPath) {
-		_themeList.push_back(pair<generic_string, generic_string>(getThemeFromXmlFileName(xmlFullPath.c_str()), xmlFullPath));
+		_themeList.push_back(std::pair<generic_string, generic_string>(getThemeFromXmlFileName(xmlFullPath.c_str()), xmlFullPath));
 	};
 
 	void addDefaultThemeFromXml(generic_string xmlFullPath) {
-		_themeList.push_back(pair<generic_string, generic_string>(TEXT("Default (stylers.xml)"), xmlFullPath));
+		_themeList.push_back(std::pair<generic_string, generic_string>(TEXT("Default (stylers.xml)"), xmlFullPath));
 	};
 
 	generic_string getThemeFromXmlFileName(const TCHAR *fn) const;
@@ -1124,24 +1122,24 @@ public :
 	};
 
 	
-	pair<generic_string, generic_string> & getElementFromIndex(size_t index) {
+	std::pair<generic_string, generic_string> & getElementFromIndex(size_t index) {
 		//if (index >= _themeList.size())
 			//return pair<generic_string, generic_string>(TEXT(""), TEXT(""));
 		return _themeList[index];
 	};
 
 private :
-	vector< pair< generic_string, generic_string > > _themeList;
+	std::vector< std::pair< generic_string, generic_string > > _themeList;
 	generic_string _stylesXmlPath;
 };
 
 class PluginList {
 public :
     void add(generic_string fn, bool isInBL){
-        _list.push_back(pair<generic_string, bool>(fn, isInBL));
+		_list.push_back(std::pair<generic_string, bool>(fn, isInBL));
     };
 private :
-    vector<pair<generic_string, bool>>_list;
+	std::vector<std::pair<generic_string, bool>>_list;
 };
 
 const int NB_LANG = 80;
@@ -1278,7 +1276,7 @@ public:
     };
 
 	void setFontList(HWND hWnd);
-	const vector<generic_string> & getFontList() const {return _fontlist;};
+	const std::vector<generic_string> & getFontList() const { return _fontlist; };
 	
 	int getNbUserLang() const {return _nbUserLang;};
 	UserLangContainer & getULCFromIndex(int i) {return *_userLangArray[i];};
@@ -1304,7 +1302,7 @@ public:
 	bool ExternalLangHasRoom() const {return _nbExternalLang < NB_MAX_EXTERNAL_LANG;};
 
 	void getExternalLexerFromXmlTree(TiXmlDocument *doc);
-	vector<TiXmlDocument *> * getExternalLexerDoc() { return &_pXmlExternalLexerDoc;};
+	std::vector<TiXmlDocument *> * getExternalLexerDoc() { return &_pXmlExternalLexerDoc; };
 
 	void writeUserDefinedLang();
 	void writeShortcuts();
@@ -1329,7 +1327,7 @@ public:
 
 		for (int i = 0 ; i < _nbUserLang ; ++i)
 		{
-			vector<generic_string> extVect;
+			std::vector<generic_string> extVect;
 			cutString(_userLangArray[i]->_ext.c_str(), extVect);
 			for (size_t j = 0, len = extVect.size(); j < len; ++j)
 				if (!generic_stricmp(extVect[j].c_str(), ext) || (_tcschr(fullName, '.') && !generic_stricmp(extVect[j].c_str(), fullName)))
@@ -1389,21 +1387,21 @@ public:
 
 	bool isRemappingShortcut() const {return _shortcuts.size() != 0;};
 
-	vector<CommandShortcut> & getUserShortcuts() {return _shortcuts;};
-	vector<int> & getUserModifiedShortcuts() {return _customizedShortcuts;};
+	std::vector<CommandShortcut> & getUserShortcuts() { return _shortcuts; };
+	std::vector<int> & getUserModifiedShortcuts() { return _customizedShortcuts; };
 	void addUserModifiedIndex(int index);
 
-	vector<MacroShortcut> & getMacroList() {return _macros;};
-	vector<UserCommand> & getUserCommandList() {return _userCommands;};
-	vector<PluginCmdShortcut> & getPluginCommandList() {return _pluginCommands;};
-	vector<int> & getPluginModifiedKeyIndices() {return _pluginCustomizedCmds;};
+	std::vector<MacroShortcut> & getMacroList() { return _macros; };
+	std::vector<UserCommand> & getUserCommandList() { return _userCommands; };
+	std::vector<PluginCmdShortcut> & getPluginCommandList() { return _pluginCommands; };
+	std::vector<int> & getPluginModifiedKeyIndices() { return _pluginCustomizedCmds; };
 	void addPluginModifiedIndex(int index);
 
-	vector<ScintillaKeyMap> & getScintillaKeyList() {return _scintillaKeyCommands;};
-	vector<int> & getScintillaModifiedKeyIndices() {return _scintillaModifiedKeyIndices;};
+	std::vector<ScintillaKeyMap> & getScintillaKeyList() { return _scintillaKeyCommands; };
+	std::vector<int> & getScintillaModifiedKeyIndices() { return _scintillaModifiedKeyIndices; };
 	void addScintillaModifiedIndex(int index);
 
-	vector<MenuItemUnit> & getContextMenuItems() {return _contextMenuItems;};
+	std::vector<MenuItemUnit> & getContextMenuItems() { return _contextMenuItems; };
 	const Session & getSession() const {return _session;};
 
 	bool hasCustomContextMenu() const {return !_contextMenuItems.empty();};
@@ -1468,7 +1466,7 @@ public:
 		return _themeSwitcher;
 	};
 
-    vector<generic_string> & getBlackList() {return _blacklist;};
+	std::vector<generic_string> & getBlackList() { return _blacklist; };
     bool isInBlackList(TCHAR *fn) {
         for (size_t i = 0, len = _blacklist.size(); i < len ; ++i)
             if (_blacklist[i] == fn)
@@ -1534,7 +1532,7 @@ private:
 	
 	TiXmlDocumentA *_pXmlNativeLangDocA, *_pXmlContextMenuDocA;
 
-	vector<TiXmlDocument *> _pXmlExternalLexerDoc;
+	std::vector<TiXmlDocument *> _pXmlExternalLexerDoc;
 
 	NppGUI _nppGUI;
 	ScintillaViewParams _svp;
@@ -1566,8 +1564,8 @@ private:
 	LexerStylerArray _lexerStylerArray;
     StyleArray _widgetStyleArray;
 
-	vector<generic_string> _fontlist;
-    vector<generic_string> _blacklist;
+	std::vector<generic_string> _fontlist;
+	std::vector<generic_string> _blacklist;
     PluginList _pluginList;
 
 	HMODULE _hUXTheme;
@@ -1577,15 +1575,15 @@ private:
 	bool _isLocal;
 
 
-	vector<CommandShortcut> _shortcuts;			//main menu shortuts. Static size
-	vector<int> _customizedShortcuts;			//altered main menu shortcuts. Indices static. Needed when saving alterations
-	vector<MacroShortcut> _macros;				//macro shortcuts, dynamic size, defined on loading macros and adding/deleting them
-	vector<UserCommand> _userCommands;			//run shortcuts, dynamic size, defined on loading run commands and adding/deleting them
-	vector<PluginCmdShortcut> _pluginCommands;	//plugin commands, dynamic size, defined on loading plugins
-	vector<int> _pluginCustomizedCmds;			//plugincommands that have been altered. Indices determined after loading ALL plugins. Needed when saving alterations
+	std::vector<CommandShortcut> _shortcuts;			//main menu shortuts. Static size
+	std::vector<int> _customizedShortcuts;			//altered main menu shortcuts. Indices static. Needed when saving alterations
+	std::vector<MacroShortcut> _macros;				//macro shortcuts, dynamic size, defined on loading macros and adding/deleting them
+	std::vector<UserCommand> _userCommands;			//run shortcuts, dynamic size, defined on loading run commands and adding/deleting them
+	std::vector<PluginCmdShortcut> _pluginCommands;	//plugin commands, dynamic size, defined on loading plugins
+	std::vector<int> _pluginCustomizedCmds;			//plugincommands that have been altered. Indices determined after loading ALL plugins. Needed when saving alterations
 
-	vector<ScintillaKeyMap> _scintillaKeyCommands;	//scintilla keycommands. Static size
-	vector<int> _scintillaModifiedKeyIndices;		//modified scintilla keys. Indices static, determined by searching for commandId. Needed when saving alterations
+	std::vector<ScintillaKeyMap> _scintillaKeyCommands;	//scintilla keycommands. Static size
+	std::vector<int> _scintillaModifiedKeyIndices;		//modified scintilla keys. Indices static, determined by searching for commandId. Needed when saving alterations
 
 	LocalizationSwitcher _localizationSwitcher;
 	generic_string _startWithLocFileName;
@@ -1593,7 +1591,7 @@ private:
 	ThemeSwitcher _themeSwitcher;
 
 	//vector<generic_string> _noMenuCmdNames;
-	vector<MenuItemUnit> _contextMenuItems;
+	std::vector<MenuItemUnit> _contextMenuItems;
 	Session _session;
 
 	generic_string _shortcutsPath;
@@ -1621,7 +1619,7 @@ private:
 	COLORREF _currentDefaultFgColor;
 
 	static int CALLBACK EnumFontFamExProc(ENUMLOGFONTEX *lpelfe, NEWTEXTMETRICEX *, int, LPARAM lParam) {
-		vector<generic_string> *pStrVect = (vector<generic_string> *)lParam;
+		std::vector<generic_string> *pStrVect = (std::vector<generic_string> *)lParam;
         size_t vectSize = pStrVect->size();
 
 		//Search through all the fonts, EnumFontFamiliesEx never states anything about order
diff --git a/PowerEditor/src/ScitillaComponent/AutoCompletion.cpp b/PowerEditor/src/ScitillaComponent/AutoCompletion.cpp
index 2d071afe..cd79faf7 100644
--- a/PowerEditor/src/ScitillaComponent/AutoCompletion.cpp
+++ b/PowerEditor/src/ScitillaComponent/AutoCompletion.cpp
@@ -25,12 +25,13 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-
-#include "precompiledHeaders.h"
-
+#include <algorithm>
+#include <locale>
+#include <shlwapi.h>
 #include "AutoCompletion.h"
 #include "Notepad_plus_msgs.h"
-#include <locale>
+
+using namespace std;
 
 static bool isInList(generic_string word, const vector<generic_string> & wordArray)
 {
diff --git a/PowerEditor/src/ScitillaComponent/AutoCompletion.h b/PowerEditor/src/ScitillaComponent/AutoCompletion.h
index a3d66e02..58dfe39f 100644
--- a/PowerEditor/src/ScitillaComponent/AutoCompletion.h
+++ b/PowerEditor/src/ScitillaComponent/AutoCompletion.h
@@ -103,14 +103,14 @@ private:
 
 	bool _ignoreCase;
 
-	vector<generic_string> _keyWordArray;
+	std::vector<generic_string> _keyWordArray;
 	generic_string _keyWords;
 	size_t _keyWordMaxLen;
 
 	FunctionCallTip _funcCalltip;
 
 	const TCHAR * getApiFileName();
-	void getWordArray(vector<generic_string> & wordArray, TCHAR *beginChars);
+	void getWordArray(std::vector<generic_string> & wordArray, TCHAR *beginChars);
 };
 
 #endif //AUTOCOMPLETION_H
diff --git a/PowerEditor/src/ScitillaComponent/Buffer.cpp b/PowerEditor/src/ScitillaComponent/Buffer.cpp
index 875bf973..2826ec5b 100644
--- a/PowerEditor/src/ScitillaComponent/Buffer.cpp
+++ b/PowerEditor/src/ScitillaComponent/Buffer.cpp
@@ -25,8 +25,9 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-
-#include "precompiledHeaders.h"
+#include <deque>
+#include <time.h>
+#include <sys/stat.h>
 #include "Buffer.h"
 #include "Scintilla.h"
 #include "Parameters.h"
diff --git a/PowerEditor/src/ScitillaComponent/Buffer.h b/PowerEditor/src/ScitillaComponent/Buffer.h
index 51c30cba..0a8a5e4a 100644
--- a/PowerEditor/src/ScitillaComponent/Buffer.h
+++ b/PowerEditor/src/ScitillaComponent/Buffer.h
@@ -348,9 +348,9 @@ private :
 	bool _needLexer;	//initially true
 	//these properties have to be duplicated because of multiple references
 	//All the vectors must have the same size at all times
-	vector< ScintillaEditView * > _referees;
-	vector< Position > _positions;
-	vector< vector<size_t> > _foldStates;
+	std::vector< ScintillaEditView * > _referees;
+	std::vector< Position > _positions;
+	std::vector< std::vector<size_t> > _foldStates;
 
 	//vector< pair<size_t, pair<size_t, bool> > > _linesUndoState;
 
diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
index 3c8fb972..153760e5 100644
--- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
+++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
@@ -33,6 +33,8 @@
 #include "UniConversion.h"
 #include "LongRunningOperation.h"
 
+using namespace std;
+
 FindOption * FindReplaceDlg::_env;
 FindOption FindReplaceDlg::_options;
 
diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h
index 92a35fb4..e69b725c 100644
--- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h
+++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h
@@ -239,7 +239,7 @@ public :
 	};
 	const TCHAR * getDir2Search() const {return _env->_directory.c_str();};
 
-	void getPatterns(vector<generic_string> & patternVect);
+	void getPatterns(std::vector<generic_string> & patternVect);
 
 	void launchFindInFilesDlg() {
 		doDialog(FINDINFILES_DLG);
@@ -361,7 +361,7 @@ private :
 	};
 	void fillFindHistory();
     void fillComboHistory(int id, const std::vector<generic_string> & strings);
-    int saveComboHistory(int id, int maxcount, vector<generic_string> & strings);
+	int saveComboHistory(int id, int maxcount, std::vector<generic_string> & strings);
 	static const int FR_OP_FIND = 1;
 	static const int FR_OP_REPLACE = 2;
 	static const int FR_OP_FIF = 4;
diff --git a/PowerEditor/src/ScitillaComponent/FunctionCallTip.h b/PowerEditor/src/ScitillaComponent/FunctionCallTip.h
index a7ce55cc..01575ce6 100644
--- a/PowerEditor/src/ScitillaComponent/FunctionCallTip.h
+++ b/PowerEditor/src/ScitillaComponent/FunctionCallTip.h
@@ -62,7 +62,7 @@ private:
 	//cache some XML values n stuff
 	TCHAR * _funcName;				//name of function
 	stringVec _retVals;				//vector of overload return values/types
-	vector<stringVec> _overloads;	//vector of overload params (=vector)
+	std::vector<stringVec> _overloads;	//vector of overload params (=vector)
 	stringVec _descriptions;		//vecotr of function descriptions
 	int _currentNrOverloads;		//current amount of overloads
 	int _currentOverload;			//current chosen overload
diff --git a/PowerEditor/src/ScitillaComponent/ScintillaCtrls.cpp b/PowerEditor/src/ScitillaComponent/ScintillaCtrls.cpp
index dc91087a..d7df7692 100644
--- a/PowerEditor/src/ScitillaComponent/ScintillaCtrls.cpp
+++ b/PowerEditor/src/ScitillaComponent/ScintillaCtrls.cpp
@@ -26,7 +26,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
 #include "ScintillaCtrls.h"
 #include "ScintillaEditView.h"
 
@@ -68,7 +67,7 @@ bool ScintillaCtrls::destroyScintilla(HWND handle2Destroy)
 	_scintVector[i]->destroy();
 	delete _scintVector[i];
 
-	vector<ScintillaEditView *>::iterator it2delete = _scintVector.begin()+ i;
+	std::vector<ScintillaEditView *>::iterator it2delete = _scintVector.begin()+ i;
 	_scintVector.erase(it2delete);
 	return true;
 }
diff --git a/PowerEditor/src/ScitillaComponent/ScintillaCtrls.h b/PowerEditor/src/ScitillaComponent/ScintillaCtrls.h
index fc9e8fcf..81b4a61e 100644
--- a/PowerEditor/src/ScitillaComponent/ScintillaCtrls.h
+++ b/PowerEditor/src/ScitillaComponent/ScintillaCtrls.h
@@ -29,6 +29,9 @@
 #ifndef SCINTILLACTRLS_H
 #define SCINTILLACTRLS_H
 
+#include <vector>
+#include <windows.h>
+
 class ScintillaEditView;
 
 class ScintillaCtrls {
diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
index bc22ac59..97922c18 100644
--- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
+++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
@@ -26,12 +26,13 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+#include <shlwapi.h>
 #include "ScintillaEditView.h"
 #include "Parameters.h"
 #include "Sorters.h"
 #include "TCHAR.h"
 
+using namespace std;
 
 // initialize the static variable
 
diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.h b/PowerEditor/src/ScitillaComponent/ScintillaEditView.h
index 122149a7..eb2f34c1 100644
--- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.h
+++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.h
@@ -187,7 +187,7 @@ struct SortInPositionOrder {
 	}
 };
 
-typedef vector<ColumnModeInfo> ColumnModeInfos;
+typedef std::vector<ColumnModeInfo> ColumnModeInfos;
 
 struct LanguageName {
 	const TCHAR * lexerName;
@@ -539,7 +539,7 @@ public:
 	void currentLineUp() const;
 	void currentLineDown() const;
 
-	pair<int, int> getSelectionLinesRange() const;
+	std::pair<int, int> getSelectionLinesRange() const;
     void currentLinesUp() const;
     void currentLinesDown() const;
 
@@ -912,7 +912,7 @@ protected:
 		}
 	};
 
-    pair<int, int> getWordRange();
+	std::pair<int, int> getWordRange();
 	bool expandWordSelection();
 };
 
diff --git a/PowerEditor/src/ScitillaComponent/UserDefineDialog.cpp b/PowerEditor/src/ScitillaComponent/UserDefineDialog.cpp
index 09f04b34..1485d8b1 100644
--- a/PowerEditor/src/ScitillaComponent/UserDefineDialog.cpp
+++ b/PowerEditor/src/ScitillaComponent/UserDefineDialog.cpp
@@ -37,6 +37,8 @@
 #include "FileDialog.h"
 #include "Common.h"
 
+using namespace std;
+
 UserLangContainer * SharedParametersDialog::_pUserLang = NULL;
 ScintillaEditView * SharedParametersDialog::_pScintilla = NULL;
 
diff --git a/PowerEditor/src/ScitillaComponent/UserDefineDialog.h b/PowerEditor/src/ScitillaComponent/UserDefineDialog.h
index cc97a4b7..c8146f59 100644
--- a/PowerEditor/src/ScitillaComponent/UserDefineDialog.h
+++ b/PowerEditor/src/ScitillaComponent/UserDefineDialog.h
@@ -52,7 +52,7 @@ static int max(int a, int b) {
 #include "tchar.h"
 #include "scilexer.h"
 #include <map>
-using namespace std;
+
 class ScintillaEditView;
 class UserLangContainer;
 struct Style;
@@ -66,18 +66,18 @@ class GlobalMappers
 {
     public:
 
-        map<generic_string, int> keywordIdMapper;
-        map<int, generic_string> keywordNameMapper;
+		std::map<generic_string, int> keywordIdMapper;
+		std::map<int, generic_string> keywordNameMapper;
 
-        map<generic_string, int> styleIdMapper;
-        map<int, generic_string> styleNameMapper;
+		std::map<generic_string, int> styleIdMapper;
+		std::map<int, generic_string> styleNameMapper;
 
-        map<generic_string, int> temp;
-        map<generic_string, int>::iterator iter;
+		std::map<generic_string, int> temp;
+		std::map<generic_string, int>::iterator iter;
 
-        map<int, int> nestingMapper;
-        map<int, int> dialogMapper;
-        map<int, string> setLexerMapper;
+		std::map<int, int> nestingMapper;
+		std::map<int, int> dialogMapper;
+		std::map<int, std::string> setLexerMapper;
 
         // only default constructor is needed
         GlobalMappers()
diff --git a/PowerEditor/src/ScitillaComponent/columnEditor.cpp b/PowerEditor/src/ScitillaComponent/columnEditor.cpp
index 19520940..a4809bce 100644
--- a/PowerEditor/src/ScitillaComponent/columnEditor.cpp
+++ b/PowerEditor/src/ScitillaComponent/columnEditor.cpp
@@ -26,12 +26,22 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+#include <vector>
+#include <algorithm>
+#include <Shlobj.h>
+#include <uxtheme.h>
 #include "columnEditor.h"
 #include "ScintillaEditView.h"
-#include <vector>
 
 
+void ColumnEditorDlg::init(HINSTANCE hInst, HWND hPere, ScintillaEditView **ppEditView) 
+{
+	Window::init(hInst, hPere);
+	if (!ppEditView)
+		throw std::runtime_error("StaticDialog::init : ppEditView is null.");
+	_ppEditView = ppEditView;
+}
+
 void ColumnEditorDlg::display(bool toShow) const 
 {
     Window::display(toShow);
diff --git a/PowerEditor/src/ScitillaComponent/columnEditor.h b/PowerEditor/src/ScitillaComponent/columnEditor.h
index ced55197..c7632713 100644
--- a/PowerEditor/src/ScitillaComponent/columnEditor.h
+++ b/PowerEditor/src/ScitillaComponent/columnEditor.h
@@ -33,6 +33,8 @@
 #include "columnEditor_rc.h"
 #endif //COLUMNEDITOR_RC_H
 
+#include "StaticDialog.h"
+
 class ScintillaEditView;
 
 const bool activeText = true;
@@ -43,12 +45,7 @@ class ColumnEditorDlg : public StaticDialog
 public :
 	ColumnEditorDlg() : StaticDialog() {};
 
-	void init(HINSTANCE hInst, HWND hPere, ScintillaEditView **ppEditView) {
-		Window::init(hInst, hPere);
-		if (!ppEditView)
-			throw std::runtime_error("StaticDialog::init : ppEditView is null.");
-		_ppEditView = ppEditView;
-	};
+	void init(HINSTANCE hInst, HWND hPere, ScintillaEditView **ppEditView);
 
 	virtual void create(int dialogID, bool isRTL = false) {
 		StaticDialog::create(dialogID, isRTL);
diff --git a/PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.cpp b/PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.cpp
index 8ab62256..110df952 100644
--- a/PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.cpp
+++ b/PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.cpp
@@ -31,11 +31,10 @@
 // Reverse regex are slow using the new regex engine, and hence cost too much time.
 
 
-#include "precompiledHeaders.h"
 #include "xmlMatchedTagsHighlighter.h"
 #include "ScintillaEditView.h"
 
-
+using namespace std;
 
 vector< pair<int, int> > XmlMatchedTagsHighlighter::getAttributesPos(int start, int end)
 {
diff --git a/PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.h b/PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.h
index 4c36619f..3d209a38 100644
--- a/PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.h
+++ b/PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.h
@@ -29,7 +29,8 @@
 #ifndef XMLMATCHEDTAGSHIGHLIGHTER_H
 #define XMLMATCHEDTAGSHIGHLIGHTER_H
 
-using namespace std;
+#include <string>
+#include <vector>
 
 class ScintillaEditView;
 
@@ -68,7 +69,7 @@ private:
 	FindResult findCloseTag(const std::string& tagName, int start, int end);
 	int findCloseAngle(int startPosition, int endPosition);
 	
-	vector< pair<int, int> > getAttributesPos(int start, int end);
+	std::vector< std::pair<int, int> > getAttributesPos(int start, int end);
 	
 };
 
diff --git a/PowerEditor/src/WinControls/AnsiCharPanel/ansiCharPanel.cpp b/PowerEditor/src/WinControls/AnsiCharPanel/ansiCharPanel.cpp
index 9d9e786b..7a1e8673 100644
--- a/PowerEditor/src/WinControls/AnsiCharPanel/ansiCharPanel.cpp
+++ b/PowerEditor/src/WinControls/AnsiCharPanel/ansiCharPanel.cpp
@@ -26,7 +26,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
 #include "ansiCharPanel.h"
 #include "ScintillaEditView.h"
 
diff --git a/PowerEditor/src/WinControls/AnsiCharPanel/ansiCharPanel.h b/PowerEditor/src/WinControls/AnsiCharPanel/ansiCharPanel.h
index f9659d39..c1eef333 100644
--- a/PowerEditor/src/WinControls/AnsiCharPanel/ansiCharPanel.h
+++ b/PowerEditor/src/WinControls/AnsiCharPanel/ansiCharPanel.h
@@ -29,7 +29,9 @@
 #ifndef ANSICHARPANEL_H
 #define  ANSICHARPANEL_H
 
-//#include <windows.h>
+#include <windows.h>
+#include <commctrl.h>
+
 #ifndef DOCKINGDLGINTERFACE_H
 #include "DockingDlgInterface.h"
 #endif //DOCKINGDLGINTERFACE_H
diff --git a/PowerEditor/src/WinControls/ClipboardHistory/clipboardHistoryPanel.cpp b/PowerEditor/src/WinControls/ClipboardHistory/clipboardHistoryPanel.cpp
index 9a70c20d..15848ebc 100644
--- a/PowerEditor/src/WinControls/ClipboardHistory/clipboardHistoryPanel.cpp
+++ b/PowerEditor/src/WinControls/ClipboardHistory/clipboardHistoryPanel.cpp
@@ -26,7 +26,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
 #include "clipboardHistoryPanel.h"
 #include "ScintillaEditView.h"
 #include "clipboardFormats.h"
diff --git a/PowerEditor/src/WinControls/ColourPicker/ColourPicker.cpp b/PowerEditor/src/WinControls/ColourPicker/ColourPicker.cpp
index 0469c1c8..4810b7ca 100644
--- a/PowerEditor/src/WinControls/ColourPicker/ColourPicker.cpp
+++ b/PowerEditor/src/WinControls/ColourPicker/ColourPicker.cpp
@@ -26,7 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+#include <iostream>
 #include "ColourPicker.h"
 #include "ColourPopup.h"
 
diff --git a/PowerEditor/src/WinControls/ColourPicker/ColourPicker.h b/PowerEditor/src/WinControls/ColourPicker/ColourPicker.h
index 16f1f63d..c1d32cb8 100644
--- a/PowerEditor/src/WinControls/ColourPicker/ColourPicker.h
+++ b/PowerEditor/src/WinControls/ColourPicker/ColourPicker.h
@@ -29,6 +29,8 @@
 #ifndef COLOUR_PICKER_H
 #define COLOUR_PICKER_H
 
+#include "Window.h"
+
 class ColourPopup;
 
 #define CPN_COLOURPICKED (BN_CLICKED)
diff --git a/PowerEditor/src/WinControls/ColourPicker/ColourPopup.cpp b/PowerEditor/src/WinControls/ColourPicker/ColourPopup.cpp
index e8f7606e..12bc83a5 100644
--- a/PowerEditor/src/WinControls/ColourPicker/ColourPopup.cpp
+++ b/PowerEditor/src/WinControls/ColourPicker/ColourPopup.cpp
@@ -26,7 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+#include <iostream>
 #include "ColourPopup.h"
 
 DWORD colourItems[] = {
diff --git a/PowerEditor/src/WinControls/ColourPicker/ColourPopup.h b/PowerEditor/src/WinControls/ColourPicker/ColourPopup.h
index cf2ed7d3..08ea6921 100644
--- a/PowerEditor/src/WinControls/ColourPicker/ColourPopup.h
+++ b/PowerEditor/src/WinControls/ColourPicker/ColourPopup.h
@@ -37,6 +37,8 @@
 #include "resource.h"
 #endif //RESOURCE_H
 
+#include "Window.h"
+
 #define WM_PICKUP_COLOR (COLOURPOPUP_USER + 1)
 #define WM_PICKUP_CANCEL (COLOURPOPUP_USER + 2)
 
diff --git a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp
index 5a50dc72..f9fdbf2a 100644
--- a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp
+++ b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp
@@ -26,10 +26,14 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+#include <Shlobj.h>
+#include <shlwapi.h>
+#include <uxtheme.h>
 #include "WordStyleDlg.h"
 #include "ScintillaEditView.h"
 
+using namespace std;
+
 BOOL CALLBACK ColourStaticTextHooker::colourStaticProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
 {
 	switch(Message)
diff --git a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h
index 3b18875c..8df97f7b 100644
--- a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h
+++ b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h
@@ -121,7 +121,7 @@ public :
 	void addLastThemeEntry() {
         NppParameters *nppParamInst = NppParameters::getInstance();
         ThemeSwitcher & themeSwitcher = nppParamInst->getThemeSwitcher();
-        pair<generic_string, generic_string> & themeInfo = themeSwitcher.getElementFromIndex(themeSwitcher.size() - 1);
+		std::pair<generic_string, generic_string> & themeInfo = themeSwitcher.getElementFromIndex(themeSwitcher.size() - 1);
 	    ::SendMessage(_hSwitch2ThemeCombo, CB_ADDSTRING, 0, (LPARAM)themeInfo.first.c_str());
     };
 
diff --git a/PowerEditor/src/WinControls/ContextMenu/ContextMenu.cpp b/PowerEditor/src/WinControls/ContextMenu/ContextMenu.cpp
index 4a6940f9..e518f705 100644
--- a/PowerEditor/src/WinControls/ContextMenu/ContextMenu.cpp
+++ b/PowerEditor/src/WinControls/ContextMenu/ContextMenu.cpp
@@ -26,7 +26,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
 #include "ContextMenu.h"
 
 MenuItemUnit::MenuItemUnit(unsigned long cmdID, const TCHAR *itemName, const TCHAR *parentFolderName) : _cmdID(cmdID)
@@ -52,7 +51,7 @@ ContextMenu::~ContextMenu()
 	}
 }
 	
-void ContextMenu::create(HWND hParent, const vector<MenuItemUnit> & menuItemArray, const HMENU mainMenuHandle)
+void ContextMenu::create(HWND hParent, const std::vector<MenuItemUnit> & menuItemArray, const HMENU mainMenuHandle)
 { 
 	_hParent = hParent;
 	_hMenu = ::CreatePopupMenu();
diff --git a/PowerEditor/src/WinControls/ContextMenu/ContextMenu.h b/PowerEditor/src/WinControls/ContextMenu/ContextMenu.h
index 6f7fb113..5e58ca5f 100644
--- a/PowerEditor/src/WinControls/ContextMenu/ContextMenu.h
+++ b/PowerEditor/src/WinControls/ContextMenu/ContextMenu.h
@@ -29,7 +29,7 @@
 #ifndef CONTEXTMENU_H
 #define CONTEXTMENU_H
 
-using namespace std;
+#include "Common.h"
 
 struct MenuItemUnit {
 	unsigned long _cmdID;
@@ -46,7 +46,7 @@ public:
 	ContextMenu() : _hParent(NULL), _hMenu(NULL) {};
 	~ContextMenu();
 
-	void create(HWND hParent, const vector<MenuItemUnit> & menuItemArray, const HMENU mainMenuHandle = NULL);
+	void create(HWND hParent, const std::vector<MenuItemUnit> & menuItemArray, const HMENU mainMenuHandle = NULL);
 	bool isCreated() const {return _hMenu != NULL;};
 	
 	void display(const POINT & p) const {
@@ -69,7 +69,7 @@ public:
 private:
 	HWND _hParent;
 	HMENU _hMenu;
-	vector<HMENU> _subMenus;
+	std::vector<HMENU> _subMenus;
 
 };
 
diff --git a/PowerEditor/src/WinControls/DockingWnd/Docking.h b/PowerEditor/src/WinControls/DockingWnd/Docking.h
index abd43eec..4ee00fe2 100644
--- a/PowerEditor/src/WinControls/DockingWnd/Docking.h
+++ b/PowerEditor/src/WinControls/DockingWnd/Docking.h
@@ -29,6 +29,8 @@
 #ifndef DOCKING_H
 #define DOCKING_H
 
+#include <windows.h>
+
 // ATTENTION : It's a part of interface header, so don't include the others header here
 
 // styles for containers
diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp b/PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp
index 8b54a07a..619176b4 100644
--- a/PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp
+++ b/PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp
@@ -25,7 +25,6 @@
 //along with this program; if not, write to the Free Software
 //Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-#include "precompiledHeaders.h"
 #include "dockingResource.h"
 #include "DockingCont.h"
 
@@ -33,6 +32,8 @@
 #include "ToolTip.h"
 #include "Parameters.h"
 
+using namespace std;
+
 #ifndef WH_MOUSE_LL
 #define WH_MOUSE_LL 14
 #endif
diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingCont.h b/PowerEditor/src/WinControls/DockingWnd/DockingCont.h
index b5117d8c..e3a05c99 100644
--- a/PowerEditor/src/WinControls/DockingWnd/DockingCont.h
+++ b/PowerEditor/src/WinControls/DockingWnd/DockingCont.h
@@ -37,8 +37,9 @@
 #include "Docking.h"
 #endif //DOCKING_H
 
-
-using namespace std;
+#include <vector>
+#include "StaticDialog.h"
+#include "Common.h"
 
 
 // window styles
@@ -61,8 +62,6 @@ enum eMousePos {
 #define CLOSEBTN_POS_TOP	3
 
 
-
-
 class DockingCont : public StaticDialog
 {
 public:
@@ -102,10 +101,10 @@ public:
 	void setActiveTb(INT iItem);
 	INT getActiveTb();
 	tTbData * getDataOfActiveTb();
-	vector<tTbData *> getDataOfAllTb() {
+	std::vector<tTbData *> getDataOfAllTb() {
 		return _vTbData;
 	};
-	vector<tTbData *> getDataOfVisTb();
+	std::vector<tTbData *> getDataOfVisTb();
 	bool isTbVis(tTbData* data);
 
 	void doDialog(bool willBeShown = true, bool isFloating = false);
@@ -234,7 +233,7 @@ private:
 	eMousePos				_hoverMPos;
 
 	// data of added windows
-	vector<tTbData *>		_vTbData;
+	std::vector<tTbData *>		_vTbData;
 };
 
 
diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingDlgInterface.h b/PowerEditor/src/WinControls/DockingWnd/DockingDlgInterface.h
index 99de6462..cefacb48 100644
--- a/PowerEditor/src/WinControls/DockingWnd/DockingDlgInterface.h
+++ b/PowerEditor/src/WinControls/DockingWnd/DockingDlgInterface.h
@@ -38,6 +38,8 @@
 
 #include <assert.h>
 #include <shlwapi.h>
+#include "Common.h"
+#include "StaticDialog.h"
 
 class DockingDlgInterface : public StaticDialog
 {
diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp b/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp
index 63a70ae1..8c78baf6 100644
--- a/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp
+++ b/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp
@@ -33,6 +33,7 @@
 #include "Gripper.h"
 #include "parameters.h"
 
+using namespace std;
 
 BOOL DockingManager::_isRegistered = FALSE;
 
diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingManager.h b/PowerEditor/src/WinControls/DockingWnd/DockingManager.h
index f4acdbc3..da401842 100644
--- a/PowerEditor/src/WinControls/DockingWnd/DockingManager.h
+++ b/PowerEditor/src/WinControls/DockingWnd/DockingManager.h
@@ -40,10 +40,6 @@ class DockingSplitter;
 #endif //SPLITTER_CONTAINER_H
 
 #define DSPC_CLASS_NAME TEXT("dockingManager")
-
-using namespace std;
-
-
 #define	CONT_MAP_MAX	50
 
 
@@ -83,7 +79,7 @@ public :
 	int  GetContainer(DockingCont* pCont); 
 
 	// get all container in vector
-	vector<DockingCont*> & getContainerInfo() {
+	std::vector<DockingCont*> & getContainerInfo() {
 		return _vContainer;
 	};
 	// get dock data (sized areas)
@@ -124,14 +120,14 @@ private:
 	RECT						_rcWork;
 	RECT						_rect;
 	Window						**_ppMainWindow;
-	vector<HWND>				_vImageList;
+	std::vector<HWND>				_vImageList;
 	HIMAGELIST					_hImageList;
-	vector<DockingCont*>		_vContainer;
+	std::vector<DockingCont*>		_vContainer;
 	tDockMgr					_dockData;
 	static BOOL					_isRegistered;
 	BOOL						_isInitialized;
 	int							_iContMap[CONT_MAP_MAX];
-	vector<DockingSplitter *>	_vSplitter;
+	std::vector<DockingSplitter *>	_vSplitter;
 };
 
 #endif //DOCKINGMANAGER_H
diff --git a/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp b/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp
index f7065889..344d6d4f 100644
--- a/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp
+++ b/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp
@@ -34,6 +34,8 @@
 #include "DockingManager.h"
 #include "Parameters.h"
 
+using namespace std;
+
 #ifndef WH_KEYBOARD_LL
 #define WH_KEYBOARD_LL 13
 #endif
diff --git a/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp b/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp
index db230d9a..2e2fd339 100644
--- a/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp
+++ b/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp
@@ -31,6 +31,8 @@
 #include "ScintillaEditView.h"
 #include "localization.h"
 
+using namespace std;
+
 #define CX_BITMAP         16
 #define CY_BITMAP         16
 
diff --git a/PowerEditor/src/WinControls/FunctionList/functionParser.cpp b/PowerEditor/src/WinControls/FunctionList/functionParser.cpp
index 6c112fdb..16d3904b 100644
--- a/PowerEditor/src/WinControls/FunctionList/functionParser.cpp
+++ b/PowerEditor/src/WinControls/FunctionList/functionParser.cpp
@@ -30,6 +30,8 @@
 #include "functionParser.h"
 #include "boostregexsearch.h"
 
+using namespace std;
+
 FunctionParsersManager::~FunctionParsersManager()
 {
 	for (size_t i = 0, len = _parsers.size(); i < len; ++i)
diff --git a/PowerEditor/src/WinControls/Grid/BabyGrid.cpp b/PowerEditor/src/WinControls/Grid/BabyGrid.cpp
index 76c636b2..ef833d5f 100644
--- a/PowerEditor/src/WinControls/Grid/BabyGrid.cpp
+++ b/PowerEditor/src/WinControls/Grid/BabyGrid.cpp
@@ -10,7 +10,6 @@ Add WM_MOUSEWHEEL, WM_LBUTTONDBLCLK and WM_RBUTTONUP events
 Modified by Don HO <don.h@free.fr>
 */
 
-#include "precompiledHeaders.h"
 #include "babygrid.h"
 #include "Parameters.h"
 
diff --git a/PowerEditor/src/WinControls/Grid/BabyGrid.h b/PowerEditor/src/WinControls/Grid/BabyGrid.h
index b39f3bd8..be1e3dba 100644
--- a/PowerEditor/src/WinControls/Grid/BabyGrid.h
+++ b/PowerEditor/src/WinControls/Grid/BabyGrid.h
@@ -7,6 +7,8 @@
 
 #ifndef BABYGRID_H
 
+#include <windows.h>
+
 #ifndef RESOURCE_H
 #include "resource.h"
 #endif// RESOURCE_H
diff --git a/PowerEditor/src/WinControls/Grid/BabyGridWrapper.cpp b/PowerEditor/src/WinControls/Grid/BabyGridWrapper.cpp
index 21714837..8ecb5e42 100644
--- a/PowerEditor/src/WinControls/Grid/BabyGridWrapper.cpp
+++ b/PowerEditor/src/WinControls/Grid/BabyGridWrapper.cpp
@@ -26,7 +26,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
 #include "BabyGridWrapper.h"
 const TCHAR *babyGridClassName = TEXT("BABYGRID");
 
diff --git a/PowerEditor/src/WinControls/Grid/BabyGridWrapper.h b/PowerEditor/src/WinControls/Grid/BabyGridWrapper.h
index 85f2fb9d..9b87a8d2 100644
--- a/PowerEditor/src/WinControls/Grid/BabyGridWrapper.h
+++ b/PowerEditor/src/WinControls/Grid/BabyGridWrapper.h
@@ -33,6 +33,8 @@
 #include "babygrid.h"
 #endif// BABYGRID_H
 
+#include "Window.h"
+
 class BabyGridWrapper : public Window
 {
 public :
diff --git a/PowerEditor/src/WinControls/Grid/ShortcutMapper.cpp b/PowerEditor/src/WinControls/Grid/ShortcutMapper.cpp
index 002d48bc..b384613b 100644
--- a/PowerEditor/src/WinControls/Grid/ShortcutMapper.cpp
+++ b/PowerEditor/src/WinControls/Grid/ShortcutMapper.cpp
@@ -26,10 +26,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
 #include "ShortcutMapper.h"
 #include "Notepad_plus.h"
 
+using namespace std;
 
 void ShortcutMapper::initTabs() {
 	HWND hTab = _hTabCtrl = ::GetDlgItem(_hSelf, IDC_BABYGRID_TABBAR);
diff --git a/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.h b/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.h
index 11711be7..307827aa 100644
--- a/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.h
+++ b/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.h
@@ -35,9 +35,7 @@
 const int nbExtMax = 256;
 const int extLenMax = 64;
 
-using namespace std;
-
-typedef vector<generic_string> stringVector;
+typedef std::vector<generic_string> stringVector;
 
 generic_string changeExt(generic_string fn, generic_string ext, bool forceReplaced = true);
 void goToCenter(HWND hwnd);
diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
index a2849c29..d8f4d2ba 100644
--- a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
+++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
@@ -31,6 +31,8 @@
 #include "lesDlgs.h"
 #include "EncodingMapper.h"
 
+using namespace std;
+
 const int BLINKRATE_FASTEST = 50;
 const int BLINKRATE_SLOWEST = 2500;
 const int BLINKRATE_INTERVAL = 50;
diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.h b/PowerEditor/src/WinControls/Preference/preferenceDlg.h
index ab79ef9d..045e8c22 100644
--- a/PowerEditor/src/WinControls/Preference/preferenceDlg.h
+++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.h
@@ -139,7 +139,7 @@ public :
 private :
     LexerStylerArray _lsArray;
 	BOOL CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam);
-	vector<LangMenuItem> _langList;
+	std::vector<LangMenuItem> _langList;
 };
 
 class TabSettings : public StaticDialog
@@ -168,7 +168,7 @@ public :
 	PrintSettingsDlg():_focusedEditCtrl(0), _selStart(0), _selEnd(0){};
 private :
 	BOOL CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam);
-	vector<strCouple> varList;
+	std::vector<strCouple> varList;
 	int _focusedEditCtrl;
 	DWORD _selStart;
 	DWORD _selEnd;
diff --git a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h
index 5d52f709..18e6898a 100644
--- a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h
+++ b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h
@@ -22,8 +22,6 @@
 #include "RunDlg_rc.h"
 #endif //RUN_DLG_RC_H
 
-using namespace std;
-
 #define CURRENTWORD_MAXLENGTH 2048
 
 const TCHAR fullCurrentPath[] = TEXT("FULL_CURRENT_PATH");
diff --git a/PowerEditor/src/WinControls/TabBar/ControlsTab.cpp b/PowerEditor/src/WinControls/TabBar/ControlsTab.cpp
index 73b4ae05..8e05dee5 100644
--- a/PowerEditor/src/WinControls/TabBar/ControlsTab.cpp
+++ b/PowerEditor/src/WinControls/TabBar/ControlsTab.cpp
@@ -26,7 +26,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
 #include "ControlsTab.h"
 
 void ControlsTab::createTabs(WindowVector & winVector)
diff --git a/PowerEditor/src/WinControls/TabBar/ControlsTab.h b/PowerEditor/src/WinControls/TabBar/ControlsTab.h
index 925f84a7..32aaa95b 100644
--- a/PowerEditor/src/WinControls/TabBar/ControlsTab.h
+++ b/PowerEditor/src/WinControls/TabBar/ControlsTab.h
@@ -29,10 +29,14 @@
 #ifndef CONTROLS_TAB_H
 #define CONTROLS_TAB_H
 
+
 #ifndef TAB_BAR_H
 #include "TabBar.h"
 #endif //TAB_BAR_H
 
+#include "window.h"
+#include "Common.h"
+
 struct DlgInfo {
     Window *_dlg;
     generic_string _name;
diff --git a/PowerEditor/src/WinControls/TabBar/TabBar.h b/PowerEditor/src/WinControls/TabBar/TabBar.h
index ab2567c8..e3a5d529 100644
--- a/PowerEditor/src/WinControls/TabBar/TabBar.h
+++ b/PowerEditor/src/WinControls/TabBar/TabBar.h
@@ -41,6 +41,10 @@
 #include "resource.h"
 #endif //RESOURCE_H
 
+#include <windows.h>
+#include <commctrl.h>
+#include "Window.h"
+
 //Notification message
 #define TCN_TABDROPPED (TCN_FIRST - 10)
 #define TCN_TABDROPPEDOUTSIDE (TCN_FIRST - 11)
diff --git a/PowerEditor/src/WinControls/ToolBar/ToolBar.h b/PowerEditor/src/WinControls/ToolBar/ToolBar.h
index c9e87ea4..ec695189 100644
--- a/PowerEditor/src/WinControls/ToolBar/ToolBar.h
+++ b/PowerEditor/src/WinControls/ToolBar/ToolBar.h
@@ -44,8 +44,6 @@
 #define _WIN32_IE	0x0600
 #endif //_WIN32_IE
 
-using namespace std;
-
 enum toolBarStatusType {/*TB_HIDE, */TB_SMALL, TB_LARGE, TB_STANDARD};
 
 
@@ -124,14 +122,14 @@ private :
 	TBBUTTON *_pTBB;
 	ToolBarIcons _toolBarIcons;
 	toolBarStatusType _state;
-	vector<tDynamicList> _vDynBtnReg;
+	std::vector<tDynamicList> _vDynBtnReg;
 	size_t _nrButtons;
 	size_t _nrDynButtons;
 	size_t _nrTotalButtons;
 	size_t _nrCurrentButtons;
 	ReBar * _pRebar;
 	REBARBANDINFO _rbBand;
-    vector<iconLocator> _customIconVect;
+    std::vector<iconLocator> _customIconVect;
     TiXmlNode *_toolIcons;
 
 
@@ -173,7 +171,7 @@ public :
 	void setGrayBackground(int id);
 
 private:
-	vector<int> usedIDs;
+	std::vector<int> usedIDs;
 
 	int getNewID();
 	void releaseID(int id);
diff --git a/PowerEditor/src/WinControls/ToolTip/ToolTip.h b/PowerEditor/src/WinControls/ToolTip/ToolTip.h
index fb4fd5f7..a8bf735e 100644
--- a/PowerEditor/src/WinControls/ToolTip/ToolTip.h
+++ b/PowerEditor/src/WinControls/ToolTip/ToolTip.h
@@ -29,7 +29,7 @@
 #ifndef __TOOLTIP_H__
 #define __TOOLTIP_H__
 
-using namespace std;
+#include <commctrl.h>
 
 class ToolTip : public Window
 {
diff --git a/PowerEditor/src/WinControls/WindowsDlg/SizeableDlg.h b/PowerEditor/src/WinControls/WindowsDlg/SizeableDlg.h
index c1b4120d..58e67031 100644
--- a/PowerEditor/src/WinControls/WindowsDlg/SizeableDlg.h
+++ b/PowerEditor/src/WinControls/WindowsDlg/SizeableDlg.h
@@ -37,6 +37,8 @@
 #include "WinMgr.h"
 #endif //WINMGR_H
 
+#include "StaticDialog.h"
+
 class SizeableDlg : public StaticDialog {
 	typedef StaticDialog MyBaseClass;
 public:
diff --git a/PowerEditor/src/WinControls/WindowsDlg/WinMgr.h b/PowerEditor/src/WinControls/WindowsDlg/WinMgr.h
index 1971d0ba..dbfe934b 100644
--- a/PowerEditor/src/WinControls/WindowsDlg/WinMgr.h
+++ b/PowerEditor/src/WinControls/WindowsDlg/WinMgr.h
@@ -14,6 +14,9 @@
 
 #pragma once
 
+#include <assert.h>
+#include <windows.h>
+
 
 const SIZE SIZEZERO = {0, 0};
 const SIZE SIZEMAX = {SHRT_MAX, SHRT_MAX};
diff --git a/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp b/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp
index 3ffb964f..647f95c9 100644
--- a/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp
+++ b/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp
@@ -26,12 +26,15 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+#include <functional>
+#include <algorithm>
 #include "WindowsDlg.h"
 #include "WindowsDlgRc.h"
 #include "DocTabView.h"
 #include "EncodingMapper.h"
 
+using namespace std;
+
 #ifndef _countof
 #define _countof(x) (sizeof(x)/sizeof((x)[0]))
 #endif
diff --git a/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.h b/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.h
index f7679d19..48eac8b0 100644
--- a/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.h
+++ b/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.h
@@ -33,6 +33,8 @@
 #include "SizeableDlg.h"
 #endif //SIZABLE_DLG_H
 
+#include "Common.h"
+
 class DocTabView;
 class TiXmlNodeA;
 
diff --git a/PowerEditor/src/WinControls/shortcut/RunMacroDlg.cpp b/PowerEditor/src/WinControls/shortcut/RunMacroDlg.cpp
index 2e67424f..46b5957f 100644
--- a/PowerEditor/src/WinControls/shortcut/RunMacroDlg.cpp
+++ b/PowerEditor/src/WinControls/shortcut/RunMacroDlg.cpp
@@ -27,7 +27,7 @@
 
 // created by Daniel Volk mordorpost@volkarts.com
 
-#include "precompiledHeaders.h"
+
 #include "RunMacroDlg.h"
 #include "ScintillaEditView.h"
 #include "Notepad_plus_msgs.h"
@@ -37,7 +37,7 @@ void RunMacroDlg::initMacroList()
 	if (!isCreated()) return;
 
 	NppParameters *pNppParam = NppParameters::getInstance();
-	vector<MacroShortcut> & macroList = pNppParam->getMacroList();
+	std::vector<MacroShortcut> & macroList = pNppParam->getMacroList();
 
 	::SendDlgItemMessage(_hSelf, IDC_MACRO_COMBO, CB_RESETCONTENT, 0, 0);
 
diff --git a/PowerEditor/src/WinControls/shortcut/RunMacroDlg.h b/PowerEditor/src/WinControls/shortcut/RunMacroDlg.h
index 04e09382..7c218012 100644
--- a/PowerEditor/src/WinControls/shortcut/RunMacroDlg.h
+++ b/PowerEditor/src/WinControls/shortcut/RunMacroDlg.h
@@ -34,7 +34,7 @@
 #include "RunMacroDlg_rc.h"
 #endif //RUN_MACRO_DLG_RC_H
 
-using namespace std;
+#include "StaticDialog.h"
 
 #define RM_CANCEL -1
 #define RM_RUN_MULTI 1
diff --git a/PowerEditor/src/WinControls/shortcut/shortcut.cpp b/PowerEditor/src/WinControls/shortcut/shortcut.cpp
index 335deabf..bd7b31d4 100644
--- a/PowerEditor/src/WinControls/shortcut/shortcut.cpp
+++ b/PowerEditor/src/WinControls/shortcut/shortcut.cpp
@@ -26,16 +26,15 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
-
 #include "shortcut.h"
 #include "Parameters.h"
 #include "ScintillaEditView.h"
 #include "resource.h"
 #include "Notepad_plus_Window.h"
-
 #include "keys.h"
 
+using namespace std;
+
 const int KEY_STR_LEN = 16;
 
 struct KeyIDNAME {
diff --git a/PowerEditor/src/WinControls/shortcut/shortcut.h b/PowerEditor/src/WinControls/shortcut/shortcut.h
index 41748865..cb39f2cd 100644
--- a/PowerEditor/src/WinControls/shortcut/shortcut.h
+++ b/PowerEditor/src/WinControls/shortcut/shortcut.h
@@ -38,8 +38,7 @@
 #endif //SCINTILLA_H
 
 #include "StaticDialog.h"
-
-using namespace std;
+#include "Common.h"
 
 const size_t nameLenMax = 64;
 
@@ -259,7 +258,7 @@ public:
 private:
 	unsigned long _scintillaKeyID;
 	int _menuCmdID;
-	vector<KeyCombo> _keyCombos;
+	std::vector<KeyCombo> _keyCombos;
 	size_t size;
 	void applyToCurrentIndex();
 	void validateDialog();
@@ -298,7 +297,7 @@ struct recordedMacroStep {
 	void PlayBack(Window* pNotepad, ScintillaEditView *pEditView);
 };
 
-typedef vector<recordedMacroStep> Macro;
+typedef std::vector<recordedMacroStep> Macro;
 
 class MacroShortcut : public CommandShortcut {
 friend class NppParameters;
@@ -378,13 +377,13 @@ private:
 class ScintillaAccelerator {	//Handles accelerator keys for scintilla
 public:
 	ScintillaAccelerator() : _nrScintillas(0) {};
-	void init(vector<HWND> * vScintillas, HMENU hMenu, HWND menuParent);
+	void init(std::vector<HWND> * vScintillas, HMENU hMenu, HWND menuParent);
 	void updateKeys();
 	void updateKey(ScintillaKeyMap skmOld, ScintillaKeyMap skm);
 private:
 	HMENU _hAccelMenu;
 	HWND _hMenuParent;
-	vector<HWND> _vScintillas;
+	std::vector<HWND> _vScintillas;
 	int _nrScintillas;
 
 	void updateMenuItemByID(ScintillaKeyMap skm, int id);
diff --git a/PowerEditor/src/lastRecentFileList.h b/PowerEditor/src/lastRecentFileList.h
index f2271d37..ddfe14ac 100644
--- a/PowerEditor/src/lastRecentFileList.h
+++ b/PowerEditor/src/lastRecentFileList.h
@@ -33,6 +33,8 @@
 #include "Parameters.h"
 #endif //PARAMETERS_H
 
+#include <deque>
+
 struct RecentItem {
 	int _id;
 	generic_string _name;
diff --git a/PowerEditor/src/localization.cpp b/PowerEditor/src/localization.cpp
index 85ae80e6..fd41fa30 100644
--- a/PowerEditor/src/localization.cpp
+++ b/PowerEditor/src/localization.cpp
@@ -30,9 +30,9 @@
 #include "Notepad_plus.h"
 #include "ShortcutMapper.h"
 #include "EncodingMapper.h"
-
 #include "localization.h"
 
+using namespace std;
 
 void NativeLangSpeaker::init(TiXmlDocumentA *nativeLangDocRootA, bool loadIfEnglish)
 {
diff --git a/PowerEditor/src/uchardet/CharDistribution.cpp b/PowerEditor/src/uchardet/CharDistribution.cpp
index e78cf891..488d9bc3 100644
--- a/PowerEditor/src/uchardet/CharDistribution.cpp
+++ b/PowerEditor/src/uchardet/CharDistribution.cpp
@@ -35,7 +35,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "precompiledHeaders.h"
 #include "CharDistribution.h"
 
 #include "JISFreq.tab"