diff --git a/mythtv/programs/mythcommflag/SceneChangeDetector.h b/mythtv/programs/mythcommflag/SceneChangeDetector.h
@@ -4,8 +4,8 @@
  * Detect scene changes based on histogram analysis.
  */
 
-#ifndef __SCENECHANGEDETECTOR_H__
-#define __SCENECHANGEDETECTOR_H__
+#ifndef SCENECHANGEDETECTOR_H
+#define SCENECHANGEDETECTOR_H
 
 #include <QString>
 
@@ -61,7 +61,6 @@ class SceneChangeDetector : public FrameAnalyzer
     bool                    m_sceneChangeDone    {false};
 };
 
-#endif  /* !__SCENECHANGEDETECTOR_H__ */
+#endif  /* !SCENECHANGEDETECTOR_H */
 
 /* vim: set expandtab tabstop=4 shiftwidth=4: */
-
diff --git a/mythtv/programs/mythcommflag/SceneChangeDetectorBase.h b/mythtv/programs/mythcommflag/SceneChangeDetectorBase.h
@@ -1,5 +1,5 @@
-#ifndef _SCENECHANGEDETECTORBASE_H_
-#define _SCENECHANGEDETECTORBASE_H_
+#ifndef SCENECHANGEDETECTORBASE_H
+#define SCENECHANGEDETECTORBASE_H
 
 #include <QObject>
 #include "mythframe.h"
@@ -25,7 +25,6 @@ class SceneChangeDetectorBase : public QObject
     unsigned int m_width, m_height;
 };
 
-#endif
+#endif // SCENECHANGEDETECTORBASE_H
 
 /* vim: set expandtab tabstop=4 shiftwidth=4: */
-
diff --git a/mythtv/programs/mythcommflag/SlotRelayer.h b/mythtv/programs/mythcommflag/SlotRelayer.h
@@ -1,5 +1,5 @@
-#ifndef _SLOTRELAYER_H_
-#define _SLOTRELAYER_H_
+#ifndef SLOTRELAYER_H
+#define SLOTRELAYER_H
 
 #include <QObject>
 class QString;
@@ -31,7 +31,6 @@ class SlotRelayer : public QObject
     void (*m_fpVoid)()                  { nullptr };
 };
 
-#endif
-
+#endif // SLOTRELAYER_H
 
 /* vim: set expandtab tabstop=4 shiftwidth=4: */
diff --git a/mythtv/programs/mythcommflag/TemplateFinder.h b/mythtv/programs/mythcommflag/TemplateFinder.h
@@ -15,8 +15,8 @@
  * sequence of images will cause this algorithm to fail.
  */
 
-#ifndef __TEMPLATEFINDER_H__
-#define __TEMPLATEFINDER_H__
+#ifndef TEMPLATEFINDER_H
+#define TEMPLATEFINDER_H
 
 extern "C" {
 #include "libavcodec/avcodec.h"    /* AVFrame */
@@ -95,6 +95,6 @@ class TemplateFinder : public FrameAnalyzer
     struct timeval  m_analyzeTime      {0,0};
 };
 
-#endif  /* !__TEMPLATEFINDER_H__ */
+#endif  /* !TEMPLATEFINDER_H */
 
 /* vim: set expandtab tabstop=4 shiftwidth=4: */
diff --git a/mythtv/programs/mythcommflag/TemplateMatcher.h b/mythtv/programs/mythcommflag/TemplateMatcher.h
@@ -15,8 +15,8 @@
  * template known to change locations, but at a very large cost of time.
  */
 
-#ifndef __TEMPLATEMATCHER_H__
-#define __TEMPLATEMATCHER_H__
+#ifndef TEMPLATEMATCHER_H
+#define TEMPLATEMATCHER_H
 
 extern "C" {
 #include "libavcodec/avcodec.h"    /* AVFrame */
@@ -83,7 +83,6 @@ class TemplateMatcher : public FrameAnalyzer
     struct timeval          m_analyzeTime       {0,0};
 };
 
