diff --git a/include/libyuv/planar_functions.h b/include/libyuv/planar_functions.h
index b9878d22b..6f955c7dc 100644
--- a/include/libyuv/planar_functions.h
+++ b/include/libyuv/planar_functions.h
@@ -22,37 +22,6 @@ namespace libyuv {
 extern "C" {
 #endif
 
-// TODO(fbarchard): Move cpu macros to row.h
-#if defined(__pnacl__) || defined(__CLR_VER) ||            \
-    (defined(__native_client__) && defined(__x86_64__)) || \
-    (defined(__i386__) && !defined(__SSE__) && !defined(__clang__))
-#define LIBYUV_DISABLE_X86
-#endif
-// MemorySanitizer does not support assembly code yet. http://crbug.com/344505
-#if defined(__has_feature)
-#if __has_feature(memory_sanitizer)
-#if !defined(LIBYUV_DISABLE_NEON)
-#define LIBYUV_DISABLE_NEON
-#endif
-#if !defined(LIBYUV_DISABLE_SME)
-#define LIBYUV_DISABLE_SME
-#endif
-#if !defined(LIBYUV_DISABLE_SVE)
-#define LIBYUV_DISABLE_SVE
-#endif
-#if !defined(LIBYUV_DISABLE_X86)
-#define LIBYUV_DISABLE_X86
-#endif
-#endif  // __has_feature(memory_sanitizer)
-#endif  // defined(__has_feature)
-// The following are available on all x86 platforms:
-#if !defined(LIBYUV_DISABLE_X86) &&                             \
-    (defined(_M_IX86) ||                                        \
-     (defined(__x86_64__) && !defined(LIBYUV_ENABLE_ROWWIN)) || \
-     defined(__i386__))
-#define HAS_ARGBAFFINEROW_SSE2
-#endif
-
 // Copy a plane of data.
 LIBYUV_API
 void CopyPlane(const uint8_t* src_y,
@@ -1105,22 +1074,6 @@ int I420Interpolate(const uint8_t* src0_y,
                     int height,
                     int interpolation);
 
-// Row function for copying pixels from a source with a slope to a row
-// of destination. Useful for scaling, rotation, mirror, texture mapping.
-LIBYUV_API
-void ARGBAffineRow_C(const uint8_t* src_argb,
-                     int src_argb_stride,
-                     uint8_t* dst_argb,
-                     const float* uv_dudv,
-                     int width);
-// TODO(fbarchard): Move ARGBAffineRow_SSE2 to row.h
-LIBYUV_API
-void ARGBAffineRow_SSE2(const uint8_t* src_argb,
-                        int src_argb_stride,
-                        uint8_t* dst_argb,
-                        const float* uv_dudv,
-                        int width);
-
 // Shuffle ARGB channel order.  e.g. BGRA to ARGB.
 // shuffler is 16 bytes.
 LIBYUV_API
diff --git a/unit_test/planar_test.cc b/unit_test/planar_test.cc
index 576696bca..be9f3e023 100644
--- a/unit_test/planar_test.cc
+++ b/unit_test/planar_test.cc
@@ -1517,6 +1517,7 @@ TEST_F(LibYUVPlanarTest, I420Blend_Invert) {
                 disable_cpu_flags_, benchmark_cpu_info_, -1, 0);
 }
 
+#ifdef ENABLE_ROW_TESTS
 TEST_F(LibYUVPlanarTest, TestAffine) {
   SIMD_ALIGNED(uint8_t orig_pixels_0[1280][4]);
   SIMD_ALIGNED(uint8_t interpolate_pixels_C[1280][4]);
@@ -1550,6 +1551,7 @@ TEST_F(LibYUVPlanarTest, TestAffine) {
   }
 #endif
 }
+#endif  // ENABLE_ROW_TESTS
 
 static int TestCopyPlane(int benchmark_width,
                          int benchmark_height,