Consolidate inclusion of <string.h> via common.h

willieyz · hanno-becker · commit 0b1c5364dc46 · 2026-02-14T09:16:57.000Z
While consolidating &lt;stdint.h&gt; includes, we observed that &lt;string.h&gt;
is already transitively included through common.h. However, many source
files still explicitly included &lt;string.h&gt;.

This change removes redundant &lt;string.h&gt; includes across the codebase
and standardizes include order by placing the corresponding foo.h at
the top of each foo.c, following the convention used in mlkem-native.

Signed-off-by: willieyz &lt;willie.zhao@chelpis.com&gt;
diff --git a/dev/fips202/armv81m/mve.h b/dev/fips202/armv81m/mve.h
@@ -15,7 +15,6 @@
 #define MLD_FIPS202_ARMV81M_NEED_X4
 
 #if !defined(__ASSEMBLER__)
-#include <stdint.h>
 #include "../api.h"
 
 #define mld_keccak_f1600_x4_native_impl \
diff --git a/dev/fips202/armv81m/src/fips202_native_armv81m.h b/dev/fips202/armv81m/src/fips202_native_armv81m.h
@@ -6,7 +6,6 @@
 #ifndef MLD_DEV_FIPS202_ARMV81M_SRC_FIPS202_NATIVE_ARMV81M_H
 #define MLD_DEV_FIPS202_ARMV81M_SRC_FIPS202_NATIVE_ARMV81M_H
 
-#include <stdint.h>
 #include "../../../../common.h"
 
 /* Keccak round constants in bit-interleaved form */
diff --git a/dev/fips202/armv81m/src/keccak_f1600_x4_mve.c b/dev/fips202/armv81m/src/keccak_f1600_x4_mve.c
@@ -10,7 +10,6 @@
 #if defined(MLD_FIPS202_ARMV81M_NEED_X4) && \
     !defined(MLD_CONFIG_MULTILEVEL_NO_SHARED)
 
-#include <stdint.h>
 #include "fips202_native_armv81m.h"
 
 /*
diff --git a/dev/fips202/armv81m/src/keccakf1600_round_constants.c b/dev/fips202/armv81m/src/keccakf1600_round_constants.c
@@ -9,8 +9,6 @@
 #if defined(MLD_FIPS202_ARMV81M_NEED_X4) && \
     !defined(MLD_CONFIG_MULTILEVEL_NO_SHARED)
 
-#include <stdint.h>
-
 #include "fips202_native_armv81m.h"
 
 /*
diff --git a/dev/x86_64/src/poly_decompose_32_avx2.c b/dev/x86_64/src/poly_decompose_32_avx2.c
@@ -29,7 +29,6 @@
      (MLD_CONFIG_PARAMETER_SET == 65 || MLD_CONFIG_PARAMETER_SET == 87))
 
 #include <immintrin.h>
-#include <string.h>
 #include "arith_native_x86_64.h"
 #include "consts.h"
 
diff --git a/dev/x86_64/src/poly_decompose_88_avx2.c b/dev/x86_64/src/poly_decompose_88_avx2.c
@@ -29,7 +29,6 @@
      MLD_CONFIG_PARAMETER_SET == 44)
 
 #include <immintrin.h>
-#include <string.h>
 #include "arith_native_x86_64.h"
 #include "consts.h"
 
diff --git a/dev/x86_64/src/poly_use_hint_32_avx2.c b/dev/x86_64/src/poly_use_hint_32_avx2.c
@@ -25,7 +25,6 @@
      (MLD_CONFIG_PARAMETER_SET == 65 || MLD_CONFIG_PARAMETER_SET == 87))
 
 #include <immintrin.h>
-#include <string.h>
 #include "arith_native_x86_64.h"
 #include "consts.h"
 
diff --git a/dev/x86_64/src/poly_use_hint_88_avx2.c b/dev/x86_64/src/poly_use_hint_88_avx2.c
@@ -25,7 +25,6 @@
      MLD_CONFIG_PARAMETER_SET == 44)
 
 #include <immintrin.h>
-#include <string.h>
 #include "arith_native_x86_64.h"
 #include "consts.h"
 
diff --git a/dev/x86_64/src/rej_uniform_avx2.c b/dev/x86_64/src/rej_uniform_avx2.c
@@ -23,7 +23,6 @@
     !defined(MLD_CONFIG_MULTILEVEL_NO_SHARED)
 
 #include <immintrin.h>
-#include <string.h>
 #include "arith_native_x86_64.h"
 #include "consts.h"
 
diff --git a/dev/x86_64/src/rej_uniform_eta2_avx2.c b/dev/x86_64/src/rej_uniform_eta2_avx2.c
@@ -24,7 +24,6 @@
     (defined(MLD_CONFIG_MULTILEVEL_WITH_SHARED) || MLDSA_ETA == 2)
 
 #include <immintrin.h>
-#include <string.h>
 #include "arith_native_x86_64.h"
 #include "consts.h"
 
diff --git a/dev/x86_64/src/rej_uniform_eta4_avx2.c b/dev/x86_64/src/rej_uniform_eta4_avx2.c
@@ -24,7 +24,6 @@
     (defined(MLD_CONFIG_MULTILEVEL_WITH_SHARED) || MLDSA_ETA == 4)
 
 #include <immintrin.h>
-#include <string.h>
 #include "arith_native_x86_64.h"
 #include "consts.h"
 
diff --git a/mldsa/src/fips202/fips202x4.c b/mldsa/src/fips202/fips202x4.c
@@ -17,7 +17,6 @@
 #if !defined(MLD_CONFIG_MULTILEVEL_NO_SHARED) && \
     !defined(MLD_CONFIG_SERIAL_FIPS202_ONLY)
 
-#include <string.h>
 #include "../ct.h"
 #include "fips202.h"
 #include "fips202x4.h"
diff --git a/mldsa/src/fips202/native/api.h b/mldsa/src/fips202/native/api.h
@@ -14,6 +14,7 @@
  */
 
 #include "../../cbmc.h"
