#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