From c4f7faea1019457ac3b57fbaaf4adf2a8eee69ee Mon Sep 17 00:00:00 2001
From: Flavio Ceolin <flavio.ceolin@intel.com>
Date: Thu, 11 Jun 2020 21:28:55 -0700
Subject: [PATCH] random: Include header where it is used

Unit tests were failing to build because random header was included by
kernel_includes.h. The problem is that rand32.h includes a generated
file that is either not generated or not included when building unit
tests. Also, it is better to limit the scope of this file to where it is
used.

Signed-off-by: Flavio Ceolin <flavio.ceolin@intel.com>
---
 drivers/ethernet/eth.h                                  | 1 +
 drivers/ieee802154/ieee802154_uart_pipe.c               | 1 +
 drivers/modem/wncm14a2a.c                               | 1 +
 drivers/net/ppp.c                                       | 1 +
 drivers/net/slip.c                                      | 1 +
 include/kernel_includes.h                               | 1 -
 kernel/thread.c                                         | 1 +
 samples/bluetooth/peripheral_csc/src/main.c             | 1 +
 samples/net/cloud/mqtt_azure/src/main.c                 | 1 +
 samples/net/mqtt_publisher/src/main.c                   | 1 +
 samples/net/sockets/echo_client/src/tcp.c               | 1 +
 samples/net/sockets/echo_client/src/udp.c               | 1 +
 samples/net/sockets/websocket_client/src/main.c         | 1 +
 samples/net/wpan_serial/src/main.c                      | 1 +
 subsys/net/ip/dhcpv4.c                                  | 1 +
 subsys/net/ip/ipv4_autoconf.c                           | 1 +
 subsys/net/ip/ipv6_fragment.c                           | 1 +
 subsys/net/ip/net_context.c                             | 1 +
 subsys/net/ip/net_if.c                                  | 1 +
 subsys/net/ip/net_shell.c                               | 1 +
 subsys/net/ip/tcp2.c                                    | 1 +
 subsys/net/ip/tcp_internal.h                            | 1 +
 subsys/net/ip/trickle.c                                 | 1 +
 subsys/net/l2/canbus/6locan.c                           | 1 +
 subsys/net/l2/ethernet/ethernet.c                       | 1 +
 subsys/net/l2/ethernet/gptp/gptp.c                      | 1 +
 subsys/net/l2/ieee802154/ieee802154_radio_csma_ca.c     | 1 +
 subsys/net/l2/ppp/fsm.c                                 | 1 +
 subsys/net/lib/dns/resolve.c                            | 1 +
 subsys/net/lib/openthread/platform/settings.c           | 1 +
 subsys/net/lib/sockets/sockets_tls.c                    | 1 +
 subsys/net/lib/websocket/websocket.c                    | 1 +
 tests/benchmarks/mbedtls/src/benchmark.c                | 1 +
 tests/crypto/rand32/src/main.c                          | 1 +
 tests/crypto/tinycrypt/src/ecc_dsa.c                    | 1 +
 tests/kernel/sched/deadline/src/main.c                  | 1 +
 tests/kernel/timer/timer_api/src/timer_convert.c        | 1 +
 tests/net/arp/src/main.c                                | 1 +
 tests/net/checksum_offload/src/main.c                   | 1 +
 tests/net/context/src/main.c                            | 1 +
 tests/net/hostname/src/main.c                           | 1 +
 tests/net/iface/src/main.c                              | 1 +
 tests/net/ip-addr/src/main.c                            | 1 +
 tests/net/ipv6/src/main.c                               | 1 +
 tests/net/ipv6_fragment/src/main.c                      | 1 +
 tests/net/lib/dns_addremove/src/main.c                  | 1 +
 tests/net/lib/dns_resolve/src/main.c                    | 1 +
 tests/net/lib/mqtt_publisher/src/test_mqtt_publish.c    | 2 ++
 tests/net/lib/mqtt_pubsub/src/test_mqtt_pubsub.c        | 1 +
 tests/net/lib/mqtt_subscriber/src/test_mqtt_subscribe.c | 1 +
 tests/net/mld/src/main.c                                | 2 ++
 tests/net/net_pkt/src/main.c                            | 1 +
 tests/net/pm/src/main.c                                 | 1 +
 tests/net/ptp/clock/src/main.c                          | 2 ++
 tests/net/route/src/main.c                              | 1 +
 tests/net/shell/src/main.c                              | 1 +
 tests/net/traffic_class/src/main.c                      | 1 +
 tests/net/tx_timestamp/src/main.c                       | 1 +
 tests/net/udp/src/main.c                                | 1 +
 tests/net/vlan/src/main.c                               | 1 +
 60 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/drivers/ethernet/eth.h b/drivers/ethernet/eth.h
