diff --git a/libmediation/fs/osdep/file_win32.cpp b/libmediation/fs/osdep/file_win32.cpp
index 9aa19fb2..44bb5278 100644
--- a/libmediation/fs/osdep/file_win32.cpp
+++ b/libmediation/fs/osdep/file_win32.cpp
@@ -194,7 +194,7 @@ uint64_t File::seek(const int64_t offset, const SeekMethod whence) const
     case SeekMethod::smCurrent:
         moveMethod = FILE_CURRENT;
         break;
-    default: // SeekMethod::smEnd:
+    default:  // SeekMethod::smEnd:
         moveMethod = FILE_END;
         break;
     }
diff --git a/libmediation/types/types.h b/libmediation/types/types.h
index fd9c3cd3..6e6f9793 100644
--- a/libmediation/types/types.h
+++ b/libmediation/types/types.h
@@ -1,5 +1,5 @@
-#ifndef __T_TYPES_H
-#define __T_TYPES_H
+#ifndef T_TYPES_H_
+#define T_TYPES_H_
 
 #include <cstdint>
 #include <regex>
@@ -113,4 +113,4 @@ std::vector<wchar_t> toWide(const std::string&);
 std::string toUtf8(const wchar_t*);
 #endif
 
-#endif  //__T_TYPES_H
+#endif  //_T_TYPES_H_
diff --git a/tsMuxer/BufferedReader.h b/tsMuxer/BufferedReader.h
index 1f100225..d4750943 100644
--- a/tsMuxer/BufferedReader.h
+++ b/tsMuxer/BufferedReader.h
@@ -1,5 +1,5 @@
-#ifndef __BUFFERED_READER_H
-#define __BUFFERED_READER_H
+#ifndef BUFFERED_READER_H_
+#define BUFFERED_READER_H_
 
 #include <containers/safequeue.h>
 #include <system/terminatablethread.h>
diff --git a/tsMuxer/aac.h b/tsMuxer/aac.h
index 005f7b46..69fb50cd 100644
--- a/tsMuxer/aac.h
+++ b/tsMuxer/aac.h
@@ -1,7 +1,7 @@
-#include <types/types.h>
+#ifndef AAC_CODEC_H_
+#define AAC_CODEC_H_
 
-#ifndef __AAC_CODEC_H
-#define __AAC_CODEC_H
+#include <types/types.h>
 
 static constexpr int AAC_HEADER_LEN = 7;
 
diff --git a/tsMuxer/aacStreamReader.h b/tsMuxer/aacStreamReader.h
index fc97a1cd..147f02fb 100644
--- a/tsMuxer/aacStreamReader.h
+++ b/tsMuxer/aacStreamReader.h
@@ -1,5 +1,5 @@
-#ifndef __AAC_STREAM_READER_H
-#define __AAC_STREAM_READER_H
+#ifndef AAC_STREAM_READER_H_
+#define AAC_STREAM_READER_H_
 
 #include "aac.h"
 #include "avPacket.h"
diff --git a/tsMuxer/abstractDemuxer.h b/tsMuxer/abstractDemuxer.h
index e92358b9..a7060de7 100644
--- a/tsMuxer/abstractDemuxer.h
+++ b/tsMuxer/abstractDemuxer.h
@@ -1,5 +1,5 @@
-#ifndef __ABSTRACT_DEMUXER_H
-#define __ABSTRACT_DEMUXER_H
+#ifndef ABSTRACT_DEMUXER_H_
+#define ABSTRACT_DEMUXER_H_
 
 #include <assert.h>
 #include <memory.h>
diff --git a/tsMuxer/abstractMuxer.h b/tsMuxer/abstractMuxer.h
index e67b7f47..aa44fcdd 100644
--- a/tsMuxer/abstractMuxer.h
+++ b/tsMuxer/abstractMuxer.h
@@ -1,5 +1,5 @@
-#ifndef __ABSTRACT_MUXER_H
-#define __ABSTRACT_MUXER_H
+#ifndef ABSTRACT_MUXER_H_
+#define ABSTRACT_MUXER_H_
 
 #include <fs/file.h>
 #include <fs/systemlog.h>
