From fe4c791d4f62127ff0b5faf87d2ca2d9cf0d8af2 Mon Sep 17 00:00:00 2001
From: GreyMerlin <GreyMerlin7@gmail.com>
Date: Fri, 22 Sep 2017 18:00:48 -0700
Subject: [PATCH] Use '#pragma once' in more .h files

---
 Externals/crystaledit/editlib/LineInfo.h           | 5 +----
 Externals/crystaledit/editlib/SyntaxColors.h       | 5 +----
 Externals/crystaledit/editlib/UndoRecord.h         | 4 +---
 Externals/crystaledit/editlib/ViewableWhitespace.h | 4 +---
 Externals/crystaledit/editlib/ccrystaleditview.h   | 6 ------
 Externals/crystaledit/editlib/ccrystaltextbuffer.h | 6 ------
 Externals/crystaledit/editlib/ccrystaltextview.h   | 7 -------
 Externals/crystaledit/editlib/ceditreplacedlg.h    | 6 ------
 Externals/crystaledit/editlib/cfindtextdlg.h       | 7 -------
 Externals/crystaledit/editlib/chcondlg.h           | 6 ------
 Externals/crystaledit/editlib/cregexp.h            | 4 +---
 Externals/crystaledit/editlib/crystaleditviewex.h  | 7 -------
 Externals/crystaledit/editlib/crystalparser.h      | 7 -------
 Externals/crystaledit/editlib/crystaltextblock.h   | 7 -------
 Externals/crystaledit/editlib/cs2cs.h              | 4 +---
 Externals/crystaledit/editlib/editreg.h            | 4 +---
 Externals/crystaledit/editlib/edtlib.h             | 6 ------
 Externals/crystaledit/editlib/filesup.h            | 5 +----
 Externals/crystaledit/editlib/fpattern.h           | 4 +---
 Externals/crystaledit/editlib/gotodlg.h            | 5 -----
 Externals/crystaledit/editlib/memcombo.h           | 5 +----
 Externals/crystaledit/editlib/registry.h           | 5 +----
 Externals/crystaledit/editlib/splash.h             | 6 ++----
 Externals/crystaledit/editlib/statbar.h            | 5 +----
 Externals/crystaledit/editlib/string_util.h        | 5 +----
 Externals/crystaledit/editlib/wispelld.h           | 5 +----
 Src/7zCommon.h                                     | 2 ++
 Src/Common/BCMenu.h                                | 6 +-----
 Src/Common/MyCom.h                                 | 4 +---
 Src/DDXHelper.h                                    | 4 +---
 Src/DirFilterDlg.h                                 | 3 ---
 Src/MergeCmdLineInfo.h                             | 4 +---
 Src/OptionsInit.h                                  | 2 ++
 Src/diffutils/config.h                             | 2 ++
 Src/diffutils/lib/cmpbuf.h                         | 3 +++
 Src/diffutils/src/diff.h                           | 4 +---
 Src/diffutils/src/system.h                         | 2 ++
 Src/dllpstub.h                                     | 4 +---
 Src/ssauto.h                                       | 4 +---
 39 files changed, 34 insertions(+), 150 deletions(-)

diff --git a/Externals/crystaledit/editlib/LineInfo.h b/Externals/crystaledit/editlib/LineInfo.h
index 1fe864ca0..1e54edcdc 100644
--- a/Externals/crystaledit/editlib/LineInfo.h
+++ b/Externals/crystaledit/editlib/LineInfo.h
@@ -7,8 +7,7 @@
 // ID line follows -- this is updated by SVN
 // $Id$
 
-#ifndef _EDITOR_LINEINFO_H_
-#define _EDITOR_LINEINFO_H_
+#pragma once
 
 //  Line allocation granularity
 #define     CHAR_ALIGN                  16
@@ -62,5 +61,3 @@ private:
     int m_nLength; /**< Line length (without EOL bytes). */
     int m_nEolChars; /**< # of EOL bytes. */
   };
-
-#endif // _EDITOR_LINEINFO_H_
diff --git a/Externals/crystaledit/editlib/SyntaxColors.h b/Externals/crystaledit/editlib/SyntaxColors.h
index c2d026140..8cbd723df 100644
--- a/Externals/crystaledit/editlib/SyntaxColors.h
+++ b/Externals/crystaledit/editlib/SyntaxColors.h
@@ -6,8 +6,7 @@
 // ID line follows -- this is updated by SVN
 // $Id$
 
