From ebe0b1b189728fa11d73a7e053defa1e8cb2f834 Mon Sep 17 00:00:00 2001
From: Don HO <don.h@free.fr>
Date: Sat, 16 Nov 2019 03:38:11 +0100
Subject: [PATCH] Use "#pragma once" instead of "#ifndef"

---
 PowerEditor/src/MISC/Exception/MiniDumper.h       |  4 +---
 PowerEditor/src/MISC/Exception/Win32Exception.h   |  5 +----
 PowerEditor/src/MISC/PluginsManager/IDAllocator.h |  4 +---
 .../src/MISC/PluginsManager/Notepad_plus_msgs.h   |  5 +----
 .../src/MISC/PluginsManager/PluginInterface.h     | 10 +---------
 PowerEditor/src/MISC/Process/Processus.h          |  5 +----
 PowerEditor/src/MISC/RegExt/regExtDlg.h           |  5 +----
 PowerEditor/src/MISC/RegExt/regExtDlgRc.h         |  4 +---
 PowerEditor/src/MISC/md5/md5.h                    |  5 +----
 PowerEditor/src/Notepad_plus_Window.cpp           |  6 +++---
 .../src/ScitillaComponent/FindReplaceDlg.rc       |  8 +++-----
 .../src/ScitillaComponent/FunctionCallTip.h       |  7 +------
 PowerEditor/src/ScitillaComponent/Printer.h       |  6 +-----
 .../src/ScitillaComponent/ScintillaCtrls.h        |  4 +---
 .../src/ScitillaComponent/SmartHighlighter.h      |  5 +----
 .../src/ScitillaComponent/UserDefineDialog.rc     |  5 +----
 .../ScitillaComponent/UserDefineLangReference.h   |  7 +------
 .../src/ScitillaComponent/UserDefineResource.h    |  4 +---
 PowerEditor/src/ScitillaComponent/colors.h        |  6 +-----
 .../ScitillaComponent/xmlMatchedTagsHighlighter.h |  4 +---
 PowerEditor/src/UniConversion.h                   |  4 +---
 PowerEditor/src/Utf8_16.h                         |  5 -----
 PowerEditor/src/WinControls/AboutDlg/URLCtrl.h    |  4 +---
 .../ClipboardHistory/clipboardHistoryPanel.h      | 15 ++-------------
 .../ClipboardHistory/clipboardHistoryPanel_rc.h   |  5 +----
 .../src/WinControls/DockingWnd/DockingSplitter.h  | 10 +---------
 PowerEditor/src/WinControls/DockingWnd/Gripper.h  | 11 +----------
 .../src/WinControls/DockingWnd/dockingResource.h  |  5 +----
 .../src/WinControls/FileBrowser/fileBrowser.h     |  4 ----
 .../src/WinControls/FileBrowser/fileBrowser_rc.h  |  6 +-----
 .../FindCharsInRange/FindCharsInRange.h           |  9 +--------
 .../FunctionList/functionListPanel_rc.h           |  5 +----
 PowerEditor/src/WinControls/Grid/BabyGrid.h       |  7 +------
 .../src/WinControls/Grid/ShortcutMapper_rc.h      |  5 +----
 .../WinControls/OpenSaveFileDialog/FileDialog.h   |  4 +---
 .../WinControls/ProjectPanel/ProjectPanel_rc.h    |  4 +---
 .../src/WinControls/ProjectPanel/TreeView.h       |  5 +----
 .../src/WinControls/TaskList/TaskListDlg_rc.h     |  4 +---
 PowerEditor/src/WinControls/ToolBar/ToolBar.h     |  5 +----
 .../src/WinControls/TrayIcon/trayIconControler.h  |  4 +---
 .../VerticalFileSwitcher/VerticalFileSwitcher.h   |  4 +---
 .../VerticalFileSwitcherListView.h                |  6 +-----
 .../VerticalFileSwitcher_rc.h                     |  4 +---
 .../src/WinControls/WindowsDlg/SizeableDlg.h      | 10 +---------
 PowerEditor/src/WinControls/WindowsDlg/WinMgr.h   |  7 +------
 .../src/WinControls/WindowsDlg/WindowsDlgRc.h     |  4 +---
 .../src/WinControls/shortcut/RunMacroDlg.rc       |  5 ++---
 .../src/WinControls/shortcut/RunMacroDlg_rc.h     |  4 +---
 PowerEditor/src/lesDlgs.h                         |  4 +---
 PowerEditor/src/localization.h                    |  4 +---
 PowerEditor/src/menuCmdID.h                       |  5 +----
 51 files changed, 55 insertions(+), 232 deletions(-)

diff --git a/PowerEditor/src/MISC/Exception/MiniDumper.h b/PowerEditor/src/MISC/Exception/MiniDumper.h
index 37ae5f390..1f97f1944 100644
--- a/PowerEditor/src/MISC/Exception/MiniDumper.h
+++ b/PowerEditor/src/MISC/Exception/MiniDumper.h
@@ -29,8 +29,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef MDUMP_H
-#define MDUMP_H
+#pragma once
 
 #include <windows.h>
 #include <dbghelp.h>
@@ -49,4 +48,3 @@ public:
 	bool writeDump(EXCEPTION_POINTERS * pExceptionInfo);
 };
 
-#endif //MDUMP_H
diff --git a/PowerEditor/src/MISC/Exception/Win32Exception.h b/PowerEditor/src/MISC/Exception/Win32Exception.h
index 0efa0ee02..09e5fc45b 100644
--- a/PowerEditor/src/MISC/Exception/Win32Exception.h
+++ b/PowerEditor/src/MISC/Exception/Win32Exception.h
@@ -31,8 +31,7 @@
 // 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
+#pragma once
 
 #include <exception>
 #include <windows.h>
@@ -75,5 +74,3 @@ private:
 
     friend void Win32Exception::translate(unsigned code, EXCEPTION_POINTERS* info);
 };