index c0ad94c042d..6f158677471 100644
--- a/drivers/ethernet/eth.h
+++ b/drivers/ethernet/eth.h
@@ -8,6 +8,7 @@
 #define ZEPHYR_DRIVERS_ETHERNET_ETH_H_
 
 #include <zephyr/types.h>
+#include <random/rand32.h>
 
 /* helper macro to return mac address octet from local_mac_address prop */
 #define NODE_MAC_ADDR_OCTET(node, n) DT_PROP_BY_IDX(node, local_mac_address, n)
diff --git a/drivers/ieee802154/ieee802154_uart_pipe.c b/drivers/ieee802154/ieee802154_uart_pipe.c
index a8d06de9ed6..c2efa1f592e 100644
--- a/drivers/ieee802154/ieee802154_uart_pipe.c
+++ b/drivers/ieee802154/ieee802154_uart_pipe.c
@@ -19,6 +19,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <init.h>
 #include <net/net_if.h>
 #include <net/net_pkt.h>
+#include <random/rand32.h>
 
 #include <drivers/console/uart_pipe.h>
 #include <net/ieee802154_radio.h>
diff --git a/drivers/modem/wncm14a2a.c b/drivers/modem/wncm14a2a.c
index 55101e7f48e..62d0d09ba68 100644
--- a/drivers/modem/wncm14a2a.c
+++ b/drivers/modem/wncm14a2a.c
@@ -20,6 +20,7 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
 #include <drivers/gpio.h>
 #include <device.h>
 #include <init.h>
+#include <random/rand32.h>
 
 #include <net/net_context.h>
 #include <net/net_if.h>
diff --git a/drivers/net/ppp.c b/drivers/net/ppp.c
index 0669157b880..d80af4c7f80 100644
--- a/drivers/net/ppp.c
+++ b/drivers/net/ppp.c
@@ -31,6 +31,7 @@ LOG_MODULE_REGISTER(net_ppp, LOG_LEVEL);
 #include <sys/crc.h>
 #include <drivers/uart.h>
 #include <drivers/console/uart_mux.h>
+#include <random/rand32.h>
 
 #include "../../subsys/net/ip/net_stats.h"
 #include "../../subsys/net/ip/net_private.h"
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 7510a6943d0..31639e9b126 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -32,6 +32,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <net/net_core.h>
 #include <net/dummy.h>
 #include <drivers/console/uart_pipe.h>
+#include <random/rand32.h>
 
 #define SLIP_END     0300
 #define SLIP_ESC     0333
diff --git a/include/kernel_includes.h b/include/kernel_includes.h
index 2572d979e29..3c810053716 100644
--- a/include/kernel_includes.h
+++ b/include/kernel_includes.h
@@ -33,7 +33,6 @@
 #include <mempool_sys.h>
 #endif
 #include <kernel_version.h>
-#include <random/rand32.h>
 #include <syscall.h>
 #include <sys/printk.h>
 #include <arch/cpu.h>
diff --git a/kernel/thread.c b/kernel/thread.c
index 8dbe4faf3c4..ac665217ab5 100644
--- a/kernel/thread.c
+++ b/kernel/thread.c
@@ -26,6 +26,7 @@
 #include <stdbool.h>
 #include <irq_offload.h>
 #include <sys/check.h>
