diff --git a/crypto_sign/sphincs-sha256-128f-robust/avx2/Makefile b/crypto_sign/sphincs-sha256-128f-robust/avx2/Makefile
index 3590aa5e..b17cb9b0 100644
--- a/crypto_sign/sphincs-sha256-128f-robust/avx2/Makefile
+++ b/crypto_sign/sphincs-sha256-128f-robust/avx2/Makefile
@@ -3,7 +3,7 @@
 LIB=libsphincs-sha256-128f-robust_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h  sha256.h
-OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o
+OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o
 
 CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS)
 
diff --git a/crypto_sign/sphincs-sha256-128f-simple/avx2/Makefile b/crypto_sign/sphincs-sha256-128f-simple/avx2/Makefile
index c49054c0..c1cc4973 100644
--- a/crypto_sign/sphincs-sha256-128f-simple/avx2/Makefile
+++ b/crypto_sign/sphincs-sha256-128f-simple/avx2/Makefile
@@ -3,7 +3,7 @@
 LIB=libsphincs-sha256-128f-simple_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h  sha256.h
-OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o
+OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o
 
 CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS)
 
diff --git a/crypto_sign/sphincs-sha256-128s-robust/avx2/Makefile b/crypto_sign/sphincs-sha256-128s-robust/avx2/Makefile
index 4bd1d4f8..dff43035 100644
--- a/crypto_sign/sphincs-sha256-128s-robust/avx2/Makefile
+++ b/crypto_sign/sphincs-sha256-128s-robust/avx2/Makefile
@@ -3,7 +3,7 @@
 LIB=libsphincs-sha256-128s-robust_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h  sha256.h
-OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o
+OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o
 
 CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS)
 
diff --git a/crypto_sign/sphincs-sha256-128s-simple/avx2/Makefile b/crypto_sign/sphincs-sha256-128s-simple/avx2/Makefile
index 7d91a2af..cf030ab5 100644
--- a/crypto_sign/sphincs-sha256-128s-simple/avx2/Makefile
+++ b/crypto_sign/sphincs-sha256-128s-simple/avx2/Makefile
@@ -3,7 +3,7 @@
 LIB=libsphincs-sha256-128s-simple_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h  sha256.h
-OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o
+OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o
 
 CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS)
 
diff --git a/crypto_sign/sphincs-sha256-192f-robust/avx2/Makefile b/crypto_sign/sphincs-sha256-192f-robust/avx2/Makefile
index 76ab47a6..f4022e14 100644
--- a/crypto_sign/sphincs-sha256-192f-robust/avx2/Makefile
+++ b/crypto_sign/sphincs-sha256-192f-robust/avx2/Makefile
@@ -3,7 +3,7 @@
 LIB=libsphincs-sha256-192f-robust_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h  sha256.h
-OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o
+OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o
 
 CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS)
 
diff --git a/crypto_sign/sphincs-sha256-192f-simple/avx2/Makefile b/crypto_sign/sphincs-sha256-192f-simple/avx2/Makefile
index f309eb6b..4a7240ac 100644
--- a/crypto_sign/sphincs-sha256-192f-simple/avx2/Makefile
+++ b/crypto_sign/sphincs-sha256-192f-simple/avx2/Makefile
@@ -3,7 +3,7 @@
 LIB=libsphincs-sha256-192f-simple_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h  sha256.h
-OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o
+OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o
 
 CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS)
 
diff --git a/crypto_sign/sphincs-sha256-192s-robust/avx2/Makefile b/crypto_sign/sphincs-sha256-192s-robust/avx2/Makefile
index 554905e8..db8b9e05 100644
--- a/crypto_sign/sphincs-sha256-192s-robust/avx2/Makefile
+++ b/crypto_sign/sphincs-sha256-192s-robust/avx2/Makefile
@@ -3,7 +3,7 @@
 LIB=libsphincs-sha256-192s-robust_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h  sha256.h
-OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o
+OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o
 
 CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS)
 
diff --git a/crypto_sign/sphincs-sha256-192s-simple/avx2/Makefile b/crypto_sign/sphincs-sha256-192s-simple/avx2/Makefile
index c9ba4b65..bafa06bc 100644
--- a/crypto_sign/sphincs-sha256-192s-simple/avx2/Makefile
+++ b/crypto_sign/sphincs-sha256-192s-simple/avx2/Makefile
@@ -3,7 +3,7 @@
 LIB=libsphincs-sha256-192s-simple_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h  sha256.h
-OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o
+OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o
 
 CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS)
 
diff --git a/crypto_sign/sphincs-sha256-256f-robust/avx2/Makefile b/crypto_sign/sphincs-sha256-256f-robust/avx2/Makefile
index 7e288be7..8c40f89b 100644
--- a/crypto_sign/sphincs-sha256-256f-robust/avx2/Makefile
+++ b/crypto_sign/sphincs-sha256-256f-robust/avx2/Makefile
@@ -3,7 +3,7 @@
 LIB=libsphincs-sha256-256f-robust_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h  sha256.h
-OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o
+OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o
 
 CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS)
 
diff --git a/crypto_sign/sphincs-sha256-256f-simple/avx2/Makefile b/crypto_sign/sphincs-sha256-256f-simple/avx2/Makefile
index 2379ef36..2af8fa8f 100644
--- a/crypto_sign/sphincs-sha256-256f-simple/avx2/Makefile
+++ b/crypto_sign/sphincs-sha256-256f-simple/avx2/Makefile
@@ -3,7 +3,7 @@
 LIB=libsphincs-sha256-256f-simple_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h  sha256.h
-OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o
+OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o
 
 CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS)
 
diff --git a/crypto_sign/sphincs-sha256-256s-robust/avx2/Makefile b/crypto_sign/sphincs-sha256-256s-robust/avx2/Makefile
index 62d536f1..069584ab 100644
--- a/crypto_sign/sphincs-sha256-256s-robust/avx2/Makefile
+++ b/crypto_sign/sphincs-sha256-256s-robust/avx2/Makefile
@@ -3,7 +3,7 @@
 LIB=libsphincs-sha256-256s-robust_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h  sha256.h
-OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o
+OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_robust.o hash_sha256x8.o thash_sha256_robustx8.o sha256.o
 
 CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS)
 
diff --git a/crypto_sign/sphincs-sha256-256s-simple/avx2/Makefile b/crypto_sign/sphincs-sha256-256s-simple/avx2/Makefile
index 74763e38..e599bf29 100644
--- a/crypto_sign/sphincs-sha256-256s-simple/avx2/Makefile
+++ b/crypto_sign/sphincs-sha256-256s-simple/avx2/Makefile
@@ -3,7 +3,7 @@
 LIB=libsphincs-sha256-256s-simple_avx2.a
 
 HEADERS = params.h address.h wots.h utils.h utilsx8.h sha256avx.h sha256x8.h fors.h api.h hash.h hashx8.h hash_state.h thash.h thashx8.h  sha256.h
-OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o hash_sha256x8.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o
+OBJECTS =          address.o wots.o utils.o utilsx8.o sha256avx.o sha256x8.o fors.o sign.o hash_sha256.o thash_sha256_simple.o hash_sha256x8.o thash_sha256_simplex8.o sha256.o
 
 CFLAGS=-mavx2 -O3 -Wall -Wconversion -Wextra -Wpedantic -Wvla -Werror -Wmissing-prototypes -Wredundant-decls -std=c99 -I../../../common $(EXTRAFLAGS)