diff --git a/tsMuxer/abstractStreamReader.h b/tsMuxer/abstractStreamReader.h
index ee5d06ca..27d045e2 100644
--- a/tsMuxer/abstractStreamReader.h
+++ b/tsMuxer/abstractStreamReader.h
@@ -1,5 +1,5 @@
-#ifndef __ABSTRACT_STREAM_READER_H
-#define __ABSTRACT_STREAM_READER_H
+#ifndef ABSTRACT_STREAM_READER_H_
+#define ABSTRACT_STREAM_READER_H_
 
 #include <fs/file.h>
 #include <types/types.h>
diff --git a/tsMuxer/abstractreader.h b/tsMuxer/abstractreader.h
index 7888f314..81d33e5c 100644
--- a/tsMuxer/abstractreader.h
+++ b/tsMuxer/abstractreader.h
@@ -1,5 +1,5 @@
-#ifndef __ABSTRACT_READER_H
-#define __ABSTRACT_READER_H
+#ifndef ABSTRACT_READER_H_
+#define ABSTRACT_READER_H_
 
 #include <types/types.h>
 
diff --git a/tsMuxer/ac3Codec.h b/tsMuxer/ac3Codec.h
index c3de51fc..8a45932e 100644
--- a/tsMuxer/ac3Codec.h
+++ b/tsMuxer/ac3Codec.h
@@ -1,5 +1,5 @@
-#ifndef __AC3_CODEC_H
-#define __AC3_CODEC_H
+#ifndef AC3_CODEC_H_
+#define AC3_CODEC_H_
 
 #include "avPacket.h"
 #include "mlpCodec.h"
diff --git a/tsMuxer/ac3StreamReader.h b/tsMuxer/ac3StreamReader.h
index f4aa49d5..6df5fa25 100644
--- a/tsMuxer/ac3StreamReader.h
+++ b/tsMuxer/ac3StreamReader.h
@@ -1,5 +1,5 @@
-#ifndef __AC3_STREAM_READER_H
-#define __AC3_STREAM_READER_H
+#ifndef AC3_STREAM_READER_H_
+#define AC3_STREAM_READER_H_
 
 #include <deque>
 
diff --git a/tsMuxer/avCodecs.h b/tsMuxer/avCodecs.h
index f5350989..4127dd7e 100644
--- a/tsMuxer/avCodecs.h
+++ b/tsMuxer/avCodecs.h
@@ -1,5 +1,5 @@
-#ifndef __AV_CODECS_H
-#define __AV_CODECS_H
+#ifndef AV_CODECS_H_
+#define AV_CODECS_H_
 
 #include <types/types.h>
 
diff --git a/tsMuxer/avPacket.h b/tsMuxer/avPacket.h
index 99586910..9cd6d4b8 100644
--- a/tsMuxer/avPacket.h
+++ b/tsMuxer/avPacket.h
@@ -1,5 +1,5 @@
-#ifndef __AV_PACKET_H
-#define __AV_PACKET_H
+#ifndef AV_PACKET_H_
+#define AV_PACKET_H_
 
 #include <types/types.h>
 
diff --git a/tsMuxer/bitStream.h b/tsMuxer/bitStream.h
index a84b4f47..afb488b4 100644
--- a/tsMuxer/bitStream.h
+++ b/tsMuxer/bitStream.h
@@ -1,5 +1,5 @@
-#ifndef __BITSTREAM_H
-#define __BITSTREAM_H
+#ifndef BITSTREAM_H_
+#define BITSTREAM_H_
 
 #include <assert.h>
 #include <limits.h>
diff --git a/tsMuxer/blank_patterns.h b/tsMuxer/blank_patterns.h
index 686cef02..ba7d820e 100644
--- a/tsMuxer/blank_patterns.h
+++ b/tsMuxer/blank_patterns.h
@@ -1,5 +1,5 @@
-#ifndef __BLANK_PATTERNS_H
-#define __BLANK_PATTERNS_H
+#ifndef BLANK_PATTERNS_H_
+#define BLANK_PATTERNS_H_
 
 uint8_t pattern_ntsc[] = {
     0x00, 0x00, 0x00, 0x01, 0x67, 0x4D, 0x40, 0x29, 0xB9, 0x10, 0x16, 0x87, 0xB4, 0x20, 0x01, 0x00, 0x00, 0x03, 0x00,
diff --git a/tsMuxer/blurayHelper.h b/tsMuxer/blurayHelper.h
index 5069b893..e4293e2d 100644
--- a/tsMuxer/blurayHelper.h
+++ b/tsMuxer/blurayHelper.h
@@ -1,5 +1,5 @@
-#ifndef _BLURAY_HELPER_H__
-#define _BLURAY_HELPER_H__
+#ifndef BLURAY_HELPER_H_
+#define BLURAY_HELPER_H_
 
 #include <string>
 #include <vector>
@@ -46,4 +46,4 @@ class BlurayHelper : public FileFactory
     IsoWriter* m_isoWriter;
 };
 