+#include <random/rand32.h>
 
 #ifdef CONFIG_THREAD_MONITOR
 /* This lock protects the linked list of active threads; i.e. the
diff --git a/samples/bluetooth/peripheral_csc/src/main.c b/samples/bluetooth/peripheral_csc/src/main.c
index 8b2448b70a4..908dacdd9be 100644
--- a/samples/bluetooth/peripheral_csc/src/main.c
+++ b/samples/bluetooth/peripheral_csc/src/main.c
@@ -11,6 +11,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
+#include <random/rand32.h>
 #include <sys/printk.h>
 #include <sys/byteorder.h>
 #include <zephyr.h>
diff --git a/samples/net/cloud/mqtt_azure/src/main.c b/samples/net/cloud/mqtt_azure/src/main.c
index dfc0dc5c310..cba20101f00 100644
--- a/samples/net/cloud/mqtt_azure/src/main.c
+++ b/samples/net/cloud/mqtt_azure/src/main.c
@@ -12,6 +12,7 @@ LOG_MODULE_REGISTER(mqtt_azure, LOG_LEVEL_DBG);
 #include <net/mqtt.h>
 
 #include <sys/printk.h>
+#include <random/rand32.h>
 #include <string.h>
 #include <errno.h>
 
diff --git a/samples/net/mqtt_publisher/src/main.c b/samples/net/mqtt_publisher/src/main.c
index d78b19fb5cd..8cfd8ca2e76 100644
--- a/samples/net/mqtt_publisher/src/main.c
+++ b/samples/net/mqtt_publisher/src/main.c
@@ -10,6 +10,7 @@ LOG_MODULE_REGISTER(net_mqtt_publisher_sample, LOG_LEVEL_DBG);
 #include <zephyr.h>
 #include <net/socket.h>
 #include <net/mqtt.h>
+#include <random/rand32.h>
 
 #include <string.h>
 #include <errno.h>
diff --git a/samples/net/sockets/echo_client/src/tcp.c b/samples/net/sockets/echo_client/src/tcp.c
index 35e0582d0cc..584f7008af3 100644
--- a/samples/net/sockets/echo_client/src/tcp.c
+++ b/samples/net/sockets/echo_client/src/tcp.c
@@ -16,6 +16,7 @@ LOG_MODULE_DECLARE(net_echo_client_sample, LOG_LEVEL_DBG);
 
 #include <net/socket.h>
 #include <net/tls_credentials.h>
+#include <random/rand32.h>
 
 #include "common.h"
 #include "ca_certificate.h"
diff --git a/samples/net/sockets/echo_client/src/udp.c b/samples/net/sockets/echo_client/src/udp.c
index 20ab3d42312..fd752449181 100644
--- a/samples/net/sockets/echo_client/src/udp.c
+++ b/samples/net/sockets/echo_client/src/udp.c
@@ -16,6 +16,7 @@ LOG_MODULE_DECLARE(net_echo_client_sample, LOG_LEVEL_DBG);
 
 #include <net/socket.h>
 #include <net/tls_credentials.h>
+#include <random/rand32.h>
 
 #include "common.h"
 #include "ca_certificate.h"
diff --git a/samples/net/sockets/websocket_client/src/main.c b/samples/net/sockets/websocket_client/src/main.c
index 5b09e639934..d59d2eac0f3 100644
--- a/samples/net/sockets/websocket_client/src/main.c
+++ b/samples/net/sockets/websocket_client/src/main.c
@@ -11,6 +11,7 @@ LOG_MODULE_REGISTER(net_websocket_client_sample, LOG_LEVEL_DBG);
 #include <net/socket.h>
 #include <net/tls_credentials.h>
 #include <net/websocket.h>
+#include <random/rand32.h>
 #include <shell/shell.h>
 
 #include "ca_certificate.h"
diff --git a/samples/net/wpan_serial/src/main.c b/samples/net/wpan_serial/src/main.c
index 92549bf90db..ce69359f66b 100644
--- a/samples/net/wpan_serial/src/main.c
+++ b/samples/net/wpan_serial/src/main.c
@@ -18,6 +18,7 @@ LOG_MODULE_REGISTER(wpan_serial, CONFIG_USB_DEVICE_LOG_LEVEL);
 #include <drivers/uart.h>
 #include <zephyr.h>
 #include <usb/usb_device.h>
+#include <random/rand32.h>
 
 #include <net/buf.h>
 #include <net_private.h>
diff --git a/subsys/net/ip/dhcpv4.c b/subsys/net/ip/dhcpv4.c
index 54ff9bea2f1..3497a64eada 100644
--- a/subsys/net/ip/dhcpv4.c
+++ b/subsys/net/ip/dhcpv4.c
@@ -15,6 +15,7 @@ LOG_MODULE_REGISTER(net_dhcpv4, CONFIG_NET_DHCPV4_LOG_LEVEL);
 
 #include <errno.h>
 #include <inttypes.h>
+#include <random/rand32.h>
 #include <net/net_core.h>
 #include <net/net_pkt.h>
 #include <net/net_if.h>
diff --git a/subsys/net/ip/ipv4_autoconf.c b/subsys/net/ip/ipv4_autoconf.c
index 0b3f166602e..4875c9aa298 100644
--- a/subsys/net/ip/ipv4_autoconf.c
+++ b/subsys/net/ip/ipv4_autoconf.c
@@ -18,6 +18,7 @@ LOG_MODULE_REGISTER(net_ipv4_autoconf, CONFIG_NET_IPV4_AUTO_LOG_LEVEL);
 #include <net/net_pkt.h>
 #include <net/net_core.h>
 #include <net/net_if.h>
+#include <random/rand32.h>
 
 #include "ipv4_autoconf_internal.h"
 
diff --git a/subsys/net/ip/ipv6_fragment.c b/subsys/net/ip/ipv6_fragment.c
index 59d963016bc..3fd23b0109e 100644
--- a/subsys/net/ip/ipv6_fragment.c
+++ b/subsys/net/ip/ipv6_fragment.c
@@ -17,6 +17,7 @@ LOG_MODULE_DECLARE(net_ipv6, CONFIG_NET_IPV6_LOG_LEVEL);
 #include <net/net_stats.h>
 #include <net/net_context.h>
 #include <net/net_mgmt.h>
+#include <random/rand32.h>
 #include "net_private.h"
 #include "connection.h"
 #include "icmpv6.h"
diff --git a/subsys/net/ip/net_context.c b/subsys/net/ip/net_context.c
index 747b6988a96..cf0da1f2b0b 100644
--- a/subsys/net/ip/net_context.c
+++ b/subsys/net/ip/net_context.c
@@ -14,6 +14,7 @@
 LOG_MODULE_REGISTER(net_ctx, CONFIG_NET_CONTEXT_LOG_LEVEL);
 
 #include <kernel.h>
+#include <random/rand32.h>
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
diff --git a/subsys/net/ip/net_if.c b/subsys/net/ip/net_if.c
index 8c5d91d84ed..05cce7ca04f 100644
--- a/subsys/net/ip/net_if.c
+++ b/subsys/net/ip/net_if.c
@@ -10,6 +10,7 @@ LOG_MODULE_REGISTER(net_if, CONFIG_NET_IF_LOG_LEVEL);
 #include <init.h>
 #include <kernel.h>
 #include <linker/sections.h>
+#include <random/rand32.h>
 #include <syscall_handler.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/subsys/net/ip/net_shell.c b/subsys/net/ip/net_shell.c
index 6d46c95d367..17c59ad7e5c 100644
--- a/subsys/net/ip/net_shell.c
+++ b/subsys/net/ip/net_shell.c
@@ -15,6 +15,7 @@ LOG_MODULE_REGISTER(net_shell, LOG_LEVEL_DBG);
 
 #include <zephyr.h>
 #include <kernel_internal.h>
+#include <random/rand32.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <shell/shell.h>
diff --git a/subsys/net/ip/tcp2.c b/subsys/net/ip/tcp2.c
index 133eeca6a59..cf744a3cdf0 100644
--- a/subsys/net/ip/tcp2.c
+++ b/subsys/net/ip/tcp2.c
@@ -11,6 +11,7 @@ LOG_MODULE_REGISTER(net_tcp, CONFIG_NET_TCP_LOG_LEVEL);
 #include <stdio.h>
 #include <stdlib.h>
 #include <zephyr.h>
+#include <random/rand32.h>
 #include <net/net_pkt.h>
 #include <net/net_context.h>
 #include <net/udp.h>
diff --git a/subsys/net/ip/tcp_internal.h b/subsys/net/ip/tcp_internal.h
index 0d256693858..259abe50506 100644
--- a/subsys/net/ip/tcp_internal.h
+++ b/subsys/net/ip/tcp_internal.h
@@ -14,6 +14,7 @@
 #define __TCP_INTERNAL_H
 
 #include <zephyr/types.h>
+#include <random/rand32.h>
 
 #include <net/net_core.h>
 #include <net/net_ip.h>
diff --git a/subsys/net/ip/trickle.c b/subsys/net/ip/trickle.c
index 6737c9a52aa..71fd4ff1317 100644
--- a/subsys/net/ip/trickle.c
+++ b/subsys/net/ip/trickle.c
@@ -15,6 +15,7 @@ LOG_MODULE_REGISTER(net_trickle, CONFIG_NET_TRICKLE_LOG_LEVEL);
 
 #include <errno.h>
 #include <sys/util.h>
+#include <random/rand32.h>
 
 #include <net/net_core.h>
 #include <net/trickle.h>
diff --git a/subsys/net/l2/canbus/6locan.c b/subsys/net/l2/canbus/6locan.c
index 2af451415c6..75fa61696c6 100644
--- a/subsys/net/l2/canbus/6locan.c
+++ b/subsys/net/l2/canbus/6locan.c
@@ -20,6 +20,7 @@ LOG_MODULE_REGISTER(net_l2_canbus, CONFIG_NET_L2_CANBUS_LOG_LEVEL);
 #include <net/ethernet.h>
 #include <net/net_ip.h>
 #include <string.h>
+#include <random/rand32.h>
 
 #define NET_CAN_WFTMAX 2
 #define NET_CAN_ALLOC_TIMEOUT K_MSEC(100)
diff --git a/subsys/net/l2/ethernet/ethernet.c b/subsys/net/l2/ethernet/ethernet.c
index b5c3b302df2..572f024b9d7 100644
--- a/subsys/net/l2/ethernet/ethernet.c
+++ b/subsys/net/l2/ethernet/ethernet.c
@@ -14,6 +14,7 @@ LOG_MODULE_REGISTER(net_ethernet, CONFIG_NET_L2_ETHERNET_LOG_LEVEL);
 #include <net/ethernet.h>
 #include <net/ethernet_mgmt.h>
 #include <net/gptp.h>
+#include <random/rand32.h>
 
 #if defined(CONFIG_NET_LLDP)
 #include <net/lldp.h>
diff --git a/subsys/net/l2/ethernet/gptp/gptp.c b/subsys/net/l2/ethernet/gptp/gptp.c
index 23998c03fd9..d2270db0e32 100644
--- a/subsys/net/l2/ethernet/gptp/gptp.c
+++ b/subsys/net/l2/ethernet/gptp/gptp.c
@@ -10,6 +10,7 @@ LOG_MODULE_REGISTER(net_gptp, CONFIG_NET_GPTP_LOG_LEVEL);
 #include <net/net_pkt.h>
 #include <ptp_clock.h>
 #include <net/ethernet_mgmt.h>
+#include <random/rand32.h>
 
 #include <net/gptp.h>
 
diff --git a/subsys/net/l2/ieee802154/ieee802154_radio_csma_ca.c b/subsys/net/l2/ieee802154/ieee802154_radio_csma_ca.c
index 51b3928ddb4..fecd9a21ee4 100644
--- a/subsys/net/l2/ieee802154/ieee802154_radio_csma_ca.c
+++ b/subsys/net/l2/ieee802154/ieee802154_radio_csma_ca.c
@@ -11,6 +11,7 @@ LOG_MODULE_REGISTER(net_ieee802154_csma, CONFIG_NET_L2_IEEE802154_LOG_LEVEL);
 #include <net/net_if.h>
 
 #include <sys/util.h>
+#include <random/rand32.h>
 
 #include <stdlib.h>
 #include <errno.h>
diff --git a/subsys/net/l2/ppp/fsm.c b/subsys/net/l2/ppp/fsm.c
index 8121394b620..70efab08045 100644
--- a/subsys/net/l2/ppp/fsm.c
+++ b/subsys/net/l2/ppp/fsm.c
@@ -11,6 +11,7 @@ LOG_MODULE_DECLARE(net_l2_ppp, CONFIG_NET_L2_PPP_LOG_LEVEL);
 #include <net/net_pkt.h>
 
 #include <net/ppp.h>
+#include <random/rand32.h>
 
 #include "net_private.h"
 
diff --git a/subsys/net/lib/dns/resolve.c b/subsys/net/lib/dns/resolve.c
index 4657ed55318..b260d75344e 100644
--- a/subsys/net/lib/dns/resolve.c
+++ b/subsys/net/lib/dns/resolve.c
@@ -14,6 +14,7 @@
 LOG_MODULE_REGISTER(net_dns_resolve, CONFIG_DNS_RESOLVER_LOG_LEVEL);
 
 #include <zephyr/types.h>
+#include <random/rand32.h>
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/subsys/net/lib/openthread/platform/settings.c b/subsys/net/lib/openthread/platform/settings.c
index d40ef495277..792af5f19a8 100644
--- a/subsys/net/lib/openthread/platform/settings.c
+++ b/subsys/net/lib/openthread/platform/settings.c
@@ -7,6 +7,7 @@
 #include <kernel.h>
 #include <logging/log.h>
 #include <settings/settings.h>
+#include <random/rand32.h>
 
 #include <openthread/platform/settings.h>
 
diff --git a/subsys/net/lib/sockets/sockets_tls.c b/subsys/net/lib/sockets/sockets_tls.c
index df3a68257c4..e9f69856fb8 100644
--- a/subsys/net/lib/sockets/sockets_tls.c
+++ b/subsys/net/lib/sockets/sockets_tls.c
@@ -16,6 +16,7 @@ LOG_MODULE_REGISTER(net_sock_tls, CONFIG_NET_SOCKETS_LOG_LEVEL);
 #include <sys/util.h>
 #include <net/net_context.h>
 #include <net/socket.h>
+#include <random/rand32.h>
 #include <syscall_handler.h>
 #include <sys/fdtable.h>
 
diff --git a/subsys/net/lib/websocket/websocket.c b/subsys/net/lib/websocket/websocket.c
index 7019a02cacb..e24e12d3961 100644
--- a/subsys/net/lib/websocket/websocket.c
+++ b/subsys/net/lib/websocket/websocket.c
@@ -26,6 +26,7 @@ LOG_MODULE_REGISTER(net_websocket, CONFIG_NET_WEBSOCKET_LOG_LEVEL);
 #include <net/http_client.h>
 #include <net/websocket.h>
 
+#include <random/rand32.h>
 #include <sys/byteorder.h>
 #include <sys/base64.h>
 #include <mbedtls/sha1.h>
diff --git a/tests/benchmarks/mbedtls/src/benchmark.c b/tests/benchmarks/mbedtls/src/benchmark.c
index ce8ccb9f276..5f45aaa65f0 100644
--- a/tests/benchmarks/mbedtls/src/benchmark.c
+++ b/tests/benchmarks/mbedtls/src/benchmark.c
@@ -69,6 +69,7 @@
 
 #include <zephyr/types.h>
 #include <sys/byteorder.h>
+#include <random/rand32.h>
 
 #include "kernel.h"
 
diff --git a/tests/crypto/rand32/src/main.c b/tests/crypto/rand32/src/main.c
index ab291e6a2ca..aced55d72eb 100644
--- a/tests/crypto/rand32/src/main.c
+++ b/tests/crypto/rand32/src/main.c
@@ -15,6 +15,7 @@
 
 #include <ztest.h>
 #include <kernel_internal.h>
+#include <random/rand32.h>
 
 #define N_VALUES 10
 
diff --git a/tests/crypto/tinycrypt/src/ecc_dsa.c b/tests/crypto/tinycrypt/src/ecc_dsa.c
index cf38554a592..d248863ad05 100644
--- a/tests/crypto/tinycrypt/src/ecc_dsa.c
+++ b/tests/crypto/tinycrypt/src/ecc_dsa.c
@@ -67,6 +67,7 @@
 #include <test_utils.h>
 #include "test_ecc_utils.h"
 #include <sys/util.h>
+#include <random/rand32.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/kernel/sched/deadline/src/main.c b/tests/kernel/sched/deadline/src/main.c
index 70888ccefc8..6b40a10a7bf 100644
--- a/tests/kernel/sched/deadline/src/main.c
+++ b/tests/kernel/sched/deadline/src/main.c
@@ -5,6 +5,7 @@
  */
 #include <zephyr.h>
 #include <ztest.h>
