From 677963e5a428739062ab5d46d5baed5eadd0195d Mon Sep 17 00:00:00 2001
From: Pauli <paul.dale@oracle.com>
Date: Fri, 18 Aug 2017 13:52:46 +1000
Subject: [PATCH] e_os.h removal from other headers and source files.

Removed e_os.h from all bar three headers (apps/apps.h crypto/bio/bio_lcl.h and
ssl/ssl_locl.h).

Added e_os.h into the files that need it now.

Directly reference internal/nelem.h when required.

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4188)
---
 apps/apps.h                     | 3 ++-
 crypto/asn1/ameth_lib.c         | 5 +++--
 crypto/asn1/tasn_utl.c          | 3 ++-
 crypto/async/arch/async_posix.h | 1 -
 crypto/blake2/blake2_impl.h     | 3 +--
 crypto/blake2/blake2_locl.h     | 3 +--
 crypto/bn/bn_dh.c               | 4 ++--
 crypto/bn/bn_srp.c              | 4 ++--
 crypto/cast/cast_lcl.h          | 4 +---
 crypto/conf/conf_mod.c          | 1 +
 crypto/cryptlib.c               | 3 ++-
 crypto/des/cfb64ede.c           | 2 +-
 crypto/dh/dh_lib.c              | 1 +
 crypto/dllmain.c                | 3 ++-
 crypto/dsa/dsa_lib.c            | 3 ++-
 crypto/dso/dso_lib.c            | 3 ++-
 crypto/dso/dso_win32.c          | 3 ++-
 crypto/ec/ec_asn1.c             | 1 +
 crypto/ec/ec_curve.c            | 2 +-
 crypto/ec/ec_key.c              | 3 ++-
 crypto/ec/ec_lcl.h              | 4 +---
 crypto/ec/ec_mult.c             | 3 ++-
 crypto/ec/ecp_nistz256.c        | 3 ++-
 crypto/engine/eng_init.c        | 3 ++-
 crypto/engine/eng_lib.c         | 1 +
 crypto/engine/tb_asnmth.c       | 3 ++-
 crypto/evp/p_lib.c              | 1 +
 crypto/init.c                   | 1 +
 crypto/mem.c                    | 1 +
 crypto/objects/obj_xref.c       | 4 ++--
 crypto/rsa/rsa_lib.c            | 1 +
 crypto/ui/ui_openssl.c          | 3 ++-
 crypto/x509/by_dir.c            | 1 +
 crypto/x509/x509_lu.c           | 1 +
 crypto/x509/x509_set.c          | 3 ++-
 crypto/x509/x509cset.c          | 3 ++-
 crypto/x509v3/v3_ncons.c        | 4 +++-
 crypto/x509v3/v3_tlsf.c         | 3 ++-
 crypto/x509v3/v3_utl.c          | 1 +
 include/internal/cryptlib.h     | 5 ++---
 ssl/d1_lib.c                    | 3 ++-
 ssl/record/rec_layer_s3.c       | 2 +-
 ssl/s3_lib.c                    | 2 ++
 ssl/ssl_cert.c                  | 7 ++++++-
 ssl/ssl_ciph.c                  | 1 +
 ssl/ssl_conf.c                  | 3 ++-
 ssl/ssl_lib.c                   | 3 ++-
 ssl/ssl_locl.h                  | 2 +-
 ssl/ssl_sess.c                  | 3 ++-
 ssl/statem/extensions.c         | 1 +
 ssl/statem/statem.c             | 3 ++-
 ssl/t1_lib.c                    | 3 ++-
 test/bftest.c                   | 1 +
 test/ctype_internal_test.c      | 2 +-
 test/tls13encryptiontest.c      | 1 +
 55 files changed, 90 insertions(+), 51 deletions(-)

diff --git a/apps/apps.h b/apps/apps.h
index fdf316a08e9e0..bbc9a5ad8fc78 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -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
@@ -10,6 +10,7 @@
 #ifndef HEADER_APPS_H
 # define HEADER_APPS_H
 
+# include "internal/nelem.h"
 # include "e_os.h"
 # if defined(__unix) || defined(__unix__)
 #  include <sys/time.h> /* struct timeval for DTLS */
diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c
index c677917c2f598..82868e136668e 100644
--- a/crypto/asn1/ameth_lib.c
+++ b/crypto/asn1/ameth_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-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
@@ -7,8 +7,9 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <stdio.h>
+#include "e_os.h"               /* for strncasecmp */
 #include "internal/cryptlib.h"
+#include <stdio.h>
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
 #include <openssl/engine.h>
diff --git a/crypto/asn1/tasn_utl.c b/crypto/asn1/tasn_utl.c
index 9fc4cc264232b..5f7e4fbde2e22 100644
--- a/crypto/asn1/tasn_utl.c
+++ b/crypto/asn1/tasn_utl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-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
@@ -10,6 +10,7 @@
 #include <stddef.h>
 #include <string.h>
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
 #include <openssl/objects.h>
diff --git a/crypto/async/arch/async_posix.h b/crypto/async/arch/async_posix.h
index 3c61f7f7b0818..4d88bd1993925 100644
--- a/crypto/async/arch/async_posix.h
+++ b/crypto/async/arch/async_posix.h
@@ -26,7 +26,6 @@
 
 #  include <ucontext.h>
 #  include <setjmp.h>
-#  include "e_os.h"
 
 typedef struct async_fibre_st {
     ucontext_t fibre;
diff --git a/crypto/blake2/blake2_impl.h b/crypto/blake2/blake2_impl.h
index 8fe5c95915059..80b717e79c08a 100644
--- a/crypto/blake2/blake2_impl.h
+++ b/crypto/blake2/blake2_impl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-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
@@ -15,7 +15,6 @@
  */
 
 #include <string.h>
-#include "e_os.h"
 
 static ossl_inline uint32_t load32(const uint8_t *src)
 {
diff --git a/crypto/blake2/blake2_locl.h b/crypto/blake2/blake2_locl.h
index fb7beb976c2f1..926bae944c174 100644
--- a/crypto/blake2/blake2_locl.h
+++ b/crypto/blake2/blake2_locl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-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
@@ -15,7 +15,6 @@
  */
 
 #include <stddef.h>
-#include "e_os.h"
 
 #define BLAKE2S_BLOCKBYTES    64
 #define BLAKE2S_OUTBYTES      32
diff --git a/crypto/bn/bn_dh.c b/crypto/bn/bn_dh.c
index 17d05597b3fc3..75d69151a1445 100644
--- a/crypto/bn/bn_dh.c
+++ b/crypto/bn/bn_dh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2014-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
@@ -8,7 +8,7 @@
  */
 
 #include "bn_lcl.h"
-#include "e_os.h"
+#include "internal/nelem.h"
 
 #ifndef OPENSSL_NO_DH
 #include <openssl/dh.h>
diff --git a/crypto/bn/bn_srp.c b/crypto/bn/bn_srp.c
index a68a4ac49f967..27b6ebe518ea8 100644
--- a/crypto/bn/bn_srp.c
+++ b/crypto/bn/bn_srp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2014-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
@@ -8,7 +8,7 @@
  */
 
 #include "bn_lcl.h"
-#include "e_os.h"
+#include "internal/nelem.h"
 
 #ifndef OPENSSL_NO_SRP
 
diff --git a/crypto/cast/cast_lcl.h b/crypto/cast/cast_lcl.h
index e8cf322d430dc..35e89930a8c02 100644
--- a/crypto/cast/cast_lcl.h
+++ b/crypto/cast/cast_lcl.h
@@ -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
@@ -7,8 +7,6 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "e_os.h"
-
 #ifdef OPENSSL_SYS_WIN32
 # include <stdlib.h>
 #endif
diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c
index 932c69d7b7d29..da591cba6366e 100644
--- a/crypto/conf/conf_mod.c
+++ b/crypto/conf/conf_mod.c
@@ -11,6 +11,7 @@
 #include <ctype.h>
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include "internal/conf.h"
 #include "internal/dso.h"
 #include <openssl/x509.h>
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 4fe6a451406ce..bafcaab9668be 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1998-2017 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -9,6 +9,7 @@
  */
 
 #include "internal/cryptlib_int.h"
+#include "e_os.h"
 #include <openssl/safestack.h>
 
 #if     defined(__i386)   || defined(__i386__)   || defined(_M_IX86) || \
diff --git a/crypto/des/cfb64ede.c b/crypto/des/cfb64ede.c
index 5edb979e1069e..7017fd96ff47a 100644
--- a/crypto/des/cfb64ede.c
+++ b/crypto/des/cfb64ede.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
diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c
index f22bcf07062b4..9e8877e2d7a66 100644
--- a/crypto/dh/dh_lib.c
+++ b/crypto/dh/dh_lib.c
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include <openssl/bn.h>
 #include "dh_locl.h"
 #include <openssl/engine.h>
diff --git a/crypto/dllmain.c b/crypto/dllmain.c
index 91904aad983b5..376a34165a0c9 100644
--- a/crypto/dllmain.c
+++ b/crypto/dllmain.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-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
@@ -8,6 +8,7 @@
  */
 
 #include "internal/cryptlib_int.h"
+#include "e_os.h"
 
 #if defined(_WIN32) || defined(__CYGWIN__)
 # ifdef __CYGWIN__
diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index c90d09b0f06f9..efd98c21cf43d 100644
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_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
@@ -11,6 +11,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include <openssl/bn.h>
 #include "dsa_locl.h"
 #include <openssl/asn1.h>
diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c
index ec3c59ac4d222..3645c8d603ae2 100644
--- a/crypto/dso/dso_lib.c
+++ b/crypto/dso/dso_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-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
@@ -8,6 +8,7 @@
  */
 
 #include "dso_locl.h"
+#include "e_os.h"
 
 static DSO_METHOD *default_DSO_meth = NULL;
 
diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c
index 829f1b859b019..635974be7017f 100644
--- a/crypto/dso/dso_win32.c
+++ b/crypto/dso/dso_win32.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-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
@@ -7,6 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "e_os.h"
 #include "dso_locl.h"
 
 #if defined(DSO_WIN32)
diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index d57f3b4649575..5e3fbe82e759c 100644
--- a/crypto/ec/ec_asn1.c
+++ b/crypto/ec/ec_asn1.c
@@ -12,6 +12,7 @@
 #include <openssl/err.h>
 #include <openssl/asn1t.h>
 #include <openssl/objects.h>
+#include "internal/nelem.h"
 
 int EC_GROUP_get_basis_type(const EC_GROUP *group)
 {
diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c
index b9eb9939c49c4..99288fe59cea8 100644
--- a/crypto/ec/ec_curve.c
+++ b/crypto/ec/ec_curve.c
@@ -13,7 +13,7 @@
 #include <openssl/err.h>
 #include <openssl/obj_mac.h>
 #include <openssl/opensslconf.h>
-#include "e_os.h"
+#include "internal/nelem.h"
 
 typedef struct {
     int field_type,             /* either NID_X9_62_prime_field or
diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index 6aa204eed09b2..882c88229694b 100644
--- a/crypto/ec/ec_key.c
+++ b/crypto/ec/ec_key.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2017 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -11,6 +11,7 @@
 #include "internal/cryptlib.h"
 #include <string.h>
 #include "ec_lcl.h"
+#include "e_os.h"
 #include <openssl/err.h>
 #include <openssl/engine.h>
 
diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h
index 4b65c325af72d..6cc0190aa7f8d 100644
--- a/crypto/ec/ec_lcl.h
+++ b/crypto/ec/ec_lcl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -15,8 +15,6 @@
 #include <openssl/bn.h>
 #include "internal/refcount.h"
 
-#include "e_os.h"
-
 #if defined(__SUNPRO_C)
 # if __SUNPRO_C >= 0x520
 #  pragma error_messages (off,E_ARRAY_OF_INCOMPLETE_NONAME,E_ARRAY_OF_INCOMPLETE)
diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c
index 308cb52d495e0..6f75416425240 100644
--- a/crypto/ec/ec_mult.c
+++ b/crypto/ec/ec_mult.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -14,6 +14,7 @@
 #include "internal/cryptlib.h"
 #include "internal/bn_int.h"
 #include "ec_lcl.h"
+#include "e_os.h"
 
 /*
  * This file implements the wNAF-based interleaving multi-exponentiation method
diff --git a/crypto/ec/ecp_nistz256.c b/crypto/ec/ecp_nistz256.c
index 16557d77f2ef3..edea1f8810c30 100644
--- a/crypto/ec/ecp_nistz256.c
+++ b/crypto/ec/ecp_nistz256.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2014, Intel Corporation. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -21,6 +21,7 @@
 #include "internal/cryptlib.h"
 #include "internal/bn_int.h"
 #include "ec_lcl.h"
+#include "e_os.h"
 
 #if BN_BITS2 != 64
 # define TOBN(hi,lo)    lo,hi
diff --git a/crypto/engine/eng_init.c b/crypto/engine/eng_init.c
index 8be7c6fc8658b..3d5eaa14e4ea0 100644
--- a/crypto/engine/eng_init.c
+++ b/crypto/engine/eng_init.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-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
@@ -8,6 +8,7 @@
  */
 
 #include "eng_int.h"
+#include "e_os.h"
 
 /*
  * Initialise a engine type for use (or up its functional reference count if
diff --git a/crypto/engine/eng_lib.c b/crypto/engine/eng_lib.c
index 6f422bd77e8a3..51998340a9408 100644
--- a/crypto/engine/eng_lib.c
+++ b/crypto/engine/eng_lib.c
@@ -8,6 +8,7 @@
  */
 
 #include "eng_int.h"
+#include "e_os.h"
 #include <openssl/rand.h>
 #include "internal/refcount.h"
 
diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c
index 480267daabad9..ca3727e90227d 100644
--- a/crypto/engine/tb_asnmth.c
+++ b/crypto/engine/tb_asnmth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-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
@@ -8,6 +8,7 @@
  */
 
 #include "eng_int.h"
+#include "e_os.h"
 #include <openssl/evp.h>
 #include "internal/asn1_int.h"
 
diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index b5e5206778ffd..266d8ca47b9f6 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include <openssl/bn.h>
 #include <openssl/err.h>
 #include <openssl/objects.h>
diff --git a/crypto/init.c b/crypto/init.c
index ccfd003bb630c..fa68a29b2c251 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -25,6 +25,7 @@
 #include "internal/thread_once.h"
 #include "internal/dso.h"
 #include "internal/store.h"
+#include "e_os.h"
 
 static int stopped = 0;
 
diff --git a/crypto/mem.c b/crypto/mem.c
index 947c50ed21dcb..2713b833c0b56 100644
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -11,6 +11,7 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <openssl/crypto.h>
+#include "e_os.h"
 #include "internal/cryptlib.h"
 #include "internal/cryptlib_int.h"
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
diff --git a/crypto/objects/obj_xref.c b/crypto/objects/obj_xref.c
index 9a558a24cd970..05a5c86217e7e 100644
--- a/crypto/objects/obj_xref.c
+++ b/crypto/objects/obj_xref.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-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,7 @@
 
 #include <openssl/objects.h>
 #include "obj_xref.h"
-#include "e_os.h"
+#include "internal/nelem.h"
 
 static STACK_OF(nid_triple) *sig_app, *sigx_app;
 
diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c
index 7a1d81c206d42..92d872886b207 100644
--- a/crypto/rsa/rsa_lib.c
+++ b/crypto/rsa/rsa_lib.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include <openssl/lhash.h>
 #include "internal/bn_int.h"
 #include <openssl/engine.h>
diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
index 977c7ad2b9ed0..cff1a840abe14 100644
--- a/crypto/ui/ui_openssl.c
+++ b/crypto/ui/ui_openssl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-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
@@ -10,6 +10,7 @@
 #include <openssl/e_os2.h>
 #include <openssl/err.h>
 #include <openssl/ui.h>
+#include "e_os.h"
 
 #ifndef OPENSSL_NO_UI_CONSOLE
 /*
diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
index d8142977a86fe..335c3b3dda23f 100644
--- a/crypto/x509/by_dir.c
+++ b/crypto/x509/by_dir.c
@@ -13,6 +13,7 @@
 #include <sys/types.h>
 
 #include "internal/cryptlib.h"
+#include "e_os.h"
 
 #ifndef OPENSSL_NO_POSIX_IO
 # include <sys/stat.h>
diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index e64fda24f405b..7d915aa76245c 100644
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include <openssl/lhash.h>
 #include <openssl/x509.h>
 #include "internal/x509_int.h"
diff --git a/crypto/x509/x509_set.c b/crypto/x509/x509_set.c
index 08b71ff582129..49f8651e9a6ac 100644
--- a/crypto/x509/x509_set.c
+++ b/crypto/x509/x509_set.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,6 +9,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include <openssl/asn1.h>
 #include <openssl/objects.h>
 #include <openssl/evp.h>
diff --git a/crypto/x509/x509cset.c b/crypto/x509/x509cset.c
index 3c9c32296e533..63ad319181d9e 100644
--- a/crypto/x509/x509cset.c
+++ b/crypto/x509/x509cset.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-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,6 +9,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include <openssl/asn1.h>
 #include <openssl/objects.h>
 #include <openssl/evp.h>
diff --git a/crypto/x509v3/v3_ncons.c b/crypto/x509v3/v3_ncons.c
index 36ff966a36bb4..3b9145b15e0b8 100644
--- a/crypto/x509v3/v3_ncons.c
+++ b/crypto/x509v3/v3_ncons.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2003-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
@@ -7,8 +7,10 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "e_os.h"               /* for strncasecmp */
 #include <stdio.h>
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include "internal/asn1_int.h"
 #include <openssl/asn1t.h>
 #include <openssl/conf.h>
diff --git a/crypto/x509v3/v3_tlsf.c b/crypto/x509v3/v3_tlsf.c
index fec67243f8d38..8e5daf9d15806 100644
--- a/crypto/x509v3/v3_tlsf.c
+++ b/crypto/x509v3/v3_tlsf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-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,6 +9,7 @@
 
 #include <stdio.h>
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include "internal/o_str.h"
 #include <openssl/asn1t.h>
 #include <openssl/conf.h>
diff --git a/crypto/x509v3/v3_utl.c b/crypto/x509v3/v3_utl.c
index a10722cf16a86..b58fac5fd05d4 100644
--- a/crypto/x509v3/v3_utl.c
+++ b/crypto/x509v3/v3_utl.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include "internal/ctype.h"
 #include "internal/cryptlib.h"
+#include "e_os.h"
 #include <openssl/conf.h>
 #include <openssl/x509v3.h>
 #include "internal/x509_int.h"
diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h
index c73c754242472..3d348008e2355 100644
--- a/include/internal/cryptlib.h
+++ b/include/internal/cryptlib.h
@@ -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,8 +13,6 @@
 # include <stdlib.h>
 # include <string.h>
 
-# include "e_os.h"
-
 # ifdef OPENSSL_USE_APPLINK
 #  undef BIO_FLAGS_UPLINK
 #  define BIO_FLAGS_UPLINK 0x8000
@@ -25,6 +23,7 @@
 # include <openssl/buffer.h>
 # include <openssl/bio.h>
 # include <openssl/err.h>
+# include "internal/nelem.h"
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index dd62e0cff78d8..e4abe92ac1be4 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2005-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,6 +11,7 @@
 #include <openssl/objects.h>
 #include <openssl/rand.h>
 #include "ssl_locl.h"
+#include "e_os.h"
 
 #if defined(OPENSSL_SYS_VXWORKS)
 # include <sys/times.h>
diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index d1dfb92bf8d88..aec568707f738 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.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
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index fdccdb76c4a83..1a5c3f76b817d 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -11,7 +11,9 @@
 
 #include <stdio.h>
 #include <openssl/objects.h>
+#include "internal/nelem.h"
 #include "ssl_locl.h"
+#include "e_os.h"
 #include <openssl/md5.h>
 #include <openssl/dh.h>
 #include <openssl/rand.h>
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index a0dd878ef77f1..ad78545f8c99f 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -11,7 +11,11 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#include "e_os.h"
+#include "internal/nelem.h"
+#ifndef NO_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
 #include "internal/o_dir.h"
 #include <openssl/lhash.h>
 #include <openssl/bio.h>
@@ -20,6 +24,7 @@
 #include <openssl/dh.h>
 #include <openssl/bn.h>
 #include <openssl/crypto.h>
+#include "e_os.h"
 #include "ssl_locl.h"
 #include "ssl_cert_table.h"
 #include "internal/thread_once.h"
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 60e1308d54013..17bd939a74845 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -15,6 +15,7 @@
 #include <openssl/comp.h>
 #include <openssl/engine.h>
 #include <openssl/crypto.h>
+#include "internal/nelem.h"
 #include "ssl_locl.h"
 #include "internal/thread_once.h"
 #include "internal/cryptlib.h"
diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c
index 6dd5922a5476d..1a8dc1543d17d 100644
--- a/ssl/ssl_conf.c
+++ b/ssl/ssl_conf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2012-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,6 +12,7 @@
 #include <openssl/conf.h>
 #include <openssl/objects.h>
 #include <openssl/dh.h>
+#include "internal/nelem.h"
 
 /*
  * structure holding name tables. This is used for permitted elements in lists
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 501a12ce50205..eb8603da1e80f 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_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.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  * Copyright 2005 Nokia. All rights reserved.
  *
@@ -10,6 +10,7 @@
  */
 
 #include <stdio.h>
+#include "e_os.h"
 #include "ssl_locl.h"
 #include <openssl/objects.h>
 #include <openssl/lhash.h>
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index f14148a438113..72f48752e9765 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -16,7 +16,7 @@
 # include <string.h>
 # include <errno.h>
 
-# include "e_os.h"
+# include "e_os.h"              /* struct timeval for Windows */
 # if defined(__unix) || defined(__unix__)
 #  include <sys/time.h>         /* struct timeval for DTLS */
 # endif
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index efba7077ae9e8..ea5309e8195bd 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.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.
  * Copyright 2005 Nokia. All rights reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -12,6 +12,7 @@
 #include <openssl/lhash.h>
 #include <openssl/rand.h>
 #include <openssl/engine.h>
+#include "e_os.h"
 #include "ssl_locl.h"
 #include "statem/statem_locl.h"
 
diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index d569f6c2519ae..c435405e4d7ea 100644
--- a/ssl/statem/extensions.c
+++ b/ssl/statem/extensions.c
@@ -8,6 +8,7 @@
  */
 
 #include <string.h>
+#include "internal/nelem.h"
 #include "../ssl_locl.h"
 #include "statem_locl.h"
 
diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c
index 4f259fdf8e7fd..fd48f666c0df0 100644
--- a/ssl/statem/statem.c
+++ b/ssl/statem/statem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-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
@@ -8,6 +8,7 @@
  */
 
 #include <openssl/rand.h>
+#include "e_os.h"
 #include "../ssl_locl.h"
 #include "statem_locl.h"
 
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 02ed680225cc4..48c33de64bf86 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_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
@@ -17,6 +17,7 @@
 #include <openssl/x509v3.h>
 #include <openssl/dh.h>
 #include <openssl/bn.h>
+#include "internal/nelem.h"
 #include "ssl_locl.h"
 #include <openssl/ct.h>
 
diff --git a/test/bftest.c b/test/bftest.c
index 36029c2f7b2b6..7ab3d5115f0f5 100644
--- a/test/bftest.c
+++ b/test/bftest.c
@@ -19,6 +19,7 @@
 #include "testutil.h"
 
 #include "internal/nelem.h"
+
 #ifndef OPENSSL_NO_BF
 # include <openssl/blowfish.h>
 
diff --git a/test/ctype_internal_test.c b/test/ctype_internal_test.c
index ce3cbfee0a328..9cb2321bc014e 100644
--- a/test/ctype_internal_test.c
+++ b/test/ctype_internal_test.c
@@ -9,7 +9,7 @@
 
 #include "testutil.h"
 #include "internal/ctype.h"
-#include "../e_os.h"
+#include "internal/nelem.h"
 #include <ctype.h>
 #include <stdio.h>
 
diff --git a/test/tls13encryptiontest.c b/test/tls13encryptiontest.c
index 667f9534de1e6..6e4b88985fc66 100644
--- a/test/tls13encryptiontest.c
+++ b/test/tls13encryptiontest.c
@@ -22,6 +22,7 @@
 # pragma names restore
 #endif
 
+#include "internal/nelem.h"
 #include "testutil.h"
 
 /*