diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index 4d035ae..e345ba4 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -417,7 +417,8 @@
       { av1_quantize_dc_facade, av1_highbd_quantize_dc_facade },
       { NULL, NULL } };
 
-#else
+#elif !CONFIG_PVQ
+
 typedef enum QUANT_FUNC {
   QUANT_FUNC_LOWBD = 0,
   QUANT_FUNC_LAST = 1
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index c8841e3..fa497cb 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4565,8 +4565,9 @@
     for (idx = 0; idx < width / 4; idx += num_4x4_w) {
       int64_t dist, ssz, rd, rd1, rd2;
       int block;
+#if !CONFIG_PVQ
       int coeff_ctx;
-#if CONFIG_PVQ
+#else
       const int src_stride = p->src.stride;
       const int dst_stride = pd->dst.stride;
       const int diff_stride = 8;