-#endif  // _BLURAY_HELPER_H__
+#endif  // _BLURAY_HELPER_H_
diff --git a/tsMuxer/bufferedFileReader.h b/tsMuxer/bufferedFileReader.h
index 71ba3321..cc2f754c 100644
--- a/tsMuxer/bufferedFileReader.h
+++ b/tsMuxer/bufferedFileReader.h
@@ -1,5 +1,5 @@
-#ifndef __BUFFERED_FILE_READER_H
-#define __BUFFERED_FILE_READER_H
+#ifndef BUFFERED_FILE_READER_H_
+#define BUFFERED_FILE_READER_H_
 
 #include <fs/file.h>
 #include <fs/systemlog.h>
diff --git a/tsMuxer/bufferedFileWriter.h b/tsMuxer/bufferedFileWriter.h
index 4c61f435..8972684b 100644
--- a/tsMuxer/bufferedFileWriter.h
+++ b/tsMuxer/bufferedFileWriter.h
@@ -1,5 +1,5 @@
-#ifndef __BUFFERED_FILE_WRITER_H
-#define __BUFFERED_FILE_WRITER_H
+#ifndef BUFFERED_FILE_WRITER_H_
+#define BUFFERED_FILE_WRITER_H_
 
 #include <containers/safequeue.h>
 #include <fs/file.h>
diff --git a/tsMuxer/bufferedReaderManager.h b/tsMuxer/bufferedReaderManager.h
index 75447336..0115529f 100644
--- a/tsMuxer/bufferedReaderManager.h
+++ b/tsMuxer/bufferedReaderManager.h
@@ -1,5 +1,5 @@
-#ifndef __BUFFERED_READER_MANAGER_H
-#define __BUFFERED_READER_MANAGER_H
+#ifndef BUFFERED_READER_MANAGER_H_
+#define BUFFERED_READER_MANAGER_H_
 
 #include <types/types.h>
 
diff --git a/tsMuxer/crc32.h b/tsMuxer/crc32.h
index bee0d25f..529d125e 100644
--- a/tsMuxer/crc32.h
+++ b/tsMuxer/crc32.h
@@ -1,5 +1,5 @@
-#ifndef __CRC32_H
-#define __CRC32_H
+#ifndef CRC32_H_
+#define CRC32_H_
 
 static uint32_t calculateCRC32(uint8_t *p_begin, uint64_t i_count, uint32_t i_crc = 0)
 {
diff --git a/tsMuxer/dtsStreamReader.h b/tsMuxer/dtsStreamReader.h
index 57e02d2f..f48ccdd5 100644
--- a/tsMuxer/dtsStreamReader.h
+++ b/tsMuxer/dtsStreamReader.h
@@ -1,5 +1,5 @@
-#ifndef __DTS_STREAM_READER
-#define __DTS_STREAM_READER
+#ifndef DTS_STREAM_READER_
+#define DTS_STREAM_READER_
 
 #include <algorithm>
 
diff --git a/tsMuxer/dvbSubStreamReader.h b/tsMuxer/dvbSubStreamReader.h
index 49f818e2..3e4ad51f 100644
--- a/tsMuxer/dvbSubStreamReader.h
+++ b/tsMuxer/dvbSubStreamReader.h
@@ -1,5 +1,5 @@
-#ifndef __DVB_SUB_STREAM_READRE
-#define __DVB_SUB_STREAM_READRE
+#ifndef DVB_SUB_STREAM_READER_
+#define DVB_SUB_STREAM_READER_
 
 #include "simplePacketizerReader.h"
 
diff --git a/tsMuxer/h264StreamReader.h b/tsMuxer/h264StreamReader.h
index a9737a71..e558e3e6 100644
--- a/tsMuxer/h264StreamReader.h
+++ b/tsMuxer/h264StreamReader.h
@@ -1,5 +1,5 @@
-#ifndef __H264_STREAM_READER_H
-#define __H264_STREAM_READER_H
+#ifndef H264_STREAM_READER_H_
+#define H264_STREAM_READER_H_
 
 #include <iostream>
 #include <map>
diff --git a/tsMuxer/hevc.h b/tsMuxer/hevc.h
index b5fc3a78..60e47442 100644
--- a/tsMuxer/hevc.h
+++ b/tsMuxer/hevc.h
@@ -1,5 +1,5 @@
-#ifndef __HEVC_H_
-#define __HEVC_H_
+#ifndef HEVC_H_
+#define HEVC_H_
 
 #include "nalUnits.h"
 
@@ -179,4 +179,4 @@ struct HevcSliceHeader : public HevcUnit
 
 std::vector<std::vector<uint8_t>> hevc_extract_priv_data(const uint8_t* buff, int size, int* nal_size);
 
-#endif  // __HEVC_H_
+#endif  // _HEVC_H_
diff --git a/tsMuxer/hevcStreamReader.h b/tsMuxer/hevcStreamReader.h
index 35035969..f2f82e11 100644
--- a/tsMuxer/hevcStreamReader.h
+++ b/tsMuxer/hevcStreamReader.h
@@ -1,5 +1,5 @@
-#ifndef __HEVC_STREAM_READER_H__
-#define __HEVC_STREAM_READER_H__
+#ifndef HEVC_STREAM_READER_H_
+#define HEVC_STREAM_READER_H_
 
 #include <map>
 
@@ -71,4 +71,4 @@ class HEVCStreamReader : public MPEGStreamReader
     int m_vpsSizeDiff;
 };
 