+#include <random/rand32.h>
 
 #define NUM_THREADS 8
 #define STACK_SIZE (256 + CONFIG_TEST_EXTRA_STACKSIZE)
diff --git a/tests/kernel/timer/timer_api/src/timer_convert.c b/tests/kernel/timer/timer_api/src/timer_convert.c
index 084419f5a61..3b3de558b83 100644
--- a/tests/kernel/timer/timer_api/src/timer_convert.c
+++ b/tests/kernel/timer/timer_api/src/timer_convert.c
@@ -6,6 +6,7 @@
 #include <ztest.h>
 #include <zephyr/types.h>
 #include <sys/time_units.h>
+#include <random/rand32.h>
 
 #define NUM_RANDOM 100
 
diff --git a/tests/net/arp/src/main.c b/tests/net/arp/src/main.c
index e5f7e2b6190..82c7342879e 100644
--- a/tests/net/arp/src/main.c
+++ b/tests/net/arp/src/main.c
@@ -25,6 +25,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_ARP_LOG_LEVEL);
 #include <net/net_ip.h>
 #include <net/dummy.h>
 #include <ztest.h>
+#include <random/rand32.h>
 
 #include "arp.h"
 
diff --git a/tests/net/checksum_offload/src/main.c b/tests/net/checksum_offload/src/main.c
index 0449780d475..e462b2f8403 100644
--- a/tests/net/checksum_offload/src/main.c
+++ b/tests/net/checksum_offload/src/main.c
@@ -18,6 +18,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <errno.h>
 #include <sys/printk.h>
 #include <linker/sections.h>
