Consolidate imports of stdint.h

willieyz · hanno-becker · commit 79f05d8b4898 · 2026-02-14T09:16:57.000Z
mldsa-native depends on stdint.h which is a popular extension to C90,
but not part of it -- contrary to our documentation stating C90
compliance.

As a step towards clarifying the reliance on non-standard headers,
this commit consolidates all imports of stdint.h into common.h
and mldsa_native.h.

Signed-off-by: willieyz &lt;willie.zhao@chelpis.com&gt;
diff --git a/dev/aarch64_clean/src/arith_native_aarch64.h b/dev/aarch64_clean/src/arith_native_aarch64.h
@@ -7,7 +7,6 @@
 #ifndef MLD_NATIVE_AARCH64_SRC_ARITH_NATIVE_AARCH64_H
 #define MLD_NATIVE_AARCH64_SRC_ARITH_NATIVE_AARCH64_H
 
-#include <stdint.h>
 #include "../../../cbmc.h"
 #include "../../../common.h"
 
diff --git a/dev/aarch64_clean/src/polyz_unpack_table.c b/dev/aarch64_clean/src/polyz_unpack_table.c
@@ -14,7 +14,6 @@
 #if defined(MLD_ARITH_BACKEND_AARCH64) && \
     !defined(MLD_CONFIG_MULTILEVEL_NO_SHARED)
 
-#include <stdint.h>
 #include "arith_native_aarch64.h"
 
 /* Table of indices used for tbl instructions in polyz_unpack_{17,19}.
diff --git a/dev/aarch64_opt/src/arith_native_aarch64.h b/dev/aarch64_opt/src/arith_native_aarch64.h
@@ -7,7 +7,6 @@
 #ifndef MLD_NATIVE_AARCH64_SRC_ARITH_NATIVE_AARCH64_H
 #define MLD_NATIVE_AARCH64_SRC_ARITH_NATIVE_AARCH64_H
 
-#include <stdint.h>
 #include "../../../cbmc.h"
 #include "../../../common.h"
 
diff --git a/dev/aarch64_opt/src/polyz_unpack_table.c b/dev/aarch64_opt/src/polyz_unpack_table.c
@@ -14,7 +14,6 @@
 #if defined(MLD_ARITH_BACKEND_AARCH64) && \
     !defined(MLD_CONFIG_MULTILEVEL_NO_SHARED)
 
-#include <stdint.h>
 #include "arith_native_aarch64.h"
 
 /* Table of indices used for tbl instructions in polyz_unpack_{17,19}.
diff --git a/dev/fips202/aarch64/src/fips202_native_aarch64.h b/dev/fips202/aarch64/src/fips202_native_aarch64.h
@@ -6,7 +6,6 @@
 #ifndef MLD_DEV_FIPS202_AARCH64_SRC_FIPS202_NATIVE_AARCH64_H
 #define MLD_DEV_FIPS202_AARCH64_SRC_FIPS202_NATIVE_AARCH64_H
 
-#include <stdint.h>
 
 #include "../../../../cbmc.h"
 #include "../../../../common.h"
diff --git a/dev/fips202/aarch64/src/keccakf1600_round_constants.c b/dev/fips202/aarch64/src/keccakf1600_round_constants.c
@@ -13,7 +13,6 @@
      defined(MLD_FIPS202_AARCH64_NEED_X4_V8A_V84A_SCALAR_HYBRID)) && \
     !defined(MLD_CONFIG_MULTILEVEL_NO_SHARED)
 
-#include <stdint.h>
 #include "fips202_native_aarch64.h"
 
 MLD_ALIGN const uint64_t mld_keccakf1600_round_constants[] = {
diff --git a/dev/x86_64/src/arith_native_x86_64.h b/dev/x86_64/src/arith_native_x86_64.h
@@ -7,7 +7,6 @@
 #define MLD_NATIVE_X86_64_SRC_ARITH_NATIVE_X86_64_H
 #include "../../../common.h"
 
-#include <stdint.h>
 #include "consts.h"
 
 #define MLD_AVX2_REJ_UNIFORM_BUFLEN \
diff --git a/dev/x86_64/src/poly_chknorm_avx2.c b/dev/x86_64/src/poly_chknorm_avx2.c
@@ -23,7 +23,6 @@
     !defined(MLD_CONFIG_MULTILEVEL_NO_SHARED)
 
 #include <immintrin.h>
-#include <stdint.h>
 #include "arith_native_x86_64.h"
 
 int mld_poly_chknorm_avx2(const int32_t *a, int32_t B)
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 <stdint.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 <stdint.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 <stdint.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 <stdint.h>
 #include <string.h>
 #include "arith_native_x86_64.h"
 #include "consts.h"
diff --git a/dev/x86_64/src/polyz_unpack_17_avx2.c b/dev/x86_64/src/polyz_unpack_17_avx2.c
@@ -25,7 +25,6 @@
      MLD_CONFIG_PARAMETER_SET == 44)
 
 #include <immintrin.h>
-#include <stdint.h>
 #include "arith_native_x86_64.h"
 
 void mld_polyz_unpack_17_avx2(int32_t *r, const uint8_t *a)
diff --git a/dev/x86_64/src/polyz_unpack_19_avx2.c b/dev/x86_64/src/polyz_unpack_19_avx2.c
@@ -25,7 +25,6 @@
      (MLD_CONFIG_PARAMETER_SET == 65 || MLD_CONFIG_PARAMETER_SET == 87))
 
 #include <immintrin.h>
-#include <stdint.h>
 #include "arith_native_x86_64.h"
 
 void mld_polyz_unpack_19_avx2(int32_t *r, const uint8_t *a)
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 <stdint.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 <stdint.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 <stdint.h>
 #include <string.h>
 #include "arith_native_x86_64.h"
 #include "consts.h"
diff --git a/mldsa/src/cbmc.h b/mldsa/src/cbmc.h
@@ -16,7 +16,6 @@
 
 #else /* !CBMC */
 