-#endif  // __HEVC_STREAM_READER_H__
+#endif  // _HEVC_STREAM_READER_H_
diff --git a/tsMuxer/ioContextDemuxer.h b/tsMuxer/ioContextDemuxer.h
index 2a850604..d1aec1f1 100644
--- a/tsMuxer/ioContextDemuxer.h
+++ b/tsMuxer/ioContextDemuxer.h
@@ -1,5 +1,5 @@
-#ifndef __IO_CONTEXT_DEMUXER_H
-#define __IO_CONTEXT_DEMUXER_H
+#ifndef IO_CONTEXT_DEMUXER_H_
+#define IO_CONTEXT_DEMUXER_H_
 
 #include <map>
 #include <queue>
diff --git a/tsMuxer/iso_writer.h b/tsMuxer/iso_writer.h
index 7fb7f2a2..93763ed0 100644
--- a/tsMuxer/iso_writer.h
+++ b/tsMuxer/iso_writer.h
@@ -1,5 +1,5 @@
-#ifndef __ISO_WRITER_H__
-#define __ISO_WRITER_H__
+#ifndef ISO_WRITER_H_
+#define ISO_WRITER_H_
 
 #include <fs/file.h>
 
@@ -293,4 +293,4 @@ class ISOFile : public AbstractOutputStream
     FileEntryInfo* m_entry;
 };
 
-#endif  // __ISO_WRITER_H__
+#endif  // ISO_WRITER_H_
diff --git a/tsMuxer/lpcmStreamReader.h b/tsMuxer/lpcmStreamReader.h
index f3802182..ac88c971 100644
--- a/tsMuxer/lpcmStreamReader.h
+++ b/tsMuxer/lpcmStreamReader.h
@@ -1,5 +1,5 @@
-#ifndef __LPCM_STREAM_READER_H
-#define __LPCM_STREAM_READER_H
+#ifndef LPCM_STREAM_READER_H_
+#define LPCM_STREAM_READER_H_
 
 #include "avPacket.h"
 #include "simplePacketizerReader.h"
diff --git a/tsMuxer/matroskaDemuxer.h b/tsMuxer/matroskaDemuxer.h
index 94de1c98..5f909c71 100644
--- a/tsMuxer/matroskaDemuxer.h
+++ b/tsMuxer/matroskaDemuxer.h
@@ -1,5 +1,5 @@
-#ifndef __MATROSKA_STREAM_READER_H
-#define __MATROSKA_STREAM_READER_H
+#ifndef MATROSKA_STREAM_READER_H_
+#define MATROSKA_STREAM_READER_H_
 
 #include "ioContextDemuxer.h"
 // #include "tsPacket.h"
