diff --git a/test/default/auth.c b/test/default/auth.c
index 93518512..5da0d0e3 100644
--- a/test/default/auth.c
+++ b/test/default/auth.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "crypto_auth_hmacsha512256.h"
 
 #define TEST_NAME "auth"
 #include "cmptest.h"
diff --git a/test/default/auth2.c b/test/default/auth2.c
index 89f034ca..b3301cfe 100644
--- a/test/default/auth2.c
+++ b/test/default/auth2.c
@@ -1,7 +1,6 @@
 /* "Test Case AUTH256-4" from RFC 4868 */
 
 #include <stdio.h>
-#include "crypto_auth_hmacsha256.h"
 
 #define TEST_NAME "auth2"
 #include "cmptest.h"
diff --git a/test/default/auth3.c b/test/default/auth3.c
index b19b27fc..08e275ad 100644
--- a/test/default/auth3.c
+++ b/test/default/auth3.c
@@ -1,7 +1,6 @@
 /* "Test Case AUTH256-4" from RFC 4868 */
 
 #include <stdio.h>
-#include "crypto_auth_hmacsha256.h"
 
 #define TEST_NAME "auth3"
 #include "cmptest.h"
diff --git a/test/default/auth5.c b/test/default/auth5.c
index 1c2b2f2b..44fce2a1 100644
--- a/test/default/auth5.c
+++ b/test/default/auth5.c
@@ -1,7 +1,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "crypto_auth_hmacsha512256.h"
-#include "randombytes.h"
 #include "windows/windows-quirks.h"
 
 #define TEST_NAME "auth5"
diff --git a/test/default/box.c b/test/default/box.c
index ded5e954..d9f26292 100644
--- a/test/default/box.c
+++ b/test/default/box.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "crypto_box_curve25519xsalsa20poly1305.h"
 
 #define TEST_NAME "box"
 #include "cmptest.h"
diff --git a/test/default/box2.c b/test/default/box2.c
index 193b9b58..7af2f581 100644
--- a/test/default/box2.c
+++ b/test/default/box2.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "crypto_box_curve25519xsalsa20poly1305.h"
 
 #define TEST_NAME "box2"
 #include "cmptest.h"
diff --git a/test/default/box7.c b/test/default/box7.c
index a4fb7ce6..0cf5cffc 100644
--- a/test/default/box7.c
+++ b/test/default/box7.c
@@ -1,6 +1,4 @@
 #include <stdio.h>
-#include "crypto_box.h"
-#include "randombytes.h"
 
 #define TEST_NAME "box7"
 #include "cmptest.h"
diff --git a/test/default/box8.c b/test/default/box8.c
index bade157f..d753b7ba 100644
--- a/test/default/box8.c
+++ b/test/default/box8.c
@@ -1,7 +1,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "crypto_box.h"
-#include "randombytes.h"
 #include "windows/windows-quirks.h"
 
 #define TEST_NAME "box8"
diff --git a/test/default/core1.c b/test/default/core1.c
index 5e6aa82e..4c9453fa 100644
--- a/test/default/core1.c
+++ b/test/default/core1.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "crypto_core_hsalsa20.h"
 
 #define TEST_NAME "core1"
 #include "cmptest.h"
diff --git a/test/default/core2.c b/test/default/core2.c
index 20010cff..b07df8df 100644
--- a/test/default/core2.c
+++ b/test/default/core2.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "crypto_core_hsalsa20.h"
 
 #define TEST_NAME "core2"
 #include "cmptest.h"
diff --git a/test/default/core3.c b/test/default/core3.c
index ca9fc7c3..5d24fdda 100644
--- a/test/default/core3.c
+++ b/test/default/core3.c
@@ -1,6 +1,4 @@
 #include <stdio.h>
-#include "crypto_core_salsa20.h"
-#include "crypto_hash_sha256.h"
 
 #define TEST_NAME "core3"
 #include "cmptest.h"
diff --git a/test/default/core4.c b/test/default/core4.c
index 6d168610..d818723a 100644
--- a/test/default/core4.c
+++ b/test/default/core4.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "crypto_core_salsa20.h"
 
 #define TEST_NAME "core4"
 #include "cmptest.h"
diff --git a/test/default/core5.c b/test/default/core5.c
index d1dc331a..467b27a4 100644
--- a/test/default/core5.c
+++ b/test/default/core5.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "crypto_core_hsalsa20.h"
 
 #define TEST_NAME "core5"
 #include "cmptest.h"
diff --git a/test/default/core6.c b/test/default/core6.c
index 1e2962a5..8a986968 100644
--- a/test/default/core6.c
+++ b/test/default/core6.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "crypto_core_salsa20.h"
 
 #define TEST_NAME "core6"
 #include "cmptest.h"
diff --git a/test/default/hash.c b/test/default/hash.c
index 1b7b8df7..fa0c29a8 100644
--- a/test/default/hash.c
+++ b/test/default/hash.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "crypto_hash.h"
 
 #define TEST_NAME "hash"
 #include "cmptest.h"
diff --git a/test/default/hash3.c b/test/default/hash3.c
index c0f66738..e56660b7 100644
--- a/test/default/hash3.c
+++ b/test/default/hash3.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "crypto_hash_sha512.h"
 
 #define TEST_NAME "hash3"
 #include "cmptest.h"
diff --git a/test/default/onetimeauth.c b/test/default/onetimeauth.c
index 29af33bf..ddeb8eec 100644
--- a/test/default/onetimeauth.c
+++ b/test/default/onetimeauth.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "crypto_onetimeauth_poly1305.h"
 
 #define TEST_NAME "onetimeauth"
 #include "cmptest.h"
