diff --git a/crypto/pkcs7/pk7_mime.c b/crypto/pkcs7/pk7_mime.c
index 3049e0adb12d8b60a40d658a91766b169b14adc8..5abd0ec8fac53d12131e2194b8ac54941a78c348 100644
--- a/crypto/pkcs7/pk7_mime.c
+++ b/crypto/pkcs7/pk7_mime.c
@@ -74,6 +74,7 @@ char *param_name;			/* Param name e.g. "micalg" */
 char *param_value;			/* Param value e.g. "sha1" */
 } MIME_PARAM;
 
+DECLARE_STACK_OF(MIME_PARAM)
 IMPLEMENT_STACK_OF(MIME_PARAM)
 
 typedef struct {
@@ -82,6 +83,7 @@ char *value;				/* Value of line e.g. "text/plain" */
 STACK_OF(MIME_PARAM) *params;		/* Zero or more parameters */
 } MIME_HEADER;
 
+DECLARE_STACK_OF(MIME_HEADER)
 IMPLEMENT_STACK_OF(MIME_HEADER)
 
 static int B64_write_PKCS7(BIO *bio, PKCS7 *p7);
diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c
index 8ab4302c2e487a1d36a485241093bcb92b76c5d2..be132d5dea4a93a932ff8f4441888fac02574bf1 100644
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -285,7 +285,7 @@ int sk_num(const STACK *st)
 	return st->num;
 }
 
-char *sk_value(STACK *st, int i)
+char *sk_value(const STACK *st, int i)
 {
 	if(st == NULL) return NULL;
 	return st->data[i];
diff --git a/crypto/stack/stack.h b/crypto/stack/stack.h
index 0cc3b44cc077ce272a467413052b9b093ae511bb..1613ac5fb1418304d917a0177f6bc9a30cd7cb50 100644
--- a/crypto/stack/stack.h
+++ b/crypto/stack/stack.h
@@ -80,7 +80,7 @@ typedef struct stack_st
 #define M_sk_value(sk,n)	((sk) ? (sk)->data[n] : NULL)
 
 int sk_num(const STACK *);
-char *sk_value(STACK *, int);
+char *sk_value(const STACK *, int);
 
 char *sk_set(STACK *, int, char *);