Index: App/utils/BitrateTargeting/ExtractBitrates.h
===================================================================
--- App/utils/BitrateTargeting/ExtractBitrates.h	(revision 2966)
+++ App/utils/BitrateTargeting/ExtractBitrates.h	(working copy)
@@ -31,8 +31,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef EXTRACT_BITRATES_H
-#define EXTRACT_BITRATES_H
+#ifndef __EXTRACTBITRATES__
+#define __EXTRACTBITRATES__
 
 #include "RuntimeError.h"
 #include <vector>
Index: App/utils/BitrateTargeting/GuessLambdaModifiers.h
===================================================================
--- App/utils/BitrateTargeting/GuessLambdaModifiers.h	(revision 2966)
+++ App/utils/BitrateTargeting/GuessLambdaModifiers.h	(working copy)
@@ -31,8 +31,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CALCULATE_LAMBDA_MODIFIER_H
-#define CALCULATE_LAMBDA_MODIFIER_H
+#ifndef __GUESSLAMBDAMODIFIERS__
+#define __GUESSLAMBDAMODIFIERS__
 
 #include "RuntimeError.h"
 #include <vector>
Index: App/utils/BitrateTargeting/RuntimeError.h
===================================================================
--- App/utils/BitrateTargeting/RuntimeError.h	(revision 2966)
+++ App/utils/BitrateTargeting/RuntimeError.h	(working copy)
@@ -31,8 +31,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DIRECTORY_LIB_RUNTIME_ERROR_H
-#define DIRECTORY_LIB_RUNTIME_ERROR_H
+#ifndef __RUNTIMEERROR__
+#define __RUNTIMEERROR__
 
 #include <sstream>
 #include <stdexcept>
Index: Lib/TAppCommon/program_options_lite.h
===================================================================
--- Lib/TAppCommon/program_options_lite.h	(revision 2966)
+++ Lib/TAppCommon/program_options_lite.h	(working copy)
@@ -30,6 +30,10 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#ifndef __PROGRAM_OPTIONS_LITE__
+#define __PROGRAM_OPTIONS_LITE__
+
 #include <iostream>
 #include <sstream>
 #include <string>
@@ -230,3 +234,5 @@
 }; /* namespace: df */
 
 //! \}
+
+#endif
Index: Lib/TLibCommon/AccessUnit.h
===================================================================
--- Lib/TLibCommon/AccessUnit.h	(revision 2966)
+++ Lib/TLibCommon/AccessUnit.h	(working copy)
@@ -38,6 +38,9 @@
 
 #pragma once
 
+#ifndef __ACCESSUNIT__
+#define __ACCESSUNIT__
+
 #include <list>
 #include "NAL.h"
 
@@ -69,3 +72,5 @@
 };
 
 //! \}
+
+#endif
Index: Lib/TLibCommon/ContextModel.h
===================================================================
--- Lib/TLibCommon/ContextModel.h	(revision 2966)
+++ Lib/TLibCommon/ContextModel.h	(working copy)
@@ -36,8 +36,8 @@
     \brief    context model class (header)
 */
 
-#ifndef __CONTEXT_MODEL__
-#define __CONTEXT_MODEL__
+#ifndef __CONTEXTMODEL__
+#define __CONTEXTMODEL__
 
 #if _MSC_VER > 1000
 #pragma once
Index: Lib/TLibCommon/ContextModel3DBuffer.h
===================================================================
--- Lib/TLibCommon/ContextModel3DBuffer.h	(revision 2966)
+++ Lib/TLibCommon/ContextModel3DBuffer.h	(working copy)
@@ -35,8 +35,8 @@
     \brief    context model 3D buffer class (header)
 */
 
-#ifndef _HM_CONTEXT_MODEL_3DBUFFER_H_
-#define _HM_CONTEXT_MODEL_3DBUFFER_H_
+#ifndef __CONTEXTMODEL3DBUFFER__
+#define __CONTEXTMODEL3DBUFFER__
 
 #include <stdio.h>
 #include <assert.h>
