2 files changed, 6 insertions, 2 deletions

diff --git a/sys/dev/random/hash.c b/sys/dev/random/hash.c
index 2f3cb4738bc6..113f76e8a041 100644
--- a/sys/dev/random/hash.c
+++ b/sys/dev/random/hash.c
@@ -37,12 +37,16 @@ __FBSDID("$FreeBSD$");
 #else /* !_KERNEL */
 #include <sys/param.h>
 #include <sys/types.h>
+#include <assert.h>
 #include <inttypes.h>
+#include <signal.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <threads.h>
-#include "unit_test.h"
+#define KASSERT(x, y)	assert(x)
+#define CTASSERT(x)	_Static_assert(x, "CTASSERT " #x)
 #endif /* _KERNEL */
 
 #define CHACHA_EMBED
diff --git a/sys/dev/random/hash.h b/sys/dev/random/hash.h
index bcc7035a0e4f..e76eaaaf4ccb 100644
--- a/sys/dev/random/hash.h
+++ b/sys/dev/random/hash.h
@@ -54,7 +54,7 @@ union randomdev_key {
 	struct chacha_ctx chacha;
 };
 
-extern bool fortuna_chachamode;
+extern bool random_chachamode;
 
 void randomdev_hash_init(struct randomdev_hash *);
 void randomdev_hash_iterate(struct randomdev_hash *, const void *, size_t);