-#ifndef _SYNTAX_COLORS_H_
-#define _SYNTAX_COLORS_H_
+#pragma once
 
 #include <Windows.h>
 #include <vector>
@@ -88,5 +87,3 @@ private:
 	std::vector<COLORREF> m_colors; /**< Syntax highlight colors */
 	std::vector<bool> m_bolds; /**< Bold font enable/disable */
 };
-
-#endif // _SYNTAX_COLORS_H_
diff --git a/Externals/crystaledit/editlib/UndoRecord.h b/Externals/crystaledit/editlib/UndoRecord.h
index c063c7ecb..414e6d785 100644
--- a/Externals/crystaledit/editlib/UndoRecord.h
+++ b/Externals/crystaledit/editlib/UndoRecord.h
@@ -7,8 +7,7 @@
 // ID line follows -- this is updated by SVN
 // $Id$
 
-#ifndef _EDITOR_UNDO_RECORD_H_
-#define _EDITOR_UNDO_RECORD_H_
+#pragma once
 
 class UndoRecord
 {
@@ -93,4 +92,3 @@ private:
   }
 };
 
-#endif // _EDITOR_UNDO_RECORD_H_
diff --git a/Externals/crystaledit/editlib/ViewableWhitespace.h b/Externals/crystaledit/editlib/ViewableWhitespace.h
index c251e0a14..4ad70da7a 100644
--- a/Externals/crystaledit/editlib/ViewableWhitespace.h
+++ b/Externals/crystaledit/editlib/ViewableWhitespace.h
@@ -6,8 +6,7 @@
 // RCS ID line follows -- this is updated by CVS
 // $Id: ViewableWhitespace.h 3410 2006-07-31 17:14:15Z kimmov $
 
