Yet more pissing about to get PEM built at the right moment.
diff --git a/Makefile.org b/Makefile.org
index ed0fc7a..4e1c79e 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -157,7 +157,7 @@
 	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 784ad4d..17922ff 100644
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -29,7 +29,7 @@
 	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 87469bc..76ef64b 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)