+#include <random/rand32.h>
 
 #include <ztest.h>
 
diff --git a/tests/net/context/src/main.c b/tests/net/context/src/main.c
index adb91a3db21..d6c95e23a9b 100644
--- a/tests/net/context/src/main.c
+++ b/tests/net/context/src/main.c
@@ -17,6 +17,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_CONTEXT_LOG_LEVEL);
 #include <errno.h>
 #include <sys/printk.h>
 #include <linker/sections.h>
+#include <random/rand32.h>
 
 #include <tc_util.h>
 
diff --git a/tests/net/hostname/src/main.c b/tests/net/hostname/src/main.c
index 92ca820b3d3..19129868d81 100644
--- a/tests/net/hostname/src/main.c
+++ b/tests/net/hostname/src/main.c
@@ -16,6 +16,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
+#include <random/rand32.h>
 #include <sys/printk.h>
 #include <linker/sections.h>
 
diff --git a/tests/net/iface/src/main.c b/tests/net/iface/src/main.c
index 8d3bc32070f..fdf700dfa9f 100644
--- a/tests/net/iface/src/main.c
+++ b/tests/net/iface/src/main.c
@@ -18,6 +18,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <errno.h>
 #include <sys/printk.h>
 #include <linker/sections.h>
+#include <random/rand32.h>
 
 #include <ztest.h>
 
