diff --git a/PowerEditor/src/EncodingMapper.cpp b/PowerEditor/src/EncodingMapper.cpp
index 48245966..27c02c49 100644
--- a/PowerEditor/src/EncodingMapper.cpp
+++ b/PowerEditor/src/EncodingMapper.cpp
@@ -26,7 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+#include <string.h>
 #include "EncodingMapper.h"
 #include "Scintilla.h"
 
diff --git a/PowerEditor/src/MISC/Common/Common.cpp b/PowerEditor/src/MISC/Common/Common.cpp
index 3b97a041..d9a5a04c 100644
--- a/PowerEditor/src/MISC/Common/Common.cpp
+++ b/PowerEditor/src/MISC/Common/Common.cpp
@@ -26,7 +26,15 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+#include <algorithm>
+#include <shlwapi.h>
+#include <Shlobj.h>
+#include <uxtheme.h>
+#include "StaticDialog.h"
+
+
+
+#include "Common.h"
 #include "../Utf8.h"
 
 WcharMbcsConvertor * WcharMbcsConvertor::_pSelf = new WcharMbcsConvertor;
diff --git a/PowerEditor/src/MISC/Common/precompiledHeaders.h b/PowerEditor/src/MISC/Common/precompiledHeaders.h
index 73bff62f..c3a6a897 100644
--- a/PowerEditor/src/MISC/Common/precompiledHeaders.h
+++ b/PowerEditor/src/MISC/Common/precompiledHeaders.h
@@ -59,8 +59,8 @@
 // Windows Header Files
 #include <windows.h>
 #include <commctrl.h>
-#include <Shlobj.h>
 #include <shlwapi.h>
+#include <Shlobj.h>
 #include <uxtheme.h>
 #include <Oleacc.h>
 #include <dbghelp.h>
diff --git a/PowerEditor/src/MISC/Exception/MiniDumper.cpp b/PowerEditor/src/MISC/Exception/MiniDumper.cpp
index f713a160..939cbda0 100644
--- a/PowerEditor/src/MISC/Exception/MiniDumper.cpp
+++ b/PowerEditor/src/MISC/Exception/MiniDumper.cpp
@@ -29,7 +29,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+#include <shlwapi.h>
 #include "MiniDumper.h"
 
 LPCTSTR msgTitle = TEXT("Notepad++ crash analysis");
diff --git a/PowerEditor/src/MISC/Exception/MiniDumper.h b/PowerEditor/src/MISC/Exception/MiniDumper.h
index 130953d2..d3b5c112 100644
--- a/PowerEditor/src/MISC/Exception/MiniDumper.h
+++ b/PowerEditor/src/MISC/Exception/MiniDumper.h
@@ -32,6 +32,9 @@
 #ifndef MDUMP_H
 #define MDUMP_H
 
+#include <windows.h>
+#include <dbghelp.h>
+
 
 // based on dbghelp.h
 typedef BOOL (WINAPI *MINIDUMPWRITEDUMP)(HANDLE hProcess, DWORD dwPid, HANDLE hFile, MINIDUMP_TYPE DumpType,
diff --git a/PowerEditor/src/MISC/Exception/Win32Exception.cpp b/PowerEditor/src/MISC/Exception/Win32Exception.cpp
index d37d4d41..74fca430 100644
--- a/PowerEditor/src/MISC/Exception/Win32Exception.cpp
+++ b/PowerEditor/src/MISC/Exception/Win32Exception.cpp
@@ -32,7 +32,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
 #include "Win32Exception.h"
 
 
diff --git a/PowerEditor/src/MISC/Exception/Win32Exception.h b/PowerEditor/src/MISC/Exception/Win32Exception.h
index 3117a1bc..5be89c2f 100644
--- a/PowerEditor/src/MISC/Exception/Win32Exception.h
+++ b/PowerEditor/src/MISC/Exception/Win32Exception.h
@@ -31,6 +31,11 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+#ifndef WIN32_EXCEPTION_H
+#define  WIN32_EXCEPTION_H
+
+#include <exception>
+#include <windows.h>
 
 typedef const void* ExceptionAddress; // OK on Win32 platform
 
@@ -69,3 +74,5 @@ private:
 
     friend void Win32Exception::translate(unsigned code, EXCEPTION_POINTERS* info);
 };
+
+#endif // WIN32_EXCEPTION_H
\ No newline at end of file
diff --git a/PowerEditor/src/MISC/PluginsManager/IDAllocator.cpp b/PowerEditor/src/MISC/PluginsManager/IDAllocator.cpp
index 568d6fb8..5cd78d51 100644
--- a/PowerEditor/src/MISC/PluginsManager/IDAllocator.cpp
+++ b/PowerEditor/src/MISC/PluginsManager/IDAllocator.cpp
@@ -28,8 +28,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
-
 #include "IDAllocator.h"
 
 IDAllocator::IDAllocator(int start, int maximumID)
diff --git a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
index f37a993e..9048cfae 100644
--- a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
+++ b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
@@ -26,7 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+#include <shlwapi.h>
 #include "PluginsManager.h"
 #include "resource.h"
 
diff --git a/PowerEditor/src/MISC/Process/Process.cpp b/PowerEditor/src/MISC/Process/Process.cpp
index 33c7818a..56904083 100644
--- a/PowerEditor/src/MISC/Process/Process.cpp
+++ b/PowerEditor/src/MISC/Process/Process.cpp
@@ -26,7 +26,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
 #include "Parameters.h"
 #include "process.h"
 
diff --git a/PowerEditor/src/MISC/RegExt/regExtDlg.cpp b/PowerEditor/src/MISC/RegExt/regExtDlg.cpp
index 41015a2a..6a21061e 100644
--- a/PowerEditor/src/MISC/RegExt/regExtDlg.cpp
+++ b/PowerEditor/src/MISC/RegExt/regExtDlg.cpp
@@ -25,8 +25,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-
-#include "precompiledHeaders.h"
+#include "Common.h"
 #include "regExtDlg.h"
 #include "resource.h"
 
diff --git a/PowerEditor/src/MISC/RegExt/regExtDlg.h b/PowerEditor/src/MISC/RegExt/regExtDlg.h
index 2ef81778..14a48634 100644
--- a/PowerEditor/src/MISC/RegExt/regExtDlg.h
+++ b/PowerEditor/src/MISC/RegExt/regExtDlg.h
@@ -33,6 +33,8 @@
 #include "regExtDlgRc.h"
 #endif //REGEXTDLGRC_H
 
+#include "StaticDialog.h"
+
 const int extNameLen = 32;
 
 class RegExtDlg : public StaticDialog
diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
index c81d48a5..3a0d078c 100644
--- a/PowerEditor/src/Notepad_plus.cpp
+++ b/PowerEditor/src/Notepad_plus.cpp
@@ -25,8 +25,8 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-
-#include "precompiledHeaders.h"
+#include <time.h>
+#include <shlwapi.h>
 #include "Notepad_plus.h"
 #include "Notepad_plus_Window.h"
 #include "FileDialog.h"
