diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h
index 3ac4b28c0..2fee2c59c 100644
--- a/include/openssl/asn1.h
+++ b/include/openssl/asn1.h
@@ -1278,6 +1278,54 @@ OPENSSL_EXPORT unsigned long ASN1_STRING_get_default_mask(void);
 // ASN1_STRING_TABLE_cleanup does nothing.
 OPENSSL_EXPORT void ASN1_STRING_TABLE_cleanup(void);
 
+// M_ASN1_* are legacy aliases for various |ASN1_STRING| functions. Use the
+// functions themselves.
+#define M_ASN1_STRING_length(x) ASN1_STRING_length(x)
+#define M_ASN1_STRING_type(x) ASN1_STRING_type(x)
+#define M_ASN1_STRING_data(x) ASN1_STRING_data(x)
+#define M_ASN1_BIT_STRING_new() ASN1_BIT_STRING_new()
+#define M_ASN1_BIT_STRING_free(a) ASN1_BIT_STRING_free(a)
+#define M_ASN1_BIT_STRING_dup(a) ASN1_STRING_dup(a)
+#define M_ASN1_BIT_STRING_cmp(a, b) ASN1_STRING_cmp(a, b)
+#define M_ASN1_BIT_STRING_set(a, b, c) ASN1_BIT_STRING_set(a, b, c)
+#define M_ASN1_INTEGER_new() ASN1_INTEGER_new()
+#define M_ASN1_INTEGER_free(a) ASN1_INTEGER_free(a)
+#define M_ASN1_INTEGER_dup(a) ASN1_INTEGER_dup(a)
+#define M_ASN1_INTEGER_cmp(a, b) ASN1_INTEGER_cmp(a, b)
+#define M_ASN1_ENUMERATED_new() ASN1_ENUMERATED_new()
+#define M_ASN1_ENUMERATED_free(a) ASN1_ENUMERATED_free(a)
+#define M_ASN1_ENUMERATED_dup(a) ASN1_STRING_dup(a)
+#define M_ASN1_ENUMERATED_cmp(a, b) ASN1_STRING_cmp(a, b)
+#define M_ASN1_OCTET_STRING_new() ASN1_OCTET_STRING_new()
+#define M_ASN1_OCTET_STRING_free(a) ASN1_OCTET_STRING_free()
+#define M_ASN1_OCTET_STRING_dup(a) ASN1_OCTET_STRING_dup(a)
+#define M_ASN1_OCTET_STRING_cmp(a, b) ASN1_OCTET_STRING_cmp(a, b)
+#define M_ASN1_OCTET_STRING_set(a, b, c) ASN1_OCTET_STRING_set(a, b, c)
+#define M_ASN1_OCTET_STRING_print(a, b) ASN1_STRING_print(a, b)
+#define M_ASN1_PRINTABLESTRING_new() ASN1_PRINTABLESTRING_new()
+#define M_ASN1_PRINTABLESTRING_free(a) ASN1_PRINTABLESTRING_free(a)
+#define M_ASN1_IA5STRING_new() ASN1_IA5STRING_new()
+#define M_ASN1_IA5STRING_free(a) ASN1_IA5STRING_free(a)
+#define M_ASN1_IA5STRING_dup(a) ASN1_STRING_dup(a)
+#define M_ASN1_UTCTIME_new() ASN1_UTCTIME_new()
+#define M_ASN1_UTCTIME_free(a) ASN1_UTCTIME_free(a)
+#define M_ASN1_UTCTIME_dup(a) ASN1_STRING_dup(a)
+#define M_ASN1_T61STRING_new() ASN1_T61STRING_new()
+#define M_ASN1_T61STRING_free(a) ASN1_T61STRING_free(a)
+#define M_ASN1_GENERALIZEDTIME_new() ASN1_GENERALIZEDTIME_new()
+#define M_ASN1_GENERALIZEDTIME_free(a) ASN1_GENERALIZEDTIME_free(a)
+#define M_ASN1_GENERALIZEDTIME_dup(a) ASN1_STRING_dup(a)
+#define M_ASN1_GENERALSTRING_new() ASN1_GENERALSTRING_new()
+#define M_ASN1_GENERALSTRING_free(a) ASN1_GENERALSTRING_free(a)
+#define M_ASN1_UNIVERSALSTRING_new() ASN1_UNIVERSALSTRING_new()
+#define M_ASN1_UNIVERSALSTRING_free(a) ASN1_UNIVERSALSTRING_free(a)
+#define M_ASN1_BMPSTRING_new() ASN1_BMPSTRING_new()
+#define M_ASN1_BMPSTRING_free(a) ASN1_BMPSTRING_free(a)
+#define M_ASN1_VISIBLESTRING_new() ASN1_VISIBLESTRING_new()
+#define M_ASN1_VISIBLESTRING_free(a) ASN1_VISIBLESTRING_free(a)
+#define M_ASN1_UTF8STRING_new() ASN1_UTF8STRING_new()
+#define M_ASN1_UTF8STRING_free(a) ASN1_UTF8STRING_free(a)
+
 
 // Underdocumented functions.
 //
