vp10/ -> av1/

Change-Id: Ia055d03656ad1580447eced8687949583fdf4089

aom/src/svc_encodeframe.c

@@ -26,7 +26,7 @@
 #include "aom/vp8cx.h"
 #include "aom/vpx_encoder.h"
 #include "aom_mem/vpx_mem.h"
-#include "vp10/common/onyxc_int.h"
+#include "av1/common/onyxc_int.h"
 
 #ifdef __MINGW32__
 #define strtok_r strtok_s

aom_scale/generic/yv12extend.c

@@ -16,7 +16,7 @@
 #include "aom_ports/mem.h"
 #include "aom_scale/yv12config.h"
 #if CONFIG_VPX_HIGHBITDEPTH
-#include "vp10/common/common.h"
+#include "av1/common/common.h"
 #endif
 
 static void extend_plane(uint8_t *const src, int src_stride, int width,

vp10/common/alloccommon.c → av1/common/alloccommon.c

@@ -11,11 +11,11 @@
 #include "./vpx_config.h"
 #include "aom_mem/vpx_mem.h"
 
-#include "vp10/common/alloccommon.h"
-#include "vp10/common/blockd.h"
-#include "vp10/common/entropymode.h"
-#include "vp10/common/entropymv.h"
-#include "vp10/common/onyxc_int.h"
+#include "av1/common/alloccommon.h"
+#include "av1/common/blockd.h"
+#include "av1/common/entropymode.h"
+#include "av1/common/entropymv.h"
+#include "av1/common/onyxc_int.h"
 
 void vp10_set_mb_mi(VP10_COMMON *cm, int width, int height) {
   const int aligned_width = ALIGN_POWER_OF_TWO(width, MI_SIZE_LOG2);

vp10/common/arm/neon/iht4x4_add_neon.c → av1/common/arm/neon/iht4x4_add_neon.c

@@ -13,7 +13,7 @@
 
 #include "./vp10_rtcd.h"
 #include "./vpx_config.h"
-#include "vp10/common/common.h"
+#include "av1/common/common.h"
 
 static int16_t sinpi_1_9 = 0x14a3;
 static int16_t sinpi_2_9 = 0x26c9;

vp10/common/arm/neon/iht8x8_add_neon.c → av1/common/arm/neon/iht8x8_add_neon.c

@@ -13,7 +13,7 @@
 
 #include "./vp10_rtcd.h"
 #include "./vpx_config.h"
-#include "vp10/common/common.h"
+#include "av1/common/common.h"
 
 static int16_t cospi_2_64 = 16305;
 static int16_t cospi_4_64 = 16069;

vp10/common/blockd.c → av1/common/blockd.c

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/blockd.h"
+#include "av1/common/blockd.h"
 
 PREDICTION_MODE vp10_left_block_mode(const MODE_INFO *cur_mi,
                                      const MODE_INFO *left_mi, int b) {

vp10/common/blockd.h → av1/common/blockd.h

@@ -17,16 +17,16 @@
 #include "aom_ports/mem.h"
 #include "aom_scale/yv12config.h"
 
-#include "vp10/common/common_data.h"
-#include "vp10/common/entropy.h"
-#include "vp10/common/entropymode.h"
-#include "vp10/common/mv.h"
+#include "av1/common/common_data.h"
+#include "av1/common/entropy.h"
+#include "av1/common/entropymode.h"
+#include "av1/common/mv.h"
 #if CONFIG_AOM_QM
-#include "vp10/common/quant_common.h"
+#include "av1/common/quant_common.h"
 #endif
-#include "vp10/common/scale.h"
-#include "vp10/common/seg_common.h"
-#include "vp10/common/tile_common.h"
+#include "av1/common/scale.h"
+#include "av1/common/seg_common.h"
+#include "av1/common/tile_common.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/common/clpf.c → av1/common/clpf.c

@@ -3,7 +3,7 @@ Copyright (c) 2016 Cisco Systems
 (Replace with proper AOM header)
 */
 
-#include "vp10/common/clpf.h"
+#include "av1/common/clpf.h"
 
 // Apply the filter on a single block
 static void clpf_block(const uint8_t *src, uint8_t *dst, int sstride,

vp10/common/clpf.h → av1/common/clpf.h

@@ -6,7 +6,7 @@ Copyright (c) 2016, Cisco Systems
 #ifndef VP10_COMMON_CLPF_H_
 #define VP10_COMMON_CLPF_H_
 
-#include "vp10/common/reconinter.h"
+#include "av1/common/reconinter.h"
 
 // Configuration
 #define CLPF_ALLOW_PIXEL_PARALLELISM \

vp10/common/common_data.h → av1/common/common_data.h

@@ -11,7 +11,7 @@
 #ifndef VP10_COMMON_COMMON_DATA_H_
 #define VP10_COMMON_COMMON_DATA_H_
 
-#include "vp10/common/enums.h"
+#include "av1/common/enums.h"
 #include "aom/vpx_integer.h"
 #include "aom_dsp/vpx_dsp_common.h"
 

vp10/common/debugmodes.c → av1/common/debugmodes.c

@@ -10,8 +10,8 @@
 
 #include <stdio.h>
 
-#include "vp10/common/blockd.h"
-#include "vp10/common/onyxc_int.h"
+#include "av1/common/blockd.h"
+#include "av1/common/onyxc_int.h"
 
 static void log_frame_info(VP10_COMMON *cm, const char *str, FILE *f) {
   fprintf(f, "%s", str);

vp10/common/dering.c → av1/common/dering.c

@@ -13,10 +13,10 @@
 
 #include "./vpx_scale_rtcd.h"
 #include "aom/vpx_integer.h"
-#include "vp10/common/dering.h"
-#include "vp10/common/onyxc_int.h"
-#include "vp10/common/reconinter.h"
-#include "vp10/common/od_dering.h"
+#include "av1/common/dering.h"
+#include "av1/common/onyxc_int.h"
+#include "av1/common/reconinter.h"
+#include "av1/common/od_dering.h"
 
 
 int compute_level_from_index(int global_level, int gi) {

vp10/common/dering.h → av1/common/dering.h

 #ifndef VP10_COMMON_DERING_H_
 #define VP10_COMMON_DERING_H_
 
-#include "vp10/common/od_dering.h"
-#include "vp10/common/onyxc_int.h"
+#include "av1/common/od_dering.h"
+#include "av1/common/onyxc_int.h"
 #include "aom/vpx_integer.h"
 #include "./vpx_config.h"
 #include "aom_ports/mem.h"

vp10/common/entropy.c → av1/common/entropy.c

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/entropy.h"
-#include "vp10/common/blockd.h"
-#include "vp10/common/onyxc_int.h"
-#include "vp10/common/entropymode.h"
+#include "av1/common/entropy.h"
+#include "av1/common/blockd.h"
+#include "av1/common/onyxc_int.h"
+#include "av1/common/entropymode.h"
 #include "aom_mem/vpx_mem.h"
 #include "aom/vpx_integer.h"
 

vp10/common/entropy.h → av1/common/entropy.h

@@ -14,8 +14,8 @@
 #include "aom/vpx_integer.h"
 #include "aom_dsp/prob.h"
 
-#include "vp10/common/common.h"
-#include "vp10/common/enums.h"
+#include "av1/common/common.h"
+#include "av1/common/enums.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/common/entropymode.c → av1/common/entropymode.c

@@ -10,8 +10,8 @@
 
 #include "aom_mem/vpx_mem.h"
 
-#include "vp10/common/onyxc_int.h"
-#include "vp10/common/seg_common.h"
+#include "av1/common/onyxc_int.h"
+#include "av1/common/seg_common.h"
 
 const vpx_prob vp10_kf_y_mode_prob[INTRA_MODES][INTRA_MODES][INTRA_MODES - 1] =
     { {

vp10/common/entropymode.h → av1/common/entropymode.h

@@ -11,10 +11,10 @@
 #ifndef VP10_COMMON_ENTROPYMODE_H_
 #define VP10_COMMON_ENTROPYMODE_H_
 
-#include "vp10/common/entropy.h"
-#include "vp10/common/entropymv.h"
-#include "vp10/common/filter.h"
-#include "vp10/common/seg_common.h"
+#include "av1/common/entropy.h"
+#include "av1/common/entropymv.h"
+#include "av1/common/filter.h"
+#include "av1/common/seg_common.h"
 #include "aom_dsp/vpx_filter.h"
 
 #ifdef __cplusplus

vp10/common/entropymv.c → av1/common/entropymv.c

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/onyxc_int.h"
-#include "vp10/common/entropymv.h"
+#include "av1/common/onyxc_int.h"
+#include "av1/common/entropymv.h"
 
 // Integer pel reference mv threshold for use of high-precision 1/8 mv
 #define COMPANDED_MVREF_THRESH 8

vp10/common/entropymv.h → av1/common/entropymv.h

@@ -15,7 +15,7 @@
 
 #include "aom_dsp/prob.h"
 
-#include "vp10/common/mv.h"
+#include "av1/common/mv.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/common/filter.c → av1/common/filter.c

@@ -10,7 +10,7 @@
 
 #include <assert.h>
 
-#include "vp10/common/filter.h"
+#include "av1/common/filter.h"
 
 DECLARE_ALIGNED(256, static const InterpKernel,
                 bilinear_filters[SUBPEL_SHIFTS]) = {

vp10/common/frame_buffers.c → av1/common/frame_buffers.c

@@ -10,7 +10,7 @@
 
 #include <assert.h>
 
-#include "vp10/common/frame_buffers.h"
+#include "av1/common/frame_buffers.h"
 #include "aom_mem/vpx_mem.h"
 
 int vp10_alloc_internal_frame_buffers(InternalFrameBufferList *list) {

vp10/common/idct.c → av1/common/idct.c

@@ -12,8 +12,8 @@
 
 #include "./vp10_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
-#include "vp10/common/blockd.h"
-#include "vp10/common/idct.h"
+#include "av1/common/blockd.h"
+#include "av1/common/idct.h"
 #include "aom_dsp/inv_txfm.h"
 #include "aom_ports/mem.h"
 

vp10/common/idct.h → av1/common/idct.h

@@ -14,8 +14,8 @@
 #include <assert.h>
 
 #include "./vpx_config.h"
-#include "vp10/common/common.h"
-#include "vp10/common/enums.h"
+#include "av1/common/common.h"
+#include "av1/common/enums.h"
 #include "aom_dsp/inv_txfm.h"
 #include "aom_dsp/txfm_common.h"
 #include "aom_ports/mem.h"

vp10/common/loopfilter.c → av1/common/loopfilter.c

@@ -10,14 +10,14 @@
 
 #include "./vpx_config.h"
 #include "./vpx_dsp_rtcd.h"
-#include "vp10/common/loopfilter.h"
-#include "vp10/common/onyxc_int.h"
-#include "vp10/common/reconinter.h"
+#include "av1/common/loopfilter.h"
+#include "av1/common/onyxc_int.h"
+#include "av1/common/reconinter.h"
 #include "aom_dsp/vpx_dsp_common.h"
 #include "aom_mem/vpx_mem.h"
 #include "aom_ports/mem.h"
 
-#include "vp10/common/seg_common.h"
+#include "av1/common/seg_common.h"
 
 // 64 bit masks for left transform size. Each 1 represents a position where
 // we should apply a loop filter across the left border of an 8x8 block

vp10/common/loopfilter.h → av1/common/loopfilter.h

@@ -14,8 +14,8 @@
 #include "aom_ports/mem.h"
 #include "./vpx_config.h"
 
-#include "vp10/common/blockd.h"
-#include "vp10/common/seg_common.h"
+#include "av1/common/blockd.h"
+#include "av1/common/seg_common.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/common/mips/dspr2/itrans16_dspr2.c → av1/common/mips/dspr2/itrans16_dspr2.c

@@ -13,9 +13,9 @@
 
 #include "./vpx_config.h"
 #include "./vp10_rtcd.h"
-#include "vp10/common/common.h"
-#include "vp10/common/blockd.h"
-#include "vp10/common/idct.h"
+#include "av1/common/common.h"
+#include "av1/common/blockd.h"
+#include "av1/common/idct.h"
 #include "aom_dsp/mips/inv_txfm_dspr2.h"
 #include "aom_dsp/txfm_common.h"
 #include "aom_ports/mem.h"

vp10/common/mips/dspr2/itrans4_dspr2.c → av1/common/mips/dspr2/itrans4_dspr2.c

@@ -13,9 +13,9 @@
 
 #include "./vpx_config.h"
 #include "./vp10_rtcd.h"
-#include "vp10/common/common.h"
-#include "vp10/common/blockd.h"
-#include "vp10/common/idct.h"
+#include "av1/common/common.h"
+#include "av1/common/blockd.h"
+#include "av1/common/idct.h"
 #include "aom_dsp/mips/inv_txfm_dspr2.h"
 #include "aom_dsp/txfm_common.h"
 #include "aom_ports/mem.h"

vp10/common/mips/dspr2/itrans8_dspr2.c → av1/common/mips/dspr2/itrans8_dspr2.c

@@ -13,8 +13,8 @@
 
 #include "./vpx_config.h"
 #include "./vp10_rtcd.h"
-#include "vp10/common/common.h"
-#include "vp10/common/blockd.h"
+#include "av1/common/common.h"
+#include "av1/common/blockd.h"
 #include "aom_dsp/mips/inv_txfm_dspr2.h"
 #include "aom_dsp/txfm_common.h"
 #include "aom_ports/mem.h"

vp10/common/mips/msa/idct16x16_msa.c → av1/common/mips/msa/idct16x16_msa.c

@@ -10,7 +10,7 @@
 
 #include <assert.h>
 
-#include "vp10/common/enums.h"
+#include "av1/common/enums.h"
 #include "aom_dsp/mips/inv_txfm_msa.h"
 
 void vp10_iht16x16_256_add_msa(const int16_t *input, uint8_t *dst,

vp10/common/mips/msa/idct4x4_msa.c → av1/common/mips/msa/idct4x4_msa.c

@@ -10,7 +10,7 @@
 
 #include <assert.h>
 
-#include "vp10/common/enums.h"
+#include "av1/common/enums.h"
 #include "aom_dsp/mips/inv_txfm_msa.h"
 
 void vp10_iht4x4_16_add_msa(const int16_t *input, uint8_t *dst,

vp10/common/mips/msa/idct8x8_msa.c → av1/common/mips/msa/idct8x8_msa.c

@@ -10,7 +10,7 @@
 
 #include <assert.h>
 
-#include "vp10/common/enums.h"
+#include "av1/common/enums.h"
 #include "aom_dsp/mips/inv_txfm_msa.h"
 
 void vp10_iht8x8_64_add_msa(const int16_t *input, uint8_t *dst,

vp10/common/mv.h → av1/common/mv.h

@@ -13,7 +13,7 @@
 
 #include "aom/vpx_integer.h"
 
-#include "vp10/common/common.h"
+#include "av1/common/common.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/common/mvref_common.c → av1/common/mvref_common.c

@@ -9,7 +9,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/mvref_common.h"
+#include "av1/common/mvref_common.h"
 
 // This function searches the neighbourhood of a given MB/SB
 // to try and find candidate reference vectors.

vp10/common/mvref_common.h → av1/common/mvref_common.h

@@ -10,8 +10,8 @@
 #ifndef VP10_COMMON_MVREF_COMMON_H_
 #define VP10_COMMON_MVREF_COMMON_H_
 
-#include "vp10/common/onyxc_int.h"
-#include "vp10/common/blockd.h"
+#include "av1/common/onyxc_int.h"
+#include "av1/common/blockd.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/common/odintrin.c → av1/common/odintrin.c

@@ -22,7 +22,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/
 
-#include "vp10/common/odintrin.h"
+#include "av1/common/odintrin.h"
 
 /*Constants for use with OD_DIVU_SMALL().
   See \cite{Rob05} for details on computing these constants.

vp10/common/odintrin.h → av1/common/odintrin.h

 #ifndef VP10_COMMON_ODINTRIN_H_
 #define VP10_COMMON_ODINTRIN_H_
 
-#include "vp10/common/enums.h"
+#include "av1/common/enums.h"
 #include "aom/vpx_integer.h"
 #include "aom_dsp/vpx_dsp_common.h"
 #include "aom_ports/bitops.h"

vp10/common/onyxc_int.h → av1/common/onyxc_int.h

@@ -15,13 +15,13 @@
 #include "aom/internal/vpx_codec_internal.h"
 #include "aom_util/vpx_thread.h"
 #include "./vp10_rtcd.h"
-#include "vp10/common/alloccommon.h"
-#include "vp10/common/loopfilter.h"
-#include "vp10/common/entropymv.h"
-#include "vp10/common/entropy.h"
-#include "vp10/common/entropymode.h"
-#include "vp10/common/frame_buffers.h"
-#include "vp10/common/tile_common.h"
+#include "av1/common/alloccommon.h"
+#include "av1/common/loopfilter.h"
+#include "av1/common/entropymv.h"
+#include "av1/common/entropy.h"
+#include "av1/common/entropymode.h"
+#include "av1/common/frame_buffers.h"
+#include "av1/common/tile_common.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/common/pred_common.c → av1/common/pred_common.c

@@ -9,9 +9,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/common.h"
-#include "vp10/common/pred_common.h"
-#include "vp10/common/seg_common.h"
+#include "av1/common/common.h"
+#include "av1/common/pred_common.h"
+#include "av1/common/seg_common.h"
 
 // Returns a context number for the given MB prediction signal
 int vp10_get_pred_context_switchable_interp(const MACROBLOCKD *xd) {

vp10/common/pred_common.h → av1/common/pred_common.h

@@ -11,8 +11,8 @@
 #ifndef VP10_COMMON_PRED_COMMON_H_
 #define VP10_COMMON_PRED_COMMON_H_
 
-#include "vp10/common/blockd.h"
-#include "vp10/common/onyxc_int.h"
+#include "av1/common/blockd.h"
+#include "av1/common/onyxc_int.h"
 #include "aom_dsp/vpx_dsp_common.h"
 
 #ifdef __cplusplus

vp10/common/quant_common.c → av1/common/quant_common.c

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/common.h"
-#include "vp10/common/onyxc_int.h"
-#include "vp10/common/quant_common.h"
-#include "vp10/common/seg_common.h"
+#include "av1/common/common.h"
+#include "av1/common/onyxc_int.h"
+#include "av1/common/quant_common.h"
+#include "av1/common/seg_common.h"
 
 #if CONFIG_AOM_QM
 static void make_qmatrices(qm_val_t* wmatrix[NUM_QM_LEVELS][2][2][TX_SIZES],

vp10/common/quant_common.h → av1/common/quant_common.h

@@ -12,8 +12,8 @@
 #define VP10_COMMON_QUANT_COMMON_H_
 
 #include "aom/vpx_codec.h"
-#include "vp10/common/seg_common.h"
-#include "vp10/common/enums.h"
+#include "av1/common/seg_common.h"
+#include "av1/common/enums.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/common/reconinter.c → av1/common/reconinter.c

@@ -15,9 +15,9 @@
 
 #include "aom/vpx_integer.h"
 
-#include "vp10/common/blockd.h"
-#include "vp10/common/reconinter.h"
-#include "vp10/common/reconintra.h"
+#include "av1/common/blockd.h"
+#include "av1/common/reconinter.h"
+#include "av1/common/reconintra.h"
 
 #if CONFIG_VPX_HIGHBITDEPTH
 void vp10_highbd_build_inter_predictor(

vp10/common/reconinter.h → av1/common/reconinter.h

@@ -11,8 +11,8 @@
 #ifndef VP10_COMMON_RECONINTER_H_
 #define VP10_COMMON_RECONINTER_H_
 
-#include "vp10/common/filter.h"
-#include "vp10/common/onyxc_int.h"
+#include "av1/common/filter.h"
+#include "av1/common/onyxc_int.h"
 #include "aom/vpx_integer.h"
 #include "aom_dsp/vpx_filter.h"
 

vp10/common/reconintra.c → av1/common/reconintra.c

@@ -18,8 +18,8 @@
 #include "aom_ports/mem.h"
 #include "aom_ports/vpx_once.h"
 
-#include "vp10/common/reconintra.h"
-#include "vp10/common/onyxc_int.h"
+#include "av1/common/reconintra.h"
+#include "av1/common/onyxc_int.h"
 
 #if CONFIG_MISC_FIXES
 enum {

vp10/common/reconintra.h → av1/common/reconintra.h

@@ -12,7 +12,7 @@
 #define VP10_COMMON_RECONINTRA_H_
 
 #include "aom/vpx_integer.h"
-#include "vp10/common/blockd.h"
+#include "av1/common/blockd.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/common/scale.c → av1/common/scale.c

@@ -9,8 +9,8 @@
  */
 
 #include "./vpx_dsp_rtcd.h"
-#include "vp10/common/filter.h"
-#include "vp10/common/scale.h"
+#include "av1/common/filter.h"
+#include "av1/common/scale.h"
 #include "aom_dsp/vpx_filter.h"
 
 static INLINE int scaled_x(int val, const struct scale_factors *sf) {

vp10/common/scale.h → av1/common/scale.h

@@ -11,7 +11,7 @@
 #ifndef VP10_COMMON_SCALE_H_
 #define VP10_COMMON_SCALE_H_
 
-#include "vp10/common/mv.h"
+#include "av1/common/mv.h"
 #include "aom_dsp/vpx_convolve.h"
 
 #ifdef __cplusplus

vp10/common/scan.c → av1/common/scan.c

@@ -10,7 +10,7 @@
 
 #include <assert.h>
 
-#include "vp10/common/scan.h"
+#include "av1/common/scan.h"
 
 DECLARE_ALIGNED(16, static const int16_t, default_scan_4x4[16]) = {
   0, 4, 1, 5, 8, 2, 12, 9, 3, 6, 13, 10, 7, 14, 11, 15,

vp10/common/scan.h → av1/common/scan.h

@@ -14,8 +14,8 @@
 #include "aom/vpx_integer.h"
 #include "aom_ports/mem.h"
 
-#include "vp10/common/enums.h"
-#include "vp10/common/blockd.h"
+#include "av1/common/enums.h"
+#include "av1/common/blockd.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/common/seg_common.c → av1/common/seg_common.c

@@ -10,10 +10,10 @@
 
 #include <assert.h>
 
-#include "vp10/common/blockd.h"
-#include "vp10/common/loopfilter.h"
-#include "vp10/common/seg_common.h"
-#include "vp10/common/quant_common.h"
+#include "av1/common/blockd.h"
+#include "av1/common/loopfilter.h"
+#include "av1/common/seg_common.h"
+#include "av1/common/quant_common.h"
 
 static const int seg_feature_data_signed[SEG_LVL_MAX] = { 1, 1, 0, 0 };
 

vp10/common/thread_common.c → av1/common/thread_common.c

@@ -11,10 +11,10 @@
 #include "./vpx_config.h"
 #include "aom_dsp/vpx_dsp_common.h"
 #include "aom_mem/vpx_mem.h"
-#include "vp10/common/entropymode.h"
-#include "vp10/common/thread_common.h"
-#include "vp10/common/reconinter.h"
-#include "vp10/common/loopfilter.h"
+#include "av1/common/entropymode.h"
+#include "av1/common/thread_common.h"
+#include "av1/common/reconinter.h"
+#include "av1/common/loopfilter.h"
 
 #if CONFIG_MULTITHREAD
 static INLINE void mutex_lock(pthread_mutex_t *const mutex) {

vp10/common/thread_common.h → av1/common/thread_common.h

@@ -11,7 +11,7 @@
 #ifndef VP10_COMMON_LOOPFILTER_THREAD_H_
 #define VP10_COMMON_LOOPFILTER_THREAD_H_
 #include "./vpx_config.h"
-#include "vp10/common/loopfilter.h"
+#include "av1/common/loopfilter.h"
 #include "aom_util/vpx_thread.h"
 
 #ifdef __cplusplus

vp10/common/tile_common.c → av1/common/tile_common.c

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/tile_common.h"
-#include "vp10/common/onyxc_int.h"
+#include "av1/common/tile_common.h"
+#include "av1/common/onyxc_int.h"
 #include "aom_dsp/vpx_dsp_common.h"