diff --git a/aom_dsp/psnr.c b/aom_dsp/psnr.c
index d3fe316325e366eabba27fdff32f4cc280f19371..937886371ef891b1a9d6158f7a542cb13ffec865 100644
--- a/aom_dsp/psnr.c
+++ b/aom_dsp/psnr.c
@@ -198,9 +198,9 @@ int64_t aom_highbd_get_y_sse(const YV12_BUFFER_CONFIG *a,
                         a->y_crop_width, a->y_crop_height);
 }
 
-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 aom_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] = {a->y_crop_height, a->uv_crop_height,
                           a->uv_crop_height};
@@ -246,8 +246,8 @@ void calc_highbd_psnr(const YV12_BUFFER_CONFIG *a, const YV12_BUFFER_CONFIG *b,
 
 #endif
 
-void calc_psnr(const YV12_BUFFER_CONFIG *a, const YV12_BUFFER_CONFIG *b,
-               PSNR_STATS *psnr) {
+void aom_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};
   const int heights[3] = {a->y_crop_height, a->uv_crop_height,
diff --git a/aom_dsp/psnr.h b/aom_dsp/psnr.h
index 21c96c967310defb87f023a6b576e89bfca77a50..ab9c3614bfd47e7ec798ab02cbd69aa89c56d394 100644
--- a/aom_dsp/psnr.h
+++ b/aom_dsp/psnr.h
@@ -36,25 +36,21 @@ typedef struct {
 */
 double aom_sse_to_psnr(double samples, double peak, double sse);
 int64_t aom_get_y_sse(const YV12_BUFFER_CONFIG *a, const YV12_BUFFER_CONFIG *b);
+
 #if CONFIG_AOM_HIGHBITDEPTH
 int64_t aom_highbd_get_y_sse(const YV12_BUFFER_CONFIG *a,
                              const YV12_BUFFER_CONFIG *b);
-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);
-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);
+
+void aom_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);
 #endif
-void calc_psnr(const YV12_BUFFER_CONFIG *a, const YV12_BUFFER_CONFIG *b,
-               PSNR_STATS *psnr);
+void aom_calc_psnr(const YV12_BUFFER_CONFIG *a, const YV12_BUFFER_CONFIG *b,
+                   PSNR_STATS *psnr);
 
 double aom_psnrhvs(const YV12_BUFFER_CONFIG *source,
                    const YV12_BUFFER_CONFIG *dest, 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
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index e4a4e83a46dc752a5f5627ca8ce9e2ed47b175b9..82ee837931d9847c6952c1b3de02d9c35b2e06bf 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -1856,10 +1856,10 @@ static void generate_psnr_packet(AV1_COMP *cpi) {
   int i;
   PSNR_STATS psnr;
 #if CONFIG_AOM_HIGHBITDEPTH
-  calc_highbd_psnr(cpi->Source, cpi->common.frame_to_show, &psnr,
-                   cpi->td.mb.e_mbd.bd, cpi->oxcf.input_bit_depth);
+  aom_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);
+  aom_calc_psnr(cpi->Source, cpi->common.frame_to_show, &psnr);
 #endif
 
   for (i = 0; i < 4; ++i) {
@@ -3538,9 +3538,9 @@ static void compute_internal_stats(AV1_COMP *cpi) {
       aom_clear_system_state();
 // TODO(yaowu): unify these two versions into one.
 #if CONFIG_AOM_HIGHBITDEPTH
-      calc_highbd_psnr(orig, recon, &psnr, cpi->td.mb.e_mbd.bd, in_bit_depth);
+      aom_calc_highbd_psnr(orig, recon, &psnr, bit_depth, in_bit_depth);
 #else
-      calc_psnr(orig, recon, &psnr);
+      aom_calc_psnr(orig, recon, &psnr);
 #endif  // CONFIG_AOM_HIGHBITDEPTH
 
       adjust_image_stat(psnr.psnr[1], psnr.psnr[2], psnr.psnr[3], psnr.psnr[0],
diff --git a/test/hbd_metrics_test.cc b/test/hbd_metrics_test.cc
index d2a8f66677ad947c48e6e7bf1fba08fb48d2fddb..792638552ae93ade4ef89eaa51f34ff88ebd0d53 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);
+  aom_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);
+  aom_calc_psnr(source, dest, &psnr);
   return psnr.psnr[0];
 }