From 2b8dc065d1f6e66905bf85fb624a9c74e4fd8bdf Mon Sep 17 00:00:00 2001
From: Jim Bankoski <jimbankoski@google.com>
Date: Thu, 29 Nov 2012 16:36:10 -0800
Subject: [PATCH] google style guide include guards

Change-Id: I2c252f3ddcc99e96c1f5d3dab8bcb25a2a3637ea
---
 vp9/common/arm/vp9_bilinearfilter_arm.h | 4 ++--
 vp9/common/arm/vp9_idct_arm.h           | 4 ++--
 vp9/common/arm/vp9_loopfilter_arm.h     | 4 ++--
 vp9/common/arm/vp9_recon_arm.h          | 4 ++--
 vp9/common/arm/vp9_subpixel_arm.h       | 4 ++--
 vp9/common/vp9_alloccommon.h            | 4 ++--
 vp9/common/vp9_blockd.h                 | 4 ++--
 vp9/common/vp9_common.h                 | 4 ++--
 vp9/common/vp9_common_types.h           | 4 ++--
 vp9/common/vp9_entropy.h                | 4 ++--
 vp9/common/vp9_entropymode.h            | 4 ++--
 vp9/common/vp9_entropymv.h              | 4 ++--
 vp9/common/vp9_extend.h                 | 4 ++--
 vp9/common/vp9_filter.h                 | 4 ++--
 vp9/common/vp9_findnearmv.h             | 4 ++--
 vp9/common/vp9_header.h                 | 4 ++--
 vp9/common/vp9_invtrans.h               | 4 ++--
 vp9/common/vp9_loopfilter.h             | 4 ++--
 vp9/common/vp9_modecont.h               | 4 ++--
 vp9/common/vp9_mv.h                     | 4 ++--
 vp9/common/vp9_mvref_common.h           | 4 ++--
 vp9/common/vp9_onyx.h                   | 4 ++--
 vp9/common/vp9_onyxc_int.h              | 4 ++--
 vp9/common/vp9_onyxd.h                  | 4 ++--
 vp9/common/vp9_postproc.h               | 4 ++--
 vp9/common/vp9_ppflags.h                | 4 ++--
 vp9/common/vp9_pred_common.h            | 4 ++--
 vp9/common/vp9_reconinter.h             | 4 ++--
 vp9/common/vp9_reconintra.h             | 4 ++--
 vp9/common/vp9_reconintra4x4.h          | 4 ++--
 vp9/common/vp9_sadmxn.h                 | 4 ++--
 vp9/common/vp9_seg_common.h             | 4 ++--
 vp9/common/vp9_subpixel.h               | 4 ++--
 vp9/common/vp9_swapyv12buffer.h         | 4 ++--
 vp9/common/vp9_systemdependent.h        | 4 +++-
 vp9/common/vp9_textblit.h               | 4 ++--
 vp9/common/vp9_treecoder.h              | 4 ++--
 vp9/common/vp9_type_aliases.h           | 4 ++--
 vp9/common/x86/vp9_idct_x86.h           | 4 ++--
 vp9/common/x86/vp9_loopfilter_x86.h     | 4 ++--
 vp9/common/x86/vp9_postproc_x86.h       | 4 ++--
 vp9/common/x86/vp9_subpixel_x86.h       | 4 ++--
 vp9/decoder/vp9_dboolhuff.h             | 4 ++--
 vp9/decoder/vp9_decodframe.h            | 4 ++--
 vp9/decoder/vp9_dequantize.h            | 4 ++--
 vp9/decoder/vp9_detokenize.h            | 4 ++--
 vp9/decoder/vp9_onyxd_int.h             | 4 ++--
 vp9/decoder/vp9_reconintra_mt.h         | 4 ++--
 vp9/decoder/vp9_treereader.h            | 4 ++--
 vp9/decoder/x86/vp9_idct_mmx.h          | 4 ++--
 vp9/encoder/arm/vp9_dct_arm.h           | 4 ++--
 vp9/encoder/arm/vp9_encodemb_arm.h      | 4 ++--
 vp9/encoder/arm/vp9_quantize_arm.h      | 4 ++--
 vp9/encoder/arm/vp9_variance_arm.h      | 4 ++--
 vp9/encoder/vp9_bitstream.h             | 4 ++--
 vp9/encoder/vp9_block.h                 | 4 ++--
 vp9/encoder/vp9_boolhuff.h              | 4 ++--
 vp9/encoder/vp9_encodeframe.h           | 4 ++--
 vp9/encoder/vp9_encodeintra.h           | 4 ++--
 vp9/encoder/vp9_encodemb.h              | 4 ++--
 vp9/encoder/vp9_encodemv.h              | 4 ++--
 vp9/encoder/vp9_firstpass.h             | 2 +-
 vp9/encoder/vp9_lookahead.h             | 4 ++--
 vp9/encoder/vp9_mbgraph.h               | 4 ++--
 vp9/encoder/vp9_mcomp.h                 | 4 ++--
 vp9/encoder/vp9_modecosts.h             | 4 ++--
 vp9/encoder/vp9_onyx_int.h              | 4 ++--
 vp9/encoder/vp9_picklpf.h               | 4 ++--
 vp9/encoder/vp9_psnr.h                  | 4 ++--
 vp9/encoder/vp9_quantize.h              | 4 ++--
 vp9/encoder/vp9_ratectrl.h              | 3 ++-
 vp9/encoder/vp9_rdopt.h                 | 4 ++--
 vp9/encoder/vp9_segmentation.h          | 4 ++--
 vp9/encoder/vp9_temporal_filter.h       | 4 ++--
 vp9/encoder/vp9_tokenize.h              | 4 ++--
 vp9/encoder/vp9_treewriter.h            | 4 ++--
 vp9/encoder/vp9_variance.h              | 4 ++--
 vp9/encoder/x86/vp9_dct_mmx.h           | 4 ++--
 vp9/encoder/x86/vp9_mcomp_x86.h         | 4 ++--
 vp9/encoder/x86/vp9_quantize_x86.h      | 4 ++--
 80 files changed, 160 insertions(+), 157 deletions(-)

