Cleanup : directly include of `internal/nelem.h` when required.

And so clean a few useless includes

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

8 files changed, 6 insertions, 2 deletions

diff --git a/providers/baseprov.c b/providers/baseprov.c
index 44c6e8b7e7..f2729b3307 100644
--- a/providers/baseprov.c
+++ b/providers/baseprov.c
@@ -19,7 +19,6 @@
 #include "prov/providercommon.h"
 #include "prov/implementations.h"
 #include "prov/provider_util.h"
-#include "internal/nelem.h"
 
 /*
  * Forward declarations to ensure that interface functions are correctly
diff --git a/providers/common/provider_util.c b/providers/common/provider_util.c
index 2d8cba2ac9..2473754d26 100644
--- a/providers/common/provider_util.c
+++ b/providers/common/provider_util.c
@@ -19,7 +19,6 @@
 # include "crypto/evp.h"
 #endif
 #include "prov/provider_util.h"
-#include "internal/nelem.h"
 
 void ossl_prov_cipher_reset(PROV_CIPHER *pc)
 {
diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c
index 533d9d1598..767b079e22 100644
--- a/providers/fips/fipsprov.c
+++ b/providers/fips/fipsprov.c
@@ -21,6 +21,7 @@
 #include "prov/providercommon.h"
 #include "prov/provider_util.h"
 #include "prov/seeding.h"
+#include "internal/nelem.h"
 #include "self_test.h"
 #include "crypto/context.h"
 #include "internal/core.h"
diff --git a/providers/implementations/encode_decode/decode_der2key.c b/providers/implementations/encode_decode/decode_der2key.c
index d4d3731460..6ea8cc0550 100644
--- a/providers/implementations/encode_decode/decode_der2key.c
+++ b/providers/implementations/encode_decode/decode_der2key.c
@@ -35,6 +35,7 @@
 #include "prov/bio.h"
 #include "prov/implementations.h"
 #include "endecoder_local.h"
+#include "internal/nelem.h"
 
 struct der2key_ctx_st;           /* Forward declaration */
 typedef int check_key_fn(void *, struct der2key_ctx_st *ctx);
diff --git a/providers/implementations/kdfs/x942kdf.c b/providers/implementations/kdfs/x942kdf.c
index 5e5bf68d60..78bd8d235e 100644
--- a/providers/implementations/kdfs/x942kdf.c
+++ b/providers/implementations/kdfs/x942kdf.c
@@ -17,6 +17,7 @@
 #include <openssl/proverr.h>
 #include "internal/packet.h"
 #include "internal/der.h"
+#include "internal/nelem.h"
 #include "prov/provider_ctx.h"
 #include "prov/providercommon.h"
 #include "prov/implementations.h"
diff --git a/providers/implementations/kem/rsa_kem.c b/providers/implementations/kem/rsa_kem.c
index 882cf16125..365ae3d7d6 100644
--- a/providers/implementations/kem/rsa_kem.c
+++ b/providers/implementations/kem/rsa_kem.c
@@ -23,6 +23,7 @@
 #include <openssl/err.h>
 #include "crypto/rsa.h"
 #include <openssl/proverr.h>
+#include "internal/nelem.h"
 #include "prov/provider_ctx.h"
 #include "prov/implementations.h"
 #include "prov/securitycheck.h"
diff --git a/providers/implementations/rands/seeding/rand_unix.c b/providers/implementations/rands/seeding/rand_unix.c
index 363f3b814e..fa7ad6cfeb 100644
--- a/providers/implementations/rands/seeding/rand_unix.c
+++ b/providers/implementations/rands/seeding/rand_unix.c
@@ -18,6 +18,7 @@
 #include "crypto/rand_pool.h"
 #include "crypto/rand.h"
 #include "internal/dso.h"
+#include "internal/nelem.h"
 #include "prov/seeding.h"
 
 #ifdef __linux
diff --git a/providers/implementations/rands/seeding/rand_vms.c b/providers/implementations/rands/seeding/rand_vms.c
index 07814a43dc..4ff879491a 100644
--- a/providers/implementations/rands/seeding/rand_vms.c
+++ b/providers/implementations/rands/seeding/rand_vms.c
@@ -12,6 +12,7 @@
 #define __NEW_STARLET 1         /* New starlet definitions since VMS 7.0 */
 #include <unistd.h>
 #include "internal/cryptlib.h"
+#include "internal/nelem.h"
 #include <openssl/rand.h>
 #include "crypto/rand.h"
 #include "crypto/rand_pool.h"