Change #include filenames from <foo.h> to <openssl.h>.

Submitted by:
Reviewed by:
PR:

34 files changed, 207 insertions, 207 deletions

diff --git a/apps/apps.h b/apps/apps.h
index 25a9262e03..3ad21bb9a9 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -59,11 +59,11 @@
 #ifndef HEADER_APPS_H
 #define HEADER_APPS_H
 
-#include "e_os.h"
+#include <openssl/e_os.h>
 
-#include "buffer.h"
-#include "bio.h"
-#include "crypto.h"
+#include <openssl/buffer.h>
+#include <openssl/bio.h>
+#include <openssl/crypto.h>
 #include "progs.h"
 
 #ifdef NO_STDIO
@@ -88,7 +88,7 @@ extern BIO *bio_err;
 #else
 
 #define MAIN(a,v)	PROG(a,v)
-#include "conf.h"
+#include <openssl/conf.h>
 extern LHASH *config;
 extern char *default_config_file;
 extern BIO *bio_err;
diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index 39e97887af..a5e4bfcf5e 100644
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -64,10 +64,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"
-#include "err.h"
-#include "evp.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 /* -inform arg	- input format - default PEM (DER or PEM)
  * -in arg	- input file - default stdin
diff --git a/apps/ca.c b/apps/ca.c
index 5ce0dc202b..16afb8d7ee 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -64,16 +64,16 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "apps.h"
-#include "conf.h"
-#include "bio.h"
-#include "err.h"
-#include "bn.h"
-#include "txt_db.h"
-#include "evp.h"
-#include "x509.h"
-#include "x509v3.h"
-#include "objects.h"
-#include "pem.h"
+#include <openssl/conf.h>
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/txt_db.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+#include <openssl/objects.h>
+#include <openssl/pem.h>
 
 #ifndef W_OK
 #include <sys/file.h>
diff --git a/apps/ciphers.c b/apps/ciphers.c
index b02b64b5df..3c76782b7e 100644
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -63,8 +63,8 @@
 #define APPS_WIN16
 #endif
 #include "apps.h"
-#include "err.h"
-#include "ssl.h"
+#include <openssl/err.h>
+#include <openssl/ssl.h>
 
 #undef PROG
 #define PROG	ciphers_main
diff --git a/apps/crl.c b/apps/crl.c
index 0c03f5fb6c..cdbee4847d 100644
--- a/apps/crl.c
+++ b/apps/crl.c
@@ -60,11 +60,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "x509.h"
-#include "x509v3.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+#include <openssl/pem.h>
 
 #undef PROG
 #define PROG	crl_main
diff --git a/apps/crl2p7.c b/apps/crl2p7.c
index aa407b7098..12e535a282 100644
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -65,12 +65,12 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "apps.h"
-#include "err.h"
-#include "evp.h"
-#include "x509.h"
-#include "pkcs7.h"
-#include "pem.h"
-#include "objects.h"
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pkcs7.h>
+#include <openssl/pem.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);
diff --git a/apps/dgst.c b/apps/dgst.c
index 2926e5514f..82bb20a8be 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -60,12 +60,12 @@
 #include <string.h>
 #include <stdlib.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #undef BUFSIZE
 #define BUFSIZE	1024*8
diff --git a/apps/dh.c b/apps/dh.c
index 0b548ef570..02742485ce 100644
--- a/apps/dh.c
+++ b/apps/dh.c
@@ -61,12 +61,12 @@
 #include <time.h>
 #include <string.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "bn.h"
-#include "dh.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/dh.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #undef PROG
 #define PROG	dh_main
diff --git a/apps/dsa.c b/apps/dsa.c
index 312ed31798..dc282b77d0 100644
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -61,12 +61,12 @@
 #include <string.h>
 #include <time.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "dsa.h"
-#include "evp.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/dsa.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #undef PROG
 #define PROG	dsa_main
diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index 085e4845c1..e733b53db4 100644
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -61,13 +61,13 @@
 #include <time.h>
 #include <string.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "bn.h"
-#include "rand.h"
-#include "dsa.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/rand.h>
+#include <openssl/dsa.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #undef PROG
 #define PROG	dsaparam_main
diff --git a/apps/eay.c b/apps/eay.c
index 7c3bae3bfb..80a141b938 100644
--- a/apps/eay.c
+++ b/apps/eay.c
@@ -64,27 +64,27 @@
 #define USE_SOCKETS
 #include "../e_os.h"
 