-#ifndef ViewableWhitespace_included_h
-#define ViewableWhitespace_included_h
+#pragma once
 
 /**
  * @brief Structure containing characters for viewable whitespace chars.
@@ -27,4 +26,3 @@ struct ViewableWhitespaceChars
 
 const ViewableWhitespaceChars * GetViewableWhitespaceChars(int codepage);
 
-#endif // ViewableWhitespace_included_h
diff --git a/Externals/crystaledit/editlib/ccrystaleditview.h b/Externals/crystaledit/editlib/ccrystaleditview.h
index f9618b3a7..8ccfd6f4f 100644
--- a/Externals/crystaledit/editlib/ccrystaleditview.h
+++ b/Externals/crystaledit/editlib/ccrystaleditview.h
@@ -24,12 +24,7 @@
 //        and maybe "ugly" code ...
 ////////////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_CCRYSTALEDITVIEW_H__8F3F8B63_6F66_11D2_8C34_0080ADB86836__INCLUDED_)
-#define AFX_CCRYSTALEDITVIEW_H__8F3F8B63_6F66_11D2_8C34_0080ADB86836__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
 
 #include "ccrystaltextview.h"
 #include "wispelld.h"
@@ -231,4 +226,3 @@ protected :
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
 
-#endif // !defined(AFX_CCRYSTALEDITVIEW_H__8F3F8B63_6F66_11D2_8C34_0080ADB86836__INCLUDED_)
diff --git a/Externals/crystaledit/editlib/ccrystaltextbuffer.h b/Externals/crystaledit/editlib/ccrystaltextbuffer.h
index ac7e02a94..924fd60bd 100644
--- a/Externals/crystaledit/editlib/ccrystaltextbuffer.h
+++ b/Externals/crystaledit/editlib/ccrystaltextbuffer.h
@@ -31,10 +31,6 @@
 // ID line follows -- this is updated by SVN
 // $Id: ccrystaltextbuffer.h 6879 2009-06-29 10:00:33Z kimmov $
 
-
-#if !defined(AFX_CCRYSTALTEXTBUFFER_H__AD7F2F49_6CB3_11D2_8C32_0080ADB86836__INCLUDED_)
-#define AFX_CCRYSTALTEXTBUFFER_H__AD7F2F49_6CB3_11D2_8C32_0080ADB86836__INCLUDED_
-
 #pragma once
 
 #include <vector>
@@ -325,5 +321,3 @@ public :
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_CCRYSTALTEXTBUFFER_H__AD7F2F49_6CB3_11D2_8C32_0080ADB86836__INCLUDED_)
diff --git a/Externals/crystaledit/editlib/ccrystaltextview.h b/Externals/crystaledit/editlib/ccrystaltextview.h
index 1c122dfde..8b9709352 100644
--- a/Externals/crystaledit/editlib/ccrystaltextview.h
+++ b/Externals/crystaledit/editlib/ccrystaltextview.h
@@ -31,12 +31,7 @@
 // ID line follows -- this is updated by SVN
 // $Id: ccrystaltextview.h 6888 2009-06-30 10:36:28Z kimmov $
 
-#if !defined(AFX_CCRYSTALTEXTVIEW_H__AD7F2F41_6CB3_11D2_8C32_0080ADB86836__INCLUDED_)
-#define AFX_CCRYSTALTEXTVIEW_H__AD7F2F41_6CB3_11D2_8C32_0080ADB86836__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
 
 #include <vector>
 #include "cregexp.h"
@@ -1007,5 +1002,3 @@ protected :
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_CCRYSTALTEXTVIEW_H__AD7F2F41_6CB3_11D2_8C32_0080ADB86836__INCLUDED_)
diff --git a/Externals/crystaledit/editlib/ceditreplacedlg.h b/Externals/crystaledit/editlib/ceditreplacedlg.h
index f7435dd74..dcd9ec405 100644
--- a/Externals/crystaledit/editlib/ceditreplacedlg.h
+++ b/Externals/crystaledit/editlib/ceditreplacedlg.h
@@ -24,12 +24,7 @@
 //        and maybe "ugly" code ...
 ////////////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_CEDITREPLACEDLG_H__759417E3_7B18_11D2_8C50_0080ADB86836__INCLUDED_)
-#define AFX_CEDITREPLACEDLG_H__759417E3_7B18_11D2_8C50_0080ADB86836__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
 // ceditreplacedlg.h : header file
 //
 
@@ -113,4 +108,3 @@ protected :
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
 
-#endif // !defined(AFX_CEDITREPLACEDLG_H__759417E3_7B18_11D2_8C50_0080ADB86836__INCLUDED_)
diff --git a/Externals/crystaledit/editlib/cfindtextdlg.h b/Externals/crystaledit/editlib/cfindtextdlg.h
index fa7ff94bf..34ee238e3 100644
--- a/Externals/crystaledit/editlib/cfindtextdlg.h
+++ b/Externals/crystaledit/editlib/cfindtextdlg.h
@@ -31,12 +31,7 @@
 // RCS ID line follows -- this is updated by CVS
 // $Id$
 
-#if !defined(AFX_CFINDTEXTDLG_H__F59009E3_7B01_11D2_8C4F_0080ADB86836__INCLUDED_)
-#define AFX_CFINDTEXTDLG_H__F59009E3_7B01_11D2_8C4F_0080ADB86836__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
 
 #include "resource.h"
 #include "memcombo.h"
@@ -122,5 +117,3 @@ protected :
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_CFINDTEXTDLG_H__F59009E3_7B01_11D2_8C4F_0080ADB86836__INCLUDED_)
diff --git a/Externals/crystaledit/editlib/chcondlg.h b/Externals/crystaledit/editlib/chcondlg.h
index fd1dd7300..62ec78fbe 100644
--- a/Externals/crystaledit/editlib/chcondlg.h
+++ b/Externals/crystaledit/editlib/chcondlg.h
@@ -14,12 +14,7 @@
 //  - LEAVE THIS HEADER INTACT
 ////////////////////////////////////////////////////////////////////////////
 
-#ifndef __CHCONDLG_H__INCLUDED__
-#define __CHCONDLG_H__INCLUDED__
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
 
 #include "editcmd.h"
 
@@ -68,4 +63,3 @@ protected :
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
 
-#endif // __CHCONDLG_H__INCLUDED__
diff --git a/Externals/crystaledit/editlib/cregexp.h b/Externals/crystaledit/editlib/cregexp.h
index df8fa1231..e885d31cd 100644
--- a/Externals/crystaledit/editlib/cregexp.h
+++ b/Externals/crystaledit/editlib/cregexp.h
@@ -14,8 +14,7 @@
 //  - LEAVE THIS HEADER INTACT
 ////////////////////////////////////////////////////////////////////////////
 
-#ifndef __REGEX_H
-#define __REGEX_H
+#pragma once
 
 /*
  * Operator:
@@ -105,4 +104,3 @@ int EDITPADC_CLASS RxExec(RxNode *Regexp, LPCTSTR Data, int Len, LPCTSTR Start,
 int EDITPADC_CLASS RxReplace(LPCTSTR rep, LPCTSTR Src, int len, RxMatchRes match, LPTSTR *Dest, int *Dlen);
 void EDITPADC_CLASS RxFree(RxNode *Node);
 
-#endif
diff --git a/Externals/crystaledit/editlib/crystaleditviewex.h b/Externals/crystaledit/editlib/crystaleditviewex.h
index 4cb489114..1e335ccf0 100644
--- a/Externals/crystaledit/editlib/crystaleditviewex.h
+++ b/Externals/crystaledit/editlib/crystaleditviewex.h
@@ -2,12 +2,7 @@
 //
 //////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_CRYSTALEDITVIEWEX_H__5353A214_1059_11D3_929E_CEFE4CA77E5E__INCLUDED_)
-#define AFX_CRYSTALEDITVIEWEX_H__5353A214_1059_11D3_929E_CEFE4CA77E5E__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #include "ccrystaleditview.h"
 #include "crystalparser.h"
@@ -90,5 +85,3 @@ protected:
 	*/
 	CCrystalParser *m_pSyntaxParser;
 };