-#endif  /* !__TEMPLATEMATCHER_H__ */
+#endif  /* !TEMPLATEMATCHER_H */
 
 /* vim: set expandtab tabstop=4 shiftwidth=4: */
-
diff --git a/mythtv/programs/mythcommflag/pgm.h b/mythtv/programs/mythcommflag/pgm.h
@@ -4,8 +4,8 @@
  * Routines for querying and manipulating PGM (greyscale) images.
  */
 
-#ifndef __PGM_H__
-#define __PGM_H__
+#ifndef PGM_H
+#define PGM_H
 
 struct VideoFrame_;
 struct AVFrame;
@@ -22,6 +22,6 @@ int pgm_convolve_radial(struct AVFrame *dst, struct AVFrame *s1,
         struct AVFrame *s2, const struct AVFrame *src, int srcheight,
         const double *mask, int mask_radius);
 
-#endif  /* !__PGM_H__ */
+#endif  /* !PGM_H */
 
 /* vim: set expandtab tabstop=4 shiftwidth=4: */
diff --git a/mythtv/programs/mythcommflag/quickselect.h b/mythtv/programs/mythcommflag/quickselect.h
@@ -1,5 +1,5 @@
-#ifndef __QUICKSELECT_H__
-#define __QUICKSELECT_H__
+#ifndef QUICKSELECT_H
+#define QUICKSELECT_H
 
 unsigned char quick_select(unsigned char *arr, int nelems, int select);
 unsigned char quick_select_median(unsigned char *arr, int nelems);
@@ -10,4 +10,4 @@ unsigned short quick_select_median_ushort(unsigned short *arr, int nelems);
 float quick_select_float(float *arr, int nelems, int select);
 float quick_select_median_float(float *arr, int nelems);
 
-#endif  /* !__QUICKSELECT_H__ */
+#endif  /* !QUICKSELECT_H */
diff --git a/mythtv/programs/mythexternrecorder/MythExternControl.h b/mythtv/programs/mythexternrecorder/MythExternControl.h
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MythExternControl_H_
-#define _MythExternControl_H_
+#ifndef MYTHEXTERNCONTROL_H
+#define MYTHEXTERNCONTROL_H
 
 #include "MythExternRecApp.h"
 
@@ -181,4 +181,4 @@ class MythExternControl : public QObject
     std::atomic<bool> m_ready            {false};
 };
 
-#endif
+#endif // MYTHEXTERNCONTROL_H
diff --git a/mythtv/programs/mythexternrecorder/MythExternRecApp.h b/mythtv/programs/mythexternrecorder/MythExternRecApp.h
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MythTVExternRecApp_H_
-#define _MythTVExternRecApp_H_
+#ifndef MYTHTVEXTERNRECAPP_H
+#define MYTHTVEXTERNRECAPP_H
 
 #include <QObject>
 #include <QtCore/QtCore>
@@ -124,4 +124,4 @@ class MythExternRecApp : public QObject
 
 };
 
-#endif
+#endif // MYTHTVEXTERNRECAPP_H
diff --git a/mythtv/programs/mythfilerecorder/mythfilerecorder.h b/mythtv/programs/mythfilerecorder/mythfilerecorder.h
@@ -1,5 +1,5 @@
-#ifndef _FILE_RECORDER_H_
-#define _FILE_RECORDER_H_
+#ifndef MYTH_FILE_RECORDER_H
+#define MYTH_FILE_RECORDER_H
 
 #include <QObject>
 #include <QFile>
@@ -76,4 +76,4 @@ class Commands : public QObject
     QAtomicInt m_eof     {       0 };
 };
 
-#endif
+#endif // MYTH_FILE_RECORDER_H
diff --git a/mythtv/programs/mythfilldatabase/channeldata.h b/mythtv/programs/mythfilldatabase/channeldata.h
@@ -1,5 +1,5 @@
-#ifndef _CHANNELDATA_H_
-#define _CHANNELDATA_H_
+#ifndef CHANNELDATA_H
+#define CHANNELDATA_H
 
 // Qt headers
 #include <QString>
@@ -33,4 +33,4 @@ class ChannelData
     QString m_cardType;
 };
 