+#include "../../common.h"
 
 /* Backends must return MLD_NATIVE_FUNC_SUCCESS upon success. */
 #define MLD_NATIVE_FUNC_SUCCESS (0)
diff --git a/mldsa/src/fips202/native/armv81m/mve.h b/mldsa/src/fips202/native/armv81m/mve.h
@@ -15,7 +15,6 @@
 #define MLD_FIPS202_ARMV81M_NEED_X4
 
 #if !defined(__ASSEMBLER__)
-#include <stdint.h>
 #include "../api.h"
 
 #define mld_keccak_f1600_x4_native_impl \
diff --git a/mldsa/src/fips202/native/armv81m/src/fips202_native_armv81m.h b/mldsa/src/fips202/native/armv81m/src/fips202_native_armv81m.h
@@ -6,7 +6,6 @@
 #ifndef MLD_FIPS202_NATIVE_ARMV81M_SRC_FIPS202_NATIVE_ARMV81M_H
 #define MLD_FIPS202_NATIVE_ARMV81M_SRC_FIPS202_NATIVE_ARMV81M_H
 
-#include <stdint.h>
 #include "../../../../common.h"
 
 /* Keccak round constants in bit-interleaved form */
diff --git a/mldsa/src/fips202/native/armv81m/src/keccak_f1600_x4_mve.c b/mldsa/src/fips202/native/armv81m/src/keccak_f1600_x4_mve.c
@@ -10,7 +10,6 @@
 #if defined(MLD_FIPS202_ARMV81M_NEED_X4) && \
     !defined(MLD_CONFIG_MULTILEVEL_NO_SHARED)
 
