From dce1a1acdaf04126b484f8f145abe1e6d66a6196 Mon Sep 17 00:00:00 2001
From: Joost Rijneveld <joost@joostrijneveld.nl>
Date: Thu, 19 Oct 2017 16:17:07 +0200
Subject: [PATCH] Clean up includes

---
 fips202.c      | 8 ++++----
 hash.h         | 1 +
 xmss_commons.h | 3 ---
 xmss_core.h    | 5 ++---
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/fips202.c b/fips202.c
index 4d5b09d..5e36d66 100644
--- a/fips202.c
+++ b/fips202.c
@@ -5,10 +5,12 @@
  * from https://twitter.com/tweetfips202
  * by Gilles Van Assche, Daniel J. Bernstein, and Peter Schwabe */
 
-#include <stdint.h>
-#include <assert.h>
 #include "fips202.h"
 
+#include <assert.h>
+#include <stdint.h>
+#include <string.h>
+
 #define NROUNDS 24
 #define ROL(a, offset) ((a << offset) ^ (a >> (64-offset)))
 
@@ -324,8 +326,6 @@ void KeccakF1600_StatePermute(uint64_t * state)
     state[24] = Asu;
 }
 
-#include <string.h>
-
 static void keccak_absorb(uint64_t *s, unsigned int r,
                           const unsigned char *m, unsigned long long mlen,
                           unsigned char p)
diff --git a/hash.h b/hash.h
index 4bfe2d5..9d1edd8 100644
--- a/hash.h
+++ b/hash.h
@@ -8,6 +8,7 @@ Public domain.
 #ifndef XMSS_HASH_H
 #define XMSS_HASH_H
 
+#include <stdint.h>
 #include "params.h"
 
 #define IS_LITTLE_ENDIAN 1
diff --git a/xmss_commons.h b/xmss_commons.h
index 7d34013..ac91d1f 100644
--- a/xmss_commons.h
+++ b/xmss_commons.h
@@ -7,14 +7,11 @@ Public domain.
 #ifndef XMSS_COMMONS_H
 #define XMSS_COMMONS_H
 
-#include <stdlib.h>
 #include <stdint.h>
 #include "params.h"
 
 void to_byte(unsigned char *output, unsigned long long in, uint32_t bytes);
 
-void hexdump(const unsigned char *a, size_t len);
-
 void gen_leaf_wots(const xmss_params *params, unsigned char *leaf,
                    const unsigned char *sk_seed, const unsigned char *pub_seed,
                    uint32_t ltree_addr[8], uint32_t ots_addr[8]);
diff --git a/xmss_core.h b/xmss_core.h
index 7f15b3b..5be5026 100644
--- a/xmss_core.h
+++ b/xmss_core.h
@@ -4,12 +4,11 @@ Andreas Hülsing
 Joost Rijneveld
 Public domain.
 */
-
-#include "wots.h"
-
 #ifndef XMSS_CORE_H
 #define XMSS_CORE_H
 
+#include "params.h"
+
 /**
  * Generates a XMSS key pair for a given parameter set.
  * Format sk: [(32bit) idx || SK_SEED || SK_PRF || PUB_SEED || root]