-#include "bio.h"
-#include "stack.h"
-#include "lhash.h"
+#include <openssl/bio.h>
+#include <openssl/stack.h>
+#include <openssl/lhash.h>
 
-#include "err.h"
+#include <openssl/err.h>
 
-#include "bn.h"
+#include <openssl/bn.h>
 
-#include "evp.h"
+#include <openssl/evp.h>
 
-#include "rand.h"
-#include "conf.h"
-#include "txt_db.h"
+#include <openssl/rand.h>
+#include <openssl/conf.h>
+#include <openssl/txt_db.h>
 
-#include "err.h"
+#include <openssl/err.h>
 
-#include "x509.h"
-#include "pkcs7.h"
-#include "pem.h"
-#include "asn1.h"
-#include "objects.h"
+#include <openssl/x509.h>
+#include <openssl/pkcs7.h>
+#include <openssl/pem.h>
+#include <openssl/asn1.h>
+#include <openssl/objects.h>
 
 #define MONOLITH
 
diff --git a/apps/enc.c b/apps/enc.c
index b561326733..84a81ffb23 100644
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -60,15 +60,15 @@
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
 #ifdef NO_MD5
-#include "md5.h"
+#include <openssl/md5.h>
 #endif
-#include "pem.h"
+#include <openssl/pem.h>
 
 #ifndef NOPROTO
 int set_hex(char *in,unsigned char *out,int size);
diff --git a/apps/errstr.c b/apps/errstr.c
index ee51abaf34..c86b5d940b 100644
--- a/apps/errstr.c
+++ b/apps/errstr.c
@@ -60,10 +60,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"
-#include "bio.h"
-#include "lhash.h"
-#include "err.h"
-#include "ssl.h"
+#include <openssl/bio.h>
+#include <openssl/lhash.h>
+#include <openssl/err.h>
+#include <openssl/ssl.h>
 
 #undef PROG
 #define PROG	errstr_main
diff --git a/apps/gendh.c b/apps/gendh.c
index 8900b4f1af..c69147e370 100644
--- a/apps/gendh.c
+++ b/apps/gendh.c
@@ -61,13 +61,13 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "apps.h"
-#include "bio.h"
-#include "rand.h"
-#include "err.h"
-#include "bn.h"
-#include "dh.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/rand.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/dh.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #define DEFBITS	512
 #undef PROG
diff --git a/apps/gendsa.c b/apps/gendsa.c
index 3e198a24f9..db641da503 100644
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -61,13 +61,13 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "apps.h"
-#include "bio.h"
-#include "rand.h"
-#include "err.h"
-#include "bn.h"
-#include "dsa.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/rand.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/dsa.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #define DEFBITS	512
 #undef PROG
diff --git a/apps/genrsa.c b/apps/genrsa.c
index f83bafc7f1..30f1618f18 100644
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -61,14 +61,14 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "apps.h"
-#include "bio.h"
-#include "rand.h"
-#include "err.h"
-#include "bn.h"
-#include "rsa.h"
-#include "evp.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/rand.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #define DEFBITS	512
 #undef PROG
diff --git a/apps/nseq.c b/apps/nseq.c
index a36f29f518..9c84d93b81 100644
--- a/apps/nseq.c
+++ b/apps/nseq.c
@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "pem.h"
-#include "err.h"
+#include <openssl/pem.h>
+#include <openssl/err.h>
 #include "apps.h"
 
 #undef PROG
diff --git a/apps/openssl.c b/apps/openssl.c
index 21724201d6..bae0c4f004 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -63,19 +63,19 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "bio.h"
-#include "crypto.h"
-#include "lhash.h"
-#include "conf.h"
-#include "x509.h"
-#include "pem.h"
-#include "ssl.h"
+#include <openssl/bio.h>
+#include <openssl/crypto.h>
+#include <openssl/lhash.h>
+#include <openssl/conf.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+#include <openssl/ssl.h>
 #define SSLEAY	/* turn off a few special case MONOLITH macros */
 #define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */
 #define SSLEAY_SRC
 #include "apps.h"
 #include "s_apps.h"
-#include "err.h"
+#include <openssl/err.h>
 
 /*
 #ifdef WINDOWS
diff --git a/apps/pem_mail.c b/apps/pem_mail.c
index acbf7bd9a0..b60c9a3922 100644
--- a/apps/pem_mail.c
+++ b/apps/pem_mail.c
@@ -57,12 +57,12 @@
  */
 
 #include <stdio.h>
