diff --git a/vp10/common/dering.c b/vp10/common/dering.c
index b7c9844a2e4eec62140d3da5a509747775bedb74..6e8fdc297defec3a331f2189d9d93144d3db1b34 100644
--- a/vp10/common/dering.c
+++ b/vp10/common/dering.c
@@ -50,7 +50,7 @@ void vp10_dering_frame(YV12_BUFFER_CONFIG *frame, VP10_COMMON *cm,
   int r, c;
   int sbr, sbc;
   int nhsb, nvsb;
-  dering_in *src[3];
+  od_dering_in *src[3];
   unsigned char *bskip;
   int dir[OD_DERING_NBLOCKS][OD_DERING_NBLOCKS] = {{0}};
   int stride;
diff --git a/vp10/common/od_dering.c b/vp10/common/od_dering.c
index be6d48e23ab53035a31abbcb5eef20f6b6c16547..66eecea60e733d0e1082f99598595b989ae24cdf 100644
--- a/vp10/common/od_dering.c
+++ b/vp10/common/od_dering.c
@@ -58,7 +58,7 @@ const double OD_DERING_GAIN_TABLE[OD_DERING_LEVELS] = {
    in a particular direction. Since each direction have the same sum(x^2) term,
    that term is never computed. See Section 2, step 2, of:
    http://jmvalin.ca/notes/intra_paint.pdf */
-static int od_dir_find8(const dering_in *img, int stride, int32_t *var,
+static int od_dir_find8(const od_dering_in *img, int stride, int32_t *var,
     int coeff_shift) {
   int i;
   int cost[8] = {0};
@@ -160,7 +160,7 @@ void od_filter_dering_direction_8x8_c(int16_t *y, int ystride,
 
 /* Smooth in the direction orthogonal to what was detected. */
 void od_filter_dering_orthogonal_c(int16_t *y, int ystride, const int16_t *in,
- const dering_in *x, int xstride, int ln, int threshold, int dir) {
+ const od_dering_in *x, int xstride, int ln, int threshold, int dir) {
   int i;
   int j;
   int offset;
@@ -198,12 +198,14 @@ void od_filter_dering_orthogonal_c(int16_t *y, int ystride, const int16_t *in,
 }
 
 void od_filter_dering_orthogonal_4x4_c(int16_t *y, int ystride,
- const int16_t *in, const dering_in *x, int xstride, int threshold, int dir) {
+ const int16_t *in, const od_dering_in *x, int xstride, int threshold,
+ int dir) {
   od_filter_dering_orthogonal_c(y, ystride, in, x, xstride, 2, threshold, dir);
 }
 
 void od_filter_dering_orthogonal_8x8_c(int16_t *y, int ystride,
- const int16_t *in, const dering_in *x, int xstride, int threshold, int dir) {
+ const int16_t *in, const od_dering_in *x, int xstride, int threshold,
+ int dir) {
   od_filter_dering_orthogonal_c(y, ystride, in, x, xstride, 3, threshold, dir);
 }
 
@@ -238,9 +240,9 @@ static void od_compute_thresh(int thresh[OD_DERING_NBLOCKS][OD_DERING_NBLOCKS],
 }
 
 void od_dering(const od_dering_opt_vtbl *vtbl, int16_t *y, int ystride,
- const dering_in *x, int xstride, int nhb, int nvb, int sbx, int sby, int nhsb,
- int nvsb, int xdec, int dir[OD_DERING_NBLOCKS][OD_DERING_NBLOCKS], int pli,
- unsigned char *bskip, int skip_stride, int threshold, int overlap,
+ const od_dering_in *x, int xstride, int nhb, int nvb, int sbx, int sby,
+ int nhsb, int nvsb, int xdec, int dir[OD_DERING_NBLOCKS][OD_DERING_NBLOCKS],
+ int pli, unsigned char *bskip, int skip_stride, int threshold, int overlap,
  int coeff_shift) {
   int i;
   int j;
diff --git a/vp10/common/od_dering.h b/vp10/common/od_dering.h
index 1a77ce0ba5a71a8d61f1fac15a420bb4617a7305..24127dd973054c9b432d4d9d8ef093b83582cab4 100644
--- a/vp10/common/od_dering.h
+++ b/vp10/common/od_dering.h
@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/
 
 # if defined(DAALA_ODINTRIN)
 #  include "filter.h"
-typedef int16_t dering_in;
+typedef int16_t od_dering_in;
 # endif
 
 #define OD_DERINGSIZES (2)
@@ -50,7 +50,8 @@ extern const int OD_DIRECTION_OFFSETS_TABLE[8][3];
 typedef void (*od_filter_dering_direction_func)(int16_t *y, int ystride,
  const int16_t *in, int threshold, int dir);
 typedef void (*od_filter_dering_orthogonal_func)(int16_t *y, int ystride,
- const int16_t *in, const dering_in *x, int xstride, int threshold, int dir);
+ const int16_t *in, const od_dering_in *x, int xstride, int threshold,
+ int dir);
 
 struct od_dering_opt_vtbl {
   od_filter_dering_direction_func filter_dering_direction[OD_DERINGSIZES];
@@ -60,14 +61,14 @@ typedef struct od_dering_opt_vtbl od_dering_opt_vtbl;
 
 
 void od_dering(const od_dering_opt_vtbl *vtbl, int16_t *y, int ystride,
- const dering_in *x, int xstride, int nvb, int nhb, int sbx, int sby, int nhsb,
- int nvsb, int xdec, int dir[OD_DERING_NBLOCKS][OD_DERING_NBLOCKS], int pli,
- unsigned char *bskip, int skip_stride, int threshold, int overlap,
+ const od_dering_in *x, int xstride, int nvb, int nhb, int sbx, int sby,
+ int nhsb, int nvsb, int xdec, int dir[OD_DERING_NBLOCKS][OD_DERING_NBLOCKS],
+ int pli, unsigned char *bskip, int skip_stride, int threshold, int overlap,
  int coeff_shift);
 void od_filter_dering_direction_c(int16_t *y, int ystride, const int16_t *in,
  int ln, int threshold, int dir);
 void od_filter_dering_orthogonal_c(int16_t *y, int ystride, const int16_t *in,
- const dering_in *x, int xstride, int ln, int threshold, int dir);
+ const od_dering_in *x, int xstride, int ln, int threshold, int dir);
 
 extern const od_dering_opt_vtbl OD_DERING_VTBL_C;
 
@@ -76,8 +77,10 @@ void od_filter_dering_direction_4x4_c(int16_t *y, int ystride,
 void od_filter_dering_direction_8x8_c(int16_t *y, int ystride,
  const int16_t *in, int threshold, int dir);
 void od_filter_dering_orthogonal_4x4_c(int16_t *y, int ystride,
- const int16_t *in, const dering_in *x, int xstride, int threshold, int dir);
+ const int16_t *in, const od_dering_in *x, int xstride, int threshold,
+ int dir);
 void od_filter_dering_orthogonal_8x8_c(int16_t *y, int ystride,
- const int16_t *in, const dering_in *x, int xstride, int threshold, int dir);
+ const int16_t *in, const od_dering_in *x, int xstride, int threshold,
+ int dir);
 
 #endif
diff --git a/vp10/common/odintrin.h b/vp10/common/odintrin.h
index bb94e1e981eaab6434c20dbc46c586a0e3725130..c81d37d3c9d71ec7ef319a471280876806b29142 100644
--- a/vp10/common/odintrin.h
+++ b/vp10/common/odintrin.h
@@ -17,7 +17,7 @@
 
 typedef int od_coeff;
 
-typedef int16_t dering_in;
+typedef int16_t od_dering_in;
 
 #define OD_DIVU_SMALL(_x, _d) ((_x) / (_d))
 
diff --git a/vp10/encoder/pickdering.c b/vp10/encoder/pickdering.c
index 479ce0c1679bd1dbd0bad1ce61598feba3f0a3fb..556580a3edb87d05109e61276f612e821bfb8dff 100644
--- a/vp10/encoder/pickdering.c
+++ b/vp10/encoder/pickdering.c
@@ -38,7 +38,7 @@ int vp10_dering_search(YV12_BUFFER_CONFIG *frame, const YV12_BUFFER_CONFIG *ref,
   int r, c;
   int sbr, sbc;
   int nhsb, nvsb;
-  dering_in *src;
+  od_dering_in *src;
   int16_t *ref_coeff;
   unsigned char *bskip;
   int dir[OD_DERING_NBLOCKS][OD_DERING_NBLOCKS] = {{0}};