diff --git a/PowerEditor/src/Notepad_plus_Window.cpp b/PowerEditor/src/Notepad_plus_Window.cpp
index 0e9d8169..49f8be61 100644
--- a/PowerEditor/src/Notepad_plus_Window.cpp
+++ b/PowerEditor/src/Notepad_plus_Window.cpp
@@ -26,7 +26,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+#include <time.h>
+#include <shlwapi.h>
 #include "Notepad_plus_Window.h"
 
 const TCHAR Notepad_plus_Window::_className[32] = TEXT("Notepad++");
diff --git a/PowerEditor/src/NppBigSwitch.cpp b/PowerEditor/src/NppBigSwitch.cpp
index 494238e3..89857a46 100644
--- a/PowerEditor/src/NppBigSwitch.cpp
+++ b/PowerEditor/src/NppBigSwitch.cpp
@@ -26,7 +26,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+#include <algorithm>
+#include <shlwapi.h>
 #include "Notepad_plus_Window.h"
 #include "TaskListDlg.h"
 #include "ImageListSet.h"
diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp
index 2df44ee7..d15c671b 100644
--- a/PowerEditor/src/NppCommands.cpp
+++ b/PowerEditor/src/NppCommands.cpp
@@ -25,8 +25,8 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-
-#include "precompiledHeaders.h"
+#include <memory>
+#include <shlwapi.h>
 #include "Notepad_plus_Window.h"
 #include "EncodingMapper.h"
 #include "ShortcutMapper.h"
diff --git a/PowerEditor/src/NppIO.cpp b/PowerEditor/src/NppIO.cpp
index ee732d1a..9fcc33a7 100644
--- a/PowerEditor/src/NppIO.cpp
+++ b/PowerEditor/src/NppIO.cpp
@@ -26,7 +26,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+#include <time.h>
+#include <shlwapi.h>
 #include "Notepad_plus_Window.h"
 #include "FileDialog.h"
 #include "EncodingMapper.h"
diff --git a/PowerEditor/src/NppNotification.cpp b/PowerEditor/src/NppNotification.cpp
index fcbc5eee..44599880 100644
--- a/PowerEditor/src/NppNotification.cpp
+++ b/PowerEditor/src/NppNotification.cpp
@@ -26,7 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+
 #include "Notepad_plus_Window.h"
 #include "xmlMatchedTagsHighlighter.h"
 #include "VerticalFileSwitcher.h"
diff --git a/PowerEditor/src/ScitillaComponent/DocTabView.cpp b/PowerEditor/src/ScitillaComponent/DocTabView.cpp
index 95506df7..03d26069 100644
--- a/PowerEditor/src/ScitillaComponent/DocTabView.cpp
+++ b/PowerEditor/src/ScitillaComponent/DocTabView.cpp
@@ -26,7 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+
 #include "DocTabView.h"
 #include "ScintillaEditView.h"
 
diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
index cf9fdb4b..89059ef9 100644
--- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
+++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
@@ -25,8 +25,8 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-
-#include "precompiledHeaders.h"
+#include <Shlobj.h>
+#include <uxtheme.h>
 #include "FindReplaceDlg.h"
 #include "ScintillaEditView.h"
 #include "Notepad_plus_msgs.h"
diff --git a/PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp b/PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp
index 475a49e2..c7d40daf 100644
--- a/PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp
+++ b/PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp
@@ -26,7 +26,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
 #include "FunctionCallTip.h"
 
 
diff --git a/PowerEditor/src/ScitillaComponent/GoToLineDlg.cpp b/PowerEditor/src/ScitillaComponent/GoToLineDlg.cpp
index 55375f06..3f2543d0 100644
--- a/PowerEditor/src/ScitillaComponent/GoToLineDlg.cpp
+++ b/PowerEditor/src/ScitillaComponent/GoToLineDlg.cpp
@@ -26,7 +26,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
 #include "GoToLineDlg.h"
 
 
diff --git a/PowerEditor/src/ScitillaComponent/Printer.cpp b/PowerEditor/src/ScitillaComponent/Printer.cpp
index b82de0a3..4b976b31 100644
--- a/PowerEditor/src/ScitillaComponent/Printer.cpp
+++ b/PowerEditor/src/ScitillaComponent/Printer.cpp
@@ -26,7 +26,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
 #include "Printer.h"
 #include "RunDlg.h"
 //#include "Parameters.h"
diff --git a/PowerEditor/src/ScitillaComponent/UserDefineDialog.cpp b/PowerEditor/src/ScitillaComponent/UserDefineDialog.cpp
index 1485d8b1..83d2de23 100644
--- a/PowerEditor/src/ScitillaComponent/UserDefineDialog.cpp
+++ b/PowerEditor/src/ScitillaComponent/UserDefineDialog.cpp
@@ -26,8 +26,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
-
 #include "localization.h"
 #include "UserDefineDialog.h"
 #include "ScintillaEditView.h"
diff --git a/PowerEditor/src/ScitillaComponent/UserDefineLangReference.h b/PowerEditor/src/ScitillaComponent/UserDefineLangReference.h
index cc924065..3f8c7a92 100644
--- a/PowerEditor/src/ScitillaComponent/UserDefineLangReference.h
+++ b/PowerEditor/src/ScitillaComponent/UserDefineLangReference.h
@@ -29,9 +29,7 @@
 #ifndef USER_DEFINE_LANG_REFERENCE_H
 #define USER_DEFINE_LANG_REFERENCE_H
 
-#ifndef SCILEXER_H
 #include "scilexer.h"
-#endif //SCILEXER_H
 
 const int langNameLenMax = 33;
 const int extsLenMax = 256;
diff --git a/PowerEditor/src/TinyXml/tinyXmlA/tinystrA.cpp b/PowerEditor/src/TinyXml/tinyXmlA/tinystrA.cpp
index 39240495..3640ea72 100644
--- a/PowerEditor/src/TinyXml/tinyXmlA/tinystrA.cpp
+++ b/PowerEditor/src/TinyXml/tinyXmlA/tinystrA.cpp
@@ -22,7 +22,6 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
-#include "precompiledHeaders.h"
 #include "tinyxmlA.h"
 
 #ifndef TIXMLA_USE_STL
diff --git a/PowerEditor/src/TinyXml/tinyXmlA/tinyxmlA.cpp b/PowerEditor/src/TinyXml/tinyXmlA/tinyxmlA.cpp
index afaa1c3d..c3affd57 100644
--- a/PowerEditor/src/TinyXml/tinyXmlA/tinyxmlA.cpp
+++ b/PowerEditor/src/TinyXml/tinyXmlA/tinyxmlA.cpp
@@ -22,7 +22,7 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
-#include "precompiledHeaders.h"
+#include "Common.h"
 #include "tinyxmlA.h"
 
 #ifdef TIXMLA_USE_STL
diff --git a/PowerEditor/src/TinyXml/tinyXmlA/tinyxmlerrorA.cpp b/PowerEditor/src/TinyXml/tinyXmlA/tinyxmlerrorA.cpp
index 5ad92200..51302660 100644
--- a/PowerEditor/src/TinyXml/tinyXmlA/tinyxmlerrorA.cpp
+++ b/PowerEditor/src/TinyXml/tinyXmlA/tinyxmlerrorA.cpp
@@ -22,7 +22,7 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
-#include "precompiledHeaders.h"
+
 #include "tinyxmlA.h"
 
 // The goal of the seperate error file is to make the first
