159 files changed, 139 insertions, 139 deletions

diff --git a/vp9/common/arm/armv6/bilinearfilter_v6.asm b/vp9/common/arm/armv6/vp9_bilinearfilter_v6.asm
index 36e391e2b..36e391e2b 100644
--- a/vp9/common/arm/armv6/bilinearfilter_v6.asm
+++ b/vp9/common/arm/armv6/vp9_bilinearfilter_v6.asm
diff --git a/vp9/common/arm/armv6/copymem16x16_v6.asm b/vp9/common/arm/armv6/vp9_copymem16x16_v6.asm
index 44c3c492f..44c3c492f 100644
--- a/vp9/common/arm/armv6/copymem16x16_v6.asm
+++ b/vp9/common/arm/armv6/vp9_copymem16x16_v6.asm
diff --git a/vp9/common/arm/armv6/copymem8x4_v6.asm b/vp9/common/arm/armv6/vp9_copymem8x4_v6.asm
index 45b904367..45b904367 100644
--- a/vp9/common/arm/armv6/copymem8x4_v6.asm
+++ b/vp9/common/arm/armv6/vp9_copymem8x4_v6.asm
diff --git a/vp9/common/arm/armv6/copymem8x8_v6.asm b/vp9/common/arm/armv6/vp9_copymem8x8_v6.asm
index 0dd971bfe..0dd971bfe 100644
--- a/vp9/common/arm/armv6/copymem8x8_v6.asm
+++ b/vp9/common/arm/armv6/vp9_copymem8x8_v6.asm
diff --git a/vp9/common/arm/armv6/dc_only_idct_add_v6.asm b/vp9/common/arm/armv6/vp9_dc_only_idct_add_v6.asm
index e0660e9fd..e0660e9fd 100644
--- a/vp9/common/arm/armv6/dc_only_idct_add_v6.asm
+++ b/vp9/common/arm/armv6/vp9_dc_only_idct_add_v6.asm
diff --git a/vp9/common/arm/armv6/filter_v6.asm b/vp9/common/arm/armv6/vp9_filter_v6.asm
index 16b321e37..16b321e37 100644
--- a/vp9/common/arm/armv6/filter_v6.asm
+++ b/vp9/common/arm/armv6/vp9_filter_v6.asm
diff --git a/vp9/common/arm/armv6/idct_v6.asm b/vp9/common/arm/armv6/vp9_idct_v6.asm
index 27215afcd..27215afcd 100644
--- a/vp9/common/arm/armv6/idct_v6.asm
+++ b/vp9/common/arm/armv6/vp9_idct_v6.asm
diff --git a/vp9/common/arm/armv6/iwalsh_v6.asm b/vp9/common/arm/armv6/vp9_iwalsh_v6.asm
index 463bff0f5..463bff0f5 100644
--- a/vp9/common/arm/armv6/iwalsh_v6.asm
+++ b/vp9/common/arm/armv6/vp9_iwalsh_v6.asm
diff --git a/vp9/common/arm/armv6/loopfilter_v6.asm b/vp9/common/arm/armv6/vp9_loopfilter_v6.asm
index 37b54a39c..37b54a39c 100644
--- a/vp9/common/arm/armv6/loopfilter_v6.asm
+++ b/vp9/common/arm/armv6/vp9_loopfilter_v6.asm
diff --git a/vp9/common/arm/armv6/recon_v6.asm b/vp9/common/arm/armv6/vp9_recon_v6.asm
index 99c7bcf2d..99c7bcf2d 100644
--- a/vp9/common/arm/armv6/recon_v6.asm
+++ b/vp9/common/arm/armv6/vp9_recon_v6.asm
diff --git a/vp9/common/arm/armv6/simpleloopfilter_v6.asm b/vp9/common/arm/armv6/vp9_simpleloopfilter_v6.asm
index 8306912be..8306912be 100644
--- a/vp9/common/arm/armv6/simpleloopfilter_v6.asm
+++ b/vp9/common/arm/armv6/vp9_simpleloopfilter_v6.asm
diff --git a/vp9/common/arm/armv6/sixtappredict8x4_v6.asm b/vp9/common/arm/armv6/vp9_sixtappredict8x4_v6.asm
index 5bf94e090..5bf94e090 100644
--- a/vp9/common/arm/armv6/sixtappredict8x4_v6.asm
+++ b/vp9/common/arm/armv6/vp9_sixtappredict8x4_v6.asm
diff --git a/vp9/common/arm/neon/bilinearpredict16x16_neon.asm b/vp9/common/arm/neon/vp9_bilinearpredict16x16_neon.asm
index 2528be7c3..2528be7c3 100644
--- a/vp9/common/arm/neon/bilinearpredict16x16_neon.asm
+++ b/vp9/common/arm/neon/vp9_bilinearpredict16x16_neon.asm
diff --git a/vp9/common/arm/neon/bilinearpredict4x4_neon.asm b/vp9/common/arm/neon/vp9_bilinearpredict4x4_neon.asm
index 01eedf8e9..01eedf8e9 100644
--- a/vp9/common/arm/neon/bilinearpredict4x4_neon.asm
+++ b/vp9/common/arm/neon/vp9_bilinearpredict4x4_neon.asm
diff --git a/vp9/common/arm/neon/bilinearpredict8x4_neon.asm b/vp9/common/arm/neon/vp9_bilinearpredict8x4_neon.asm
index 8f49345ff..8f49345ff 100644
--- a/vp9/common/arm/neon/bilinearpredict8x4_neon.asm
+++ b/vp9/common/arm/neon/vp9_bilinearpredict8x4_neon.asm
diff --git a/vp9/common/arm/neon/bilinearpredict8x8_neon.asm b/vp9/common/arm/neon/vp9_bilinearpredict8x8_neon.asm
index 6967f1950..6967f1950 100644
--- a/vp9/common/arm/neon/bilinearpredict8x8_neon.asm
+++ b/vp9/common/arm/neon/vp9_bilinearpredict8x8_neon.asm
diff --git a/vp9/common/arm/neon/buildintrapredictorsmby_neon.asm b/vp9/common/arm/neon/vp9_buildintrapredictorsmby_neon.asm
index e3ea91fe6..e3ea91fe6 100644
--- a/vp9/common/arm/neon/buildintrapredictorsmby_neon.asm
+++ b/vp9/common/arm/neon/vp9_buildintrapredictorsmby_neon.asm
diff --git a/vp9/common/arm/neon/copymem16x16_neon.asm b/vp9/common/arm/neon/vp9_copymem16x16_neon.asm
index bff8156d9..bff8156d9 100644
--- a/vp9/common/arm/neon/copymem16x16_neon.asm
+++ b/vp9/common/arm/neon/vp9_copymem16x16_neon.asm
diff --git a/vp9/common/arm/neon/copymem8x4_neon.asm b/vp9/common/arm/neon/vp9_copymem8x4_neon.asm
index ffd2df8e1..ffd2df8e1 100644
--- a/vp9/common/arm/neon/copymem8x4_neon.asm
+++ b/vp9/common/arm/neon/vp9_copymem8x4_neon.asm
diff --git a/vp9/common/arm/neon/copymem8x8_neon.asm b/vp9/common/arm/neon/vp9_copymem8x8_neon.asm
index 2d394c043..2d394c043 100644
--- a/vp9/common/arm/neon/copymem8x8_neon.asm
+++ b/vp9/common/arm/neon/vp9_copymem8x8_neon.asm
diff --git a/vp9/common/arm/neon/dc_only_idct_add_neon.asm b/vp9/common/arm/neon/vp9_dc_only_idct_add_neon.asm
index 49ba05fb0..49ba05fb0 100644
--- a/vp9/common/arm/neon/dc_only_idct_add_neon.asm
+++ b/vp9/common/arm/neon/vp9_dc_only_idct_add_neon.asm
diff --git a/vp9/common/arm/neon/iwalsh_neon.asm b/vp9/common/arm/neon/vp9_iwalsh_neon.asm
index 01c79d937..01c79d937 100644
--- a/vp9/common/arm/neon/iwalsh_neon.asm
+++ b/vp9/common/arm/neon/vp9_iwalsh_neon.asm
diff --git a/vp9/common/arm/neon/loopfilter_neon.asm b/vp9/common/arm/neon/vp9_loopfilter_neon.asm
index bc6616734..bc6616734 100644
--- a/vp9/common/arm/neon/loopfilter_neon.asm
+++ b/vp9/common/arm/neon/vp9_loopfilter_neon.asm
diff --git a/vp9/common/arm/neon/loopfiltersimplehorizontaledge_neon.asm b/vp9/common/arm/neon/vp9_loopfiltersimplehorizontaledge_neon.asm
index eb07ce0d5..eb07ce0d5 100644
--- a/vp9/common/arm/neon/loopfiltersimplehorizontaledge_neon.asm
+++ b/vp9/common/arm/neon/vp9_loopfiltersimplehorizontaledge_neon.asm
diff --git a/vp9/common/arm/neon/loopfiltersimpleverticaledge_neon.asm b/vp9/common/arm/neon/vp9_loopfiltersimpleverticaledge_neon.asm
index d5cf8c2b5..d5cf8c2b5 100644
--- a/vp9/common/arm/neon/loopfiltersimpleverticaledge_neon.asm
+++ b/vp9/common/arm/neon/vp9_loopfiltersimpleverticaledge_neon.asm
diff --git a/vp9/common/arm/neon/mbloopfilter_neon.asm b/vp9/common/arm/neon/vp9_mbloopfilter_neon.asm
index 19b67f47d..19b67f47d 100644
--- a/vp9/common/arm/neon/mbloopfilter_neon.asm
+++ b/vp9/common/arm/neon/vp9_mbloopfilter_neon.asm
diff --git a/vp9/common/arm/neon/recon16x16mb_neon.asm b/vp9/common/arm/neon/vp9_recon16x16mb_neon.asm
index 3f1a30f48..3f1a30f48 100644
--- a/vp9/common/arm/neon/recon16x16mb_neon.asm
+++ b/vp9/common/arm/neon/vp9_recon16x16mb_neon.asm
diff --git a/vp9/common/arm/neon/recon2b_neon.asm b/vp9/common/arm/neon/vp9_recon2b_neon.asm
index 99b251c91..99b251c91 100644
--- a/vp9/common/arm/neon/recon2b_neon.asm
+++ b/vp9/common/arm/neon/vp9_recon2b_neon.asm
diff --git a/vp9/common/arm/neon/recon4b_neon.asm b/vp9/common/arm/neon/vp9_recon4b_neon.asm
index 991727746..991727746 100644
--- a/vp9/common/arm/neon/recon4b_neon.asm
+++ b/vp9/common/arm/neon/vp9_recon4b_neon.asm
diff --git a/vp9/common/arm/neon/recon_neon.c b/vp9/common/arm/neon/vp9_recon_neon.c
index 10fd46feb..cc3f9f59d 100644
--- a/vp9/common/arm/neon/recon_neon.c
+++ b/vp9/common/arm/neon/vp9_recon_neon.c
@@ -11,7 +11,7 @@
 
 #include "vpx_ports/config.h"
 #include "vp9/common/recon.h"
-#include "vp9/common/blockd.h"
+#include "vp9/common/vp9_blockd.h"
 
 extern void vp8_recon16x16mb_neon(unsigned char *pred_ptr, short *diff_ptr, unsigned char *dst_ptr, int ystride, unsigned char *udst_ptr, unsigned char *vdst_ptr);
 
diff --git a/vp9/common/arm/neon/reconb_neon.asm b/vp9/common/arm/neon/vp9_reconb_neon.asm
index 288c0ef01..288c0ef01 100644
--- a/vp9/common/arm/neon/reconb_neon.asm
+++ b/vp9/common/arm/neon/vp9_reconb_neon.asm
diff --git a/vp9/common/arm/neon/save_neon_reg.asm b/vp9/common/arm/neon/vp9_save_neon_reg.asm
index 71c3e7077..71c3e7077 100644
--- a/vp9/common/arm/neon/save_neon_reg.asm
+++ b/vp9/common/arm/neon/vp9_save_neon_reg.asm
diff --git a/vp9/common/arm/neon/shortidct4x4llm_1_neon.asm b/vp9/common/arm/neon/vp9_shortidct4x4llm_1_neon.asm
index d7bdbae75..d7bdbae75 100644
--- a/vp9/common/arm/neon/shortidct4x4llm_1_neon.asm
+++ b/vp9/common/arm/neon/vp9_shortidct4x4llm_1_neon.asm
diff --git a/vp9/common/arm/neon/shortidct4x4llm_neon.asm b/vp9/common/arm/neon/vp9_shortidct4x4llm_neon.asm
index b74c31521..b74c31521 100644
--- a/vp9/common/arm/neon/shortidct4x4llm_neon.asm
+++ b/vp9/common/arm/neon/vp9_shortidct4x4llm_neon.asm
diff --git a/vp9/common/arm/neon/sixtappredict16x16_neon.asm b/vp9/common/arm/neon/vp9_sixtappredict16x16_neon.asm
index 5e83f49f5..5e83f49f5 100644
--- a/vp9/common/arm/neon/sixtappredict16x16_neon.asm
+++ b/vp9/common/arm/neon/vp9_sixtappredict16x16_neon.asm
diff --git a/vp9/common/arm/neon/sixtappredict4x4_neon.asm b/vp9/common/arm/neon/vp9_sixtappredict4x4_neon.asm
index 5966b642f..5966b642f 100644
--- a/vp9/common/arm/neon/sixtappredict4x4_neon.asm
+++ b/vp9/common/arm/neon/vp9_sixtappredict4x4_neon.asm
diff --git a/vp9/common/arm/neon/sixtappredict8x4_neon.asm b/vp9/common/arm/neon/vp9_sixtappredict8x4_neon.asm
index 9ce1e3bbd..9ce1e3bbd 100644
--- a/vp9/common/arm/neon/sixtappredict8x4_neon.asm
+++ b/vp9/common/arm/neon/vp9_sixtappredict8x4_neon.asm
diff --git a/vp9/common/arm/neon/sixtappredict8x8_neon.asm b/vp9/common/arm/neon/vp9_sixtappredict8x8_neon.asm
index 5ff16616d..5ff16616d 100644
--- a/vp9/common/arm/neon/sixtappredict8x8_neon.asm
+++ b/vp9/common/arm/neon/vp9_sixtappredict8x8_neon.asm
diff --git a/vp9/common/arm/arm_systemdependent.c b/vp9/common/arm/vp9_arm_systemdependent.c
index 0a0e8098e..a6319a4c5 100644
--- a/vp9/common/arm/arm_systemdependent.c
+++ b/vp9/common/arm/vp9_arm_systemdependent.c
@@ -11,11 +11,11 @@
 
 #include "vpx_ports/config.h"
 #include "vpx_ports/arm.h"
-#include "vp9/common/pragmas.h"
-#include "vp9/common/subpixel.h"
-#include "vp9/common/loopfilter.h"
+#include "vp9/common/vp9_pragmas.h"
+#include "vp9/common/vp9_subpixel.h"
+#include "vp9/common/vp9_loopfilter.h"
 #include "vp9/common/recon.h"