-
-#endif // WIN32_EXCEPTION_H
diff --git a/PowerEditor/src/MISC/PluginsManager/IDAllocator.h b/PowerEditor/src/MISC/PluginsManager/IDAllocator.h
index 9a0500523..42d26c010 100644
--- a/PowerEditor/src/MISC/PluginsManager/IDAllocator.h
+++ b/PowerEditor/src/MISC/PluginsManager/IDAllocator.h
@@ -28,8 +28,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef IDALLOCATOR_H
-#define IDALLOCATOR_H
+#pragma once
 
 class IDAllocator
 {
@@ -47,4 +46,3 @@ private:
 	int _maximumID;
 };
 
-#endif
diff --git a/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h b/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
index 17ae057d7..ba548b709 100644
--- a/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
+++ b/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef NOTEPAD_PLUS_MSGS_H
-#define NOTEPAD_PLUS_MSGS_H
+#pragma once
 
 #include <windows.h>
 #include <tchar.h>
@@ -611,5 +610,3 @@ enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64 };
 	//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/PluginInterface.h b/PowerEditor/src/MISC/PluginsManager/PluginInterface.h
index 4ec81f374..24f6b65d3 100644
--- a/PowerEditor/src/MISC/PluginsManager/PluginInterface.h
+++ b/PowerEditor/src/MISC/PluginsManager/PluginInterface.h
@@ -26,16 +26,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef PLUGININTERFACE_H
-#define PLUGININTERFACE_H
+#pragma once
 
-#ifndef SCINTILLA_H
 #include "Scintilla.h"
-#endif //SCINTILLA_H
-
-#ifndef NOTEPAD_PLUS_MSGS_H
 #include "Notepad_plus_msgs.h"
-#endif //NOTEPAD_PLUS_MSGS_H
 
 const int nbChar = 64;
 
@@ -83,5 +77,3 @@ extern "C" __declspec(dllexport) LRESULT messageProc(UINT Message, WPARAM wParam
 // This API return always true now, since Notepad++ isn't compiled in ANSI mode anymore
 extern "C" __declspec(dllexport) BOOL isUnicode();
 
-
-#endif //PLUGININTERFACE_H
diff --git a/PowerEditor/src/MISC/Process/Processus.h b/PowerEditor/src/MISC/Process/Processus.h
index 4a4911709..b11a7ec14 100644
--- a/PowerEditor/src/MISC/Process/Processus.h
+++ b/PowerEditor/src/MISC/Process/Processus.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef PROCESSUS_H
-#define PROCESSUS_H
+#pragma once
 
 #include "Common.h"
 
@@ -48,5 +47,3 @@ protected:
 	generic_string _curDir;
 };
 
-#endif //PROCESSUS_H
-
diff --git a/PowerEditor/src/MISC/RegExt/regExtDlg.h b/PowerEditor/src/MISC/RegExt/regExtDlg.h
index 9fa71af57..7c33f3557 100644
--- a/PowerEditor/src/MISC/RegExt/regExtDlg.h
+++ b/PowerEditor/src/MISC/RegExt/regExtDlg.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef REG_EXT_DLG_H
-#define REG_EXT_DLG_H
+#pragma once
 
 #include "regExtDlgRc.h"
 #include "StaticDialog.h"
@@ -65,5 +64,3 @@ private :
 		return (result == ERROR_SUCCESS)?nbSubValue:0;
 	}
 };
-
-#endif //REG_EXT_DLG_H
diff --git a/PowerEditor/src/MISC/RegExt/regExtDlgRc.h b/PowerEditor/src/MISC/RegExt/regExtDlgRc.h
index 21ebf67e7..3f16d0bd8 100644
--- a/PowerEditor/src/MISC/RegExt/regExtDlgRc.h
+++ b/PowerEditor/src/MISC/RegExt/regExtDlgRc.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef REGEXTDLGRC_H
-#define REGEXTDLGRC_H
+#pragma once
 
 #define	IDD_REGEXT_BOX 4000
 
@@ -42,4 +41,3 @@
 	#define IDC_SUPPORTEDEXTS_STATIC         (IDD_REGEXT_BOX + 9)
 	#define IDC_REGISTEREDEXTS_STATIC        (IDD_REGEXT_BOX + 10)
 
-#endif //REGEXTDLGRC_H
diff --git a/PowerEditor/src/MISC/md5/md5.h b/PowerEditor/src/MISC/md5/md5.h
index 769e442f4..7843e1d38 100644
--- a/PowerEditor/src/MISC/md5/md5.h
+++ b/PowerEditor/src/MISC/md5/md5.h
@@ -1,5 +1,4 @@
-#ifndef MD5_H
-#define MD5_H
+#pragma once
 
 // Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
 // rights reserved.
@@ -388,5 +387,3 @@ public:
     return digestChars ;
   }
 } ;