Index: Lib/TLibCommon/NAL.h
===================================================================
--- Lib/TLibCommon/NAL.h	(revision 2966)
+++ Lib/TLibCommon/NAL.h	(working copy)
@@ -33,6 +33,9 @@
 
 #pragma once
 
+#ifndef __NAL__
+#define __NAL__
+
 #include <vector>
 #include <sstream>
 #include "CommonDef.h"
@@ -111,3 +114,5 @@
 };
 //! \}
 //! \}
+
+#endif
Index: Lib/TLibCommon/SEI.h
===================================================================
--- Lib/TLibCommon/SEI.h	(revision 2966)
+++ Lib/TLibCommon/SEI.h	(working copy)
@@ -32,6 +32,10 @@
  */
 
 #pragma once
+
+#ifndef __SEI__
+#define __SEI__
+
 #include <list>
 #include <vector>
 #include <cstring>
@@ -404,3 +408,5 @@
 };
 
 //! \}
+
+#endif
Index: Lib/TLibCommon/TComBitCounter.h
===================================================================
--- Lib/TLibCommon/TComBitCounter.h	(revision 2966)
+++ Lib/TLibCommon/TComBitCounter.h	(working copy)
@@ -35,8 +35,8 @@
     \brief    Class for counting bits (header)
 */
 
-#ifndef __COMBITCOUNTER__
-#define __COMBITCOUNTER__
+#ifndef __TCOMBITCOUNTER__
+#define __TCOMBITCOUNTER__
 
 #if _MSC_VER > 1000
 #pragma once
Index: Lib/TLibCommon/TComBitStream.h
===================================================================
--- Lib/TLibCommon/TComBitStream.h	(revision 2966)
+++ Lib/TLibCommon/TComBitStream.h	(working copy)
@@ -35,8 +35,8 @@
     \brief    class for handling bitstream (header)
 */
 
-#ifndef __COMBITSTREAM__
-#define __COMBITSTREAM__
+#ifndef __TCOMBITSTREAM__
+#define __TCOMBITSTREAM__
 
 #if _MSC_VER > 1000
 #pragma once
Index: Lib/TLibCommon/TComCABACTables.h
===================================================================
--- Lib/TLibCommon/TComCABACTables.h	(revision 2966)
+++ Lib/TLibCommon/TComCABACTables.h	(working copy)
@@ -35,8 +35,8 @@
     \brief    static class for CABAC tables
 */
 
-#ifndef __TCOM_CABAC_TABLES__
-#define __TCOM_CABAC_TABLES__
+#ifndef __TCOMCABACTABLES__
+#define __TCOMCABACTABLES__
 
 #include "TLibCommon/CommonDef.h"
 
Index: Lib/TLibCommon/TComDataCU.h
===================================================================
--- Lib/TLibCommon/TComDataCU.h	(revision 2966)
+++ Lib/TLibCommon/TComDataCU.h	(working copy)
@@ -36,8 +36,8 @@
     \todo     not all entities are documented
 */
 
-#ifndef _TCOMDATACU_
-#define _TCOMDATACU_
+#ifndef __TCOMDATACU__
+#define __TCOMDATACU__
 
 #include <assert.h>
 
Index: Lib/TLibCommon/TComInterpolationFilter.h
===================================================================
--- Lib/TLibCommon/TComInterpolationFilter.h	(revision 2966)
+++ Lib/TLibCommon/TComInterpolationFilter.h	(working copy)
@@ -36,8 +36,8 @@
  * \brief Declaration of TComInterpolationFilter class
  */
 
-#ifndef __HM_TCOMINTERPOLATIONFILTER_H__
-#define __HM_TCOMINTERPOLATIONFILTER_H__
+#ifndef __TCOMINTERPOLATIONFILTER__
+#define __TCOMINTERPOLATIONFILTER__
 
 #include "TypeDef.h"
 
