diff --git a/apps/apps.h b/apps/apps.h
index 70c9278c6f3307eded9982820015508e0b0a8ea4..a279d42b56d00e5766f65d4a3e2869c8b8d5027d 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -18,7 +18,6 @@
 # include <openssl/ossl_typ.h>
 # include <openssl/bio.h>
 # include <openssl/x509.h>
-# include <openssl/lhash.h>
 # include <openssl/conf.h>
 # include <openssl/txt_db.h>
 # include <openssl/engine.h>
diff --git a/apps/errstr.c b/apps/errstr.c
index 8b993fa20ed3f4af915256d21ad864362faeb012..a02fa689dc85a0e69861f7eb59a938b08806ecba 100644
--- a/apps/errstr.c
+++ b/apps/errstr.c
@@ -12,7 +12,6 @@
 #include <string.h>
 #include "apps.h"
 #include <openssl/bio.h>
-#include <openssl/lhash.h>
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
diff --git a/apps/s_server.c b/apps/s_server.c
index bc3922b03057e1a9a17c1dffbbf3e6f29272f566..b22f08311b7496f2cd69540324f877a450e2162d 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -35,7 +35,6 @@
 typedef unsigned int u_int;
 #endif
 
-#include <openssl/lhash.h>
 #include <openssl/bn.h>
 #include "apps.h"
 #include <openssl/err.h>
diff --git a/apps/spkac.c b/apps/spkac.c
index 0560cc8233fdd72f52a0eb3af6a41e667378f003..d1414d6713bc89a7e3e7efce1bfdfde536bf2bac 100644
--- a/apps/spkac.c
+++ b/apps/spkac.c
@@ -16,7 +16,6 @@
 #include <openssl/conf.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
-#include <openssl/lhash.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 
diff --git a/crypto/err/err.c b/crypto/err/err.c
index 5e3474fffff007ae03f486d472dbad3f97c287b7..58a58c22b66d5bf78ce63e7552ab085ef18e1138 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -13,7 +13,6 @@
 #include "internal/cryptlib_int.h"
 #include "internal/err.h"
 #include "internal/err_int.h"
-#include <openssl/lhash.h>
 #include <openssl/err.h>
 #include <openssl/crypto.h>
 #include <openssl/buffer.h>
diff --git a/crypto/err/err_prn.c b/crypto/err/err_prn.c
index c7dc1d151a42342f6fe7b903cd8f2e606e87a686..a528d08d4ea347dde847c7df76b484c937329931 100644
--- a/crypto/err/err_prn.c
+++ b/crypto/err/err_prn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -9,7 +9,6 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
-#include <openssl/lhash.h>
 #include <openssl/crypto.h>
 #include <openssl/buffer.h>
 #include <openssl/err.h>
diff --git a/crypto/ex_data.c b/crypto/ex_data.c
index 30b16f945728a6c4de1601782987606ac77c7653..78162b5c092098163512a775c64300efb887e619 100644
--- a/crypto/ex_data.c
+++ b/crypto/ex_data.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -9,7 +9,6 @@
 
 #include "internal/cryptlib_int.h"
 #include "internal/thread_once.h"
