diff --git a/apps/ca.c b/apps/ca.c
index 9126c30fa7d84f2f34a123f913efb471421353aa..42738deb3a5378de24da617dbc001d30390914df 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -1336,7 +1336,7 @@ bad:
 			j=x->cert_info->serialNumber->length;
 			p=(char *)x->cert_info->serialNumber->data;
 			
-			if(strlen(outdir) >= (j ? BSIZE-j*2-6 : BSIZE-8))
+			if(strlen(outdir) >= (size_t)(j ? BSIZE-j*2-6 : BSIZE-8))
 				{
 				BIO_printf(bio_err,"certificate file name too long\n");
 				goto err;
diff --git a/crypto/aes/aes_cbc.c b/crypto/aes/aes_cbc.c
index c5f1a13c24ffede8e77f1cd47c8efbd8dc74a011..01e965a532211b2cdfe09f161b179f129d1a3aca 100644
--- a/crypto/aes/aes_cbc.c
+++ b/crypto/aes/aes_cbc.c
@@ -63,7 +63,7 @@ void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
 		     const unsigned long length, const AES_KEY *key,
 		     unsigned char *ivec, const int enc) {
 
-	int n;
+	unsigned long n;
 	unsigned long len = length;
 	unsigned char tmp[AES_BLOCK_SIZE];
 
diff --git a/crypto/buffer/buffer.h b/crypto/buffer/buffer.h
index b6307f52eca240b5f3c59482cbd505a37787283d..465dc34f3fea5696d723b17ce6b021eb00e31452 100644
--- a/crypto/buffer/buffer.h
+++ b/crypto/buffer/buffer.h
@@ -63,6 +63,7 @@
 extern "C" {
 #endif
 
+#include <stddef.h>
 #include <sys/types.h>
 
 typedef struct buf_mem_st