-
-#endif // !defined(AFX_CRYSTALEDITVIEWEX_H__5353A214_1059_11D3_929E_CEFE4CA77E5E__INCLUDED_)
diff --git a/Externals/crystaledit/editlib/crystalparser.h b/Externals/crystaledit/editlib/crystalparser.h
index 9427dc86f..7d1635fa6 100644
--- a/Externals/crystaledit/editlib/crystalparser.h
+++ b/Externals/crystaledit/editlib/crystalparser.h
@@ -13,12 +13,7 @@
 //	- LEAVE THIS HEADER INTACT
 ////////////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_CRYSTALPARSER_H__17435DA0_1F72_11D3_929E_FD90DABF8479__INCLUDED_)
-#define AFX_CRYSTALPARSER_H__17435DA0_1F72_11D3_929E_FD90DABF8479__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 #include "crystaltextblock.h"
 
@@ -105,5 +100,3 @@ protected:
 	CCrystalTextView *m_pTextView;
 
 };
-
-#endif // !defined(AFX_CRYSTALPARSER_H__17435DA0_1F72_11D3_929E_FD90DABF8479__INCLUDED_)
diff --git a/Externals/crystaledit/editlib/crystaltextblock.h b/Externals/crystaledit/editlib/crystaltextblock.h
index 5a8da52ee..d995c2031 100644
--- a/Externals/crystaledit/editlib/crystaltextblock.h
+++ b/Externals/crystaledit/editlib/crystaltextblock.h
@@ -13,12 +13,7 @@
 //	- LEAVE THIS HEADER INTACT
 ////////////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_CRYSTALTEXTBLOCK_H__37ECF0C1_145F_11D3_929E_444553540000__INCLUDED_)
-#define AFX_CRYSTALTEXTBLOCK_H__37ECF0C1_145F_11D3_929E_444553540000__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
 
 /**
 Objects of this class are passed to CCrystalParser::ParseLine() to get the
@@ -67,5 +62,3 @@ protected:
 	/** Index */
 	int &m_rnActualItems;
 };
-
-#endif // !defined(AFX_CRYSTALTEXTBLOCK_H__37ECF0C1_145F_11D3_929E_444553540000__INCLUDED_)
diff --git a/Externals/crystaledit/editlib/cs2cs.h b/Externals/crystaledit/editlib/cs2cs.h
index ec94afb55..6b1f67642 100644
--- a/Externals/crystaledit/editlib/cs2cs.h
+++ b/Externals/crystaledit/editlib/cs2cs.h
@@ -1,7 +1,6 @@
 /* Ferda Prantl - character coding conversion engine  */
 
-#ifndef __CS2CS_H__INCLUDED__
-#define __CS2CS_H__INCLUDED__
+#pragma once
 
 #define FD_CODE_ASCII      0
 #define FD_CODE_CP1250     1