-#include <openssl/lhash.h>
 
 /*
  * Each structure type (sometimes called a class), that supports
diff --git a/crypto/objects/obj_lib.c b/crypto/objects/obj_lib.c
index 33075e6451742bf3ce7d3798c56f3a7cf5aac3b3..ec791992d6aebe14bf970552481cd615ab1cd84d 100644
--- a/crypto/objects/obj_lib.c
+++ b/crypto/objects/obj_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -9,7 +9,6 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
-#include <openssl/lhash.h>
 #include <openssl/objects.h>
 #include <openssl/buffer.h>
 #include "internal/asn1_int.h"
diff --git a/crypto/rsa/rsa_crpt.c b/crypto/rsa/rsa_crpt.c
index cc621530398ddaeb83691a212401ca938c4b64a1..f4ef8b4381f71e873963970fd8258ad70c5743bd 100644
--- a/crypto/rsa/rsa_crpt.c
+++ b/crypto/rsa/rsa_crpt.c
@@ -10,7 +10,6 @@
 #include <stdio.h>
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
-#include <openssl/lhash.h>
 #include "internal/bn_int.h"
 #include <openssl/rand.h>
 #include "rsa_locl.h"
diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c
index 45ec81337663538cfb287521f2adb9babb81b6c3..e43d8238b5fc79d386d7d9148078463ad27ab0e6 100644
--- a/crypto/rsa/rsa_lib.c
+++ b/crypto/rsa/rsa_lib.c
@@ -11,7 +11,6 @@
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
 #include "internal/refcount.h"
-#include <openssl/lhash.h>
 #include "internal/bn_int.h"
 #include <openssl/engine.h>
 #include <openssl/evp.h>
diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
index b83a473017341f2dc07576044195aeb9e1779ada..03c3cde96b4f540d38ab9305a48671e995c70d64 100644
--- a/crypto/x509/by_dir.c
+++ b/crypto/x509/by_dir.c
@@ -18,8 +18,6 @@
 # include <sys/stat.h>
 #endif
 
-
-#include <openssl/lhash.h>
 #include <openssl/x509.h>
 #include "internal/x509_int.h"
 #include "x509_lcl.h"
diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c
index 457118ed63cc8e1c1d36b5dbfbbc55d64396181b..1dbe351adcdcc7e2a406218ee687f42a5b6a3ede 100644
--- a/crypto/x509/by_file.c
+++ b/crypto/x509/by_file.c
@@ -12,7 +12,6 @@
 #include <errno.h>
 
 #include "internal/cryptlib.h"
-#include <openssl/lhash.h>
 #include <openssl/buffer.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index f45b06112d3dd7ea77219a8fca71d82c830dbec6..b8845f1e64fcd5811ec5ecce5e2eef2118ca7528 100644
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c
@@ -10,7 +10,6 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include "internal/refcount.h"
-#include <openssl/lhash.h>
 #include <openssl/x509.h>
 #include "internal/x509_int.h"
 #include <openssl/x509v3.h>
diff --git a/crypto/x509/x509_obj.c b/crypto/x509/x509_obj.c
index 55dc778bba76759290047572d2caca7333021412..b6d60be6fd927d495bc1a2085bb5ec902d59994f 100644
--- a/crypto/x509/x509_obj.c
+++ b/crypto/x509/x509_obj.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -9,7 +9,6 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
-#include <openssl/lhash.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/buffer.h>
diff --git a/crypto/x509/x509_txt.c b/crypto/x509/x509_txt.c
index a460bf5474d38a894ade16b94094bfaebdea976b..157db38f8cf23cd35575a46e50da4732b76a0b56 100644
--- a/crypto/x509/x509_txt.c
+++ b/crypto/x509/x509_txt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,7 +12,6 @@
 #include <errno.h>
 
 #include "internal/cryptlib.h"
-#include <openssl/lhash.h>
 #include <openssl/buffer.h>
 #include <openssl/evp.h>
 #include <openssl/asn1.h>
diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index d4a5f3a6ba418f7028d58b8a768e7a32f7af398b..9ebda1bb1fca8cd3b837a5e207cfc7983697cf2a 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -15,7 +15,6 @@
 #include "internal/ctype.h"
 #include "internal/cryptlib.h"
 #include <openssl/crypto.h>
-#include <openssl/lhash.h>
 #include <openssl/buffer.h>
 #include <openssl/evp.h>
 #include <openssl/asn1.h>
diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c
index 95f1c5b4c824c02e03b8372eaaac8d02532f9555..033ec423bc69fdd7519037e52366a2a387b76d2e 100644
--- a/crypto/x509/x509_vpm.c
+++ b/crypto/x509/x509_vpm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -11,7 +11,6 @@
 
 #include "internal/cryptlib.h"
 #include <openssl/crypto.h>
-#include <openssl/lhash.h>
 #include <openssl/buffer.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index a79c6d377efe9d2cebca6f612a6f21152f036803..7bc409c494171a0227ebb40e64a11caaefc9dfa7 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -19,9 +19,9 @@
 # if OPENSSL_API_COMPAT < 0x10100000L
 #  include <openssl/x509.h>
 #  include <openssl/crypto.h>
-#  include <openssl/lhash.h>
 #  include <openssl/buffer.h>
 # endif
+# include <openssl/lhash.h>
 # include <openssl/pem.h>
 # include <openssl/hmac.h>
 # include <openssl/async.h>
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index a517cf11e6e2452bb8a22a0ac41c95706f9820e5..008b58f4bd16fd56f7476ee1314d998a4b274d6c 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -13,7 +13,6 @@
 
 #include "internal/nelem.h"
 #include "internal/o_dir.h"
-#include <openssl/lhash.h>
 #include <openssl/bio.h>
 #include <openssl/pem.h>
 #include <openssl/x509v3.h>
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 85425a1887368a080a57d1e3993e2fe649021d7c..063c312080ce2ab9ef84b3da9e06d33c173c0838 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -12,7 +12,6 @@
 #include <stdio.h>
 #include "ssl_locl.h"
 #include <openssl/objects.h>
-#include <openssl/lhash.h>
 #include <openssl/x509v3.h>
 #include <openssl/rand.h>
 #include <openssl/ocsp.h>
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 1482a3e7c75bdba03d9920263731f7c42222c3ad..dcdf4f6e022958f313376dcf037919d2d1542898 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -9,7 +9,6 @@
  */
 
 #include <stdio.h>
-#include <openssl/lhash.h>
 #include <openssl/rand.h>
 #include <openssl/engine.h>
 #include "internal/refcount.h"