diff --git a/crypto_sign/dilithium2/avx2/Makefile b/crypto_sign/dilithium2/avx2/Makefile
index 7471c4d1..c363416b 100644
--- a/crypto_sign/dilithium2/avx2/Makefile
+++ b/crypto_sign/dilithium2/avx2/Makefile
@@ -2,13 +2,13 @@
 
 LIB=libdilithium2_avx2.a
 
-SOURCES = fips202x4.c invntt.s nttconsts.c ntt.s packing.c pointwise.S poly.c \
-		  polyvec.c reduce.s rejsample.c rounding.c sign.c stream.c
+SOURCES = fips202x4.c invntt.S nttconsts.c ntt.S packing.c pointwise.S poly.c \
+		  polyvec.c reduce.S rejsample.c rounding.c sign.c stream.c
 OBJECTS = fips202x4.o invntt.o nttconsts.o ntt.o packing.o pointwise.o poly.o \
 		  polyvec.o reduce.o rejsample.o rounding.o sign.o stream.o
 HEADERS = alignment.h api.h params.h sign.h polyvec.h poly.h packing.h ntt.h  \
 		  nttconsts.h reduce.h rounding.h rejsample.h symmetric.h stream.h    \
-		  fips202x4.h shuffle.inc
+		  fips202x4.h shuffle.inc cdecl.inc
 
 CFLAGS=-O3 -Wall -Wextra -Wpedantic -Wvla -Werror \
 	   -Wmissing-prototypes -Wredundant-decls -std=c99 \
diff --git a/crypto_sign/dilithium3/avx2/Makefile b/crypto_sign/dilithium3/avx2/Makefile
index 1982bd7d..58f6c43d 100644
--- a/crypto_sign/dilithium3/avx2/Makefile
+++ b/crypto_sign/dilithium3/avx2/Makefile
@@ -2,13 +2,13 @@
 
 LIB=libdilithium3_avx2.a
 
-SOURCES = fips202x4.c invntt.s nttconsts.c ntt.s packing.c pointwise.S poly.c \
-		  polyvec.c reduce.s rejsample.c rounding.c sign.c stream.c
+SOURCES = fips202x4.c invntt.S nttconsts.c ntt.S packing.c pointwise.S poly.c \
+		  polyvec.c reduce.S rejsample.c rounding.c sign.c stream.c
 OBJECTS = fips202x4.o invntt.o nttconsts.o ntt.o packing.o pointwise.o poly.o \
 		  polyvec.o reduce.o rejsample.o rounding.o sign.o stream.o
 HEADERS = alignment.h api.h params.h sign.h polyvec.h poly.h packing.h ntt.h  \
 		  nttconsts.h reduce.h rounding.h rejsample.h symmetric.h stream.h    \
-		  fips202x4.h shuffle.inc
+		  fips202x4.h shuffle.inc cdecl.inc
 
 CFLAGS=-O3 -Wall -Wextra -Wpedantic -Wvla -Werror \
 	   -Wmissing-prototypes -Wredundant-decls -std=c99 \
diff --git a/crypto_sign/dilithium4/avx2/Makefile b/crypto_sign/dilithium4/avx2/Makefile
index a09c5c81..9fd9f482 100644
--- a/crypto_sign/dilithium4/avx2/Makefile
+++ b/crypto_sign/dilithium4/avx2/Makefile
@@ -2,13 +2,13 @@
 
 LIB=libdilithium4_avx2.a
 
-SOURCES = fips202x4.c invntt.s nttconsts.c ntt.s packing.c pointwise.S poly.c \
-		  polyvec.c reduce.s rejsample.c rounding.c sign.c stream.c
+SOURCES = fips202x4.c invntt.S nttconsts.c ntt.S packing.c pointwise.S poly.c \
+		  polyvec.c reduce.S rejsample.c rounding.c sign.c stream.c
 OBJECTS = fips202x4.o invntt.o nttconsts.o ntt.o packing.o pointwise.o poly.o \
 		  polyvec.o reduce.o rejsample.o rounding.o sign.o stream.o
 HEADERS = alignment.h api.h params.h sign.h polyvec.h poly.h packing.h ntt.h  \
 		  nttconsts.h reduce.h rounding.h rejsample.h symmetric.h stream.h    \
-		  fips202x4.h shuffle.inc
+		  fips202x4.h shuffle.inc cdecl.inc
 
 CFLAGS=-O3 -Wall -Wextra -Wpedantic -Wvla -Werror \
 	   -Wmissing-prototypes -Wredundant-decls -std=c99 \