diff --git a/tsMuxer/mlpCodec.h b/tsMuxer/mlpCodec.h
index 6e466417..5446dd97 100644
--- a/tsMuxer/mlpCodec.h
+++ b/tsMuxer/mlpCodec.h
@@ -1,7 +1,7 @@
 #include <types/types.h>
 
-#ifndef __MLP_CODEC_H
-#define __MLP_CODEC_H
+#ifndef MLP_CODEC_H_
+#define MLP_CODEC_H_
 
 static constexpr int MLP_HEADER_LEN = 7;
 
diff --git a/tsMuxer/mlpStreamReader.h b/tsMuxer/mlpStreamReader.h
index a0cd9c58..c7816165 100644
--- a/tsMuxer/mlpStreamReader.h
+++ b/tsMuxer/mlpStreamReader.h
@@ -1,5 +1,5 @@
-#ifndef __MLP_STREAM_READER_H
-#define __MLP_STREAM_READER_H
+#ifndef MLP_STREAM_READER_H_
+#define MLP_STREAM_READER_H_
 
 #include "avPacket.h"
 #include "mlpCodec.h"
diff --git a/tsMuxer/movDemuxer.h b/tsMuxer/movDemuxer.h
index cc76918b..33d3ace8 100644
--- a/tsMuxer/movDemuxer.h
+++ b/tsMuxer/movDemuxer.h
@@ -1,5 +1,5 @@
-#ifndef __MOV_DEMUXER_H
-#define __MOV_DEMUXER_H
+#ifndef MOV_DEMUXER_H_
+#define MOV_DEMUXER_H_
 
 #include <map>
 #include <queue>
diff --git a/tsMuxer/mp3Codec.h b/tsMuxer/mp3Codec.h
index 76a832b2..75d59b83 100644
--- a/tsMuxer/mp3Codec.h
+++ b/tsMuxer/mp3Codec.h
@@ -1,5 +1,5 @@
-#ifndef __MP3_CODEC_H
-#define __MP3_CODEC_H
+#ifndef MP3_CODEC_H_
+#define MP3_CODEC_H_
 
 #include <types/types.h>
 
diff --git a/tsMuxer/mpeg2StreamReader.h b/tsMuxer/mpeg2StreamReader.h
index eed7f5fc..8ca8a3b0 100644
--- a/tsMuxer/mpeg2StreamReader.h
+++ b/tsMuxer/mpeg2StreamReader.h
@@ -1,5 +1,5 @@
-#ifndef __MPEG2_STREAM_READER_H
-#define __MPEG2_STREAM_READER_H
+#ifndef MPEG2_STREAM_READER_H_
+#define MPEG2_STREAM_READER_H_
 
 #include "avCodecs.h"
 #include "mpegStreamReader.h"
diff --git a/tsMuxer/mpegAudioStreamReader.h b/tsMuxer/mpegAudioStreamReader.h
index 9a7b8895..db6fc382 100644
--- a/tsMuxer/mpegAudioStreamReader.h
+++ b/tsMuxer/mpegAudioStreamReader.h
@@ -1,5 +1,5 @@
-#ifndef __MPEG_AUDIO_STREAM_READER
-#define __MPEG_AUDIO_STREAM_READER
+#ifndef MPEG_AUDIO_STREAM_READER_
+#define MPEG_AUDIO_STREAM_READER_
 
 #include "mp3Codec.h"
 #include "simplePacketizerReader.h"
diff --git a/tsMuxer/mpegStreamReader.h b/tsMuxer/mpegStreamReader.h
index 4f8830dd..974342df 100644
--- a/tsMuxer/mpegStreamReader.h
+++ b/tsMuxer/mpegStreamReader.h
@@ -1,5 +1,5 @@
-#ifndef __MPEG_STREAM_READER_H
-#define __MPEG_STREAM_READER_H
+#ifndef MPEG_STREAM_READER_H_
+#define MPEG_STREAM_READER_H_
 
 #include <algorithm>
 