diff --git a/PowerEditor/src/TinyXml/tinyXmlA/tinyxmlparserA.cpp b/PowerEditor/src/TinyXml/tinyXmlA/tinyxmlparserA.cpp
index 935f8fc4..d7d4f375 100644
--- a/PowerEditor/src/TinyXml/tinyXmlA/tinyxmlparserA.cpp
+++ b/PowerEditor/src/TinyXml/tinyXmlA/tinyxmlparserA.cpp
@@ -22,7 +22,7 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
-#include "precompiledHeaders.h"
+
 #include "tinyxmlA.h"
 
 //#define DEBUG_PARSER
diff --git a/PowerEditor/src/TinyXml/tinystr.cpp b/PowerEditor/src/TinyXml/tinystr.cpp
index 78bf513b..45343fda 100644
--- a/PowerEditor/src/TinyXml/tinystr.cpp
+++ b/PowerEditor/src/TinyXml/tinystr.cpp
@@ -22,7 +22,6 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
-#include "precompiledHeaders.h"
 
 #ifndef TIXML_USE_STL
 
diff --git a/PowerEditor/src/TinyXml/tinyxml.cpp b/PowerEditor/src/TinyXml/tinyxml.cpp
index e8419cc1..d50938c5 100644
--- a/PowerEditor/src/TinyXml/tinyxml.cpp
+++ b/PowerEditor/src/TinyXml/tinyxml.cpp
@@ -22,7 +22,7 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
-#include "precompiledHeaders.h"
+#include <sstream>
 #include "tinyxml.h"
 
 bool TiXmlBase::condenseWhiteSpace = true;
diff --git a/PowerEditor/src/TinyXml/tinyxmlerror.cpp b/PowerEditor/src/TinyXml/tinyxmlerror.cpp
index a5259b99..717cfb9d 100644
--- a/PowerEditor/src/TinyXml/tinyxmlerror.cpp
+++ b/PowerEditor/src/TinyXml/tinyxmlerror.cpp
@@ -22,7 +22,7 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
-#include "precompiledHeaders.h"
+
 #include "tinyxml.h"
 
 // The goal of the seperate error file is to make the first
diff --git a/PowerEditor/src/TinyXml/tinyxmlparser.cpp b/PowerEditor/src/TinyXml/tinyxmlparser.cpp
index f4a8d941..45ff2621 100644
--- a/PowerEditor/src/TinyXml/tinyxmlparser.cpp
+++ b/PowerEditor/src/TinyXml/tinyxmlparser.cpp
@@ -22,7 +22,7 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
-#include "precompiledHeaders.h"
+
 #include "tinyxml.h"
 
 //#define DEBUG_PARSER
diff --git a/PowerEditor/src/UniConversion.cpp b/PowerEditor/src/UniConversion.cpp
index 90f90225..bff612c6 100644
--- a/PowerEditor/src/UniConversion.cpp
+++ b/PowerEditor/src/UniConversion.cpp
@@ -5,7 +5,7 @@
 // Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