@@ -1353,54 +1401,6 @@ typedef STACK_OF(ASN1_TYPE) ASN1_SEQUENCE_ANY;
 DECLARE_ASN1_ENCODE_FUNCTIONS_const(ASN1_SEQUENCE_ANY, ASN1_SEQUENCE_ANY)
 DECLARE_ASN1_ENCODE_FUNCTIONS_const(ASN1_SEQUENCE_ANY, ASN1_SET_ANY)
 
-// M_ASN1_* are legacy aliases for various |ASN1_STRING| functions. Use the
-// functions themselves.
-#define M_ASN1_STRING_length(x) ASN1_STRING_length(x)
-#define M_ASN1_STRING_type(x) ASN1_STRING_type(x)
-#define M_ASN1_STRING_data(x) ASN1_STRING_data(x)
-#define M_ASN1_BIT_STRING_new() ASN1_BIT_STRING_new()
-#define M_ASN1_BIT_STRING_free(a) ASN1_BIT_STRING_free(a)
-#define M_ASN1_BIT_STRING_dup(a) ASN1_STRING_dup(a)
-#define M_ASN1_BIT_STRING_cmp(a, b) ASN1_STRING_cmp(a, b)
-#define M_ASN1_BIT_STRING_set(a, b, c) ASN1_BIT_STRING_set(a, b, c)
-#define M_ASN1_INTEGER_new() ASN1_INTEGER_new()
-#define M_ASN1_INTEGER_free(a) ASN1_INTEGER_free(a)
-#define M_ASN1_INTEGER_dup(a) ASN1_INTEGER_dup(a)
-#define M_ASN1_INTEGER_cmp(a, b) ASN1_INTEGER_cmp(a, b)
-#define M_ASN1_ENUMERATED_new() ASN1_ENUMERATED_new()
-#define M_ASN1_ENUMERATED_free(a) ASN1_ENUMERATED_free(a)
-#define M_ASN1_ENUMERATED_dup(a) ASN1_STRING_dup(a)
-#define M_ASN1_ENUMERATED_cmp(a, b) ASN1_STRING_cmp(a, b)
-#define M_ASN1_OCTET_STRING_new() ASN1_OCTET_STRING_new()
-#define M_ASN1_OCTET_STRING_free(a) ASN1_OCTET_STRING_free()
-#define M_ASN1_OCTET_STRING_dup(a) ASN1_OCTET_STRING_dup(a)
-#define M_ASN1_OCTET_STRING_cmp(a, b) ASN1_OCTET_STRING_cmp(a, b)
-#define M_ASN1_OCTET_STRING_set(a, b, c) ASN1_OCTET_STRING_set(a, b, c)
-#define M_ASN1_OCTET_STRING_print(a, b) ASN1_STRING_print(a, b)
-#define M_ASN1_PRINTABLESTRING_new() ASN1_PRINTABLESTRING_new()
-#define M_ASN1_PRINTABLESTRING_free(a) ASN1_PRINTABLESTRING_free(a)
-#define M_ASN1_IA5STRING_new() ASN1_IA5STRING_new()
-#define M_ASN1_IA5STRING_free(a) ASN1_IA5STRING_free(a)
-#define M_ASN1_IA5STRING_dup(a) ASN1_STRING_dup(a)
-#define M_ASN1_UTCTIME_new() ASN1_UTCTIME_new()
-#define M_ASN1_UTCTIME_free(a) ASN1_UTCTIME_free(a)
-#define M_ASN1_UTCTIME_dup(a) ASN1_STRING_dup(a)
-#define M_ASN1_T61STRING_new() ASN1_T61STRING_new()
-#define M_ASN1_T61STRING_free(a) ASN1_T61STRING_free(a)
-#define M_ASN1_GENERALIZEDTIME_new() ASN1_GENERALIZEDTIME_new()
-#define M_ASN1_GENERALIZEDTIME_free(a) ASN1_GENERALIZEDTIME_free(a)
-#define M_ASN1_GENERALIZEDTIME_dup(a) ASN1_STRING_dup(a)
-#define M_ASN1_GENERALSTRING_new() ASN1_GENERALSTRING_new()
-#define M_ASN1_GENERALSTRING_free(a) ASN1_GENERALSTRING_free(a)
-#define M_ASN1_UNIVERSALSTRING_new() ASN1_UNIVERSALSTRING_new()
-#define M_ASN1_UNIVERSALSTRING_free(a) ASN1_UNIVERSALSTRING_free(a)
-#define M_ASN1_BMPSTRING_new() ASN1_BMPSTRING_new()
-#define M_ASN1_BMPSTRING_free(a) ASN1_BMPSTRING_free(a)
-#define M_ASN1_VISIBLESTRING_new() ASN1_VISIBLESTRING_new()
-#define M_ASN1_VISIBLESTRING_free(a) ASN1_VISIBLESTRING_free(a)
-#define M_ASN1_UTF8STRING_new() ASN1_UTF8STRING_new()
-#define M_ASN1_UTF8STRING_free(a) ASN1_UTF8STRING_free(a)
-
 #define B_ASN1_TIME B_ASN1_UTCTIME | B_ASN1_GENERALIZEDTIME
 
 #define B_ASN1_PRINTABLE                                              \