-#endif // _CHANNELDATA_H_
+#endif // CHANNELDATA_H
diff --git a/mythtv/programs/mythfilldatabase/filldata.h b/mythtv/programs/mythfilldatabase/filldata.h
@@ -1,5 +1,5 @@
-#ifndef _FILLDATA_H_
-#define _FILLDATA_H_
+#ifndef FILLDATA_H
+#define FILLDATA_H
 
 // C++ headers
 #include <vector>
@@ -80,4 +80,4 @@ class FillData
     mutable QStringList m_fatalErrors;
 };
 
-#endif // _FILLDATA_H_
+#endif // FILLDATA_H
diff --git a/mythtv/programs/mythfilldatabase/fillutil.h b/mythtv/programs/mythfilldatabase/fillutil.h
@@ -1,5 +1,5 @@
-#ifndef _FILLUTIL_H_
-#define _FILLUTIL_H_
+#ifndef FILLUTIL_H
+#define FILLUTIL_H
 
 // Std C headers
 #include <cstdio>
@@ -14,4 +14,4 @@ bool dash_open(QFile &file, const QString &filename,
 
 QString SetupIconCacheDirectory(void);
 
-#endif // _FILLUTIL_H_
+#endif // FILLUTIL_H
diff --git a/mythtv/programs/mythfilldatabase/xmltvparser.h b/mythtv/programs/mythfilldatabase/xmltvparser.h
@@ -1,5 +1,5 @@
-#ifndef _XMLTVPARSER_H_
-#define _XMLTVPARSER_H_
+#ifndef XMLTVPARSER_H
+#define XMLTVPARSER_H
 
 // Qt headers
 #include <QMap>
@@ -30,4 +30,4 @@ class XMLTVParser
     QString m_tvGrabberPath;
 };
 
-#endif // _XMLTVPARSER_H_
+#endif // XMLTVPARSER_H
diff --git a/mythtv/programs/mythfrontend/idlescreen.h b/mythtv/programs/mythfrontend/idlescreen.h
@@ -1,5 +1,5 @@
-#ifndef _IDLESCREEN_H_
-#define _IDLESCREEN_H_
+#ifndef IDLESCREEN_H
+#define IDLESCREEN_H
 
 #include <mythscreentype.h>
 // libmyth
@@ -52,4 +52,4 @@ class IdleScreen : public MythScreenType
     bool            m_hasConflicts            {false};
 };
 
-#endif
+#endif // IDLESCREEN_H
diff --git a/mythtv/programs/mythfrontend/mediarenderer.h b/mythtv/programs/mythfrontend/mediarenderer.h
@@ -8,8 +8,8 @@
 //                                                                            
 //////////////////////////////////////////////////////////////////////////////
 
-#ifndef __MEDIARENDERER_H__
-#define __MEDIARENDERER_H__
+#ifndef MEDIARENDERER_H
+#define MEDIARENDERER_H
 
 #include <QObject>
 #include <QMutex>
@@ -42,4 +42,4 @@ class MediaRenderer : public UPnp
                                           const QString  &sPin );
 };
 
-#endif
+#endif // MEDIARENDERER_H
diff --git a/mythtv/programs/mythfrontend/playbackboxhelper.h b/mythtv/programs/mythfrontend/playbackboxhelper.h
@@ -1,5 +1,5 @@
-#ifndef _FREE_SPACE_H_
-#define _FREE_SPACE_H_
+#ifndef PLAYBACKBOXHELPER_H
+#define PLAYBACKBOXHELPER_H
 
 #include <cstdint>
 
@@ -67,4 +67,4 @@ class PlaybackBoxHelper : public MThread
     InfoMap             m_artworkCache;
 };
 
-#endif // _FREE_SPACE_H_
+#endif // PLAYBACKBOXHELPER_H
diff --git a/mythtv/programs/mythfrontend/playbackboxlistitem.h b/mythtv/programs/mythfrontend/playbackboxlistitem.h
@@ -1,7 +1,7 @@
 // -*- Mode: c++ -*-
 // vim:set sw=4 ts=4 expandtab:
-#ifndef _PLAYBACKBOXLISTITEM_H_
-#define _PLAYBACKBOXLISTITEM_H_
+#ifndef PLAYBACKBOXLISTITEM_H
+#define PLAYBACKBOXLISTITEM_H
 
 
 #include "mythuibuttonlist.h"
@@ -23,4 +23,4 @@ class PlaybackBoxListItem : public MythUIButtonListItem
 #endif
 };
 
-#endif // _PLAYBACKBOXLISTITEM_H_
+#endif // PLAYBACKBOXLISTITEM_H
diff --git a/mythtv/programs/mythfrontend/proglist_helpers.h b/mythtv/programs/mythfrontend/proglist_helpers.h
@@ -1,5 +1,5 @@
-#ifndef _PROGLIST_HELPERS_H_
-#define _PROGLIST_HELPERS_H_
+#ifndef PROGLIST_HELPERS_H
+#define PROGLIST_HELPERS_H
 
 #include <utility>
 
@@ -130,4 +130,4 @@ class EditPowerSearchPopup : public MythScreenType
     MythUIButton     *m_okButton     {nullptr};
 };
 
-#endif // _PROGLIST_HELPERS_H_
+#endif // PROGLIST_HELPERS_H
diff --git a/mythtv/programs/mythfrontend/programinfocache.h b/mythtv/programs/mythfrontend/programinfocache.h
@@ -1,7 +1,7 @@
 // -*- Mode: c++ -*-
 // vim:set sw=4 ts=4 expandtab:
-#ifndef _PROGRAM_INFO_CACHE_H_
-#define _PROGRAM_INFO_CACHE_H_
+#ifndef PROGRAM_INFO_CACHE_H
+#define PROGRAM_INFO_CACHE_H
 
 // C++ headers
 #include <cstdint>
@@ -63,4 +63,4 @@ class ProgramInfoCache
     mutable QWaitCondition  m_loadWait;
 };
 
-#endif // _PROGRAM_INFO_CACHE_H_
+#endif // PROGRAM_INFO_CACHE_H
diff --git a/mythtv/programs/mythfrontend/themechooser.h b/mythtv/programs/mythfrontend/themechooser.h
@@ -1,5 +1,5 @@
-#ifndef __THEMECHOOSER_H__
-#define __THEMECHOOSER_H__
+#ifndef THEMECHOOSER_H
+#define THEMECHOOSER_H
 
 // Qt headers
 #include <QString>
@@ -115,6 +115,6 @@ class ThemeUpdateChecker : public QObject
     QString    m_newVersion;
 };
 
-#endif /* THEMECHOOSER */
+#endif /* THEMECHOOSER_H */
 
 /* vim: set expandtab tabstop=4 shiftwidth=4: */
diff --git a/mythtv/programs/mythmediaserver/controlrequesthandler.h b/mythtv/programs/mythmediaserver/controlrequesthandler.h
@@ -1,5 +1,5 @@
-#ifndef _CONTROLREQUESTHANDLER_H_
-#define _CONTROLREQUESTHANDLER_H_
+#ifndef CONTROLREQUESTHANDLER_H
+#define CONTROLREQUESTHANDLER_H
 
 using namespace std;
 
@@ -20,4 +20,4 @@ class ControlRequestHandler : public OutboundRequestHandler
     bool AnnounceSocket(void) override; // OutboundRequestHandler
 };
 
-#endif
+#endif // CONTROLREQUESTHANDLER_H
diff --git a/mythtv/programs/mythtranscode/external/replex/element.h b/mythtv/programs/mythtranscode/external/replex/element.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef _ELEMENT_H_
-#define _ELEMENT_H_
+#ifndef ELEMENT_H
+#define ELEMENT_H
 
 #include <cstdint>
 
@@ -136,4 +136,4 @@ int check_audio_header(ringbuffer *rbuf, audio_frame_t * af,
 		       int  off, int le, int type);
 int get_video_ext_info(ringbuffer *rbuf, sequence_t *s, int off, int le);
 