-#include <stdint.h>
 
 #define __contract__(x) x
 #define __loop__(x) x
diff --git a/mldsa/src/common.h b/mldsa/src/common.h
@@ -6,6 +6,11 @@
 #ifndef MLD_COMMON_H
 #define MLD_COMMON_H
 
+#ifndef __ASSEMBLER__
+#include <stdint.h>
+#endif
+
+
 #define MLD_BUILD_INTERNAL
 
 #if defined(MLD_CONFIG_FILE)
diff --git a/mldsa/src/ct.h b/mldsa/src/ct.h
@@ -26,7 +26,6 @@
 #ifndef MLD_CT_H
 #define MLD_CT_H
 
-#include <stdint.h>
 #include "cbmc.h"
 #include "common.h"
 
diff --git a/mldsa/src/debug.h b/mldsa/src/debug.h
@@ -8,7 +8,6 @@
 #include "common.h"
 
 #if defined(MLDSA_DEBUG)
-#include <stdint.h>
 
 /*************************************************
  * Name:        mld_assert
diff --git a/mldsa/src/fips202/fips202.c b/mldsa/src/fips202/fips202.c
@@ -32,7 +32,6 @@
  * by Ronny Van Keer, and the public domain @[tweetfips] implementation. */
 
 #include <stddef.h>
-#include <stdint.h>
 
 #include "../common.h"
 #include "../ct.h"
diff --git a/mldsa/src/fips202/fips202.h b/mldsa/src/fips202/fips202.h
@@ -6,7 +6,6 @@
 #define MLD_FIPS202_FIPS202_H
 
 #include <stddef.h>
-#include <stdint.h>
 #include "../cbmc.h"
 #include "../common.h"
 
diff --git a/mldsa/src/fips202/fips202x4.h b/mldsa/src/fips202/fips202x4.h
@@ -11,7 +11,6 @@
 #if !defined(MLD_CONFIG_SERIAL_FIPS202_ONLY)
 
 #include <stddef.h>
-#include <stdint.h>
 
 #include "../cbmc.h"
 #include "fips202.h"
diff --git a/mldsa/src/fips202/keccakf1600.c b/mldsa/src/fips202/keccakf1600.c
@@ -28,7 +28,6 @@
  * by Ronny Van Keer, and the public domain @[tweetfips] implementation. */
 
 #include <assert.h>
-#include <stdint.h>
 
 #include "keccakf1600.h"
 #if !defined(MLD_CONFIG_MULTILEVEL_NO_SHARED)