-
-#endif
\ No newline at end of file
diff --git a/PowerEditor/src/Notepad_plus_Window.cpp b/PowerEditor/src/Notepad_plus_Window.cpp
index 29dee0e4f..c5b2b6cbb 100644
--- a/PowerEditor/src/Notepad_plus_Window.cpp
+++ b/PowerEditor/src/Notepad_plus_Window.cpp
@@ -201,7 +201,7 @@ void Notepad_plus_Window::init(HINSTANCE hInst, HWND parent, const TCHAR *cmdLin
 
 	_notepad_plus_plus_core.getMatchedFileNames(localizationDir.c_str(), patterns, fileNames, false, false);
 	for (size_t i = 0, len = fileNames.size(); i < len; ++i)
-		localizationSwitcher.addLanguageFromXml(fileNames[i].c_str());
+		localizationSwitcher.addLanguageFromXml(fileNames[i]);
 
 	fileNames.clear();
 	ThemeSwitcher & themeSwitcher = nppParams.getThemeSwitcher();
@@ -217,7 +217,7 @@ void Notepad_plus_Window::init(HINSTANCE hInst, HWND parent, const TCHAR *cmdLin
 	    _notepad_plus_plus_core.getMatchedFileNames(themeDir.c_str(), patterns, fileNames, false, false);
 	    for (size_t i = 0, len = fileNames.size() ; i < len ; ++i)
 	    {
-		    themeSwitcher.addThemeFromXml(fileNames[i].c_str());
+		    themeSwitcher.addThemeFromXml(fileNames[i]);
 	    }
     }
 
@@ -231,7 +231,7 @@ void Notepad_plus_Window::init(HINSTANCE hInst, HWND parent, const TCHAR *cmdLin
 		generic_string themeName( themeSwitcher.getThemeFromXmlFileName(fileNames[i].c_str()) );
 		if (! themeSwitcher.themeNameExists(themeName.c_str()) )
 		{
-			themeSwitcher.addThemeFromXml(fileNames[i].c_str());
+			themeSwitcher.addThemeFromXml(fileNames[i]);
 		}
 	}
 
diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc
index 91830504e..4c080e1f7 100644
--- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc
+++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc
@@ -26,8 +26,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef FIND_REPLACE_DLG_RC
-#define FIND_REPLACE_DLG_RC
+#pragma once
+
 #include <windows.h>
 #include "FindReplaceDlg_rc.h"
 
@@ -132,6 +132,4 @@ BEGIN
 	CONTROL         "&. matches newline",IDREDOTMATCHNL_FIFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,167,68,9
     PUSHBUTTON      "Find All",IDOK,268,20,90,14,WS_GROUP
 	PUSHBUTTON      "Close",IDCANCEL,268,38,90,14
-END
-
-#endif //FIND_REPLACE_DLG_RC
+END
\ No newline at end of file
diff --git a/PowerEditor/src/ScitillaComponent/FunctionCallTip.h b/PowerEditor/src/ScitillaComponent/FunctionCallTip.h
index 3e7678419..e2f5cfc2c 100644
--- a/PowerEditor/src/ScitillaComponent/FunctionCallTip.h
+++ b/PowerEditor/src/ScitillaComponent/FunctionCallTip.h
@@ -25,12 +25,9 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-#ifndef FUNCTIONCALLTIP_H
-#define FUNCTIONCALLTIP_H
+#pragma once
 
-#ifndef SCINTILLA_EDIT_VIEW_H
 #include "ScintillaEditView.h"
-#endif //SCINTILLA_EDIT_VIEW_H
 
 typedef std::vector<const TCHAR *> stringVec;
 
@@ -88,5 +85,3 @@ private:
         return false;
     };
 };
-
-#endif// FUNCTIONCALLTIP_H
diff --git a/PowerEditor/src/ScitillaComponent/Printer.h b/PowerEditor/src/ScitillaComponent/Printer.h
index e1b3130e7..7db826893 100644
--- a/PowerEditor/src/ScitillaComponent/Printer.h
+++ b/PowerEditor/src/ScitillaComponent/Printer.h
@@ -26,12 +26,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef PRINTER_H
-#define PRINTER_H
+#pragma once
 
-#ifndef SCINTILLA_EDIT_VIEW_H
 #include "ScintillaEditView.h"
-#endif //SCINTILLA_EDIT_VIEW_H
 
 
 struct NPP_RangeToFormat {
@@ -65,4 +62,3 @@ private :
 	bool _isRTL = false;
 };
 
-#endif //PRINTER_H
diff --git a/PowerEditor/src/ScitillaComponent/ScintillaCtrls.h b/PowerEditor/src/ScitillaComponent/ScintillaCtrls.h
index b4e832b51..c7839b2c0 100644
--- a/PowerEditor/src/ScitillaComponent/ScintillaCtrls.h
+++ b/PowerEditor/src/ScitillaComponent/ScintillaCtrls.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef SCINTILLACTRLS_H
-#define SCINTILLACTRLS_H
+#pragma once
 
 #include <vector>
 #include <windows.h>
@@ -53,4 +52,3 @@ private:
 	int getIndexFrom(HWND handle2Find);
 };
 
-#endif //SCINTILLACTRLS_H
diff --git a/PowerEditor/src/ScitillaComponent/SmartHighlighter.h b/PowerEditor/src/ScitillaComponent/SmartHighlighter.h
index 0562c3525..63bc37fee 100644
--- a/PowerEditor/src/ScitillaComponent/SmartHighlighter.h
+++ b/PowerEditor/src/ScitillaComponent/SmartHighlighter.h
@@ -25,8 +25,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-#ifndef SMARTHIGHLIGHTER_H
-#define SMARTHIGHLIGHTER_H
+#pragma once
 
 #include "Common.h"
 
@@ -42,5 +41,3 @@ public:
 private:
 	FindReplaceDlg * _pFRDlg;
 };
-
-#endif //SMARTHIGHLIGHTER_H
\ No newline at end of file
diff --git a/PowerEditor/src/ScitillaComponent/UserDefineDialog.rc b/PowerEditor/src/ScitillaComponent/UserDefineDialog.rc
index 8a5dcb98c..8db0765ad 100644
--- a/PowerEditor/src/ScitillaComponent/UserDefineDialog.rc
+++ b/PowerEditor/src/ScitillaComponent/UserDefineDialog.rc
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef USERDEFINEDIALOG_RC
-#define USERDEFINEDIALOG_RC
+#pragma once
 
 #include <windows.h>
 #include "UserDefineResource.h"
@@ -304,5 +303,3 @@ BEGIN
     CONTROL         "Operators 2",IDC_STYLER_CHECK_NESTING_OPERATORS2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,209,183,76,13
     CONTROL         "Numbers",IDC_STYLER_CHECK_NESTING_NUMBERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,209,200,76,13
 END