Index: Lib/TLibCommon/TComList.h
===================================================================
--- Lib/TLibCommon/TComList.h	(revision 2966)
+++ Lib/TLibCommon/TComList.h	(working copy)
@@ -35,8 +35,8 @@
     \brief    general list class (header)
 */
 
-#ifndef _TCOMLIST_
-#define _TCOMLIST_
+#ifndef __TCOMLIST__
+#define __TCOMLIST__
 
 #if _MSC_VER > 1000
 #pragma once
Index: Lib/TLibCommon/TypeDef.h
===================================================================
--- Lib/TLibCommon/TypeDef.h	(revision 2966)
+++ Lib/TLibCommon/TypeDef.h	(working copy)
@@ -35,8 +35,8 @@
     \brief    Define basic types, new types and enumerations
 */
 
-#ifndef _TYPEDEF__
-#define _TYPEDEF__
+#ifndef __TYPEDEF__
+#define __TYPEDEF__
 
 //! \ingroup TLibCommon
 //! \{
Index: Lib/TLibDecoder/AnnexBread.h
===================================================================
--- Lib/TLibDecoder/AnnexBread.h	(revision 2966)
+++ Lib/TLibDecoder/AnnexBread.h	(working copy)
@@ -38,6 +38,9 @@
 
 #pragma once
 
+#ifndef __ANNEXBREAD__
+#define __ANNEXBREAD__
+
 #include <stdint.h>
 #include <istream>
 #include <vector>
@@ -184,3 +187,5 @@
 Bool byteStreamNALUnit(InputByteStream& bs, std::vector<uint8_t>& nalUnit, AnnexBStats& stats);
 
 //! \}
+
+#endif
Index: Lib/TLibDecoder/NALread.h
===================================================================
--- Lib/TLibDecoder/NALread.h	(revision 2966)
+++ Lib/TLibDecoder/NALread.h	(working copy)
@@ -38,6 +38,9 @@
 
 #pragma once
 
+#ifndef __NALREAD__
+#define __NALREAD__
+
 #include "TLibCommon/TypeDef.h"
 #include "TLibCommon/TComBitStream.h"
 #include "TLibCommon/NAL.h"
@@ -60,3 +63,5 @@
 void read(InputNALUnit& nalu, std::vector<uint8_t>& nalUnitBuf);
 
 //! \}
+
+#endif
Index: Lib/TLibDecoder/TDecBinCoder.h
===================================================================
--- Lib/TLibDecoder/TDecBinCoder.h	(revision 2966)
+++ Lib/TLibDecoder/TDecBinCoder.h	(working copy)
@@ -35,8 +35,8 @@
     \brief    binary entropy decoder interface
 */
 
-#ifndef __TDEC_BIN_CODER__
-#define __TDEC_BIN_CODER__
+#ifndef __TDECBINCODER__
+#define __TDECBINCODER__
 
 #include "TLibCommon/ContextModel.h"
 #include "TLibCommon/TComBitStream.h"
Index: Lib/TLibDecoder/TDecBinCoderCABAC.h
===================================================================
--- Lib/TLibDecoder/TDecBinCoderCABAC.h	(revision 2966)
+++ Lib/TLibDecoder/TDecBinCoderCABAC.h	(working copy)
@@ -35,8 +35,8 @@
     \brief    binary entropy decoder of CABAC
 */
 
-#ifndef __TDEC_BIN_CODER_CABAC__
-#define __TDEC_BIN_CODER_CABAC__
+#ifndef __TDECBINCODERCABAC__
+#define __TDECBINCODERCABAC__
 
 #include "TLibCommon/TComCABACTables.h"
 #include "TDecBinCoder.h"
Index: Lib/TLibEncoder/AnnexBwrite.h
===================================================================
--- Lib/TLibEncoder/AnnexBwrite.h	(revision 2966)
+++ Lib/TLibEncoder/AnnexBwrite.h	(working copy)
@@ -33,6 +33,9 @@
 
 #pragma once
 
+#ifndef __ANNEXBWRITE__
+#define __ANNEXBWRITE__
+
 #include <ostream>
 #include "TLibCommon/AccessUnit.h"
 #include "NALwrite.h"