diff --git a/tsMuxer/mpegVideo.h b/tsMuxer/mpegVideo.h
index d9f175bd..7d899d0f 100644
--- a/tsMuxer/mpegVideo.h
+++ b/tsMuxer/mpegVideo.h
@@ -1,5 +1,5 @@
-#ifndef __MPEG_VIDEO_H
-#define __MPEG_VIDEO_H
+#ifndef MPEG_VIDEO_H_
+#define MPEG_VIDEO_H_
 
 /* Start codes. */
 
diff --git a/tsMuxer/muxerManager.h b/tsMuxer/muxerManager.h
index 3fa6412f..8542e8bc 100644
--- a/tsMuxer/muxerManager.h
+++ b/tsMuxer/muxerManager.h
@@ -1,5 +1,5 @@
-#ifndef __MUXER_MANAGER_H
-#define __MUXER_MANAGER_H
+#ifndef MUXER_MANAGER_H_
+#define MUXER_MANAGER_H_
 
 #include "abstractMuxer.h"
 #include "bufferedFileWriter.h"
@@ -102,4 +102,4 @@ class MuxerManager
     bool m_reproducibleIsoHeader = false;
 };
 
-#endif  // __MUXER_MANAGER_H
+#endif  // _MUXER_MANAGER_H_
diff --git a/tsMuxer/nalUnits.h b/tsMuxer/nalUnits.h
index 410afec0..c671d30d 100644
--- a/tsMuxer/nalUnits.h
+++ b/tsMuxer/nalUnits.h
@@ -1,5 +1,5 @@
-#ifndef __NAL_UNITS_H
-#define __NAL_UNITS_H
+#ifndef NAL_UNITS_H_
+#define NAL_UNITS_H_
 
 #include <memory.h>
 #include <types/types.h>
diff --git a/tsMuxer/osdep/textSubtitlesRenderFT.h b/tsMuxer/osdep/textSubtitlesRenderFT.h
index 53bb1265..b9c59cf3 100644
--- a/tsMuxer/osdep/textSubtitlesRenderFT.h
+++ b/tsMuxer/osdep/textSubtitlesRenderFT.h
@@ -1,5 +1,5 @@
-#ifndef __TEXT_SUBTITLES_RENDER_FT_H
-#define __TEXT_SUBTITLES_RENDER_FT_H
+#ifndef TEXT_SUBTITLES_RENDER_FT_H_
+#define TEXT_SUBTITLES_RENDER_FT_H_
 
 #include <ft2build.h>
 
diff --git a/tsMuxer/osdep/textSubtitlesRenderWin32.h b/tsMuxer/osdep/textSubtitlesRenderWin32.h
index 1c905fc7..045c632b 100644
--- a/tsMuxer/osdep/textSubtitlesRenderWin32.h
+++ b/tsMuxer/osdep/textSubtitlesRenderWin32.h
@@ -1,5 +1,5 @@
-#ifndef __TEXT_SUBTITLES_RENDER_WIN_H
-#define __TEXT_SUBTITLES_RENDER_WIN_H
+#ifndef TEXT_SUBTITLES_RENDER_WIN_H_
+#define TEXT_SUBTITLES_RENDER_WIN_H_
 
 #include "../textSubtitlesRender.h"
 #include "windows.h"
diff --git a/tsMuxer/programStreamDemuxer.h b/tsMuxer/programStreamDemuxer.h
index 56c000db..7f6ba744 100644
--- a/tsMuxer/programStreamDemuxer.h
+++ b/tsMuxer/programStreamDemuxer.h
@@ -1,5 +1,5 @@
-#ifndef __PROGRAM_STREAM_DEMUXER_H
-#define __PROGRAM_STREAM_DEMUXER_H
+#ifndef PROGRAM_STREAM_DEMUXER_H_
+#define PROGRAM_STREAM_DEMUXER_H_
 
 #include <set>
 #include <vector>
diff --git a/tsMuxer/psgStreamReader.h b/tsMuxer/psgStreamReader.h
index 7f22b952..18dff6c3 100644
--- a/tsMuxer/psgStreamReader.h
+++ b/tsMuxer/psgStreamReader.h
@@ -1,5 +1,5 @@
-#ifndef __PGS_STREAM_READER_H
-#define __PGS_STREAM_READER_H
+#ifndef PGS_STREAM_READER_H_
+#define PGS_STREAM_READER_H_
 
 #include <vector>
 