-
-#endif //USERDEFINEDIALOG_RC
diff --git a/PowerEditor/src/ScitillaComponent/UserDefineLangReference.h b/PowerEditor/src/ScitillaComponent/UserDefineLangReference.h
index b36a6156a..ab95e1bb7 100644
--- a/PowerEditor/src/ScitillaComponent/UserDefineLangReference.h
+++ b/PowerEditor/src/ScitillaComponent/UserDefineLangReference.h
@@ -26,15 +26,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef USER_DEFINE_LANG_REFERENCE_H
-#define USER_DEFINE_LANG_REFERENCE_H
+#pragma once
 
 #include "SciLexer.h"
 
 const int langNameLenMax = 64;
 const int extsLenMax = 256;
 const int max_char = 1024*30;
-
-#endif //USER_DEFINE_LANG_REFERENCE_H
-
-
diff --git a/PowerEditor/src/ScitillaComponent/UserDefineResource.h b/PowerEditor/src/ScitillaComponent/UserDefineResource.h
index 2f942ed98..c0d9a297a 100644
--- a/PowerEditor/src/ScitillaComponent/UserDefineResource.h
+++ b/PowerEditor/src/ScitillaComponent/UserDefineResource.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef USERDEFINE_RC_H
-#define USERDEFINE_RC_H
+#pragma once
 
 #define    IDD_GLOBAL_USERDEFINE_DLG 20000
     #define    IDC_DOCK_BUTTON                              (IDD_GLOBAL_USERDEFINE_DLG + 1 )
@@ -310,4 +309,3 @@
     #define    IDC_STRING_STATIC                            (IDD_STRING_DLG + 1)
     #define    IDC_STRING_EDIT                              (IDD_STRING_DLG + 2)
 
-#endif //USERDEFIN_RC_H
diff --git a/PowerEditor/src/ScitillaComponent/colors.h b/PowerEditor/src/ScitillaComponent/colors.h
index 03b7162bc..828e898c5 100644
--- a/PowerEditor/src/ScitillaComponent/colors.h
+++ b/PowerEditor/src/ScitillaComponent/colors.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef COLORS_H
-#define COLORS_H
+#pragma once
 
 const COLORREF red			            = RGB(0xFF,    0,    0);
 const COLORREF darkRed                  = RGB(0x80,    0,    0);
@@ -64,6 +63,3 @@ const COLORREF extremeLitePurple        = RGB(0xF8, 0xE8, 0xFF);
 const COLORREF veryLitePurple           = RGB(0xE7, 0xD8, 0xE9);
 const COLORREF liteBerge				= RGB(0xFE, 0xFC, 0xF5);
 const COLORREF berge					= RGB(0xFD, 0xF8, 0xE3);
-
-#endif //COLORS_H
-
diff --git a/PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.h b/PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.h
index 91f1c4822..b563c6800 100644
--- a/PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.h
+++ b/PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef XMLMATCHEDTAGSHIGHLIGHTER_H
-#define XMLMATCHEDTAGSHIGHLIGHTER_H
+#pragma once
 
 #include <string>
 #include <vector>
@@ -72,5 +71,4 @@ private:
 	
 };
 
-#endif //XMLMATCHEDTAGSHIGHLIGHTER_H
 
diff --git a/PowerEditor/src/UniConversion.h b/PowerEditor/src/UniConversion.h
index 3a0b3393e..86224fb6d 100644
--- a/PowerEditor/src/UniConversion.h
+++ b/PowerEditor/src/UniConversion.h
@@ -5,8 +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.
 
-#ifndef UNICONVERSION_H
-#define UNICONVERSION_H
+#pragma once
 
 unsigned int UTF8Length(const wchar_t * uptr, unsigned int tlen);
 void UTF8FromUCS2(const wchar_t * uptr, unsigned int tlen, char * putf, unsigned int len);
@@ -15,4 +14,3 @@ unsigned int UCS2FromUTF8(const char * s, unsigned int len, wchar_t * tbuf, unsi
 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.h b/PowerEditor/src/Utf8_16.h
index 679573455..eebe0585e 100644
--- a/PowerEditor/src/Utf8_16.h
+++ b/PowerEditor/src/Utf8_16.h
@@ -19,13 +19,9 @@
 // - Add convert function in Utf8_16_Write
 ////////////////////////////////////////////////////////////////////////////////
 
-#ifndef UTF8_16_H
-
 #pragma once
 
-#ifndef PARAMETERS_H
 #include "Parameters.h"
-#endif// PARAMETERS_H
 
 #ifdef _MSC_VER
 #pragma warning(disable: 4514) // nreferenced inline function has been removed
@@ -161,4 +157,3 @@ protected:
 	bool m_bFirstWrite;
 };
 
-#endif// UTF8_16_H
diff --git a/PowerEditor/src/WinControls/AboutDlg/URLCtrl.h b/PowerEditor/src/WinControls/AboutDlg/URLCtrl.h
index 059c76c94..c7ccb78f4 100644
--- a/PowerEditor/src/WinControls/AboutDlg/URLCtrl.h
+++ b/PowerEditor/src/WinControls/AboutDlg/URLCtrl.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef URLCTRL_INCLUDED
-#define URLCTRL_INCLUDED
+#pragma once
 
 #include "Window.h"
 #include "Common.h"
@@ -61,4 +60,3 @@ protected :
     LRESULT runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam);
 };
 
-#endif //URLCTRL_INCLUDED
diff --git a/PowerEditor/src/WinControls/ClipboardHistory/clipboardHistoryPanel.h b/PowerEditor/src/WinControls/ClipboardHistory/clipboardHistoryPanel.h
index ac9d85c85..22a910b90 100644
--- a/PowerEditor/src/WinControls/ClipboardHistory/clipboardHistoryPanel.h
+++ b/PowerEditor/src/WinControls/ClipboardHistory/clipboardHistoryPanel.h
@@ -26,14 +26,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef CLIPBOARDHISTORYPANEL_H
-#define CLIPBOARDHISTORYPANEL_H
+#pragma once
 
