diff --git a/av1/common/common_data.h b/av1/common/common_data.h
index 0eeefcb..4b2f34f 100644
--- a/av1/common/common_data.h
+++ b/av1/common/common_data.h
@@ -293,56 +293,6 @@
   2,
   IF_EXT_PARTITION(16, 4)
 };
-static const uint8_t num_16x16_blocks_wide_lookup[BLOCK_SIZES_ALL] = {
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  2,
-  2,
-  2,
-  4,
-  4,
-  IF_EXT_PARTITION(4, 8, 8) 1,
-  1,
-  1,
-  2,
-  2,
-  4,
-  IF_EXT_PARTITION(2, 8)
-};
-static const uint8_t num_16x16_blocks_high_lookup[BLOCK_SIZES_ALL] = {
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  2,
-  1,
-  2,
-  4,
-  2,
-  4,
-  IF_EXT_PARTITION(8, 4, 8) 1,
-  1,
-  2,
-  1,
-  4,
-  2,
-  IF_EXT_PARTITION(8, 2)
-};
 
 // AOMMIN(3, AOMMIN(b_width_log2(bsize), b_height_log2(bsize)))
 static const uint8_t size_group_lookup[BLOCK_SIZES_ALL] = {
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 9910a26..ca081d6 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -146,6 +146,59 @@
 };
 #endif  // CONFIG_HIGHBITDEPTH
 
+#if CONFIG_FP_MB_STATS
+static const uint8_t num_16x16_blocks_wide_lookup[BLOCK_SIZES_ALL] = {
+  1,
+  1,
+  1,
+  1,
+  1,
+  1,
+  1,
+  1,
+  1,
+  1,
+  1,
+  2,
+  2,
+  2,
+  4,
+  4,
+  IF_EXT_PARTITION(4, 8, 8) 1,
+  1,
+  1,
+  2,
+  2,
+  4,
+  IF_EXT_PARTITION(2, 8)
+};
+static const uint8_t num_16x16_blocks_high_lookup[BLOCK_SIZES_ALL] = {
+  1,
+  1,
+  1,
+  1,
+  1,
+  1,
+  1,
+  1,
+  1,
+  1,
+  2,
+  1,
+  2,
+  4,
+  2,
+  4,
+  IF_EXT_PARTITION(8, 4, 8) 1,
+  1,
+  2,
+  1,
+  4,
+  2,
+  IF_EXT_PARTITION(8, 2)
+};
+#endif  // CONFIG_FP_MB_STATS
+
 unsigned int av1_get_sby_perpixel_variance(const AV1_COMP *cpi,
                                            const struct buf_2d *ref,
                                            BLOCK_SIZE bs) {