diff --git a/vp9/common/mips/dspr2/vp9_convolve2_dspr2.c b/vp9/common/mips/dspr2/vp9_convolve2_dspr2.c
index bc422bcf1..6474ec786 100644
--- a/vp9/common/mips/dspr2/vp9_convolve2_dspr2.c
+++ b/vp9/common/mips/dspr2/vp9_convolve2_dspr2.c
@@ -16,7 +16,7 @@
 #include "vp9/common/vp9_common.h"
 #include "vpx/vpx_integer.h"
 #include "vpx_ports/mem.h"
-#include "vp9/common/vp9_convolve.h"
+#include "vp9/common/vp9_filter.h"
 #include "vp9/common/mips/dspr2/vp9_common_dspr2.h"
 
 #if HAVE_DSPR2
diff --git a/vp9/common/mips/dspr2/vp9_convolve8_dspr2.c b/vp9/common/mips/dspr2/vp9_convolve8_dspr2.c
index 126e05a67..0ef9dd508 100644
--- a/vp9/common/mips/dspr2/vp9_convolve8_dspr2.c
+++ b/vp9/common/mips/dspr2/vp9_convolve8_dspr2.c
@@ -16,7 +16,7 @@
 #include "vp9/common/vp9_common.h"
 #include "vpx/vpx_integer.h"
 #include "vpx_ports/mem.h"
-#include "vp9/common/vp9_convolve.h"
+#include "vp9/common/vp9_filter.h"
 #include "vp9/common/mips/dspr2/vp9_common_dspr2.h"
 
 #if HAVE_DSPR2
diff --git a/vp9/common/vp9_convolve.h b/vp9/common/vp9_convolve.h
index 9a5caa662..29d499063 100644
--- a/vp9/common/vp9_convolve.h
+++ b/vp9/common/vp9_convolve.h
@@ -13,8 +13,6 @@
 #include "./vpx_config.h"
 #include "vpx/vpx_integer.h"
 
-#define FILTER_BITS 7
-
 typedef void (*convolve_fn_t)(const uint8_t *src, ptrdiff_t src_stride,
                               uint8_t *dst, ptrdiff_t dst_stride,
                               const int16_t *filter_x, int x_step_q4,
diff --git a/vp9/common/vp9_filter.h b/vp9/common/vp9_filter.h
index 36d19a76d..302945374 100644
--- a/vp9/common/vp9_filter.h
+++ b/vp9/common/vp9_filter.h
@@ -14,6 +14,8 @@
 #include "./vpx_config.h"
 #include "vpx/vpx_integer.h"
 
+#define FILTER_BITS 7
+
 #define SUBPEL_BITS 4
 #define SUBPEL_MASK ((1 << SUBPEL_BITS) - 1)
 #define SUBPEL_SHIFTS (1 << SUBPEL_BITS)
diff --git a/vp9/encoder/vp9_variance_c.c b/vp9/encoder/vp9_variance_c.c
index 991ef4d29..cfda7119f 100644
--- a/vp9/encoder/vp9_variance_c.c
+++ b/vp9/encoder/vp9_variance_c.c
@@ -14,8 +14,8 @@
 #include "vpx/vpx_integer.h"
 
 #include "vp9/common/vp9_common.h"
-#include "vp9/common/vp9_convolve.h"
 #include "vp9/common/vp9_filter.h"
+
 #include "vp9/encoder/vp9_variance.h"
 
 static void variance(const uint8_t *src_ptr,