-//#include <windows.h>
-#ifndef DOCKINGDLGINTERFACE_H
 #include "DockingDlgInterface.h"
-#endif //DOCKINGDLGINTERFACE_H
-
 #include "clipboardHistoryPanel_rc.h"
 #include <vector>
 
@@ -73,17 +68,11 @@ public:
 		DockingDlgInterface::init(hInst, hPere);
 		_ppEditView = ppEditView;
 	};
-/*
-    virtual void display(bool toShow = true) const {
-        DockingDlgInterface::display(toShow);
-    };
-*/
 
     void setParent(HWND parent2set){
         _hParent = parent2set;
     };
 
-	//void switchEncoding();
 	ClipboardData getClipboadData();
 	void addToClipboadHistory(ClipboardData cbd);
 	int getClipboardDataIndex(ClipboardData cbd);
@@ -108,4 +97,4 @@ private:
 	int _lbFgColor;
 
 };
-#endif // CLIPBOARDHISTORYPANEL_H
+
diff --git a/PowerEditor/src/WinControls/ClipboardHistory/clipboardHistoryPanel_rc.h b/PowerEditor/src/WinControls/ClipboardHistory/clipboardHistoryPanel_rc.h
index 94c554659..384659e4a 100644
--- a/PowerEditor/src/WinControls/ClipboardHistory/clipboardHistoryPanel_rc.h
+++ b/PowerEditor/src/WinControls/ClipboardHistory/clipboardHistoryPanel_rc.h
@@ -26,11 +26,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef IDD_CLIPBOARDHISTORYPANEL_RC_H
-#define IDD_CLIPBOARDHISTORYPANEL_RC_H
+#pragma once
 
 #define	IDD_CLIPBOARDHISTORY_PANEL		2800
 #define	IDC_LIST_CLIPBOARD    (IDD_CLIPBOARDHISTORY_PANEL + 1)
 
-#endif //IDD_CLIPBOARDHISTORYPANEL_RC_H
-
diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.h b/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.h
index 00ac5a8cb..feb43ce34 100644
--- a/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.h
+++ b/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.h
@@ -26,18 +26,11 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef DOCKINGSPLITTER_H
-#define DOCKINGSPLITTER_H
+#pragma once
 
 #include "Window.h"
-
-#ifndef DOCKING_H
 #include "Docking.h"
-#endif //DOCKING_H
-
-#ifndef DOCKING_RESOURCE_H
 #include "dockingResource.h"
-#endif //DOCKING_RESOURCE_H
 
 #define	DMS_VERTICAL		0x00000001
 #define	DMS_HORIZONTAL		0x00000002
@@ -69,4 +62,3 @@ private:
 	static BOOL _isHoriReg;
 };
 
-#endif // DOCKINGSPLITTER_H
diff --git a/PowerEditor/src/WinControls/DockingWnd/Gripper.h b/PowerEditor/src/WinControls/DockingWnd/Gripper.h
index c154821be..df03d3934 100644
--- a/PowerEditor/src/WinControls/DockingWnd/Gripper.h
+++ b/PowerEditor/src/WinControls/DockingWnd/Gripper.h
@@ -26,27 +26,19 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef GRIPPER_H
-#define GRIPPER_H
+#pragma once
 
 #include <windows.h>
 #include <commctrl.h>
 #include "Common.h"
-
-#ifndef DOCKING_H
 #include "Docking.h"
-#endif //DOCKING_H
-
-#ifndef DOCKING_RESOURCE_H
 #include "dockingResource.h"
-#endif //DOCKING_RESOURCE_H
 
 class DockingCont;
 class DockingManager;
 
 // For the following #define see the comments at drawRectangle() definition. (jg)
 #define USE_LOCKWINDOWUPDATE
-//#undef USE_LOCKWINDOWUPDATE
 
 
 // Used by getRectAndStyle() to draw the drag rectangle
@@ -163,4 +155,3 @@ private:
 	static BOOL _isRegistered;
 };
 
-#endif // GRIPPER_H
diff --git a/PowerEditor/src/WinControls/DockingWnd/dockingResource.h b/PowerEditor/src/WinControls/DockingWnd/dockingResource.h
index 8b83f912c..201418fdc 100644
--- a/PowerEditor/src/WinControls/DockingWnd/dockingResource.h
+++ b/PowerEditor/src/WinControls/DockingWnd/dockingResource.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef DOCKING_RESOURCE_H
-#define DOCKING_RESOURCE_H
+#pragma once
 
 #define DM_NOFOCUSWHILECLICKINGCAPTION TEXT("NOFOCUSWHILECLICKINGCAPTION")
 
@@ -77,5 +76,3 @@
 	//nmhdr.hwndFrom = DockingCont::_hself;
 	//nmhdr.idFrom = 0;
 
-#endif //DOCKING_RESOURCE_H
-
diff --git a/PowerEditor/src/WinControls/FileBrowser/fileBrowser.h b/PowerEditor/src/WinControls/FileBrowser/fileBrowser.h
index 5daeeceb2..3a38b59f5 100644
--- a/PowerEditor/src/WinControls/FileBrowser/fileBrowser.h
+++ b/PowerEditor/src/WinControls/FileBrowser/fileBrowser.h
@@ -28,11 +28,7 @@
 
 #pragma once
 
-//#include <windows.h>
-#ifndef DOCKINGDLGINTERFACE_H
 #include "DockingDlgInterface.h"
-#endif //DOCKINGDLGINTERFACE_H
-
 #include "TreeView.h"
 #include "fileBrowser_rc.h"
 
diff --git a/PowerEditor/src/WinControls/FileBrowser/fileBrowser_rc.h b/PowerEditor/src/WinControls/FileBrowser/fileBrowser_rc.h
index 1b3599e21..7255f7042 100644
--- a/PowerEditor/src/WinControls/FileBrowser/fileBrowser_rc.h
+++ b/PowerEditor/src/WinControls/FileBrowser/fileBrowser_rc.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef FILEBROWSER_RC_H
-#define FILEBROWSER_RC_H
+#pragma once
 
 #define	IDD_FILEBROWSER		3500
 