diff --git a/mldsa/src/fips202/keccakf1600.h b/mldsa/src/fips202/keccakf1600.h
@@ -5,7 +5,6 @@
  */
 #ifndef MLD_FIPS202_KECCAKF1600_H
 #define MLD_FIPS202_KECCAKF1600_H
-#include <stdint.h>
 #include "../cbmc.h"
 #include "../common.h"
 #include "fips202.h"
diff --git a/mldsa/src/fips202/native/aarch64/src/fips202_native_aarch64.h b/mldsa/src/fips202/native/aarch64/src/fips202_native_aarch64.h
@@ -6,7 +6,6 @@
 #ifndef MLD_FIPS202_NATIVE_AARCH64_SRC_FIPS202_NATIVE_AARCH64_H
 #define MLD_FIPS202_NATIVE_AARCH64_SRC_FIPS202_NATIVE_AARCH64_H
 
-#include <stdint.h>
 
 #include "../../../../cbmc.h"
 #include "../../../../common.h"
diff --git a/mldsa/src/fips202/native/aarch64/src/keccakf1600_round_constants.c b/mldsa/src/fips202/native/aarch64/src/keccakf1600_round_constants.c
@@ -13,7 +13,6 @@
      defined(MLD_FIPS202_AARCH64_NEED_X4_V8A_V84A_SCALAR_HYBRID)) && \
     !defined(MLD_CONFIG_MULTILEVEL_NO_SHARED)
 
-#include <stdint.h>
 #include "fips202_native_aarch64.h"
 
 MLD_ALIGN const uint64_t mld_keccakf1600_round_constants[] = {
diff --git a/mldsa/src/fips202/native/api.h b/mldsa/src/fips202/native/api.h
@@ -13,7 +13,6 @@
  * It should not be included by backend implementations.
  */
 
-#include <stdint.h>
 #include "../../cbmc.h"
 
 /* Backends must return MLD_NATIVE_FUNC_SUCCESS upon success. */
diff --git a/mldsa/src/fips202/native/x86_64/src/KeccakP_1600_times4_SIMD256.c b/mldsa/src/fips202/native/x86_64/src/KeccakP_1600_times4_SIMD256.c
@@ -30,7 +30,6 @@ and related or neighboring rights to the source code in this file.
     !defined(MLD_CONFIG_MULTILEVEL_NO_SHARED)
 
 #include <immintrin.h>
-#include <stdint.h>
 
 #include "KeccakP_1600_times4_SIMD256.h"
 
@@ -323,7 +322,6 @@ static MLD_ALIGN const uint64_t mld_keccakf1600RoundConstants[24] = {
     (uint64_t)0x8000000080008081ULL, (uint64_t)0x8000000000008080ULL,
     (uint64_t)0x0000000080000001ULL, (uint64_t)0x8000000080008008ULL};
 
-#include <stdint.h>
 
 #define MLD_COPY_FROM_STATE(X, state)                                       \
   do                                                                        \
diff --git a/mldsa/src/fips202/native/x86_64/xkcp.h b/mldsa/src/fips202/native/x86_64/xkcp.h
@@ -12,7 +12,6 @@
 #define MLD_FIPS202_X86_64_XKCP
 
 #if !defined(__ASSEMBLER__)
-#include <stdint.h>
 #include "../api.h"
 #include "src/KeccakP_1600_times4_SIMD256.h"
 
diff --git a/mldsa/src/native/aarch64/src/arith_native_aarch64.h b/mldsa/src/native/aarch64/src/arith_native_aarch64.h
@@ -7,7 +7,6 @@
 #ifndef MLD_NATIVE_AARCH64_SRC_ARITH_NATIVE_AARCH64_H
 #define MLD_NATIVE_AARCH64_SRC_ARITH_NATIVE_AARCH64_H
 
-#include <stdint.h>
 #include "../../../cbmc.h"
 #include "../../../common.h"
 
diff --git a/mldsa/src/native/aarch64/src/polyz_unpack_table.c b/mldsa/src/native/aarch64/src/polyz_unpack_table.c
@@ -14,7 +14,6 @@
 #if defined(MLD_ARITH_BACKEND_AARCH64) && \
     !defined(MLD_CONFIG_MULTILEVEL_NO_SHARED)
 
-#include <stdint.h>
 #include "arith_native_aarch64.h"
 
 /* Table of indices used for tbl instructions in polyz_unpack_{17,19}.
diff --git a/mldsa/src/native/api.h b/mldsa/src/native/api.h
@@ -18,7 +18,6 @@
  * and run sanity checks.
  */
 
-#include <stdint.h>
 #include "../cbmc.h"
 #include "../common.h"
 
diff --git a/mldsa/src/native/x86_64/src/arith_native_x86_64.h b/mldsa/src/native/x86_64/src/arith_native_x86_64.h
@@ -7,7 +7,6 @@
 #define MLD_NATIVE_X86_64_SRC_ARITH_NATIVE_X86_64_H
 #include "../../../common.h"
 
-#include <stdint.h>
 #include "consts.h"
 
 #define MLD_AVX2_REJ_UNIFORM_BUFLEN \
diff --git a/mldsa/src/native/x86_64/src/poly_chknorm_avx2.c b/mldsa/src/native/x86_64/src/poly_chknorm_avx2.c
@@ -23,7 +23,6 @@
     !defined(MLD_CONFIG_MULTILEVEL_NO_SHARED)
 
 #include <immintrin.h>
-#include <stdint.h>
 #include "arith_native_x86_64.h"
 
 int mld_poly_chknorm_avx2(const int32_t *a, int32_t B)
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 <stdint.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 <stdint.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 <stdint.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 <stdint.h>
 #include <string.h>
 #include "arith_native_x86_64.h"
 #include "consts.h"
diff --git a/mldsa/src/native/x86_64/src/polyz_unpack_17_avx2.c b/mldsa/src/native/x86_64/src/polyz_unpack_17_avx2.c
@@ -25,7 +25,6 @@
      MLD_CONFIG_PARAMETER_SET == 44)
 
 #include <immintrin.h>