-#include "precompiledHeaders.h"
+#include <windows.h>
 #include "UniConversion.h"
 
 unsigned int UTF8Length(const wchar_t *uptr, unsigned int tlen) {
diff --git a/PowerEditor/src/UniConversion.h b/PowerEditor/src/UniConversion.h
index c959087c..3a0b3393 100644
--- a/PowerEditor/src/UniConversion.h
+++ b/PowerEditor/src/UniConversion.h
@@ -5,9 +5,14 @@
 // Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
+#ifndef UNICONVERSION_H
+#define UNICONVERSION_H
+
 unsigned int UTF8Length(const wchar_t * uptr, unsigned int tlen);
 void UTF8FromUCS2(const wchar_t * uptr, unsigned int tlen, char * putf, unsigned int len);
 unsigned int UCS2Length(const char * s, unsigned int len);
 unsigned int UCS2FromUTF8(const char * s, unsigned int len, wchar_t * tbuf, unsigned int tlen);
 unsigned int ascii_to_utf8(const char * pszASCII, unsigned int lenASCII, char * pszUTF8);
 int utf8_to_ascii(const char * pszUTF8, unsigned int lenUTF8, char * pszASCII);
+
+#endif //UNICONVERSION_H
diff --git a/PowerEditor/src/Utf8_16.cpp b/PowerEditor/src/Utf8_16.cpp
index 729427ab..1532c758 100644
--- a/PowerEditor/src/Utf8_16.cpp
+++ b/PowerEditor/src/Utf8_16.cpp
@@ -16,7 +16,6 @@
 // - Add convert function in Utf8_16_Write
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "precompiledHeaders.h"
 #include "Utf8_16.h"
 
 const Utf8_16::utf8 Utf8_16::k_Boms[][3] = {
diff --git a/PowerEditor/src/WinControls/AnsiCharPanel/ListView.cpp b/PowerEditor/src/WinControls/AnsiCharPanel/ListView.cpp
index e5f15c1f..ea37f218 100644
--- a/PowerEditor/src/WinControls/AnsiCharPanel/ListView.cpp
+++ b/PowerEditor/src/WinControls/AnsiCharPanel/ListView.cpp
@@ -26,7 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+
 #include "ListView.h"
 #include "Parameters.h"
 #include "localization.h"
diff --git a/PowerEditor/src/WinControls/AnsiCharPanel/ListView.h b/PowerEditor/src/WinControls/AnsiCharPanel/ListView.h
index 0b7faf34..6a510161 100644
--- a/PowerEditor/src/WinControls/AnsiCharPanel/ListView.h
+++ b/PowerEditor/src/WinControls/AnsiCharPanel/ListView.h
@@ -30,6 +30,7 @@
 #define LISTVIEW_H
 
 #include "window.h"
+#include "Common.h"
 
 class ListView : public Window
 {
diff --git a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h
index 8df97f7b..5a290a4b 100644
--- a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h
+++ b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h
@@ -29,17 +29,10 @@
 #ifndef WORD_STYLE_H
 #define WORD_STYLE_H
 
-#ifndef COLOUR_PICKER_H
 #include "ColourPicker.h"
-#endif //COLOUR_PICKER_H
-
-#ifndef WORD_STYLE_DLG_RES_H
 #include "WordStyleDlgRes.h"
-#endif //WORD_STYLE_DLG_RES_H
-
-#ifndef PARAMETERS_H
 #include "Parameters.h"
-#endif //PARAMETERS_H
+
 
 #define WM_UPDATESCINTILLAS			(WORDSTYLE_USER + 1) //GlobalStyleDlg's msg 2 send 2 its parent
 
diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp b/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp
index 8c78baf6..88d0361e 100644
--- a/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp
+++ b/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp
@@ -26,7 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+
 #include "DockingManager.h"
 #include "DockingSplitter.h"
 #include "DockingCont.h"
@@ -44,18 +44,24 @@ static	HHOOK			gWinCallHook = NULL;
 LRESULT CALLBACK FocusWndProc(int nCode, WPARAM wParam, LPARAM lParam);
 
 // Callback function that handles messages (to test focus)
-LRESULT CALLBACK FocusWndProc(int nCode, WPARAM wParam, LPARAM lParam) {
-	if (nCode == HC_ACTION && hWndServer) {
+LRESULT CALLBACK FocusWndProc(int nCode, WPARAM wParam, LPARAM lParam)
+{
+	if (nCode == HC_ACTION && hWndServer)
+	{
 		DockingManager *pDockingManager = (DockingManager *)::GetWindowLongPtr(hWndServer, GWL_USERDATA);
-		if (pDockingManager) {
+		if (pDockingManager)
+		{
 			vector<DockingCont*> & vcontainer = pDockingManager->getContainerInfo();
 			CWPSTRUCT * pCwp = (CWPSTRUCT*)lParam;
-			if (pCwp->message == WM_KILLFOCUS) {
+			if (pCwp->message == WM_KILLFOCUS)
+			{
 				for (int i = 0; i < DOCKCONT_MAX; ++i)
 				{
 					vcontainer[i]->SetActive(FALSE);	//deactivate all containers
 				}
-			} else if (pCwp->message == WM_SETFOCUS) {
+			}
+			else if (pCwp->message == WM_SETFOCUS)
+			{
 				for (int i = 0; i < DOCKCONT_MAX; ++i)
 				{
 					vcontainer[i]->SetActive(IsChild(vcontainer[i]->getHSelf(), pCwp->hwnd));	//activate the container that contains the window with focus, this can be none
diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingManager.h b/PowerEditor/src/WinControls/DockingWnd/DockingManager.h
index da401842..91ab144f 100644
--- a/PowerEditor/src/WinControls/DockingWnd/DockingManager.h
+++ b/PowerEditor/src/WinControls/DockingWnd/DockingManager.h
@@ -29,6 +29,11 @@
 #ifndef DOCKINGMANAGER_H
 #define DOCKINGMANAGER_H
 
+#include <vector>
+#include <windows.h>
+#include <commctrl.h>
+#include "Window.h"
+
 #ifndef DOCKINGCONT
 #include "DockingCont.h"
 #endif //DOCKINGCONT
@@ -39,6 +44,7 @@ class DockingSplitter;
 #include "SplitterContainer.h"
 #endif //SPLITTER_CONTAINER_H
 
+
 #define DSPC_CLASS_NAME TEXT("dockingManager")
 #define	CONT_MAP_MAX	50
 
diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp b/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp
index 1778042e..3d07437e 100644
--- a/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp
+++ b/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp
@@ -26,7 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+
 #include "DockingSplitter.h"
 #include "Notepad_plus_msgs.h"
 #include "Parameters.h"
diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.h b/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.h
index ffc33cbe..521c117c 100644
--- a/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.h
+++ b/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.h
@@ -29,6 +29,8 @@
 #ifndef DOCKINGSPLITTER_H
 #define DOCKINGSPLITTER_H
 
+#include "Window.h"
+
 #ifndef DOCKING_H
 #include "Docking.h"
 #endif //DOCKING_H
diff --git a/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp b/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp
index 344d6d4f..10284fc5 100644
--- a/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp
+++ b/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp
@@ -29,7 +29,6 @@
 // speed and consistency of the drag-rectangle - August 2010, Joern Gruel (jg)
 
 
-#include "precompiledHeaders.h"
 #include "Gripper.h"
 #include "DockingManager.h"
 #include "Parameters.h"
diff --git a/PowerEditor/src/WinControls/DockingWnd/Gripper.h b/PowerEditor/src/WinControls/DockingWnd/Gripper.h
index 98aa4662..c154821b 100644
--- a/PowerEditor/src/WinControls/DockingWnd/Gripper.h
+++ b/PowerEditor/src/WinControls/DockingWnd/Gripper.h
@@ -29,6 +29,10 @@
 #ifndef GRIPPER_H
 #define GRIPPER_H
 
+#include <windows.h>
+#include <commctrl.h>
+#include "Common.h"
+
 #ifndef DOCKING_H
 #include "Docking.h"
 #endif //DOCKING_H
diff --git a/PowerEditor/src/WinControls/DocumentMap/documentMap.cpp b/PowerEditor/src/WinControls/DocumentMap/documentMap.cpp
index 11f50af0..ac8245c1 100644
--- a/PowerEditor/src/WinControls/DocumentMap/documentMap.cpp
+++ b/PowerEditor/src/WinControls/DocumentMap/documentMap.cpp
@@ -26,7 +26,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
 #include "documentMap.h"
 #include "ScintillaEditView.h"
 
diff --git a/PowerEditor/src/WinControls/FindCharsInRange/FindCharsInRange.cpp b/PowerEditor/src/WinControls/FindCharsInRange/FindCharsInRange.cpp
index 79716580..8ad4227e 100644
--- a/PowerEditor/src/WinControls/FindCharsInRange/FindCharsInRange.cpp
+++ b/PowerEditor/src/WinControls/FindCharsInRange/FindCharsInRange.cpp
@@ -26,7 +26,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
 #include "FindCharsInRange.h"
 #include "FindCharsInRange_rc.h"
 
diff --git a/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp b/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp
index 2e2fd339..13f780ba 100644
--- a/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp
+++ b/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp
@@ -26,7 +26,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
 #include "functionListPanel.h"
 #include "ScintillaEditView.h"
 #include "localization.h"
diff --git a/PowerEditor/src/WinControls/FunctionList/functionParser.cpp b/PowerEditor/src/WinControls/FunctionList/functionParser.cpp
index 16d3904b..a0b80242 100644
--- a/PowerEditor/src/WinControls/FunctionList/functionParser.cpp
+++ b/PowerEditor/src/WinControls/FunctionList/functionParser.cpp
@@ -25,7 +25,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-#include "precompiledHeaders.h"
+#include <shlwapi.h>
 #include "ScintillaEditView.h"
 #include "functionParser.h"
 #include "boostregexsearch.h"
diff --git a/PowerEditor/src/WinControls/ImageListSet/ImageListSet.cpp b/PowerEditor/src/WinControls/ImageListSet/ImageListSet.cpp
index e6f42f02..8f8a7cba 100644
--- a/PowerEditor/src/WinControls/ImageListSet/ImageListSet.cpp
+++ b/PowerEditor/src/WinControls/ImageListSet/ImageListSet.cpp
@@ -26,7 +26,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
 #include "ImageListSet.h"
 
 void IconList::create(HINSTANCE hInst, int iconSize) 
diff --git a/PowerEditor/src/WinControls/ImageListSet/ImageListSet.h b/PowerEditor/src/WinControls/ImageListSet/ImageListSet.h
index 84343b75..6ebbea91 100644
--- a/PowerEditor/src/WinControls/ImageListSet/ImageListSet.h
+++ b/PowerEditor/src/WinControls/ImageListSet/ImageListSet.h
@@ -29,6 +29,8 @@
 #ifndef IMAGE_LIST_H
 #define IMAGE_LIST_H
 
+#include <vector>
+#include <windows.h>
 #include <commctrl.h>
 
 const int nbMax = 45;
diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
index d8f4d2ba..477a43a5 100644
--- a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
+++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.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 <shlwapi.h>
+#include <Shlobj.h>
+#include <uxtheme.h>
 #include "preferenceDlg.h"
 #include "lesDlgs.h"
 #include "EncodingMapper.h"
diff --git a/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp b/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp
index f0372919..2c56c05a 100644
--- a/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp
+++ b/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp
@@ -26,7 +26,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
 #include "ProjectPanel.h"
 #include "resource.h"
 #include "tinyxml.h"
diff --git a/PowerEditor/src/WinControls/ProjectPanel/TreeView.cpp b/PowerEditor/src/WinControls/ProjectPanel/TreeView.cpp
index d46f347b..7aa100e8 100644
--- a/PowerEditor/src/WinControls/ProjectPanel/TreeView.cpp
+++ b/PowerEditor/src/WinControls/ProjectPanel/TreeView.cpp
@@ -26,7 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+
 #include "TreeView.h"
 
 #define CY_ITEMHEIGHT     18
diff --git a/PowerEditor/src/WinControls/ProjectPanel/TreeView.h b/PowerEditor/src/WinControls/ProjectPanel/TreeView.h
index 0138fe8c..d14b4b5c 100644
--- a/PowerEditor/src/WinControls/ProjectPanel/TreeView.h
+++ b/PowerEditor/src/WinControls/ProjectPanel/TreeView.h
@@ -28,7 +28,10 @@
 #ifndef TREE_VIEW_H
 #define TREE_VIEW_H
 
+#include <windows.h>
+#include <commctrl.h>
 #include "window.h"
+#include "Common.h"
 
 struct TreeStateNode {
 	generic_string _label;
diff --git a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.cpp b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.cpp
index f4b6526a..63255732 100644
--- a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.cpp
+++ b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.cpp
@@ -15,7 +15,7 @@
 //along with this program; if not, write to the Free Software
 //Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-#include "precompiledHeaders.h"
+#include "StaticDialog.h"
 #include "RunDlg.h"
 #include "FileDialog.h"
 #include "Notepad_plus_msgs.h"
diff --git a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h
index 18e6898a..a4ef21ba 100644
--- a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h
+++ b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h
@@ -18,6 +18,9 @@
 #ifndef RUN_DLG_H
 #define RUN_DLG_H
 
+#include <Oleacc.h>
+#include "Common.h"
+
 #ifndef RUN_DLG_RC_H
 #include "RunDlg_rc.h"
 #endif //RUN_DLG_RC_H
diff --git a/PowerEditor/src/WinControls/StaticDialog/StaticDialog.h b/PowerEditor/src/WinControls/StaticDialog/StaticDialog.h
index f4e37456..e3431a89 100644
--- a/PowerEditor/src/WinControls/StaticDialog/StaticDialog.h
+++ b/PowerEditor/src/WinControls/StaticDialog/StaticDialog.h
@@ -29,10 +29,7 @@
 #ifndef STATIC_DIALOG_H
 #define STATIC_DIALOG_H
 
-#ifndef NOTEPAD_PLUS_MSGS_H
 #include "Notepad_plus_msgs.h"
-#endif //NOTEPAD_PLUS_MSGS_H
-
 #include "Window.h"
 
 typedef HRESULT (WINAPI * ETDTProc) (HWND, DWORD);
diff --git a/PowerEditor/src/WinControls/TabBar/TabBar.cpp b/PowerEditor/src/WinControls/TabBar/TabBar.cpp
index 6e9e24a4..bcb9aa20 100644
--- a/PowerEditor/src/WinControls/TabBar/TabBar.cpp
+++ b/PowerEditor/src/WinControls/TabBar/TabBar.cpp
@@ -26,7 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+
 #include "TabBar.h"
 #include "Parameters.h"
 
diff --git a/PowerEditor/src/WinControls/TaskList/TaskList.cpp b/PowerEditor/src/WinControls/TaskList/TaskList.cpp
index 0006583b..42205a46 100644
--- a/PowerEditor/src/WinControls/TaskList/TaskList.cpp
+++ b/PowerEditor/src/WinControls/TaskList/TaskList.cpp
@@ -26,7 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+
 #include "TaskList.h"
 #include "TaskListDlg_rc.h"
 #include "colors.h"
diff --git a/PowerEditor/src/WinControls/TaskList/TaskList.h b/PowerEditor/src/WinControls/TaskList/TaskList.h
index 9645823e..b2a64142 100644
--- a/PowerEditor/src/WinControls/TaskList/TaskList.h
+++ b/PowerEditor/src/WinControls/TaskList/TaskList.h
@@ -29,6 +29,10 @@
 #ifndef TASKLIST_H
 #define TASKLIST_H
 
+#include <windows.h>
+#include <commctrl.h>
+#include "Window.h"
+
 #ifndef WM_MOUSEWHEEL
 #define WM_MOUSEWHEEL 0x020A
 #endif //WM_MOUSEWHEEL
diff --git a/PowerEditor/src/WinControls/TaskList/TaskListDlg.cpp b/PowerEditor/src/WinControls/TaskList/TaskListDlg.cpp
index 67dda3cc..ef5657ad 100644
--- a/PowerEditor/src/WinControls/TaskList/TaskListDlg.cpp
+++ b/PowerEditor/src/WinControls/TaskList/TaskListDlg.cpp
@@ -26,7 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+
 #include "TaskListDlg.h"
 #include "Parameters.h"
 #include "resource.h"
diff --git a/PowerEditor/src/WinControls/TaskList/TaskListDlg.h b/PowerEditor/src/WinControls/TaskList/TaskListDlg.h
index 9362e736..42cd16b4 100644
--- a/PowerEditor/src/WinControls/TaskList/TaskListDlg.h
+++ b/PowerEditor/src/WinControls/TaskList/TaskListDlg.h
@@ -29,6 +29,9 @@
 #ifndef TASKLISTDLG_H
 #define TASKLISTDLG_H
 
+#include "Common.h"
+#include "StaticDialog.h"
+
 #ifndef TASKLISTDLGRC_H
 #include "TaskListDlg_rc.h"
 #endif //TASKLISTDLGRC_H
diff --git a/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp b/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp
index c2807f61..2439d852 100644
--- a/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp
+++ b/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp
@@ -26,7 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+
 #include "ToolBar.h"
 #include "Shortcut.h"
 #include "Parameters.h"
diff --git a/PowerEditor/src/WinControls/ToolBar/ToolBar.h b/PowerEditor/src/WinControls/ToolBar/ToolBar.h
index ec695189..6db67f13 100644
--- a/PowerEditor/src/WinControls/ToolBar/ToolBar.h
+++ b/PowerEditor/src/WinControls/ToolBar/ToolBar.h
@@ -29,11 +29,9 @@
 #ifndef TOOL_BAR_H
 #define TOOL_BAR_H
 
-#ifndef NOTEPAD_PLUS_MSGS_H
-#include "Notepad_plus_msgs.h"
-#endif //NOTEPAD_PLUS_MSGS_H
-
+#include "Common.h"
 #include "Window.h"
+#include "Notepad_plus_msgs.h"
 #include "ImageListSet.h"
 
 #define REBAR_BAR_TOOLBAR		0
diff --git a/PowerEditor/src/WinControls/ToolTip/ToolTip.cpp b/PowerEditor/src/WinControls/ToolTip/ToolTip.cpp
index 1d7024cb..9b984c05 100644
--- a/PowerEditor/src/WinControls/ToolTip/ToolTip.cpp
+++ b/PowerEditor/src/WinControls/ToolTip/ToolTip.cpp
@@ -26,14 +26,11 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+#include <iostream>
 #include "ToolTip.h"
 
-
-
 LRESULT CALLBACK dlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 
-
 void ToolTip::init(HINSTANCE hInst, HWND hParent)
 {
 	if (_hSelf == NULL)
diff --git a/PowerEditor/src/WinControls/ToolTip/ToolTip.h b/PowerEditor/src/WinControls/ToolTip/ToolTip.h
index a8bf735e..8310c57d 100644
--- a/PowerEditor/src/WinControls/ToolTip/ToolTip.h
+++ b/PowerEditor/src/WinControls/ToolTip/ToolTip.h
@@ -29,7 +29,9 @@
 #ifndef __TOOLTIP_H__
 #define __TOOLTIP_H__
 
+#include <windows.h>
 #include <commctrl.h>
+#include "Window.h"
 
 class ToolTip : public Window
 {
diff --git a/PowerEditor/src/WinControls/TrayIcon/trayIconControler.cpp b/PowerEditor/src/WinControls/TrayIcon/trayIconControler.cpp
index 84d77284..b34af62f 100644
--- a/PowerEditor/src/WinControls/TrayIcon/trayIconControler.cpp
+++ b/PowerEditor/src/WinControls/TrayIcon/trayIconControler.cpp
@@ -26,7 +26,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
 #include "trayIconControler.h"
 
 trayIconControler::trayIconControler(HWND hwnd, UINT uID, UINT uCBMsg, HICON hicon, TCHAR *tip)
diff --git a/PowerEditor/src/WinControls/TrayIcon/trayIconControler.h b/PowerEditor/src/WinControls/TrayIcon/trayIconControler.h
index d3bd689a..bfaf436b 100644
--- a/PowerEditor/src/WinControls/TrayIcon/trayIconControler.h
+++ b/PowerEditor/src/WinControls/TrayIcon/trayIconControler.h
@@ -29,6 +29,8 @@
 #ifndef TRAY_ICON_CONTROLER_H
 #define TRAY_ICON_CONTROLER_H
 
+#include <windows.h>
+
 #define ADD     NIM_ADD
 #define REMOVE  NIM_DELETE
 
diff --git a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.cpp b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.cpp
index a5532f58..658648ad 100644
--- a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.cpp
+++ b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.cpp
@@ -26,7 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+
 #include "VerticalFileSwitcher.h"
 #include "menuCmdID.h"
 #include "Parameters.h"
diff --git a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.h b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.h
index 5fb08eb4..0276cd00 100644
--- a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.h
+++ b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.h
@@ -29,11 +29,7 @@
 #ifndef VERTICALFILESWITCHER_H
 #define  VERTICALFILESWITCHER_H
 
-//#include <windows.h>
-#ifndef DOCKINGDLGINTERFACE_H
 #include "DockingDlgInterface.h"
-#endif //DOCKINGDLGINTERFACE_H
-
 #include "VerticalFileSwitcher_rc.h"
 #include "VerticalFileSwitcherListView.h"
 
diff --git a/PowerEditor/src/WinControls/WindowsDlg/WinMgr.cpp b/PowerEditor/src/WinControls/WindowsDlg/WinMgr.cpp
index 47127d92..d4f37813 100644
--- a/PowerEditor/src/WinControls/WindowsDlg/WinMgr.cpp
+++ b/PowerEditor/src/WinControls/WindowsDlg/WinMgr.cpp
@@ -8,7 +8,7 @@
 // Theo - Heavily modified to remove MFC dependencies.  
 //        Replaced CWnd*/HWND, CRect/RECT, CSize/SIZE, CPoint/POINT
 
-#include "precompiledHeaders.h"
+
 #include "WinMgr.h"
 
 // Theo - Style Helpers
diff --git a/PowerEditor/src/WinControls/WindowsDlg/WinRect.cpp b/PowerEditor/src/WinControls/WindowsDlg/WinRect.cpp
index 5caeb955..3dcb68f0 100644
--- a/PowerEditor/src/WinControls/WindowsDlg/WinRect.cpp
+++ b/PowerEditor/src/WinControls/WindowsDlg/WinRect.cpp
@@ -7,7 +7,6 @@
 //
 
 
-#include "precompiledHeaders.h"
 #include "WinMgr.h"
 
 //////////////////
diff --git a/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.h b/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.h
index 48eac8b0..d194dc4e 100644
--- a/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.h
+++ b/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.h
@@ -29,10 +29,7 @@
 #ifndef WINDOWS_DLG_H
 #define WINDOWS_DLG_H
 
-#ifndef SIZABLE_DLG_H
 #include "SizeableDlg.h"
-#endif //SIZABLE_DLG_H
-
 #include "Common.h"
 
 class DocTabView;
diff --git a/PowerEditor/src/lastRecentFileList.cpp b/PowerEditor/src/lastRecentFileList.cpp
index 2e7dc670..b2b9d80b 100644
--- a/PowerEditor/src/lastRecentFileList.cpp
+++ b/PowerEditor/src/lastRecentFileList.cpp
@@ -26,7 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+
 #include "lastRecentFileList.h"
 #include "menuCmdID.h"
 #include "localization.h"
diff --git a/PowerEditor/src/lesDlgs.cpp b/PowerEditor/src/lesDlgs.cpp
index 57947d89..0b2e29c6 100644
--- a/PowerEditor/src/lesDlgs.cpp
+++ b/PowerEditor/src/lesDlgs.cpp
@@ -26,7 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
+
 #include "lesDlgs.h"
 #include "resource.h"
 #include "menuCmdID.h"
diff --git a/PowerEditor/src/lesDlgs.h b/PowerEditor/src/lesDlgs.h
index a3e52e7e..0fdd66be 100644
--- a/PowerEditor/src/lesDlgs.h
+++ b/PowerEditor/src/lesDlgs.h
@@ -29,6 +29,9 @@
 #ifndef SIZE_DLG_H
 #define SIZE_DLG_H
 
+#include "StaticDialog.h"
+#include "Common.h"
+
 const int DEFAULT_NB_NUMBER = 2;
 class ValueDlg : public StaticDialog
 {
diff --git a/PowerEditor/src/localization.cpp b/PowerEditor/src/localization.cpp
index fd41fa30..920eba3e 100644
--- a/PowerEditor/src/localization.cpp
+++ b/PowerEditor/src/localization.cpp
@@ -26,7 +26,6 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#include "precompiledHeaders.h"
 #include "Notepad_plus.h"
 #include "ShortcutMapper.h"
 #include "EncodingMapper.h"
diff --git a/PowerEditor/src/localization.h b/PowerEditor/src/localization.h
index e436909e..4d77d6db 100644
--- a/PowerEditor/src/localization.h
+++ b/PowerEditor/src/localization.h
@@ -29,9 +29,9 @@
 #ifndef LOCALIZATION_H
 #define LOCALIZATION_H
 
-#ifndef TINYXMLA_INCLUDED
+#include "Common.h"
 #include "tinyxmlA.h"
-#endif //TINYXMLA_INCLUDED
+
 
 class FindReplaceDlg;
 class PreferenceDlg;
diff --git a/PowerEditor/src/uchardet/JpCntx.cpp b/PowerEditor/src/uchardet/JpCntx.cpp
index 033bb2a7..7da04139 100644
--- a/PowerEditor/src/uchardet/JpCntx.cpp
+++ b/PowerEditor/src/uchardet/JpCntx.cpp
@@ -34,7 +34,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "precompiledHeaders.h"
+
 #include "nscore.h"
 #include "JpCntx.h"
 
diff --git a/PowerEditor/src/uchardet/LangBulgarianModel.cpp b/PowerEditor/src/uchardet/LangBulgarianModel.cpp
index 9af123d9..77686607 100644
--- a/PowerEditor/src/uchardet/LangBulgarianModel.cpp
+++ b/PowerEditor/src/uchardet/LangBulgarianModel.cpp
@@ -34,7 +34,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "precompiledHeaders.h"
+
 #include "nsSBCharSetProber.h"
 /****************************************************************
 255: Control characters that usually does not exist in any text
diff --git a/PowerEditor/src/uchardet/LangCyrillicModel.cpp b/PowerEditor/src/uchardet/LangCyrillicModel.cpp
index 6407e8f5..42f28876 100644
--- a/PowerEditor/src/uchardet/LangCyrillicModel.cpp
+++ b/PowerEditor/src/uchardet/LangCyrillicModel.cpp
@@ -34,7 +34,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "precompiledHeaders.h"
+
 #include "nsSBCharSetProber.h"
 
 
diff --git a/PowerEditor/src/uchardet/LangGreekModel.cpp b/PowerEditor/src/uchardet/LangGreekModel.cpp
index e09b1864..d90ced9d 100644
--- a/PowerEditor/src/uchardet/LangGreekModel.cpp
+++ b/PowerEditor/src/uchardet/LangGreekModel.cpp
@@ -34,7 +34,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "precompiledHeaders.h"
+
 #include "nsSBCharSetProber.h"
 /****************************************************************
 255: Control characters that usually does not exist in any text
diff --git a/PowerEditor/src/uchardet/LangHebrewModel.cpp b/PowerEditor/src/uchardet/LangHebrewModel.cpp
index f3c11852..99a36e72 100644
--- a/PowerEditor/src/uchardet/LangHebrewModel.cpp
+++ b/PowerEditor/src/uchardet/LangHebrewModel.cpp
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "precompiledHeaders.h"
+
 #include "nsSBCharSetProber.h"
 
 
diff --git a/PowerEditor/src/uchardet/LangHungarianModel.cpp b/PowerEditor/src/uchardet/LangHungarianModel.cpp
index cf3e449d..856644af 100644
--- a/PowerEditor/src/uchardet/LangHungarianModel.cpp
+++ b/PowerEditor/src/uchardet/LangHungarianModel.cpp
@@ -34,7 +34,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "precompiledHeaders.h"
+
 #include "nsSBCharSetProber.h"
 /****************************************************************
 255: Control characters that usually does not exist in any text
diff --git a/PowerEditor/src/uchardet/LangThaiModel.cpp b/PowerEditor/src/uchardet/LangThaiModel.cpp
index f849e01d..11b8e75e 100644
--- a/PowerEditor/src/uchardet/LangThaiModel.cpp
+++ b/PowerEditor/src/uchardet/LangThaiModel.cpp
@@ -34,7 +34,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "precompiledHeaders.h"
+
 #include "nsSBCharSetProber.h"
 
 
diff --git a/PowerEditor/src/uchardet/nsBig5Prober.cpp b/PowerEditor/src/uchardet/nsBig5Prober.cpp
index b2ae4f6a..7a85abb5 100644
--- a/PowerEditor/src/uchardet/nsBig5Prober.cpp
+++ b/PowerEditor/src/uchardet/nsBig5Prober.cpp
@@ -34,7 +34,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "precompiledHeaders.h"
+
 #include "nsBig5Prober.h"
 
 void  nsBig5Prober::Reset(void)
diff --git a/PowerEditor/src/uchardet/nsCharSetProber.cpp b/PowerEditor/src/uchardet/nsCharSetProber.cpp
index 6a823470..fdfe7d7a 100644
--- a/PowerEditor/src/uchardet/nsCharSetProber.cpp
+++ b/PowerEditor/src/uchardet/nsCharSetProber.cpp
@@ -35,7 +35,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "precompiledHeaders.h"
+
 #include "nsCharSetProber.h"
 #include "prmem.h"
 
diff --git a/PowerEditor/src/uchardet/nsEUCJPProber.cpp b/PowerEditor/src/uchardet/nsEUCJPProber.cpp
index 9255394d..54861b3d 100644
--- a/PowerEditor/src/uchardet/nsEUCJPProber.cpp
+++ b/PowerEditor/src/uchardet/nsEUCJPProber.cpp
@@ -39,7 +39,7 @@
 // 1, kana character (or hankaku?) often have hight frequency of appereance
 // 2, kana character often exist in group
 // 3, certain combination of kana is never used in japanese language
-#include "precompiledHeaders.h"
+
 #include "nsEUCJPProber.h"
 
 void  nsEUCJPProber::Reset(void)
diff --git a/PowerEditor/src/uchardet/nsEUCKRProber.cpp b/PowerEditor/src/uchardet/nsEUCKRProber.cpp
index ff9fea0f..3632f1f9 100644
--- a/PowerEditor/src/uchardet/nsEUCKRProber.cpp
+++ b/PowerEditor/src/uchardet/nsEUCKRProber.cpp
@@ -34,7 +34,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "precompiledHeaders.h"
+
 #include "nsEUCKRProber.h"
 
 void  nsEUCKRProber::Reset(void)
diff --git a/PowerEditor/src/uchardet/nsEUCTWProber.cpp b/PowerEditor/src/uchardet/nsEUCTWProber.cpp
index 33f4b0ee..a06e074b 100644
--- a/PowerEditor/src/uchardet/nsEUCTWProber.cpp
+++ b/PowerEditor/src/uchardet/nsEUCTWProber.cpp
@@ -34,7 +34,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "precompiledHeaders.h"
+
 #include "nsEUCTWProber.h"
 
 void  nsEUCTWProber::Reset(void)
diff --git a/PowerEditor/src/uchardet/nsEscCharsetProber.cpp b/PowerEditor/src/uchardet/nsEscCharsetProber.cpp
index 9390b5a5..464c7534 100644
--- a/PowerEditor/src/uchardet/nsEscCharsetProber.cpp
+++ b/PowerEditor/src/uchardet/nsEscCharsetProber.cpp
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "precompiledHeaders.h"
+
 #include "nsEscCharsetProber.h"
 #include "nsUniversalDetector.h"
 
diff --git a/PowerEditor/src/uchardet/nsEscSM.cpp b/PowerEditor/src/uchardet/nsEscSM.cpp
index c746609d..7b1de390 100644
--- a/PowerEditor/src/uchardet/nsEscSM.cpp
+++ b/PowerEditor/src/uchardet/nsEscSM.cpp
@@ -34,7 +34,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "precompiledHeaders.h"
+
 #include "nsCodingStateMachine.h"
 
 static const PRUint32 HZ_cls[ 256 / 8 ] = {
diff --git a/PowerEditor/src/uchardet/nsGB2312Prober.cpp b/PowerEditor/src/uchardet/nsGB2312Prober.cpp
index fb0ae6fc..b6d469ce 100644
--- a/PowerEditor/src/uchardet/nsGB2312Prober.cpp
+++ b/PowerEditor/src/uchardet/nsGB2312Prober.cpp
@@ -39,7 +39,7 @@
 // 1, kana character (or hankaku?) often have hight frequency of appereance
 // 2, kana character often exist in group
 // 3, certain combination of kana is never used in japanese language
-#include "precompiledHeaders.h"
+
 #include "nsGB2312Prober.h"
 
 void  nsGB18030Prober::Reset(void)
diff --git a/PowerEditor/src/uchardet/nsHebrewProber.cpp b/PowerEditor/src/uchardet/nsHebrewProber.cpp
index 2dd4b7cd..b148ce3f 100644
--- a/PowerEditor/src/uchardet/nsHebrewProber.cpp
+++ b/PowerEditor/src/uchardet/nsHebrewProber.cpp
@@ -35,7 +35,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "precompiledHeaders.h"
 #include "nsHebrewProber.h"
 #include <stdio.h>
 
diff --git a/PowerEditor/src/uchardet/nsLatin1Prober.cpp b/PowerEditor/src/uchardet/nsLatin1Prober.cpp
index 77a8c6a2..7694ef76 100644
--- a/PowerEditor/src/uchardet/nsLatin1Prober.cpp
+++ b/PowerEditor/src/uchardet/nsLatin1Prober.cpp
@@ -36,7 +36,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "precompiledHeaders.h"
 #include "nsLatin1Prober.h"
 #include "prmem.h"
 #include <stdio.h>
diff --git a/PowerEditor/src/uchardet/nsMBCSGroupProber.cpp b/PowerEditor/src/uchardet/nsMBCSGroupProber.cpp
index 360635ab..4fafb134 100644
--- a/PowerEditor/src/uchardet/nsMBCSGroupProber.cpp
+++ b/PowerEditor/src/uchardet/nsMBCSGroupProber.cpp
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "precompiledHeaders.h"
+
 #include <stdio.h>
 
 #include "nsMBCSGroupProber.h"
diff --git a/PowerEditor/src/uchardet/nsMBCSSM.cpp b/PowerEditor/src/uchardet/nsMBCSSM.cpp
index e4fe43ce..bedf2b76 100644
--- a/PowerEditor/src/uchardet/nsMBCSSM.cpp
+++ b/PowerEditor/src/uchardet/nsMBCSSM.cpp
@@ -34,7 +34,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "precompiledHeaders.h"
+
 #include "nsCodingStateMachine.h"
 
 /*
diff --git a/PowerEditor/src/uchardet/nsSBCSGroupProber.cpp b/PowerEditor/src/uchardet/nsSBCSGroupProber.cpp
index 1adcfef6..d8fef879 100644
--- a/PowerEditor/src/uchardet/nsSBCSGroupProber.cpp
+++ b/PowerEditor/src/uchardet/nsSBCSGroupProber.cpp
@@ -36,7 +36,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "precompiledHeaders.h"
 #include <stdio.h>
 #include "prmem.h"
 
diff --git a/PowerEditor/src/uchardet/nsSBCharSetProber.cpp b/PowerEditor/src/uchardet/nsSBCharSetProber.cpp
index 8ebfacda..3a88fdf3 100644
--- a/PowerEditor/src/uchardet/nsSBCharSetProber.cpp
+++ b/PowerEditor/src/uchardet/nsSBCharSetProber.cpp
@@ -35,7 +35,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "precompiledHeaders.h"
+
 #include <stdio.h>
 #include "nsSBCharSetProber.h"
 
diff --git a/PowerEditor/src/uchardet/nsSJISProber.cpp b/PowerEditor/src/uchardet/nsSJISProber.cpp
index 7386a9cd..0b59e399 100644
--- a/PowerEditor/src/uchardet/nsSJISProber.cpp
+++ b/PowerEditor/src/uchardet/nsSJISProber.cpp
@@ -40,7 +40,7 @@
 // 2, kana character often exist in group
 // 3, certain combination of kana is never used in japanese language
 
-#include "precompiledHeaders.h"
+
 #include "nsSJISProber.h"
 
 void  nsSJISProber::Reset(void)
diff --git a/PowerEditor/src/uchardet/nsUTF8Prober.cpp b/PowerEditor/src/uchardet/nsUTF8Prober.cpp
index 81ab5f18..ab8d9f7b 100644
--- a/PowerEditor/src/uchardet/nsUTF8Prober.cpp
+++ b/PowerEditor/src/uchardet/nsUTF8Prober.cpp
@@ -35,7 +35,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "precompiledHeaders.h"
 #include "nsUTF8Prober.h"
 
 void  nsUTF8Prober::Reset(void)
diff --git a/PowerEditor/src/uchardet/nsUniversalDetector.cpp b/PowerEditor/src/uchardet/nsUniversalDetector.cpp
index 16a26cd7..dd74243c 100644
--- a/PowerEditor/src/uchardet/nsUniversalDetector.cpp
+++ b/PowerEditor/src/uchardet/nsUniversalDetector.cpp
@@ -36,8 +36,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "precompiledHeaders.h"
-
 #include "nscore.h"
 
 #include "nsUniversalDetector.h"
diff --git a/PowerEditor/src/uchardet/uchardet.cpp b/PowerEditor/src/uchardet/uchardet.cpp
index eeba3106..35b84092 100644
--- a/PowerEditor/src/uchardet/uchardet.cpp
+++ b/PowerEditor/src/uchardet/uchardet.cpp
@@ -34,7 +34,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "precompiledHeaders.h"
+
 #include "uchardet.h"
 #include "nscore.h"
 #include "nsUniversalDetector.h"
diff --git a/PowerEditor/src/winmain.cpp b/PowerEditor/src/winmain.cpp
index 7ad85802..4b6a8752 100644
--- a/PowerEditor/src/winmain.cpp
+++ b/PowerEditor/src/winmain.cpp
@@ -25,8 +25,8 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+#define _WIN32_WINNT 0x0501
 
-#include "precompiledHeaders.h"
 #include "Notepad_plus_Window.h"
 #include "Process.h"