@@ -48,6 +47,3 @@
 #define	IDD_FILEBROWSER_CTRL		(IDD_FILEBROWSER + 30)
   #define	ID_FILEBROWSERTREEVIEW    (IDD_FILEBROWSER_CTRL + 1)
   
-
-#endif // FILEBROWSER_RC_H
-
diff --git a/PowerEditor/src/WinControls/FindCharsInRange/FindCharsInRange.h b/PowerEditor/src/WinControls/FindCharsInRange/FindCharsInRange.h
index dd5cf2cc9..9501d9734 100644
--- a/PowerEditor/src/WinControls/FindCharsInRange/FindCharsInRange.h
+++ b/PowerEditor/src/WinControls/FindCharsInRange/FindCharsInRange.h
@@ -26,16 +26,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef FINDCHARSINRANGE_DLG_H
-#define FINDCHARSINRANGE_DLG_H
+#pragma once
 
-#ifndef FINDCHARSINRANGE_RC_H
 #include "findCharsInRange_rc.h"
-#endif //FINDCHARSINRANGE_RC_H
-
-#ifndef SCINTILLA_EDIT_VIEW_H
 #include "ScintillaEditView.h"
-#endif //SCINTILLA_EDIT_VIEW_H
 
 class FindCharsInRangeDlg : public StaticDialog
 {
@@ -73,4 +67,3 @@ private :
 	void getDirectionFromUI(bool & whichDirection, bool & isWrap);
 };
 
-#endif //FINDCHARSINRANGE_DLG_H
diff --git a/PowerEditor/src/WinControls/FunctionList/functionListPanel_rc.h b/PowerEditor/src/WinControls/FunctionList/functionListPanel_rc.h
index a32106da3..1dd1d5cf0 100644
--- a/PowerEditor/src/WinControls/FunctionList/functionListPanel_rc.h
+++ b/PowerEditor/src/WinControls/FunctionList/functionListPanel_rc.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef IDD_FUNCLISTPANEL_RC_H
-#define IDD_FUNCLISTPANEL_RC_H
+#pragma once
 
 #define	IDD_FUNCLIST_PANEL		3400
 #define	IDC_LIST_FUNCLIST                (IDD_FUNCLIST_PANEL + 1)
@@ -36,5 +35,3 @@
 #define	IDC_RELOADBUTTON_FUNCLIST        (IDD_FUNCLIST_PANEL + 4)
 #define	IDC_SORTBUTTON_FUNCLIST          (IDD_FUNCLIST_PANEL + 5)
 
-#endif //IDD_FUNCLISTPANEL_RC_H
-
diff --git a/PowerEditor/src/WinControls/Grid/BabyGrid.h b/PowerEditor/src/WinControls/Grid/BabyGrid.h
index 267328b44..e76ae0448 100644
--- a/PowerEditor/src/WinControls/Grid/BabyGrid.h
+++ b/PowerEditor/src/WinControls/Grid/BabyGrid.h
@@ -5,13 +5,10 @@
 //Printed BABYGRID message reference and tutorial available.
 //email: mudcat@mis.net for more information.
 
-#ifndef BABYGRID_H
+#pragma once
 
 #include <windows.h>
-
-#ifndef RESOURCE_H
 #include "resource.h"
-#endif// RESOURCE_H
 
 #ifndef WM_MOUSEWHEEL
 #define WM_MOUSEWHEEL 0x020A
@@ -110,5 +107,3 @@ ATOM RegisterGridClass(HINSTANCE);
 LRESULT CALLBACK GridProc(HWND, UINT, WPARAM, LPARAM);
 void SetCell(_BGCELL *cell,int row, int col);
 
-
-#endif// BABYGRID_H
diff --git a/PowerEditor/src/WinControls/Grid/ShortcutMapper_rc.h b/PowerEditor/src/WinControls/Grid/ShortcutMapper_rc.h
index 0637dbc1a..7437bd053 100644
--- a/PowerEditor/src/WinControls/Grid/ShortcutMapper_rc.h
+++ b/PowerEditor/src/WinControls/Grid/ShortcutMapper_rc.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef SHORTCUTMAPPER_RC_H
-#define SHORTCUTMAPPER_RC_H
+#pragma once
 
 #define	IDD_SHORTCUTMAPPER_DLG      2600
 #define	IDD_BABYGRID_ID1      (IDD_SHORTCUTMAPPER_DLG + 1)
@@ -38,5 +37,3 @@
 #define	IDM_BABYGRID_CLEAR    (IDD_SHORTCUTMAPPER_DLG + 6)
 #define	IDC_BABYGRID_STATIC   (IDD_SHORTCUTMAPPER_DLG + 7)
 #define	IDC_BABYGRID_FILTER   (IDD_SHORTCUTMAPPER_DLG + 8)
-
-#endif// SHORTCUTMAPPER_RC_H
diff --git a/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.h b/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.h
index fe2234509..5f658e486 100644
--- a/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.h
+++ b/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef FILE_DIALOG_H
-#define FILE_DIALOG_H
+#pragma once
 
 #include "Common.h"
 #include "Notepad_plus_msgs.h"
@@ -78,4 +77,3 @@ private:
     static FileDialog *staticThis;
 };
 
-#endif //FILE_DIALOG_H
diff --git a/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel_rc.h b/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel_rc.h
index aa22474c8..e2d2ac3f9 100644
--- a/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel_rc.h
+++ b/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel_rc.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef PROJECTPANEL_RC_H
-#define PROJECTPANEL_RC_H
+#pragma once
 
 #define	IDD_PROJECTPANEL		3100
 