diff --git a/vp9/common/arm/vp9_bilinearfilter_arm.h b/vp9/common/arm/vp9_bilinearfilter_arm.h
index b6d9cfc2d..422691e44 100644
--- a/vp9/common/arm/vp9_bilinearfilter_arm.h
+++ b/vp9/common/arm/vp9_bilinearfilter_arm.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef BILINEARFILTER_ARM_H
-#define BILINEARFILTER_ARM_H
+#ifndef VP9_COMMON_ARM_VP9_BILINEARFILTER_ARM_H_
+#define VP9_COMMON_ARM_VP9_BILINEARFILTER_ARM_H_
 
 extern void vp9_filter_block2d_bil_first_pass_armv6
 (
diff --git a/vp9/common/arm/vp9_idct_arm.h b/vp9/common/arm/vp9_idct_arm.h
index 2fc4cf7fc..8112ab913 100644
--- a/vp9/common/arm/vp9_idct_arm.h
+++ b/vp9/common/arm/vp9_idct_arm.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef IDCT_ARM_H
-#define IDCT_ARM_H
+#ifndef VP9_COMMON_ARM_VP9_IDCT_ARM_H_
+#define VP9_COMMON_ARM_VP9_IDCT_ARM_H_
 
 #if HAVE_ARMV6
 extern prototype_idct(vp9_short_idct4x4llm_1_v6);
diff --git a/vp9/common/arm/vp9_loopfilter_arm.h b/vp9/common/arm/vp9_loopfilter_arm.h
index de6b7ffbc..4f12ff31e 100644
--- a/vp9/common/arm/vp9_loopfilter_arm.h
+++ b/vp9/common/arm/vp9_loopfilter_arm.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef LOOPFILTER_ARM_H
-#define LOOPFILTER_ARM_H
+#ifndef VP9_COMMON_ARM_VP9_LOOPFILTER_ARM_H_
+#define VP9_COMMON_ARM_VP9_LOOPFILTER_ARM_H_
 
 #include "vpx_config.h"
 
diff --git a/vp9/common/arm/vp9_recon_arm.h b/vp9/common/arm/vp9_recon_arm.h
index 1e402951c..788385272 100644
--- a/vp9/common/arm/vp9_recon_arm.h
+++ b/vp9/common/arm/vp9_recon_arm.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef RECON_ARM_H
-#define RECON_ARM_H
+#ifndef VP9_COMMON_ARM_VP9_RECON_ARM_H_
+#define VP9_COMMON_ARM_VP9_RECON_ARM_H_
 
 #if HAVE_ARMV6
 extern prototype_recon_block(vp9_recon_b_armv6);
diff --git a/vp9/common/arm/vp9_subpixel_arm.h b/vp9/common/arm/vp9_subpixel_arm.h
index b4f9f54f3..efc7c1a5d 100644
--- a/vp9/common/arm/vp9_subpixel_arm.h
+++ b/vp9/common/arm/vp9_subpixel_arm.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef SUBPIXEL_ARM_H
-#define SUBPIXEL_ARM_H
+#ifndef VP9_COMMON_ARM_VP9_SUBPIXEL_ARM_H_
+#define VP9_COMMON_ARM_VP9_SUBPIXEL_ARM_H_
 
 #if HAVE_ARMV6
 extern prototype_subpixel_predict(vp9_sixtap_predict16x16_armv6);
diff --git a/vp9/common/vp9_alloccommon.h b/vp9/common/vp9_alloccommon.h
index bfecef524..3a37dc3bb 100644
--- a/vp9/common/vp9_alloccommon.h
+++ b/vp9/common/vp9_alloccommon.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_ALLOCCOMMON_H
-#define __INC_ALLOCCOMMON_H
+#ifndef VP9_COMMON_VP9_ALLOCCOMMON_H_
+#define VP9_COMMON_VP9_ALLOCCOMMON_H_
 
 #include "vp9/common/vp9_onyxc_int.h"
 
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h
index 839d5b587..17e847462 100644
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_BLOCKD_H
-#define __INC_BLOCKD_H
+#ifndef VP9_COMMON_VP9_BLOCKD_H_
+#define VP9_COMMON_VP9_BLOCKD_H_
 
 void vpx_log(const char *format, ...);
 
diff --git a/vp9/common/vp9_common.h b/vp9/common/vp9_common.h
index 64804e16e..893a3f8b3 100644
--- a/vp9/common/vp9_common.h
+++ b/vp9/common/vp9_common.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef common_h
-#define common_h 1
+#ifndef VP9_COMMON_VP9_COMMON_H_
+#define VP9_COMMON_VP9_COMMON_H_
 
 #include <assert.h>
 #include "vpx_config.h"
diff --git a/vp9/common/vp9_common_types.h b/vp9/common/vp9_common_types.h
index 4e6248697..8982898ca 100644
--- a/vp9/common/vp9_common_types.h
+++ b/vp9/common/vp9_common_types.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_COMMON_TYPES
-#define __INC_COMMON_TYPES
+#ifndef VP9_COMMON_VP9_COMMON_TYPES_H_
+#define VP9_COMMON_VP9_COMMON_TYPES_H_
 
 #define TRUE    1
 #define FALSE   0
diff --git a/vp9/common/vp9_entropy.h b/vp9/common/vp9_entropy.h
index ccf68a422..3c74de7be 100644
--- a/vp9/common/vp9_entropy.h
+++ b/vp9/common/vp9_entropy.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_ENTROPY_H
-#define __INC_ENTROPY_H
+#ifndef VP9_COMMON_VP9_ENTROPY_H_
+#define VP9_COMMON_VP9_ENTROPY_H_
 
 #include "vp9/common/vp9_treecoder.h"
 #include "vp9/common/vp9_blockd.h"
diff --git a/vp9/common/vp9_entropymode.h b/vp9/common/vp9_entropymode.h
index 0b14cf67e..78ec325b9 100644
--- a/vp9/common/vp9_entropymode.h
+++ b/vp9/common/vp9_entropymode.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_ENTROPYMODE_H
-#define __INC_ENTROPYMODE_H
+#ifndef VP9_COMMON_VP9_ENTROPYMODE_H_
+#define VP9_COMMON_VP9_ENTROPYMODE_H_
 
 #include "vp9/common/vp9_blockd.h"
 #include "vp9/common/vp9_treecoder.h"
diff --git a/vp9/common/vp9_entropymv.h b/vp9/common/vp9_entropymv.h
index b6b35df04..66126daf3 100644
--- a/vp9/common/vp9_entropymv.h
+++ b/vp9/common/vp9_entropymv.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_ENTROPYMV_H
-#define __INC_ENTROPYMV_H
+#ifndef VP9_COMMON_VP9_ENTROPYMV_H_
+#define VP9_COMMON_VP9_ENTROPYMV_H_
 
 #include "vp9/common/vp9_treecoder.h"
 #include "vpx_config.h"
diff --git a/vp9/common/vp9_extend.h b/vp9/common/vp9_extend.h
index c3c590479..55036f86b 100644
--- a/vp9/common/vp9_extend.h
+++ b/vp9/common/vp9_extend.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef __INC_EXTEND_H
-#define __INC_EXTEND_H
+#ifndef VP9_COMMON_VP9_EXTEND_H_
+#define VP9_COMMON_VP9_EXTEND_H_
 
 #include "vpx_scale/yv12config.h"
 
diff --git a/vp9/common/vp9_filter.h b/vp9/common/vp9_filter.h
index c194887dc..545d39a8a 100644
--- a/vp9/common/vp9_filter.h
+++ b/vp9/common/vp9_filter.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef FILTER_H
-#define FILTER_H
+#ifndef VP9_COMMON_VP9_FILTER_H_
+#define VP9_COMMON_VP9_FILTER_H_
 
 #include "vpx_config.h"
 #include "vpx_scale/yv12config.h"
diff --git a/vp9/common/vp9_findnearmv.h b/vp9/common/vp9_findnearmv.h
index a12a72201..d401c7373 100644
--- a/vp9/common/vp9_findnearmv.h
+++ b/vp9/common/vp9_findnearmv.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_FINDNEARMV_H
-#define __INC_FINDNEARMV_H
+#ifndef VP9_COMMON_VP9_FINDNEARMV_H_
+#define VP9_COMMON_VP9_FINDNEARMV_H_
 
 #include "vp9/common/vp9_mv.h"
 #include "vp9/common/vp9_blockd.h"
diff --git a/vp9/common/vp9_header.h b/vp9/common/vp9_header.h
index a88b6e3e3..00dd17e2d 100644
--- a/vp9/common/vp9_header.h
+++ b/vp9/common/vp9_header.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_HEADER_H
-#define __INC_HEADER_H
+#ifndef VP9_COMMON_VP9_HEADER_H_
+#define VP9_COMMON_VP9_HEADER_H_
 
 /* 24 bits total */
 typedef struct {
diff --git a/vp9/common/vp9_invtrans.h b/vp9/common/vp9_invtrans.h
index 9ac9bb1cd..b012834f3 100644
--- a/vp9/common/vp9_invtrans.h
+++ b/vp9/common/vp9_invtrans.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef __INC_INVTRANS_H
-#define __INC_INVTRANS_H
+#ifndef VP9_COMMON_VP9_INVTRANS_H_
+#define VP9_COMMON_VP9_INVTRANS_H_
 
 #include "vpx_ports/config.h"
 #include "vp9/common/vp9_blockd.h"
diff --git a/vp9/common/vp9_loopfilter.h b/vp9/common/vp9_loopfilter.h
index 34d1cd37f..4e8fa78e2 100644
--- a/vp9/common/vp9_loopfilter.h
+++ b/vp9/common/vp9_loopfilter.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef loopfilter_h
-#define loopfilter_h
+#ifndef VP9_COMMON_VP9_LOOPFILTER_H_
+#define VP9_COMMON_VP9_LOOPFILTER_H_
 
 #include "vpx_ports/mem.h"
 #include "vpx_config.h"
diff --git a/vp9/common/vp9_modecont.h b/vp9/common/vp9_modecont.h
index b142bd0f3..122eb12d6 100644
--- a/vp9/common/vp9_modecont.h
+++ b/vp9/common/vp9_modecont.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_MODECONT_H
-#define __INC_MODECONT_H
+#ifndef VP9_COMMON_VP9_MODECONT_H_
+#define VP9_COMMON_VP9_MODECONT_H_
 
 extern const int vp9_default_mode_contexts[INTER_MODE_CONTEXTS][4];
 #endif
diff --git a/vp9/common/vp9_mv.h b/vp9/common/vp9_mv.h
index bbe6d2c8b..f084b1104 100644
--- a/vp9/common/vp9_mv.h
+++ b/vp9/common/vp9_mv.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_MV_H
-#define __INC_MV_H
+#ifndef VP9_COMMON_VP9_MV_H_
+#define VP9_COMMON_VP9_MV_H_
 #include "vpx/vpx_integer.h"
 
 typedef struct {
diff --git a/vp9/common/vp9_mvref_common.h b/vp9/common/vp9_mvref_common.h
index eb8626ed2..1938352c4 100644
--- a/vp9/common/vp9_mvref_common.h
+++ b/vp9/common/vp9_mvref_common.h
@@ -12,8 +12,8 @@
 #include "vp9/common/vp9_blockd.h"
 
 
-#ifndef __INC_MVREF_COMMON_H
-#define __INC_MVREF_COMMON_H
+#ifndef VP9_COMMON_VP9_MVREF_COMMON_H_
+#define VP9_COMMON_VP9_MVREF_COMMON_H_
 
 void vp9_find_mv_refs(
   MACROBLOCKD *xd,
diff --git a/vp9/common/vp9_onyx.h b/vp9/common/vp9_onyx.h
index 96c7123b4..a6bd95118 100644
--- a/vp9/common/vp9_onyx.h
+++ b/vp9/common/vp9_onyx.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_ONYX_H
-#define __INC_ONYX_H
+#ifndef VP9_COMMON_VP9_ONYX_H_
+#define VP9_COMMON_VP9_ONYX_H_
 
 #ifdef __cplusplus
 extern "C"
diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h
index 202f953b3..0b6de7f82 100644
--- a/vp9/common/vp9_onyxc_int.h
+++ b/vp9/common/vp9_onyxc_int.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_ONYXC_INT_H
-#define __INC_ONYXC_INT_H
+#ifndef VP9_COMMON_VP9_ONYXC_INT_H_
+#define VP9_COMMON_VP9_ONYXC_INT_H_
 
 #include "vpx_config.h"
 #include "vpx/internal/vpx_codec_internal.h"
diff --git a/vp9/common/vp9_onyxd.h b/vp9/common/vp9_onyxd.h
index af16ee71c..063e5a894 100644
--- a/vp9/common/vp9_onyxd.h
+++ b/vp9/common/vp9_onyxd.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_ONYXD_H
-#define __INC_ONYXD_H
+#ifndef VP9_COMMON_VP9_ONYXD_H_
+#define VP9_COMMON_VP9_ONYXD_H_
 
 
 /* Create/destroy static data structures. */
diff --git a/vp9/common/vp9_postproc.h b/vp9/common/vp9_postproc.h
index d7fc30db4..0628d84e9 100644
--- a/vp9/common/vp9_postproc.h
+++ b/vp9/common/vp9_postproc.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef POSTPROC_H
-#define POSTPROC_H
+#ifndef VP9_COMMON_VP9_POSTPROC_H_
+#define VP9_COMMON_VP9_POSTPROC_H_
 
 #include "vpx_ports/mem.h"
 struct postproc_state {
diff --git a/vp9/common/vp9_ppflags.h b/vp9/common/vp9_ppflags.h
index fd8371180..293d8d5cc 100644
--- a/vp9/common/vp9_ppflags.h
+++ b/vp9/common/vp9_ppflags.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_PPFLAGS_H
-#define __INC_PPFLAGS_H
+#ifndef VP9_COMMON_VP9_PPFLAGS_H_
+#define VP9_COMMON_VP9_PPFLAGS_H_
 enum {
   VP9D_NOFILTERING            = 0,
   VP9D_DEBLOCK                = 1 << 0,
diff --git a/vp9/common/vp9_pred_common.h b/vp9/common/vp9_pred_common.h
index 28511c2f2..af6ad7b9d 100644
--- a/vp9/common/vp9_pred_common.h
+++ b/vp9/common/vp9_pred_common.h
@@ -12,8 +12,8 @@
 #include "vp9/common/vp9_onyxc_int.h"
 #include "vp9/common/vp9_blockd.h"
 
-#ifndef __INC_PRED_COMMON_H__
-#define __INC_PRED_COMMON_H__ 1
+#ifndef VP9_COMMON_VP9_PRED_COMMON_H_
+#define VP9_COMMON_VP9_PRED_COMMON_H_
 
 
 // Predicted items
diff --git a/vp9/common/vp9_reconinter.h b/vp9/common/vp9_reconinter.h
index 70ffd3bd1..f3292f148 100644
--- a/vp9/common/vp9_reconinter.h
+++ b/vp9/common/vp9_reconinter.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef __INC_RECONINTER_H
-#define __INC_RECONINTER_H
+#ifndef VP9_COMMON_VP9_RECONINTER_H_
+#define VP9_COMMON_VP9_RECONINTER_H_
 
 #include "vp9/common/vp9_onyxc_int.h"
 
diff --git a/vp9/common/vp9_reconintra.h b/vp9/common/vp9_reconintra.h
index 3ef44c85d..c9a11f8ca 100644
--- a/vp9/common/vp9_reconintra.h
+++ b/vp9/common/vp9_reconintra.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef __INC_RECONINTRA_H
-#define __INC_RECONINTRA_H
+#ifndef VP9_COMMON_VP9_RECONINTRA_H_
+#define VP9_COMMON_VP9_RECONINTRA_H_
 
 #include "vp9/common/vp9_blockd.h"
 
diff --git a/vp9/common/vp9_reconintra4x4.h b/vp9/common/vp9_reconintra4x4.h
index 79a048076..8e806bcb7 100644
--- a/vp9/common/vp9_reconintra4x4.h
+++ b/vp9/common/vp9_reconintra4x4.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_RECONINTRA4x4_H
-#define __INC_RECONINTRA4x4_H
+#ifndef VP9_COMMON_VP9_RECONINTRA4X4_H_
+#define VP9_COMMON_VP9_RECONINTRA4X4_H_
 
 extern void vp9_intra_prediction_down_copy(MACROBLOCKD *xd);
 
diff --git a/vp9/common/vp9_sadmxn.h b/vp9/common/vp9_sadmxn.h
index 47b8dfc58..bed257f26 100644
--- a/vp9/common/vp9_sadmxn.h
+++ b/vp9/common/vp9_sadmxn.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef __INC_SAD_H
-#define __INC_SAD_H
+#ifndef VP9_COMMON_VP9_SADMXN_H_
+#define VP9_COMMON_VP9_SADMXN_H_
 
 static __inline
 unsigned int sad_mx_n_c(
diff --git a/vp9/common/vp9_seg_common.h b/vp9/common/vp9_seg_common.h
index 29eee4ce9..a9f9b93be 100644
--- a/vp9/common/vp9_seg_common.h
+++ b/vp9/common/vp9_seg_common.h
@@ -12,8 +12,8 @@
 #include "vp9/common/vp9_onyxc_int.h"
 #include "vp9/common/vp9_blockd.h"
 
-#ifndef __INC_SEG_COMMON_H__
-#define __INC_SEG_COMMON_H__ 1
+#ifndef VP9_COMMON_VP9_SEG_COMMON_H_
+#define VP9_COMMON_VP9_SEG_COMMON_H_
 
 int vp9_segfeature_active(const MACROBLOCKD *xd,
                           int segment_id,
diff --git a/vp9/common/vp9_subpixel.h b/vp9/common/vp9_subpixel.h
index 2b8429198..5824e1aa9 100644
--- a/vp9/common/vp9_subpixel.h
+++ b/vp9/common/vp9_subpixel.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef SUBPIXEL_H
-#define SUBPIXEL_H
+#ifndef VP9_COMMON_VP9_SUBPIXEL_H_
+#define VP9_COMMON_VP9_SUBPIXEL_H_
 
 #define prototype_subpixel_predict(sym) \
   void sym(unsigned char *src, int src_pitch, int xofst, int yofst, \
diff --git a/vp9/common/vp9_swapyv12buffer.h b/vp9/common/vp9_swapyv12buffer.h
index 44ed5e84d..43001763a 100644
--- a/vp9/common/vp9_swapyv12buffer.h
+++ b/vp9/common/vp9_swapyv12buffer.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef __SWAPYV12_BUFFER_H
-#define __SWAPYV12_BUFFER_H
+#ifndef VP9_COMMON_VP9_SWAPYV12BUFFER_H_
+#define VP9_COMMON_VP9_SWAPYV12BUFFER_H_
 
 #include "vpx_scale/yv12config.h"
 
diff --git a/vp9/common/vp9_systemdependent.h b/vp9/common/vp9_systemdependent.h
index 5d778bcd0..91a50607a 100644
--- a/vp9/common/vp9_systemdependent.h
+++ b/vp9/common/vp9_systemdependent.h
@@ -7,7 +7,8 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-
+#ifndef VP9_COMMON_VP9_SYSTEMDEPENDENT_H_
+#define VP9_COMMON_VP9_SYSTEMDEPENDENT_H_
 
 #include "vpx_ports/config.h"
 #if ARCH_X86 || ARCH_X86_64
@@ -19,3 +20,4 @@ void vpx_reset_mmx_state(void);
 
 struct VP9Common;
 void vp9_machine_specific_config(struct VP9Common *);
+#endif
diff --git a/vp9/common/vp9_textblit.h b/vp9/common/vp9_textblit.h
index 39edbb09d..81bfa253e 100644
--- a/vp9/common/vp9_textblit.h
+++ b/vp9/common/vp9_textblit.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef __INC_TEXTBLIT_H
-#define __INC_TEXTBLIT_H
+#ifndef VP9_COMMON_VP9_TEXTBLIT_H_
+#define VP9_COMMON_VP9_TEXTBLIT_H_
 
 extern void vp9_blit_text(const char *msg, unsigned char *address,
                           const int pitch);
diff --git a/vp9/common/vp9_treecoder.h b/vp9/common/vp9_treecoder.h
index 92b92ef55..bbf7e74d7 100644
--- a/vp9/common/vp9_treecoder.h
+++ b/vp9/common/vp9_treecoder.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_TREECODER_H
-#define __INC_TREECODER_H
+#ifndef VP9_COMMON_VP9_TREECODER_H_
+#define VP9_COMMON_VP9_TREECODER_H_
 
 typedef unsigned char vp9_prob;
 
diff --git a/vp9/common/vp9_type_aliases.h b/vp9/common/vp9_type_aliases.h
index 91939ee19..110e2d07d 100644
--- a/vp9/common/vp9_type_aliases.h
+++ b/vp9/common/vp9_type_aliases.h
@@ -16,8 +16,8 @@
 *   Description  :     Standard type aliases
 *
 ****************************************************************************/
-#ifndef __INC_TYPE_ALIASES_H
-#define __INC_TYPE_ALIASES_H
+#ifndef VP9_COMMON_VP9_TYPE_ALIASES_H_
+#define VP9_COMMON_VP9_TYPE_ALIASES_H_
 
 /****************************************************************************
 * Macros
diff --git a/vp9/common/x86/vp9_idct_x86.h b/vp9/common/x86/vp9_idct_x86.h
index 297ab0d33..8320cf87d 100644
--- a/vp9/common/x86/vp9_idct_x86.h
+++ b/vp9/common/x86/vp9_idct_x86.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef IDCT_X86_H
-#define IDCT_X86_H
+#ifndef VP9_COMMON_X86_VP9_IDCT_X86_H_
+#define VP9_COMMON_X86_VP9_IDCT_X86_H_
 
 /* Note:
  *
diff --git a/vp9/common/x86/vp9_loopfilter_x86.h b/vp9/common/x86/vp9_loopfilter_x86.h
index 25cf383c9..46a6202d2 100644
--- a/vp9/common/x86/vp9_loopfilter_x86.h
+++ b/vp9/common/x86/vp9_loopfilter_x86.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef LOOPFILTER_X86_H
-#define LOOPFILTER_X86_H
+#ifndef VP9_COMMON_X86_VP9_LOOPFILTER_X86_H_
+#define VP9_COMMON_X86_VP9_LOOPFILTER_X86_H_
 
 /* Note:
  *
diff --git a/vp9/common/x86/vp9_postproc_x86.h b/vp9/common/x86/vp9_postproc_x86.h
index a4c4f8c74..b0e8b181f 100644
--- a/vp9/common/x86/vp9_postproc_x86.h
+++ b/vp9/common/x86/vp9_postproc_x86.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef POSTPROC_X86_H
-#define POSTPROC_X86_H
+#ifndef VP9_COMMON_X86_VP9_POSTPROC_X86_H_
+#define VP9_COMMON_X86_VP9_POSTPROC_X86_H_
 
 /* Note:
  *
diff --git a/vp9/common/x86/vp9_subpixel_x86.h b/vp9/common/x86/vp9_subpixel_x86.h
index 4c224da3b..86b72f39a 100644
--- a/vp9/common/x86/vp9_subpixel_x86.h
+++ b/vp9/common/x86/vp9_subpixel_x86.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef SUBPIXEL_X86_H
-#define SUBPIXEL_X86_H
+#ifndef VP9_COMMON_X86_VP9_SUBPIXEL_X86_H_
+#define VP9_COMMON_X86_VP9_SUBPIXEL_X86_H_
 
 /* Note:
  *
diff --git a/vp9/decoder/vp9_dboolhuff.h b/vp9/decoder/vp9_dboolhuff.h
index 6529170ab..a1c0c7956 100644
--- a/vp9/decoder/vp9_dboolhuff.h
+++ b/vp9/decoder/vp9_dboolhuff.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef DBOOLHUFF_H
-#define DBOOLHUFF_H
+#ifndef VP9_DECODER_VP9_DBOOLHUFF_H_
+#define VP9_DECODER_VP9_DBOOLHUFF_H_
 #include <stddef.h>
 #include <limits.h>
 #include "vpx_ports/config.h"
diff --git a/vp9/decoder/vp9_decodframe.h b/vp9/decoder/vp9_decodframe.h
index cc480798a..2a6547ed9 100644
--- a/vp9/decoder/vp9_decodframe.h
+++ b/vp9/decoder/vp9_decodframe.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_DECODFRAME_H
-#define __INC_DECODFRAME_H
+#ifndef VP9_DECODER_VP9_DECODFRAME_H_
+#define VP9_DECODER_VP9_DECODFRAME_H_
 
 struct VP9Decompressor;
 
diff --git a/vp9/decoder/vp9_dequantize.h b/vp9/decoder/vp9_dequantize.h
index 0b455200c..8a6bf2b26 100644
--- a/vp9/decoder/vp9_dequantize.h
+++ b/vp9/decoder/vp9_dequantize.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef DEQUANTIZE_H
-#define DEQUANTIZE_H
+#ifndef VP9_DECODER_VP9_DEQUANTIZE_H_
+#define VP9_DECODER_VP9_DEQUANTIZE_H_
 #include "vp9/common/vp9_blockd.h"
 
 #if CONFIG_LOSSLESS
diff --git a/vp9/decoder/vp9_detokenize.h b/vp9/decoder/vp9_detokenize.h
index e1a3b44f3..9b319d4a9 100644
--- a/vp9/decoder/vp9_detokenize.h
+++ b/vp9/decoder/vp9_detokenize.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef DETOKENIZE_H
-#define DETOKENIZE_H
+#ifndef VP9_DECODER_VP9_DETOKENIZE_H_
+#define VP9_DECODER_VP9_DETOKENIZE_H_
 
 #include "vp9/decoder/vp9_onyxd_int.h"
 
diff --git a/vp9/decoder/vp9_onyxd_int.h b/vp9/decoder/vp9_onyxd_int.h
index 603455af0..e4f3228c7 100644
--- a/vp9/decoder/vp9_onyxd_int.h
+++ b/vp9/decoder/vp9_onyxd_int.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_ONYXD_INT_H
-#define __INC_ONYXD_INT_H
+#ifndef VP9_DECODER_VP9_ONYXD_INT_H_
+#define VP9_DECODER_VP9_ONYXD_INT_H_
 #include "vpx_ports/config.h"
 #include "vp9/common/vp9_onyxd.h"
 #include "vp9/decoder/vp9_treereader.h"
diff --git a/vp9/decoder/vp9_reconintra_mt.h b/vp9/decoder/vp9_reconintra_mt.h
index b04537956..af9634936 100644
--- a/vp9/decoder/vp9_reconintra_mt.h
+++ b/vp9/decoder/vp9_reconintra_mt.h
@@ -9,7 +9,7 @@
  */
 
 
-#ifndef __INC_RECONINTRA_MT_H
-#define __INC_RECONINTRA_MT_H
+#ifndef VP9_DECODER_VP9_RECONINTRA_MT_H_
+#define VP9_DECODER_VP9_RECONINTRA_MT_H_
 
 #endif
diff --git a/vp9/decoder/vp9_treereader.h b/vp9/decoder/vp9_treereader.h
index ac1293cc7..aa31dc542 100644
--- a/vp9/decoder/vp9_treereader.h
+++ b/vp9/decoder/vp9_treereader.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef tree_reader_h
-#define tree_reader_h 1
+#ifndef VP9_DECODER_VP9_TREEREADER_H_
+#define VP9_DECODER_VP9_TREEREADER_H_
 
 #include "vp9/common/vp9_treecoder.h"
 
diff --git a/vp9/decoder/x86/vp9_idct_mmx.h b/vp9/decoder/x86/vp9_idct_mmx.h
index a4f49d30e..c0e9bfd06 100644
--- a/vp9/decoder/x86/vp9_idct_mmx.h
+++ b/vp9/decoder/x86/vp9_idct_mmx.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef __INC_IDCT_MMX_H_
-#define __INC_IDCT_MMX_H_
+#ifndef VP9_DECODER_X86_VP9_IDCT_MMX_H_
+#define VP9_DECODER_X86_VP9_IDCT_MMX_H_
 
 
 void vp9_dequant_dc_idct_add_mmx(short *input, const short *dq,
diff --git a/vp9/encoder/arm/vp9_dct_arm.h b/vp9/encoder/arm/vp9_dct_arm.h
index 83c446e7e..8eed31e60 100644
--- a/vp9/encoder/arm/vp9_dct_arm.h
+++ b/vp9/encoder/arm/vp9_dct_arm.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef DCT_ARM_H
-#define DCT_ARM_H
+#ifndef VP9_ENCODER_ARM_VP9_DCT_ARM_H_
+#define VP9_ENCODER_ARM_VP9_DCT_ARM_H_
 
 #if HAVE_ARMV6
 extern prototype_fdct(vp9_short_walsh4x4_armv6);
diff --git a/vp9/encoder/arm/vp9_encodemb_arm.h b/vp9/encoder/arm/vp9_encodemb_arm.h
index 80bff79df..2f21d2cba 100644
--- a/vp9/encoder/arm/vp9_encodemb_arm.h
+++ b/vp9/encoder/arm/vp9_encodemb_arm.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef ENCODEMB_ARM_H
-#define ENCODEMB_ARM_H
+#ifndef VP9_ENCODER_ARM_VP9_ENCODEMB_ARM_H_
+#define VP9_ENCODER_ARM_VP9_ENCODEMB_ARM_H_
 
 #if HAVE_ARMV6
 extern prototype_subb(vp9_subtract_b_armv6);
diff --git a/vp9/encoder/arm/vp9_quantize_arm.h b/vp9/encoder/arm/vp9_quantize_arm.h
index 7d2088d2d..41a83d7f9 100644
--- a/vp9/encoder/arm/vp9_quantize_arm.h
+++ b/vp9/encoder/arm/vp9_quantize_arm.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef QUANTIZE_ARM_H
-#define QUANTIZE_ARM_H
+#ifndef VP9_ENCODER_ARM_VP9_QUANTIZE_ARM_H_
+#define VP9_ENCODER_ARM_VP9_QUANTIZE_ARM_H_
 
 #if HAVE_ARMV6
 
diff --git a/vp9/encoder/arm/vp9_variance_arm.h b/vp9/encoder/arm/vp9_variance_arm.h
index c2c208a78..144feea3d 100644
--- a/vp9/encoder/arm/vp9_variance_arm.h
+++ b/vp9/encoder/arm/vp9_variance_arm.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef VARIANCE_ARM_H
-#define VARIANCE_ARM_H
+#ifndef VP9_ENCODER_ARM_VP9_VARIANCE_ARM_H_
+#define VP9_ENCODER_ARM_VP9_VARIANCE_ARM_H_
 
 #if HAVE_ARMV6
 
diff --git a/vp9/encoder/vp9_bitstream.h b/vp9/encoder/vp9_bitstream.h
index a0ac8b5db..5a63d6e1b 100644
--- a/vp9/encoder/vp9_bitstream.h
+++ b/vp9/encoder/vp9_bitstream.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_BITSTREAM_H
-#define __INC_BITSTREAM_H
+#ifndef VP9_ENCODER_VP9_BITSTREAM_H_
+#define VP9_ENCODER_VP9_BITSTREAM_H_
 
 void vp9_update_skip_probs(VP9_COMP *cpi);
 
diff --git a/vp9/encoder/vp9_block.h b/vp9/encoder/vp9_block.h
index 986807e3c..d5bf89c7d 100644
--- a/vp9/encoder/vp9_block.h
+++ b/vp9/encoder/vp9_block.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_BLOCK_H
-#define __INC_BLOCK_H
+#ifndef VP9_ENCODER_VP9_BLOCK_H_
+#define VP9_ENCODER_VP9_BLOCK_H_
 
 #include "vp9/common/vp9_onyx.h"
 #include "vp9/common/vp9_entropymv.h"
diff --git a/vp9/encoder/vp9_boolhuff.h b/vp9/encoder/vp9_boolhuff.h
index 1958a41e1..0d42ecfc4 100644
--- a/vp9/encoder/vp9_boolhuff.h
+++ b/vp9/encoder/vp9_boolhuff.h
@@ -16,8 +16,8 @@
 *   Description  :     Bool Coder header file.
 *
 ****************************************************************************/
-#ifndef __INC_BOOLHUFF_H
-#define __INC_BOOLHUFF_H
+#ifndef VP9_ENCODER_VP9_BOOLHUFF_H_
+#define VP9_ENCODER_VP9_BOOLHUFF_H_
 
 #include "vpx_ports/mem.h"
 
diff --git a/vp9/encoder/vp9_encodeframe.h b/vp9/encoder/vp9_encodeframe.h
index 5693d681c..8c1716fdf 100644
--- a/vp9/encoder/vp9_encodeframe.h
+++ b/vp9/encoder/vp9_encodeframe.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_ENCODEFRAME_H
-#define __INC_ENCODEFRAME_H
+#ifndef VP9_ENCODER_VP9_ENCODEFRAME_H_
+#define VP9_ENCODER_VP9_ENCODEFRAME_H_
 
 struct macroblock;
 
diff --git a/vp9/encoder/vp9_encodeintra.h b/vp9/encoder/vp9_encodeintra.h
index 363254eb0..91c410d08 100644
--- a/vp9/encoder/vp9_encodeintra.h
+++ b/vp9/encoder/vp9_encodeintra.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef __ENCODEINTRA_H_
-#define __ENCODEINTRA_H_
+#ifndef VP9_ENCODER_VP9_ENCODEINTRA_H_
+#define VP9_ENCODER_VP9_ENCODEINTRA_H_
 
 #include "vp9/encoder/vp9_onyx_int.h"
 
diff --git a/vp9/encoder/vp9_encodemb.h b/vp9/encoder/vp9_encodemb.h
index b56dcece9..4f49647a2 100644
--- a/vp9/encoder/vp9_encodemb.h
+++ b/vp9/encoder/vp9_encodemb.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_ENCODEMB_H
-#define __INC_ENCODEMB_H
+#ifndef VP9_ENCODER_VP9_ENCODEMB_H_
+#define VP9_ENCODER_VP9_ENCODEMB_H_
 
 #include "vpx_ports/config.h"
 #include "vp9/encoder/vp9_block.h"
diff --git a/vp9/encoder/vp9_encodemv.h b/vp9/encoder/vp9_encodemv.h
index ac09bcbdf..84cd6fb09 100644
--- a/vp9/encoder/vp9_encodemv.h
+++ b/vp9/encoder/vp9_encodemv.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_ENCODEMV_H
-#define __INC_ENCODEMV_H
+#ifndef VP9_ENCODER_VP9_ENCODEMV_H_
+#define VP9_ENCODER_VP9_ENCODEMV_H_
 
 #include "vp9/encoder/vp9_onyx_int.h"
 
diff --git a/vp9/encoder/vp9_firstpass.h b/vp9/encoder/vp9_firstpass.h
index f90a857f2..52a48f23b 100644
--- a/vp9/encoder/vp9_firstpass.h
+++ b/vp9/encoder/vp9_firstpass.h
@@ -10,7 +10,7 @@
 
 
 #if !defined __INC_FIRSTPASS_H
-#define      __INC_FIRSTPASS_H
+#define VP9_ENCODER_VP9_FIRSTPASS_H_
 
 extern void vp9_init_first_pass(VP9_COMP *cpi);
 extern void vp9_first_pass(VP9_COMP *cpi);
diff --git a/vp9/encoder/vp9_lookahead.h b/vp9/encoder/vp9_lookahead.h
index 44c31d66d..da2910c1c 100644
--- a/vp9/encoder/vp9_lookahead.h
+++ b/vp9/encoder/vp9_lookahead.h
@@ -7,8 +7,8 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#ifndef LOOKAHEAD_H
-#define LOOKAHEAD_H
+#ifndef VP9_ENCODER_VP9_LOOKAHEAD_H_
+#define VP9_ENCODER_VP9_LOOKAHEAD_H_
 #include "vpx_scale/yv12config.h"
 #include "vpx/vpx_integer.h"
 
diff --git a/vp9/encoder/vp9_mbgraph.h b/vp9/encoder/vp9_mbgraph.h
index 516fe23d2..01ab18f30 100644
--- a/vp9/encoder/vp9_mbgraph.h
+++ b/vp9/encoder/vp9_mbgraph.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef __INC_MBGRAPH_H__
-#define __INC_MBGRAPH_H__ 1
+#ifndef VP9_ENCODER_VP9_MBGRAPH_H_
+#define VP9_ENCODER_VP9_MBGRAPH_H_
 
 extern void vp9_update_mbgraph_stats(VP9_COMP *cpi);
 
diff --git a/vp9/encoder/vp9_mcomp.h b/vp9/encoder/vp9_mcomp.h
index 81fe70c85..c052e16b0 100644
--- a/vp9/encoder/vp9_mcomp.h
+++ b/vp9/encoder/vp9_mcomp.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_MCOMP_H
-#define __INC_MCOMP_H
+#ifndef VP9_ENCODER_VP9_MCOMP_H_
+#define VP9_ENCODER_VP9_MCOMP_H_
 
 #include "vp9/encoder/vp9_block.h"
 #include "vp9/encoder/vp9_variance.h"
diff --git a/vp9/encoder/vp9_modecosts.h b/vp9/encoder/vp9_modecosts.h
index c37604edc..1f2cc56ee 100644
--- a/vp9/encoder/vp9_modecosts.h
+++ b/vp9/encoder/vp9_modecosts.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_MODECOSTS_H
-#define __INC_MODECOSTS_H
+#ifndef VP9_ENCODER_VP9_MODECOSTS_H_
+#define VP9_ENCODER_VP9_MODECOSTS_H_
 
 void vp9_init_mode_costs(VP9_COMP *x);
 
diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h
index 425c38672..44d2d68fc 100644
--- a/vp9/encoder/vp9_onyx_int.h
+++ b/vp9/encoder/vp9_onyx_int.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_ONYX_INT_H
-#define __INC_ONYX_INT_H
+#ifndef VP9_ENCODER_VP9_ONYX_INT_H_
+#define VP9_ENCODER_VP9_ONYX_INT_H_
 
 #include <stdio.h>
 #include "vpx_ports/config.h"
diff --git a/vp9/encoder/vp9_picklpf.h b/vp9/encoder/vp9_picklpf.h
index 9c3f442ae..b5c6bdd91 100644
--- a/vp9/encoder/vp9_picklpf.h
+++ b/vp9/encoder/vp9_picklpf.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_PICKLPF_H
-#define __INC_PICKLPF_H
+#ifndef VP9_ENCODER_VP9_PICKLPF_H_
+#define VP9_ENCODER_VP9_PICKLPF_H_
 
 struct yv12_buffer_config;
 struct VP9_COMP;
diff --git a/vp9/encoder/vp9_psnr.h b/vp9/encoder/vp9_psnr.h
index c25bea750..7dd5048ef 100644
--- a/vp9/encoder/vp9_psnr.h
+++ b/vp9/encoder/vp9_psnr.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_PSNR_H
-#define __INC_PSNR_H
+#ifndef VP9_ENCODER_VP9_PSNR_H_
+#define VP9_ENCODER_VP9_PSNR_H_
 
 extern double vp9_mse2psnr(double Samples, double Peak, double Mse);
 
diff --git a/vp9/encoder/vp9_quantize.h b/vp9/encoder/vp9_quantize.h
index 5a0f7e058..d801ca74b 100644
--- a/vp9/encoder/vp9_quantize.h
+++ b/vp9/encoder/vp9_quantize.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef __INC_QUANTIZE_H
-#define __INC_QUANTIZE_H
+#ifndef VP9_ENCODER_VP9_QUANTIZE_H_
+#define VP9_ENCODER_VP9_QUANTIZE_H_
 
 #include "vp9/encoder/vp9_block.h"
 
diff --git a/vp9/encoder/vp9_ratectrl.h b/vp9/encoder/vp9_ratectrl.h
index 9d6960727..a2572116c 100644
--- a/vp9/encoder/vp9_ratectrl.h
+++ b/vp9/encoder/vp9_ratectrl.h
@@ -9,7 +9,8 @@
  */
 
 
-#if !defined __INC_RATECTRL_H
+#ifndef VP9_ENCODER_VP9_RATECTRL_H_
+#define VP9_ENCODER_VP9_RATECTRL_H_
 
 #include "vp9/encoder/vp9_onyx_int.h"
 
diff --git a/vp9/encoder/vp9_rdopt.h b/vp9/encoder/vp9_rdopt.h
index 0300303a8..4e41714f8 100644
--- a/vp9/encoder/vp9_rdopt.h
+++ b/vp9/encoder/vp9_rdopt.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_RDOPT_H
-#define __INC_RDOPT_H
+#ifndef VP9_ENCODER_VP9_RDOPT_H_
+#define VP9_ENCODER_VP9_RDOPT_H_
 
 #define RDCOST(RM,DM,R,D) ( ((128+((int64_t)R)*(RM)) >> 8) + ((int64_t)DM)*(D) )
 #define RDCOST_8x8(RM,DM,R,D) ( ((128+((int64_t)R)*(RM)) >> 8) + ((int64_t)DM)*(D) )
diff --git a/vp9/encoder/vp9_segmentation.h b/vp9/encoder/vp9_segmentation.h
index 589c04bbd..493a76700 100644
--- a/vp9/encoder/vp9_segmentation.h
+++ b/vp9/encoder/vp9_segmentation.h
@@ -13,8 +13,8 @@
 #include "vp9/common/vp9_blockd.h"
 #include "vp9/encoder/vp9_onyx_int.h"
 
-#ifndef __INC_SEGMENTATION_H__
-#define __INC_SEGMENTATION_H__ 1
+#ifndef VP9_ENCODER_VP9_SEGMENTATION_H_
+#define VP9_ENCODER_VP9_SEGMENTATION_H_
 
 extern void vp9_update_gf_useage_maps(VP9_COMP *cpi, VP9_COMMON *cm,
                                       MACROBLOCK *x);
diff --git a/vp9/encoder/vp9_temporal_filter.h b/vp9/encoder/vp9_temporal_filter.h
index 8aaa28e81..abcb21926 100644
--- a/vp9/encoder/vp9_temporal_filter.h
+++ b/vp9/encoder/vp9_temporal_filter.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef __INC_VP9_TEMPORAL_FILTER_H
-#define __INC_VP9_TEMPORAL_FILTER_H
+#ifndef VP9_ENCODER_VP9_TEMPORAL_FILTER_H_
+#define VP9_ENCODER_VP9_TEMPORAL_FILTER_H_
 
 extern void vp9_temporal_filter_prepare(VP9_COMP *cpi, int distance);
 
diff --git a/vp9/encoder/vp9_tokenize.h b/vp9/encoder/vp9_tokenize.h
index 9ac26eb1c..868909be3 100644
--- a/vp9/encoder/vp9_tokenize.h
+++ b/vp9/encoder/vp9_tokenize.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef tokenize_h
-#define tokenize_h
+#ifndef VP9_ENCODER_VP9_TOKENIZE_H_
+#define VP9_ENCODER_VP9_TOKENIZE_H_
 
 #include "vp9/common/vp9_entropy.h"
 #include "vp9/encoder/vp9_block.h"
diff --git a/vp9/encoder/vp9_treewriter.h b/vp9/encoder/vp9_treewriter.h
index 2175c744b..5da4a17a9 100644
--- a/vp9/encoder/vp9_treewriter.h
+++ b/vp9/encoder/vp9_treewriter.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_TREEWRITER_H
-#define __INC_TREEWRITER_H
+#ifndef VP9_ENCODER_VP9_TREEWRITER_H_
+#define VP9_ENCODER_VP9_TREEWRITER_H_
 
 /* Trees map alphabets into huffman-like codes suitable for an arithmetic
    bit coder.  Timothy S Murphy  11 October 2004 */
diff --git a/vp9/encoder/vp9_variance.h b/vp9/encoder/vp9_variance.h
index b504fbb17..87036c1b0 100644
--- a/vp9/encoder/vp9_variance.h
+++ b/vp9/encoder/vp9_variance.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef VARIANCE_H
-#define VARIANCE_H
+#ifndef VP9_ENCODER_VP9_VARIANCE_H_
+#define VP9_ENCODER_VP9_VARIANCE_H_
 
 typedef unsigned int(*vp9_sad_fn_t)(const unsigned char *src_ptr,
                                     int source_stride,
diff --git a/vp9/encoder/x86/vp9_dct_mmx.h b/vp9/encoder/x86/vp9_dct_mmx.h
index 5f8e18fdf..3bac7c87b 100644
--- a/vp9/encoder/x86/vp9_dct_mmx.h
+++ b/vp9/encoder/x86/vp9_dct_mmx.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef __INC_VP9_DCT_MMX_H_
-#define __INC_VP9_DCT_MMX_H_
+#ifndef VP9_ENCODER_X86_VP9_DCT_MMX_H_
+#define VP9_ENCODER_X86_VP9_DCT_MMX_H_
 
 extern void vp9_short_fdct4x4_mmx(short *input, short *output, int pitch);
 
diff --git a/vp9/encoder/x86/vp9_mcomp_x86.h b/vp9/encoder/x86/vp9_mcomp_x86.h
index cde954550..ca80b8bff 100644
--- a/vp9/encoder/x86/vp9_mcomp_x86.h
+++ b/vp9/encoder/x86/vp9_mcomp_x86.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef MCOMP_X86_H
-#define MCOMP_X86_H
+#ifndef VP9_ENCODER_X86_VP9_MCOMP_X86_H_
+#define VP9_ENCODER_X86_VP9_MCOMP_X86_H_
 
 #if HAVE_SSE3
 #if !CONFIG_RUNTIME_CPU_DETECT
diff --git a/vp9/encoder/x86/vp9_quantize_x86.h b/vp9/encoder/x86/vp9_quantize_x86.h
index 6946e7e29..d1db17394 100644
--- a/vp9/encoder/x86/vp9_quantize_x86.h
+++ b/vp9/encoder/x86/vp9_quantize_x86.h
@@ -7,8 +7,8 @@
  *  file in the root of the source tree.
  */
 
-#ifndef QUANTIZE_X86_H
-#define QUANTIZE_X86_H
+#ifndef VP9_ENCODER_X86_VP9_QUANTIZE_X86_H_
+#define VP9_ENCODER_X86_VP9_QUANTIZE_X86_H_
 
 
 /* Note: