12 files changed, 56 insertions, 56 deletions
diff --git a/vp10/decoder/vp9_decodeframe.c b/vp10/decoder/decodeframe.c
index f079e28ea..8814f9691 100644
--- a/vp10/decoder/vp9_decodeframe.c
+++ b/vp10/decoder/decodeframe.c
@@ -23,24 +23,24 @@
 #include "vpx_scale/vpx_scale.h"
 #include "vpx_util/vpx_thread.h"
 
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_idct.h"
-#include "vp10/common/vp9_thread_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_tile_common.h"
-
-#include "vp10/decoder/vp9_decodeframe.h"
-#include "vp10/decoder/vp9_detokenize.h"
-#include "vp10/decoder/vp9_decodemv.h"
-#include "vp10/decoder/vp9_decoder.h"
-#include "vp10/decoder/vp9_dsubexp.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/idct.h"
+#include "vp10/common/thread_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/tile_common.h"
+
+#include "vp10/decoder/decodeframe.h"
+#include "vp10/decoder/detokenize.h"
+#include "vp10/decoder/decodemv.h"
+#include "vp10/decoder/decoder.h"
+#include "vp10/decoder/dsubexp.h"
 
 #define MAX_VP9_HEADER_SIZE 80
 
diff --git a/vp10/decoder/vp9_decodeframe.h b/vp10/decoder/decodeframe.h
index 39a59460e..39a59460e 100644
--- a/vp10/decoder/vp9_decodeframe.h
+++ b/vp10/decoder/decodeframe.h
diff --git a/vp10/decoder/vp9_decodemv.c b/vp10/decoder/decodemv.c
index 0f8c76b54..439b82937 100644
--- a/vp10/decoder/vp9_decodemv.c
+++ b/vp10/decoder/decodemv.c
@@ -10,17 +10,17 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_entropymv.h"
-#include "vp10/common/vp9_mvref_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_seg_common.h"
-
-#include "vp10/decoder/vp9_decodemv.h"
-#include "vp10/decoder/vp9_decodeframe.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/entropymv.h"
+#include "vp10/common/mvref_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/seg_common.h"
+
+#include "vp10/decoder/decodemv.h"
+#include "vp10/decoder/decodeframe.h"
 
 static PREDICTION_MODE read_intra_mode(vpx_reader *r, const vpx_prob *p) {
   return (PREDICTION_MODE)vpx_read_tree(r, vp10_intra_mode_tree, p);
diff --git a/vp10/decoder/vp9_decodemv.h b/vp10/decoder/decodemv.h
index bdca0db50..8734ccc4b 100644
--- a/vp10/decoder/vp9_decodemv.h
+++ b/vp10/decoder/decodemv.h
@@ -13,7 +13,7 @@
 
 #include "vpx_dsp/bitreader.h"
 
-#include "vp10/decoder/vp9_decoder.h"
+#include "vp10/decoder/decoder.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/decoder/vp9_decoder.c b/vp10/decoder/decoder.c
index 5dd364c27..dda5d6cd3 100644
--- a/vp10/decoder/vp9_decoder.c
+++ b/vp10/decoder/decoder.c
@@ -22,19 +22,19 @@
 #include "vpx_scale/vpx_scale.h"
 #include "vpx_util/vpx_thread.h"
 
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_loopfilter.h"
-#include "vp10/common/vp9_onyxc_int.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/loopfilter.h"
+#include "vp10/common/onyxc_int.h"
 #if CONFIG_VP9_POSTPROC
-#include "vp10/common/vp9_postproc.h"
+#include "vp10/common/postproc.h"
 #endif
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_systemdependent.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/systemdependent.h"
 
-#include "vp10/decoder/vp9_decodeframe.h"
-#include "vp10/decoder/vp9_decoder.h"
-#include "vp10/decoder/vp9_detokenize.h"
+#include "vp10/decoder/decodeframe.h"
+#include "vp10/decoder/decoder.h"
+#include "vp10/decoder/detokenize.h"
 
 static void initialize_dec(void) {
   static volatile int init_done = 0;
diff --git a/vp10/decoder/vp9_decoder.h b/vp10/decoder/decoder.h
index db26f4dd4..462a64ebd 100644
--- a/vp10/decoder/vp9_decoder.h
+++ b/vp10/decoder/decoder.h
@@ -18,10 +18,10 @@
 #include "vpx_scale/yv12config.h"
 #include "vpx_util/vpx_thread.h"
 
-#include "vp10/common/vp9_thread_common.h"
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_ppflags.h"
-#include "vp10/decoder/vp9_dthread.h"
+#include "vp10/common/thread_common.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/ppflags.h"
+#include "vp10/decoder/dthread.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/decoder/vp9_detokenize.c b/vp10/decoder/detokenize.c
index 5cea0f7d7..2902ece7c 100644
--- a/vp10/decoder/vp9_detokenize.c
+++ b/vp10/decoder/detokenize.c
@@ -11,14 +11,14 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropy.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
 #if CONFIG_COEFFICIENT_RANGE_CHECKING
-#include "vp10/common/vp9_idct.h"
+#include "vp10/common/idct.h"
 #endif
 
-#include "vp10/decoder/vp9_detokenize.h"
+#include "vp10/decoder/detokenize.h"
 
 #define EOB_CONTEXT_NODE            0
 #define ZERO_CONTEXT_NODE           1
diff --git a/vp10/decoder/vp9_detokenize.h b/vp10/decoder/detokenize.h
index 17aaffea2..cf752d1d4 100644
--- a/vp10/decoder/vp9_detokenize.h
+++ b/vp10/decoder/detokenize.h
@@ -13,8 +13,8 @@
 #define VP9_DECODER_VP9_DETOKENIZE_H_
 
 #include "vpx_dsp/bitreader.h"
-#include "vp10/decoder/vp9_decoder.h"
-#include "vp10/common/vp9_scan.h"
+#include "vp10/decoder/decoder.h"
+#include "vp10/common/scan.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/vp10/decoder/vp9_dsubexp.c b/vp10/decoder/dsubexp.c
index 5c82b3144..dbcdb4964 100644
--- a/vp10/decoder/vp9_dsubexp.c
+++ b/vp10/decoder/dsubexp.c
@@ -10,9 +10,9 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_entropy.h"
+#include "vp10/common/entropy.h"
 
-#include "vp10/decoder/vp9_dsubexp.h"
+#include "vp10/decoder/dsubexp.h"
 
 static int inv_recenter_nonneg(int v, int m) {
   if (v > 2 * m)
diff --git a/vp10/decoder/vp9_dsubexp.h b/vp10/decoder/dsubexp.h
index a422f555a..a422f555a 100644
--- a/vp10/decoder/vp9_dsubexp.h
+++ b/vp10/decoder/dsubexp.h
diff --git a/vp10/decoder/vp9_dthread.c b/vp10/decoder/dthread.c
index 3436dd2f4..391613a3d 100644
--- a/vp10/decoder/vp9_dthread.c
+++ b/vp10/decoder/dthread.c
@@ -10,9 +10,9 @@
 
 #include "./vpx_config.h"
 #include "vpx_mem/vpx_mem.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/decoder/vp9_dthread.h"
-#include "vp10/decoder/vp9_decoder.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/decoder/dthread.h"
+#include "vp10/decoder/decoder.h"
 
 // #define DEBUG_THREAD
 
diff --git a/vp10/decoder/vp9_dthread.h b/vp10/decoder/dthread.h
index 008103507..008103507 100644
--- a/vp10/decoder/vp9_dthread.h
+++ b/vp10/decoder/dthread.h