diff --git a/engines/e_4758_cca.c b/engines/e_4758_cca.c
index b02989f3367abc1004b10cfcc12e5c2fccb0179d..2e77f8c6471c0c6dd6e51247c512be704e08fef2 100644
--- a/engines/e_4758_cca.c
+++ b/engines/e_4758_cca.c
@@ -56,7 +56,6 @@
 #include <stdio.h>
 #include <openssl/crypto.h>
 /* #include <openssl/pem.h> */
-#include "cryptlib.h"
 #include <openssl/dso.h>
 #include <openssl/x509.h>
 #include <openssl/objects.h>
@@ -71,7 +70,7 @@
 #include "vendor_defns/hw_4758_cca.h"
 #endif
 
-#include "hw_4758_cca_err.c"
+#include "e_4758_cca_err.c"
 
 static int ibm_4758_cca_destroy(ENGINE *e);
 static int ibm_4758_cca_init(ENGINE *e);
diff --git a/engines/e_4758_cca_err.c b/engines/e_4758_cca_err.c
index 7ea5c63707bc19a6ca40d5bd87c203f7c2d29d04..12c6d2eeda9913c662a95295aa1846cd47f19cee 100644
--- a/engines/e_4758_cca_err.c
+++ b/engines/e_4758_cca_err.c
@@ -60,7 +60,7 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "hw_4758_cca_err.h"
+#include "e_4758_cca_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
diff --git a/engines/e_aep.c b/engines/e_aep.c
index daea7e86e9b9ae80da6a34f343452707936daf34..b01d7094f4dab7a4370709ce2aa7879ed3b2d055 100644
--- a/engines/e_aep.c
+++ b/engines/e_aep.c
@@ -84,7 +84,7 @@ typedef int pid_t;
 #define AEP_LIB_NAME "aep engine"
 #define FAIL_TO_SW 0x10101010
 
-#include "hw_aep_err.c"
+#include "e_aep_err.c"
 
 static int aep_init(ENGINE *e);
 static int aep_finish(ENGINE *e);
diff --git a/engines/e_aep_err.c b/engines/e_aep_err.c
index 092f532946c36b599cdae49cf26b6621cf834adb..3a0e72463c722da144c8d07d5fb2d326eb318e2e 100644
--- a/engines/e_aep_err.c
+++ b/engines/e_aep_err.c
@@ -60,7 +60,7 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "hw_aep_err.h"
+#include "e_aep_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
diff --git a/engines/e_atalla.c b/engines/e_atalla.c
index 3f7494c707d3d570a49751262f75d5b27c7eac78..be590f0ebbd86cb1bd92ab3347ba727976227bc0 100644
--- a/engines/e_atalla.c
+++ b/engines/e_atalla.c
@@ -58,7 +58,7 @@
 
 #include <stdio.h>
 #include <openssl/crypto.h>
-#include "cryptlib.h"
+#include <openssl/buffer.h>
 #include <openssl/dso.h>
 #include <openssl/engine.h>
 
@@ -72,7 +72,7 @@
 #endif
 
 #define ATALLA_LIB_NAME "atalla engine"
-#include "hw_atalla_err.c"
+#include "e_atalla_err.c"
 
 static int atalla_destroy(ENGINE *e);
 static int atalla_init(ENGINE *e);
diff --git a/engines/e_atalla_err.c b/engines/e_atalla_err.c
index 1df9c4570c575558eafde9e1092ffc35efe77fb7..94f637a613d515f6dafb5f13d86db7d7e8ec46a3 100644
--- a/engines/e_atalla_err.c
+++ b/engines/e_atalla_err.c
@@ -60,7 +60,7 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "hw_atalla_err.h"
+#include "e_atalla_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
diff --git a/engines/e_cswift.c b/engines/e_cswift.c
index a813227149a96e370355bcc17437d930c4cb2119..23d7919da0f1744fee94da7965f5f08e9dce5196 100644
--- a/engines/e_cswift.c
+++ b/engines/e_cswift.c
@@ -58,7 +58,7 @@
 
 #include <stdio.h>
 #include <openssl/crypto.h>
-#include "cryptlib.h"
+#include <openssl/buffer.h>
 #include <openssl/dso.h>
 #include <openssl/engine.h>
 
@@ -84,7 +84,7 @@
 #endif
 
 #define CSWIFT_LIB_NAME "cswift engine"
-#include "hw_cswift_err.c"
+#include "e_cswift_err.c"
 
 static int cswift_destroy(ENGINE *e);
 static int cswift_init(ENGINE *e);
diff --git a/engines/e_cswift_err.c b/engines/e_cswift_err.c
index 684f53bf27ec07e30db80c0b35d4d79b67c7ed1e..3c1111ba408bfac486a71f31c9ac3b8d719e2097 100644
--- a/engines/e_cswift_err.c
+++ b/engines/e_cswift_err.c
@@ -60,7 +60,7 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "hw_cswift_err.h"
+#include "e_cswift_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
diff --git a/engines/e_ncipher.c b/engines/e_ncipher.c
index 614f9a1dde278faa381c3889934071385edaa9fa..f38a6a6b3578b39d8da57b423a8a300aea3f13bd 100644
--- a/engines/e_ncipher.c
+++ b/engines/e_ncipher.c
@@ -59,7 +59,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "cryptlib.h"
 #include <openssl/crypto.h>
 #include <openssl/pem.h>
 #include <openssl/dso.h>
