diff --git a/include/libyuv/row.h b/include/libyuv/row.h
index 5645a73f3..b7114cb21 100644
--- a/include/libyuv/row.h
+++ b/include/libyuv/row.h
@@ -428,7 +428,6 @@ extern "C" {
 #define HAS_DETILEROW_NEON
 #define HAS_DETILESPLITUVROW_NEON
 #define HAS_DETILETOYUY2_NEON
-#define HAS_UNPACKMT2T_NEON
 #define HAS_DIVIDEROW_16_NEON
 #define HAS_HALFFLOATROW_NEON
 #define HAS_HALFMERGEUVROW_NEON
@@ -492,6 +491,7 @@ extern "C" {
 #define HAS_SPLITUVROW_NEON
 #define HAS_SPLITXRGBROW_NEON
 #define HAS_SWAPUVROW_NEON
+#define HAS_UNPACKMT2T_NEON
 #define HAS_UYVYTOARGBROW_NEON
 #define HAS_UYVYTOUV422ROW_NEON
 #define HAS_UYVYTOUVROW_NEON
@@ -525,17 +525,17 @@ extern "C" {
 
 // The following are available on AArch64 platforms:
 #if !defined(LIBYUV_DISABLE_NEON) && defined(__aarch64__)
-#define HAS_ARGBTOAR30ROW_NEON
 #define HAS_ABGRTOAR30ROW_NEON
+#define HAS_ARGBTOAR30ROW_NEON
 #define HAS_CONVERT8TO16ROW_NEON
 #define HAS_I210ALPHATOARGBROW_NEON
-#define HAS_I410ALPHATOARGBROW_NEON
-#define HAS_I210TOARGBROW_NEON
-#define HAS_I410TOARGBROW_NEON
 #define HAS_I210TOAR30ROW_NEON
-#define HAS_I410TOAR30ROW_NEON
-#define HAS_I212TOARGBROW_NEON
+#define HAS_I210TOARGBROW_NEON
 #define HAS_I212TOAR30ROW_NEON
+#define HAS_I212TOARGBROW_NEON
+#define HAS_I410ALPHATOARGBROW_NEON
+#define HAS_I410TOAR30ROW_NEON
+#define HAS_I410TOARGBROW_NEON
 #define HAS_I422TOAR30ROW_NEON
 #define HAS_P210TOAR30ROW_NEON
 #define HAS_P210TOARGBROW_NEON
@@ -544,13 +544,13 @@ extern "C" {
 
 #define HAS_ABGRTOYJROW_NEON_DOTPROD
 #define HAS_ABGRTOYROW_NEON_DOTPROD
+#define HAS_ARGBGRAYROW_NEON_DOTPROD
+#define HAS_ARGBSEPIAROW_NEON_DOTPROD
 #define HAS_ARGBTOYJROW_NEON_DOTPROD
 #define HAS_ARGBTOYROW_NEON_DOTPROD
 #define HAS_BGRATOYROW_NEON_DOTPROD
 #define HAS_RGBATOYJROW_NEON_DOTPROD
 #define HAS_RGBATOYROW_NEON_DOTPROD
-#define HAS_ARGBGRAYROW_NEON_DOTPROD
-#define HAS_ARGBSEPIAROW_NEON_DOTPROD
 
 #define HAS_ABGRTOUVJROW_NEON_I8MM
 #define HAS_ABGRTOUVROW_NEON_I8MM
@@ -668,6 +668,7 @@ extern "C" {
 #define HAS_INTERPOLATEROW_16TO8_NEON
 #define HAS_SCALESUMSAMPLES_NEON
 #endif
+
 #if !defined(LIBYUV_DISABLE_MSA) && defined(__mips_msa)
 #define HAS_ABGRTOUVJROW_MSA
 #define HAS_ABGRTOUVROW_MSA