diff --git a/include/dav1d/picture.rs b/include/dav1d/picture.rs
index 7e46a8b18..51ca05cc1 100644
--- a/include/dav1d/picture.rs
+++ b/include/dav1d/picture.rs
@@ -5,9 +5,9 @@ use crate::include::dav1d::headers::Dav1dITUTT35;
 use crate::include::dav1d::headers::Dav1dMasteringDisplay;
 use crate::include::dav1d::headers::Dav1dPixelLayout;
 use crate::include::dav1d::headers::Dav1dSequenceHeader;
-use crate::include::stddef::ptrdiff_t;
-use crate::include::stdint::uintptr_t;
 use crate::src::r#ref::Dav1dRef;
+use libc::ptrdiff_t;
+use libc::uintptr_t;
 
 #[derive(Clone)]
 #[repr(C)]
diff --git a/include/stddef.rs b/include/stddef.rs
deleted file mode 100644
index 5da56a02d..000000000
--- a/include/stddef.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub type ptrdiff_t = libc::ptrdiff_t;
diff --git a/include/stdint.rs b/include/stdint.rs
deleted file mode 100644
index 5a954a6fe..000000000
--- a/include/stdint.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub type intptr_t = libc::intptr_t;
-pub type uintptr_t = libc::uintptr_t;
diff --git a/lib.rs b/lib.rs
index 3f05973f1..fbc9e90b6 100644
--- a/lib.rs
+++ b/lib.rs
@@ -26,8 +26,6 @@ pub mod include {
     pub mod pthread;
     pub mod sched;
     pub mod stdatomic;
-    pub mod stddef;
-    pub mod stdint;
 } // mod include
 pub mod src {
     mod align;
diff --git a/src/cdef.rs b/src/cdef.rs
index 0491925ac..fca90b06c 100644
--- a/src/cdef.rs
+++ b/src/cdef.rs
@@ -1,7 +1,7 @@
 use crate::include::common::bitdepth::DynPixel;
 use crate::include::common::bitdepth::LeftPixelRow2px;
 use crate::include::common::intops::apply_sign;
-use crate::include::stddef::ptrdiff_t;
+use libc::ptrdiff_t;
 use std::cmp;
 
 pub type CdefEdgeFlags = libc::c_uint;
diff --git a/src/cdef_apply_tmpl_16.rs b/src/cdef_apply_tmpl_16.rs
index 07928cff7..aa29027f7 100644
--- a/src/cdef_apply_tmpl_16.rs
+++ b/src/cdef_apply_tmpl_16.rs
@@ -4,7 +4,6 @@ use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I400;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I422;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
-use crate::include::stddef::*;
 use crate::src::align::Align16;
 use crate::src::cdef::CdefEdgeFlags;
 use crate::src::cdef::CDEF_HAVE_BOTTOM;
@@ -15,6 +14,7 @@ use crate::src::internal::Dav1dDSPContext;
 use crate::src::internal::Dav1dFrameContext;
 use crate::src::internal::Dav1dTaskContext;
 use crate::src::lf_mask::Av1Filter;
+use libc::ptrdiff_t;
 use std::cmp;
 
 extern "C" {
diff --git a/src/cdef_apply_tmpl_8.rs b/src/cdef_apply_tmpl_8.rs
index 58c151bf3..c6c69ecc3 100644
--- a/src/cdef_apply_tmpl_8.rs
+++ b/src/cdef_apply_tmpl_8.rs
@@ -4,7 +4,6 @@ use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I400;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I422;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
-use crate::include::stddef::*;
 use crate::src::align::Align16;
 use crate::src::cdef::CdefEdgeFlags;
 use crate::src::cdef::CDEF_HAVE_BOTTOM;
@@ -15,6 +14,7 @@ use crate::src::internal::Dav1dDSPContext;
 use crate::src::internal::Dav1dFrameContext;
 use crate::src::internal::Dav1dTaskContext;
 use crate::src::lf_mask::Av1Filter;
+use libc::ptrdiff_t;
 use std::cmp;
 
 extern "C" {
diff --git a/src/cdef_tmpl_16.rs b/src/cdef_tmpl_16.rs
index f445bbe72..dbd190d0f 100644
--- a/src/cdef_tmpl_16.rs
+++ b/src/cdef_tmpl_16.rs
@@ -3,7 +3,6 @@ use crate::include::common::bitdepth::DynPixel;
 use crate::include::common::bitdepth::LeftPixelRow2px;
 use crate::include::common::intops::iclip;
 use crate::include::common::intops::ulog2;
-use crate::include::stddef::*;
 use crate::src::cdef::constrain;
 use crate::src::cdef::fill;
 use crate::src::cdef::CdefEdgeFlags;
@@ -13,6 +12,7 @@ use crate::src::cdef::CDEF_HAVE_LEFT;
 use crate::src::cdef::CDEF_HAVE_RIGHT;
 use crate::src::cdef::CDEF_HAVE_TOP;
 use crate::src::tables::dav1d_cdef_directions;
+use libc::ptrdiff_t;
 use std::cmp;
 
 #[cfg(feature = "asm")]
diff --git a/src/cdef_tmpl_8.rs b/src/cdef_tmpl_8.rs
index c76f1ed2f..f2f6301ca 100644
--- a/src/cdef_tmpl_8.rs
+++ b/src/cdef_tmpl_8.rs
@@ -2,7 +2,6 @@ use crate::include::common::bitdepth::DynPixel;
 use crate::include::common::bitdepth::LeftPixelRow2px;
 use crate::include::common::intops::iclip;
 use crate::include::common::intops::ulog2;
-use crate::include::stddef::*;
 use crate::src::cdef::constrain;
 use crate::src::cdef::fill;
 use crate::src::cdef::CdefEdgeFlags;
@@ -12,6 +11,7 @@ use crate::src::cdef::CDEF_HAVE_LEFT;
 use crate::src::cdef::CDEF_HAVE_RIGHT;
 use crate::src::cdef::CDEF_HAVE_TOP;
 use crate::src::tables::dav1d_cdef_directions;
+use libc::ptrdiff_t;
 use std::cmp;
 
 #[cfg(all(feature = "asm", any(target_arch = "arm", target_arch = "aarch64"),))]
diff --git a/src/decode.rs b/src/decode.rs
index 1659660d6..5fb4b0216 100644
--- a/src/decode.rs
+++ b/src/decode.rs
@@ -33,8 +33,6 @@ use crate::include::dav1d::headers::DAV1D_WM_TYPE_TRANSLATION;
 use crate::include::dav1d::picture::Dav1dPicture;
 use crate::include::stdatomic::atomic_int;
 use crate::include::stdatomic::atomic_uint;
-use crate::include::stddef::*;
-use crate::include::stdint::*;
 use crate::src::align::Align16;
 use crate::src::cdef::Dav1dCdefDSPContext;
 use crate::src::cdf::dav1d_cdf_thread_copy;
@@ -221,6 +219,8 @@ use libc::pthread_cond_signal;
 use libc::pthread_cond_wait;
 use libc::pthread_mutex_lock;
 use libc::pthread_mutex_unlock;
+use libc::ptrdiff_t;
+use libc::uintptr_t;
 use std::array;
 use std::cmp;
 use std::iter;
diff --git a/src/env.rs b/src/env.rs
index 09eac11de..d83e243a5 100644
--- a/src/env.rs
+++ b/src/env.rs
@@ -2,7 +2,6 @@ use crate::include::common::intops::apply_sign;
 use crate::include::dav1d::headers::Dav1dFrameHeader;
 use crate::include::dav1d::headers::Dav1dWarpedMotionParams;
 use crate::include::dav1d::headers::DAV1D_N_SWITCHABLE_FILTERS;
-use crate::include::stddef::ptrdiff_t;
 use crate::src::align::Align8;
 use crate::src::levels::mv;
 use crate::src::levels::BlockLevel;
@@ -30,6 +29,7 @@ use crate::src::levels::V_ADST;
 use crate::src::levels::V_FLIPADST;
 use crate::src::refmvs::refmvs_candidate;
 use crate::src::tables::TxfmInfo;
+use libc::ptrdiff_t;
 use std::cmp;
 use std::cmp::Ordering;
 
diff --git a/src/fg_apply_tmpl_16.rs b/src/fg_apply_tmpl_16.rs
index ad75403a0..c2093e7a5 100644
--- a/src/fg_apply_tmpl_16.rs
+++ b/src/fg_apply_tmpl_16.rs
@@ -4,11 +4,11 @@ use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I400;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
 use crate::include::dav1d::picture::Dav1dPicture;
-use crate::include::stddef::*;
-use crate::include::stdint::*;
 use crate::src::align::Align1;
 use crate::src::align::Align16;
 use crate::src::filmgrain::Dav1dFilmGrainDSPContext;
+use libc::intptr_t;
+use libc::ptrdiff_t;
 use std::cmp;
 
 extern "C" {
diff --git a/src/fg_apply_tmpl_8.rs b/src/fg_apply_tmpl_8.rs
index 2e7a129cf..3d18794b5 100644
--- a/src/fg_apply_tmpl_8.rs
+++ b/src/fg_apply_tmpl_8.rs
@@ -4,11 +4,11 @@ use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I400;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
 use crate::include::dav1d::picture::Dav1dPicture;
-use crate::include::stddef::*;
-use crate::include::stdint::*;
 use crate::src::align::Align16;
 use crate::src::filmgrain::Dav1dFilmGrainDSPContext;
 use cfg_if::cfg_if;
+use libc::intptr_t;
+use libc::ptrdiff_t;
 use std::cmp;
 
 extern "C" {
diff --git a/src/filmgrain.rs b/src/filmgrain.rs
index b530b8884..1d8cdc0ac 100644
--- a/src/filmgrain.rs
+++ b/src/filmgrain.rs
@@ -1,8 +1,8 @@
 use crate::include::common::bitdepth::DynEntry;
 use crate::include::common::bitdepth::DynPixel;
 use crate::include::dav1d::headers::Dav1dFilmGrainData;
-use crate::include::stddef::ptrdiff_t;
-use crate::include::stdint::intptr_t;
+use libc::intptr_t;
+use libc::ptrdiff_t;
 
 #[inline]
 pub unsafe extern "C" fn get_random_number(
diff --git a/src/filmgrain_tmpl_16.rs b/src/filmgrain_tmpl_16.rs
index a7fb78a7c..2e827d86c 100644
--- a/src/filmgrain_tmpl_16.rs
+++ b/src/filmgrain_tmpl_16.rs
@@ -6,13 +6,13 @@ use crate::include::dav1d::headers::Dav1dFilmGrainData;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I422;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
-use crate::include::stddef::*;
-use crate::include::stdint::*;
 use crate::src::filmgrain::get_random_number;
 use crate::src::filmgrain::round2;
 use crate::src::filmgrain::Dav1dFilmGrainDSPContext;
 use crate::src::filmgrain::GRAIN_WIDTH;
 use crate::src::tables::dav1d_gaussian_sequence;
+use libc::intptr_t;
+use libc::ptrdiff_t;
 use std::cmp;
 
 #[cfg(feature = "asm")]
diff --git a/src/filmgrain_tmpl_8.rs b/src/filmgrain_tmpl_8.rs
index a3b72cc67..aec768fc6 100644
--- a/src/filmgrain_tmpl_8.rs
+++ b/src/filmgrain_tmpl_8.rs
@@ -6,13 +6,13 @@ use crate::include::dav1d::headers::Dav1dFilmGrainData;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I422;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
-use crate::include::stddef::ptrdiff_t;
-use crate::include::stdint::intptr_t;
 use crate::src::filmgrain::get_random_number;
 use crate::src::filmgrain::round2;
 use crate::src::filmgrain::Dav1dFilmGrainDSPContext;
 use crate::src::filmgrain::GRAIN_WIDTH;
 use crate::src::tables::dav1d_gaussian_sequence;
+use libc::intptr_t;
+use libc::ptrdiff_t;
 use std::cmp;
 
 #[cfg(feature = "asm")]
diff --git a/src/internal.rs b/src/internal.rs
index 56c880988..f0a642b52 100644
--- a/src/internal.rs
+++ b/src/internal.rs
@@ -16,7 +16,6 @@ use crate::include::dav1d::picture::Dav1dPicAllocator;
 use crate::include::dav1d::picture::Dav1dPicture;
 use crate::include::stdatomic::atomic_int;
 use crate::include::stdatomic::atomic_uint;
-use crate::include::stddef::ptrdiff_t;
 use crate::src::align::*;
 use crate::src::cdef::Dav1dCdefDSPContext;
 use crate::src::cdf::CdfContext;
@@ -56,6 +55,7 @@ use crate::src::refmvs::Dav1dRefmvsDSPContext;
 use crate::src::thread_data::thread_data;
 use libc::pthread_cond_t;
 use libc::pthread_mutex_t;
+use libc::ptrdiff_t;
 
 #[repr(C)]
 pub struct Dav1dDSPContext {
diff --git a/src/ipred.rs b/src/ipred.rs
index feee17de8..99735a38c 100644
--- a/src/ipred.rs
+++ b/src/ipred.rs
@@ -1,5 +1,5 @@
 use crate::include::common::bitdepth::DynPixel;
-use crate::include::stddef::ptrdiff_t;
+use libc::ptrdiff_t;
 
 #[inline]
 pub unsafe extern "C" fn get_upsample(
diff --git a/src/ipred_prepare_tmpl_16.rs b/src/ipred_prepare_tmpl_16.rs
index 8f23971ff..a08d619ae 100644
--- a/src/ipred_prepare_tmpl_16.rs
+++ b/src/ipred_prepare_tmpl_16.rs
@@ -1,5 +1,4 @@
 use crate::include::common::attributes::clz;
-use crate::include::stddef::*;
 use crate::src::intra_edge::EdgeFlags;
 use crate::src::intra_edge::EDGE_I444_LEFT_HAS_BOTTOM;
 use crate::src::intra_edge::EDGE_I444_TOP_HAS_RIGHT;
@@ -17,6 +16,7 @@ use crate::src::levels::Z1_PRED;
 use crate::src::levels::Z2_PRED;
 use crate::src::levels::Z3_PRED;
 use c2rust_bitfields::BitfieldStruct;
+use libc::ptrdiff_t;
 use std::cmp;
 
 extern "C" {
diff --git a/src/ipred_prepare_tmpl_8.rs b/src/ipred_prepare_tmpl_8.rs
index f5bb0eb19..df271c881 100644
--- a/src/ipred_prepare_tmpl_8.rs
+++ b/src/ipred_prepare_tmpl_8.rs
@@ -1,4 +1,3 @@
-use crate::include::stddef::*;
 use crate::src::intra_edge::EdgeFlags;
 use crate::src::intra_edge::EDGE_I444_LEFT_HAS_BOTTOM;
 use crate::src::intra_edge::EDGE_I444_TOP_HAS_RIGHT;
@@ -16,6 +15,7 @@ use crate::src::levels::Z1_PRED;
 use crate::src::levels::Z2_PRED;
 use crate::src::levels::Z3_PRED;
 use c2rust_bitfields::BitfieldStruct;
+use libc::ptrdiff_t;
 use std::cmp;
 
 extern "C" {
diff --git a/src/ipred_tmpl_16.rs b/src/ipred_tmpl_16.rs
index 9dbdc98fd..e931b3458 100644
--- a/src/ipred_tmpl_16.rs
+++ b/src/ipred_tmpl_16.rs
@@ -5,7 +5,6 @@ use crate::include::common::intops::iclip;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I422;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
-use crate::include::stddef::*;
 use crate::src::ipred::get_upsample;
 use crate::src::ipred::Dav1dIntraPredDSPContext;
 use crate::src::levels::DC_128_PRED;
@@ -25,6 +24,7 @@ use crate::src::levels::Z3_PRED;
 use crate::src::tables::dav1d_dr_intra_derivative;
 use crate::src::tables::dav1d_filter_intra_taps;
 use crate::src::tables::dav1d_sm_weights;
+use libc::ptrdiff_t;
 use std::cmp;
 
 #[cfg(feature = "asm")]
diff --git a/src/ipred_tmpl_8.rs b/src/ipred_tmpl_8.rs
index ac31311dc..217623f4f 100644
--- a/src/ipred_tmpl_8.rs
+++ b/src/ipred_tmpl_8.rs
@@ -6,7 +6,6 @@ use crate::include::common::intops::iclip_u8;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I422;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
-use crate::include::stddef::*;
 use crate::src::ipred::get_upsample;
 use crate::src::ipred::Dav1dIntraPredDSPContext;
 use crate::src::levels::DC_128_PRED;
@@ -26,6 +25,7 @@ use crate::src::levels::Z3_PRED;
 use crate::src::tables::dav1d_dr_intra_derivative;
 use crate::src::tables::dav1d_filter_intra_taps;
 use crate::src::tables::dav1d_sm_weights;
+use libc::ptrdiff_t;
 use std::cmp;
 
 #[cfg(feature = "asm")]
diff --git a/src/itx.rs b/src/itx.rs
index 5946c7494..d32d8c1b4 100644
--- a/src/itx.rs
+++ b/src/itx.rs
@@ -3,9 +3,9 @@ use crate::include::common::bitdepth::BitDepth;
 use crate::include::common::bitdepth::DynCoef;
 use crate::include::common::bitdepth::DynPixel;
 use crate::include::common::intops::iclip;
-use crate::include::stddef::*;
 use crate::src::levels::N_RECT_TX_SIZES;
 use crate::src::levels::N_TX_TYPES_PLUS_LL;
+use libc::ptrdiff_t;
 use std::cmp;
 
 extern "C" {
diff --git a/src/itx_1d.rs b/src/itx_1d.rs
index 519f5fda0..2d83d628f 100644
--- a/src/itx_1d.rs
+++ b/src/itx_1d.rs
@@ -1,5 +1,5 @@
 use crate::include::common::intops::iclip;
-use crate::include::stddef::*;
+use libc::ptrdiff_t;
 
 #[inline(never)]
 unsafe extern "C" fn inv_dct4_1d_internal_c(
diff --git a/src/itx_tmpl_16.rs b/src/itx_tmpl_16.rs
index 584ac0a2f..1262f481d 100644
--- a/src/itx_tmpl_16.rs
+++ b/src/itx_tmpl_16.rs
@@ -2,7 +2,6 @@ use crate::include::common::bitdepth::BitDepth16;
 use crate::include::common::bitdepth::DynCoef;
 use crate::include::common::bitdepth::DynPixel;
 use crate::include::common::intops::iclip;
-use crate::include::stddef::*;
 use crate::src::itx::Dav1dInvTxfmDSPContext;
 use crate::src::levels::ADST_ADST;
 use crate::src::levels::ADST_DCT;
@@ -40,6 +39,7 @@ use crate::src::levels::V_ADST;
 use crate::src::levels::V_DCT;
 use crate::src::levels::V_FLIPADST;
 use crate::src::levels::WHT_WHT;
+use libc::ptrdiff_t;
 
 #[cfg(feature = "asm")]
 use crate::src::cpu::dav1d_get_cpu_flags;
diff --git a/src/itx_tmpl_8.rs b/src/itx_tmpl_8.rs
index 159afc783..d0fec1de2 100644
--- a/src/itx_tmpl_8.rs
+++ b/src/itx_tmpl_8.rs
@@ -2,7 +2,6 @@ use crate::include::common::bitdepth::BitDepth8;
 use crate::include::common::bitdepth::DynCoef;
 use crate::include::common::bitdepth::DynPixel;
 use crate::include::common::intops::iclip_u8;
-use crate::include::stddef::*;
 use crate::src::itx::Dav1dInvTxfmDSPContext;
 use crate::src::levels::ADST_ADST;
 use crate::src::levels::ADST_DCT;
@@ -40,6 +39,7 @@ use crate::src::levels::V_ADST;
 use crate::src::levels::V_DCT;
 use crate::src::levels::V_FLIPADST;
 use crate::src::levels::WHT_WHT;
+use libc::ptrdiff_t;
 
 #[cfg(feature = "asm")]
 use crate::src::cpu::dav1d_get_cpu_flags;
diff --git a/src/lf_apply_tmpl_16.rs b/src/lf_apply_tmpl_16.rs
index 75840bac1..dd2e35a4a 100644
--- a/src/lf_apply_tmpl_16.rs
+++ b/src/lf_apply_tmpl_16.rs
@@ -1,7 +1,6 @@
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I400;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
-use crate::include::stddef::*;
 use crate::src::env::BlockContext;
 use crate::src::internal::Dav1dDSPContext;
 use crate::src::internal::Dav1dFrameContext;
@@ -9,6 +8,7 @@ use crate::src::lf_mask::Av1Filter;
 use crate::src::lr_apply::LR_RESTORE_U;
 use crate::src::lr_apply::LR_RESTORE_V;
 use crate::src::lr_apply::LR_RESTORE_Y;
+use libc::ptrdiff_t;
 use std::cmp;
 
 extern "C" {
diff --git a/src/lf_apply_tmpl_8.rs b/src/lf_apply_tmpl_8.rs
index 7a6f9d0a3..e278a1519 100644
--- a/src/lf_apply_tmpl_8.rs
+++ b/src/lf_apply_tmpl_8.rs
@@ -1,7 +1,6 @@
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I400;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
-use crate::include::stddef::*;
 use crate::src::env::BlockContext;
 use crate::src::internal::Dav1dDSPContext;
 use crate::src::internal::Dav1dFrameContext;
@@ -9,6 +8,7 @@ use crate::src::lf_mask::Av1Filter;
 use crate::src::lr_apply::LR_RESTORE_U;
 use crate::src::lr_apply::LR_RESTORE_V;
 use crate::src::lr_apply::LR_RESTORE_Y;
+use libc::ptrdiff_t;
 use std::cmp;
 
 extern "C" {
diff --git a/src/lf_mask.rs b/src/lf_mask.rs
index 4a23e401b..cc69e9a06 100644
--- a/src/lf_mask.rs
+++ b/src/lf_mask.rs
@@ -5,7 +5,6 @@ use crate::include::dav1d::headers::Dav1dPixelLayout;
 use crate::include::dav1d::headers::Dav1dRestorationType;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
-use crate::include::stddef::ptrdiff_t;
 use crate::src::align::Align16;
 use crate::src::ctx::CaseSet;
 use crate::src::levels::BlockSize;
@@ -13,6 +12,7 @@ use crate::src::levels::RectTxfmSize;
 use crate::src::levels::TX_4X4;
 use crate::src::tables::dav1d_block_dimensions;
 use crate::src::tables::dav1d_txfm_dimensions;
+use libc::ptrdiff_t;
 use std::cmp;
 
 #[repr(C)]
diff --git a/src/loopfilter.rs b/src/loopfilter.rs
index 84f619007..da0b89700 100644
--- a/src/loopfilter.rs
+++ b/src/loopfilter.rs
@@ -1,6 +1,6 @@
 use crate::include::common::bitdepth::DynPixel;
-use crate::include::stddef::ptrdiff_t;
 use crate::src::lf_mask::Av1FilterLUT;
+use libc::ptrdiff_t;
 
 pub type loopfilter_sb_fn = unsafe extern "C" fn(
     *mut DynPixel,
diff --git a/src/loopfilter_tmpl_16.rs b/src/loopfilter_tmpl_16.rs
index 9621ef2c4..cb6f060ed 100644
--- a/src/loopfilter_tmpl_16.rs
+++ b/src/loopfilter_tmpl_16.rs
@@ -1,9 +1,9 @@
 use crate::include::common::attributes::clz;
 use crate::include::common::bitdepth::DynPixel;
 use crate::include::common::intops::iclip;
-use crate::include::stddef::*;
 use crate::src::lf_mask::Av1FilterLUT;
 use crate::src::loopfilter::Dav1dLoopFilterDSPContext;
+use libc::ptrdiff_t;
 use std::cmp;
 
 #[cfg(feature = "asm")]
diff --git a/src/loopfilter_tmpl_8.rs b/src/loopfilter_tmpl_8.rs
index 2ec295ba2..23a7b0449 100644
--- a/src/loopfilter_tmpl_8.rs
+++ b/src/loopfilter_tmpl_8.rs
@@ -1,9 +1,9 @@
 use crate::include::common::bitdepth::DynPixel;
 use crate::include::common::intops::iclip;
 use crate::include::common::intops::iclip_u8;
-use crate::include::stddef::*;
 use crate::src::lf_mask::Av1FilterLUT;
 use crate::src::loopfilter::Dav1dLoopFilterDSPContext;
+use libc::ptrdiff_t;
 use std::cmp;
 
 #[cfg(feature = "asm")]
diff --git a/src/looprestoration.rs b/src/looprestoration.rs
index 7fa8b5541..8a88675f9 100644
--- a/src/looprestoration.rs
+++ b/src/looprestoration.rs
@@ -5,15 +5,15 @@ use crate::include::common::bitdepth::LeftPixelRow;
 use crate::include::common::bitdepth::ToPrimitive;
 use crate::include::common::bitdepth::BPC;
 use crate::include::common::intops::iclip;
-use crate::include::stddef::ptrdiff_t;
 use crate::src::align::Align16;
 use crate::src::cursor::CursorMut;
 use crate::src::tables::dav1d_sgr_x_by_x;
+use libc::ptrdiff_t;
 use std::cmp;
 use std::ops::Add;
 
 #[cfg(all(feature = "asm", target_arch = "arm"))]
-use crate::include::stdint::intptr_t;
+use libc::intptr_t;
 
 #[cfg(all(
     feature = "asm",
diff --git a/src/lr_apply_tmpl_16.rs b/src/lr_apply_tmpl_16.rs
index aa97b91b2..21ef66bc0 100644
--- a/src/lr_apply_tmpl_16.rs
+++ b/src/lr_apply_tmpl_16.rs
@@ -3,7 +3,6 @@ use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
 use crate::include::dav1d::headers::DAV1D_RESTORATION_NONE;
 use crate::include::dav1d::headers::DAV1D_RESTORATION_SGRPROJ;
 use crate::include::dav1d::headers::DAV1D_RESTORATION_WIENER;
-use crate::include::stddef::*;
 use crate::src::align::Align16;
 use crate::src::internal::Dav1dDSPContext;
 use crate::src::internal::Dav1dFrameContext;
@@ -19,6 +18,7 @@ use crate::src::lr_apply::LR_RESTORE_U;
 use crate::src::lr_apply::LR_RESTORE_V;
 use crate::src::lr_apply::LR_RESTORE_Y;
 use crate::src::tables::dav1d_sgr_params;
+use libc::ptrdiff_t;
 use std::cmp;
 
 extern "C" {
diff --git a/src/lr_apply_tmpl_8.rs b/src/lr_apply_tmpl_8.rs
index 18c6c2f42..7b65081a6 100644
--- a/src/lr_apply_tmpl_8.rs
+++ b/src/lr_apply_tmpl_8.rs
@@ -3,7 +3,6 @@ use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
 use crate::include::dav1d::headers::DAV1D_RESTORATION_NONE;
 use crate::include::dav1d::headers::DAV1D_RESTORATION_SGRPROJ;
 use crate::include::dav1d::headers::DAV1D_RESTORATION_WIENER;
-use crate::include::stddef::*;
 use crate::src::align::Align16;
 use crate::src::internal::Dav1dDSPContext;
 use crate::src::internal::Dav1dFrameContext;
@@ -19,6 +18,7 @@ use crate::src::lr_apply::LR_RESTORE_U;
 use crate::src::lr_apply::LR_RESTORE_V;
 use crate::src::lr_apply::LR_RESTORE_Y;
 use crate::src::tables::dav1d_sgr_params;
+use libc::ptrdiff_t;
 use std::cmp;
 
 extern "C" {
diff --git a/src/mc.rs b/src/mc.rs
index d0c478052..74dc1e26b 100644
--- a/src/mc.rs
+++ b/src/mc.rs
@@ -6,8 +6,6 @@ use crate::include::dav1d::headers::Dav1dFilterMode;
 use crate::include::dav1d::headers::DAV1D_FILTER_8TAP_REGULAR;
 use crate::include::dav1d::headers::DAV1D_FILTER_8TAP_SHARP;
 use crate::include::dav1d::headers::DAV1D_FILTER_8TAP_SMOOTH;
-use crate::include::stddef::ptrdiff_t;
-use crate::include::stdint::intptr_t;
 use crate::src::levels::FILTER_2D_8TAP_REGULAR;
 use crate::src::levels::FILTER_2D_8TAP_REGULAR_SHARP;
 use crate::src::levels::FILTER_2D_8TAP_REGULAR_SMOOTH;
@@ -22,6 +20,8 @@ use crate::src::tables::dav1d_mc_subpel_filters;
 use crate::src::tables::dav1d_mc_warp_filter;
 use crate::src::tables::dav1d_obmc_masks;
 use crate::src::tables::dav1d_resize_filter;
+use libc::intptr_t;
+use libc::ptrdiff_t;
 use std::cmp;
 use std::iter;
 
@@ -914,9 +914,9 @@ unsafe fn w_mask_rust<BD: BitDepth>(
 
 unsafe fn warp_affine_8x8_rust<BD: BitDepth>(
     mut dst: *mut BD::Pixel,
-    dst_stride: libc::ptrdiff_t,
+    dst_stride: ptrdiff_t,
     mut src: *const BD::Pixel,
-    src_stride: libc::ptrdiff_t,
+    src_stride: ptrdiff_t,
     abcd: *const i16,
     mut mx: libc::c_int,
     mut my: libc::c_int,
@@ -999,9 +999,9 @@ unsafe fn warp_affine_8x8_rust<BD: BitDepth>(
 
 unsafe fn warp_affine_8x8t_rust<BD: BitDepth>(
     mut tmp: *mut i16,
-    tmp_stride: libc::ptrdiff_t,
+    tmp_stride: ptrdiff_t,
     mut src: *const BD::Pixel,
-    src_stride: libc::ptrdiff_t,
+    src_stride: ptrdiff_t,
     abcd: *const i16,
     mut mx: libc::c_int,
     mut my: libc::c_int,
@@ -1082,16 +1082,16 @@ unsafe fn warp_affine_8x8t_rust<BD: BitDepth>(
 }
 
 unsafe fn emu_edge_rust<BD: BitDepth>(
-    bw: libc::intptr_t,
-    bh: libc::intptr_t,
-    iw: libc::intptr_t,
-    ih: libc::intptr_t,
-    x: libc::intptr_t,
-    y: libc::intptr_t,
+    bw: intptr_t,
+    bh: intptr_t,
+    iw: intptr_t,
+    ih: intptr_t,
+    x: intptr_t,
+    y: intptr_t,
     mut dst: *mut BD::Pixel,
-    dst_stride: libc::ptrdiff_t,
+    dst_stride: ptrdiff_t,
     mut r#ref: *const BD::Pixel,
-    ref_stride: libc::ptrdiff_t,
+    ref_stride: ptrdiff_t,
 ) {
     r#ref = r#ref.offset(
         iclip(y as libc::c_int, 0 as libc::c_int, ih as libc::c_int - 1) as isize
@@ -1177,9 +1177,9 @@ unsafe fn emu_edge_rust<BD: BitDepth>(
 
 unsafe fn resize_rust<BD: BitDepth>(
     mut dst: *mut BD::Pixel,
-    dst_stride: libc::ptrdiff_t,
+    dst_stride: ptrdiff_t,
     mut src: *const BD::Pixel,
-    src_stride: libc::ptrdiff_t,
+    src_stride: ptrdiff_t,
     dst_w: libc::c_int,
     mut h: libc::c_int,
     src_w: libc::c_int,
diff --git a/src/mem.rs b/src/mem.rs
index 098d1e9b6..ed558f5b6 100644
--- a/src/mem.rs
+++ b/src/mem.rs
@@ -1,10 +1,10 @@
-use crate::include::stdint::*;
 use libc::pthread_mutex_destroy;
 use libc::pthread_mutex_init;
 use libc::pthread_mutex_lock;
 use libc::pthread_mutex_t;
 use libc::pthread_mutex_unlock;
 use libc::pthread_mutexattr_t;
+use libc::uintptr_t;
 
 extern "C" {
     fn malloc(_: libc::c_ulong) -> *mut libc::c_void;
diff --git a/src/picture.rs b/src/picture.rs
index 40e558a5e..4ff71bae8 100644
--- a/src/picture.rs
+++ b/src/picture.rs
@@ -15,7 +15,6 @@ use crate::include::dav1d::picture::Dav1dPicAllocator;
 use crate::include::dav1d::picture::Dav1dPicture;
 use crate::include::stdatomic::atomic_int;
 use crate::include::stdatomic::atomic_uint;
-use crate::include::stddef::*;
 use crate::src::data::dav1d_data_props_copy;
 use crate::src::data::dav1d_data_props_set_defaults;
 use crate::src::internal::Dav1dContext;
@@ -30,6 +29,7 @@ use crate::src::r#ref::dav1d_ref_wrap;
 use crate::src::r#ref::Dav1dRef;
 use crate::stderr;
 use libc::malloc;
+use libc::ptrdiff_t;
 
 extern "C" {
     fn fprintf(_: *mut libc::FILE, _: *const libc::c_char, _: ...) -> libc::c_int;
diff --git a/src/recon_tmpl_16.rs b/src/recon_tmpl_16.rs
index f047f56b9..39ece25ca 100644
--- a/src/recon_tmpl_16.rs
+++ b/src/recon_tmpl_16.rs
@@ -13,8 +13,6 @@ use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I400;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
 use crate::include::dav1d::headers::DAV1D_WM_TYPE_TRANSLATION;
-use crate::include::stddef::*;
-use crate::include::stdint::*;
 use crate::src::ctx::CaseSet;
 use crate::src::env::get_uv_inter_txtp;
 use crate::src::internal::CodedBlockInfo;
@@ -87,6 +85,8 @@ use crate::src::tables::dav1d_txtp_from_uvmode;
 use crate::src::tables::TxfmInfo;
 use crate::src::wedge::dav1d_ii_masks;
 use crate::src::wedge::dav1d_wedge_masks;
+use libc::intptr_t;
+use libc::ptrdiff_t;
 use std::cmp;
 
 extern "C" {
diff --git a/src/recon_tmpl_8.rs b/src/recon_tmpl_8.rs
index 5e85cb586..5dc4035ef 100644
--- a/src/recon_tmpl_8.rs
+++ b/src/recon_tmpl_8.rs
@@ -13,8 +13,6 @@ use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I400;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
 use crate::include::dav1d::headers::DAV1D_WM_TYPE_TRANSLATION;
-use crate::include::stddef::*;
-use crate::include::stdint::*;
 use crate::src::ctx::CaseSet;
 use crate::src::env::get_uv_inter_txtp;
 use crate::src::internal::CodedBlockInfo;
@@ -87,6 +85,8 @@ use crate::src::tables::dav1d_txtp_from_uvmode;
 use crate::src::tables::TxfmInfo;
 use crate::src::wedge::dav1d_ii_masks;
 use crate::src::wedge::dav1d_wedge_masks;
+use libc::intptr_t;
+use libc::ptrdiff_t;
 use std::cmp;
 
 extern "C" {
diff --git a/src/refmvs.rs b/src/refmvs.rs
index 500d04139..d285a4075 100644
--- a/src/refmvs.rs
+++ b/src/refmvs.rs
@@ -3,7 +3,6 @@ use crate::include::common::intops::iclip;
 use crate::include::dav1d::headers::Dav1dFrameHeader;
 use crate::include::dav1d::headers::Dav1dSequenceHeader;
 use crate::include::dav1d::headers::DAV1D_WM_TYPE_TRANSLATION;
-use crate::include::stddef::*;
 use crate::src::env::fix_mv_precision;
 use crate::src::env::get_gmv_2d;
 use crate::src::env::get_poc_diff;
@@ -15,6 +14,7 @@ use crate::src::mem::dav1d_alloc_aligned;
 use crate::src::mem::dav1d_freep_aligned;
 use crate::src::tables::dav1d_block_dimensions;
 use cfg_if::cfg_if;
+use libc::ptrdiff_t;
 use std::cmp;
 
 #[cfg(feature = "asm")]
diff --git a/tools/dav1d.rs b/tools/dav1d.rs
index ff5cfe7bf..1c01a1706 100644
--- a/tools/dav1d.rs
+++ b/tools/dav1d.rs
@@ -17,6 +17,7 @@ mod output {
     mod yuv;
 } // mod output
 mod dav1d_cli_parse;
+use libc::ptrdiff_t;
 use rav1d::include::dav1d::common::Dav1dDataProps;
 use rav1d::include::dav1d::common::Dav1dUserData;
 use rav1d::include::dav1d::data::Dav1dData;
@@ -43,7 +44,6 @@ use rav1d::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
 use rav1d::include::dav1d::picture::Dav1dPicAllocator;
 use rav1d::include::dav1d::picture::Dav1dPicture;
 use rav1d::include::dav1d::picture::Dav1dPictureParameters;
-use rav1d::include::stddef::*;
 use rav1d::src::lib::dav1d_close;
 use rav1d::src::lib::dav1d_data_unref;
 use rav1d::src::lib::dav1d_get_picture;
diff --git a/tools/input/ivf.rs b/tools/input/ivf.rs
index 9c956decd..985df75ab 100644
--- a/tools/input/ivf.rs
+++ b/tools/input/ivf.rs
@@ -1,6 +1,6 @@
+use libc::ptrdiff_t;
 use rav1d::errno_location;
 use rav1d::include::dav1d::data::Dav1dData;
-use rav1d::include::stddef::ptrdiff_t;
 use rav1d::src::lib::dav1d_data_create;
 use rav1d::src::lib::dav1d_data_unref;
 use rav1d::stderr;