-#include <stdint.h>
 #include "arith_native_x86_64.h"
 
 void mld_polyz_unpack_17_avx2(int32_t *r, const uint8_t *a)
diff --git a/mldsa/src/native/x86_64/src/polyz_unpack_19_avx2.c b/mldsa/src/native/x86_64/src/polyz_unpack_19_avx2.c
@@ -25,7 +25,6 @@
      (MLD_CONFIG_PARAMETER_SET == 65 || MLD_CONFIG_PARAMETER_SET == 87))
 
 #include <immintrin.h>
-#include <stdint.h>
 #include "arith_native_x86_64.h"
 
 void mld_polyz_unpack_19_avx2(int32_t *r, const uint8_t *a)
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 <stdint.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 <stdint.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 <stdint.h>
 #include <string.h>
 #include "arith_native_x86_64.h"
 #include "consts.h"
diff --git a/mldsa/src/packing.h b/mldsa/src/packing.h
@@ -5,7 +5,6 @@
 #ifndef MLD_PACKING_H
 #define MLD_PACKING_H
 
-#include <stdint.h>
 #include "polyvec.h"
 
 #define mld_pack_pk MLD_NAMESPACE_KL(pack_pk)
diff --git a/mldsa/src/poly.c b/mldsa/src/poly.c
@@ -18,7 +18,6 @@
  *   https://github.com/pq-crystals/dilithium/tree/master/ref
  */
 
-#include <stdint.h>
 #include <string.h>
 
 #include "common.h"
diff --git a/mldsa/src/poly.h b/mldsa/src/poly.h
@@ -5,7 +5,6 @@
 #ifndef MLD_POLY_H
 #define MLD_POLY_H
 
-#include <stdint.h>
 #include "cbmc.h"
 #include "common.h"
 #include "reduce.h"
diff --git a/mldsa/src/poly_kl.c b/mldsa/src/poly_kl.c
diff --git a/mldsa/src/polyvec.c b/mldsa/src/polyvec.c
diff --git a/mldsa/src/polyvec.h b/mldsa/src/polyvec.h
diff --git a/mldsa/src/randombytes.h b/mldsa/src/randombytes.h
diff --git a/mldsa/src/reduce.h b/mldsa/src/reduce.h
diff --git a/mldsa/src/rounding.h b/mldsa/src/rounding.h
diff --git a/mldsa/src/sign.c b/mldsa/src/sign.c
diff --git a/mldsa/src/sign.h b/mldsa/src/sign.h
diff --git a/mldsa/src/symmetric.h b/mldsa/src/symmetric.h