-#include "rsa.h"
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
-#include "err.h"
-#include "pem.h"
+#include <openssl/rsa.h>
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
+#include <openssl/err.h>
+#include <openssl/pem.h>
 #include "apps.h"
 
 #undef PROG
diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 97b7c88ef9..79fd19a69f 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -59,9 +59,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pem.h>
-#include <err.h>
-#include "pkcs12.h"
+#include <openssl/pem.h>
+#include <openssl/err.h>
+#include <openssl/pkcs12.h>
 
 #include "apps.h"
 #define PROG pkcs12_main
diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index ece2cd7d68..24b3e57882 100644
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -61,12 +61,12 @@
 #include <string.h>
 #include <time.h>
 #include "apps.h"
-#include "err.h"
-#include "objects.h"
-#include "evp.h"
-#include "x509.h"
-#include "pkcs7.h"
-#include "pem.h"
+#include <openssl/err.h>
+#include <openssl/objects.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pkcs7.h>
+#include <openssl/pem.h>
 
 #undef PROG
 #define PROG	pkcs7_main
diff --git a/apps/req.c b/apps/req.c
index 69f371697b..78a50a5525 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -64,16 +64,16 @@
 #define APPS_WIN16
 #endif
 #include "apps.h"
-#include "bio.h"
-#include "evp.h"
-#include "rand.h"
-#include "conf.h"
-#include "err.h"
-#include "asn1.h"
-#include "x509.h"
-#include "x509v3.h"
-#include "objects.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+#include <openssl/rand.h>
+#include <openssl/conf.h>
+#include <openssl/err.h>
+#include <openssl/asn1.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+#include <openssl/objects.h>
+#include <openssl/pem.h>
 
 #define SECTION		"req"
 
diff --git a/apps/rsa.c b/apps/rsa.c
index e09eeda16e..1372a5fac9 100644
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -61,12 +61,12 @@
 #include <string.h>
 #include <time.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "rsa.h"
-#include "evp.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/rsa.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #undef PROG
 #define PROG	rsa_main
diff --git a/apps/s_cb.c b/apps/s_cb.c
index ad5bc26e31..fdb11a1d11 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -63,9 +63,9 @@
 #include "apps.h"
 #undef NON_MAIN
 #undef USE_SOCKETS
-#include "err.h"
-#include "x509.h"
-#include "ssl.h"
+#include <openssl/err.h>
+#include <openssl/x509.h>
+#include <openssl/ssl.h>
 #include "s_apps.h"
 
 int verify_depth=0;
diff --git a/apps/s_client.c b/apps/s_client.c
index 20e581ec20..9e90b483f2 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -64,10 +64,10 @@
 #define APPS_WIN16
 #endif
 #include "apps.h"
-#include "x509.h"
-#include "ssl.h"
-#include "err.h"
-#include "pem.h"
+#include <openssl/x509.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <openssl/pem.h>
 #include "s_apps.h"
 
 #undef PROG
diff --git a/apps/s_server.c b/apps/s_server.c
index f026fa1b6b..0198cb8a05 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -64,14 +64,14 @@
 #ifdef NO_STDIO
 #define APPS_WIN16
 #endif
-#include "lhash.h"
-#include "bn.h"
+#include <openssl/lhash.h>
+#include <openssl/bn.h>
 #define USE_SOCKETS
 #include "apps.h"
-#include "err.h"
-#include "pem.h"
-#include "x509.h"
-#include "ssl.h"
+#include <openssl/err.h>
+#include <openssl/pem.h>
+#include <openssl/x509.h>
+#include <openssl/ssl.h>
 #include "s_apps.h"
 
 #ifndef NOPROTO
diff --git a/apps/s_socket.c b/apps/s_socket.c
index 2c83dbb607..9110234ed2 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -67,7 +67,7 @@
 #undef USE_SOCKETS
 #undef NON_MAIN
 #include "s_apps.h"
-#include "ssl.h"
+#include <openssl/ssl.h>
 
 #ifndef NOPROTO
 static struct hostent *GetHostByName(char *name);
diff --git a/apps/s_time.c b/apps/s_time.c
index 1e335ef4b2..187c09d12e 100644
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -70,13 +70,13 @@
 #ifdef NO_STDIO
 #define APPS_WIN16
 #endif
-#include "x509.h"
-#include "ssl.h"
-#include "pem.h"
+#include <openssl/x509.h>
+#include <openssl/ssl.h>
+#include <openssl/pem.h>
 #define USE_SOCKETS
 #include "apps.h"
 #include "s_apps.h"
