diff --git a/Makefile.org b/Makefile.org
index ed0fc7a552d7582034e5ecba030fb460711f40cb..4e1c79e40cc403a7af57463a9b84b7da14e74561 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -157,7 +157,7 @@ SDIRS=  \
 	des rc2 rc4 rc5 idea bf cast \
 	bn rsa dsa dh \
 	buffer bio stack lhash rand err objects \
-	evp pem asn1 x509 x509v3 conf txt_db pkcs7 comp
+	evp asn1 pem x509 x509v3 conf txt_db pkcs7 comp
 
 # If you change the INSTALLTOP, make sure to also change the values
 # in crypto/location.h
diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index 784ad4d5b36d53c57e88169b6ad58de3bb20a927..17922ff1174530f3488fd8ba4ac8581ae67c3b05 100644
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -29,7 +29,7 @@ SDIRS=	md2 md5 sha mdc2 hmac ripemd \
 	des rc2 rc4 rc5 idea bf cast \
 	bn rsa dsa dh \
 	buffer bio stack lhash rand err objects \
-	evp pem x509 x509v3 asn1 conf txt_db pkcs7 comp
+	evp asn1 pem x509 x509v3 conf txt_db pkcs7 comp
 
 GENERAL=Makefile README
 
diff --git a/crypto/pem/ctx_size.c b/crypto/pem/ctx_size.c
index 87469bc4af47134c4ef5a5a3685e4dc07f9ba17c..76ef64b1298330ac6da328e869fa940bcec214f5 100644
--- a/crypto/pem/ctx_size.c
+++ b/crypto/pem/ctx_size.c
@@ -57,7 +57,7 @@
  */
 
 #include <stdio.h>
-#include "cryptlib.h"
+#include <string.h>
 #include "evp.h"
 
 int main(argc,argv)