@@ -84,7 +83,7 @@
 #endif
 
 #define HWCRHK_LIB_NAME "hwcrhk engine"
-#include "hw_ncipher_err.c"
+#include "e_ncipher_err.c"
 
 static int hwcrhk_destroy(ENGINE *e);
 static int hwcrhk_init(ENGINE *e);
diff --git a/engines/e_ncipher_err.c b/engines/e_ncipher_err.c
index 24024cfc6f453e694924b3f1924f80e9c84a653f..692435eee74dc583417295892f798b338f8b193d 100644
--- a/engines/e_ncipher_err.c
+++ b/engines/e_ncipher_err.c
@@ -60,7 +60,7 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "hw_ncipher_err.h"
+#include "e_ncipher_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
diff --git a/engines/e_nuron.c b/engines/e_nuron.c
index c3a53275946c4a033846c9c4c5ac7ac22a3df029..4585dbed1fa77c0b5f627e24e571a829a982fd6b 100644
--- a/engines/e_nuron.c
+++ b/engines/e_nuron.c
@@ -58,7 +58,7 @@
 
 #include <stdio.h>
 #include <openssl/crypto.h>
-#include "cryptlib.h"
+#include <openssl/buffer.h>
 #include <openssl/dso.h>
 #include <openssl/engine.h>
 
@@ -67,7 +67,7 @@
 #ifndef OPENSSL_NO_HW_NURON
 
 #define NURON_LIB_NAME "nuron engine"
-#include "hw_nuron_err.c"
+#include "e_nuron_err.c"
 
 static const char *NURON_LIBNAME = NULL;
 static const char *get_NURON_LIBNAME(void)
diff --git a/engines/e_nuron_err.c b/engines/e_nuron_err.c
index df9d7bde7669d99f76c5964736bb2f2008f42ef1..739529a1fa181d77c68ed076846291b9c14e5d5b 100644
--- a/engines/e_nuron_err.c
+++ b/engines/e_nuron_err.c
@@ -60,7 +60,7 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "hw_nuron_err.h"
+#include "e_nuron_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
diff --git a/engines/e_sureware.c b/engines/e_sureware.c
index 89488b9e1b37d2536af74c9075f8c248dd74569b..dced97c695a568f3cffed2942e92c8a715321684 100644
--- a/engines/e_sureware.c
+++ b/engines/e_sureware.c
@@ -51,12 +51,9 @@
 ====================================================================*/
 
 #include <stdio.h>
-#include "cryptlib.h"
 #include <openssl/crypto.h>
 #include <openssl/pem.h>
 #include <openssl/dso.h>
-#include "eng_int.h"
-#include "engine.h"
 #include <openssl/engine.h>
 
 #ifndef OPENSSL_NO_HW
@@ -69,7 +66,7 @@
 #endif
 
 #define SUREWARE_LIB_NAME "sureware engine"
-#include "hw_sureware_err.c"
+#include "e_sureware_err.c"
 
 static int surewarehk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
 static int surewarehk_destroy(ENGINE *e);
diff --git a/engines/e_sureware_err.c b/engines/e_sureware_err.c
index 69955dadbb9054389d6c76681af429c8aaa42963..3ca03367b2ff622423adb4a339d4c950d43a67db 100644
--- a/engines/e_sureware_err.c
+++ b/engines/e_sureware_err.c
@@ -60,7 +60,7 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "hw_sureware_err.h"
+#include "e_sureware_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
diff --git a/engines/e_ubsec.c b/engines/e_ubsec.c
index 7d077c7bc322abbc43bc188c057015d89d1eae98..fe4a3b7ef753925742dcb5f194d2e06fbf23c844 100644
--- a/engines/e_ubsec.c
+++ b/engines/e_ubsec.c
@@ -60,7 +60,7 @@
 
 #include <stdio.h>
 #include <openssl/crypto.h>
-#include "cryptlib.h"
+#include <openssl/buffer.h>
 #include <openssl/dso.h>
 #include <openssl/engine.h>
 
@@ -74,7 +74,7 @@
 #endif
 
 #define UBSEC_LIB_NAME "ubsec engine"
-#include "hw_ubsec_err.c"
+#include "e_ubsec_err.c"
 
 #define FAIL_TO_SOFTWARE -15
 
diff --git a/engines/e_ubsec_err.c b/engines/e_ubsec_err.c
index d707331fc201eab6ea6497ffe5d2d53636ebbcd2..5504116511d20b4b71cddba82c89c830529952a6 100644
--- a/engines/e_ubsec_err.c
+++ b/engines/e_ubsec_err.c
@@ -60,7 +60,7 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "hw_ubsec_err.h"
+#include "e_ubsec_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR