2 files changed, 13 insertions, 4 deletions

diff --git a/sys/crypto/chacha20/_chacha.h b/sys/crypto/chacha20/_chacha.h
new file mode 100644
index 0000000000000..a7217b628d0e9
--- /dev/null
+++ b/sys/crypto/chacha20/_chacha.h
@@ -0,0 +1,12 @@
+/* $FreeBSD$ */
+
+#ifndef _CHACHA_H
+#define _CHACHA_H
+
+#include <sys/types.h>
+
+struct chacha_ctx {
+	u_int input[16];
+};
+
+#endif
diff --git a/sys/crypto/chacha20/chacha.h b/sys/crypto/chacha20/chacha.h
index e67cc81264cd5..d150093c6f93e 100644
--- a/sys/crypto/chacha20/chacha.h
+++ b/sys/crypto/chacha20/chacha.h
@@ -12,10 +12,7 @@ Public domain.
 #define CHACHA_H
 
 #include <sys/types.h>
-
-struct chacha_ctx {
-	u_int input[16];
-};
+#include <crypto/chacha20/_chacha.h>
 
 #define CHACHA_MINKEYLEN 	16
 #define CHACHA_NONCELEN		8