diff --git a/tests/net/ip-addr/src/main.c b/tests/net/ip-addr/src/main.c
index 87e6887fe31..09a32f9d219 100644
--- a/tests/net/ip-addr/src/main.c
+++ b/tests/net/ip-addr/src/main.c
@@ -16,6 +16,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 #include <device.h>
 #include <init.h>
 #include <linker/sections.h>
+#include <random/rand32.h>
 
 #include <ztest.h>
 
diff --git a/tests/net/ipv6/src/main.c b/tests/net/ipv6/src/main.c
index aae4f184689..f2d63da9045 100644
--- a/tests/net/ipv6/src/main.c
+++ b/tests/net/ipv6/src/main.c
@@ -15,6 +15,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 #include <string.h>
 #include <errno.h>
 #include <linker/sections.h>
+#include <random/rand32.h>
 
 #include <ztest.h>
 
diff --git a/tests/net/ipv6_fragment/src/main.c b/tests/net/ipv6_fragment/src/main.c
index 6b7abba037b..f3d41e2f3b5 100644
--- a/tests/net/ipv6_fragment/src/main.c
+++ b/tests/net/ipv6_fragment/src/main.c
@@ -16,6 +16,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 #include <errno.h>
 #include <sys/printk.h>
 #include <linker/sections.h>