@@ -60,5 +59,4 @@
 #define	IDD_FILERELOCALIZER_DIALOG  3200
   #define	IDC_EDIT_FILEFULLPATHNAME  (IDD_FILERELOCALIZER_DIALOG + 1)
   
-#endif // PROJECTPANEL_RC_H
 
diff --git a/PowerEditor/src/WinControls/ProjectPanel/TreeView.h b/PowerEditor/src/WinControls/ProjectPanel/TreeView.h
index a08ae212c..6adb7b405 100644
--- a/PowerEditor/src/WinControls/ProjectPanel/TreeView.h
+++ b/PowerEditor/src/WinControls/ProjectPanel/TreeView.h
@@ -25,8 +25,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-#ifndef TREE_VIEW_H
-#define TREE_VIEW_H
+#pragma once
 
 #include <windows.h>
 #include <commctrl.h>
@@ -142,5 +141,3 @@ protected:
 	bool canDropIn(HTREEITEM targetItem);
 };
 
-
-#endif // TREE_VIEW_H
diff --git a/PowerEditor/src/WinControls/TaskList/TaskListDlg_rc.h b/PowerEditor/src/WinControls/TaskList/TaskListDlg_rc.h
index 88a0a7fb2..23ff95b71 100644
--- a/PowerEditor/src/WinControls/TaskList/TaskListDlg_rc.h
+++ b/PowerEditor/src/WinControls/TaskList/TaskListDlg_rc.h
@@ -26,10 +26,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef TASKLISTDLGRC_H
-#define TASKLISTDLGRC_H
+#pragma once
 
 #define	IDD_TASKLIST_DLG    2450
 	#define	ID_PICKEDUP     (IDD_TASKLIST_DLG + 1)
 
-#endif // TASKLISTDLGRC_H
diff --git a/PowerEditor/src/WinControls/ToolBar/ToolBar.h b/PowerEditor/src/WinControls/ToolBar/ToolBar.h
index 20a334915..5eee0030f 100644
--- a/PowerEditor/src/WinControls/ToolBar/ToolBar.h
+++ b/PowerEditor/src/WinControls/ToolBar/ToolBar.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef TOOL_BAR_H
-#define TOOL_BAR_H
+#pragma once
 
 #include "Common.h"
 #include "Window.h"
@@ -174,5 +173,3 @@ private:
 	void releaseID(int id);
 	bool isIDTaken(int id);
 };
-
-#endif // TOOL_BAR_H
diff --git a/PowerEditor/src/WinControls/TrayIcon/trayIconControler.h b/PowerEditor/src/WinControls/TrayIcon/trayIconControler.h
index c38c3fe10..cdfe1e77c 100644
--- a/PowerEditor/src/WinControls/TrayIcon/trayIconControler.h
+++ b/PowerEditor/src/WinControls/TrayIcon/trayIconControler.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef TRAY_ICON_CONTROLER_H
-#define TRAY_ICON_CONTROLER_H
+#pragma once
 
 #include <windows.h>
 
@@ -50,4 +49,3 @@ private:
   bool              _isIconShowed;
 };
 
-#endif //TRAY_ICON_CONTROLER_H
diff --git a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.h b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.h
index a24af0279..06da930f7 100644
--- a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.h
+++ b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef VERTICALFILESWITCHER_H
-#define  VERTICALFILESWITCHER_H
+#pragma once
 
 #include "DockingDlgInterface.h"
 #include "VerticalFileSwitcher_rc.h"
@@ -120,4 +119,3 @@ private:
 	VerticalFileSwitcherListView _fileListView;
 	HIMAGELIST _hImaLst = nullptr;
 };
-#endif // VERTICALFILESWITCHER_H
diff --git a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.h b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.h
index 26d5e7b70..1bca314e8 100644
--- a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.h
+++ b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef VERTICALFILESWITCHERLISTVIEW_H
-#define VERTICALFILESWITCHERLISTVIEW_H
+#pragma once
 
 #include "Window.h"
 #include "TaskListDlg.h"
@@ -103,6 +102,3 @@ protected:
 	void remove(int index);
 	void removeAll();
 };
-
-
-#endif // VERTICALFILESWITCHERLISTVIEW_H
diff --git a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher_rc.h b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher_rc.h
index 1f1e64523..043ef480c 100644
--- a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher_rc.h
+++ b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher_rc.h
@@ -26,11 +26,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef VERTICALFILESWITCHER_RC_H
-#define VERTICALFILESWITCHER_RC_H
+#pragma once
 
 #define	IDD_FILESWITCHER_PANEL		3000
 #define	IDC_LIST_FILESWITCHER    (IDD_FILESWITCHER_PANEL + 1)
 
-#endif // VERTICALFILESWITCHER_RC_H
 
diff --git a/PowerEditor/src/WinControls/WindowsDlg/SizeableDlg.h b/PowerEditor/src/WinControls/WindowsDlg/SizeableDlg.h
index 5bf0922d1..9174e7f08 100644
--- a/PowerEditor/src/WinControls/WindowsDlg/SizeableDlg.h
+++ b/PowerEditor/src/WinControls/WindowsDlg/SizeableDlg.h
@@ -26,17 +26,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef SIZABLE_DLG_H
-#define SIZABLE_DLG_H
+#pragma once
 
-#ifndef WINDOWS_DLG_RC_H
 #include "WindowsDlgRc.h"
-#endif //WINDOWS_DLG_RC_H
-
-#ifndef WINMGR_H
 #include "WinMgr.h"
-#endif //WINMGR_H
-
 #include "StaticDialog.h"
 
 class SizeableDlg : public StaticDialog {
@@ -54,4 +47,3 @@ protected:
 	virtual LRESULT onWinMgr(WPARAM wp, LPARAM lp);
 };
 