diff --git a/tsMuxer/simplePacketizerReader.h b/tsMuxer/simplePacketizerReader.h
index 85966bd8..731d64d3 100644
--- a/tsMuxer/simplePacketizerReader.h
+++ b/tsMuxer/simplePacketizerReader.h
@@ -1,5 +1,5 @@
-#ifndef __SIMPLE_PACKETIZER_READER_H
-#define __SIMPLE_PACKETIZER_READER_H
+#ifndef SIMPLE_PACKETIZER_READER_H_
+#define SIMPLE_PACKETIZER_READER_H_
 
 #include "abstractStreamReader.h"
 #include "avCodecs.h"
diff --git a/tsMuxer/singleFileMuxer.h b/tsMuxer/singleFileMuxer.h
index dd5fd6a1..eebb43ae 100644
--- a/tsMuxer/singleFileMuxer.h
+++ b/tsMuxer/singleFileMuxer.h
@@ -1,5 +1,5 @@
-#ifndef __SINGLE_FILE_MUXER_H
-#define __SINGLE_FILE_MUXER_H
+#ifndef SINGLE_FILE_MUXER_H_
+#define SINGLE_FILE_MUXER_H_
 
 #include <types/types.h>
 
diff --git a/tsMuxer/srtStreamReader.h b/tsMuxer/srtStreamReader.h
index 3008809a..92971f26 100644
--- a/tsMuxer/srtStreamReader.h
+++ b/tsMuxer/srtStreamReader.h
@@ -1,5 +1,5 @@
-#ifndef __SRT_STREAM_READER
-#define __SRT_STREAM_READER
+#ifndef SRT_STREAM_READER_
+#define SRT_STREAM_READER_
 
 #include <queue>
 
diff --git a/tsMuxer/subTrackFilter.h b/tsMuxer/subTrackFilter.h
index 504356a3..154babfa 100644
--- a/tsMuxer/subTrackFilter.h
+++ b/tsMuxer/subTrackFilter.h
@@ -1,5 +1,5 @@
-#ifndef __SUB_TRACK_FILTER_H__
-#define __SUB_TRACK_FILTER_H__
+#ifndef SUB_TRACK_FILTER_H_
+#define SUB_TRACK_FILTER_H_
 
 #include "abstractreader.h"
 
@@ -19,4 +19,4 @@ class SubTrackFilter
     int m_srcPID;
 };
 
-#endif  // __SUB_TRACK_FILTER_H__
+#endif  // SUB_TRACK_FILTER_H_
diff --git a/tsMuxer/textSubtitles.h b/tsMuxer/textSubtitles.h
index c0f6c8ee..b23a98c6 100644
--- a/tsMuxer/textSubtitles.h
+++ b/tsMuxer/textSubtitles.h
@@ -1,5 +1,5 @@
-#ifndef __TEXT_SUBTITLES_H
-#define __TEXT_SUBTITLES_H
+#ifndef TEXT_SUBTITLES_H_
+#define TEXT_SUBTITLES_H_
 
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN  // Exclude rarely-used stuff from Windows headers
diff --git a/tsMuxer/textSubtitlesRender.h b/tsMuxer/textSubtitlesRender.h
index 137f815e..a13415ed 100644
--- a/tsMuxer/textSubtitlesRender.h
+++ b/tsMuxer/textSubtitlesRender.h
@@ -1,5 +1,5 @@
-#ifndef __TEXT_SUBTITLES_RENDER
-#define __TEXT_SUBTITLES_RENDER
+#ifndef TEXT_SUBTITLES_RENDER_
+#define TEXT_SUBTITLES_RENDER_
 
 #include <types/types.h>
 
diff --git a/tsMuxer/tsMuxer.h b/tsMuxer/tsMuxer.h
index 36e19b9b..dfaf5ce6 100644
--- a/tsMuxer/tsMuxer.h
+++ b/tsMuxer/tsMuxer.h
@@ -1,5 +1,5 @@
-#ifndef __TS_MUXER_H
-#define __TS_MUXER_H
+#ifndef TS_MUXER_H_
+#define TS_MUXER_H_
 
 #include <types/types.h>
 
diff --git a/tsMuxer/tsPacket.h b/tsMuxer/tsPacket.h
index 94dd598f..f608bbac 100644
--- a/tsMuxer/tsPacket.h
+++ b/tsMuxer/tsPacket.h
@@ -1,5 +1,5 @@
-#ifndef __TS_PACKET_H
-#define __TS_PACKET_H
+#ifndef TS_PACKET_H_
+#define TS_PACKET_H_
 
 #include <memory.h>
 #include <types/types.h>
