diff --git a/crypto_sign/sphincs-haraka-128f-robust/clean/Makefile b/crypto_sign/sphincs-haraka-128f-robust/clean/Makefile
index 9716e43e..ef8b9b20 100644
--- a/crypto_sign/sphincs-haraka-128f-robust/clean/Makefile
+++ b/crypto_sign/sphincs-haraka-128f-robust/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-haraka-128f-robust_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h haraka.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_haraka.o thash_haraka_robust.o haraka.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-haraka-128f-simple/clean/Makefile b/crypto_sign/sphincs-haraka-128f-simple/clean/Makefile
index 502a4585..f8e5ced4 100644
--- a/crypto_sign/sphincs-haraka-128f-simple/clean/Makefile
+++ b/crypto_sign/sphincs-haraka-128f-simple/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-haraka-128f-simple_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h haraka.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_haraka.o thash_haraka_simple.o haraka.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-haraka-128s-robust/clean/Makefile b/crypto_sign/sphincs-haraka-128s-robust/clean/Makefile
index 6ab2d592..af7bc1f5 100644
--- a/crypto_sign/sphincs-haraka-128s-robust/clean/Makefile
+++ b/crypto_sign/sphincs-haraka-128s-robust/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-haraka-128s-robust_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h haraka.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_haraka.o thash_haraka_robust.o haraka.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-haraka-128s-simple/clean/Makefile b/crypto_sign/sphincs-haraka-128s-simple/clean/Makefile
index f6dfd16c..c620fb24 100644
--- a/crypto_sign/sphincs-haraka-128s-simple/clean/Makefile
+++ b/crypto_sign/sphincs-haraka-128s-simple/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-haraka-128s-simple_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h haraka.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_haraka.o thash_haraka_simple.o haraka.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-haraka-192f-robust/clean/Makefile b/crypto_sign/sphincs-haraka-192f-robust/clean/Makefile
index f599064e..5031e2a9 100644
--- a/crypto_sign/sphincs-haraka-192f-robust/clean/Makefile
+++ b/crypto_sign/sphincs-haraka-192f-robust/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-haraka-192f-robust_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h haraka.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_haraka.o thash_haraka_robust.o haraka.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-haraka-192f-simple/clean/Makefile b/crypto_sign/sphincs-haraka-192f-simple/clean/Makefile
index 1e2c792f..880784b6 100644
--- a/crypto_sign/sphincs-haraka-192f-simple/clean/Makefile
+++ b/crypto_sign/sphincs-haraka-192f-simple/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-haraka-192f-simple_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h haraka.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_haraka.o thash_haraka_simple.o haraka.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-haraka-192s-robust/clean/Makefile b/crypto_sign/sphincs-haraka-192s-robust/clean/Makefile
index a4e20d14..5c4b009c 100644
--- a/crypto_sign/sphincs-haraka-192s-robust/clean/Makefile
+++ b/crypto_sign/sphincs-haraka-192s-robust/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-haraka-192s-robust_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h haraka.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_haraka.o thash_haraka_robust.o haraka.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-haraka-192s-simple/clean/Makefile b/crypto_sign/sphincs-haraka-192s-simple/clean/Makefile
index 1c6a1a4a..1b72ee9c 100644
--- a/crypto_sign/sphincs-haraka-192s-simple/clean/Makefile
+++ b/crypto_sign/sphincs-haraka-192s-simple/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-haraka-192s-simple_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h haraka.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_haraka.o thash_haraka_simple.o haraka.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-haraka-256f-robust/clean/Makefile b/crypto_sign/sphincs-haraka-256f-robust/clean/Makefile
index 65645c8b..29d1bd75 100644
--- a/crypto_sign/sphincs-haraka-256f-robust/clean/Makefile
+++ b/crypto_sign/sphincs-haraka-256f-robust/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-haraka-256f-robust_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h haraka.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_haraka.o thash_haraka_robust.o haraka.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-haraka-256f-simple/clean/Makefile b/crypto_sign/sphincs-haraka-256f-simple/clean/Makefile
index a573a3c1..9bbe5996 100644
--- a/crypto_sign/sphincs-haraka-256f-simple/clean/Makefile
+++ b/crypto_sign/sphincs-haraka-256f-simple/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-haraka-256f-simple_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h haraka.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_haraka.o thash_haraka_simple.o haraka.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-haraka-256s-robust/clean/Makefile b/crypto_sign/sphincs-haraka-256s-robust/clean/Makefile
index ba0cb5f0..646f17e7 100644
--- a/crypto_sign/sphincs-haraka-256s-robust/clean/Makefile
+++ b/crypto_sign/sphincs-haraka-256s-robust/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-haraka-256s-robust_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h haraka.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_haraka.o thash_haraka_robust.o haraka.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-haraka-256s-simple/clean/Makefile b/crypto_sign/sphincs-haraka-256s-simple/clean/Makefile
index e0a67389..1f52d495 100644
--- a/crypto_sign/sphincs-haraka-256s-simple/clean/Makefile
+++ b/crypto_sign/sphincs-haraka-256s-simple/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-haraka-256s-simple_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h haraka.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_haraka.o thash_haraka_simple.o haraka.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-sha256-128f-robust/clean/Makefile b/crypto_sign/sphincs-sha256-128f-robust/clean/Makefile
index 20685ac9..fc8d8e0e 100644
--- a/crypto_sign/sphincs-sha256-128f-robust/clean/Makefile
+++ b/crypto_sign/sphincs-sha256-128f-robust/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-sha256-128f-robust_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h sha256.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_sha256.o thash_sha256_robust.o sha256.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-sha256-128f-simple/clean/Makefile b/crypto_sign/sphincs-sha256-128f-simple/clean/Makefile
index 338c3f55..0e42d073 100644
--- a/crypto_sign/sphincs-sha256-128f-simple/clean/Makefile
+++ b/crypto_sign/sphincs-sha256-128f-simple/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-sha256-128f-simple_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h sha256.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_sha256.o thash_sha256_simple.o sha256.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-sha256-128s-robust/clean/Makefile b/crypto_sign/sphincs-sha256-128s-robust/clean/Makefile
index 88775b78..a2fbc903 100644
--- a/crypto_sign/sphincs-sha256-128s-robust/clean/Makefile
+++ b/crypto_sign/sphincs-sha256-128s-robust/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-sha256-128s-robust_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h sha256.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_sha256.o thash_sha256_robust.o sha256.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-sha256-128s-simple/clean/Makefile b/crypto_sign/sphincs-sha256-128s-simple/clean/Makefile
index 990988b6..c1d12ba3 100644
--- a/crypto_sign/sphincs-sha256-128s-simple/clean/Makefile
+++ b/crypto_sign/sphincs-sha256-128s-simple/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-sha256-128s-simple_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h sha256.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_sha256.o thash_sha256_simple.o sha256.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-sha256-192f-robust/clean/Makefile b/crypto_sign/sphincs-sha256-192f-robust/clean/Makefile
index 9f3af076..c3ebe8b7 100644
--- a/crypto_sign/sphincs-sha256-192f-robust/clean/Makefile
+++ b/crypto_sign/sphincs-sha256-192f-robust/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-sha256-192f-robust_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h sha256.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_sha256.o thash_sha256_robust.o sha256.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-sha256-192f-simple/clean/Makefile b/crypto_sign/sphincs-sha256-192f-simple/clean/Makefile
index d15dfb6c..100b4d35 100644
--- a/crypto_sign/sphincs-sha256-192f-simple/clean/Makefile
+++ b/crypto_sign/sphincs-sha256-192f-simple/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-sha256-192f-simple_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h sha256.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_sha256.o thash_sha256_simple.o sha256.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-sha256-192s-robust/clean/Makefile b/crypto_sign/sphincs-sha256-192s-robust/clean/Makefile
index c8fd7215..eff4eb93 100644
--- a/crypto_sign/sphincs-sha256-192s-robust/clean/Makefile
+++ b/crypto_sign/sphincs-sha256-192s-robust/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-sha256-192s-robust_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h sha256.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_sha256.o thash_sha256_robust.o sha256.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-sha256-192s-simple/clean/Makefile b/crypto_sign/sphincs-sha256-192s-simple/clean/Makefile
index b4964631..a12ef970 100644
--- a/crypto_sign/sphincs-sha256-192s-simple/clean/Makefile
+++ b/crypto_sign/sphincs-sha256-192s-simple/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-sha256-192s-simple_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h sha256.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_sha256.o thash_sha256_simple.o sha256.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-sha256-256f-robust/clean/Makefile b/crypto_sign/sphincs-sha256-256f-robust/clean/Makefile
index f05ea23c..f6ec4885 100644
--- a/crypto_sign/sphincs-sha256-256f-robust/clean/Makefile
+++ b/crypto_sign/sphincs-sha256-256f-robust/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-sha256-256f-robust_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h sha256.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_sha256.o thash_sha256_robust.o sha256.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-sha256-256f-simple/clean/Makefile b/crypto_sign/sphincs-sha256-256f-simple/clean/Makefile
index 717c9d99..feaeccb8 100644
--- a/crypto_sign/sphincs-sha256-256f-simple/clean/Makefile
+++ b/crypto_sign/sphincs-sha256-256f-simple/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-sha256-256f-simple_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h sha256.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_sha256.o thash_sha256_simple.o sha256.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-sha256-256s-robust/clean/Makefile b/crypto_sign/sphincs-sha256-256s-robust/clean/Makefile
index 8061bea0..25a11be7 100644
--- a/crypto_sign/sphincs-sha256-256s-robust/clean/Makefile
+++ b/crypto_sign/sphincs-sha256-256s-robust/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-sha256-256s-robust_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h sha256.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_sha256.o thash_sha256_robust.o sha256.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-sha256-256s-simple/clean/Makefile b/crypto_sign/sphincs-sha256-256s-simple/clean/Makefile
index 5e23595f..04c4ef5f 100644
--- a/crypto_sign/sphincs-sha256-256s-simple/clean/Makefile
+++ b/crypto_sign/sphincs-sha256-256s-simple/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-sha256-256s-simple_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h sha256.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_sha256.o thash_sha256_simple.o sha256.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-shake256-128f-robust/clean/Makefile b/crypto_sign/sphincs-shake256-128f-robust/clean/Makefile
index d667c89c..b344b32d 100644
--- a/crypto_sign/sphincs-shake256-128f-robust/clean/Makefile
+++ b/crypto_sign/sphincs-shake256-128f-robust/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-shake256-128f-robust_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_shake256.o thash_shake256_robust.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-shake256-128s-robust/clean/Makefile b/crypto_sign/sphincs-shake256-128s-robust/clean/Makefile
index c40f8325..40a1e76c 100644
--- a/crypto_sign/sphincs-shake256-128s-robust/clean/Makefile
+++ b/crypto_sign/sphincs-shake256-128s-robust/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-shake256-128s-robust_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_shake256.o thash_shake256_robust.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-shake256-128s-simple/clean/Makefile b/crypto_sign/sphincs-shake256-128s-simple/clean/Makefile
index 3d31edc7..45d52caf 100644
--- a/crypto_sign/sphincs-shake256-128s-simple/clean/Makefile
+++ b/crypto_sign/sphincs-shake256-128s-simple/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-shake256-128s-simple_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_shake256.o thash_shake256_simple.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-shake256-192f-robust/clean/Makefile b/crypto_sign/sphincs-shake256-192f-robust/clean/Makefile
index 04364baf..612f7b3e 100644
--- a/crypto_sign/sphincs-shake256-192f-robust/clean/Makefile
+++ b/crypto_sign/sphincs-shake256-192f-robust/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-shake256-192f-robust_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_shake256.o thash_shake256_robust.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-shake256-192f-simple/clean/Makefile b/crypto_sign/sphincs-shake256-192f-simple/clean/Makefile
index b1c5dddf..8488a644 100644
--- a/crypto_sign/sphincs-shake256-192f-simple/clean/Makefile
+++ b/crypto_sign/sphincs-shake256-192f-simple/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-shake256-192f-simple_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_shake256.o thash_shake256_simple.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-shake256-192s-robust/clean/Makefile b/crypto_sign/sphincs-shake256-192s-robust/clean/Makefile
index 8d178e39..d9fc53a8 100644
--- a/crypto_sign/sphincs-shake256-192s-robust/clean/Makefile
+++ b/crypto_sign/sphincs-shake256-192s-robust/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-shake256-192s-robust_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_shake256.o thash_shake256_robust.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-shake256-192s-simple/clean/Makefile b/crypto_sign/sphincs-shake256-192s-simple/clean/Makefile
index fb0bdddd..c55451c5 100644
--- a/crypto_sign/sphincs-shake256-192s-simple/clean/Makefile
+++ b/crypto_sign/sphincs-shake256-192s-simple/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-shake256-192s-simple_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_shake256.o thash_shake256_simple.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-shake256-256f-robust/clean/Makefile b/crypto_sign/sphincs-shake256-256f-robust/clean/Makefile
index b43911a4..4cf963a3 100644
--- a/crypto_sign/sphincs-shake256-256f-robust/clean/Makefile
+++ b/crypto_sign/sphincs-shake256-256f-robust/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-shake256-256f-robust_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_shake256.o thash_shake256_robust.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-shake256-256f-simple/clean/Makefile b/crypto_sign/sphincs-shake256-256f-simple/clean/Makefile
index b585d808..1cebdfda 100644
--- a/crypto_sign/sphincs-shake256-256f-simple/clean/Makefile
+++ b/crypto_sign/sphincs-shake256-256f-simple/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-shake256-256f-simple_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_shake256.o thash_shake256_simple.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-shake256-256s-robust/clean/Makefile b/crypto_sign/sphincs-shake256-256s-robust/clean/Makefile
index 60bf6c95..5172613f 100644
--- a/crypto_sign/sphincs-shake256-256s-robust/clean/Makefile
+++ b/crypto_sign/sphincs-shake256-256s-robust/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-shake256-256s-robust_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_shake256.o thash_shake256_robust.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)
 
diff --git a/crypto_sign/sphincs-shake256-256s-simple/clean/Makefile b/crypto_sign/sphincs-shake256-256s-simple/clean/Makefile
index fcc20c94..35e43d53 100644
--- a/crypto_sign/sphincs-shake256-256s-simple/clean/Makefile
+++ b/crypto_sign/sphincs-shake256-256s-simple/clean/Makefile
@@ -5,7 +5,7 @@ LIB=libsphincs-shake256-256s-simple_clean.a
 HEADERS = params.h address.h wots.h utils.h fors.h api.h  hash.h thash.h
 OBJECTS =          address.o wots.o utils.o fors.o sign.o hash_shake256.o thash_shake256_simple.o
 
-CFLAGS=-Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
+CFLAGS=-O3 -Wall -Wconversion -Wextra -Wpedantic -Werror -Wmissing-prototypes -std=c99 -I../../../common $(EXTRAFLAGS)
 
 all: $(LIB)