-#include "vp9/common/onyxc_int.h"
+#include "vp9/common/vp9_onyxc_int.h"
 
 void vp9_arch_arm_common_init(VP9_COMMON *ctx) {
 #if CONFIG_RUNTIME_CPU_DETECT
diff --git a/vp9/common/arm/bilinearfilter_arm.c b/vp9/common/arm/vp9_bilinearfilter_arm.c
index 287fdf04d..409e271b1 100644
--- a/vp9/common/arm/bilinearfilter_arm.c
+++ b/vp9/common/arm/vp9_bilinearfilter_arm.c
@@ -10,9 +10,9 @@
 
 
 #include <math.h>
-#include "vp9/common/filter.h"
-#include "vp9/common/subpixel.h"
-#include "bilinearfilter_arm.h"
+#include "vp9/common/vp9_filter.h"
+#include "vp9/common/vp9_subpixel.h"
+#include "vp9_bilinearfilter_arm.h"
 
 void vp9_filter_block2d_bil_armv6
 (
diff --git a/vp9/common/arm/bilinearfilter_arm.h b/vp9/common/arm/vp9_bilinearfilter_arm.h
index b6d9cfc2d..b6d9cfc2d 100644
--- a/vp9/common/arm/bilinearfilter_arm.h
+++ b/vp9/common/arm/vp9_bilinearfilter_arm.h
diff --git a/vp9/common/arm/filter_arm.c b/vp9/common/arm/vp9_filter_arm.c
index ccb34e236..f55273c33 100644
--- a/vp9/common/arm/filter_arm.c
+++ b/vp9/common/arm/vp9_filter_arm.c
@@ -11,8 +11,8 @@
 
 #include "vpx_ports/config.h"
 #include <math.h>
-#include "vp9/common/filter.h"
-#include "vp9/common/subpixel.h"
+#include "vp9/common/vp9_filter.h"
+#include "vp9/common/vp9_subpixel.h"
 #include "vpx_ports/mem.h"
 
 extern void vp9_filter_block2d_first_pass_armv6
diff --git a/vp9/common/arm/idct_arm.h b/vp9/common/arm/vp9_idct_arm.h
index 2fc4cf7fc..2fc4cf7fc 100644
--- a/vp9/common/arm/idct_arm.h
+++ b/vp9/common/arm/vp9_idct_arm.h
diff --git a/vp9/common/arm/loopfilter_arm.c b/vp9/common/arm/vp9_loopfilter_arm.c
index abcb4c7cc..b61f1a86b 100644
--- a/vp9/common/arm/loopfilter_arm.c
+++ b/vp9/common/arm/vp9_loopfilter_arm.c
@@ -10,8 +10,8 @@
 
 
 #include "vpx_config.h"
-#include "vp9/common/loopfilter.h"
-#include "vp9/common/onyxc_int.h"
+#include "vp9/common/vp9_loopfilter.h"
+#include "vp9/common/vp9_onyxc_int.h"
 
 #if HAVE_ARMV6
 extern prototype_loopfilter(vp9_loop_filter_horizontal_edge_armv6);
diff --git a/vp9/common/arm/loopfilter_arm.h b/vp9/common/arm/vp9_loopfilter_arm.h
index de6b7ffbc..de6b7ffbc 100644
--- a/vp9/common/arm/loopfilter_arm.h
+++ b/vp9/common/arm/vp9_loopfilter_arm.h
diff --git a/vp9/common/arm/recon_arm.h b/vp9/common/arm/vp9_recon_arm.h
index 1e402951c..1e402951c 100644
--- a/vp9/common/arm/recon_arm.h
+++ b/vp9/common/arm/vp9_recon_arm.h
diff --git a/vp9/common/arm/reconintra_arm.c b/vp9/common/arm/vp9_reconintra_arm.c
index 590254680..5720828c7 100644
--- a/vp9/common/arm/reconintra_arm.c
+++ b/vp9/common/arm/vp9_reconintra_arm.c
@@ -10,8 +10,8 @@
 
 
 #include "vpx_ports/config.h"
-#include "vp9/common/blockd.h"
-#include "vp9/common/reconintra.h"
+#include "vp9/common/vp9_blockd.h"
+#include "vp9/common/vp9_reconintra.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vp9/common/recon.h"
 
diff --git a/vp9/common/arm/subpixel_arm.h b/vp9/common/arm/vp9_subpixel_arm.h
index b4f9f54f3..b4f9f54f3 100644
--- a/vp9/common/arm/subpixel_arm.h
+++ b/vp9/common/arm/vp9_subpixel_arm.h
diff --git a/vp9/common/generic/systemdependent.c b/vp9/common/generic/vp9_systemdependent.c
index 6d1a271f5..29d1c3057 100644
--- a/vp9/common/generic/systemdependent.c
+++ b/vp9/common/generic/vp9_systemdependent.c
@@ -11,9 +11,9 @@
 
 #include "vpx_ports/config.h"
 #include "vp9_rtcd.h"
-#include "vp9/common/subpixel.h"
-#include "vp9/common/loopfilter.h"
-#include "vp9/common/onyxc_int.h"
+#include "vp9/common/vp9_subpixel.h"
+#include "vp9/common/vp9_loopfilter.h"
+#include "vp9/common/vp9_onyxc_int.h"
 
 extern void vp9_arch_x86_common_init(VP9_COMMON *ctx);
 extern void vp9_arch_arm_common_init(VP9_COMMON *ctx);
diff --git a/vp9/common/ppc/copy_altivec.asm b/vp9/common/ppc/vp9_copy_altivec.asm
index a4ce91583..a4ce91583 100644
--- a/vp9/common/ppc/copy_altivec.asm
+++ b/vp9/common/ppc/vp9_copy_altivec.asm
diff --git a/vp9/common/ppc/filter_altivec.asm b/vp9/common/ppc/vp9_filter_altivec.asm
index 4da2e94f9..4da2e94f9 100644
--- a/vp9/common/ppc/filter_altivec.asm
+++ b/vp9/common/ppc/vp9_filter_altivec.asm
diff --git a/vp9/common/ppc/filter_bilinear_altivec.asm b/vp9/common/ppc/vp9_filter_bilinear_altivec.asm
index fd8aa665f..fd8aa665f 100644
--- a/vp9/common/ppc/filter_bilinear_altivec.asm
+++ b/vp9/common/ppc/vp9_filter_bilinear_altivec.asm
diff --git a/vp9/common/ppc/idctllm_altivec.asm b/vp9/common/ppc/vp9_idctllm_altivec.asm
index 117d9cfc8..117d9cfc8 100644
--- a/vp9/common/ppc/idctllm_altivec.asm
+++ b/vp9/common/ppc/vp9_idctllm_altivec.asm
diff --git a/vp9/common/ppc/loopfilter_altivec.c b/vp9/common/ppc/vp9_loopfilter_altivec.c
index 962da2319..cae171805 100644
--- a/vp9/common/ppc/loopfilter_altivec.c
+++ b/vp9/common/ppc/vp9_loopfilter_altivec.c
@@ -9,8 +9,8 @@
  */
 
 
-#include "loopfilter.h"
-#include "onyxc_int.h"
+#include "vp9_loopfilter.h"
+#include "vp9_onyxc_int.h"
 
 typedef void loop_filter_function_y_ppc
 (
diff --git a/vp9/common/ppc/loopfilter_filters_altivec.asm b/vp9/common/ppc/vp9_loopfilter_filters_altivec.asm
index 61df4e976..61df4e976 100644
--- a/vp9/common/ppc/loopfilter_filters_altivec.asm
+++ b/vp9/common/ppc/vp9_loopfilter_filters_altivec.asm
diff --git a/vp9/common/ppc/platform_altivec.asm b/vp9/common/ppc/vp9_platform_altivec.asm
index f81d86f74..f81d86f74 100644
--- a/vp9/common/ppc/platform_altivec.asm
+++ b/vp9/common/ppc/vp9_platform_altivec.asm
diff --git a/vp9/common/ppc/recon_altivec.asm b/vp9/common/ppc/vp9_recon_altivec.asm
index dd39e05a8..dd39e05a8 100644
--- a/vp9/common/ppc/recon_altivec.asm
+++ b/vp9/common/ppc/vp9_recon_altivec.asm
diff --git a/vp9/common/ppc/systemdependent.c b/vp9/common/ppc/vp9_systemdependent.c
index 941c11bd6..2137dee9c 100644
--- a/vp9/common/ppc/systemdependent.c
+++ b/vp9/common/ppc/vp9_systemdependent.c
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "subpixel.h"
-#include "loopfilter.h"
+#include "vp9_subpixel.h"
+#include "vp9_loopfilter.h"
 #include "recon.h"
-#include "onyxc_int.h"
+#include "vp9_onyxc_int.h"
 
 void (*vp8_short_idct4x4)(short *input, short *output, int pitch);
 void (*vp8_short_idct4x4_1)(short *input, short *output, int pitch);
diff --git a/vp9/common/alloccommon.c b/vp9/common/vp9_alloccommon.c
index 33d322099..04a8b368a 100644
--- a/vp9/common/alloccommon.c
+++ b/vp9/common/vp9_alloccommon.c
@@ -10,13 +10,13 @@
 
 
 #include "vpx_ports/config.h"
-#include "blockd.h"
+#include "vp9_blockd.h"
 #include "vpx_mem/vpx_mem.h"
-#include "onyxc_int.h"
-#include "findnearmv.h"
-#include "entropymode.h"
-#include "entropymv.h"
-#include "systemdependent.h"
+#include "vp9_onyxc_int.h"
+#include "vp9_findnearmv.h"
+#include "vp9_entropymode.h"
+#include "vp9_entropymv.h"
+#include "vp9_systemdependent.h"
 
 
 void vp9_update_mode_info_border(VP9_COMMON *cpi, MODE_INFO *mi_base) {
diff --git a/vp9/common/alloccommon.h b/vp9/common/vp9_alloccommon.h
index 490b869b7..df94f421e 100644
--- a/vp9/common/alloccommon.h
+++ b/vp9/common/vp9_alloccommon.h
@@ -12,7 +12,7 @@
 #ifndef __INC_ALLOCCOMMON_H
 #define __INC_ALLOCCOMMON_H
 
-#include "onyxc_int.h"
+#include "vp9_onyxc_int.h"
 
 void vp9_create_common(VP9_COMMON *oci);
 void vp9_remove_common(VP9_COMMON *oci);
diff --git a/vp9/common/asm_com_offsets.c b/vp9/common/vp9_asm_com_offsets.c
index 07d3e333a..07d3e333a 100644
--- a/vp9/common/asm_com_offsets.c
+++ b/vp9/common/vp9_asm_com_offsets.c
diff --git a/vp9/common/blockd.c b/vp9/common/vp9_blockd.c
index 140500ec4..d8bb394d4 100644
--- a/vp9/common/blockd.c
+++ b/vp9/common/vp9_blockd.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "blockd.h"
+#include "vp9_blockd.h"
 #include "vpx_mem/vpx_mem.h"
 
 
diff --git a/vp9/common/blockd.h b/vp9/common/vp9_blockd.h
index 409c7b8f8..a91e8d4d0 100644
--- a/vp9/common/blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -16,11 +16,11 @@ void vpx_log(const char *format, ...);
 
 #include "vpx_ports/config.h"
 #include "vpx_scale/yv12config.h"
-#include "mv.h"
-#include "treecoder.h"
-#include "subpixel.h"
+#include "vp9_mv.h"
+#include "vp9_treecoder.h"
+#include "vp9_subpixel.h"
 #include "vpx_ports/mem.h"
-#include "common.h"
+#include "vp9_common.h"
 
 #define TRUE    1
 #define FALSE   0
diff --git a/vp9/common/coefupdateprobs.h b/vp9/common/vp9_coefupdateprobs.h
index 185bc6d84..cd7eabfa5 100644
--- a/vp9/common/coefupdateprobs.h
+++ b/vp9/common/vp9_coefupdateprobs.h
@@ -10,7 +10,7 @@
 
 
 /* Update probabilities for the nodes in the token entropy tree.
-   Generated file included by entropy.c */
+   Generated file included by vp9_entropy.c */
 #define COEF_UPDATE_PROB 252
 #define COEF_UPDATE_PROB_8X8 252
 #define COEF_UPDATE_PROB_16X16 252
diff --git a/vp9/common/common.h b/vp9/common/vp9_common.h
index bd34bf9b1..61c0e25d8 100644
--- a/vp9/common/common.h
+++ b/vp9/common/vp9_common.h
@@ -18,7 +18,7 @@
 
 #include "vpx_mem/vpx_mem.h"
 
-#include "common_types.h"
+#include "vp9_common_types.h"
 
 /* Only need this for fixed-size arrays, for structs just assign. */
 
diff --git a/vp9/common/common_types.h b/vp9/common/vp9_common_types.h
index 4e6248697..4e6248697 100644
--- a/vp9/common/common_types.h
+++ b/vp9/common/vp9_common_types.h
diff --git a/vp9/common/context.c b/vp9/common/vp9_context.c
index 181a27f3e..90a1f796f 100644
--- a/vp9/common/context.c
+++ b/vp9/common/vp9_context.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "entropy.h"
+#include "vp9_entropy.h"
 
 /* *** GENERATED FILE: DO NOT EDIT *** */
 
diff --git a/vp9/common/debugmodes.c b/vp9/common/vp9_debugmodes.c
index 5cd84c51b..058abb57e 100644
--- a/vp9/common/debugmodes.c
+++ b/vp9/common/vp9_debugmodes.c
@@ -9,7 +9,7 @@
  */
 
 #include <stdio.h>
-#include "blockd.h"
+#include "vp9_blockd.h"
 
 void vp9_print_modes_and_motion_vectors(MODE_INFO *mi, int rows, int cols,
                                         int frame) {
diff --git a/vp9/common/default_coef_probs.h b/vp9/common/vp9_default_coef_probs.h
index 4caf8818d..52fb02f36 100644
--- a/vp9/common/default_coef_probs.h
+++ b/vp9/common/vp9_default_coef_probs.h
@@ -9,7 +9,7 @@
 */
 
 
-/*Generated file, included by entropy.c*/
+/*Generated file, included by vp9_entropy.c*/
 
 
 static const vp9_prob default_coef_probs [BLOCK_TYPES]
diff --git a/vp9/common/entropy.c b/vp9/common/vp9_entropy.c
index a4ecae09f..e6ee2729e 100644
--- a/vp9/common/entropy.c
+++ b/vp9/common/vp9_entropy.c
@@ -11,11 +11,11 @@
 
 #include <stdio.h>
 
-#include "entropy.h"
+#include "vp9_entropy.h"
 #include "string.h"
-#include "blockd.h"
-#include "onyxc_int.h"
-#include "entropymode.h"
+#include "vp9_blockd.h"
+#include "vp9_onyxc_int.h"
+#include "vp9_entropymode.h"
 #include "vpx_mem/vpx_mem.h"
 
 #define uchar unsigned char     /* typedefs can clash */
@@ -26,7 +26,7 @@ typedef const uint cuint;
 
 typedef vp9_prob Prob;
 
-#include "coefupdateprobs.h"
+#include "vp9_coefupdateprobs.h"
 
 const int vp9_i8x8_block[4] = {0, 2, 8, 10};
 
@@ -200,7 +200,7 @@ vp9_extra_bit_struct vp9_extra_bits[12] = {
   { 0, 0, 0, 0}
 };
 
-#include "default_coef_probs.h"
+#include "vp9_default_coef_probs.h"
 
 void vp9_default_coef_probs(VP9_COMMON *pc) {
   vpx_memcpy(pc->fc.coef_probs, default_coef_probs,
diff --git a/vp9/common/entropy.h b/vp9/common/vp9_entropy.h
index fa24a058e..a2053609b 100644
--- a/vp9/common/entropy.h
+++ b/vp9/common/vp9_entropy.h
@@ -12,10 +12,10 @@
 #ifndef __INC_ENTROPY_H
 #define __INC_ENTROPY_H
 
-#include "treecoder.h"
-#include "blockd.h"
-#include "common.h"
-#include "coefupdateprobs.h"
+#include "vp9_treecoder.h"
+#include "vp9_blockd.h"
+#include "vp9_common.h"
+#include "vp9_coefupdateprobs.h"
 
 extern const int vp9_i8x8_block[4];
 
diff --git a/vp9/common/entropymode.c b/vp9/common/vp9_entropymode.c
index 5d3336916..69acbab02 100644
--- a/vp9/common/entropymode.c
+++ b/vp9/common/vp9_entropymode.c
@@ -9,8 +9,8 @@
  */
 
 
-#include "onyxc_int.h"
-#include "modecont.h"
+#include "vp9_onyxc_int.h"
+#include "vp9_modecont.h"
 #include "vpx_mem/vpx_mem.h"
 
 
@@ -519,7 +519,7 @@ void vp9_update_mode_context(VP9_COMMON *pc) {
 }
 
 #ifdef MODE_STATS
-#include "vp9/common/modecont.h"
+#include "vp9/common/vp9_modecont.h"
 void print_mode_contexts(VP9_COMMON *pc) {
   int j, i;
   printf("\n====================\n");
diff --git a/vp9/common/entropymode.h b/vp9/common/vp9_entropymode.h
index 9f20ae94d..aee6e6c76 100644
--- a/vp9/common/entropymode.h
+++ b/vp9/common/vp9_entropymode.h
@@ -12,8 +12,8 @@
 #ifndef __INC_ENTROPYMODE_H
 #define __INC_ENTROPYMODE_H
 
-#include "blockd.h"
-#include "treecoder.h"
+#include "vp9_blockd.h"
+#include "vp9_treecoder.h"
 
 #define SUBMVREF_COUNT 5
 #define VP9_NUMMBSPLITS 4
diff --git a/vp9/common/entropymv.c b/vp9/common/vp9_entropymv.c
index 85c21ba2a..8d2ebebc4 100644
--- a/vp9/common/entropymv.c
+++ b/vp9/common/vp9_entropymv.c
@@ -9,8 +9,8 @@
  */
 
 
-#include "onyxc_int.h"
-#include "entropymv.h"
+#include "vp9_onyxc_int.h"
+#include "vp9_entropymv.h"
 
 //#define MV_COUNT_TESTING
 
diff --git a/vp9/common/entropymv.h b/vp9/common/vp9_entropymv.h
index 7a5fadff1..3be95117c 100644
--- a/vp9/common/entropymv.h
+++ b/vp9/common/vp9_entropymv.h
@@ -12,9 +12,9 @@
 #ifndef __INC_ENTROPYMV_H
 #define __INC_ENTROPYMV_H
 
-#include "treecoder.h"
+#include "vp9_treecoder.h"
 #include "vpx_config.h"
-#include "blockd.h"
+#include "vp9_blockd.h"
 
 struct VP9Common;
 
diff --git a/vp9/common/extend.c b/vp9/common/vp9_extend.c
index ad3b89b44..4f2aa0e0c 100644
--- a/vp9/common/extend.c
+++ b/vp9/common/vp9_extend.c
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "extend.h"
+#include "vp9_extend.h"
 #include "vpx_mem/vpx_mem.h"
 
 static void copy_and_extend_plane(unsigned char *s, /* source */
diff --git a/vp9/common/extend.h b/vp9/common/vp9_extend.h
index c3c590479..c3c590479 100644
--- a/vp9/common/extend.h
+++ b/vp9/common/vp9_extend.h
diff --git a/vp9/common/filter.c b/vp9/common/vp9_filter.c
index 429f408c7..8d5eb9333 100644
--- a/vp9/common/filter.c
+++ b/vp9/common/vp9_filter.c
@@ -10,7 +10,7 @@
 
 
 #include <stdlib.h>
-#include "filter.h"
+#include "vp9_filter.h"
 #include "vpx_ports/mem.h"
 #include "vp9_rtcd.h"
 
diff --git a/vp9/common/filter.h b/vp9/common/vp9_filter.h
index c194887dc..c194887dc 100644
--- a/vp9/common/filter.h
+++ b/vp9/common/vp9_filter.h
diff --git a/vp9/common/findnearmv.c b/vp9/common/vp9_findnearmv.c
index a551db810..bfbac4e18 100644
--- a/vp9/common/findnearmv.c
+++ b/vp9/common/vp9_findnearmv.c
@@ -9,9 +9,9 @@
  */
 
 
-#include "findnearmv.h"
-#include "vp9/common/sadmxn.h"
-#include "vp9/common/subpelvar.h"
+#include "vp9_findnearmv.h"
+#include "vp9/common/vp9_sadmxn.h"
+#include "vp9/common/vp9_subpelvar.h"
 #include <limits.h>
 
 const unsigned char vp9_mbsplit_offset[4][16] = {
diff --git a/vp9/common/findnearmv.h b/vp9/common/vp9_findnearmv.h
index 4e6418a51..759bdbaff 100644
--- a/vp9/common/findnearmv.h
+++ b/vp9/common/vp9_findnearmv.h
@@ -12,10 +12,10 @@
 #ifndef __INC_FINDNEARMV_H
 #define __INC_FINDNEARMV_H
 
-#include "mv.h"
-#include "blockd.h"
-#include "treecoder.h"
-#include "onyxc_int.h"
+#include "vp9_mv.h"
+#include "vp9_blockd.h"
+#include "vp9_treecoder.h"
+#include "vp9_onyxc_int.h"
 
 /* check a list of motion vectors by sad score using a number rows of pixels
  * above and a number cols of pixels in the left to select the one with best
diff --git a/vp9/common/header.h b/vp9/common/vp9_header.h
index a88b6e3e3..a88b6e3e3 100644
--- a/vp9/common/header.h
+++ b/vp9/common/vp9_header.h
diff --git a/vp9/common/idctllm.c b/vp9/common/vp9_idctllm.c
index 55b7a8571..9d559ed22 100644
--- a/vp9/common/idctllm.c
+++ b/vp9/common/vp9_idctllm.c
@@ -25,9 +25,9 @@
 #include <assert.h>
 #include <math.h>
 #include "vpx_ports/config.h"
-#include "vp9/common/systemdependent.h"
+#include "vp9/common/vp9_systemdependent.h"
 
-#include "vp9/common/blockd.h"
+#include "vp9/common/vp9_blockd.h"
 
 static const int cospi8sqrt2minus1 = 20091;
 static const int sinpi8sqrt2      = 35468;
diff --git a/vp9/common/implicit_segmentation.c b/vp9/common/vp9_implicit_segmentation.c
index 9194e2a30..472c3d1a5 100644
--- a/vp9/common/implicit_segmentation.c
+++ b/vp9/common/vp9_implicit_segmentation.c
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp9/common/onyxc_int.h"
+#include "vp9/common/vp9_onyxc_int.h"
 
 #define MAX_REGIONS 24000
 #ifndef NULL
diff --git a/vp9/common/invtrans.c b/vp9/common/vp9_invtrans.c
index ac5553e6e..76eb10307 100644
--- a/vp9/common/invtrans.c
+++ b/vp9/common/vp9_invtrans.c
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "invtrans.h"
+#include "vp9_invtrans.h"
 #include "./vp9_rtcd.h"
 
 static void recon_dcblock(MACROBLOCKD *xd) {
diff --git a/vp9/common/invtrans.h b/vp9/common/vp9_invtrans.h
index 58dc4d704..0e50c45d7 100644
--- a/vp9/common/invtrans.h
+++ b/vp9/common/vp9_invtrans.h
@@ -12,7 +12,7 @@
 #define __INC_INVTRANS_H
 
 #include "vpx_ports/config.h"
-#include "blockd.h"
+#include "vp9_blockd.h"
 
 extern void vp9_inverse_transform_b_4x4(MACROBLOCKD *xd, int block, int pitch);
 
diff --git a/vp9/common/loopfilter.c b/vp9/common/vp9_loopfilter.c
index 0d295c66a..73b343974 100644
--- a/vp9/common/loopfilter.c
+++ b/vp9/common/vp9_loopfilter.c
@@ -9,11 +9,11 @@
  */
 
 #include "vpx_config.h"
-#include "loopfilter.h"
-#include "onyxc_int.h"
+#include "vp9_loopfilter.h"
+#include "vp9_onyxc_int.h"
 #include "vpx_mem/vpx_mem.h"
 
-#include "vp9/common/seg_common.h"
+#include "vp9/common/vp9_seg_common.h"
 
 static void lf_init_lut(loop_filter_info_n *lfi) {
   int filt_lvl;
diff --git a/vp9/common/loopfilter.h b/vp9/common/vp9_loopfilter.h
index 0b7de682c..b3254f692 100644
--- a/vp9/common/loopfilter.h
+++ b/vp9/common/vp9_loopfilter.h
@@ -13,7 +13,7 @@
 
 #include "vpx_ports/mem.h"
 #include "vpx_config.h"
-#include "blockd.h"
+#include "vp9_blockd.h"
 
 #define MAX_LOOP_FILTER 63
 
@@ -64,11 +64,11 @@ struct loop_filter_info {
   void sym(unsigned char *y, int ystride, const unsigned char *blimit)
 
 #if ARCH_X86 || ARCH_X86_64
-#include "x86/loopfilter_x86.h"
+#include "x86/vp9_loopfilter_x86.h"
 #endif
 
 #if ARCH_ARM
-#include "arm/loopfilter_arm.h"
+#include "arm/vp9_loopfilter_arm.h"
 #endif
 
 typedef void loop_filter_uvfunction(unsigned char *u,   /* source pointer */
diff --git a/vp9/common/loopfilter_filters.c b/vp9/common/vp9_loopfilter_filters.c
index c719b44c3..9fd6c5fa6 100644
--- a/vp9/common/loopfilter_filters.c
+++ b/vp9/common/vp9_loopfilter_filters.c
@@ -10,8 +10,8 @@
 
 #include <stdlib.h>
 #include "vpx_config.h"
-#include "loopfilter.h"
-#include "onyxc_int.h"
+#include "vp9_loopfilter.h"
+#include "vp9_onyxc_int.h"
 
 typedef unsigned char uc;
 
diff --git a/vp9/common/maskingmv.c b/vp9/common/vp9_maskingmv.c
index 05cfb4a46..f1151e3dc 100644
--- a/vp9/common/maskingmv.c
+++ b/vp9/common/vp9_maskingmv.c
@@ -1,6 +1,6 @@
 /*
  ============================================================================
- Name        : maskingmv.c
+ Name        : vp9_maskingmv.c
  Author      : jimbankoski
  Version     :
  Copyright   : Your copyright notice
diff --git a/vp9/common/mbpitch.c b/vp9/common/vp9_mbpitch.c
index 5ef4dd618..b42db987a 100644
--- a/vp9/common/mbpitch.c
+++ b/vp9/common/vp9_mbpitch.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "blockd.h"
+#include "vp9_blockd.h"
 
 typedef enum {
   PRED = 0,
diff --git a/vp9/common/modecont.c b/vp9/common/vp9_modecont.c
index 1a71eceb5..2f5bbd2ba 100644
--- a/vp9/common/modecont.c
+++ b/vp9/common/vp9_modecont.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "entropy.h"
+#include "vp9_entropy.h"
 
 const int vp9_default_mode_contexts[INTER_MODE_CONTEXTS][4] = {
   {223,     1,     1,    237},  // 0,0 best: Only candidate
diff --git a/vp9/common/modecont.h b/vp9/common/vp9_modecont.h
index 1fa4558e1..1fa4558e1 100644
--- a/vp9/common/modecont.h
+++ b/vp9/common/vp9_modecont.h
diff --git a/vp9/common/modecontext.c b/vp9/common/vp9_modecontext.c
index 522498609..e18cf63c1 100644
--- a/vp9/common/modecontext.c
+++ b/vp9/common/vp9_modecontext.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "entropymode.h"
+#include "vp9_entropymode.h"
 
 const unsigned int vp9_kf_default_bmode_counts[VP9_KF_BINTRAMODES]
                                               [VP9_KF_BINTRAMODES]
diff --git a/vp9/common/mv.h b/vp9/common/vp9_mv.h
index bbe6d2c8b..bbe6d2c8b 100644
--- a/vp9/common/mv.h
+++ b/vp9/common/vp9_mv.h
diff --git a/vp9/common/mvref_common.c b/vp9/common/vp9_mvref_common.c
index ebb8fa4bd..33dc3fa5b 100644
--- a/vp9/common/mvref_common.c
+++ b/vp9/common/vp9_mvref_common.c
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "mvref_common.h"
+#include "vp9_mvref_common.h"
 
 #define MVREF_NEIGHBOURS 8
 static int mb_mv_ref_search[MVREF_NEIGHBOURS][2] = {
diff --git a/vp9/common/mvref_common.h b/vp9/common/vp9_mvref_common.h
index 06050406b..9a1877919 100644
--- a/vp9/common/mvref_common.h
+++ b/vp9/common/vp9_mvref_common.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "onyxc_int.h"
-#include "blockd.h"
+#include "vp9_onyxc_int.h"
+#include "vp9_blockd.h"
 
 
 #ifndef __INC_MVREF_COMMON_H
diff --git a/vp9/common/onyx.h b/vp9/common/vp9_onyx.h
index 0f84e8cec..92ec667e7 100644
--- a/vp9/common/onyx.h
+++ b/vp9/common/vp9_onyx.h
@@ -20,8 +20,8 @@ extern "C"
 #include "vpx/internal/vpx_codec_internal.h"
 #include "vpx/vp8cx.h"
 #include "vpx_scale/yv12config.h"
-#include "type_aliases.h"
-#include "ppflags.h"
+#include "vp9_type_aliases.h"
+#include "vp9_ppflags.h"
   typedef int *VP9_PTR;
 
   /* Create/destroy static data structures. */
diff --git a/vp9/common/onyxc_int.h b/vp9/common/vp9_onyxc_int.h
index 27a6ca132..18750e767 100644
--- a/vp9/common/onyxc_int.h
+++ b/vp9/common/vp9_onyxc_int.h
@@ -15,16 +15,16 @@
 #include "vpx_config.h"
 #include "vpx/internal/vpx_codec_internal.h"
 #include "vp9_rtcd.h"
-#include "loopfilter.h"
-#include "entropymv.h"
-#include "entropy.h"
-#include "entropymode.h"
+#include "vp9_loopfilter.h"
+#include "vp9_entropymv.h"
+#include "vp9_entropy.h"
+#include "vp9_entropymode.h"
 #if CONFIG_POSTPROC
-#include "postproc.h"
+#include "vp9_postproc.h"
 #endif
 
 /*#ifdef PACKET_TESTING*/
-#include "header.h"
+#include "vp9_header.h"
 /*#endif*/
 
 /* Create/destroy static data structures. */
diff --git a/vp9/common/onyxd.h b/vp9/common/vp9_onyxd.h
index 7b7662b3c..2fc51db96 100644
--- a/vp9/common/onyxd.h
+++ b/vp9/common/vp9_onyxd.h
@@ -18,9 +18,9 @@
 extern "C"
 {
 #endif
-#include "type_aliases.h"
+#include "vp9_type_aliases.h"
 #include "vpx_scale/yv12config.h"
-#include "ppflags.h"
+#include "vp9_ppflags.h"
 #include "vpx_ports/mem.h"
 #include "vpx/vpx_codec.h"
 
diff --git a/vp9/common/postproc.c b/vp9/common/vp9_postproc.c
index 4c5748e7a..5752fbd82 100644
--- a/vp9/common/postproc.c
+++ b/vp9/common/vp9_postproc.c
@@ -11,10 +11,10 @@
 
 #include "vpx_ports/config.h"
 #include "vpx_scale/yv12config.h"
-#include "postproc.h"
-#include "vp9/common/textblit.h"
+#include "vp9_postproc.h"
+#include "vp9/common/vp9_textblit.h"
 #include "vpx_scale/vpxscale.h"
-#include "systemdependent.h"
+#include "vp9_systemdependent.h"
 
 #include <math.h>
 #include <stdlib.h>
diff --git a/vp9/common/postproc.h b/vp9/common/vp9_postproc.h
index f43a8f08a..bf56b5692 100644
--- a/vp9/common/postproc.h
+++ b/vp9/common/vp9_postproc.h
@@ -37,7 +37,7 @@
            int y1, int u1, int v1, int alpha, int stride)
 
 #if ARCH_X86 || ARCH_X86_64
-#include "x86/postproc_x86.h"
+#include "x86/vp9_postproc_x86.h"
 #endif
 
 #ifndef vp9_postproc_down
@@ -106,8 +106,8 @@ struct postproc_state {
   DECLARE_ALIGNED(16, char, whiteclamp[16]);
   DECLARE_ALIGNED(16, char, bothclamp[16]);
 };
-#include "onyxc_int.h"
-#include "ppflags.h"
+#include "vp9_onyxc_int.h"
+#include "vp9_ppflags.h"
 int vp9_post_proc_frame(struct VP9Common *oci, YV12_BUFFER_CONFIG *dest,
                         vp9_ppflags_t *flags);
 
diff --git a/vp9/common/ppflags.h b/vp9/common/vp9_ppflags.h
index fd8371180..fd8371180 100644
--- a/vp9/common/ppflags.h
+++ b/vp9/common/vp9_ppflags.h
diff --git a/vp9/common/pragmas.h b/vp9/common/vp9_pragmas.h
index 99fee5ae2..99fee5ae2 100644
--- a/vp9/common/pragmas.h
+++ b/vp9/common/vp9_pragmas.h
diff --git a/vp9/common/pred_common.c b/vp9/common/vp9_pred_common.c
index d779c641d..cb65d7282 100644
--- a/vp9/common/pred_common.c
+++ b/vp9/common/vp9_pred_common.c
@@ -9,8 +9,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp9/common/pred_common.h"
-#include "vp9/common/seg_common.h"
+#include "vp9/common/vp9_pred_common.h"
+#include "vp9/common/vp9_seg_common.h"
 
 // TBD prediction functions for various bitstream signals
 
diff --git a/vp9/common/pred_common.h b/vp9/common/vp9_pred_common.h
index 33656f23a..2628bb3ca 100644
--- a/vp9/common/pred_common.h
+++ b/vp9/common/vp9_pred_common.h
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "type_aliases.h"
-#include "onyxc_int.h"
-#include "vp9/common/blockd.h"
+#include "vp9_type_aliases.h"
+#include "vp9_onyxc_int.h"
+#include "vp9/common/vp9_blockd.h"
 
 #ifndef __INC_PRED_COMMON_H__
 #define __INC_PRED_COMMON_H__ 1
diff --git a/vp9/common/quant_common.c b/vp9/common/vp9_quant_common.c
index 720b27113..5d1f2594a 100644
--- a/vp9/common/quant_common.c
+++ b/vp9/common/vp9_quant_common.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "quant_common.h"
+#include "vp9_quant_common.h"
 
 static int dc_qlookup[QINDEX_RANGE];
 static int ac_qlookup[QINDEX_RANGE];
diff --git a/vp9/common/quant_common.h b/vp9/common/vp9_quant_common.h
index 2978dd8a2..88588d5d2 100644
--- a/vp9/common/quant_common.h
+++ b/vp9/common/vp9_quant_common.h
@@ -10,8 +10,8 @@
 
 
 #include "string.h"
-#include "blockd.h"
-#include "onyxc_int.h"
+#include "vp9_blockd.h"
+#include "vp9_onyxc_int.h"
 
 extern void vp9_init_quant_tables();
 extern int vp9_ac_yquant(int QIndex);
diff --git a/vp9/common/recon.c b/vp9/common/vp9_recon.c
index 77035668e..9c9029f2a 100644
--- a/vp9/common/recon.c
+++ b/vp9/common/vp9_recon.c
@@ -11,7 +11,7 @@
 
 #include "vpx_ports/config.h"
 #include "vp9_rtcd.h"
-#include "blockd.h"
+#include "vp9_blockd.h"
 
 void vp9_recon_b_c
 (
diff --git a/vp9/common/reconinter.c b/vp9/common/vp9_reconinter.c
index 37478f71e..eac07ae19 100644
--- a/vp9/common/reconinter.c
+++ b/vp9/common/vp9_reconinter.c
@@ -11,11 +11,11 @@
 
 #include "vpx_ports/config.h"
 #include "vpx/vpx_integer.h"
-#include "blockd.h"
-#include "reconinter.h"
-#include "vp9/common/reconintra.h"
+#include "vp9_blockd.h"
+#include "vp9_reconinter.h"
+#include "vp9/common/vp9_reconintra.h"
 #if CONFIG_RUNTIME_CPU_DETECT
-#include "onyxc_int.h"
+#include "vp9_onyxc_int.h"
 #endif
 
 void vp9_setup_interp_filters(MACROBLOCKD *xd,
@@ -368,7 +368,7 @@ void filter_mb(unsigned char *src, int src_stride,
   }
 }
 #else
-// Based on vp9_post_proc_down_and_across_c (postproc.c)
+// Based on vp9_post_proc_down_and_across_c (vp9_postproc.c)
 void filter_mb(unsigned char *src, int src_stride,
                unsigned char *dst, int dst_stride,
                int width, int height) {
diff --git a/vp9/common/reconinter.h b/vp9/common/vp9_reconinter.h
index ad1cf9197..25a8adc3b 100644
--- a/vp9/common/reconinter.h
+++ b/vp9/common/vp9_reconinter.h
@@ -11,7 +11,7 @@
 #ifndef __INC_RECONINTER_H
 #define __INC_RECONINTER_H
 
-#include "onyxc_int.h"
+#include "vp9_onyxc_int.h"
 
 extern void vp9_build_1st_inter16x16_predictors_mby(MACROBLOCKD *xd,
                                                     unsigned char *dst_y,
diff --git a/vp9/common/reconintra.c b/vp9/common/vp9_reconintra.c
index 89533c7ae..8199b94ae 100644
--- a/vp9/common/reconintra.c
+++ b/vp9/common/vp9_reconintra.c
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include "vpx_ports/config.h"
 #include "vp9_rtcd.h"
-#include "reconintra.h"
+#include "vp9_reconintra.h"
 #include "vpx_mem/vpx_mem.h"
 
 /* For skip_recon_mb(), add vp9_build_intra_predictors_mby_s(MACROBLOCKD *xd)
diff --git a/vp9/common/reconintra.h b/vp9/common/vp9_reconintra.h
index c72e8e912..dd35b06ad 100644
--- a/vp9/common/reconintra.h
+++ b/vp9/common/vp9_reconintra.h
@@ -11,7 +11,7 @@
 #ifndef __INC_RECONINTRA_H
 #define __INC_RECONINTRA_H
 
-#include "blockd.h"
+#include "vp9_blockd.h"
 
 extern void vp9_recon_intra_mbuv(MACROBLOCKD *xd);
 extern B_PREDICTION_MODE vp9_find_dominant_direction(unsigned char *ptr,
diff --git a/vp9/common/reconintra4x4.c b/vp9/common/vp9_reconintra4x4.c
index 1cf960cb7..d5203acd0 100644
--- a/vp9/common/reconintra4x4.c
+++ b/vp9/common/vp9_reconintra4x4.c
@@ -11,7 +11,7 @@
 
 #include "vpx_ports/config.h"
 #include "vpx_mem/vpx_mem.h"
-#include "reconintra.h"
+#include "vp9_reconintra.h"
 #include "vp9_rtcd.h"
 
 #if CONFIG_NEWBINTRAMODES
diff --git a/vp9/common/reconintra4x4.h b/vp9/common/vp9_reconintra4x4.h
index 79a048076..79a048076 100644
--- a/vp9/common/reconintra4x4.h
+++ b/vp9/common/vp9_reconintra4x4.h
diff --git a/vp9/common/rtcd.c b/vp9/common/vp9_rtcd.c
index 277d5b217..277d5b217 100644
--- a/vp9/common/rtcd.c
+++ b/vp9/common/vp9_rtcd.c
diff --git a/vp9/common/rtcd_defs.sh b/vp9/common/vp9_rtcd_defs.sh
index ea134a854..ea134a854 100644
--- a/vp9/common/rtcd_defs.sh
+++ b/vp9/common/vp9_rtcd_defs.sh
diff --git a/vp9/common/sadmxn.h b/vp9/common/vp9_sadmxn.h
index 47b8dfc58..47b8dfc58 100644
--- a/vp9/common/sadmxn.h
+++ b/vp9/common/vp9_sadmxn.h
diff --git a/vp9/common/seg_common.c b/vp9/common/vp9_seg_common.c
index 0ca55ffd8..6ac27e396 100644
--- a/vp9/common/seg_common.c
+++ b/vp9/common/vp9_seg_common.c
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp9/common/seg_common.h"
+#include "vp9/common/vp9_seg_common.h"
 
 static const int segfeaturedata_signed[SEG_LVL_MAX] = { 1, 1, 0, 0, 0, 0 };
 static const int seg_feature_data_bits[SEG_LVL_MAX] =
diff --git a/vp9/common/seg_common.h b/vp9/common/vp9_seg_common.h
index 58edf1612..fb0570c6b 100644
--- a/vp9/common/seg_common.h
+++ b/vp9/common/vp9_seg_common.h
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "type_aliases.h"
-#include "onyxc_int.h"
-#include "vp9/common/blockd.h"
+#include "vp9_type_aliases.h"
+#include "vp9_onyxc_int.h"
+#include "vp9/common/vp9_blockd.h"
 
 #ifndef __INC_SEG_COMMON_H__
 #define __INC_SEG_COMMON_H__ 1
diff --git a/vp9/common/setupintrarecon.c b/vp9/common/vp9_setupintrarecon.c
index 9cb037228..3fe4e3e50 100644
--- a/vp9/common/setupintrarecon.c
+++ b/vp9/common/vp9_setupintrarecon.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "setupintrarecon.h"
+#include "vp9_setupintrarecon.h"
 #include "vpx_mem/vpx_mem.h"
 
 void vp9_setup_intra_recon(YV12_BUFFER_CONFIG *ybf) {
diff --git a/vp9/common/setupintrarecon.h b/vp9/common/vp9_setupintrarecon.h
index 1a55d0ad6..1a55d0ad6 100644
--- a/vp9/common/setupintrarecon.h
+++ b/vp9/common/vp9_setupintrarecon.h
diff --git a/vp9/common/subpelvar.h b/vp9/common/vp9_subpelvar.h
index 83cc2a7ce..b3c3fcdaf 100644
--- a/vp9/common/subpelvar.h
+++ b/vp9/common/vp9_subpelvar.h
@@ -9,7 +9,7 @@
  */
 
 
-#include "vp9/common/filter.h"
+#include "vp9/common/vp9_filter.h"
 
 
 
diff --git a/vp9/common/subpixel.h b/vp9/common/vp9_subpixel.h
index 2b8429198..2b8429198 100644
--- a/vp9/common/subpixel.h
+++ b/vp9/common/vp9_subpixel.h
diff --git a/vp9/common/swapyv12buffer.c b/vp9/common/vp9_swapyv12buffer.c
index 13fc8d4bc..7882e0be0 100644
--- a/vp9/common/swapyv12buffer.c
+++ b/vp9/common/vp9_swapyv12buffer.c
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "swapyv12buffer.h"
+#include "vp9_swapyv12buffer.h"
 
 void vp9_swap_yv12_buffer(YV12_BUFFER_CONFIG *new_frame,
                           YV12_BUFFER_CONFIG *last_frame) {
diff --git a/vp9/common/swapyv12buffer.h b/vp9/common/vp9_swapyv12buffer.h
index 44ed5e84d..44ed5e84d 100644
--- a/vp9/common/swapyv12buffer.h
+++ b/vp9/common/vp9_swapyv12buffer.h
diff --git a/vp9/common/systemdependent.h b/vp9/common/vp9_systemdependent.h
index 5d778bcd0..5d778bcd0 100644
--- a/vp9/common/systemdependent.h
+++ b/vp9/common/vp9_systemdependent.h
diff --git a/vp9/common/tapify.py b/vp9/common/vp9_tapify.py
index 99529cff0..99529cff0 100644
--- a/vp9/common/tapify.py
+++ b/vp9/common/vp9_tapify.py
diff --git a/vp9/common/textblit.c b/vp9/common/vp9_textblit.c
index 601d298dc..52c6b87c6 100644
--- a/vp9/common/textblit.c
+++ b/vp9/common/vp9_textblit.c
@@ -10,7 +10,7 @@
 
 #include <stdlib.h>
 
-#include "vp9/common/textblit.h"
+#include "vp9/common/vp9_textblit.h"
 
 void vp9_blit_text(const char *msg, unsigned char *address, const int pitch) {
   int letter_bitmap;
diff --git a/vp9/common/textblit.h b/vp9/common/vp9_textblit.h
index 39edbb09d..39edbb09d 100644
--- a/vp9/common/textblit.h
+++ b/vp9/common/vp9_textblit.h
diff --git a/vp9/common/treecoder.c b/vp9/common/vp9_treecoder.c
index 39629406e..096dd59e5 100644
--- a/vp9/common/treecoder.c
+++ b/vp9/common/vp9_treecoder.c
@@ -16,7 +16,7 @@
 #endif
 #include <stdio.h>
 
-#include "treecoder.h"
+#include "vp9_treecoder.h"
 
 static void tree2tok(
   struct vp9_token_struct *const p,
diff --git a/vp9/common/treecoder.h b/vp9/common/vp9_treecoder.h
index 92b92ef55..92b92ef55 100644
--- a/vp9/common/treecoder.h
+++ b/vp9/common/vp9_treecoder.h
diff --git a/vp9/common/type_aliases.h b/vp9/common/vp9_type_aliases.h
index eda6a2ec2..91939ee19 100644
--- a/vp9/common/type_aliases.h
+++ b/vp9/common/vp9_type_aliases.h
@@ -11,7 +11,7 @@
 
 /****************************************************************************
 *
-*   Module Title :     type_aliases.h
+*   Module Title :     vp9_type_aliases.h
 *
 *   Description  :     Standard type aliases
 *
diff --git a/vp9/common/x86/filter_sse2.c b/vp9/common/x86/vp9_filter_sse2.c
index 92d0a2e5b..09f8de384 100644
--- a/vp9/common/x86/filter_sse2.c
+++ b/vp9/common/x86/vp9_filter_sse2.c
@@ -10,7 +10,7 @@
 
 #include <assert.h> // for alignment checks
 #include <emmintrin.h> // SSE2
-#include "vp9/common/filter.h"
+#include "vp9/common/vp9_filter.h"
 #include "vpx_ports/mem.h" // for DECLARE_ALIGNED
 #include "vp9_rtcd.h"
 
diff --git a/vp9/common/x86/filter_sse4.c b/vp9/common/x86/vp9_filter_sse4.c
index 9efe9f44a..52c35b296 100644
--- a/vp9/common/x86/filter_sse4.c
+++ b/vp9/common/x86/vp9_filter_sse4.c
@@ -10,7 +10,7 @@
 
 #include <assert.h> // for alignment checks
 #include <smmintrin.h> // SSE4.1
-#include "vp9/common/filter.h"
+#include "vp9/common/vp9_filter.h"
 #include "vpx_ports/mem.h" // for DECLARE_ALIGNED
 #include "vp9_rtcd.h"
 
diff --git a/vp9/common/x86/idct_x86.h b/vp9/common/x86/vp9_idct_x86.h
index 297ab0d33..297ab0d33 100644
--- a/vp9/common/x86/idct_x86.h
+++ b/vp9/common/x86/vp9_idct_x86.h
diff --git a/vp9/common/x86/idctllm_mmx.asm b/vp9/common/x86/vp9_idctllm_mmx.asm
index 15e81addb..15e81addb 100644
--- a/vp9/common/x86/idctllm_mmx.asm
+++ b/vp9/common/x86/vp9_idctllm_mmx.asm
diff --git a/vp9/common/x86/idctllm_sse2.asm b/vp9/common/x86/vp9_idctllm_sse2.asm
index daa572e01..daa572e01 100644
--- a/vp9/common/x86/idctllm_sse2.asm
+++ b/vp9/common/x86/vp9_idctllm_sse2.asm
diff --git a/vp9/common/x86/iwalsh_mmx.asm b/vp9/common/x86/vp9_iwalsh_mmx.asm
index 6b276b95a..6b276b95a 100644
--- a/vp9/common/x86/iwalsh_mmx.asm
+++ b/vp9/common/x86/vp9_iwalsh_mmx.asm
diff --git a/vp9/common/x86/iwalsh_sse2.asm b/vp9/common/x86/vp9_iwalsh_sse2.asm
index 143cce87d..143cce87d 100644
--- a/vp9/common/x86/iwalsh_sse2.asm
+++ b/vp9/common/x86/vp9_iwalsh_sse2.asm
diff --git a/vp9/common/x86/loopfilter_mmx.asm b/vp9/common/x86/vp9_loopfilter_mmx.asm
index ac3f74eda..ac3f74eda 100644
--- a/vp9/common/x86/loopfilter_mmx.asm
+++ b/vp9/common/x86/vp9_loopfilter_mmx.asm
diff --git a/vp9/common/x86/loopfilter_sse2.asm b/vp9/common/x86/vp9_loopfilter_sse2.asm
index 9c0c4b000..9c0c4b000 100644
--- a/vp9/common/x86/loopfilter_sse2.asm
+++ b/vp9/common/x86/vp9_loopfilter_sse2.asm
diff --git a/vp9/common/x86/loopfilter_x86.c b/vp9/common/x86/vp9_loopfilter_x86.c
index 1ce654092..af8bb6922 100644
--- a/vp9/common/x86/loopfilter_x86.c
+++ b/vp9/common/x86/vp9_loopfilter_x86.c
@@ -10,7 +10,7 @@
 
 #include <emmintrin.h>  // SSE2
 #include "vpx_config.h"
-#include "vp9/common/loopfilter.h"
+#include "vp9/common/vp9_loopfilter.h"
 
 prototype_loopfilter(vp9_loop_filter_vertical_edge_mmx);
 prototype_loopfilter(vp9_loop_filter_horizontal_edge_mmx);
diff --git a/vp9/common/x86/loopfilter_x86.h b/vp9/common/x86/vp9_loopfilter_x86.h
index 25cf383c9..25cf383c9 100644
--- a/vp9/common/x86/loopfilter_x86.h
+++ b/vp9/common/x86/vp9_loopfilter_x86.h
diff --git a/vp9/common/x86/mask_sse3.asm b/vp9/common/x86/vp9_mask_sse3.asm
index 0d90cfa86..0d90cfa86 100644
--- a/vp9/common/x86/mask_sse3.asm
+++ b/vp9/common/x86/vp9_mask_sse3.asm
diff --git a/vp9/common/x86/postproc_mmx.asm b/vp9/common/x86/vp9_postproc_mmx.asm
index fa2152bab..fa2152bab 100644
--- a/vp9/common/x86/postproc_mmx.asm
+++ b/vp9/common/x86/vp9_postproc_mmx.asm
diff --git a/vp9/common/x86/postproc_sse2.asm b/vp9/common/x86/vp9_postproc_sse2.asm
index 91758e62d..91758e62d 100644
--- a/vp9/common/x86/postproc_sse2.asm
+++ b/vp9/common/x86/vp9_postproc_sse2.asm
diff --git a/vp9/common/x86/postproc_x86.h b/vp9/common/x86/vp9_postproc_x86.h
index a4c4f8c74..a4c4f8c74 100644
--- a/vp9/common/x86/postproc_x86.h
+++ b/vp9/common/x86/vp9_postproc_x86.h
diff --git a/vp9/common/x86/recon_mmx.asm b/vp9/common/x86/vp9_recon_mmx.asm
index 20f582dba..20f582dba 100644
--- a/vp9/common/x86/recon_mmx.asm
+++ b/vp9/common/x86/vp9_recon_mmx.asm
diff --git a/vp9/common/x86/recon_sse2.asm b/vp9/common/x86/vp9_recon_sse2.asm
index c7cd23fc7..c7cd23fc7 100644
--- a/vp9/common/x86/recon_sse2.asm
+++ b/vp9/common/x86/vp9_recon_sse2.asm
diff --git a/vp9/common/x86/recon_wrapper_sse2.c b/vp9/common/x86/vp9_recon_wrapper_sse2.c
index d20e13871..49b36dbd6 100644
--- a/vp9/common/x86/recon_wrapper_sse2.c
+++ b/vp9/common/x86/vp9_recon_wrapper_sse2.c
@@ -10,7 +10,7 @@
 
 #include "vpx_ports/config.h"
 #include "vpx_mem/vpx_mem.h"
-#include "vp9/common/blockd.h"
+#include "vp9/common/vp9_blockd.h"
 
 #define build_intra_predictors_mbuv_prototype(sym) \
   void sym(unsigned char *dst, int dst_stride, \
diff --git a/vp9/common/x86/sadmxn_x86.c b/vp9/common/x86/vp9_sadmxn_x86.c
index 0b783ccea..0b783ccea 100644
--- a/vp9/common/x86/sadmxn_x86.c
+++ b/vp9/common/x86/vp9_sadmxn_x86.c
diff --git a/vp9/common/x86/subpixel_8t_ssse3.asm b/vp9/common/x86/vp9_subpixel_8t_ssse3.asm
index dd89710e8..dd89710e8 100644
--- a/vp9/common/x86/subpixel_8t_ssse3.asm
+++ b/vp9/common/x86/vp9_subpixel_8t_ssse3.asm
diff --git a/vp9/common/x86/subpixel_mmx.asm b/vp9/common/x86/vp9_subpixel_mmx.asm
index 2f757fa80..2f757fa80 100644
--- a/vp9/common/x86/subpixel_mmx.asm
+++ b/vp9/common/x86/vp9_subpixel_mmx.asm
diff --git a/vp9/common/x86/subpixel_sse2.asm b/vp9/common/x86/vp9_subpixel_sse2.asm
index f62587406..f62587406 100644
--- a/vp9/common/x86/subpixel_sse2.asm
+++ b/vp9/common/x86/vp9_subpixel_sse2.asm
diff --git a/vp9/common/x86/subpixel_ssse3.asm b/vp9/common/x86/vp9_subpixel_ssse3.asm
index 4a16f1928..4a16f1928 100644
--- a/vp9/common/x86/subpixel_ssse3.asm
+++ b/vp9/common/x86/vp9_subpixel_ssse3.asm
diff --git a/vp9/common/x86/subpixel_x86.h b/vp9/common/x86/vp9_subpixel_x86.h
index 4c224da3b..4c224da3b 100644
--- a/vp9/common/x86/subpixel_x86.h
+++ b/vp9/common/x86/vp9_subpixel_x86.h
diff --git a/vp9/common/x86/vp8_asm_stubs.c b/vp9/common/x86/vp9_vp8_asm_stubs.c
index 817a93e24..f804af698 100644
--- a/vp9/common/x86/vp8_asm_stubs.c
+++ b/vp9/common/x86/vp9_vp8_asm_stubs.c
@@ -11,7 +11,7 @@
 
 #include "vpx_ports/config.h"
 #include "vpx_ports/mem.h"
-#include "vp9/common/subpixel.h"
+#include "vp9/common/vp9_subpixel.h"
 
 extern const short vp9_six_tap_mmx[16][6 * 8];
 
diff --git a/vp9/common/x86/x86_systemdependent.c b/vp9/common/x86/vp9_x86_systemdependent.c
index 62e75ffde..8a9f04c9a 100644
--- a/vp9/common/x86/x86_systemdependent.c
+++ b/vp9/common/x86/vp9_x86_systemdependent.c
@@ -10,9 +10,9 @@
 
 #include "vpx_config.h"
 #include "vpx_ports/x86.h"
-#include "vp9/common/loopfilter.h"
-#include "vp9/common/pragmas.h"
-#include "vp9/common/onyxc_int.h"
+#include "vp9/common/vp9_loopfilter.h"
+#include "vp9/common/vp9_pragmas.h"
+#include "vp9/common/vp9_onyxc_int.h"
 
 void vp9_arch_x86_common_init(VP9_COMMON *ctx) {
 #if CONFIG_RUNTIME_CPU_DETECT