diff --git a/tsMuxer/utf8Converter.h b/tsMuxer/utf8Converter.h
index bc1efb00..4ff9b3fe 100644
--- a/tsMuxer/utf8Converter.h
+++ b/tsMuxer/utf8Converter.h
@@ -1,5 +1,5 @@
-#ifndef __UTFCONVERTER__H__
-#define __UTFCONVERTER__H__
+#ifndef UTFCONVERTER_H_
+#define UTFCONVERTER_H_
 
 #include <types/types.h>
 
diff --git a/tsMuxer/vc1StreamReader.h b/tsMuxer/vc1StreamReader.h
index 7dd0bf66..d460225b 100644
--- a/tsMuxer/vc1StreamReader.h
+++ b/tsMuxer/vc1StreamReader.h
@@ -1,5 +1,5 @@
-#ifndef __VC1_STREAM_READER_H
-#define __VC1_STREAM_READER_H
+#ifndef VC1_STREAM_READER_H_
+#define VC1_STREAM_READER_H_
 
 #include "avCodecs.h"
 #include "mpegStreamReader.h"
diff --git a/tsMuxer/vodCoreException.h b/tsMuxer/vodCoreException.h
index bd67c802..5a1aa69b 100644
--- a/tsMuxer/vodCoreException.h
+++ b/tsMuxer/vodCoreException.h
@@ -1,5 +1,5 @@
-#ifndef __VOD_CORE_EXCEPTION_H
-#define __VOD_CORE_EXCEPTION_H
+#ifndef VOD_CORE_EXCEPTION_H_
+#define VOD_CORE_EXCEPTION_H_
 
 #include <sstream>
 #include <string>
diff --git a/tsMuxer/vod_common.h b/tsMuxer/vod_common.h
index 2b646154..c974b2b5 100644
--- a/tsMuxer/vod_common.h
+++ b/tsMuxer/vod_common.h
@@ -1,5 +1,5 @@
-#ifndef __VOD_COMMON_H
-#define __VOD_COMMON_H
+#ifndef VOD_COMMON_H_
+#define VOD_COMMON_H_
 
 #include <types/types.h>
 
diff --git a/tsMuxer/vvc.h b/tsMuxer/vvc.h
index 2b0dab15..8379f0fc 100644
--- a/tsMuxer/vvc.h
+++ b/tsMuxer/vvc.h
@@ -1,5 +1,5 @@
-#ifndef __VVC_H_
-#define __VVC_H_
+#ifndef VVC_H_
+#define VVC_H_
 
 #include "nalUnits.h"
 
@@ -177,4 +177,4 @@ struct VvcSliceHeader : public VvcUnit
 
 std::vector<std::vector<uint8_t>> vvc_extract_priv_data(const uint8_t* buff, int size, int* nal_size);
 
-#endif  // __VVC_H_
+#endif  // VVC_H_
diff --git a/tsMuxer/vvcStreamReader.h b/tsMuxer/vvcStreamReader.h
index 8704a805..442b052d 100644
--- a/tsMuxer/vvcStreamReader.h
+++ b/tsMuxer/vvcStreamReader.h
@@ -1,5 +1,5 @@
-#ifndef __VVC_STREAM_READER_H__
-#define __VVC_STREAM_READER_H__
+#ifndef VVC_STREAM_READER_H_
+#define VVC_STREAM_READER_H_
 
 #include <map>
 
@@ -68,4 +68,4 @@ class VVCStreamReader : public MPEGStreamReader
     int m_vpsSizeDiff;
 };
 
-#endif  // __VVC_STREAM_READER_H__
+#endif  // _VVC_STREAM_READER_H_
diff --git a/tsMuxer/wave.h b/tsMuxer/wave.h
index 087b30f4..af3a9a7a 100644
--- a/tsMuxer/wave.h
+++ b/tsMuxer/wave.h
@@ -1,5 +1,5 @@
-#ifndef __WAVE_FORMAT_H
-#define __WAVE_FORMAT_H
+#ifndef WAVE_FORMAT_H_
+#define WAVE_FORMAT_H_
 
 #include <types/types.h>