diff --git a/test/default/generichash.c b/test/default/generichash.c
index bd98557d..d5fc68cd 100644
--- a/test/default/generichash.c
+++ b/test/default/generichash.c
@@ -1,13 +1,11 @@
 
-#include "crypto_uint8.h"
-
 #define TEST_NAME "generichash"
 #include "cmptest.h"
 
 int main(void)
 {
 #define MAXLEN 64
-    crypto_uint8 in[MAXLEN], out[crypto_generichash_BYTES_MAX], k[crypto_generichash_KEYBYTES_MAX];
+    unsigned char in[MAXLEN], out[crypto_generichash_BYTES_MAX], k[crypto_generichash_KEYBYTES_MAX];
     size_t h,i,j;
 
     for(h = 0; h < crypto_generichash_KEYBYTES_MAX; ++h) k[h] = h;
diff --git a/test/default/generichash2.c b/test/default/generichash2.c
index c41c3545..7fab2dca 100644
--- a/test/default/generichash2.c
+++ b/test/default/generichash2.c
@@ -1,6 +1,4 @@
 
-#include "crypto_uint8.h"
-
 #define TEST_NAME "generichash2"
 #include "cmptest.h"
 
@@ -8,7 +6,7 @@ int main(void)
 {
 #define MAXLEN 64
     crypto_generichash_state st;
-    crypto_uint8 in[MAXLEN], out[crypto_generichash_BYTES_MAX], k[crypto_generichash_KEYBYTES_MAX];
+    unsigned char in[MAXLEN], out[crypto_generichash_BYTES_MAX], k[crypto_generichash_KEYBYTES_MAX];
     size_t h,i,j;
 
     for(h = 0; h < crypto_generichash_KEYBYTES_MAX; ++h) k[h] = h;
diff --git a/test/default/generichash3.c b/test/default/generichash3.c
index ab224a2d..ffd2730e 100644
--- a/test/default/generichash3.c
+++ b/test/default/generichash3.c
@@ -1,6 +1,4 @@
 
-#include "crypto_uint8.h"
-
 #define TEST_NAME "generichash3"
 #include "cmptest.h"
 
@@ -8,13 +6,13 @@ int main(void)
 {
 #define MAXLEN 64
     crypto_generichash_blake2b_state st;
-    crypto_uint8 salt[crypto_generichash_blake2b_SALTBYTES] = {
+    unsigned char salt[crypto_generichash_blake2b_SALTBYTES] = {
         '5', 'b', '6', 'b', '4', '1', 'e', 'd', '9', 'b', '3', '4', '3', 'f', 'e', '0'
     };
-    crypto_uint8 personal[crypto_generichash_blake2b_PERSONALBYTES] = {
+    unsigned char personal[crypto_generichash_blake2b_PERSONALBYTES] = {
         '5', '1', '2', '6', 'f', 'b', '2', 'a', '3', '7', '4', '0', '0', 'd', '2', 'a'
     };    
-    crypto_uint8 in[MAXLEN], out[crypto_generichash_blake2b_BYTES_MAX], k[crypto_generichash_blake2b_KEYBYTES_MAX];
+    unsigned char in[MAXLEN], out[crypto_generichash_blake2b_BYTES_MAX], k[crypto_generichash_blake2b_KEYBYTES_MAX];
     size_t h,i,j;
 
     for(h = 0; h < crypto_generichash_blake2b_KEYBYTES_MAX; ++h) k[h] = h;
diff --git a/test/default/shorthash.c b/test/default/shorthash.c
index 7ae174a7..eaada1bc 100644
--- a/test/default/shorthash.c
+++ b/test/default/shorthash.c
@@ -1,13 +1,11 @@
 
-#include "crypto_uint8.h"
-
 #define TEST_NAME "shorthash"
 #include "cmptest.h"
 
 int main(void)
 {
 #define MAXLEN 64
-    crypto_uint8 in[MAXLEN], out[crypto_shorthash_BYTES], k[crypto_shorthash_KEYBYTES];
+    unsigned char in[MAXLEN], out[crypto_shorthash_BYTES], k[crypto_shorthash_KEYBYTES];
     size_t i,j;
 
     for( i = 0; i < crypto_shorthash_KEYBYTES; ++i ) k[i] = i;