@@ -56,4 +55,3 @@ TCHAR EDITPADC_CLASS iconvert_char (TCHAR ch, int source_coding, int destination
 int EDITPADC_CLASS iconvert (LPTSTR string, int source_coding, int destination_coding, bool alphabet_only);
 int EDITPADC_CLASS iconvert_new (LPCTSTR source, LPTSTR *destination, int source_coding, int destination_coding, bool alphabet_only);
 
-#endif // __CS2CS_H__INCLUDED__
diff --git a/Externals/crystaledit/editlib/editreg.h b/Externals/crystaledit/editlib/editreg.h
index b77509722..7a557f883 100644
--- a/Externals/crystaledit/editlib/editreg.h
+++ b/Externals/crystaledit/editlib/editreg.h
@@ -23,8 +23,7 @@
 //        and maybe "ugly" code ...
 ////////////////////////////////////////////////////////////////////////////
 
-#ifndef __EDITREG_H__INCLUDED__
-#define __EDITREG_H__INCLUDED__
+#pragma once
 
 //  Registry keys & values
 #define REG_EDITPAD         _T ("Software\\Thingamahoochie\\WinMerge\\Editor")
@@ -35,4 +34,3 @@
 #define MAX_REMEMBERED 100
 #define REMEMBERED_TO_REMOVE 10
 
-#endif // __EDITREG_H__INCLUDED__
diff --git a/Externals/crystaledit/editlib/edtlib.h b/Externals/crystaledit/editlib/edtlib.h
index d1b1aa4b8..0c1094f95 100644
--- a/Externals/crystaledit/editlib/edtlib.h
+++ b/Externals/crystaledit/editlib/edtlib.h
@@ -1,10 +1,5 @@
-#ifndef __EDTLIB_H
-#define __EDTLIB_H
 
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
-
 
 
 #include "crystalparser.h"
@@ -13,4 +8,3 @@
 #include "ccrystaleditview.h"
 #include "crystaleditviewex.h"
 
-#endif // __EDTLIB_H
diff --git a/Externals/crystaledit/editlib/filesup.h b/Externals/crystaledit/editlib/filesup.h
index bee9e34b3..75d0809bc 100644
--- a/Externals/crystaledit/editlib/filesup.h
+++ b/Externals/crystaledit/editlib/filesup.h
@@ -14,8 +14,7 @@
 //  - LEAVE THIS HEADER INTACT
 ////////////////////////////////////////////////////////////////////////////
 
-#ifndef __FILESUP_H__INCLUDED__
-#define __FILESUP_H__INCLUDED__
+#pragma once
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ -35,5 +34,3 @@ CString EDITPADC_CLASS GetPathName (const CString & sString);
 #endif // _DEBUG
 
 /////////////////////////////////////////////////////////////////////////////
-
-#endif // __FILESUP_H__INCLUDED__
diff --git a/Externals/crystaledit/editlib/fpattern.h b/Externals/crystaledit/editlib/fpattern.h
index 310426da5..109d0deeb 100644
--- a/Externals/crystaledit/editlib/fpattern.h
+++ b/Externals/crystaledit/editlib/fpattern.h
@@ -14,8 +14,7 @@
 //  - LEAVE THIS HEADER INTACT
 ////////////////////////////////////////////////////////////////////////////
 
-#ifndef __FPATTERN_H__INCLUDED__
-#define __FPATTERN_H__INCLUDED__
+#pragma once
 
 /******************************************************************************
  * fpattern.h
@@ -145,4 +144,3 @@ int EDITPADC_CLASS fpattern_isvalid (LPCTSTR pat);
 int EDITPADC_CLASS fpattern_match (LPCTSTR pat, LPCTSTR fname);
 int EDITPADC_CLASS fpattern_matchn (LPCTSTR pat, LPCTSTR fname);
 
-#endif // __FPATTERN_H__INCLUDED__
diff --git a/Externals/crystaledit/editlib/gotodlg.h b/Externals/crystaledit/editlib/gotodlg.h
index 303a995ea..b302e1c77 100644
--- a/Externals/crystaledit/editlib/gotodlg.h
+++ b/Externals/crystaledit/editlib/gotodlg.h
@@ -14,12 +14,8 @@
 //  - LEAVE THIS HEADER INTACT
 ////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GOTODLG_H__INCLUDED__
-#define __GOTODLG_H__INCLUDED__
 
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
 
 #include "editcmd.h"
 
@@ -67,4 +63,3 @@ protected :
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
 
-#endif // __GOTODLG_H__INCLUDED__
diff --git a/Externals/crystaledit/editlib/memcombo.h b/Externals/crystaledit/editlib/memcombo.h
index 7c5f18b38..0ae5e2515 100644
--- a/Externals/crystaledit/editlib/memcombo.h
+++ b/Externals/crystaledit/editlib/memcombo.h
@@ -14,8 +14,7 @@
 //  - LEAVE THIS HEADER INTACT
 ////////////////////////////////////////////////////////////////////////////
 
-#ifndef __MEMCOMBO_H__INCLUDED__
-#define __MEMCOMBO_H__INCLUDED__
+#pragma once
 
 ////////////////////////////////////////////////////////////////////////////////
 // Includes
@@ -75,5 +74,3 @@ public :
 #endif // _DEBUG
 
 /////////////////////////////////////////////////////////////////////////////
-
-#endif // __MEMCOMBO_H__INCLUDED__
diff --git a/Externals/crystaledit/editlib/registry.h b/Externals/crystaledit/editlib/registry.h
index e023dcdbf..00a1b9db2 100644
--- a/Externals/crystaledit/editlib/registry.h
+++ b/Externals/crystaledit/editlib/registry.h
@@ -14,8 +14,7 @@
 //  - LEAVE THIS HEADER INTACT
 ////////////////////////////////////////////////////////////////////////////
 
-#ifndef __REGISTRY_H__INCLUDED__
-#define __REGISTRY_H__INCLUDED__
+#pragma once
 
 /*////////////////////////////////////////////////////////////////////////////*/
 
@@ -407,5 +406,3 @@ struct EDITPADC_CLASS CReg
 bool EDITPADC_CLASS RegDeleteSubKeys (HKEY hKey);
 
 /*////////////////////////////////////////////////////////////////////////////*/
-
-#endif /* __REGISTRY_H__INCLUDED__ */
diff --git a/Externals/crystaledit/editlib/splash.h b/Externals/crystaledit/editlib/splash.h
index a85b214d7..6bed138d0 100644
--- a/Externals/crystaledit/editlib/splash.h
+++ b/Externals/crystaledit/editlib/splash.h
@@ -1,5 +1,5 @@
-#ifndef __SPLASH_H__INCLUDED__
-#define __SPLASH_H__INCLUDED__
+
+#pragma once
 
 /////////////////////////////////////////////////////////////////////////////
 // CBigIcon window
@@ -51,5 +51,3 @@ protected:
 };
 
 /////////////////////////////////////////////////////////////////////////////
