#include "vpx_ports/mem.h"
-#include "vp10/encoder/vp9_aq_variance.h"
+#include "vp10/encoder/aq_variance.h"
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/seg_common.h"
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_rd.h"
-#include "vp10/encoder/vp9_segmentation.h"
-#include "vp10/common/vp9_systemdependent.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/rd.h"
+#include "vp10/encoder/segmentation.h"
+#include "vp10/common/systemdependent.h"
#define ENERGY_MIN (-4)
#define ENERGY_MAX (1)