#include "vpx_ports/mem.h"
#include "vpx_scale/yv12config.h"
-#include "vp10/common/vp9_common_data.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_mv.h"
-#include "vp10/common/vp9_scale.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_tile_common.h"
+#include "vp10/common/common_data.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/mv.h"
+#include "vp10/common/scale.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/tile_common.h"
#ifdef __cplusplus
extern "C" {