From a18ceb81ca78a7f37adc436f35e6eeb8683bb984 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Thu, 29 Sep 2016 04:36:14 +0200
Subject: Rework headers and includes

---
 src/crypto/blake2s.c          | 2 +-
 src/crypto/chacha20poly1305.c | 2 +-
 src/crypto/chacha20poly1305.h | 2 ++
 src/crypto/curve25519.c       | 2 +-
 src/crypto/siphash24.c        | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/crypto')

diff --git a/src/crypto/blake2s.c b/src/crypto/blake2s.c
index 1182ca9..0118dab 100644
--- a/src/crypto/blake2s.c
+++ b/src/crypto/blake2s.c
@@ -3,8 +3,8 @@
  * Copyright 2015-2016 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
  */
 
-#include "../wireguard.h"
 #include "blake2s.h"
+
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
diff --git a/src/crypto/chacha20poly1305.c b/src/crypto/chacha20poly1305.c
index 6f6a825..c291ba9 100644
--- a/src/crypto/chacha20poly1305.c
+++ b/src/crypto/chacha20poly1305.c
@@ -3,8 +3,8 @@
  * Copyright 2015 Martin Willi.
  */
 
-#include "../wireguard.h"
 #include "chacha20poly1305.h"
+
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/version.h>
diff --git a/src/crypto/chacha20poly1305.h b/src/crypto/chacha20poly1305.h
index 71bd6bf..e9ecaf8 100644
--- a/src/crypto/chacha20poly1305.h
+++ b/src/crypto/chacha20poly1305.h
@@ -5,6 +5,8 @@
 
 #include <linux/types.h>
 
+struct scatterlist;
+
 enum chacha20poly1305_lengths {
 	CHACHA20POLY1305_KEYLEN = 32,
 	CHACHA20POLY1305_AUTHTAGLEN = 16
diff --git a/src/crypto/curve25519.c b/src/crypto/curve25519.c
index 4d2e7c7..8f6b562 100644
--- a/src/crypto/curve25519.c
+++ b/src/crypto/curve25519.c
@@ -4,8 +4,8 @@
  * Copyright 2015-2016 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
  */
 
-#include "../wireguard.h"
 #include "curve25519.h"
+
 #include <linux/string.h>
 #include <linux/random.h>
 #include <crypto/algapi.h>
diff --git a/src/crypto/siphash24.c b/src/crypto/siphash24.c
index 6a22ca0..1203d90 100644
--- a/src/crypto/siphash24.c
+++ b/src/crypto/siphash24.c
@@ -1,7 +1,7 @@
 /* Copyright 2015-2016 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */
 
-#include "../wireguard.h"
 #include "siphash24.h"
+
 #include <linux/kernel.h>
 
 #define ROTL(x,b) (uint64_t)(((x) << (b)) | ((x) >> (64 - (b))))
-- 
cgit v1.2.3-59-g8ed1b