-#endif //SIZABLE_DLG_H
diff --git a/PowerEditor/src/WinControls/WindowsDlg/WinMgr.h b/PowerEditor/src/WinControls/WindowsDlg/WinMgr.h
index 6cf6c91ee..211375a63 100644
--- a/PowerEditor/src/WinControls/WindowsDlg/WinMgr.h
+++ b/PowerEditor/src/WinControls/WindowsDlg/WinMgr.h
@@ -9,8 +9,7 @@
 //
 // Theo - Heavily modified to remove MFC dependencies
 //        Replaced CWnd*/HWND, CRect/RECT, CSize/SIZE, CPoint/POINT
-#ifndef WINMGR_H
-#define WINMGR_H
+
 
 #pragma once
 
@@ -274,7 +273,6 @@ public:
 	// set TOFIT size for all windows from current window sizes
 	void InitToFitSizeFromCurrent(HWND hWnd);
 
-	// Theo - Removed Tracing
 
 protected:
 	WINRECT*	m_map = nullptr;			// THE window map
@@ -292,6 +290,3 @@ protected:
 private:
 	CWinMgr() { assert(FALSE); } // no default constructor
 };
-
-// Theo - Removed CSizerBar and CSizeableDlg
-#endif
\ No newline at end of file
diff --git a/PowerEditor/src/WinControls/WindowsDlg/WindowsDlgRc.h b/PowerEditor/src/WinControls/WindowsDlg/WindowsDlgRc.h
index 72a471485..f8ac01a44 100644
--- a/PowerEditor/src/WinControls/WindowsDlg/WindowsDlgRc.h
+++ b/PowerEditor/src/WinControls/WindowsDlg/WindowsDlgRc.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef WINDOWS_DLG_RC_H
-#define WINDOWS_DLG_RC_H
+#pragma once
 
 #ifdef __GNUC__
 #ifndef _WIN32_IE
@@ -51,4 +50,3 @@
 	#define  IDM_WINDOW_MRU_FIRST (IDR_WINDOWS_MENU + 20)
 	#define  IDM_WINDOW_MRU_LIMIT (IDR_WINDOWS_MENU + 29)
 
-#endif //WINDOWS_DLG_RC_H
diff --git a/PowerEditor/src/WinControls/shortcut/RunMacroDlg.rc b/PowerEditor/src/WinControls/shortcut/RunMacroDlg.rc
index e0b336327..645d14876 100644
--- a/PowerEditor/src/WinControls/shortcut/RunMacroDlg.rc
+++ b/PowerEditor/src/WinControls/shortcut/RunMacroDlg.rc
@@ -27,8 +27,8 @@
 
 // created by Daniel Volk mordorpost@volkarts.com
 
-#ifndef RUN_MACRO_DLG_RC
-#define RUN_MACRO_DLG_RC
+#pragma once
+
 #include <windows.h>
 #include "RunMacroDlg_rc.h"
 
@@ -48,4 +48,3 @@ BEGIN
     RTEXT           "Macro to run :",IDC_MACRO2RUN_STATIC,5,12,59,8
     LTEXT           "times",IDC_TIMES_STATIC,97,38,65,8
 END
-#endif // RUN_MACRO_DLG_RC
diff --git a/PowerEditor/src/WinControls/shortcut/RunMacroDlg_rc.h b/PowerEditor/src/WinControls/shortcut/RunMacroDlg_rc.h
index 34c113787..43f30681e 100644
--- a/PowerEditor/src/WinControls/shortcut/RunMacroDlg_rc.h
+++ b/PowerEditor/src/WinControls/shortcut/RunMacroDlg_rc.h
@@ -27,8 +27,7 @@
 
 // created by Daniel Volk mordorpost@volkarts.com
 
-#ifndef RUN_MACRO_DLG_RC_H
-#define RUN_MACRO_DLG_RC_H
+#pragma once
 
 #define IDD_RUN_MACRO_DLG					8000
 #define IDC_M_RUN_MULTI						8001
@@ -39,4 +38,3 @@
 #define IDC_TIMES_STATIC					8005
 #define IDC_MACRO2RUN_STATIC				8006
 
-#endif //RUN_MACRO_DLG_RC_H
diff --git a/PowerEditor/src/lesDlgs.h b/PowerEditor/src/lesDlgs.h
index 942172c03..f69f8f26e 100644
--- a/PowerEditor/src/lesDlgs.h
+++ b/PowerEditor/src/lesDlgs.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef SIZE_DLG_H
-#define SIZE_DLG_H
+#pragma once
 
 #include "StaticDialog.h"
 #include "Common.h"
@@ -94,4 +93,3 @@ protected :
     int _buttonStatus = buttonStatus_nada;
 
 };
-#endif //TABSIZE_DLG_H
diff --git a/PowerEditor/src/localization.h b/PowerEditor/src/localization.h
index 39c1b57c4..42021ae95 100644
--- a/PowerEditor/src/localization.h
+++ b/PowerEditor/src/localization.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef LOCALIZATION_H
-#define LOCALIZATION_H
+#pragma once
 
 #include "Common.h"
 #include "tinyxmlA.h"
@@ -101,4 +100,3 @@ private:
 
 MenuPosition & getMenuPosition(const char *id);
 
-#endif // LOCALIZATION_H
diff --git a/PowerEditor/src/menuCmdID.h b/PowerEditor/src/menuCmdID.h
index ef7945dc2..e488f1306 100644
--- a/PowerEditor/src/menuCmdID.h
+++ b/PowerEditor/src/menuCmdID.h
@@ -26,8 +26,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#ifndef MENUCMDID_H
-#define MENUCMDID_H
+#pragma once
 
 #define    IDM    40000
 
@@ -575,5 +574,3 @@
     #define IDM_SYSTRAYPOPUP_NEW_AND_PASTE    (IDM_SYSTRAYPOPUP + 3)
     #define IDM_SYSTRAYPOPUP_OPENFILE         (IDM_SYSTRAYPOPUP + 4)
     #define IDM_SYSTRAYPOPUP_CLOSE            (IDM_SYSTRAYPOPUP + 5)
-
-#endif //MENUCMDID_H