diff --git a/crypto/bf/bfs.cpp b/crypto/bf/bfs.cpp
index 272ed2f978..d74c457760 100644
--- a/crypto/bf/bfs.cpp
+++ b/crypto/bf/bfs.cpp
@@ -32,7 +32,7 @@ void GetTSC(unsigned long& tsc)
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "blowfish.h"
+#include <openssl/blowfish.h>
 
 void main(int argc,char *argv[])
 	{
diff --git a/crypto/cast/casts.cpp b/crypto/cast/casts.cpp
index bac7be2c9c..8d7bd468d2 100644
--- a/crypto/cast/casts.cpp
+++ b/crypto/cast/casts.cpp
@@ -32,7 +32,7 @@ void GetTSC(unsigned long& tsc)
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "cast.h"
+#include <openssl/cast.h>
 
 void main(int argc,char *argv[])
 	{
diff --git a/crypto/des/des3s.cpp b/crypto/des/des3s.cpp
index 9aff6494d9..02d527c057 100644
--- a/crypto/des/des3s.cpp
+++ b/crypto/des/des3s.cpp
@@ -32,7 +32,7 @@ void GetTSC(unsigned long& tsc)
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "des.h"
+#include <openssl/des.h>
 
 void main(int argc,char *argv[])
 	{
diff --git a/crypto/des/dess.cpp b/crypto/des/dess.cpp
index 7fb5987314..753e67ad9b 100644
--- a/crypto/des/dess.cpp
+++ b/crypto/des/dess.cpp
@@ -32,7 +32,7 @@ void GetTSC(unsigned long& tsc)
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "des.h"
+#include <openssl/des.h>
 
 void main(int argc,char *argv[])
 	{
diff --git a/crypto/md5/md5s.cpp b/crypto/md5/md5s.cpp
index ef8e175df0..dd343fd4e6 100644
--- a/crypto/md5/md5s.cpp
+++ b/crypto/md5/md5s.cpp
@@ -32,7 +32,7 @@ void GetTSC(unsigned long& tsc)
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "md5.h"
+#include <openssl/md5.h>
 
 extern "C" {
 void md5_block_x86(MD5_CTX *ctx, unsigned char *buffer,int num);
diff --git a/crypto/rc4/rc4s.cpp b/crypto/rc4/rc4s.cpp
index 39f1727dd3..3814fde997 100644
--- a/crypto/rc4/rc4s.cpp
+++ b/crypto/rc4/rc4s.cpp
@@ -32,7 +32,7 @@ void GetTSC(unsigned long& tsc)
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "rc4.h"
+#include <openssl/rc4.h>
 
 void main(int argc,char *argv[])
 	{
diff --git a/crypto/rc5/rc5s.cpp b/crypto/rc5/rc5s.cpp
index b069601c22..1c5518bc80 100644
--- a/crypto/rc5/rc5s.cpp
+++ b/crypto/rc5/rc5s.cpp
@@ -32,7 +32,7 @@ void GetTSC(unsigned long& tsc)
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "rc5.h"
+#include <openssl/rc5.h>
 
 void main(int argc,char *argv[])
 	{
diff --git a/crypto/ripemd/asm/rips.cpp b/crypto/ripemd/asm/rips.cpp
index 78a933c448..321a98443e 100644
--- a/crypto/ripemd/asm/rips.cpp
+++ b/crypto/ripemd/asm/rips.cpp
@@ -32,7 +32,7 @@ void GetTSC(unsigned long& tsc)
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "ripemd.h"
+#include <openssl/ripemd.h>
 
 extern "C" {
 void ripemd160_block_x86(RIPEMD160_CTX *ctx, unsigned char *buffer,int num);
diff --git a/crypto/sha/sha1s.cpp b/crypto/sha/sha1s.cpp
index 0163377de6..3103e1871b 100644
--- a/crypto/sha/sha1s.cpp
+++ b/crypto/sha/sha1s.cpp
@@ -32,7 +32,7 @@ void GetTSC(unsigned long& tsc)
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "sha.h"
+#include <openssl/sha.h>
 
 extern "C" {
 void sha1_block_x86(SHA_CTX *ctx, unsigned char *buffer,int num);
diff --git a/demos/ssl/cli.cpp b/demos/ssl/cli.cpp
index f52a9c025b..f15b7ad170 100644
--- a/demos/ssl/cli.cpp
+++ b/demos/ssl/cli.cpp
@@ -11,11 +11,11 @@
 #include <netdb.h>
 
 #include "rsa.h"       /* SSLeay stuff */
-#include "crypto.h"
-#include "x509.h"
-#include "pem.h"
-#include "ssl.h"
-#include "err.h"
+#include <openssl/crypto.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
 
 #define CHK_NULL(x) if ((x)==NULL) exit (1)
 #define CHK_ERR(err,s) if ((err)==-1) { perror(s); exit(1); }
diff --git a/demos/ssl/inetdsrv.cpp b/demos/ssl/inetdsrv.cpp
index b09c8b6e0b..5b09227210 100644
--- a/demos/ssl/inetdsrv.cpp
+++ b/demos/ssl/inetdsrv.cpp
@@ -8,11 +8,11 @@
 #include <errno.h>
 
 #include "rsa.h"       /* SSLeay stuff */
-#include "crypto.h"
-#include "x509.h"
-#include "pem.h"
-#include "ssl.h"
-#include "err.h"
+#include <openssl/crypto.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
 
 #define HOME "/usr/users/sampo/demo/"
 #define CERTF HOME "plain-cert.pem"
diff --git a/demos/ssl/serv.cpp b/demos/ssl/serv.cpp
index 8681f2f22b..feb6fdf7a6 100644
--- a/demos/ssl/serv.cpp
+++ b/demos/ssl/serv.cpp
@@ -11,11 +11,11 @@
 #include <netdb.h>
 
 #include "rsa.h"       /* SSLeay stuff */
-#include "crypto.h"
-#include "x509.h"
-#include "pem.h"
-#include "ssl.h"
-#include "err.h"
+#include <openssl/crypto.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
 
 #define HOME "/usr/users/sampo/sibs/tim/"
 #define CERTF HOME "plain-cert.pem"
diff --git a/times/x86/bfs.cpp b/times/x86/bfs.cpp
index 272ed2f978..d74c457760 100644
--- a/times/x86/bfs.cpp
+++ b/times/x86/bfs.cpp
@@ -32,7 +32,7 @@ void GetTSC(unsigned long& tsc)
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "blowfish.h"
+#include <openssl/blowfish.h>
 
 void main(int argc,char *argv[])
 	{
diff --git a/times/x86/casts.cpp b/times/x86/casts.cpp
index 7f524da57b..7661191acf 100644
--- a/times/x86/casts.cpp
+++ b/times/x86/casts.cpp
@@ -32,7 +32,7 @@ void GetTSC(unsigned long& tsc)
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "cast.h"
+#include <openssl/cast.h>
 
 void main(int argc,char *argv[])
 	{
diff --git a/times/x86/des3s.cpp b/times/x86/des3s.cpp
index 9aff6494d9..02d527c057 100644
--- a/times/x86/des3s.cpp
+++ b/times/x86/des3s.cpp
@@ -32,7 +32,7 @@ void GetTSC(unsigned long& tsc)
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "des.h"
+#include <openssl/des.h>
 
 void main(int argc,char *argv[])
 	{
diff --git a/times/x86/dess.cpp b/times/x86/dess.cpp
index 7fb5987314..753e67ad9b 100644
--- a/times/x86/dess.cpp
+++ b/times/x86/dess.cpp
@@ -32,7 +32,7 @@ void GetTSC(unsigned long& tsc)
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "des.h"
+#include <openssl/des.h>
 
 void main(int argc,char *argv[])
 	{
diff --git a/times/x86/md5s.cpp b/times/x86/md5s.cpp
index ef8e175df0..dd343fd4e6 100644
--- a/times/x86/md5s.cpp
+++ b/times/x86/md5s.cpp
@@ -32,7 +32,7 @@ void GetTSC(unsigned long& tsc)
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "md5.h"
+#include <openssl/md5.h>
 
 extern "C" {
 void md5_block_x86(MD5_CTX *ctx, unsigned char *buffer,int num);
diff --git a/times/x86/rc4s.cpp b/times/x86/rc4s.cpp
index 39f1727dd3..3814fde997 100644
--- a/times/x86/rc4s.cpp
+++ b/times/x86/rc4s.cpp
@@ -32,7 +32,7 @@ void GetTSC(unsigned long& tsc)
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "rc4.h"
+#include <openssl/rc4.h>
 
 void main(int argc,char *argv[])
 	{
diff --git a/times/x86/sha1s.cpp b/times/x86/sha1s.cpp
index 0163377de6..3103e1871b 100644
--- a/times/x86/sha1s.cpp
+++ b/times/x86/sha1s.cpp
@@ -32,7 +32,7 @@ void GetTSC(unsigned long& tsc)
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "sha.h"
+#include <openssl/sha.h>
 
 extern "C" {
 void sha1_block_x86(SHA_CTX *ctx, unsigned char *buffer,int num);