apps: directly inclusion of "e_os.h when needed

Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14344)

14 files changed, 23 insertions, 4 deletions

diff --git a/apps/ca.c b/apps/ca.c
index a8966399b1..6d1d1c0a6e 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -6,6 +6,8 @@
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  */
+#include "internal/e_os.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/apps/cmp.c b/apps/cmp.c
index dc2a1c3a6a..3fa7dd9361 100644
--- a/apps/cmp.c
+++ b/apps/cmp.c
@@ -10,6 +10,7 @@
  */
 
 /* This app is disabled when OPENSSL_NO_CMP is defined. */
+#include "internal/e_os.h"
 
 #include <string.h>
 #include <ctype.h>
diff --git a/apps/include/apps.h b/apps/include/apps.h
index 7c5510976d..62b5cf9a01 100644
--- a/apps/include/apps.h
+++ b/apps/include/apps.h
@@ -10,10 +10,8 @@
 #ifndef OSSL_APPS_H
 # define OSSL_APPS_H
 
-# include "internal/e_os.h" /* struct timeval for DTLS */
 # include "internal/common.h" /* for HAS_PREFIX */
 # include "internal/nelem.h"
-# include "internal/sockets.h" /* for openssl_fdset() */
 # include <assert.h>
 
 # include <stdarg.h>
diff --git a/apps/lib/app_rand.c b/apps/lib/app_rand.c
index 9ca6056563..64d0f9b309 100644
--- a/apps/lib/app_rand.c
+++ b/apps/lib/app_rand.c
@@ -7,6 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "internal/e_os.h" /* LIST_SEPARATOR_CHAR */
 #include "apps.h"
 #include <openssl/bio.h>
 #include <openssl/err.h>
diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index 490ad99ade..38f0311974 100644
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -48,6 +48,9 @@
 #include "s_apps.h"
 #include "apps.h"
 
+#include "internal/sockets.h" /* for openssl_fdset() */
+#include "internal/e_os.h"
+
 #ifdef _WIN32
 static int WIN32_rename(const char *from, const char *to);
 # define rename(from, to) WIN32_rename((from), (to))
diff --git a/apps/lib/engine_loader.c b/apps/lib/engine_loader.c
index b3ed120ea0..e0f26f614a 100644
--- a/apps/lib/engine_loader.c
+++ b/apps/lib/engine_loader.c
@@ -14,6 +14,7 @@
  */
 #define OPENSSL_SUPPRESS_DEPRECATED
 
+#include "internal/e_os.h"
 #include "apps.h"
 
 #ifndef OPENSSL_NO_ENGINE
diff --git a/apps/lib/http_server.c b/apps/lib/http_server.c
index 4bc2012a1e..e80ad14eb6 100644
--- a/apps/lib/http_server.c
+++ b/apps/lib/http_server.c
@@ -18,8 +18,10 @@
 #endif
 
 #include <ctype.h>
+#include "internal/e_os.h"
 #include "http_server.h"
-#include "internal/sockets.h"
+#include "internal/sockets.h" /* for openssl_fdset() */
+
 #include <openssl/err.h>
 #include <openssl/trace.h>
 #include <openssl/rand.h>
diff --git a/apps/lib/s_socket.c b/apps/lib/s_socket.c
index f7454053cf..658192421d 100644
--- a/apps/lib/s_socket.c
+++ b/apps/lib/s_socket.c
@@ -37,9 +37,10 @@ typedef unsigned int u_int;
 
 #ifndef OPENSSL_NO_SOCK
 
+# include "internal/e_os.h"
 # include "apps.h"
 # include "s_apps.h"
-# include "internal/sockets.h"
+# include "internal/sockets.h" /* for openssl_fdset() */
 
 # include <openssl/bio.h>
 # include <openssl/err.h>
diff --git a/apps/list.c b/apps/list.c
index 14a20bd74a..c0b0a5a4c4 100644
--- a/apps/list.c
+++ b/apps/list.c
@@ -10,6 +10,8 @@
 /* We need to use some deprecated APIs */
 #define OPENSSL_SUPPRESS_DEPRECATED
 
+#include "internal/e_os.h"
+
 #include <string.h>
 #include <openssl/evp.h>
 #include <openssl/err.h>
diff --git a/apps/openssl.c b/apps/openssl.c
index adf77096c7..cbd3476b32 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -7,6 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "internal/e_os.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include "internal/common.h"
diff --git a/apps/rehash.c b/apps/rehash.c
index 9a5be029d3..6226f0f545 100644
--- a/apps/rehash.c
+++ b/apps/rehash.c
@@ -8,6 +8,7 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "internal/e_os.h" /* LIST_SEPARATOR_CHAR */
 #include "apps.h"
 #include "progs.h"
 
diff --git a/apps/s_client.c b/apps/s_client.c
index 5eec42f3cc..c922653ee7 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <openssl/e_os2.h>
 #include "internal/nelem.h"
+#include "internal/sockets.h" /* for openssl_fdset() */
 
 #ifndef OPENSSL_NO_SOCK
 
diff --git a/apps/s_server.c b/apps/s_server.c
index 4a26c0178f..e47691655e 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -9,6 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include "internal/e_os.h"
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -22,6 +24,7 @@
 #include <openssl/async.h>
 #include <openssl/ssl.h>
 #include <openssl/decoder.h>
+#include "internal/sockets.h" /* for openssl_fdset() */
 
 #ifndef OPENSSL_NO_SOCK
 
diff --git a/apps/speed.c b/apps/speed.c
index afebda62e0..db0327187d 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -26,6 +26,7 @@
 
 /* We need to use some deprecated APIs */
 #define OPENSSL_SUPPRESS_DEPRECATED
+#include "internal/e_os.h"
 
 #include <stdio.h>
 #include <stdlib.h>