@@ -84,3 +87,5 @@
   return annexBsizes;
 }
 //! \}
+
+#endif
Index: Lib/TLibEncoder/NALwrite.h
===================================================================
--- Lib/TLibEncoder/NALwrite.h	(revision 2966)
+++ Lib/TLibEncoder/NALwrite.h	(working copy)
@@ -33,6 +33,9 @@
 
 #pragma once
 
+#ifndef __NALWRITE__
+#define __NALWRITE__
+
 #include <ostream>
 
 #include "TLibCommon/TypeDef.h"
@@ -83,3 +86,5 @@
 void copyNaluData(OutputNALUnit& naluDest, const OutputNALUnit& naluSrc);
 
 //! \}
+
+#endif
Index: Lib/TLibEncoder/SEIwrite.h
===================================================================
--- Lib/TLibEncoder/SEIwrite.h	(revision 2966)
+++ Lib/TLibEncoder/SEIwrite.h	(working copy)
@@ -33,6 +33,9 @@
 
 #pragma once
 
+#ifndef __SEIWRITE__
+#define __SEIWRITE__
+
 #include "SyntaxElementWriter.h"
 #include "TLibCommon/SEI.h"
 
@@ -69,3 +72,5 @@
 };
 
 //! \}
+
+#endif
Index: Lib/TLibEncoder/TEncBinCoder.h
===================================================================
--- Lib/TLibEncoder/TEncBinCoder.h	(revision 2966)
+++ Lib/TLibEncoder/TEncBinCoder.h	(working copy)
@@ -35,8 +35,8 @@
     \brief    binary entropy encoder interface
 */
 
-#ifndef __TENC_BIN_CODER__
-#define __TENC_BIN_CODER__
+#ifndef __TENCBINCODER__
+#define __TENCBINCODER__
 
 #include "TLibCommon/ContextModel.h"
 #include "TLibCommon/TComBitStream.h"
Index: Lib/TLibEncoder/TEncBinCoderCABAC.h
===================================================================
--- Lib/TLibEncoder/TEncBinCoderCABAC.h	(revision 2966)
+++ Lib/TLibEncoder/TEncBinCoderCABAC.h	(working copy)
@@ -35,8 +35,8 @@
     \brief    binary entropy encoder of CABAC
 */
 
-#ifndef __TENC_BIN_CODER_CABAC__
-#define __TENC_BIN_CODER_CABAC__
+#ifndef __TENCBINCODERCABAC__
+#define __TENCBINCODERCABAC__
 
 #include "TLibCommon/TComCABACTables.h"
 #include "TEncBinCoder.h"
Index: Lib/TLibEncoder/TEncBinCoderCABACCounter.h
===================================================================
--- Lib/TLibEncoder/TEncBinCoderCABACCounter.h	(revision 2966)
+++ Lib/TLibEncoder/TEncBinCoderCABACCounter.h	(working copy)
@@ -35,8 +35,8 @@
     \brief    binary entropy encoder of CABAC
 */
 
-#ifndef __TENC_BIN_CODER_CABAC_COUNTER__
-#define __TENC_BIN_CODER_CABAC_COUNTER__
+#ifndef __TENCBINCODERCABACCOUNTER__
+#define __TENCBINCODERCABACCOUNTER__
 
 
 #include "TEncBinCoderCABAC.h"
Index: Lib/TLibEncoder/TEncRateCtrl.h
===================================================================
--- Lib/TLibEncoder/TEncRateCtrl.h	(revision 2966)
+++ Lib/TLibEncoder/TEncRateCtrl.h	(working copy)
@@ -35,8 +35,8 @@
     \brief    Rate control manager class
 */
 
-#ifndef _HM_TENCRATECTRL_H_
-#define _HM_TENCRATECTRL_H_
+#ifndef __TENCRATECTRL__
+#define __TENCRATECTRL__
 
 #if _MSC_VER > 1000
 #pragma once