diff --git a/mlkem/fips202/keccakf1600.c b/mlkem/fips202/keccakf1600.c
index 7c7a2d71d..7c04efcea 100644
--- a/mlkem/fips202/keccakf1600.c
+++ b/mlkem/fips202/keccakf1600.c
@@ -10,14 +10,12 @@
  * from https://twitter.com/tweetfips202
  * by Gilles Van Assche, Daniel J. Bernstein, and Peter Schwabe */
 
-#include "keccakf1600.h"
 #include <assert.h>
 #include <stdint.h>
 
-#include "config.h"
-#include "fips202_backend.h"
-
 #include "cbmc.h"
+#include "fips202_backend.h"
+#include "keccakf1600.h"
 
 #define NROUNDS 24
 #define ROL(a, offset) ((a << offset) ^ (a >> (64 - offset)))
diff --git a/mlkem/kem.h b/mlkem/kem.h
index 2ba4af066..fc0c04bf9 100644
--- a/mlkem/kem.h
+++ b/mlkem/kem.h
@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 #include "cbmc.h"
-#include "params.h"
+#include "commmon.h"
 
 #define CRYPTO_SECRETKEYBYTES MLKEM_SECRETKEYBYTES
 #define CRYPTO_PUBLICKEYBYTES MLKEM_PUBLICKEYBYTES
diff --git a/mlkem/polyvec.c b/mlkem/polyvec.c
index 72277a626..d1150ca85 100644
--- a/mlkem/polyvec.c
+++ b/mlkem/polyvec.c
@@ -5,7 +5,6 @@
 #include "polyvec.h"
 #include <stdint.h>
 #include "arith_backend.h"
-#include "config.h"
 #include "ntt.h"
 #include "poly.h"
 
diff --git a/mlkem/verify.h b/mlkem/verify.h
index 126eeb279..4398eafe7 100644
--- a/mlkem/verify.h
+++ b/mlkem/verify.h
@@ -9,7 +9,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include "cbmc.h"
-#include "params.h"
+#include "common.h"
 
 /* Static namespacing
  * This is to facilitate building multiple instances