-#include "err.h"
+#include <openssl/err.h>
 #ifdef WIN32_STUFF
 #include "winmain.h"
 #include "wintext.h"
diff --git a/apps/sc.c b/apps/sc.c
index 816040d28a..e6da658f06 100644
--- a/apps/sc.c
+++ b/apps/sc.c
@@ -64,10 +64,10 @@
 #define APPS_WIN16
 #endif
 #include "apps.h"
-#include "x509.h"
-#include "ssl.h"
-#include "err.h"
-#include "pem.h"
+#include <openssl/x509.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <openssl/pem.h>
 #include "s_apps.h"
 
 #ifdef WINDOWS
diff --git a/apps/sess_id.c b/apps/sess_id.c
index c1b497981e..11cf837267 100644
--- a/apps/sess_id.c
+++ b/apps/sess_id.c
@@ -60,11 +60,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "x509.h"
-#include "pem.h"
-#include "ssl.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+#include <openssl/ssl.h>
 
 #undef PROG
 #define PROG	sess_id_main
diff --git a/apps/speed.c b/apps/speed.c
index 6c88a1c3d1..d6ee53e9fe 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -78,9 +78,9 @@
 #ifdef NO_STDIO
 #define APPS_WIN16
 #endif
-#include "crypto.h"
-#include "rand.h"
-#include "err.h"
+#include <openssl/crypto.h>
+#include <openssl/rand.h>
+#include <openssl/err.h>
 
 #ifndef MSDOS
 #define TIMES
@@ -114,47 +114,47 @@ struct tms {
 #endif
 
 #ifndef NO_DES
-#include "des.h"
+#include <openssl/des.h>
 #endif
 #ifndef NO_MD2
-#include "md2.h"
+#include <openssl/md2.h>
 #endif
 #ifndef NO_MDC2
-#include "mdc2.h"
+#include <openssl/mdc2.h>
 #endif
 #ifndef NO_MD5
-#include "md5.h"
-#include "hmac.h"
-#include "evp.h"
+#include <openssl/md5.h>
+#include <openssl/hmac.h>
+#include <openssl/evp.h>
 #endif
 #ifndef NO_SHA1
-#include "sha.h"
+#include <openssl/sha.h>
 #endif
 #ifndef NO_RMD160
-#include "ripemd.h"
+#include <openssl/ripemd.h>
 #endif
 #ifndef NO_RC4
-#include "rc4.h"
+#include <openssl/rc4.h>
 #endif
 #ifndef NO_RC5
-#include "rc5.h"
+#include <openssl/rc5.h>
 #endif
 #ifndef NO_RC2
-#include "rc2.h"
+#include <openssl/rc2.h>
 #endif
 #ifndef NO_IDEA
-#include "idea.h"
+#include <openssl/idea.h>
 #endif
 #ifndef NO_BLOWFISH
-#include "blowfish.h"
+#include <openssl/blowfish.h>
 #endif
 #ifndef NO_CAST
-#include "cast.h"
+#include <openssl/cast.h>
 #endif
 #ifndef NO_RSA
-#include "rsa.h"
+#include <openssl/rsa.h>
 #endif
-#include "x509.h"
+#include <openssl/x509.h>
 #include "./testrsa.h"
 #ifndef NO_DSA
 #include "./testdsa.h"
diff --git a/apps/verify.c b/apps/verify.c
index 1a324c3da9..aa6ee03a1d 100644
--- a/apps/verify.c
+++ b/apps/verify.c
@@ -60,10 +60,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #undef PROG
 #define PROG	verify_main
diff --git a/apps/version.c b/apps/version.c
index fd46e17688..f249d15aa6 100644
--- a/apps/version.c
+++ b/apps/version.c
@@ -60,8 +60,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"
-#include "evp.h"
-#include "crypto.h"
+#include <openssl/evp.h>
+#include <openssl/crypto.h>
 
 #undef PROG
 #define PROG	version_main
diff --git a/apps/x509.c b/apps/x509.c
index f1975dca9d..f336f24077 100644
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -63,15 +63,15 @@
 #define APPS_WIN16
 #endif
 #include "apps.h"
-#include "bio.h"
-#include "asn1.h"
-#include "err.h"
-#include "bn.h"
-#include "evp.h"
-#include "x509.h"
-#include "x509v3.h"
-#include "objects.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/asn1.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+#include <openssl/objects.h>
+#include <openssl/pem.h>
 
 #undef PROG
 #define PROG x509_main