diff --git a/test/hbd_metrics_test.cc b/test/hbd_metrics_test.cc
index 55cb71c069af6365a331882a17232856f423f452..048c3de23f77598555e55a4acd85ea9ff6963bc2 100644
--- a/test/hbd_metrics_test.cc
+++ b/test/hbd_metrics_test.cc
@@ -37,14 +37,14 @@ double compute_hbd_psnr(const YV12_BUFFER_CONFIG *source,
                         const YV12_BUFFER_CONFIG *dest,
                         uint32_t in_bd, uint32_t bd) {
   PSNR_STATS psnr;
-  calc_highbd_psnr(source, dest, &psnr, bd, in_bd);
+  vpx_calc_highbd_psnr(source, dest, &psnr, bd, in_bd);
   return psnr.psnr[0];
 }
 
 double compute_psnr(const YV12_BUFFER_CONFIG *source,
   const YV12_BUFFER_CONFIG *dest) {
   PSNR_STATS psnr;
-  calc_psnr(source, dest, &psnr);
+  vpx_calc_psnr(source, dest, &psnr);
   return psnr.psnr[0];
 }
 
diff --git a/vp10/encoder/encoder.c b/vp10/encoder/encoder.c
index dd9c06765998e650f1e805b44281186d9207de0a..5cc6dca7ad857436711ce4872ceedf0cba26ab2b 100644
--- a/vp10/encoder/encoder.c
+++ b/vp10/encoder/encoder.c
@@ -2039,10 +2039,10 @@ static void generate_psnr_packet(VP10_COMP *cpi) {
   int i;
   PSNR_STATS psnr;
 #if CONFIG_VP9_HIGHBITDEPTH
-  calc_highbd_psnr(cpi->Source, cpi->common.frame_to_show, &psnr,
-                   cpi->td.mb.e_mbd.bd, cpi->oxcf.input_bit_depth);
+  vpx_calc_highbd_psnr(cpi->Source, cpi->common.frame_to_show, &psnr,
+                       cpi->td.mb.e_mbd.bd, cpi->oxcf.input_bit_depth);
 #else
-  calc_psnr(cpi->Source, cpi->common.frame_to_show, &psnr);
+  vpx_calc_psnr(cpi->Source, cpi->common.frame_to_show, &psnr);
 #endif
 
   for (i = 0; i < 4; ++i) {
@@ -3938,9 +3938,9 @@ static void compute_internal_stats(VP10_COMP *cpi) {
       vpx_clear_system_state();
       // TODO(yaowu): unify these two versions into one.
 #if CONFIG_VP9_HIGHBITDEPTH
-      calc_highbd_psnr(orig, recon, &psnr, cpi->td.mb.e_mbd.bd, in_bit_depth);
+      vpx_calc_highbd_psnr(orig, recon, &psnr, bit_depth, in_bit_depth);
 #else
-      calc_psnr(orig, recon, &psnr);
+      vpx_calc_psnr(orig, recon, &psnr);
 #endif  // CONFIG_VP9_HIGHBITDEPTH
 
       adjust_image_stat(psnr.psnr[1], psnr.psnr[2], psnr.psnr[3],
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
index 5984ec82bcb00322640e5086a3054399f6f90866..d407f5e5337a2074f70644584fb7d2d2efcaa41d 100644
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -2145,10 +2145,10 @@ static void generate_psnr_packet(VP9_COMP *cpi) {
   int i;
   PSNR_STATS psnr;
 #if CONFIG_VP9_HIGHBITDEPTH
-  calc_highbd_psnr(cpi->Source, cpi->common.frame_to_show, &psnr,
-                   cpi->td.mb.e_mbd.bd, cpi->oxcf.input_bit_depth);
+  vpx_calc_highbd_psnr(cpi->Source, cpi->common.frame_to_show, &psnr,
+                       cpi->td.mb.e_mbd.bd, cpi->oxcf.input_bit_depth);
 #else
-  calc_psnr(cpi->Source, cpi->common.frame_to_show, &psnr);
+  vpx_calc_psnr(cpi->Source, cpi->common.frame_to_show, &psnr);
 #endif
 
   for (i = 0; i < 4; ++i) {
@@ -4329,10 +4329,10 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
         YV12_BUFFER_CONFIG *pp = &cm->post_proc_buffer;
         PSNR_STATS psnr;
 #if CONFIG_VP9_HIGHBITDEPTH
-        calc_highbd_psnr(orig, recon, &psnr, cpi->td.mb.e_mbd.bd,
-                         in_bit_depth);
+        vpx_calc_highbd_psnr(orig, recon, &psnr, cpi->td.mb.e_mbd.bd,
+                             in_bit_depth);
 #else
-        calc_psnr(orig, recon, &psnr);
+        vpx_calc_psnr(orig, recon, &psnr);
 #endif  // CONFIG_VP9_HIGHBITDEPTH
 
         adjust_image_stat(psnr.psnr[1], psnr.psnr[2], psnr.psnr[3],
@@ -4363,10 +4363,10 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
           vpx_clear_system_state();
 
 #if CONFIG_VP9_HIGHBITDEPTH
-          calc_highbd_psnr(orig, pp, &psnr2, cpi->td.mb.e_mbd.bd,
+          vpx_calc_highbd_psnr(orig, pp, &psnr2, cpi->td.mb.e_mbd.bd,
                            cpi->oxcf.input_bit_depth);
 #else
-          calc_psnr(orig, pp, &psnr2);
+          vpx_calc_psnr(orig, pp, &psnr2);
 #endif  // CONFIG_VP9_HIGHBITDEPTH
 
           cpi->totalp_sq_error += psnr2.sse[0];
diff --git a/vpx_dsp/psnr.c b/vpx_dsp/psnr.c
index 1b92e2ab4aa5ab3c154a9b3f51d219aaa76b58ca..1655f116c09dd01a69fc62bfd50137f99dc52c98 100644
--- a/vpx_dsp/psnr.c
+++ b/vpx_dsp/psnr.c
@@ -125,10 +125,10 @@ static int64_t get_sse(const uint8_t *a, int a_stride,
 }
 
 #if CONFIG_VP9_HIGHBITDEPTH
-int64_t highbd_get_sse_shift(const uint8_t *a8, int a_stride,
-  const uint8_t *b8, int b_stride,
-  int width, int height,
-  unsigned int input_shift) {
+static int64_t highbd_get_sse_shift(const uint8_t *a8, int a_stride,
+                                    const uint8_t *b8, int b_stride,
+                                    int width, int height,
+                                    unsigned int input_shift) {
   const uint16_t *a = CONVERT_TO_SHORTPTR(a8);
   const uint16_t *b = CONVERT_TO_SHORTPTR(b8);
   int64_t total_sse = 0;
@@ -145,9 +145,9 @@ int64_t highbd_get_sse_shift(const uint8_t *a8, int a_stride,
   return total_sse;
 }
 
-int64_t highbd_get_sse(const uint8_t *a, int a_stride,
-  const uint8_t *b, int b_stride,
-  int width, int height) {
+static int64_t highbd_get_sse(const uint8_t *a, int a_stride,
+                              const uint8_t *b, int b_stride,
+                              int width, int height) {
   int64_t total_sse = 0;
   int x, y;
   const int dw = width % 16;
@@ -206,11 +206,10 @@ int64_t vpx_highbd_get_y_sse(const YV12_BUFFER_CONFIG *a,
 #endif  // CONFIG_VP9_HIGHBITDEPTH
 
 #if CONFIG_VP9_HIGHBITDEPTH
-void calc_highbd_psnr(const YV12_BUFFER_CONFIG *a,
-  const YV12_BUFFER_CONFIG *b,
-  PSNR_STATS *psnr,
-  unsigned int bit_depth,
-  unsigned int in_bit_depth) {
+void vpx_calc_highbd_psnr(const YV12_BUFFER_CONFIG *a,
+                          const YV12_BUFFER_CONFIG *b,
+                          PSNR_STATS *psnr, uint32_t bit_depth,
+                          uint32_t in_bit_depth) {
   const int widths[3] =
   { a->y_crop_width, a->uv_crop_width, a->uv_crop_width };
   const int heights[3] =
@@ -260,8 +259,8 @@ void calc_highbd_psnr(const YV12_BUFFER_CONFIG *a,
 
 #endif  // !CONFIG_VP9_HIGHBITDEPTH
 
-void calc_psnr(const YV12_BUFFER_CONFIG *a, const YV12_BUFFER_CONFIG *b,
-  PSNR_STATS *psnr) {
+void vpx_calc_psnr(const YV12_BUFFER_CONFIG *a, const YV12_BUFFER_CONFIG *b,
+                   PSNR_STATS *psnr) {
   static const double peak = 255.0;
   const int widths[3] = {
     a->y_crop_width, a->uv_crop_width, a->uv_crop_width };
diff --git a/vpx_dsp/psnr.h b/vpx_dsp/psnr.h
index 14d256fcfac5ea6e5bd06d9bafe91b9936d9f560..e25b4504af84445dd3d2fb55ca35041c71f0deeb 100644
--- a/vpx_dsp/psnr.h
+++ b/vpx_dsp/psnr.h
@@ -42,17 +42,13 @@ int64_t vpx_get_y_sse(const YV12_BUFFER_CONFIG *a,
 #if CONFIG_VP9_HIGHBITDEPTH
 int64_t vpx_highbd_get_y_sse(const YV12_BUFFER_CONFIG *a,
                              const YV12_BUFFER_CONFIG *b);
-void calc_highbd_psnr(const YV12_BUFFER_CONFIG *a,
+void vpx_calc_highbd_psnr(const YV12_BUFFER_CONFIG *a,
                       const YV12_BUFFER_CONFIG *b,
                       PSNR_STATS *psnr,
                       unsigned int bit_depth,
                       unsigned int in_bit_depth);
-int64_t highbd_get_sse_shift(const uint8_t *a8, int a_stride,
-                             const uint8_t *b8, int b_stride,
-                             int width, int height,
-                             unsigned int input_shift);
 #endif
-void calc_psnr(const YV12_BUFFER_CONFIG *a,
+void vpx_calc_psnr(const YV12_BUFFER_CONFIG *a,
                const YV12_BUFFER_CONFIG *b,
                PSNR_STATS *psnr);
 
@@ -61,9 +57,6 @@ double vpx_psnrhvs(const YV12_BUFFER_CONFIG *source,
                    double *phvs_y, double *phvs_u,
                    double *phvs_v, uint32_t bd, uint32_t in_bd);
 
-int64_t highbd_get_sse(const uint8_t *a, int a_stride,
-                       const uint8_t *b, int b_stride,
-                       int width, int height);
 #ifdef __cplusplus
 }  // extern "C"
 #endif