+#include <random/rand32.h>
 
 #include <ztest.h>
 
diff --git a/tests/net/lib/dns_addremove/src/main.c b/tests/net/lib/dns_addremove/src/main.c
index b80558d395d..74e37ecbb4f 100644
--- a/tests/net/lib/dns_addremove/src/main.c
+++ b/tests/net/lib/dns_addremove/src/main.c
@@ -13,6 +13,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_DNS_RESOLVER_LOG_LEVEL);
 #include <string.h>
 #include <errno.h>
 #include <sys/printk.h>
+#include <random/rand32.h>
 
 #include <ztest.h>
 
diff --git a/tests/net/lib/dns_resolve/src/main.c b/tests/net/lib/dns_resolve/src/main.c
index 3ed7c7f065b..d0de0976e02 100644
--- a/tests/net/lib/dns_resolve/src/main.c
+++ b/tests/net/lib/dns_resolve/src/main.c
@@ -13,6 +13,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_DNS_RESOLVER_LOG_LEVEL);
 #include <string.h>
 #include <errno.h>
 #include <sys/printk.h>
+#include <random/rand32.h>
 
 #include <ztest.h>
 
diff --git a/tests/net/lib/mqtt_publisher/src/test_mqtt_publish.c b/tests/net/lib/mqtt_publisher/src/test_mqtt_publish.c
index 3b253fa3546..79a0c394923 100644
--- a/tests/net/lib/mqtt_publisher/src/test_mqtt_publish.c
+++ b/tests/net/lib/mqtt_publisher/src/test_mqtt_publish.c
@@ -14,6 +14,8 @@ LOG_MODULE_REGISTER(net_test, LOG_LEVEL_WRN);
 #include <string.h>
 #include <errno.h>
 
+#include <random/rand32.h>
+
 #include "config.h"
 
 /* This is mqtt payload message. */
diff --git a/tests/net/lib/mqtt_pubsub/src/test_mqtt_pubsub.c b/tests/net/lib/mqtt_pubsub/src/test_mqtt_pubsub.c
index b786fc199b6..5eb62af32ec 100644
--- a/tests/net/lib/mqtt_pubsub/src/test_mqtt_pubsub.c
+++ b/tests/net/lib/mqtt_pubsub/src/test_mqtt_pubsub.c
@@ -10,6 +10,7 @@ LOG_MODULE_REGISTER(net_test, LOG_LEVEL_WRN);
 #include <ztest.h>
 #include <net/socket.h>
 #include <net/mqtt.h>
+#include <random/rand32.h>
 
 #include <string.h>
 #include <errno.h>
diff --git a/tests/net/lib/mqtt_subscriber/src/test_mqtt_subscribe.c b/tests/net/lib/mqtt_subscriber/src/test_mqtt_subscribe.c
index 7c87fcbecdf..17baff039a2 100644
--- a/tests/net/lib/mqtt_subscriber/src/test_mqtt_subscribe.c
+++ b/tests/net/lib/mqtt_subscriber/src/test_mqtt_subscribe.c
@@ -10,6 +10,7 @@ LOG_MODULE_REGISTER(net_test, LOG_LEVEL_WRN);
 #include <ztest.h>
 #include <net/socket.h>
 #include <net/mqtt.h>
+#include <random/rand32.h>
 
 #include <string.h>
 #include <errno.h>