diff --git a/test/default/onetimeauth2.c b/test/default/onetimeauth2.c
index fbc1cff5..2114e291 100644
--- a/test/default/onetimeauth2.c
+++ b/test/default/onetimeauth2.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "crypto_onetimeauth_poly1305.h"
 
 #define TEST_NAME "onetimeauth2"
 #include "cmptest.h"
diff --git a/test/default/onetimeauth7.c b/test/default/onetimeauth7.c
index 8028eb09..268f33d4 100644
--- a/test/default/onetimeauth7.c
+++ b/test/default/onetimeauth7.c
@@ -1,7 +1,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "crypto_onetimeauth_poly1305.h"
-#include "randombytes.h"
 #include "windows/windows-quirks.h"
 
 #define TEST_NAME "onetimeauth7"
diff --git a/test/default/scalarmult.c b/test/default/scalarmult.c
index ca1921d4..957bc9c1 100644
--- a/test/default/scalarmult.c
+++ b/test/default/scalarmult.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "crypto_scalarmult_curve25519.h"
 
 #define TEST_NAME "scalarmult"
 #include "cmptest.h"
diff --git a/test/default/scalarmult2.c b/test/default/scalarmult2.c
index 45e2ab04..93a37d07 100644
--- a/test/default/scalarmult2.c
+++ b/test/default/scalarmult2.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "crypto_scalarmult_curve25519.h"
 
 #define TEST_NAME "scalarmult2"
 #include "cmptest.h"
diff --git a/test/default/scalarmult5.c b/test/default/scalarmult5.c
index 21170ee1..b6852a91 100644
--- a/test/default/scalarmult5.c
+++ b/test/default/scalarmult5.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "crypto_scalarmult_curve25519.h"
 
 #define TEST_NAME "scalarmult5"
 #include "cmptest.h"
diff --git a/test/default/scalarmult6.c b/test/default/scalarmult6.c
index 51a05de4..c1ac8853 100644
--- a/test/default/scalarmult6.c
+++ b/test/default/scalarmult6.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "crypto_scalarmult_curve25519.h"
 
 #define TEST_NAME "scalarmult6"
 #include "cmptest.h"
diff --git a/test/default/secretbox.c b/test/default/secretbox.c
index 29e2a28b..485a97a1 100644
--- a/test/default/secretbox.c
+++ b/test/default/secretbox.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "crypto_secretbox_xsalsa20poly1305.h"
 
 #define TEST_NAME "secretbox"
 #include "cmptest.h"
diff --git a/test/default/secretbox2.c b/test/default/secretbox2.c
index 4676f280..5af6c41b 100644
--- a/test/default/secretbox2.c
+++ b/test/default/secretbox2.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "crypto_secretbox_xsalsa20poly1305.h"
 
 #define TEST_NAME "secretbox2"
 #include "cmptest.h"
diff --git a/test/default/secretbox7.c b/test/default/secretbox7.c
index 5731fb78..5dd8b821 100644
--- a/test/default/secretbox7.c
+++ b/test/default/secretbox7.c
@@ -1,6 +1,4 @@
 #include <stdio.h>
-#include "crypto_secretbox.h"
-#include "randombytes.h"
 
 #define TEST_NAME "secretbox7"
 #include "cmptest.h"
diff --git a/test/default/secretbox8.c b/test/default/secretbox8.c
index 685d6870..c3424b6c 100644
--- a/test/default/secretbox8.c
+++ b/test/default/secretbox8.c
@@ -1,8 +1,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "crypto_secretbox.h"
-#include "randombytes.h"
-#include "windows/windows-quirks.h"
 
 #define TEST_NAME "secretbox8"
 #include "cmptest.h"
diff --git a/test/default/shorthash.c b/test/default/shorthash.c
index b939535d..a08a5db0 100644
--- a/test/default/shorthash.c
+++ b/test/default/shorthash.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
+
 #include "crypto_uint8.h"
-#include "crypto_shorthash.h"
 
 #define TEST_NAME "shorthash"
 #include "cmptest.h"
diff --git a/test/default/stream.c b/test/default/stream.c
index 5cf5d578..cc6d4162 100644
--- a/test/default/stream.c
+++ b/test/default/stream.c
@@ -1,6 +1,4 @@
 #include <stdio.h>
-#include "crypto_stream_xsalsa20.h"
-#include "crypto_hash_sha256.h"
 
 #define TEST_NAME "stream"
 #include "cmptest.h"
diff --git a/test/default/stream2.c b/test/default/stream2.c
index 99f2327e..25cdb352 100644
--- a/test/default/stream2.c
+++ b/test/default/stream2.c
@@ -1,6 +1,4 @@
 #include <stdio.h>
-#include "crypto_stream_salsa20.h"
-#include "crypto_hash_sha256.h"
 
 #define TEST_NAME "stream2"
 #include "cmptest.h"
diff --git a/test/default/stream3.c b/test/default/stream3.c
index b966c346..3a1f559d 100644
--- a/test/default/stream3.c
+++ b/test/default/stream3.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "crypto_stream_xsalsa20.h"
 
 #define TEST_NAME "stream3"
 #include "cmptest.h"
diff --git a/test/default/stream4.c b/test/default/stream4.c
index 33bdc426..91c724f7 100644
--- a/test/default/stream4.c
+++ b/test/default/stream4.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include "crypto_stream_xsalsa20.h"
 
 #define TEST_NAME "stream4"
 #include "cmptest.h"