-#include <stdint.h>
 #include "fips202_native_armv81m.h"
 
 /*
diff --git a/mldsa/src/fips202/native/armv81m/src/keccakf1600_round_constants.c b/mldsa/src/fips202/native/armv81m/src/keccakf1600_round_constants.c
@@ -9,8 +9,6 @@
 #if defined(MLD_FIPS202_ARMV81M_NEED_X4) && \
     !defined(MLD_CONFIG_MULTILEVEL_NO_SHARED)
 
-#include <stdint.h>
-
 #include "fips202_native_armv81m.h"
 
 /*
diff --git a/mldsa/src/native/x86_64/src/poly_decompose_32_avx2.c b/mldsa/src/native/x86_64/src/poly_decompose_32_avx2.c
@@ -29,7 +29,6 @@
      (MLD_CONFIG_PARAMETER_SET == 65 || MLD_CONFIG_PARAMETER_SET == 87))
 
 #include <immintrin.h>
-#include <string.h>
 #include "arith_native_x86_64.h"
 #include "consts.h"
 
diff --git a/mldsa/src/native/x86_64/src/poly_decompose_88_avx2.c b/mldsa/src/native/x86_64/src/poly_decompose_88_avx2.c
@@ -29,7 +29,6 @@
      MLD_CONFIG_PARAMETER_SET == 44)
 
 #include <immintrin.h>
-#include <string.h>
 #include "arith_native_x86_64.h"
 #include "consts.h"
 
diff --git a/mldsa/src/native/x86_64/src/poly_use_hint_32_avx2.c b/mldsa/src/native/x86_64/src/poly_use_hint_32_avx2.c
@@ -25,7 +25,6 @@
      (MLD_CONFIG_PARAMETER_SET == 65 || MLD_CONFIG_PARAMETER_SET == 87))
 
 #include <immintrin.h>
-#include <string.h>
 #include "arith_native_x86_64.h"
 #include "consts.h"
 
diff --git a/mldsa/src/native/x86_64/src/poly_use_hint_88_avx2.c b/mldsa/src/native/x86_64/src/poly_use_hint_88_avx2.c
@@ -25,7 +25,6 @@
      MLD_CONFIG_PARAMETER_SET == 44)
 
 #include <immintrin.h>
-#include <string.h>
 #include "arith_native_x86_64.h"
 #include "consts.h"
 
diff --git a/mldsa/src/native/x86_64/src/rej_uniform_avx2.c b/mldsa/src/native/x86_64/src/rej_uniform_avx2.c
@@ -23,7 +23,6 @@
     !defined(MLD_CONFIG_MULTILEVEL_NO_SHARED)
 
 #include <immintrin.h>
-#include <string.h>
 #include "arith_native_x86_64.h"
 #include "consts.h"
 
diff --git a/mldsa/src/native/x86_64/src/rej_uniform_eta2_avx2.c b/mldsa/src/native/x86_64/src/rej_uniform_eta2_avx2.c
@@ -24,7 +24,6 @@
     (defined(MLD_CONFIG_MULTILEVEL_WITH_SHARED) || MLDSA_ETA == 2)
 
 #include <immintrin.h>
-#include <string.h>
 #include "arith_native_x86_64.h"
 #include "consts.h"
 
diff --git a/mldsa/src/native/x86_64/src/rej_uniform_eta4_avx2.c b/mldsa/src/native/x86_64/src/rej_uniform_eta4_avx2.c
@@ -24,7 +24,6 @@
     (defined(MLD_CONFIG_MULTILEVEL_WITH_SHARED) || MLDSA_ETA == 4)
 
 #include <immintrin.h>
-#include <string.h>
 #include "arith_native_x86_64.h"
 #include "consts.h"
 
diff --git a/mldsa/src/poly.c b/mldsa/src/poly.c
@@ -18,12 +18,11 @@
  *   https://github.com/pq-crystals/dilithium/tree/master/ref
  */
 
-#include <string.h>
+#include "poly.h"
 
 #include "common.h"
 #include "ct.h"
 #include "debug.h"
-#include "poly.h"
 #include "reduce.h"
 #include "rounding.h"
 #include "symmetric.h"
diff --git a/mldsa/src/poly_kl.c b/mldsa/src/poly_kl.c
@@ -18,11 +18,10 @@
  *   https://github.com/pq-crystals/dilithium/tree/master/ref
  */
 
-#include <string.h>
+#include "poly_kl.h"
 
 #include "ct.h"
 #include "debug.h"
-#include "poly_kl.h"
 #include "rounding.h"
 #include "symmetric.h"
 
diff --git a/mldsa/src/polyvec.c b/mldsa/src/polyvec.c
@@ -12,11 +12,9 @@
  *   https://csrc.nist.gov/pubs/fips/204/final
  */
 
-#include <string.h>
+#include "polyvec.h"
 
-#include "common.h"
 #include "debug.h"
-#include "polyvec.h"
 
 /* This namespacing is not done at the top to avoid a naming conflict
  * with native backends, which are currently not yet namespaced. */
diff --git a/mldsa/src/sign.c b/mldsa/src/sign.c
@@ -24,7 +24,7 @@
  *   https://pq-crystals.org/dilithium/data/dilithium-specification-round3-20210208.pdf
  */
 
-#include <string.h>
+#include "sign.h"
 
 #include "cbmc.h"
 #include "ct.h"
@@ -34,7 +34,6 @@
 #include "poly_kl.h"
 #include "polyvec.h"
 #include "randombytes.h"
-#include "sign.h"
 #include "symmetric.h"
 
 /* Parameter set namespacing
diff --git a/scripts/autogen b/scripts/autogen
@@ -1099,7 +1099,6 @@ def gen_aarch64_polyz_unpack_table():
         yield "#if defined(MLD_ARITH_BACKEND_AARCH64) && \\"
         yield "    !defined(MLD_CONFIG_MULTILEVEL_NO_SHARED)"
         yield ""
-        yield "#include <stdint.h>"
         yield '#include "arith_native_aarch64.h"'
         yield ""
         yield "/* Table of indices used for tbl instructions in polyz_unpack_{17,19}."
