summaryrefslogtreecommitdiff
path: root/vp8/common
diff options
context:
space:
mode:
Diffstat (limited to 'vp8/common')
-rw-r--r--vp8/common/alloccommon.h6
-rw-r--r--vp8/common/blockd.h6
-rw-r--r--vp8/common/coefupdateprobs.h6
-rw-r--r--vp8/common/common.h6
-rw-r--r--vp8/common/default_coef_probs.h6
-rw-r--r--vp8/common/entropy.h6
-rw-r--r--vp8/common/entropymode.h6
-rw-r--r--vp8/common/entropymv.h6
-rw-r--r--vp8/common/extend.h6
-rw-r--r--vp8/common/filter.h6
-rw-r--r--vp8/common/findnearmv.h6
-rw-r--r--vp8/common/header.h6
-rw-r--r--vp8/common/invtrans.h6
-rw-r--r--vp8/common/loopfilter.h6
-rw-r--r--vp8/common/mips/msa/vp8_macros_msa.h6
-rw-r--r--vp8/common/modecont.h6
-rw-r--r--vp8/common/mv.h6
-rw-r--r--vp8/common/onyx.h6
-rw-r--r--vp8/common/onyxc_int.h6
-rw-r--r--vp8/common/onyxd.h6
-rw-r--r--vp8/common/postproc.h6
-rw-r--r--vp8/common/ppflags.h6
-rw-r--r--vp8/common/quant_common.h6
-rw-r--r--vp8/common/reconinter.h6
-rw-r--r--vp8/common/reconintra.h6
-rw-r--r--vp8/common/reconintra4x4.h6
-rw-r--r--vp8/common/setupintrarecon.h6
-rw-r--r--vp8/common/swapyv12buffer.h6
-rw-r--r--vp8/common/systemdependent.h6
-rw-r--r--vp8/common/threading.h6
-rw-r--r--vp8/common/treecoder.h6
-rw-r--r--vp8/common/vp8_entropymodedata.h6
-rw-r--r--vp8/common/vp8_skin_detection.h6
-rw-r--r--vp8/common/x86/filter_x86.h6
34 files changed, 102 insertions, 102 deletions
diff --git a/vp8/common/alloccommon.h b/vp8/common/alloccommon.h
index 5d0840c67..517d73085 100644
--- a/vp8/common/alloccommon.h
+++ b/vp8/common/alloccommon.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_ALLOCCOMMON_H_
-#define VP8_COMMON_ALLOCCOMMON_H_
+#ifndef VPX_VP8_COMMON_ALLOCCOMMON_H_
+#define VPX_VP8_COMMON_ALLOCCOMMON_H_
#include "onyxc_int.h"
@@ -27,4 +27,4 @@ void vp8_setup_version(VP8_COMMON *oci);
} // extern "C"
#endif
-#endif // VP8_COMMON_ALLOCCOMMON_H_
+#endif // VPX_VP8_COMMON_ALLOCCOMMON_H_
diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h
index ddcc307eb..22af8980b 100644
--- a/vp8/common/blockd.h
+++ b/vp8/common/blockd.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_BLOCKD_H_
-#define VP8_COMMON_BLOCKD_H_
+#ifndef VPX_VP8_COMMON_BLOCKD_H_
+#define VPX_VP8_COMMON_BLOCKD_H_
void vpx_log(const char *format, ...);
@@ -304,4 +304,4 @@ extern void vp8_setup_block_dptrs(MACROBLOCKD *x);
} // extern "C"
#endif
-#endif // VP8_COMMON_BLOCKD_H_
+#endif // VPX_VP8_COMMON_BLOCKD_H_
diff --git a/vp8/common/coefupdateprobs.h b/vp8/common/coefupdateprobs.h
index 9b01bba31..b342096b5 100644
--- a/vp8/common/coefupdateprobs.h
+++ b/vp8/common/coefupdateprobs.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_COEFUPDATEPROBS_H_
-#define VP8_COMMON_COEFUPDATEPROBS_H_
+#ifndef VPX_VP8_COMMON_COEFUPDATEPROBS_H_
+#define VPX_VP8_COMMON_COEFUPDATEPROBS_H_
#ifdef __cplusplus
extern "C" {
@@ -194,4 +194,4 @@ const vp8_prob vp8_coef_update_probs
} // extern "C"
#endif
-#endif // VP8_COMMON_COEFUPDATEPROBS_H_
+#endif // VPX_VP8_COMMON_COEFUPDATEPROBS_H_
diff --git a/vp8/common/common.h b/vp8/common/common.h
index bbfc4f393..8593e822b 100644
--- a/vp8/common/common.h
+++ b/vp8/common/common.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_COMMON_H_
-#define VP8_COMMON_COMMON_H_
+#ifndef VPX_VP8_COMMON_COMMON_H_
+#define VPX_VP8_COMMON_COMMON_H_
#include <assert.h>
@@ -45,4 +45,4 @@ extern "C" {
} // extern "C"
#endif
-#endif // VP8_COMMON_COMMON_H_
+#endif // VPX_VP8_COMMON_COMMON_H_
diff --git a/vp8/common/default_coef_probs.h b/vp8/common/default_coef_probs.h
index f3f54f6a2..b25e4a45a 100644
--- a/vp8/common/default_coef_probs.h
+++ b/vp8/common/default_coef_probs.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_DEFAULT_COEF_PROBS_H_
-#define VP8_COMMON_DEFAULT_COEF_PROBS_H_
+#ifndef VPX_VP8_COMMON_DEFAULT_COEF_PROBS_H_
+#define VPX_VP8_COMMON_DEFAULT_COEF_PROBS_H_
#ifdef __cplusplus
extern "C" {
@@ -157,4 +157,4 @@ static const vp8_prob default_coef_probs
} // extern "C"
#endif
-#endif // VP8_COMMON_DEFAULT_COEF_PROBS_H_
+#endif // VPX_VP8_COMMON_DEFAULT_COEF_PROBS_H_
diff --git a/vp8/common/entropy.h b/vp8/common/entropy.h
index d08856001..fbdb7bcfc 100644
--- a/vp8/common/entropy.h
+++ b/vp8/common/entropy.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_ENTROPY_H_
-#define VP8_COMMON_ENTROPY_H_
+#ifndef VPX_VP8_COMMON_ENTROPY_H_
+#define VPX_VP8_COMMON_ENTROPY_H_
#include "treecoder.h"
#include "blockd.h"
@@ -105,4 +105,4 @@ void vp8_coef_tree_initialize(void);
} // extern "C"
#endif
-#endif // VP8_COMMON_ENTROPY_H_
+#endif // VPX_VP8_COMMON_ENTROPY_H_
diff --git a/vp8/common/entropymode.h b/vp8/common/entropymode.h
index b3fad19be..c772cece5 100644
--- a/vp8/common/entropymode.h
+++ b/vp8/common/entropymode.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_ENTROPYMODE_H_
-#define VP8_COMMON_ENTROPYMODE_H_
+#ifndef VPX_VP8_COMMON_ENTROPYMODE_H_
+#define VPX_VP8_COMMON_ENTROPYMODE_H_
#include "onyxc_int.h"
#include "treecoder.h"
@@ -85,4 +85,4 @@ void vp8_kf_default_bmode_probs(
} // extern "C"
#endif
-#endif // VP8_COMMON_ENTROPYMODE_H_
+#endif // VPX_VP8_COMMON_ENTROPYMODE_H_
diff --git a/vp8/common/entropymv.h b/vp8/common/entropymv.h
index 637300090..40039f5b2 100644
--- a/vp8/common/entropymv.h
+++ b/vp8/common/entropymv.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_ENTROPYMV_H_
-#define VP8_COMMON_ENTROPYMV_H_
+#ifndef VPX_VP8_COMMON_ENTROPYMV_H_
+#define VPX_VP8_COMMON_ENTROPYMV_H_
#include "treecoder.h"
@@ -46,4 +46,4 @@ extern const MV_CONTEXT vp8_mv_update_probs[2], vp8_default_mv_context[2];
} // extern "C"
#endif
-#endif // VP8_COMMON_ENTROPYMV_H_
+#endif // VPX_VP8_COMMON_ENTROPYMV_H_
diff --git a/vp8/common/extend.h b/vp8/common/extend.h
index 7da5ce31d..586a38a4f 100644
--- a/vp8/common/extend.h
+++ b/vp8/common/extend.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_EXTEND_H_
-#define VP8_COMMON_EXTEND_H_
+#ifndef VPX_VP8_COMMON_EXTEND_H_
+#define VPX_VP8_COMMON_EXTEND_H_
#include "vpx_scale/yv12config.h"
@@ -29,4 +29,4 @@ void vp8_copy_and_extend_frame_with_rect(YV12_BUFFER_CONFIG *src,
} // extern "C"
#endif
-#endif // VP8_COMMON_EXTEND_H_
+#endif // VPX_VP8_COMMON_EXTEND_H_
diff --git a/vp8/common/filter.h b/vp8/common/filter.h
index f1d5ece4a..6acee22b2 100644
--- a/vp8/common/filter.h
+++ b/vp8/common/filter.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_FILTER_H_
-#define VP8_COMMON_FILTER_H_
+#ifndef VPX_VP8_COMMON_FILTER_H_
+#define VPX_VP8_COMMON_FILTER_H_
#include "vpx_ports/mem.h"
@@ -28,4 +28,4 @@ extern DECLARE_ALIGNED(16, const short, vp8_sub_pel_filters[8][6]);
} // extern "C"
#endif
-#endif // VP8_COMMON_FILTER_H_
+#endif // VPX_VP8_COMMON_FILTER_H_
diff --git a/vp8/common/findnearmv.h b/vp8/common/findnearmv.h
index c1eaa2698..9bb6c2e9f 100644
--- a/vp8/common/findnearmv.h
+++ b/vp8/common/findnearmv.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_FINDNEARMV_H_
-#define VP8_COMMON_FINDNEARMV_H_
+#ifndef VPX_VP8_COMMON_FINDNEARMV_H_
+#define VPX_VP8_COMMON_FINDNEARMV_H_
#include "./vpx_config.h"
#include "mv.h"
@@ -148,4 +148,4 @@ static INLINE B_PREDICTION_MODE above_block_mode(const MODE_INFO *cur_mb, int b,
} // extern "C"
#endif
-#endif // VP8_COMMON_FINDNEARMV_H_
+#endif // VPX_VP8_COMMON_FINDNEARMV_H_
diff --git a/vp8/common/header.h b/vp8/common/header.h
index 1df01fc6f..e64e24190 100644
--- a/vp8/common/header.h
+++ b/vp8/common/header.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_HEADER_H_
-#define VP8_COMMON_HEADER_H_
+#ifndef VPX_VP8_COMMON_HEADER_H_
+#define VPX_VP8_COMMON_HEADER_H_
#ifdef __cplusplus
extern "C" {
@@ -45,4 +45,4 @@ typedef struct {
} // extern "C"
#endif
-#endif // VP8_COMMON_HEADER_H_
+#endif // VPX_VP8_COMMON_HEADER_H_
diff --git a/vp8/common/invtrans.h b/vp8/common/invtrans.h
index c7af32fb6..aed7bb060 100644
--- a/vp8/common/invtrans.h
+++ b/vp8/common/invtrans.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_INVTRANS_H_
-#define VP8_COMMON_INVTRANS_H_
+#ifndef VPX_VP8_COMMON_INVTRANS_H_
+#define VPX_VP8_COMMON_INVTRANS_H_
#include "./vpx_config.h"
#include "vp8_rtcd.h"
@@ -54,4 +54,4 @@ static INLINE void vp8_inverse_transform_mby(MACROBLOCKD *xd) {
} // extern "C"
#endif
-#endif // VP8_COMMON_INVTRANS_H_
+#endif // VPX_VP8_COMMON_INVTRANS_H_
diff --git a/vp8/common/loopfilter.h b/vp8/common/loopfilter.h
index 7484563e0..0733046e5 100644
--- a/vp8/common/loopfilter.h
+++ b/vp8/common/loopfilter.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_LOOPFILTER_H_
-#define VP8_COMMON_LOOPFILTER_H_
+#ifndef VPX_VP8_COMMON_LOOPFILTER_H_
+#define VPX_VP8_COMMON_LOOPFILTER_H_
#include "vpx_ports/mem.h"
#include "vpx_config.h"
@@ -100,4 +100,4 @@ void vp8_loop_filter_row_simple(struct VP8Common *cm,
} // extern "C"
#endif
-#endif // VP8_COMMON_LOOPFILTER_H_
+#endif // VPX_VP8_COMMON_LOOPFILTER_H_
diff --git a/vp8/common/mips/msa/vp8_macros_msa.h b/vp8/common/mips/msa/vp8_macros_msa.h
index 6bec3adec..14f83799f 100644
--- a/vp8/common/mips/msa/vp8_macros_msa.h
+++ b/vp8/common/mips/msa/vp8_macros_msa.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_MIPS_MSA_VP8_MACROS_MSA_H_
-#define VP8_COMMON_MIPS_MSA_VP8_MACROS_MSA_H_
+#ifndef VPX_VP8_COMMON_MIPS_MSA_VP8_MACROS_MSA_H_
+#define VPX_VP8_COMMON_MIPS_MSA_VP8_MACROS_MSA_H_
#include <msa.h>
@@ -1757,4 +1757,4 @@
\
tmp1_m; \
})
-#endif /* VP8_COMMON_MIPS_MSA_VP8_MACROS_MSA_H_ */
+#endif // VPX_VP8_COMMON_MIPS_MSA_VP8_MACROS_MSA_H_
diff --git a/vp8/common/modecont.h b/vp8/common/modecont.h
index b58c7dc2d..031f74f2f 100644
--- a/vp8/common/modecont.h
+++ b/vp8/common/modecont.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_MODECONT_H_
-#define VP8_COMMON_MODECONT_H_
+#ifndef VPX_VP8_COMMON_MODECONT_H_
+#define VPX_VP8_COMMON_MODECONT_H_
#ifdef __cplusplus
extern "C" {
@@ -21,4 +21,4 @@ extern const int vp8_mode_contexts[6][4];
} // extern "C"
#endif
-#endif // VP8_COMMON_MODECONT_H_
+#endif // VPX_VP8_COMMON_MODECONT_H_
diff --git a/vp8/common/mv.h b/vp8/common/mv.h
index b6d2147af..4cde12f20 100644
--- a/vp8/common/mv.h
+++ b/vp8/common/mv.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_MV_H_
-#define VP8_COMMON_MV_H_
+#ifndef VPX_VP8_COMMON_MV_H_
+#define VPX_VP8_COMMON_MV_H_
#include "vpx/vpx_integer.h"
#ifdef __cplusplus
@@ -30,4 +30,4 @@ typedef union int_mv {
} // extern "C"
#endif
-#endif // VP8_COMMON_MV_H_
+#endif // VPX_VP8_COMMON_MV_H_
diff --git a/vp8/common/onyx.h b/vp8/common/onyx.h
index 72fba2ec5..ebdabc9b2 100644
--- a/vp8/common/onyx.h
+++ b/vp8/common/onyx.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_ONYX_H_
-#define VP8_COMMON_ONYX_H_
+#ifndef VPX_VP8_COMMON_ONYX_H_
+#define VPX_VP8_COMMON_ONYX_H_
#ifdef __cplusplus
extern "C" {
@@ -281,4 +281,4 @@ int vp8_get_quantizer(struct VP8_COMP *c);
}
#endif
-#endif // VP8_COMMON_ONYX_H_
+#endif // VPX_VP8_COMMON_ONYX_H_
diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h
index 9a12c7fb6..ef8d00762 100644
--- a/vp8/common/onyxc_int.h
+++ b/vp8/common/onyxc_int.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_ONYXC_INT_H_
-#define VP8_COMMON_ONYXC_INT_H_
+#ifndef VPX_VP8_COMMON_ONYXC_INT_H_
+#define VPX_VP8_COMMON_ONYXC_INT_H_
#include "vpx_config.h"
#include "vp8_rtcd.h"
@@ -174,4 +174,4 @@ typedef struct VP8Common {
} // extern "C"
#endif
-#endif // VP8_COMMON_ONYXC_INT_H_
+#endif // VPX_VP8_COMMON_ONYXC_INT_H_
diff --git a/vp8/common/onyxd.h b/vp8/common/onyxd.h
index d3c1b0e97..49f524bb3 100644
--- a/vp8/common/onyxd.h
+++ b/vp8/common/onyxd.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_ONYXD_H_
-#define VP8_COMMON_ONYXD_H_
+#ifndef VPX_VP8_COMMON_ONYXD_H_
+#define VPX_VP8_COMMON_ONYXD_H_
/* Create/destroy static data structures. */
#ifdef __cplusplus
@@ -60,4 +60,4 @@ int vp8dx_get_quantizer(const struct VP8D_COMP *c);
}
#endif
-#endif // VP8_COMMON_ONYXD_H_
+#endif // VPX_VP8_COMMON_ONYXD_H_
diff --git a/vp8/common/postproc.h b/vp8/common/postproc.h
index 7be112b16..218a68ea3 100644
--- a/vp8/common/postproc.h
+++ b/vp8/common/postproc.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_POSTPROC_H_
-#define VP8_COMMON_POSTPROC_H_
+#ifndef VPX_VP8_COMMON_POSTPROC_H_
+#define VPX_VP8_COMMON_POSTPROC_H_
#include "vpx_ports/mem.h"
struct postproc_state {
@@ -43,4 +43,4 @@ void vp8_multiframe_quality_enhance(struct VP8Common *cm);
} // extern "C"
#endif
-#endif // VP8_COMMON_POSTPROC_H_
+#endif // VPX_VP8_COMMON_POSTPROC_H_
diff --git a/vp8/common/ppflags.h b/vp8/common/ppflags.h
index 96e3af6c9..bdf08734b 100644
--- a/vp8/common/ppflags.h
+++ b/vp8/common/ppflags.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_PPFLAGS_H_
-#define VP8_COMMON_PPFLAGS_H_
+#ifndef VPX_VP8_COMMON_PPFLAGS_H_
+#define VPX_VP8_COMMON_PPFLAGS_H_
#ifdef __cplusplus
extern "C" {
@@ -36,4 +36,4 @@ typedef struct {
} // extern "C"
#endif
-#endif // VP8_COMMON_PPFLAGS_H_
+#endif // VPX_VP8_COMMON_PPFLAGS_H_
diff --git a/vp8/common/quant_common.h b/vp8/common/quant_common.h
index ff4203df8..049840a27 100644
--- a/vp8/common/quant_common.h
+++ b/vp8/common/quant_common.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_QUANT_COMMON_H_
-#define VP8_COMMON_QUANT_COMMON_H_
+#ifndef VPX_VP8_COMMON_QUANT_COMMON_H_
+#define VPX_VP8_COMMON_QUANT_COMMON_H_
#include "string.h"
#include "blockd.h"
@@ -30,4 +30,4 @@ extern int vp8_ac_uv_quant(int QIndex, int Delta);
} // extern "C"
#endif
-#endif // VP8_COMMON_QUANT_COMMON_H_
+#endif // VPX_VP8_COMMON_QUANT_COMMON_H_
diff --git a/vp8/common/reconinter.h b/vp8/common/reconinter.h
index 4cdd4fee0..394badb44 100644
--- a/vp8/common/reconinter.h
+++ b/vp8/common/reconinter.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_RECONINTER_H_
-#define VP8_COMMON_RECONINTER_H_
+#ifndef VPX_VP8_COMMON_RECONINTER_H_
+#define VPX_VP8_COMMON_RECONINTER_H_
#ifdef __cplusplus
extern "C" {
@@ -34,4 +34,4 @@ extern void vp8_build_inter4x4_predictors_mbuv(MACROBLOCKD *x);
} // extern "C"
#endif
-#endif // VP8_COMMON_RECONINTER_H_
+#endif // VPX_VP8_COMMON_RECONINTER_H_
diff --git a/vp8/common/reconintra.h b/vp8/common/reconintra.h
index fd7c725f3..029ac00a2 100644
--- a/vp8/common/reconintra.h
+++ b/vp8/common/reconintra.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_RECONINTRA_H_
-#define VP8_COMMON_RECONINTRA_H_
+#ifndef VPX_VP8_COMMON_RECONINTRA_H_
+#define VPX_VP8_COMMON_RECONINTRA_H_
#include "vp8/common/blockd.h"
@@ -32,4 +32,4 @@ void vp8_init_intra_predictors(void);
} // extern "C"
#endif
-#endif // VP8_COMMON_RECONINTRA_H_
+#endif // VPX_VP8_COMMON_RECONINTRA_H_
diff --git a/vp8/common/reconintra4x4.h b/vp8/common/reconintra4x4.h
index e17fc58c0..9bcd99386 100644
--- a/vp8/common/reconintra4x4.h
+++ b/vp8/common/reconintra4x4.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_RECONINTRA4X4_H_
-#define VP8_COMMON_RECONINTRA4X4_H_
+#ifndef VPX_VP8_COMMON_RECONINTRA4X4_H_
+#define VPX_VP8_COMMON_RECONINTRA4X4_H_
#include "vp8/common/blockd.h"
#ifdef __cplusplus
@@ -42,4 +42,4 @@ void vp8_init_intra4x4_predictors_internal(void);
} // extern "C"
#endif
-#endif // VP8_COMMON_RECONINTRA4X4_H_
+#endif // VPX_VP8_COMMON_RECONINTRA4X4_H_
diff --git a/vp8/common/setupintrarecon.h b/vp8/common/setupintrarecon.h
index f3ffa1660..903a536ae 100644
--- a/vp8/common/setupintrarecon.h
+++ b/vp8/common/setupintrarecon.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_SETUPINTRARECON_H_
-#define VP8_COMMON_SETUPINTRARECON_H_
+#ifndef VPX_VP8_COMMON_SETUPINTRARECON_H_
+#define VPX_VP8_COMMON_SETUPINTRARECON_H_
#include "./vpx_config.h"
#include "vpx_scale/yv12config.h"
@@ -37,4 +37,4 @@ static INLINE void setup_intra_recon_left(unsigned char *y_buffer,
} // extern "C"
#endif
-#endif // VP8_COMMON_SETUPINTRARECON_H_
+#endif // VPX_VP8_COMMON_SETUPINTRARECON_H_
diff --git a/vp8/common/swapyv12buffer.h b/vp8/common/swapyv12buffer.h
index 0ee9a52ce..e37c471f6 100644
--- a/vp8/common/swapyv12buffer.h
+++ b/vp8/common/swapyv12buffer.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_SWAPYV12BUFFER_H_
-#define VP8_COMMON_SWAPYV12BUFFER_H_
+#ifndef VPX_VP8_COMMON_SWAPYV12BUFFER_H_
+#define VPX_VP8_COMMON_SWAPYV12BUFFER_H_
#include "vpx_scale/yv12config.h"
@@ -24,4 +24,4 @@ void vp8_swap_yv12_buffer(YV12_BUFFER_CONFIG *new_frame,
} // extern "C"
#endif
-#endif // VP8_COMMON_SWAPYV12BUFFER_H_
+#endif // VPX_VP8_COMMON_SWAPYV12BUFFER_H_
diff --git a/vp8/common/systemdependent.h b/vp8/common/systemdependent.h
index 3d44e37cf..83a5513aa 100644
--- a/vp8/common/systemdependent.h
+++ b/vp8/common/systemdependent.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_SYSTEMDEPENDENT_H_
-#define VP8_COMMON_SYSTEMDEPENDENT_H_
+#ifndef VPX_VP8_COMMON_SYSTEMDEPENDENT_H_
+#define VPX_VP8_COMMON_SYSTEMDEPENDENT_H_
#include "vpx_config.h"
@@ -24,4 +24,4 @@ void vp8_machine_specific_config(struct VP8Common *);
} // extern "C"
#endif
-#endif // VP8_COMMON_SYSTEMDEPENDENT_H_
+#endif // VPX_VP8_COMMON_SYSTEMDEPENDENT_H_
diff --git a/vp8/common/threading.h b/vp8/common/threading.h
index b082bf109..58b901372 100644
--- a/vp8/common/threading.h
+++ b/vp8/common/threading.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_THREADING_H_
-#define VP8_COMMON_THREADING_H_
+#ifndef VPX_VP8_COMMON_THREADING_H_
+#define VPX_VP8_COMMON_THREADING_H_
#include "./vpx_config.h"
@@ -209,4 +209,4 @@ static INLINE void vp8_atomic_spin_wait(
} // extern "C"
#endif
-#endif // VP8_COMMON_THREADING_H_
+#endif // VPX_VP8_COMMON_THREADING_H_
diff --git a/vp8/common/treecoder.h b/vp8/common/treecoder.h
index d8503cf3f..00b1e7b24 100644
--- a/vp8/common/treecoder.h
+++ b/vp8/common/treecoder.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_TREECODER_H_
-#define VP8_COMMON_TREECODER_H_
+#ifndef VPX_VP8_COMMON_TREECODER_H_
+#define VPX_VP8_COMMON_TREECODER_H_
#ifdef __cplusplus
extern "C" {
@@ -79,4 +79,4 @@ void vp8bc_tree_probs_from_distribution(int n, /* n = size of alphabet */
} // extern "C"
#endif
-#endif // VP8_COMMON_TREECODER_H_
+#endif // VPX_VP8_COMMON_TREECODER_H_
diff --git a/vp8/common/vp8_entropymodedata.h b/vp8/common/vp8_entropymodedata.h
index 3696c08dc..3fc942e05 100644
--- a/vp8/common/vp8_entropymodedata.h
+++ b/vp8/common/vp8_entropymodedata.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_VP8_ENTROPYMODEDATA_H_
-#define VP8_COMMON_VP8_ENTROPYMODEDATA_H_
+#ifndef VPX_VP8_COMMON_VP8_ENTROPYMODEDATA_H_
+#define VPX_VP8_COMMON_VP8_ENTROPYMODEDATA_H_
#ifdef __cplusplus
extern "C" {
@@ -169,4 +169,4 @@ const vp8_prob
} // extern "C"
#endif
-#endif // VP8_COMMON_VP8_ENTROPYMODEDATA_H_
+#endif // VPX_VP8_COMMON_VP8_ENTROPYMODEDATA_H_
diff --git a/vp8/common/vp8_skin_detection.h b/vp8/common/vp8_skin_detection.h
index 4d27f5eb2..ef0e4ae4f 100644
--- a/vp8/common/vp8_skin_detection.h
+++ b/vp8/common/vp8_skin_detection.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_SKIN_DETECTION_H_
-#define VP8_COMMON_SKIN_DETECTION_H_
+#ifndef VPX_VP8_COMMON_VP8_SKIN_DETECTION_H_
+#define VPX_VP8_COMMON_VP8_SKIN_DETECTION_H_
#include "vp8/encoder/onyx_int.h"
#include "vpx/vpx_integer.h"
@@ -44,4 +44,4 @@ void vp8_compute_skin_map(struct VP8_COMP *const cpi, FILE *yuv_skinmap_file);
} // extern "C"
#endif
-#endif // VP8_COMMON_SKIN_DETECTION_H_
+#endif // VPX_VP8_COMMON_VP8_SKIN_DETECTION_H_
diff --git a/vp8/common/x86/filter_x86.h b/vp8/common/x86/filter_x86.h
index d282841be..570ff8666 100644
--- a/vp8/common/x86/filter_x86.h
+++ b/vp8/common/x86/filter_x86.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP8_COMMON_X86_FILTER_X86_H_
-#define VP8_COMMON_X86_FILTER_X86_H_
+#ifndef VPX_VP8_COMMON_X86_FILTER_X86_H_
+#define VPX_VP8_COMMON_X86_FILTER_X86_H_
#include "vpx_ports/mem.h"
@@ -30,4 +30,4 @@ extern DECLARE_ALIGNED(16, const short, vp8_bilinear_filters_x86_8[8][16]);
} // extern "C"
#endif
-#endif // VP8_COMMON_X86_FILTER_X86_H_
+#endif // VPX_VP8_COMMON_X86_FILTER_X86_H_