7 files changed, 14 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 4542fbb85..51eff2d6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
     specification to prevent warnings.
  - (dtucker) [crypto_api.h] Wrap stdlib.h include inside #ifdef HAVE_STDINT_H.
  - (dtucker) [poly1305.c] Wrap stdlib.h include inside #ifdef HAVE_STDINT_H.
+ - (dtucker) [blocks.c fe25519.c ge25519.c hash.c sc25519.c verify.c] Include
+   includes.h to pull in all of the compatibility stuff.
 
 20140118
  - (djm) OpenBSD CVS Sync
diff --git a/blocks.c b/blocks.c
index ba569b00a..ad93fe509 100644
--- a/blocks.c
+++ b/blocks.c
@@ -5,6 +5,8 @@
  * Copied from nacl-20110221/crypto_hashblocks/sha512/ref/blocks.c
  */
 
+#include "includes.h"
+
 #include "crypto_api.h"
 
 typedef unsigned long long uint64;
diff --git a/fe25519.c b/fe25519.c
index 2f368ebe6..e54fd1547 100644
--- a/fe25519.c
+++ b/fe25519.c
@@ -6,6 +6,8 @@
  * Copied from supercop-20130419/crypto_sign/ed25519/ref/fe25519.c
  */
 
+#include "includes.h"
+
 #define WINDOWSIZE 1 /* Should be 1,2, or 4 */
 #define WINDOWMASK ((1<<WINDOWSIZE)-1)
 
diff --git a/ge25519.c b/ge25519.c
index 2ce29d0e7..dfe3849b9 100644
--- a/ge25519.c
+++ b/ge25519.c
@@ -6,6 +6,8 @@
  * Copied from supercop-20130419/crypto_sign/ed25519/ref/ge25519.c
  */
 
+#include "includes.h"
+
 #include "fe25519.h"
 #include "sc25519.h"
 #include "ge25519.h"
diff --git a/hash.c b/hash.c
index 284bff9d3..734c6bee2 100644
--- a/hash.c
+++ b/hash.c
@@ -8,6 +8,8 @@ D. J. Bernstein
 Public domain.
 */
 
+#include "includes.h"
+
 #include "crypto_api.h"
 
 #define blocks crypto_hashblocks_sha512
diff --git a/sc25519.c b/sc25519.c
index 54c0b509c..1568d9a58 100644
--- a/sc25519.c
+++ b/sc25519.c
@@ -6,6 +6,8 @@
  * Copied from supercop-20130419/crypto_sign/ed25519/ref/sc25519.c
  */
 
+#include "includes.h"
+
 #include "sc25519.h"
 
 /*Arithmetic modulo the group order m = 2^252 +  27742317777372353535851937790883648493 = 7237005577332262213973186563042994240857116359379907606001950938285454250989 */
diff --git a/verify.c b/verify.c
index 0a328090c..1671a4132 100644
--- a/verify.c
+++ b/verify.c
@@ -5,6 +5,8 @@
  * Copied from nacl-20110221/crypto_verify/32/ref/verify.c
  */
 
+#include "includes.h"
+
 #include "crypto_api.h"
 
 int crypto_verify_32(const unsigned char *x,const unsigned char *y)