-
-#endif // __SPLASH_H__INCLUDED__
diff --git a/Externals/crystaledit/editlib/statbar.h b/Externals/crystaledit/editlib/statbar.h
index 05365d40e..f4eb731c8 100644
--- a/Externals/crystaledit/editlib/statbar.h
+++ b/Externals/crystaledit/editlib/statbar.h
@@ -14,8 +14,7 @@
 //  - LEAVE THIS HEADER INTACT
 ////////////////////////////////////////////////////////////////////////////
 
-#ifndef __STATBAR_H__INCLUDED__
-#define __STATBAR_H__INCLUDED__
+#pragma once
 
 class EDITPADC_CLASS CEditStatusBar : public CStatusBar
   {
@@ -49,5 +48,3 @@ public :
 
     DECLARE_MESSAGE_MAP ()
   };
-
-#endif // __STATBAR_H__INCLUDED__
diff --git a/Externals/crystaledit/editlib/string_util.h b/Externals/crystaledit/editlib/string_util.h
index 7b262e11e..54b6eb73e 100644
--- a/Externals/crystaledit/editlib/string_util.h
+++ b/Externals/crystaledit/editlib/string_util.h
@@ -6,8 +6,7 @@
 // ID line follows -- this is updated by SVN
 // $Id$
 
-#ifndef _STRING_UTIL_H_
-#define _STRING_UTIL_H_
+#pragma once
 
 #define ISXKEYWORD(keywordlist, key, keylen) IsXKeyword(key, keylen, keywordlist, sizeof(keywordlist)/sizeof(keywordlist[0]), _tcsncmp)
 #define ISXKEYWORDI(keywordlist, key, keylen) IsXKeyword(key, keylen, keywordlist, sizeof(keywordlist)/sizeof(keywordlist[0]), _tcsnicmp)
@@ -18,5 +17,3 @@ int xisalpha(wint_t c);
 int xisalnum(wint_t c);
 int xisspace(wint_t c);
 bool IsXKeyword(LPCTSTR pszKey, size_t nKeyLen, LPCTSTR pszKeywordList[], size_t nKeywordListCount, int (*compare)(LPCTSTR, LPCTSTR, size_t));
