diff --git a/aom_dsp/aom_dsp.cmake b/aom_dsp/aom_dsp.cmake
index 5a49ae8..a8bd85a 100644
--- a/aom_dsp/aom_dsp.cmake
+++ b/aom_dsp/aom_dsp.cmake
@@ -330,6 +330,13 @@
         "${AOM_ROOT}/aom_dsp/mips/variance_msa.c"
         "${AOM_ROOT}/aom_dsp/mips/sub_pixel_variance_msa.c")
 
+    if (CONFIG_EXT_INTER)
+      set(AOM_DSP_ENCODER_INTRIN_SSSE3
+          ${AOM_DSP_ENCODER_INTRIN_SSSE3}
+          "${AOM_ROOT}/aom_dsp/x86/masked_sad_intrin_ssse3.c"
+          "${AOM_ROOT}/aom_dsp/x86/masked_variance_intrin_ssse3.c")
+    endif ()
+
     if (CONFIG_HIGHBITDEPTH)
       set(AOM_DSP_ENCODER_INTRIN_SSE2
           ${AOM_DSP_ENCODER_INTRIN_SSE2}
@@ -448,6 +455,11 @@
              ${AOM_DSP_ENCODER_ASM_SSSE3_X86_64})
       endif ()
       add_asm_library("aom_dsp_encoder_ssse3" "AOM_DSP_ENCODER_ASM_SSSE3" "aom")
+
+      if (AOM_DSP_ENCODER_INTRIN_SSSE3)
+        add_intrinsics_object_library("-mssse3" "ssse3" "aom_dsp_encoder"
+                                      "AOM_DSP_ENCODER_INTRIN_SSSE3")
+      endif ()
     endif ()
   endif ()
 
diff --git a/av1/av1.cmake b/av1/av1.cmake
index 56412c9..84f141e 100644
--- a/av1/av1.cmake
+++ b/av1/av1.cmake
@@ -190,9 +190,9 @@
     "${AOM_ROOT}/av1/encoder/x86/dct_ssse3.c")
 
 set(AOM_AV1_ENCODER_INTRIN_AVX2
+    "${AOM_ROOT}/av1/encoder/x86/av1_quantize_avx2.c"
     "${AOM_ROOT}/av1/encoder/x86/error_intrin_avx2.c"
     "${AOM_ROOT}/av1/encoder/x86/hybrid_fwd_txfm_avx2.c")
-
 set(AOM_AV1_ENCODER_INTRIN_NEON
     "${AOM_ROOT}/av1/encoder/arm/neon/quantize_neon.c")
 
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index a986f95..0dc24c8 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -83,12 +83,12 @@
 set(CONFIG_HIGHBITDEPTH 1 CACHE BOOL "Internal flag.")
 set(CONFIG_EXPERIMENTAL 0 CACHE BOOL "Internal flag.")
 set(CONFIG_SIZE_LIMIT 0 CACHE BOOL "Internal flag.")
+set(CONFIG_COLORSPACE_HEADERS 0 CACHE BOOL "Internal flag.")
 set(CONFIG_FP_MB_STATS 0 CACHE BOOL "Internal flag.")
 set(CONFIG_CDEF 1 CACHE BOOL "Internal flag.")
 set(CONFIG_VAR_TX 1 CACHE BOOL "Internal flag.")
 set(CONFIG_RECT_TX 1 CACHE BOOL "Internal flag.")
 set(CONFIG_RECT_TX_EXT 0 CACHE BOOL "Internal flag.")
-set(CONFIG_RECT_INTRA_PRED 0 CACHE BOOL "Internal flag.")
 set(CONFIG_TPL_MV 0 CACHE BOOL "Internal flag.")
 set(CONFIG_DUAL_FILTER 1 CACHE BOOL "Internal flag.")
 set(CONFIG_CONVOLVE_ROUND 0 CACHE BOOL "Internal flag.")
@@ -101,11 +101,12 @@
 set(CONFIG_FILTER_INTRA 0 CACHE BOOL "Internal flag.")
 set(CONFIG_INTRA_EDGE 0 CACHE BOOL "Internal flag.")
 set(CONFIG_INTRABC 0 CACHE BOOL "Internal flag.")
-set(CONFIG_EXT_INTER 0 CACHE BOOL "Internal flag.")
-set(CONFIG_INTERINTRA 0 CACHE BOOL "Internal flag.")
-set(CONFIG_WEDGE 0 CACHE BOOL "Internal flag.")
-set(CONFIG_COMPOUND_SEGMENT 0 CACHE BOOL "Internal flag.")
+set(CONFIG_EXT_INTER 1 CACHE BOOL "Internal flag.")
+set(CONFIG_INTERINTRA 1 CACHE BOOL "Internal flag.")
+set(CONFIG_WEDGE 1 CACHE BOOL "Internal flag.")
+set(CONFIG_COMPOUND_SEGMENT 1 CACHE BOOL "Internal flag.")
 set(CONFIG_EXT_REFS 1 CACHE BOOL "Internal flag.")
+set(CONFIG_SPEED_REFS 0 CACHE BOOL "Internal flag.")
 set(CONFIG_GLOBAL_MOTION 1 CACHE BOOL "Internal flag.")
 set(CONFIG_NEW_QUANT 0 CACHE BOOL "Internal flag.")
 set(CONFIG_SUPERTX 0 CACHE BOOL "Internal flag.")
@@ -159,7 +160,10 @@
 set(CONFIG_NEW_MULTISYMBOL 0 CACHE BOOL "Internal flag.")
 set(CONFIG_COMPOUND_SINGLEREF 0 CACHE BOOL "Internal flag.")
 set(CONFIG_AOM_QM 0 CACHE BOOL "Internal flag.")
-set(CONFIG_ONE_SIDED_COMPOUND 1 CACHE BOOL "Internal flag.")
+set(CONFIG_ONE_SIDED_COMPOUND 0 CACHE BOOL "Internal flag.")
 set(CONFIG_SMOOTH_HV 0 CACHE BOOL "Internal flag.")
 set(CONFIG_VAR_REFS 0 CACHE BOOL "Internal flag.")
+set(CONFIG_RECT_INTRA_PRED 0 CACHE BOOL "Internal flag.")
+set(CONFIG_LGT 0 CACHE BOOL "Internal flag.")
+set(CONFIG_SBL_SYMBOL 0 CACHE BOOL "Internal flag.")
 set(CONFIG_ANALYZER 0 CACHE BOOL "Internal flag.")
diff --git a/test/test.cmake b/test/test.cmake
index 36df8b4..8e74f59 100644
--- a/test/test.cmake
+++ b/test/test.cmake
@@ -123,6 +123,10 @@
   set(AOM_UNIT_TEST_COMMON_INTRIN_SSE4_1
       ${AOM_UNIT_TEST_COMMON_INTRIN_SSE4_1}
       "${AOM_ROOT}/test/simd_cmp_sse4.cc")
+  set(AOM_UNIT_TEST_COMMON_INTRIN_AVX2
+      ${AOM_UNIT_TEST_COMMON_INTRIN_AVX2}
+      "${AOM_ROOT}/test/simd_avx2_test.cc"
+      "${AOM_ROOT}/test/simd_cmp_avx2.cc")
 endif ()
 
 if (CONFIG_AV1_ENCODER)