diff --git a/lib/des/dh.h b/lib/des/dh.h
index 768a38ee9..a9e2c314c 100644
--- a/lib/des/dh.h
+++ b/lib/des/dh.h
@@ -63,8 +63,8 @@
 typedef struct DH DH;
 typedef struct DH_METHOD DH_METHOD;
 
-#include <bn.h>
-#include <engine.h>
+#include <hcrypto/bn.h>
+#include <hcrypto/engine.h>
 
 struct DH_METHOD {
     const char *name;
diff --git a/lib/des/dsa.h b/lib/des/dsa.h
index ed7bdd58f..94d820658 100644
--- a/lib/des/dsa.h
+++ b/lib/des/dsa.h
@@ -38,7 +38,7 @@
 #ifndef _HEIM_DSA_H
 #define _HEIM_DSA_H 1
 
-#include <bn.h>
+#include <hcrypto/bn.h>
 
 /* symbol renaming */
 #define DSA_null_method hc_DSA_null_method
diff --git a/lib/des/engine.h b/lib/des/engine.h
index fa129898c..c8317feeb 100644
--- a/lib/des/engine.h
+++ b/lib/des/engine.h
@@ -61,9 +61,9 @@
 
 typedef struct hc_engine ENGINE;
 
-#include <rsa.h>
-#include <dsa.h>
-#include <dh.h>
+#include <hcrypto/rsa.h>
+#include <hcrypto/dsa.h>
+#include <hcrypto/dh.h>
 
 #define OPENSSL_DYNAMIC_VERSION		(unsigned long)0x00020000
 
diff --git a/lib/des/evp.h b/lib/des/evp.h
index addb4f764..514bd5bcd 100644
--- a/lib/des/evp.h
+++ b/lib/des/evp.h
@@ -36,8 +36,7 @@
 #ifndef HEIM_EVP_H
 #define HEIM_EVP_H 1
 
-#include <sys/types.h>
-#include <engine.h>
+#include <hcrypto/engine.h>
 
 /* symbol renaming */
 #define EVP_CIPHER_CTX_block_size hc_EVP_CIPHER_CTX_block_size
diff --git a/lib/des/hmac.h b/lib/des/hmac.h
index 44ed662af..345016db2 100644
--- a/lib/des/hmac.h
+++ b/lib/des/hmac.h
@@ -36,7 +36,7 @@
 #ifndef HEIM_HMAC_H
 #define HEIM_HMAC_H 1
 
-#include <evp.h>
+#include <hcrypto/evp.h>
 
 /* symbol renaming */
 #define HMAC_CTX_init hc_HMAC_CTX_init
diff --git a/lib/des/pkcs12.h b/lib/des/pkcs12.h
index b4e517b2d..71ee6ee49 100644
--- a/lib/des/pkcs12.h
+++ b/lib/des/pkcs12.h
@@ -45,7 +45,7 @@
  *
  */
 
-#include <evp.h>
+#include <hcrypto/evp.h>
 
 #define PKCS12_KEY_ID 1
 #define PKCS12_IV_ID 2
diff --git a/lib/des/rand.h b/lib/des/rand.h
index 7237fcb50..b3418557d 100644
--- a/lib/des/rand.h
+++ b/lib/des/rand.h
@@ -38,7 +38,7 @@
 #ifndef _HEIM_RAND_H
 #define _HEIM_RAND_H 1
 
-#include <bn.h>
+#include <hcrypto/bn.h>
 
 /* symbol renaming */
 #define RAND_bytes hc_RAND_bytes
diff --git a/lib/des/rsa.h b/lib/des/rsa.h
index a4ea67a4c..f20eab12d 100644
--- a/lib/des/rsa.h
+++ b/lib/des/rsa.h
@@ -67,8 +67,8 @@
 typedef struct RSA RSA;
 typedef struct RSA_METHOD RSA_METHOD;
 
-#include <bn.h>
-#include <engine.h>
+#include <hcrypto/bn.h>
+#include <hcrypto/engine.h>
 
 struct RSA_METHOD {
     const char *name;