diff --git a/tests/net/mld/src/main.c b/tests/net/mld/src/main.c
index c1050d00da9..df7aecd98ae 100644
--- a/tests/net/mld/src/main.c
+++ b/tests/net/mld/src/main.c
@@ -27,6 +27,8 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_IPV6_LOG_LEVEL);
 #include <net/net_mgmt.h>
 #include <net/net_event.h>
 
+#include <random/rand32.h>
+
 #include "icmpv6.h"
 #include "ipv6.h"
 
diff --git a/tests/net/net_pkt/src/main.c b/tests/net/net_pkt/src/main.c
index f658abdc023..bc75a12a475 100644
--- a/tests/net/net_pkt/src/main.c
+++ b/tests/net/net_pkt/src/main.c
@@ -12,6 +12,7 @@
 #include <net/net_if.h>
 #include <net/net_ip.h>
 #include <net/ethernet.h>
+#include <random/rand32.h>
 
 #include <ztest.h>
 
diff --git a/tests/net/pm/src/main.c b/tests/net/pm/src/main.c
index 41e11000d51..2708a177de9 100644
--- a/tests/net/pm/src/main.c
+++ b/tests/net/pm/src/main.c
@@ -9,6 +9,7 @@
 #include <zephyr.h>
 #include <linker/sections.h>
 #include <ztest.h>
+#include <random/rand32.h>
 
 #include <net/ethernet.h>
 #include <net/dummy.h>
diff --git a/tests/net/ptp/clock/src/main.c b/tests/net/ptp/clock/src/main.c
index 085367cd0ab..573ec21f39d 100644
--- a/tests/net/ptp/clock/src/main.c
+++ b/tests/net/ptp/clock/src/main.c
@@ -29,6 +29,8 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <net/net_ip.h>
 #include <net/net_l2.h>
 
+#include <random/rand32.h>
+
 #define NET_LOG_ENABLED 1
 #include "net_private.h"
 
diff --git a/tests/net/route/src/main.c b/tests/net/route/src/main.c
index d78538616b3..db064c2f6fd 100644
--- a/tests/net/route/src/main.c
+++ b/tests/net/route/src/main.c
@@ -17,6 +17,7 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_ROUTE_LOG_LEVEL);
 #include <errno.h>
 #include <sys/printk.h>
 #include <linker/sections.h>
+#include <random/rand32.h>
 
 #include <tc_util.h>
 
diff --git a/tests/net/shell/src/main.c b/tests/net/shell/src/main.c
index 095aba42fbf..38765a01b64 100644
--- a/tests/net/shell/src/main.c
+++ b/tests/net/shell/src/main.c
@@ -29,6 +29,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <net/ethernet.h>
 #include <net/dummy.h>
 #include <net/udp.h>
+#include <random/rand32.h>
 
 #include "ipv4.h"
 #include "ipv6.h"
diff --git a/tests/net/traffic_class/src/main.c b/tests/net/traffic_class/src/main.c
index 1457572d425..9cfda63949b 100644
--- a/tests/net/traffic_class/src/main.c
+++ b/tests/net/traffic_class/src/main.c
@@ -18,6 +18,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <errno.h>
 #include <sys/printk.h>
 #include <linker/sections.h>
+#include <random/rand32.h>
 
 #include <ztest.h>
 
diff --git a/tests/net/tx_timestamp/src/main.c b/tests/net/tx_timestamp/src/main.c
index ab42579259f..599c760721b 100644
--- a/tests/net/tx_timestamp/src/main.c
+++ b/tests/net/tx_timestamp/src/main.c
@@ -18,6 +18,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <errno.h>
 #include <sys/printk.h>
 #include <linker/sections.h>
+#include <random/rand32.h>
 
 #include <ztest.h>
 
diff --git a/tests/net/udp/src/main.c b/tests/net/udp/src/main.c
index 5534dc096bb..79521837fb2 100644
--- a/tests/net/udp/src/main.c
+++ b/tests/net/udp/src/main.c
@@ -29,6 +29,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <net/ethernet.h>
 #include <net/dummy.h>
 #include <net/udp.h>
+#include <random/rand32.h>
 
 #include "ipv4.h"
 #include "ipv6.h"
diff --git a/tests/net/vlan/src/main.c b/tests/net/vlan/src/main.c
index 4c8e9c55b99..b7721b2ff23 100644
--- a/tests/net/vlan/src/main.c
+++ b/tests/net/vlan/src/main.c
@@ -18,6 +18,7 @@ LOG_MODULE_REGISTER(net_test, NET_LOG_LEVEL);
 #include <errno.h>
 #include <sys/printk.h>
 #include <linker/sections.h>
+#include <random/rand32.h>
 
 #include <ztest.h>