diff --git a/crypto/asn1/p7_signd.c b/crypto/asn1/p7_signd.c
index 75ceb964625804ed50aa8b213d6119bece3c10d3..74f0f522e15d28247a1aef909188c6b4fe0f511d 100644
--- a/crypto/asn1/p7_signd.c
+++ b/crypto/asn1/p7_signd.c
@@ -133,10 +133,3 @@ void PKCS7_SIGNED_free(PKCS7_SIGNED *a)
 	sk_PKCS7_SIGNER_INFO_pop_free(a->signer_info,PKCS7_SIGNER_INFO_free);
 	Free(a);
 	}
-
-IMPLEMENT_STACK_OF(X509_ALGOR)
-IMPLEMENT_ASN1_SET_OF(X509_ALGOR)
-IMPLEMENT_STACK_OF(X509_CRL)
-IMPLEMENT_ASN1_SET_OF(X509_CRL)
-IMPLEMENT_STACK_OF(PKCS7_SIGNER_INFO)
-IMPLEMENT_ASN1_SET_OF(PKCS7_SIGNER_INFO)
diff --git a/crypto/asn1/p7_signi.c b/crypto/asn1/p7_signi.c
index 0f863333a1c08f53db8be76e41dcf057014f0abf..21132ef4ddd7b28d05252dc61ba8d4dc781c6112 100644
--- a/crypto/asn1/p7_signi.c
+++ b/crypto/asn1/p7_signi.c
@@ -146,3 +146,5 @@ void PKCS7_SIGNER_INFO_free(PKCS7_SIGNER_INFO *a)
 	Free((char *)a);
 	}
 
+IMPLEMENT_STACK_OF(PKCS7_SIGNER_INFO)
+IMPLEMENT_ASN1_SET_OF(PKCS7_SIGNER_INFO)
diff --git a/crypto/asn1/x_algor.c b/crypto/asn1/x_algor.c
index fd6f3ee40dd0c6d3538672fe2f7eb57c78450b71..8183b9f9e2f23362ce86e3ebf4d19e5bb3e667bf 100644
--- a/crypto/asn1/x_algor.c
+++ b/crypto/asn1/x_algor.c
@@ -113,3 +113,5 @@ void X509_ALGOR_free(X509_ALGOR *a)
 	Free((char *)a);
 	}
 
+IMPLEMENT_STACK_OF(X509_ALGOR)
+IMPLEMENT_ASN1_SET_OF(X509_ALGOR)
diff --git a/crypto/asn1/x_crl.c b/crypto/asn1/x_crl.c
index 683e1eef1897a1ba3a1d1f20ec5d90099a6f3b1b..cd46bbebc282cadebd211bb7cc734fff21b9d579 100644
--- a/crypto/asn1/x_crl.c
+++ b/crypto/asn1/x_crl.c
@@ -346,3 +346,5 @@ static int X509_REVOKED_seq_cmp(X509_REVOKED **a, X509_REVOKED **b)
 
 IMPLEMENT_STACK_OF(X509_REVOKED)
 IMPLEMENT_ASN1_SET_OF(X509_REVOKED)
+IMPLEMENT_STACK_OF(X509_CRL)
+IMPLEMENT_ASN1_SET_OF(X509_CRL)