diff --git a/CMakeLists.txt b/CMakeLists.txt
index 262ed44a71c6882abb00040b4b34d7d6f9af62e8..8eef2c3c0ead6e4883072bc9625a3c150970d9c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -461,8 +461,6 @@ set(AOM_AV1_ENCODER_SSE2_ASM
     "${AOM_ROOT}/av1/encoder/x86/temporal_filter_apply_sse2.asm")
 
 set(AOM_AV1_ENCODER_SSE2_INTRIN
-    # Requires CONFIG_EXT_INTER
-    #"${AOM_ROOT}/av1/encoder/x86/wedge_utils_sse2.c"
     "${AOM_ROOT}/av1/encoder/x86/dct_intrin_sse2.c"
     "${AOM_ROOT}/av1/encoder/x86/highbd_block_error_intrin_sse2.c"
     "${AOM_ROOT}/av1/encoder/x86/av1_quantize_sse2.c")
@@ -513,8 +511,6 @@ set(AOM_UNIT_TEST_SOURCES
     "${AOM_ROOT}/test/av1_inv_txfm_test.cc"
     "${AOM_ROOT}/test/av1_txfm_test.cc"
     "${AOM_ROOT}/test/av1_txfm_test.h"
-    # requires CONFIG_EXT_INTER
-    #"${AOM_ROOT}/test/av1_wedge_utils_test.cc"
     "${AOM_ROOT}/test/avg_test.cc"
     "${AOM_ROOT}/test/blend_a64_mask_1d_test.cc"
     "${AOM_ROOT}/test/blend_a64_mask_test.cc"
@@ -555,9 +551,6 @@ set(AOM_UNIT_TEST_SOURCES
     "${AOM_ROOT}/test/level_test.cc"
     "${AOM_ROOT}/test/lossless_test.cc"
     "${AOM_ROOT}/test/lpf_8_test.cc"
-    # requires CONFIG_EXT_INTER
-    #"${AOM_ROOT}/test/masked_sad_test.cc"
-    #"${AOM_ROOT}/test/masked_variance_test.cc"
     "${AOM_ROOT}/test/md5_helper.h"
     "${AOM_ROOT}/test/minmax_test.cc"
     # requires CONFIG_MOTION_VAR
@@ -666,6 +659,22 @@ if (CONFIG_CLPF)
       "${AOM_ROOT}/test/clpf_test.cc")
 endif ()
 
+if (CONFIG_EXT_INTER)
+  set(AOM_AV1_ENCODER_SOURCES
+      ${AOM_AV1_ENCODER_SOURCES}
+      "${AOM_ROOT}/av1/encoder/wedge_utils.c")
+
+  set(AOM_AV1_ENCODER_SSE2_INTRIN
+      ${AOM_AV1_ENCODER_SSE2_INTRIN}
+      "${AOM_ROOT}/av1/encoder/x86/wedge_utils_sse2.c")
+
+  set(AOM_UNIT_TEST_SOURCES
+      ${AOM_UNIT_TEST_SOURCES}
+      "${AOM_ROOT}/test/av1_wedge_utils_test.cc"
+      "${AOM_ROOT}/test/masked_sad_test.cc"
+      "${AOM_ROOT}/test/masked_variance_test.cc")
+endif ()
+
 if (CONFIG_INTERNAL_STATS)
   set(AOM_DSP_SOURCES
       ${AOM_DSP_SOURCES}
diff --git a/build/cmake/targets/generic.cmake b/build/cmake/targets/generic.cmake
index d68970ca9ce8493e7f18e80d53ece55bf97d8b1c..ace8f966b53fb4937be702812385aebdb0599001 100644
--- a/build/cmake/targets/generic.cmake
+++ b/build/cmake/targets/generic.cmake
@@ -35,6 +35,9 @@ endif ()
 if (CONFIG_CLPF)
   set(RTCD_CONFIG_CLPF "yes")
 endif ()
+if (CONFIG_EXT_INTER)
+  set(RTCD_CONFIG_EXT_INTER "yes")
+endif ()
 if (CONFIG_INTERNAL_STATS)
   set(RTCD_CONFIG_INTERNAL_STATS "yes")
 endif ()
diff --git a/build/cmake/targets/rtcd_templates/generic.rtcd.cmake b/build/cmake/targets/rtcd_templates/generic.rtcd.cmake
index a43fb01dae91fdbadd788dfde180db1350751188..d0257fc428c431a59d8dc5e2c9ce1d76f41e803e 100644
--- a/build/cmake/targets/rtcd_templates/generic.rtcd.cmake
+++ b/build/cmake/targets/rtcd_templates/generic.rtcd.cmake
@@ -26,4 +26,5 @@ CONFIG_OS_SUPPORT=${RTCD_CONFIG_OS_SUPPORT}
 CONFIG_TEMPORAL_DENOISING=${RTCD_CONFIG_TEMPORAL_DENOISING}
 CONFIG_AOM_HIGHBITDEPTH=${RTCD_CONFIG_AOM_HIGHBITDEPTH}
 CONFIG_CLPF=${RTCD_CONFIG_CLPF}
+CONFIG_EXT_INTER=${RTCD_CONFIG_EXT_INTER}
 CONFIG_INTERNAL_STATS=${RTCD_CONFIG_INTERNAL_STATS}
diff --git a/build/cmake/targets/rtcd_templates/x86_64.rtcd.cmake b/build/cmake/targets/rtcd_templates/x86_64.rtcd.cmake
index 43c4cfa75c3c340e436482f507d99d1a0ed4b254..22e9da7bcf89326350cfb3e140ed8cae1adc7806 100644
--- a/build/cmake/targets/rtcd_templates/x86_64.rtcd.cmake
+++ b/build/cmake/targets/rtcd_templates/x86_64.rtcd.cmake
@@ -35,4 +35,5 @@ CONFIG_OS_SUPPORT=${RTCD_CONFIG_OS_SUPPORT}
 CONFIG_TEMPORAL_DENOISING=${RTCD_CONFIG_TEMPORAL_DENOISING}
 CONFIG_AOM_HIGHBITDEPTH=${RTCD_CONFIG_AOM_HIGHBITDEPTH}
 CONFIG_CLPF=${RTCD_CONFIG_CLPF}
+CONFIG_EXT_INTER=${RTCD_CONFIG_EXT_INTER}
 CONFIG_INTERNAL_STATS=${RTCD_CONFIG_INTERNAL_STATS}
diff --git a/build/cmake/targets/x86_64.cmake b/build/cmake/targets/x86_64.cmake
index faab17a52f6239a3a0d8f63b39265241542a17fc..c8b1d0ed7f98dd1375efbc29ca684a2d6bc63e5b 100644
--- a/build/cmake/targets/x86_64.cmake
+++ b/build/cmake/targets/x86_64.cmake
@@ -56,6 +56,9 @@ endif ()
 if (CONFIG_CLPF)
   set(RTCD_CONFIG_CLPF "yes")
 endif ()
+if (CONFIG_EXT_INTER)
+  set(RTCD_CONFIG_EXT_INTER "yes")
+endif ()
 if (CONFIG_INTERNAL_STATS)
   set(RTCD_CONFIG_INTERNAL_STATS "yes")
 endif ()