diff --git a/vp9/common/arm/vp9_bilinearfilter_arm.c b/vp9/common/arm/vp9_bilinearfilter_arm.c
index 409e271b11a2dc89c9a6116544ea3ddc5049c6bc..678173141a0e5efcb4bc73bc2de09798362aad6a 100644
--- a/vp9/common/arm/vp9_bilinearfilter_arm.c
+++ b/vp9/common/arm/vp9_bilinearfilter_arm.c
@@ -12,7 +12,7 @@
 #include <math.h>
 #include "vp9/common/vp9_filter.h"
 #include "vp9/common/vp9_subpixel.h"
-#include "vp9_bilinearfilter_arm.h"
+#include "vp9/common/arm/vp9_bilinearfilter_arm.h"
 
 void vp9_filter_block2d_bil_armv6
 (
diff --git a/vp9/common/ppc/vp9_loopfilter_altivec.c b/vp9/common/ppc/vp9_loopfilter_altivec.c
index cae171805e76e11d13f40a49562f8656069fa4ba..599070a750785dba6809961fd4f4900d9bc83d65 100644
--- a/vp9/common/ppc/vp9_loopfilter_altivec.c
+++ b/vp9/common/ppc/vp9_loopfilter_altivec.c
@@ -9,8 +9,8 @@
  */
 
 
-#include "vp9_loopfilter.h"
-#include "vp9_onyxc_int.h"
+#include "vp9/common/vp9_loopfilter.h"
+#include "vp9/common/vp9_onyxc_int.h"
 
 typedef void loop_filter_function_y_ppc
 (
diff --git a/vp9/common/ppc/vp9_systemdependent.c b/vp9/common/ppc/vp9_systemdependent.c
index 2137dee9cde2e5c37fdde585ed2da45f8a4179b1..106a2b763e31a35b46f588cd1bdd54f03b6d0518 100644
--- a/vp9/common/ppc/vp9_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 "vp9_subpixel.h"
-#include "vp9_loopfilter.h"
+#include "vp9/common/vp9_subpixel.h"
+#include "vp9/common/vp9_loopfilter.h"
 #include "recon.h"
-#include "vp9_onyxc_int.h"
+#include "vp9/common/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/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c
index 04a8b368a2832565de37fd7db258a6cbc2c39399..08882b3a656e4564792b6d4e6600dc05bd27b11a 100644
--- a/vp9/common/vp9_alloccommon.c
+++ b/vp9/common/vp9_alloccommon.c
@@ -10,13 +10,13 @@
 
 
 #include "vpx_ports/config.h"
-#include "vp9_blockd.h"
+#include "vp9/common/vp9_blockd.h"
 #include "vpx_mem/vpx_mem.h"
-#include "vp9_onyxc_int.h"
-#include "vp9_findnearmv.h"
-#include "vp9_entropymode.h"
-#include "vp9_entropymv.h"
-#include "vp9_systemdependent.h"
+#include "vp9/common/vp9_onyxc_int.h"
+#include "vp9/common/vp9_findnearmv.h"
+#include "vp9/common/vp9_entropymode.h"
+#include "vp9/common/vp9_entropymv.h"
+#include "vp9/common/vp9_systemdependent.h"
 
 
 void vp9_update_mode_info_border(VP9_COMMON *cpi, MODE_INFO *mi_base) {
diff --git a/vp9/common/vp9_alloccommon.h b/vp9/common/vp9_alloccommon.h
index df94f421e45acb2d38f24d66e1a4d48e7cde0c74..bfecef52438b0c2a17aea178cac395d07091f8a0 100644
--- a/vp9/common/vp9_alloccommon.h
+++ b/vp9/common/vp9_alloccommon.h
@@ -12,7 +12,7 @@
 #ifndef __INC_ALLOCCOMMON_H
 #define __INC_ALLOCCOMMON_H
 
-#include "vp9_onyxc_int.h"
+#include "vp9/common/vp9_onyxc_int.h"
 
 void vp9_create_common(VP9_COMMON *oci);
 void vp9_remove_common(VP9_COMMON *oci);
diff --git a/vp9/common/vp9_blockd.c b/vp9/common/vp9_blockd.c
index d8bb394d4d27895a7dc6fcbadbdd62679bf6516b..60aedf8cb7bec39b36dac3b718a9208b720dd244 100644
--- a/vp9/common/vp9_blockd.c
+++ b/vp9/common/vp9_blockd.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vp9_blockd.h"
+#include "vp9/common/vp9_blockd.h"
 #include "vpx_mem/vpx_mem.h"
 
 
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h
index a91e8d4d072830ff7508047a735f868814cb197b..d819a3d69707c125b04b2e6044483f5a9ffc0fd7 100644
--- a/vp9/common/vp9_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 "vp9_mv.h"
-#include "vp9_treecoder.h"
-#include "vp9_subpixel.h"
+#include "vp9/common/vp9_mv.h"
+#include "vp9/common/vp9_treecoder.h"
+#include "vp9/common/vp9_subpixel.h"
 #include "vpx_ports/mem.h"
-#include "vp9_common.h"
+#include "vp9/common/vp9_common.h"
 
 #define TRUE    1
 #define FALSE   0
diff --git a/vp9/common/vp9_common.h b/vp9/common/vp9_common.h
index 61c0e25d8f1d6c24a13e3b3948474047f9e0a1d2..64804e16e763f61932264c92cbd6dd6abb12295b 100644
--- a/vp9/common/vp9_common.h
+++ b/vp9/common/vp9_common.h
@@ -18,7 +18,7 @@
 
 #include "vpx_mem/vpx_mem.h"
 
-#include "vp9_common_types.h"
+#include "vp9/common/vp9_common_types.h"
 
 /* Only need this for fixed-size arrays, for structs just assign. */
 
diff --git a/vp9/common/vp9_context.c b/vp9/common/vp9_context.c
index 90a1f796fa7a42ba3dd6b5d407977aaeab18244d..271b45541a07901ad54d4619b50a63e4c3060622 100644
--- a/vp9/common/vp9_context.c
+++ b/vp9/common/vp9_context.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vp9_entropy.h"
+#include "vp9/common/vp9_entropy.h"
 
 /* *** GENERATED FILE: DO NOT EDIT *** */
 
diff --git a/vp9/common/vp9_debugmodes.c b/vp9/common/vp9_debugmodes.c
index 058abb57e1b12324bdf0e5bc3d538fbdce0f06e7..76318d2e151810a61eca249e9044d6802c0993de 100644
--- a/vp9/common/vp9_debugmodes.c
+++ b/vp9/common/vp9_debugmodes.c
@@ -9,7 +9,7 @@
  */
 
 #include <stdio.h>
-#include "vp9_blockd.h"
+#include "vp9/common/vp9_blockd.h"
 
 void vp9_print_modes_and_motion_vectors(MODE_INFO *mi, int rows, int cols,
                                         int frame) {
diff --git a/vp9/common/vp9_entropy.c b/vp9/common/vp9_entropy.c
index e6ee2729e2b7b644f688414cdb21f75ce8da8d0a..4832b4e9c7b973a1b96d9df74c5bbf91e92090fe 100644
--- a/vp9/common/vp9_entropy.c
+++ b/vp9/common/vp9_entropy.c
@@ -11,11 +11,11 @@
 
 #include <stdio.h>
 
-#include "vp9_entropy.h"
+#include "vp9/common/vp9_entropy.h"
 #include "string.h"
-#include "vp9_blockd.h"
-#include "vp9_onyxc_int.h"
-#include "vp9_entropymode.h"
+#include "vp9/common/vp9_blockd.h"
+#include "vp9/common/vp9_onyxc_int.h"
+#include "vp9/common/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 "vp9_coefupdateprobs.h"
+#include "vp9/common/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 "vp9_default_coef_probs.h"
+#include "vp9/common/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/vp9_entropy.h b/vp9/common/vp9_entropy.h
index a2053609b9a40de1a0a4c0d6ab7d259ede44a8b6..ccf68a42287d3f8e8cd6c294e2f09023baf85a41 100644
--- a/vp9/common/vp9_entropy.h
+++ b/vp9/common/vp9_entropy.h
@@ -12,10 +12,10 @@
 #ifndef __INC_ENTROPY_H
 #define __INC_ENTROPY_H
 
-#include "vp9_treecoder.h"
-#include "vp9_blockd.h"
-#include "vp9_common.h"
-#include "vp9_coefupdateprobs.h"
+#include "vp9/common/vp9_treecoder.h"
+#include "vp9/common/vp9_blockd.h"
+#include "vp9/common/vp9_common.h"
+#include "vp9/common/vp9_coefupdateprobs.h"
 
 extern const int vp9_i8x8_block[4];
 
diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c
index 0eb21ca82851cc60d421962e8638a0d840c76118..9b48dc97a382219c57623991cdc6172d82a3622f 100644
--- a/vp9/common/vp9_entropymode.c
+++ b/vp9/common/vp9_entropymode.c
@@ -9,8 +9,8 @@
  */
 
 
-#include "vp9_onyxc_int.h"
-#include "vp9_modecont.h"
+#include "vp9/common/vp9_onyxc_int.h"
+#include "vp9/common/vp9_modecont.h"
 #include "vpx_mem/vpx_mem.h"
 
 
diff --git a/vp9/common/vp9_entropymode.h b/vp9/common/vp9_entropymode.h
index aee6e6c7621534598cf1e8dc0a6756c836008636..0b14cf67e888d4d333ba3e55d22f3ca6d6213a15 100644
--- a/vp9/common/vp9_entropymode.h
+++ b/vp9/common/vp9_entropymode.h
@@ -12,8 +12,8 @@
 #ifndef __INC_ENTROPYMODE_H
 #define __INC_ENTROPYMODE_H
 
-#include "vp9_blockd.h"
-#include "vp9_treecoder.h"
+#include "vp9/common/vp9_blockd.h"
+#include "vp9/common/vp9_treecoder.h"
 
 #define SUBMVREF_COUNT 5
 #define VP9_NUMMBSPLITS 4
diff --git a/vp9/common/vp9_entropymv.c b/vp9/common/vp9_entropymv.c
index 8d2ebebc487396957c9a98a09d800f29139afe66..94543c54dae99d0bbddb0fb0cb1971d1196b6584 100644
--- a/vp9/common/vp9_entropymv.c
+++ b/vp9/common/vp9_entropymv.c
@@ -9,8 +9,8 @@
  */
 
 
-#include "vp9_onyxc_int.h"
-#include "vp9_entropymv.h"
+#include "vp9/common/vp9_onyxc_int.h"
+#include "vp9/common/vp9_entropymv.h"
 
 //#define MV_COUNT_TESTING
 
diff --git a/vp9/common/vp9_entropymv.h b/vp9/common/vp9_entropymv.h
index 3be95117ce0a82446ddfda79ab64676a8c994d9b..b6b35df04f40af8580cbb2838a0e66db41a57549 100644
--- a/vp9/common/vp9_entropymv.h
+++ b/vp9/common/vp9_entropymv.h
@@ -12,9 +12,9 @@
 #ifndef __INC_ENTROPYMV_H
 #define __INC_ENTROPYMV_H
 
-#include "vp9_treecoder.h"
+#include "vp9/common/vp9_treecoder.h"
 #include "vpx_config.h"
-#include "vp9_blockd.h"
+#include "vp9/common/vp9_blockd.h"
 
 struct VP9Common;
 
diff --git a/vp9/common/vp9_extend.c b/vp9/common/vp9_extend.c
index 4f2aa0e0ce83083386d6b484f31f04c48bf72d0b..61c7abfc766f5bcc47001cfa1869ed45c04abdb5 100644
--- a/vp9/common/vp9_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 "vp9_extend.h"
+#include "vp9/common/vp9_extend.h"
 #include "vpx_mem/vpx_mem.h"
 
 static void copy_and_extend_plane(unsigned char *s, /* source */
diff --git a/vp9/common/vp9_filter.c b/vp9/common/vp9_filter.c
index 8d5eb9333b96e6805ebc9c03fa07d130a2ed8e25..18217e627f57ced03835aaf221fd44c537f21434 100644
--- a/vp9/common/vp9_filter.c
+++ b/vp9/common/vp9_filter.c
@@ -10,7 +10,7 @@
 
 
 #include <stdlib.h>
-#include "vp9_filter.h"
+#include "vp9/common/vp9_filter.h"
 #include "vpx_ports/mem.h"
 #include "vp9_rtcd.h"
 
diff --git a/vp9/common/vp9_findnearmv.c b/vp9/common/vp9_findnearmv.c
index bfbac4e1876e8a778a7176c17799cac3e8175221..ed8a99af2235a75f7ad4be598efd048123db16ea 100644
--- a/vp9/common/vp9_findnearmv.c
+++ b/vp9/common/vp9_findnearmv.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vp9_findnearmv.h"
+#include "vp9/common/vp9_findnearmv.h"
 #include "vp9/common/vp9_sadmxn.h"
 #include "vp9/common/vp9_subpelvar.h"
 #include <limits.h>
diff --git a/vp9/common/vp9_findnearmv.h b/vp9/common/vp9_findnearmv.h
index 759bdbaff74c027e031f8a2ac2ae20ab1f21391b..a12a7220135e06d6676155528275f409236e4764 100644
--- a/vp9/common/vp9_findnearmv.h
+++ b/vp9/common/vp9_findnearmv.h
@@ -12,10 +12,10 @@
 #ifndef __INC_FINDNEARMV_H
 #define __INC_FINDNEARMV_H
 
-#include "vp9_mv.h"
-#include "vp9_blockd.h"
-#include "vp9_treecoder.h"
-#include "vp9_onyxc_int.h"
+#include "vp9/common/vp9_mv.h"
+#include "vp9/common/vp9_blockd.h"
+#include "vp9/common/vp9_treecoder.h"
+#include "vp9/common/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/vp9_invtrans.c b/vp9/common/vp9_invtrans.c
index 76eb10307855d1c27665259e179bfa36bd1b99f4..b79977385cb22f93f4fde32636371054cde3f234 100644
--- a/vp9/common/vp9_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 "vp9_invtrans.h"
+#include "vp9/common/vp9_invtrans.h"
 #include "./vp9_rtcd.h"
 
 static void recon_dcblock(MACROBLOCKD *xd) {
diff --git a/vp9/common/vp9_invtrans.h b/vp9/common/vp9_invtrans.h
index 0e50c45d7614981f87f9d5b755fc55d845f1ced1..9ac9bb1cd8a286e3cc6dfaa7b6215e49776b0629 100644
--- a/vp9/common/vp9_invtrans.h
+++ b/vp9/common/vp9_invtrans.h
@@ -12,7 +12,7 @@
 #define __INC_INVTRANS_H
 
 #include "vpx_ports/config.h"
-#include "vp9_blockd.h"
+#include "vp9/common/vp9_blockd.h"
 
 extern void vp9_inverse_transform_b_4x4(MACROBLOCKD *xd, int block, int pitch);
 
diff --git a/vp9/common/vp9_loopfilter.c b/vp9/common/vp9_loopfilter.c
index 73b34397407441ee758903b7b54ea7bdcf3e8008..8d4d014ba7cfc912697b3ae2739b5f3bc0b54bef 100644
--- a/vp9/common/vp9_loopfilter.c
+++ b/vp9/common/vp9_loopfilter.c
@@ -9,8 +9,8 @@
  */
 
 #include "vpx_config.h"
-#include "vp9_loopfilter.h"
-#include "vp9_onyxc_int.h"
+#include "vp9/common/vp9_loopfilter.h"
+#include "vp9/common/vp9_onyxc_int.h"
 #include "vpx_mem/vpx_mem.h"
 
 #include "vp9/common/vp9_seg_common.h"
diff --git a/vp9/common/vp9_loopfilter.h b/vp9/common/vp9_loopfilter.h
index b3254f6922e0d5cba96fb85ad76f35b348839e83..34d1cd37f3594176c383888da44d4150590600e7 100644
--- a/vp9/common/vp9_loopfilter.h
+++ b/vp9/common/vp9_loopfilter.h
@@ -13,7 +13,7 @@
 
 #include "vpx_ports/mem.h"
 #include "vpx_config.h"
-#include "vp9_blockd.h"
+#include "vp9/common/vp9_blockd.h"
 
 #define MAX_LOOP_FILTER 63
 
diff --git a/vp9/common/vp9_loopfilter_filters.c b/vp9/common/vp9_loopfilter_filters.c
index 9fd6c5fa697b4b9e0bd8de914d5224498553ef0b..b8cfb9c1ac3bbf24956cc703bff4b11a280cd69e 100644
--- a/vp9/common/vp9_loopfilter_filters.c
+++ b/vp9/common/vp9_loopfilter_filters.c
@@ -10,8 +10,8 @@
 
 #include <stdlib.h>
 #include "vpx_config.h"
-#include "vp9_loopfilter.h"
-#include "vp9_onyxc_int.h"
+#include "vp9/common/vp9_loopfilter.h"
+#include "vp9/common/vp9_onyxc_int.h"
 
 typedef unsigned char uc;
 
diff --git a/vp9/common/vp9_mbpitch.c b/vp9/common/vp9_mbpitch.c
index b42db987ada14a52d1dd3aa8da62e0d875a2d6eb..84e473bb1779ca12aedfdd20beaf0cad4be78b84 100644
--- a/vp9/common/vp9_mbpitch.c
+++ b/vp9/common/vp9_mbpitch.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vp9_blockd.h"
+#include "vp9/common/vp9_blockd.h"
 
 typedef enum {
   PRED = 0,
diff --git a/vp9/common/vp9_modecont.c b/vp9/common/vp9_modecont.c
index 2f5bbd2bac0935e97a084a20f7ae2b34efd9dc04..64ff377c38a703cc227315b015d0e3d707a762b4 100644
--- a/vp9/common/vp9_modecont.c
+++ b/vp9/common/vp9_modecont.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vp9_entropy.h"
+#include "vp9/common/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/vp9_modecontext.c b/vp9/common/vp9_modecontext.c
index e18cf63c1e1f85b674cf8b065661469eabdefa84..ab91c0b14db10250c3f961b8e40f9168b85f63ac 100644
--- a/vp9/common/vp9_modecontext.c
+++ b/vp9/common/vp9_modecontext.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vp9_entropymode.h"
+#include "vp9/common/vp9_entropymode.h"
 
 const unsigned int vp9_kf_default_bmode_counts[VP9_KF_BINTRAMODES]
                                               [VP9_KF_BINTRAMODES]
diff --git a/vp9/common/vp9_mvref_common.c b/vp9/common/vp9_mvref_common.c
index 33dc3fa5b69bdde37894988a9ceb5401ed5aa9f9..dce49304d4bb5db8caf8848860e75a6a12fb34b7 100644
--- a/vp9/common/vp9_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 "vp9_mvref_common.h"
+#include "vp9/common/vp9_mvref_common.h"
 
 #define MVREF_NEIGHBOURS 8
 static int mb_mv_ref_search[MVREF_NEIGHBOURS][2] = {
diff --git a/vp9/common/vp9_mvref_common.h b/vp9/common/vp9_mvref_common.h
index 9a1877919c62eb63f9f45afe920f418573d646de..eb8626ed2decc5f7168525c6c3054941a9fc4319 100644
--- a/vp9/common/vp9_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 "vp9_onyxc_int.h"
-#include "vp9_blockd.h"
+#include "vp9/common/vp9_onyxc_int.h"
+#include "vp9/common/vp9_blockd.h"
 
 
 #ifndef __INC_MVREF_COMMON_H
diff --git a/vp9/common/vp9_onyx.h b/vp9/common/vp9_onyx.h
index 92ec667e7c04cab3a706c5a8927ae8c96359270e..96c7123b4d77f6657cc922dd60d53cc6b46ed8cc 100644
--- a/vp9/common/vp9_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 "vp9_type_aliases.h"
-#include "vp9_ppflags.h"
+#include "vp9/common/vp9_type_aliases.h"
+#include "vp9/common/vp9_ppflags.h"
   typedef int *VP9_PTR;
 
   /* Create/destroy static data structures. */
diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h
index bef4b41ac1b35e790498f4519e6f3f9cacd62d9b..1bbdaeeb5460fff576abcc06b9af1eb4965c8e7d 100644
--- a/vp9/common/vp9_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 "vp9_loopfilter.h"
-#include "vp9_entropymv.h"
-#include "vp9_entropy.h"
-#include "vp9_entropymode.h"
+#include "vp9/common/vp9_loopfilter.h"
+#include "vp9/common/vp9_entropymv.h"
+#include "vp9/common/vp9_entropy.h"
+#include "vp9/common/vp9_entropymode.h"
 #if CONFIG_POSTPROC
-#include "vp9_postproc.h"
+#include "vp9/common/vp9_postproc.h"
 #endif
 
 /*#ifdef PACKET_TESTING*/
-#include "vp9_header.h"
+#include "vp9/common/vp9_header.h"
 /*#endif*/
 
 /* Create/destroy static data structures. */
diff --git a/vp9/common/vp9_onyxd.h b/vp9/common/vp9_onyxd.h
index 2fc51db96e885831383f652e5db717c5afe33eaa..af16ee71c340211f67ad311880c62f59e5bf82a0 100644
--- a/vp9/common/vp9_onyxd.h
+++ b/vp9/common/vp9_onyxd.h
@@ -18,9 +18,9 @@
 extern "C"
 {
 #endif
-#include "vp9_type_aliases.h"
+#include "vp9/common/vp9_type_aliases.h"
 #include "vpx_scale/yv12config.h"
-#include "vp9_ppflags.h"
+#include "vp9/common/vp9_ppflags.h"
 #include "vpx_ports/mem.h"
 #include "vpx/vpx_codec.h"
 
diff --git a/vp9/common/vp9_postproc.c b/vp9/common/vp9_postproc.c
index aa8186be24f7b4e4d03f9a66a931ea88413a22dc..2cf3b6f775f4cfd75193bc342d722c14769e6f11 100644
--- a/vp9/common/vp9_postproc.c
+++ b/vp9/common/vp9_postproc.c
@@ -11,10 +11,10 @@
 
 #include "vpx_ports/config.h"
 #include "vpx_scale/yv12config.h"
-#include "vp9_postproc.h"
+#include "vp9/common/vp9_postproc.h"
 #include "vp9/common/vp9_textblit.h"
 #include "vpx_scale/vpxscale.h"
-#include "vp9_systemdependent.h"
+#include "vp9/common/vp9_systemdependent.h"
 #include "./vp9_rtcd.h"
 
 
diff --git a/vp9/common/vp9_postproc.h b/vp9/common/vp9_postproc.h
index de011b57577b4b7c21fbc5b6cba063c6d671b8f8..d7fc30db4b4402681fd70f3d999f589ace46693d 100644
--- a/vp9/common/vp9_postproc.h
+++ b/vp9/common/vp9_postproc.h
@@ -21,8 +21,8 @@ struct postproc_state {
   DECLARE_ALIGNED(16, char, whiteclamp[16]);
   DECLARE_ALIGNED(16, char, bothclamp[16]);
 };
-#include "vp9_onyxc_int.h"
-#include "vp9_ppflags.h"
+#include "vp9/common/vp9_onyxc_int.h"
+#include "vp9/common/vp9_ppflags.h"
 int vp9_post_proc_frame(struct VP9Common *oci, YV12_BUFFER_CONFIG *dest,
                         vp9_ppflags_t *flags);
 
diff --git a/vp9/common/vp9_pred_common.h b/vp9/common/vp9_pred_common.h
index 2628bb3cac3ab849fe4c08fc1a895d6a79746fda..28511c2f2b7899698aa743c18adbbb7db434507d 100644
--- a/vp9/common/vp9_pred_common.h
+++ b/vp9/common/vp9_pred_common.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp9_type_aliases.h"
-#include "vp9_onyxc_int.h"
+#include "vp9/common/vp9_type_aliases.h"
+#include "vp9/common/vp9_onyxc_int.h"
 #include "vp9/common/vp9_blockd.h"
 
 #ifndef __INC_PRED_COMMON_H__
diff --git a/vp9/common/vp9_quant_common.c b/vp9/common/vp9_quant_common.c
index 5d1f2594ad47a923faff6220aca021d7570f9346..119038121987f92bb8f36fc4e9cc6bee581413fb 100644
--- a/vp9/common/vp9_quant_common.c
+++ b/vp9/common/vp9_quant_common.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vp9_quant_common.h"
+#include "vp9/common/vp9_quant_common.h"
 
 static int dc_qlookup[QINDEX_RANGE];
 static int ac_qlookup[QINDEX_RANGE];
diff --git a/vp9/common/vp9_quant_common.h b/vp9/common/vp9_quant_common.h
index 88588d5d2fdbaa2f6b6f29fc012afa60d23b098c..6e0555e09115908eba7c9bca9ed201dc9f312447 100644
--- a/vp9/common/vp9_quant_common.h
+++ b/vp9/common/vp9_quant_common.h
@@ -10,8 +10,8 @@
 
 
 #include "string.h"
-#include "vp9_blockd.h"
-#include "vp9_onyxc_int.h"
+#include "vp9/common/vp9_blockd.h"
+#include "vp9/common/vp9_onyxc_int.h"
 
 extern void vp9_init_quant_tables();
 extern int vp9_ac_yquant(int QIndex);
diff --git a/vp9/common/vp9_recon.c b/vp9/common/vp9_recon.c
index 9c9029f2ad564106effe48369c6316809ffb3aeb..1f8dfce34b2f2e6be18293a2ba4d36e5b9d3fc69 100644
--- a/vp9/common/vp9_recon.c
+++ b/vp9/common/vp9_recon.c
@@ -11,7 +11,7 @@
 
 #include "vpx_ports/config.h"
 #include "vp9_rtcd.h"
-#include "vp9_blockd.h"
+#include "vp9/common/vp9_blockd.h"
 
 void vp9_recon_b_c
 (
diff --git a/vp9/common/vp9_reconinter.c b/vp9/common/vp9_reconinter.c
index eac07ae19d44d05db27d0fa36bb3dacd874e5420..bcd75ec8b8e40c48e4d94be890ec06ec7996466f 100644
--- a/vp9/common/vp9_reconinter.c
+++ b/vp9/common/vp9_reconinter.c
@@ -11,11 +11,11 @@
 
 #include "vpx_ports/config.h"
 #include "vpx/vpx_integer.h"
-#include "vp9_blockd.h"
-#include "vp9_reconinter.h"
+#include "vp9/common/vp9_blockd.h"
+#include "vp9/common/vp9_reconinter.h"
 #include "vp9/common/vp9_reconintra.h"
 #if CONFIG_RUNTIME_CPU_DETECT
-#include "vp9_onyxc_int.h"
+#include "vp9/common/vp9_onyxc_int.h"
 #endif
 
 void vp9_setup_interp_filters(MACROBLOCKD *xd,
diff --git a/vp9/common/vp9_reconinter.h b/vp9/common/vp9_reconinter.h
index 25a8adc3b2cbdeead8f41786ac963129ff7a6c95..70ffd3bd1ceed41766d96fb9786268d0b4d6dfee 100644
--- a/vp9/common/vp9_reconinter.h
+++ b/vp9/common/vp9_reconinter.h
@@ -11,7 +11,7 @@
 #ifndef __INC_RECONINTER_H
 #define __INC_RECONINTER_H
 
-#include "vp9_onyxc_int.h"
+#include "vp9/common/vp9_onyxc_int.h"
 
 extern void vp9_build_1st_inter16x16_predictors_mby(MACROBLOCKD *xd,
                                                     unsigned char *dst_y,
diff --git a/vp9/common/vp9_reconintra.c b/vp9/common/vp9_reconintra.c
index 8199b94aefef7bc263398a5e920a7601f61cff67..5c5d4abbb9fb7970f9719b49218f82d6bafc42db 100644
--- a/vp9/common/vp9_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 "vp9_reconintra.h"
+#include "vp9/common/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/vp9_reconintra.h b/vp9/common/vp9_reconintra.h
index dd35b06ad6ed2916709d01d03c19bfce336d1279..3ef44c85d7d6c1ee6c98fd31733595aef2ec3841 100644
--- a/vp9/common/vp9_reconintra.h
+++ b/vp9/common/vp9_reconintra.h
@@ -11,7 +11,7 @@
 #ifndef __INC_RECONINTRA_H
 #define __INC_RECONINTRA_H
 
-#include "vp9_blockd.h"
+#include "vp9/common/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/vp9_reconintra4x4.c b/vp9/common/vp9_reconintra4x4.c
index d5203acd0a79b98a31bbe50dcaa676f9a35e1764..e4a24f2cb1e74fbb5748a53008e75b673eb3d969 100644
--- a/vp9/common/vp9_reconintra4x4.c
+++ b/vp9/common/vp9_reconintra4x4.c
@@ -11,7 +11,7 @@
 
 #include "vpx_ports/config.h"
 #include "vpx_mem/vpx_mem.h"
-#include "vp9_reconintra.h"
+#include "vp9/common/vp9_reconintra.h"
 #include "vp9_rtcd.h"
 
 #if CONFIG_NEWBINTRAMODES
diff --git a/vp9/common/vp9_seg_common.h b/vp9/common/vp9_seg_common.h
index 20959a7052973bcb97be3287ac34d9249ad8a8ec..29eee4ce95408aeddeeee5c7f1c5e1d6df408962 100644
--- a/vp9/common/vp9_seg_common.h
+++ b/vp9/common/vp9_seg_common.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp9_type_aliases.h"
-#include "vp9_onyxc_int.h"
+#include "vp9/common/vp9_type_aliases.h"
+#include "vp9/common/vp9_onyxc_int.h"
 #include "vp9/common/vp9_blockd.h"
 
 #ifndef __INC_SEG_COMMON_H__
diff --git a/vp9/common/vp9_setupintrarecon.c b/vp9/common/vp9_setupintrarecon.c
index 3fe4e3e50e5e61cfa3d72f0494d26628761fd1ff..2c84cd0c4750bb8db3f463d9a173f5015640f6e0 100644
--- a/vp9/common/vp9_setupintrarecon.c
+++ b/vp9/common/vp9_setupintrarecon.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vp9_setupintrarecon.h"
+#include "vp9/common/vp9_setupintrarecon.h"
 #include "vpx_mem/vpx_mem.h"
 
 void vp9_setup_intra_recon(YV12_BUFFER_CONFIG *ybf) {
diff --git a/vp9/common/vp9_swapyv12buffer.c b/vp9/common/vp9_swapyv12buffer.c
index 7882e0be0088c776cd3fc481a04339c02df73c59..b0146253843f34a707d05eedc071fdfb7551e05f 100644
--- a/vp9/common/vp9_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 "vp9_swapyv12buffer.h"
+#include "vp9/common/vp9_swapyv12buffer.h"
 
 void vp9_swap_yv12_buffer(YV12_BUFFER_CONFIG *new_frame,
                           YV12_BUFFER_CONFIG *last_frame) {
diff --git a/vp9/common/vp9_treecoder.c b/vp9/common/vp9_treecoder.c
index 096dd59e544a989a4dee5bbd7a6c16f66457c81e..64018a100ce211e446090616c731054544052e62 100644
--- a/vp9/common/vp9_treecoder.c
+++ b/vp9/common/vp9_treecoder.c
@@ -16,7 +16,7 @@
 #endif
 #include <stdio.h>
 
-#include "vp9_treecoder.h"
+#include "vp9/common/vp9_treecoder.h"
 
 static void tree2tok(
   struct vp9_token_struct *const p,
diff --git a/vp9/decoder/vp9_asm_dec_offsets.c b/vp9/decoder/vp9_asm_dec_offsets.c
index ece315ac817582cf736f2080966546e708445ba0..5abc40f8cc395733ab7318a0902e6af9323b7b8f 100644
--- a/vp9/decoder/vp9_asm_dec_offsets.c
+++ b/vp9/decoder/vp9_asm_dec_offsets.c
@@ -10,7 +10,7 @@
 
 
 #include "vpx_ports/asm_offsets.h"
-#include "vp9_onyxd_int.h"
+#include "vp9/decoder/vp9_onyxd_int.h"
 
 BEGIN
 
diff --git a/vp9/decoder/vp9_dboolhuff.c b/vp9/decoder/vp9_dboolhuff.c
index 885ec0df69c06619204d7438a4fb374b5c02a186..5f1ef04083b86bfe458092fe73bfbf5f59f72739 100644
--- a/vp9/decoder/vp9_dboolhuff.c
+++ b/vp9/decoder/vp9_dboolhuff.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vp9_dboolhuff.h"
+#include "vp9/decoder/vp9_dboolhuff.h"
 #include "vpx_ports/mem.h"
 #include "vpx_mem/vpx_mem.h"
 
diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c
index f17e526bae39a2ad825396b2c4cc6970208bab60..6842a150db0f9eff55802aa835a60c4e83fe32e7 100644
--- a/vp9/decoder/vp9_decodemv.c
+++ b/vp9/decoder/vp9_decodemv.c
@@ -9,10 +9,10 @@
  */
 
 
-#include "vp9_treereader.h"
+#include "vp9/decoder/vp9_treereader.h"
 #include "vp9/common/vp9_entropymv.h"
 #include "vp9/common/vp9_entropymode.h"
-#include "vp9_onyxd_int.h"
+#include "vp9/decoder/vp9_onyxd_int.h"
 #include "vp9/common/vp9_findnearmv.h"
 
 #include "vp9/common/vp9_seg_common.h"
diff --git a/vp9/decoder/vp9_decodemv.h b/vp9/decoder/vp9_decodemv.h
index 10ae4f54e297a9b2f5b00d15d0eb0f8303d71041..a5c44670c003570108b339fbdc14bddfcc9528ca 100644
--- a/vp9/decoder/vp9_decodemv.h
+++ b/vp9/decoder/vp9_decodemv.h
@@ -9,7 +9,7 @@
  */
 
 
-#include "vp9_onyxd_int.h"
+#include "vp9/decoder/vp9_onyxd_int.h"
 
 void vp9_decode_mb_mode_mv(VP9D_COMP* const pbi,
                            MACROBLOCKD* const xd,
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c
index 2adbb903be85ae70ad7df64588d81fea5ac049e5..d253f30baf7880e9cd0ffb928e6c0b1f90be3031 100644
--- a/vp9/decoder/vp9_decodframe.c
+++ b/vp9/decoder/vp9_decodframe.c
@@ -9,13 +9,13 @@
  */
 
 
-#include "vp9_onyxd_int.h"
+#include "vp9/decoder/vp9_onyxd_int.h"
 #include "vp9/common/vp9_header.h"
 #include "vp9/common/vp9_reconintra.h"
 #include "vp9/common/vp9_reconintra4x4.h"
 #include "vp9/common/vp9_reconinter.h"
 #include "vp9/decoder/vp9_decodframe.h"
-#include "vp9_detokenize.h"
+#include "vp9/decoder/vp9_detokenize.h"
 #include "vp9/common/vp9_invtrans.h"
 #include "vp9/common/vp9_alloccommon.h"
 #include "vp9/common/vp9_entropymode.h"
@@ -23,11 +23,11 @@
 #include "vpx_scale/vpxscale.h"
 #include "vp9/common/vp9_setupintrarecon.h"
 
-#include "vp9_decodemv.h"
+#include "vp9/decoder/vp9_decodemv.h"
 #include "vp9/common/vp9_extend.h"
 #include "vp9/common/vp9_modecont.h"
 #include "vpx_mem/vpx_mem.h"
-#include "vp9_dboolhuff.h"
+#include "vp9/decoder/vp9_dboolhuff.h"
 
 #include "vp9/common/vp9_seg_common.h"
 #include "vp9/common/vp9_entropy.h"
diff --git a/vp9/decoder/vp9_dequantize.c b/vp9/decoder/vp9_dequantize.c
index f3a22b543690bed7a350e9eced7cbde92e6b433a..633e3a4bfc9f7ae0494e42b22cc8d791a3e287ac 100644
--- a/vp9/decoder/vp9_dequantize.c
+++ b/vp9/decoder/vp9_dequantize.c
@@ -10,9 +10,9 @@
 
 
 #include "vp9_rtcd.h"
-#include "vp9_dequantize.h"
+#include "vp9/decoder/vp9_dequantize.h"
 #include "vpx_mem/vpx_mem.h"
-#include "vp9_onyxd_int.h"
+#include "vp9/decoder/vp9_onyxd_int.h"
 
 #ifdef DEC_DEBUG
 extern int dec_debug;
diff --git a/vp9/decoder/vp9_detokenize.c b/vp9/decoder/vp9_detokenize.c
index c55e3620a9049cd07f6ec1c1b7a1343faebd4ac3..1a7a08fa44ffeec6731e030e1b8ca54f85ac26cf 100644
--- a/vp9/decoder/vp9_detokenize.c
+++ b/vp9/decoder/vp9_detokenize.c
@@ -11,10 +11,10 @@
 
 #include "vp9/common/vp9_type_aliases.h"
 #include "vp9/common/vp9_blockd.h"
-#include "vp9_onyxd_int.h"
+#include "vp9/decoder/vp9_onyxd_int.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
-#include "vp9_detokenize.h"
+#include "vp9/decoder/vp9_detokenize.h"
 
 #include "vp9/common/vp9_seg_common.h"
 
diff --git a/vp9/decoder/vp9_detokenize.h b/vp9/decoder/vp9_detokenize.h
index 1425a36e348e49e158667466b772b4fc1c750fce..e1a3b44f3f6759a46c4e367c26152a0a3ceb7a6f 100644
--- a/vp9/decoder/vp9_detokenize.h
+++ b/vp9/decoder/vp9_detokenize.h
@@ -12,7 +12,7 @@
 #ifndef DETOKENIZE_H
 #define DETOKENIZE_H
 
-#include "vp9_onyxd_int.h"
+#include "vp9/decoder/vp9_onyxd_int.h"
 
 void vp9_reset_mb_tokens_context(MACROBLOCKD* const);
 
diff --git a/vp9/decoder/vp9_onyxd_if.c b/vp9/decoder/vp9_onyxd_if.c
index 70671683b210e1e4c283d227105232858fabea53..e92712bd61eb51830e163ea8a3392695a8a57028 100644
--- a/vp9/decoder/vp9_onyxd_if.c
+++ b/vp9/decoder/vp9_onyxd_if.c
@@ -14,7 +14,7 @@
 #include "vp9/common/vp9_postproc.h"
 #endif
 #include "vp9/common/vp9_onyxd.h"
-#include "vp9_onyxd_int.h"
+#include "vp9/decoder/vp9_onyxd_int.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vp9/common/vp9_alloccommon.h"
 #include "vp9/common/vp9_loopfilter.h"
@@ -27,7 +27,7 @@
 #include "vp9/common/vp9_systemdependent.h"
 #include "vpx_ports/vpx_timer.h"
 #include "vp9/decoder/vp9_decodframe.h"
-#include "vp9_detokenize.h"
+#include "vp9/decoder/vp9_detokenize.h"
 #if ARCH_ARM
 #include "vpx_ports/arm.h"
 #endif
diff --git a/vp9/decoder/vp9_onyxd_int.h b/vp9/decoder/vp9_onyxd_int.h
index 023e8eefdbf0824ae2f8bb978ffd6db6440fc6ae..603455af0b857a351d03094aa5cc495b3d5d2ca4 100644
--- a/vp9/decoder/vp9_onyxd_int.h
+++ b/vp9/decoder/vp9_onyxd_int.h
@@ -13,9 +13,9 @@
 #define __INC_ONYXD_INT_H
 #include "vpx_ports/config.h"
 #include "vp9/common/vp9_onyxd.h"
-#include "vp9_treereader.h"
+#include "vp9/decoder/vp9_treereader.h"
 #include "vp9/common/vp9_onyxc_int.h"
-#include "vp9_dequantize.h"
+#include "vp9/decoder/vp9_dequantize.h"
 
 // #define DEC_DEBUG
 
diff --git a/vp9/decoder/vp9_treereader.h b/vp9/decoder/vp9_treereader.h
index 4c49c9a75411e6d4927b336676e93491b314de1f..ac1293cc71cfae654067ceaaa1f23e77fe1d22e7 100644
--- a/vp9/decoder/vp9_treereader.h
+++ b/vp9/decoder/vp9_treereader.h
@@ -14,7 +14,7 @@
 
 #include "vp9/common/vp9_treecoder.h"
 
-#include "vp9_dboolhuff.h"
+#include "vp9/decoder/vp9_dboolhuff.h"
 
 typedef BOOL_DECODER vp9_reader;
 
diff --git a/vp9/encoder/vp9_asm_enc_offsets.c b/vp9/encoder/vp9_asm_enc_offsets.c
index 52b7e9d0190543675be551b0af2559768cf6eb42..3fe9c8fb7c57d7169341451aeb513240e2a876f7 100644
--- a/vp9/encoder/vp9_asm_enc_offsets.c
+++ b/vp9/encoder/vp9_asm_enc_offsets.c
@@ -11,11 +11,11 @@
 
 #include "vpx_ports/asm_offsets.h"
 #include "vpx_config.h"
-#include "vp9_block.h"
+#include "vp9/encoder/vp9_block.h"
 #include "vp9/common/vp9_blockd.h"
-#include "vp9_onyx_int.h"
-#include "vp9_treewriter.h"
-#include "vp9_tokenize.h"
+#include "vp9/encoder/vp9_onyx_int.h"
+#include "vp9/encoder/vp9_treewriter.h"
+#include "vp9/encoder/vp9_tokenize.h"
 
 BEGIN
 
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c
index 73c116766cb88a0b409df3129055da287b17fc67..644f2082b9ab7234baf70fb7d1316222a4b348ac 100644
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -10,10 +10,10 @@
 
 
 #include "vp9/common/vp9_header.h"
-#include "vp9_encodemv.h"
+#include "vp9/encoder/vp9_encodemv.h"
 #include "vp9/common/vp9_entropymode.h"
 #include "vp9/common/vp9_findnearmv.h"
-#include "vp9_mcomp.h"
+#include "vp9/encoder/vp9_mcomp.h"
 #include "vp9/common/vp9_systemdependent.h"
 #include <assert.h>
 #include <stdio.h>
@@ -21,8 +21,8 @@
 #include "vp9/common/vp9_pragmas.h"
 #include "vpx/vpx_encoder.h"
 #include "vpx_mem/vpx_mem.h"
-#include "vp9_bitstream.h"
-#include "vp9_segmentation.h"
+#include "vp9/encoder/vp9_bitstream.h"
+#include "vp9/encoder/vp9_segmentation.h"
 
 #include "vp9/common/vp9_seg_common.h"
 #include "vp9/common/vp9_pred_common.h"
diff --git a/vp9/encoder/vp9_boolhuff.c b/vp9/encoder/vp9_boolhuff.c
index 2689ab601e9421d52587394b61120c7cc27ac36e..d1b1e0e89dc9fb08bf5cbf616709afd264ac719c 100644
--- a/vp9/encoder/vp9_boolhuff.c
+++ b/vp9/encoder/vp9_boolhuff.c
@@ -9,7 +9,7 @@
  */
 
 #include <assert.h>
-#include "vp9_boolhuff.h"
+#include "vp9/encoder/vp9_boolhuff.h"
 
 #if defined(SECTIONBITS_OUTPUT)
 unsigned __int64 Sectionbits[500];
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index fe486b192a44553b56a603cb75ecd016c7e96111..3789946304923892024626d9c19aa8d84b1e2f31 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -11,20 +11,20 @@
 
 #include "vpx_ports/config.h"
 #include "vp9/encoder/vp9_encodeframe.h"
-#include "vp9_encodemb.h"
-#include "vp9_encodemv.h"
+#include "vp9/encoder/vp9_encodemb.h"
+#include "vp9/encoder/vp9_encodemv.h"
 #include "vp9/common/vp9_common.h"
-#include "vp9_onyx_int.h"
+#include "vp9/encoder/vp9_onyx_int.h"
 #include "vp9/common/vp9_extend.h"
 #include "vp9/common/vp9_entropymode.h"
 #include "vp9/common/vp9_quant_common.h"
-#include "vp9_segmentation.h"
+#include "vp9/encoder/vp9_segmentation.h"
 #include "vp9/common/vp9_setupintrarecon.h"
 #include "vp9/common/vp9_reconintra4x4.h"
-#include "vp9_encodeintra.h"
+#include "vp9/encoder/vp9_encodeintra.h"
 #include "vp9/common/vp9_reconinter.h"
 #include "vp9/common/vp9_invtrans.h"
-#include "vp9_rdopt.h"
+#include "vp9/encoder/vp9_rdopt.h"
 #include "vp9/common/vp9_findnearmv.h"
 #include "vp9/common/vp9_reconintra.h"
 #include "vp9/common/vp9_seg_common.h"
diff --git a/vp9/encoder/vp9_encodeintra.c b/vp9/encoder/vp9_encodeintra.c
index 185b4319230c2ff251cc9948fcbcff63b51b10db..017c178b9030fc0af9e3f342397f516cbf7c2976 100644
--- a/vp9/encoder/vp9_encodeintra.c
+++ b/vp9/encoder/vp9_encodeintra.c
@@ -10,12 +10,12 @@
 
 #include "vpx_ports/config.h"
 #include "vp9_rtcd.h"
-#include "vp9_quantize.h"
+#include "vp9/encoder/vp9_quantize.h"
 #include "vp9/common/vp9_reconintra.h"
 #include "vp9/common/vp9_reconintra4x4.h"
-#include "vp9_encodemb.h"
+#include "vp9/encoder/vp9_encodemb.h"
 #include "vp9/common/vp9_invtrans.h"
-#include "vp9_encodeintra.h"
+#include "vp9/encoder/vp9_encodeintra.h"
 
 #if CONFIG_RUNTIME_CPU_DETECT
 #define IF_RTCD(x) (x)
diff --git a/vp9/encoder/vp9_encodeintra.h b/vp9/encoder/vp9_encodeintra.h
index 8d6f41e62a801e10d97c0aa71b8408cf0c9a9eeb..363254eb00a63dd74a90bfaca14ab9722cd9a026 100644
--- a/vp9/encoder/vp9_encodeintra.h
+++ b/vp9/encoder/vp9_encodeintra.h
@@ -11,7 +11,7 @@
 #ifndef __ENCODEINTRA_H_
 #define __ENCODEINTRA_H_
 
-#include "vp9_onyx_int.h"
+#include "vp9/encoder/vp9_onyx_int.h"
 
 int vp9_encode_intra(VP9_COMP *cpi, MACROBLOCK *x, int use_16x16_pred);
 void vp9_encode_intra16x16mby(MACROBLOCK *x);
diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c
index 145f75a3f9d54ed1bdc8a6f5305f10770994b794..1a7a38261f3bd0fbe5e64fa4021d1e424c2c599d 100644
--- a/vp9/encoder/vp9_encodemb.c
+++ b/vp9/encoder/vp9_encodemb.c
@@ -9,14 +9,14 @@
  */
 
 #include "vpx_ports/config.h"
-#include "vp9_encodemb.h"
+#include "vp9/encoder/vp9_encodemb.h"
 #include "vp9/common/vp9_reconinter.h"
-#include "vp9_quantize.h"
-#include "vp9_tokenize.h"
+#include "vp9/encoder/vp9_quantize.h"
+#include "vp9/encoder/vp9_tokenize.h"
 #include "vp9/common/vp9_invtrans.h"
 #include "vp9/common/vp9_reconintra.h"
 #include "vpx_mem/vpx_mem.h"
-#include "vp9_rdopt.h"
+#include "vp9/encoder/vp9_rdopt.h"
 #include "vp9/common/vp9_systemdependent.h"
 #include "vp9_rtcd.h"
 
diff --git a/vp9/encoder/vp9_encodemb.h b/vp9/encoder/vp9_encodemb.h
index 3857c66485dd97b4eaf4503d51a6be4aebdd8266..b56dcece9e604f586fdcb2a592cfef9ac0640bad 100644
--- a/vp9/encoder/vp9_encodemb.h
+++ b/vp9/encoder/vp9_encodemb.h
@@ -13,7 +13,7 @@
 #define __INC_ENCODEMB_H
 
 #include "vpx_ports/config.h"
-#include "vp9_block.h"
+#include "vp9/encoder/vp9_block.h"
 
 typedef struct {
   MB_PREDICTION_MODE mode;
@@ -25,7 +25,7 @@ typedef struct {
 } MODE_DEFINITION;
 
 
-#include "vp9_onyx_int.h"
+#include "vp9/encoder/vp9_onyx_int.h"
 struct VP9_ENCODER_RTCD;
 void vp9_encode_inter16x16(MACROBLOCK *x);
 
diff --git a/vp9/encoder/vp9_encodemv.c b/vp9/encoder/vp9_encodemv.c
index 301fa24b1b2416b96c4e9d8d28b1c83bb2fc41c5..b2589c10705e02c2e647d8a167580f6ed7f9b703 100644
--- a/vp9/encoder/vp9_encodemv.c
+++ b/vp9/encoder/vp9_encodemv.c
@@ -10,7 +10,7 @@
 
 
 #include "vp9/common/vp9_common.h"
-#include "vp9_encodemv.h"
+#include "vp9/encoder/vp9_encodemv.h"
 #include "vp9/common/vp9_entropymode.h"
 #include "vp9/common/vp9_systemdependent.h"
 
diff --git a/vp9/encoder/vp9_encodemv.h b/vp9/encoder/vp9_encodemv.h
index f3589c147471819f63cdd5441ee038eedb727ec5..ac09bcbdfd76f4232ee0e67bbeb0d5c8744449e6 100644
--- a/vp9/encoder/vp9_encodemv.h
+++ b/vp9/encoder/vp9_encodemv.h
@@ -12,7 +12,7 @@
 #ifndef __INC_ENCODEMV_H
 #define __INC_ENCODEMV_H
 
-#include "vp9_onyx_int.h"
+#include "vp9/encoder/vp9_onyx_int.h"
 
 void vp9_write_nmv_probs(VP9_COMP* const, int usehp, vp9_writer* const);
 void vp9_encode_nmv(vp9_writer* const w, const MV* const mv,
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c
index 4a8f5ef2381eca1f3e7e25fa6f4698ed2fa4ea62..65476f2ed27bc166e8b3e307bb191754f472258f 100644
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -10,27 +10,27 @@
 
 #include "math.h"
 #include "limits.h"
-#include "vp9_block.h"
-#include "vp9_onyx_int.h"
-#include "vp9_variance.h"
-#include "vp9_encodeintra.h"
+#include "vp9/encoder/vp9_block.h"
+#include "vp9/encoder/vp9_onyx_int.h"
+#include "vp9/encoder/vp9_variance.h"
+#include "vp9/encoder/vp9_encodeintra.h"
 #include "vp9/common/vp9_setupintrarecon.h"
-#include "vp9_mcomp.h"
-#include "vp9_firstpass.h"
+#include "vp9/encoder/vp9_mcomp.h"
+#include "vp9/encoder/vp9_firstpass.h"
 #include "vpx_scale/vpxscale.h"
 #include "vp9/encoder/vp9_encodeframe.h"
-#include "vp9_encodemb.h"
+#include "vp9/encoder/vp9_encodemb.h"
 #include "vp9/common/vp9_extend.h"
 #include "vp9/common/vp9_systemdependent.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vp9/common/vp9_swapyv12buffer.h"
 #include <stdio.h>
 #include "vp9/encoder/vp9_quantize.h"
-#include "vp9_rdopt.h"
-#include "vp9_ratectrl.h"
+#include "vp9/encoder/vp9_rdopt.h"
+#include "vp9/encoder/vp9_ratectrl.h"
 #include "vp9/common/vp9_quant_common.h"
 #include "vp9/common/vp9_entropymv.h"
-#include "vp9_encodemv.h"
+#include "vp9/encoder/vp9_encodemv.h"
 
 #define OUTPUT_FPF 0
 
diff --git a/vp9/encoder/vp9_lookahead.c b/vp9/encoder/vp9_lookahead.c
index ae17656dc33b47f08e3b97bee247d1605da1e37a..a51c786563d98a55a3749f8f7c4a1a8ef1706d60 100644
--- a/vp9/encoder/vp9_lookahead.c
+++ b/vp9/encoder/vp9_lookahead.c
@@ -10,7 +10,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include "vpx_config.h"
-#include "vp9_lookahead.h"
+#include "vp9/encoder/vp9_lookahead.h"
 #include "vp9/common/vp9_extend.h"
 
 #define MAX_LAG_BUFFERS 25
diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c
index b9be68c79497aa081a3cd4f0a53c56ac8bc20a76..04ee3f6103f098dfe85e6646833bf56b66e2431b 100644
--- a/vp9/encoder/vp9_mcomp.c
+++ b/vp9/encoder/vp9_mcomp.c
@@ -10,7 +10,7 @@
 
 
 #include "vp9/encoder/vp9_onyx_int.h"
-#include "vp9_mcomp.h"
+#include "vp9/encoder/vp9_mcomp.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/config.h"
 #include <stdio.h>
diff --git a/vp9/encoder/vp9_mcomp.h b/vp9/encoder/vp9_mcomp.h
index 41ba3f8c7237f3c2edef8a4a711db567688311f6..81fe70c85483d9e4028efb5109523c0f9252bfdc 100644
--- a/vp9/encoder/vp9_mcomp.h
+++ b/vp9/encoder/vp9_mcomp.h
@@ -12,8 +12,8 @@
 #ifndef __INC_MCOMP_H
 #define __INC_MCOMP_H
 
-#include "vp9_block.h"
-#include "vp9_variance.h"
+#include "vp9/encoder/vp9_block.h"
+#include "vp9/encoder/vp9_variance.h"
 
 #ifdef ENTROPY_STATS
 extern void init_mv_ref_counts();
diff --git a/vp9/encoder/vp9_modecosts.c b/vp9/encoder/vp9_modecosts.c
index 5c2eeda84c6d69238d0da33bbde3a375d06bdb6e..7d9462f94aecb1d081c14b1eef8a78ade40f1ec3 100644
--- a/vp9/encoder/vp9_modecosts.c
+++ b/vp9/encoder/vp9_modecosts.c
@@ -10,8 +10,8 @@
 
 
 #include "vp9/common/vp9_blockd.h"
-#include "vp9_onyx_int.h"
-#include "vp9_treewriter.h"
+#include "vp9/encoder/vp9_onyx_int.h"
+#include "vp9/encoder/vp9_treewriter.h"
 #include "vp9/common/vp9_entropymode.h"
 
 
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c
index 31fc126eb9eefaeeb3590ed53b42af686a86a965..754096d36e2c8a38604a7848fd894ab092a3b4cb 100644
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -11,18 +11,18 @@
 
 #include "vpx_config.h"
 #include "vp9/common/vp9_onyxc_int.h"
-#include "vp9_onyx_int.h"
+#include "vp9/encoder/vp9_onyx_int.h"
 #include "vp9/common/vp9_systemdependent.h"
-#include "vp9_quantize.h"
+#include "vp9/encoder/vp9_quantize.h"
 #include "vp9/common/vp9_alloccommon.h"
-#include "vp9_mcomp.h"
-#include "vp9_firstpass.h"
-#include "vp9_psnr.h"
+#include "vp9/encoder/vp9_mcomp.h"
+#include "vp9/encoder/vp9_firstpass.h"
+#include "vp9/encoder/vp9_psnr.h"
 #include "vpx_scale/vpxscale.h"
 #include "vp9/common/vp9_extend.h"
-#include "vp9_ratectrl.h"
+#include "vp9/encoder/vp9_ratectrl.h"
 #include "vp9/common/vp9_quant_common.h"
-#include "vp9_segmentation.h"
+#include "vp9/encoder/vp9_segmentation.h"
 #include "./vp9_rtcd.h"
 #if CONFIG_POSTPROC
 #include "vp9/common/vp9_postproc.h"
@@ -32,12 +32,11 @@
 #include "vpx_ports/vpx_timer.h"
 
 #include "vp9/common/vp9_seg_common.h"
-#include "vp9_mbgraph.h"
+#include "vp9/encoder/vp9_mbgraph.h"
 #include "vp9/common/vp9_pred_common.h"
 #include "vp9/encoder/vp9_rdopt.h"
-#include "vp9_bitstream.h"
+#include "vp9/encoder/vp9_bitstream.h"
 #include "vp9/encoder/vp9_picklpf.h"
-#include "vp9_ratectrl.h"
 #include "vp9/common/vp9_mvref_common.h"
 
 
diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h
index 79b35b41e8726a3bd1a01406acdd05e4a9ac63f6..c71888e290c2bd14e3392b900dc9b84b3ec71bc5 100644
--- a/vp9/encoder/vp9_onyx_int.h
+++ b/vp9/encoder/vp9_onyx_int.h
@@ -15,19 +15,19 @@
 #include <stdio.h>
 #include "vpx_ports/config.h"
 #include "vp9/common/vp9_onyx.h"
-#include "vp9_treewriter.h"
-#include "vp9_tokenize.h"
+#include "vp9/encoder/vp9_treewriter.h"
+#include "vp9/encoder/vp9_tokenize.h"
 #include "vp9/common/vp9_onyxc_int.h"
-#include "vp9_variance.h"
-#include "vp9_encodemb.h"
-#include "vp9_quantize.h"
+#include "vp9/encoder/vp9_variance.h"
+#include "vp9/encoder/vp9_encodemb.h"
+#include "vp9/encoder/vp9_quantize.h"
 #include "vp9/common/vp9_entropy.h"
 #include "vp9/common/vp9_entropymode.h"
 #include "vpx_ports/mem.h"
 #include "vpx/internal/vpx_codec_internal.h"
-#include "vp9_mcomp.h"
+#include "vp9/encoder/vp9_mcomp.h"
 #include "vp9/common/vp9_findnearmv.h"
-#include "vp9_lookahead.h"
+#include "vp9/encoder/vp9_lookahead.h"
 
 // #define SPEEDSTATS 1
 #define MIN_GF_INTERVAL             4
diff --git a/vp9/encoder/vp9_picklpf.c b/vp9/encoder/vp9_picklpf.c
index 4c971e200c79b55d847723f55ba52b0a8239c1d2..395600ce27289626dda7459bfd96d0a175a251da 100644
--- a/vp9/encoder/vp9_picklpf.c
+++ b/vp9/encoder/vp9_picklpf.c
@@ -10,9 +10,9 @@
 
 
 #include "vp9/common/vp9_onyxc_int.h"
-#include "vp9_onyx_int.h"
+#include "vp9/encoder/vp9_onyx_int.h"
 #include "vp9/encoder/vp9_picklpf.h"
-#include "vp9_quantize.h"
+#include "vp9/encoder/vp9_quantize.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_scale/vpxscale.h"
 #include "vp9/common/vp9_alloccommon.h"
diff --git a/vp9/encoder/vp9_quantize.c b/vp9/encoder/vp9_quantize.c
index f3c2bcb89e32bd5901599dd554d1819269e7f1b7..d3cd8eb54940417f0329f98b68a00cbce93ff87c 100644
--- a/vp9/encoder/vp9_quantize.c
+++ b/vp9/encoder/vp9_quantize.c
@@ -11,8 +11,8 @@
 #include <math.h>
 #include "vpx_mem/vpx_mem.h"
 
-#include "vp9_onyx_int.h"
-#include "vp9_quantize.h"
+#include "vp9/encoder/vp9_onyx_int.h"
+#include "vp9/encoder/vp9_quantize.h"
 #include "vp9/common/vp9_quant_common.h"
 
 #include "vp9/common/vp9_seg_common.h"
diff --git a/vp9/encoder/vp9_quantize.h b/vp9/encoder/vp9_quantize.h
index a62e7723e376b4dbf0a0aa62e4c531dd64594978..5a0f7e0586f73af0e5ae4c3e48c1c094be184b00 100644
--- a/vp9/encoder/vp9_quantize.h
+++ b/vp9/encoder/vp9_quantize.h
@@ -11,7 +11,7 @@
 #ifndef __INC_QUANTIZE_H
 #define __INC_QUANTIZE_H
 
-#include "vp9_block.h"
+#include "vp9/encoder/vp9_block.h"
 
 #define prototype_quantize_block(sym) \
   void (sym)(BLOCK *b,BLOCKD *d)
diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c
index 0ceb4f6537a28ef2fff77f7884f75698a193fd61..1d72485474f26b491f67127ad7978f3fdbadad24 100644
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -19,11 +19,11 @@
 #include "vp9/common/vp9_alloccommon.h"
 #include "vp9/common/vp9_modecont.h"
 #include "vp9/common/vp9_common.h"
-#include "vp9_ratectrl.h"
+#include "vp9/encoder/vp9_ratectrl.h"
 #include "vp9/common/vp9_entropymode.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vp9/common/vp9_systemdependent.h"
-#include "vp9_encodemv.h"
+#include "vp9/encoder/vp9_encodemv.h"
 #include "vp9/common/vp9_quant_common.h"
 
 #define MIN_BPB_FACTOR          0.005
diff --git a/vp9/encoder/vp9_ratectrl.h b/vp9/encoder/vp9_ratectrl.h
index a64b8f927f9859b4f0c47e5691137b4c87955f7a..9d69607272197b75f2334c7428d3bdf064f8ae7e 100644
--- a/vp9/encoder/vp9_ratectrl.h
+++ b/vp9/encoder/vp9_ratectrl.h
@@ -11,7 +11,7 @@
 
 #if !defined __INC_RATECTRL_H
 
-#include "vp9_onyx_int.h"
+#include "vp9/encoder/vp9_onyx_int.h"
 
 #define FRAME_OVERHEAD_BITS 200
 
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index 017bf037763a6dd0a3559b3f54a3565a49a7670a..760593acb89992cfb705b0d0a147f4571917596c 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -15,23 +15,23 @@
 #include <assert.h>
 #include "vp9/common/vp9_pragmas.h"
 
-#include "vp9_tokenize.h"
-#include "vp9_treewriter.h"
-#include "vp9_onyx_int.h"
-#include "vp9_modecosts.h"
-#include "vp9_encodeintra.h"
+#include "vp9/encoder/vp9_tokenize.h"
+#include "vp9/encoder/vp9_treewriter.h"
+#include "vp9/encoder/vp9_onyx_int.h"
+#include "vp9/encoder/vp9_modecosts.h"
+#include "vp9/encoder/vp9_encodeintra.h"
 #include "vp9/common/vp9_entropymode.h"
 #include "vp9/common/vp9_reconinter.h"
 #include "vp9/common/vp9_reconintra.h"
 #include "vp9/common/vp9_reconintra4x4.h"
 #include "vp9/common/vp9_findnearmv.h"
 #include "vp9/common/vp9_quant_common.h"
-#include "vp9_encodemb.h"
-#include "vp9_quantize.h"
-#include "vp9_variance.h"
-#include "vp9_mcomp.h"
-#include "vp9_rdopt.h"
-#include "vp9_ratectrl.h"
+#include "vp9/encoder/vp9_encodemb.h"
+#include "vp9/encoder/vp9_quantize.h"
+#include "vp9/encoder/vp9_variance.h"
+#include "vp9/encoder/vp9_mcomp.h"
+#include "vp9/encoder/vp9_rdopt.h"
+#include "vp9/encoder/vp9_ratectrl.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vp9/common/vp9_systemdependent.h"
 #include "vp9/encoder/vp9_encodemv.h"
diff --git a/vp9/encoder/vp9_segmentation.c b/vp9/encoder/vp9_segmentation.c
index a9efff9f894896f48ae26588efe047f1b5fc0bf9..bebfdfa514848acf25f5bac3f2cd5590fcea4c06 100644
--- a/vp9/encoder/vp9_segmentation.c
+++ b/vp9/encoder/vp9_segmentation.c
@@ -11,7 +11,7 @@
 
 #include "limits.h"
 #include "vpx_mem/vpx_mem.h"
-#include "vp9_segmentation.h"
+#include "vp9/encoder/vp9_segmentation.h"
 #include "vp9/common/vp9_pred_common.h"
 
 void vp9_update_gf_useage_maps(VP9_COMP *cpi, VP9_COMMON *cm, MACROBLOCK *x) {
diff --git a/vp9/encoder/vp9_segmentation.h b/vp9/encoder/vp9_segmentation.h
index 3d963f1d5223db8437cbdd794ac519629f98c192..589c04bbd2253c82ceb2fffc2d488b047c936663 100644
--- a/vp9/encoder/vp9_segmentation.h
+++ b/vp9/encoder/vp9_segmentation.h
@@ -11,7 +11,7 @@
 
 #include "string.h"
 #include "vp9/common/vp9_blockd.h"
-#include "vp9_onyx_int.h"
+#include "vp9/encoder/vp9_onyx_int.h"
 
 #ifndef __INC_SEGMENTATION_H__
 #define __INC_SEGMENTATION_H__ 1
diff --git a/vp9/encoder/vp9_ssim.c b/vp9/encoder/vp9_ssim.c
index 71ea02e087f06d999f9e36baa55cd1667e92bec1..4cbb9149b74dd778ea96d4ded4c77ccecef6282b 100644
--- a/vp9/encoder/vp9_ssim.c
+++ b/vp9/encoder/vp9_ssim.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vp9_onyx_int.h"
+#include "vp9/encoder/vp9_onyx_int.h"
 
 void vp9_ssim_parms_16x16_c(unsigned char *s, int sp, unsigned char *r,
                             int rp, unsigned long *sum_s, unsigned long *sum_r,
diff --git a/vp9/encoder/vp9_temporal_filter.c b/vp9/encoder/vp9_temporal_filter.c
index c8fc6b7d0614b3e6f5886e5a2b33b27babfeae35..44f0a623e5e6173df725a16cb3bb3dc1b50f4594 100644
--- a/vp9/encoder/vp9_temporal_filter.c
+++ b/vp9/encoder/vp9_temporal_filter.c
@@ -10,18 +10,18 @@
 
 
 #include "vp9/common/vp9_onyxc_int.h"
-#include "vp9_onyx_int.h"
+#include "vp9/encoder/vp9_onyx_int.h"
 #include "vp9/common/vp9_systemdependent.h"
-#include "vp9_quantize.h"
+#include "vp9/encoder/vp9_quantize.h"
 #include "vp9/common/vp9_alloccommon.h"
-#include "vp9_mcomp.h"
-#include "vp9_firstpass.h"
-#include "vp9_psnr.h"
+#include "vp9/encoder/vp9_mcomp.h"
+#include "vp9/encoder/vp9_firstpass.h"
+#include "vp9/encoder/vp9_psnr.h"
 #include "vpx_scale/vpxscale.h"
 #include "vp9/common/vp9_extend.h"
-#include "vp9_ratectrl.h"
+#include "vp9/encoder/vp9_ratectrl.h"
 #include "vp9/common/vp9_quant_common.h"
-#include "vp9_segmentation.h"
+#include "vp9/encoder/vp9_segmentation.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vp9/common/vp9_swapyv12buffer.h"
 #include "vpx_ports/vpx_timer.h"
diff --git a/vp9/encoder/vp9_tokenize.c b/vp9/encoder/vp9_tokenize.c
index 1713cdb73cf09c6e75eb9242a6b52b8e0592369f..41b7f0edfd6a88590e1375dc671acb88fdee3667 100644
--- a/vp9/encoder/vp9_tokenize.c
+++ b/vp9/encoder/vp9_tokenize.c
@@ -13,8 +13,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
-#include "vp9_onyx_int.h"
-#include "vp9_tokenize.h"
+#include "vp9/encoder/vp9_onyx_int.h"
+#include "vp9/encoder/vp9_tokenize.h"
 #include "vpx_mem/vpx_mem.h"
 
 #include "vp9/common/vp9_pred_common.h"
diff --git a/vp9/encoder/vp9_tokenize.h b/vp9/encoder/vp9_tokenize.h
index e69d8f6333197809500673948cb0257243a86005..9ac26eb1c71b9b63e36ca417e9a1f7387d51d271 100644
--- a/vp9/encoder/vp9_tokenize.h
+++ b/vp9/encoder/vp9_tokenize.h
@@ -13,7 +13,7 @@
 #define tokenize_h
 
 #include "vp9/common/vp9_entropy.h"
-#include "vp9_block.h"
+#include "vp9/encoder/vp9_block.h"
 
 void vp9_tokenize_initialize();
 
diff --git a/vp9/encoder/vp9_treewriter.c b/vp9/encoder/vp9_treewriter.c
index 4bdf473dbcd8c75246af624e83d0dea3723830e1..8e252813cc0cebd4e96d17cb4a607949027fcb61 100644
--- a/vp9/encoder/vp9_treewriter.c
+++ b/vp9/encoder/vp9_treewriter.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vp9_treewriter.h"
+#include "vp9/encoder/vp9_treewriter.h"
 
 static void cost(
   int *const C,
diff --git a/vp9/encoder/vp9_treewriter.h b/vp9/encoder/vp9_treewriter.h
index d9198afcf47a48be7c12896066b462a0f9ba93ff..2175c744b68ebec57910dbac6c2b6d15b12adf58 100644
--- a/vp9/encoder/vp9_treewriter.h
+++ b/vp9/encoder/vp9_treewriter.h
@@ -17,7 +17,7 @@
 
 #include "vp9/common/vp9_treecoder.h"
 
-#include "vp9_boolhuff.h"       /* for now */
+#include "vp9/encoder/vp9_boolhuff.h"       /* for now */
 
 typedef BOOL_CODER vp9_writer;
 
diff --git a/vp9/encoder/vp9_variance_c.c b/vp9/encoder/vp9_variance_c.c
index 278c7ebbe6658bcff3c247c359237964e0c39119..a91cb122cd7384f43bb95cd01621a04c10511dc2 100644
--- a/vp9/encoder/vp9_variance_c.c
+++ b/vp9/encoder/vp9_variance_c.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vp9_variance.h"
+#include "vp9/encoder/vp9_variance.h"
 #include "vp9/common/vp9_filter.h"
 #include "vp9/common/vp9_subpelvar.h"
 #include "vpx/vpx_integer.h"