-#endif /*_ELEMENT_H_*/
+#endif /* ELEMENT_H */
diff --git a/mythtv/programs/mythtranscode/external/replex/mpg_common.h b/mythtv/programs/mythtranscode/external/replex/mpg_common.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef _MPG_COMMON_H_
-#define _MPG_COMMON_H_
+#ifndef MPG_COMMON_H
+#define MPG_COMMON_H
 
 #include <cstdint>
 #include "ringbuffer.h"
@@ -75,4 +75,4 @@ int mring_peek( ringbuffer *rbuf, uint8_t *buf, unsigned int l, uint32_t off);
 int ring_find_mpg_header(ringbuffer *rbuf, uint8_t head, int off, int le);
 int ring_find_any_header(ringbuffer *rbuf, uint8_t *head, int off, int le);
 
-#endif /*_MPG_COMMON_H_*/
+#endif /* MPG_COMMON_H */
diff --git a/mythtv/programs/mythtranscode/external/replex/multiplex.h b/mythtv/programs/mythtranscode/external/replex/multiplex.h
@@ -23,8 +23,8 @@
  * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
  *
  */
-#ifndef _MULTIPLEX_H_
-#define _MULTIPLEX_H_
+#ifndef MULTIPLEX_H
+#define MULTIPLEX_H
 
 #include "mpg_common.h"
 #include "pes.h"
@@ -95,4 +95,4 @@ void init_multiplex( multiplex_t *mx, sequence_t *seq_head,
 		     int otype);
 
 void setup_multiplex(multiplex_t *mx);
-#endif /* _MULTIPLEX_H_*/
+#endif /* MULTIPLEX_H */
diff --git a/mythtv/programs/mythtranscode/external/replex/pes.h b/mythtv/programs/mythtranscode/external/replex/pes.h
@@ -3,8 +3,8 @@
 
 */
 
-#ifndef _PES_H_
-#define _PES_H_
+#ifndef PES_H
+#define PES_H
 
 #include <cstdint>
 #include "ringbuffer.h"
@@ -129,7 +129,4 @@ static inline void ptsinc(uint64_t *pts1, uint64_t pts2)
 	*pts1 = (*pts1 + pts2)%MAX_PTS2;
 }
 
-
-
-
-#endif /*_PES_H_*/
+#endif /* PES_H */
diff --git a/mythtv/programs/mythtranscode/external/replex/ringbuffer.h b/mythtv/programs/mythtranscode/external/replex/ringbuffer.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef _RINGBUFFER_H_
-#define _RINGBUFFER_H_
+#ifndef RINGBUFFER_H
+#define RINGBUFFER_H
 
 #include <cstdio>
 #include <cstdint>
@@ -116,4 +116,4 @@
         void dummy_destroy(dummy_buffer *dbuf);
 	void ring_show(ringbuffer *rbuf, unsigned int count, uint32_t off);
 
-#endif /* _RINGBUFFER_H_ */
+#endif /* RINGBUFFER_H */
diff --git a/mythtv/programs/mythtranscode/external/replex/ts.h b/mythtv/programs/mythtranscode/external/replex/ts.h
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef _TS_H_
-#define _TS_H_
+#ifndef TS_H
+#define TS_H
 
 #include "ringbuffer.h"
 #include "mpg_common.h"
@@ -73,4 +73,4 @@ int write_ac3_ts(int n, uint64_t pts, uint8_t *buf, int *alength,
 	 uint8_t ptsdts, int nframes, ringbuffer *ac3rbuffer);
 void write_ts_patpmt(extdata_t *ext, int extcnt, uint8_t prog_num,
 			uint8_t *buf);
-#endif /*_TS_H_*/
+#endif /* TS_H */
diff --git a/mythtv/programs/mythutil/mpegutils.h b/mythtv/programs/mythutil/mpegutils.h
@@ -1,8 +1,8 @@
-#ifndef _MPEG_UTILS_H_
-#define _MPEG_UTILS_H_
+#ifndef MPEG_UTILS_H
+#define MPEG_UTILS_H
 
 #include "mythutil.h"
 
 void registerMPEGUtils(UtilMap &utilMap);
 
-#endif // _MPEG_UTILS_H_
+#endif // MPEG_UTILS_H