-
-#endif // _STRING_UTIL_H_
diff --git a/Externals/crystaledit/editlib/wispelld.h b/Externals/crystaledit/editlib/wispelld.h
index 968e362eb..8bd69a788 100644
--- a/Externals/crystaledit/editlib/wispelld.h
+++ b/Externals/crystaledit/editlib/wispelld.h
@@ -7,8 +7,7 @@
  *  defined with this macro as being exported.
  */
 
-#ifndef __WISPELLD_H__
-#define __WISPELLD_H__
+#pragma once
 
 /*#ifdef WISPELL_EXPORTS
 #define WISPELL_API __declspec (dllexport)
@@ -60,5 +59,3 @@ typedef struct SpellData_t
 /* WISPELL_API int SpellInit (SpellData*); */   /* initializes the control structure */
 /* WISPELL_API int SpellCheck (SpellData*); */  /* performs spell checking (the dialog may appear) */
 /* WISPELL_API int SpellConfig (SpellData*); */ /* performs spell checking configuration (the dialog appears) */
-
-#endif /* __WISPELLD_H__ */
diff --git a/Src/7zCommon.h b/Src/7zCommon.h
index 50876b892..72588c7d7 100644
--- a/Src/7zCommon.h
+++ b/Src/7zCommon.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #define DllBuild_Merge7z 10 // Minimum DllBuild of Merge7z plugin required
 
 // We include dllpstub.h for Merge7z.h
diff --git a/Src/Common/BCMenu.h b/Src/Common/BCMenu.h
index a8342edc3..086249e54 100644
--- a/Src/Common/BCMenu.h
+++ b/Src/Common/BCMenu.h
@@ -23,8 +23,7 @@
 // like to play with new stuff.
 //*************************************************************************
 
-#ifndef BCMenu_H
-#define BCMenu_H
+#pragma once
 
 #include <afxtempl.h>
 
@@ -339,6 +338,3 @@ protected:
 	static HTHEME m_hTheme;
 }; 
 
-#endif
-
-//*************************************************************************
diff --git a/Src/Common/MyCom.h b/Src/Common/MyCom.h
index a8ae7ecfc..56a096d90 100644
--- a/Src/Common/MyCom.h
+++ b/Src/Common/MyCom.h
@@ -3,8 +3,7 @@
 // Igor Pavlov under the terms of the GNU Lesser General Public License (LGPL).
 // It has been modified by WinMerge Team.
 
-#ifndef __MYCOM_H
-#define __MYCOM_H
+#pragma once
 
 #ifndef RINOK
 #define RINOK(x) { HRESULT __result_ = (x); if (__result_ != S_OK) return __result_; }
@@ -358,4 +357,3 @@ public:
 	~CMyDispParams() { Unnamed.Drop(); }
 };
 
-#endif
diff --git a/Src/DDXHelper.h b/Src/DDXHelper.h
index 6cca29964..89c6ff84a 100644
--- a/Src/DDXHelper.h
+++ b/Src/DDXHelper.h
@@ -1,5 +1,4 @@
-#ifndef _DDXHELPER_H_
-#define _DDXHELPER_H_
+#pragma once
 
 #include "UnicodeString.h"
 
@@ -51,4 +50,3 @@ inline void DDX_CBStringExact(CDataExchange* pDX, int nIDC, String& value)
 	DDX_CBStringExact(pDX, nIDC, PopString(value));
 }
 
-#endif
diff --git a/Src/DirFilterDlg.h b/Src/DirFilterDlg.h
index 071f9ef2d..2478c46d4 100644
--- a/Src/DirFilterDlg.h
+++ b/Src/DirFilterDlg.h
@@ -6,10 +6,7 @@
  */
 #pragma once
 
-#ifndef DirReportTypes_h_included
 #include "DirReportTypes.h"
