diff --git a/dtls_debug.c b/dtls_debug.c
index 236fe705..e25cf42c 100644
--- a/dtls_debug.c
+++ b/dtls_debug.c
@@ -44,7 +44,9 @@
 #ifdef HAVE_NET_SOCKET_H
 #include <zephyr/net/socket.h>
 #endif /* HAVE_NET_SOCKET_H */
+#ifndef CONFIG_POSIX_API
 typedef int in_port_t;
+#endif /* CONFIG_POSIX_API */
 #endif /* WITH_ZEPHYR */
 
 #include "global.h"
diff --git a/platform-specific/dtls_prng_zephyr.c b/platform-specific/dtls_prng_zephyr.c
index fbeb8462..b9576378 100644
--- a/platform-specific/dtls_prng_zephyr.c
+++ b/platform-specific/dtls_prng_zephyr.c
@@ -18,7 +18,12 @@
  *
  *******************************************************************************/
 
+#include <version.h>
+#if KERNELVERSION < 0x3050000
 #include <zephyr/random/rand32.h>
+#else
+#include <zephyr/random/random.h>
+#endif
 
 #include "tinydtls.h"
 #include "dtls_prng.h"