-#endif
-
 #include "SuperComboBox.h"
 
 /** 
diff --git a/Src/MergeCmdLineInfo.h b/Src/MergeCmdLineInfo.h
index d69c287bd..39763df5d 100644
--- a/Src/MergeCmdLineInfo.h
+++ b/Src/MergeCmdLineInfo.h
@@ -27,8 +27,7 @@
 // ID line follows -- this is updated by SVN
 // $Id: MergeCmdLineInfo.h 6940 2009-08-01 17:29:01Z kimmov $
 
-#ifndef _MERGE_CMD_LINE_INFO_INCLUDED_
-#define _MERGE_CMD_LINE_INFO_INCLUDED_
+#pragma once
 
 #include "UnicodeString.h"
 #include "PathContext.h"
@@ -98,4 +97,3 @@ private:
 	MergeCmdLineInfo& operator=(const MergeCmdLineInfo& rhs);
 };
 
-#endif // _MERGE_CMD_LINE_INFO_INCLUDED_
diff --git a/Src/OptionsInit.h b/Src/OptionsInit.h
index 33a3e4b5e..a9c29f98e 100644
--- a/Src/OptionsInit.h
+++ b/Src/OptionsInit.h
@@ -1,3 +1,5 @@
+#pragma once
+
 class COptionsMgr;
 
 namespace Options {
diff --git a/Src/diffutils/config.h b/Src/diffutils/config.h
index e821a124b..8741342df 100644
--- a/Src/diffutils/config.h
+++ b/Src/diffutils/config.h
@@ -1,6 +1,8 @@
 /*
  *	config.h - pre-built version for MSDOS and NT.
  */
+#pragma once
+ 
 #define HAVE_VPRINTF 1
 #define RETSIGTYPE void
 #define STDC_HEADERS 1
diff --git a/Src/diffutils/lib/cmpbuf.h b/Src/diffutils/lib/cmpbuf.h
index a7621b781..98f7a2581 100644
--- a/Src/diffutils/lib/cmpbuf.h
+++ b/Src/diffutils/lib/cmpbuf.h
@@ -16,6 +16,9 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU DIFF; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/Src/diffutils/src/diff.h b/Src/diffutils/src/diff.h
index 405e2fd06..d1783a1be 100644
--- a/Src/diffutils/src/diff.h
+++ b/Src/diffutils/src/diff.h
@@ -17,8 +17,7 @@ You should have received a copy of the GNU General Public License
 along with GNU DIFF; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#ifndef __DIFF_H__
-#define __DIFF_H__
+#pragma once
 
 #include "system.h"
 #include <ctype.h>
@@ -386,4 +385,3 @@ int mywstat(const wchar_t *filename, struct _stat64 *buf);
 }
 #endif
 
-#endif
diff --git a/Src/diffutils/src/system.h b/Src/diffutils/src/system.h
index f60f88080..94d0f8bac 100644
--- a/Src/diffutils/src/system.h
+++ b/Src/diffutils/src/system.h
@@ -17,6 +17,8 @@ You should have received a copy of the GNU General Public License
 along with GNU DIFF; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#pragma once
+
 /* We must define `volatile' and `const' first (the latter inside config.h),
    so that they're used consistently in all system includes.  */
 #if !defined(__STDC__) && !defined(_MSC_VER)
diff --git a/Src/dllpstub.h b/Src/dllpstub.h
index 75b28af1f..9dfb2ccba 100644
--- a/Src/dllpstub.h
+++ b/Src/dllpstub.h
@@ -1,4 +1,4 @@
-#ifndef DECORATE_U
+#pragma once
 
 /**
  * @brief define the suffixes to decorate TCHAR width specific module/function names
@@ -40,5 +40,3 @@ struct DLLPSTUB
 	static void Throw(LPCSTR name, HMODULE, DWORD dwError, BOOL bFreeLibrary);
 	HMODULE Load();
 };
-
-#endif
diff --git a/Src/ssauto.h b/Src/ssauto.h
index e4f304724..8456aad8f 100644
--- a/Src/ssauto.h
+++ b/Src/ssauto.h
@@ -1,8 +1,7 @@
 /* This header file machine-generated by mktyplib.exe */
 /* Interface to type library: SourceSafeTypeLib */
 
-#ifndef _SourceSafeTypeLib_H_
-#define _SourceSafeTypeLib_H_
+#pragma once
 
 DEFINE_GUID(LIBID_SourceSafeTypeLib,0x783CD4E0L,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F);
 #ifndef BEGIN_INTERFACE
@@ -597,4 +596,3 @@ DEFINE_GUID(CLSID_VSSApp,0x2A0DE0E1L,0x2E9F,0x11D0,0x92,0x36,0x00,0xAA,0x00,0xA1
 class VSSApp;
 #endif
 
-#endif
-- 
2.11.0