diff --git a/examples/anim_diff.c b/examples/anim_diff.c
index 0bfaa7c1..62cee714 100644
--- a/examples/anim_diff.c
+++ b/examples/anim_diff.c
@@ -22,6 +22,7 @@
 #include "./anim_util.h"
 #include "./example_util.h"
 #include "./unicode.h"
+#include "webp/types.h"
 
 #if defined(_MSC_VER) && _MSC_VER < 1900
 #define snprintf _snprintf
diff --git a/examples/anim_dump.c b/examples/anim_dump.c
index fa702dd2..55ac0ad3 100644
--- a/examples/anim_dump.c
+++ b/examples/anim_dump.c
@@ -15,10 +15,11 @@
 #include <stdlib.h>
 #include <string.h>  // for 'strcmp'.
 
-#include "./anim_util.h"
-#include "webp/decode.h"
 #include "../imageio/image_enc.h"
+#include "./anim_util.h"
 #include "./unicode.h"
+#include "webp/decode.h"
+#include "webp/types.h"
 
 #if defined(_MSC_VER) && _MSC_VER < 1900
 #define snprintf _snprintf
diff --git a/examples/anim_util.c b/examples/anim_util.c
index 4ce093b9..e480063c 100644
--- a/examples/anim_util.c
+++ b/examples/anim_util.c
@@ -19,13 +19,16 @@
 #if defined(WEBP_HAVE_GIF)
 #include <gif_lib.h>
 #endif
-#include "webp/format_constants.h"
-#include "webp/decode.h"
-#include "webp/demux.h"
+
 #include "../imageio/imageio_util.h"
 #include "./gifdec.h"
 #include "./unicode.h"
 #include "./unicode_gif.h"
+#include "webp/decode.h"
+#include "webp/demux.h"
+#include "webp/format_constants.h"
+#include "webp/mux_types.h"
+#include "webp/types.h"
 
 #if defined(_MSC_VER) && _MSC_VER < 1900
 #define snprintf _snprintf
diff --git a/examples/cwebp.c b/examples/cwebp.c
index deccffc2..7a878405 100644
--- a/examples/cwebp.c
+++ b/examples/cwebp.c
@@ -27,8 +27,10 @@
 #include "../imageio/webpdec.h"
 #include "./stopwatch.h"
 #include "./unicode.h"
+#include "imageio/metadata.h"
 #include "sharpyuv/sharpyuv.h"
 #include "webp/encode.h"
+#include "webp/types.h"
 
 #ifndef WEBP_DLL
 #ifdef __cplusplus
diff --git a/examples/dwebp.c b/examples/dwebp.c
index 9dc3c6b6..b84c2164 100644
--- a/examples/dwebp.c
+++ b/examples/dwebp.c
@@ -25,6 +25,8 @@
 #include "../imageio/webpdec.h"
 #include "./stopwatch.h"
 #include "./unicode.h"
+#include "webp/decode.h"
+#include "webp/types.h"
 
 static int verbose = 0;
 static int quiet = 0;
diff --git a/examples/example_util.c b/examples/example_util.c
index fe19c9b2..a8951aee 100644
--- a/examples/example_util.c
+++ b/examples/example_util.c
@@ -17,8 +17,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "webp/mux_types.h"
 #include "../imageio/imageio_util.h"
+#include "webp/mux_types.h"
+#include "webp/types.h"
 
 //------------------------------------------------------------------------------
 // String parsing
diff --git a/examples/gifdec.c b/examples/gifdec.c
index 9b9a6947..fced38b5 100644
--- a/examples/gifdec.c
+++ b/examples/gifdec.c
@@ -19,6 +19,7 @@
 #include <string.h>
 
 #include "webp/encode.h"
+#include "webp/types.h"
 #include "webp/mux_types.h"
 
 #define GIF_TRANSPARENT_COLOR 0x00000000u
diff --git a/examples/gifdec.h b/examples/gifdec.h
index 5eba9dd3..2592c966 100644
--- a/examples/gifdec.h
+++ b/examples/gifdec.h
@@ -13,6 +13,7 @@
 #define WEBP_EXAMPLES_GIFDEC_H_
 
 #include <stdio.h>
+
 #include "webp/types.h"
 
 #ifdef HAVE_CONFIG_H
diff --git a/examples/img2webp.c b/examples/img2webp.c
index 829e3f64..c4eab6b8 100644
--- a/examples/img2webp.c
+++ b/examples/img2webp.c
@@ -31,6 +31,8 @@
 #include "sharpyuv/sharpyuv.h"
 #include "webp/encode.h"
 #include "webp/mux.h"
+#include "webp/mux_types.h"
+#include "webp/types.h"
 
 //------------------------------------------------------------------------------
 
diff --git a/examples/webpinfo.c b/examples/webpinfo.c
index cbf5a127..01052443 100644
--- a/examples/webpinfo.c
+++ b/examples/webpinfo.c
@@ -15,6 +15,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #ifdef HAVE_CONFIG_H
 #include "webp/config.h"
@@ -25,6 +26,7 @@
 #include "webp/decode.h"
 #include "webp/format_constants.h"
 #include "webp/mux_types.h"
+#include "webp/types.h"
 
 #if defined(_MSC_VER) && _MSC_VER < 1900
 #define snprintf _snprintf
diff --git a/examples/webpmux.c b/examples/webpmux.c
index 5a61b005..7ae24f87 100644
--- a/examples/webpmux.c
+++ b/examples/webpmux.c
@@ -60,11 +60,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "webp/decode.h"
-#include "webp/mux.h"
 #include "../examples/example_util.h"
 #include "../imageio/imageio_util.h"
 #include "./unicode.h"
+#include "webp/decode.h"
+#include "webp/mux.h"
+#include "webp/mux_types.h"
+#include "webp/types.h"
 
 //------------------------------------------------------------------------------
 // Config object to parse command-line arguments.
diff --git a/extras/extras.c b/extras/extras.c
index c458c695..4f38ab50 100644
--- a/extras/extras.c
+++ b/extras/extras.c
@@ -20,6 +20,7 @@
 #include "sharpyuv/sharpyuv.h"
 #include "src/dsp/dsp.h"
 #include "src/utils/utils.h"
+#include "src/webp/encode.h"
 #include "webp/format_constants.h"
 #include "webp/types.h"
 
diff --git a/extras/extras.h b/extras/extras.h
index 3cc9d700..516b60e6 100644
--- a/extras/extras.h
+++ b/extras/extras.h
@@ -11,6 +11,8 @@
 #ifndef WEBP_EXTRAS_EXTRAS_H_
 #define WEBP_EXTRAS_EXTRAS_H_
 
+#include <stddef.h>
+
 #include "webp/types.h"
 
 #ifdef __cplusplus
diff --git a/extras/get_disto.c b/extras/get_disto.c
index 7b9c202b..0fe76f51 100644
--- a/extras/get_disto.c
+++ b/extras/get_disto.c
@@ -23,10 +23,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "webp/encode.h"
+#include "../examples/unicode.h"
 #include "imageio/image_dec.h"
 #include "imageio/imageio_util.h"
-#include "../examples/unicode.h"
+#include "src/webp/types.h"
+#include "webp/encode.h"
 
 static size_t ReadPicture(const char* const filename, WebPPicture* const pic,
                           int keep_alpha) {
diff --git a/extras/quality_estimate.c b/extras/quality_estimate.c
index 45dc5bb7..7b69b1b6 100644
--- a/extras/quality_estimate.c
+++ b/extras/quality_estimate.c
@@ -11,10 +11,12 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "extras/extras.h"
-#include "webp/decode.h"
-
 #include <math.h>
+#include <stddef.h>
+
+#include "extras/extras.h"
+#include "src/webp/types.h"
+#include "webp/decode.h"
 
 //------------------------------------------------------------------------------
 
diff --git a/extras/webp_quality.c b/extras/webp_quality.c
index 52bd663b..b0725863 100644
--- a/extras/webp_quality.c
+++ b/extras/webp_quality.c
@@ -11,9 +11,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "../examples/unicode.h"
+#include "src/webp/types.h"
 #include "extras/extras.h"
 #include "imageio/imageio_util.h"
-#include "../examples/unicode.h"
 
 // Returns EXIT_SUCCESS on success, EXIT_FAILURE on failure.
 int main(int argc, const char* argv[]) {
diff --git a/imageio/image_dec.c b/imageio/image_dec.c
index 5e003fab..82bf632a 100644
--- a/imageio/image_dec.c
+++ b/imageio/image_dec.c
@@ -9,7 +9,12 @@
 //
 // Generic image-type guessing.
 
+#include <stddef.h>
+
 #include "./image_dec.h"
+#include "./metadata.h"
+#include "webp/encode.h"
+#include "webp/types.h"
 
 const char* WebPGetEnabledInputFileFormats(void) {
   return "WebP"
diff --git a/imageio/image_dec.h b/imageio/image_dec.h
index f09f564b..a5915466 100644
--- a/imageio/image_dec.h
+++ b/imageio/image_dec.h
@@ -14,6 +14,8 @@
 #ifndef WEBP_IMAGEIO_IMAGE_DEC_H_
 #define WEBP_IMAGEIO_IMAGE_DEC_H_
 
+#include <stddef.h>
+
 #include "webp/types.h"
 
 #ifdef HAVE_CONFIG_H
diff --git a/imageio/image_enc.c b/imageio/image_enc.c
index d58477f3..298a866d 100644
--- a/imageio/image_enc.c
+++ b/imageio/image_enc.c
@@ -12,6 +12,7 @@
 #include "./image_enc.h"
 
 #include <assert.h>
+#include <stdio.h>
 #include <string.h>
 
 #ifdef WEBP_HAVE_PNG
@@ -34,8 +35,10 @@
 #include <wincodec.h>
 #endif
 
-#include "./imageio_util.h"
 #include "../examples/unicode.h"
+#include "./imageio_util.h"
+#include "webp/decode.h"
+#include "webp/types.h"
 
 //------------------------------------------------------------------------------
 // PNG
diff --git a/imageio/imageio_util.c b/imageio/imageio_util.c
index 4ae4e03c..372778fd 100644
--- a/imageio/imageio_util.c
+++ b/imageio/imageio_util.c
@@ -16,8 +16,11 @@
 #include <fcntl.h>   // for _O_BINARY
 #include <io.h>      // for _setmode()
 #endif
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#include "webp/types.h"
 #include "../examples/unicode.h"
 
 // -----------------------------------------------------------------------------
diff --git a/imageio/imageio_util.h b/imageio/imageio_util.h
index f135f566..277eb7a7 100644
--- a/imageio/imageio_util.h
+++ b/imageio/imageio_util.h
@@ -14,6 +14,7 @@
 #define WEBP_IMAGEIO_IMAGEIO_UTIL_H_
 
 #include <stdio.h>
+
 #include "webp/types.h"
 
 #ifdef __cplusplus
diff --git a/imageio/jpegdec.c b/imageio/jpegdec.c
index 7bce1206..e464542d 100644
--- a/imageio/jpegdec.c
+++ b/imageio/jpegdec.c
@@ -24,9 +24,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "webp/encode.h"
 #include "./imageio_util.h"
 #include "./metadata.h"
+#include "webp/encode.h"
+#include "webp/types.h"
 
 // -----------------------------------------------------------------------------
 // Metadata processing
diff --git a/imageio/jpegdec.h b/imageio/jpegdec.h
index effc14f8..97304bc7 100644
--- a/imageio/jpegdec.h
+++ b/imageio/jpegdec.h
@@ -12,6 +12,8 @@
 #ifndef WEBP_IMAGEIO_JPEGDEC_H_
 #define WEBP_IMAGEIO_JPEGDEC_H_
 
+#include <stddef.h>
+
 #include "webp/types.h"
 
 #ifdef __cplusplus
diff --git a/imageio/metadata.h b/imageio/metadata.h
index 1d5be91a..ba479e7f 100644
--- a/imageio/metadata.h
+++ b/imageio/metadata.h
@@ -13,6 +13,8 @@
 #ifndef WEBP_IMAGEIO_METADATA_H_
 #define WEBP_IMAGEIO_METADATA_H_
 
+#include <stddef.h>
+
 #include "webp/types.h"
 
 #ifdef __cplusplus
diff --git a/imageio/pngdec.c b/imageio/pngdec.c
index 049acd7c..e04719ea 100644
--- a/imageio/pngdec.c
+++ b/imageio/pngdec.c
@@ -22,13 +22,15 @@
 #define PNG_USER_MEM_SUPPORTED  // for png_create_read_struct_2
 #endif
 #include <png.h>
+
 #include <setjmp.h>   // note: this must be included *after* png.h
 #include <stdlib.h>
 #include <string.h>
 
-#include "webp/encode.h"
 #include "./imageio_util.h"
 #include "./metadata.h"
+#include "webp/encode.h"
+#include "webp/types.h"
 
 #define LOCAL_PNG_VERSION ((PNG_LIBPNG_VER_MAJOR << 8) | PNG_LIBPNG_VER_MINOR)
 #define LOCAL_PNG_PREREQ(maj, min) \
diff --git a/imageio/pngdec.h b/imageio/pngdec.h
index e0a6122d..06d98977 100644
--- a/imageio/pngdec.h
+++ b/imageio/pngdec.h
@@ -12,6 +12,8 @@
 #ifndef WEBP_IMAGEIO_PNGDEC_H_
 #define WEBP_IMAGEIO_PNGDEC_H_
 
+#include <stddef.h>
+
 #include "webp/types.h"
 
 #ifdef __cplusplus
diff --git a/imageio/pnmdec.c b/imageio/pnmdec.c
index 0d592c32..a6cabf13 100644
--- a/imageio/pnmdec.c
+++ b/imageio/pnmdec.c
@@ -17,8 +17,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "webp/encode.h"
 #include "./imageio_util.h"
+#include "webp/encode.h"
+#include "webp/types.h"
 
 #if defined(_MSC_VER) && _MSC_VER < 1900
 #define snprintf _snprintf
diff --git a/imageio/pnmdec.h b/imageio/pnmdec.h
index c4d5823e..e496e6bf 100644
--- a/imageio/pnmdec.h
+++ b/imageio/pnmdec.h
@@ -12,6 +12,8 @@
 #ifndef WEBP_IMAGEIO_PNMDEC_H_
 #define WEBP_IMAGEIO_PNMDEC_H_
 
+#include <stddef.h>
+
 #include "webp/types.h"
 
 #ifdef __cplusplus
diff --git a/imageio/tiffdec.c b/imageio/tiffdec.c
index d711fa4b..656ed557 100644
--- a/imageio/tiffdec.c
+++ b/imageio/tiffdec.c
@@ -22,9 +22,10 @@
 #ifdef WEBP_HAVE_TIFF
 #include <tiffio.h>
 
-#include "webp/encode.h"
 #include "./imageio_util.h"
 #include "./metadata.h"
+#include "webp/encode.h"
+#include "webp/types.h"
 
 static const struct {
   ttag_t tag;
diff --git a/imageio/tiffdec.h b/imageio/tiffdec.h
index 0c8beccd..3be830d0 100644
--- a/imageio/tiffdec.h
+++ b/imageio/tiffdec.h
@@ -12,6 +12,8 @@
 #ifndef WEBP_IMAGEIO_TIFFDEC_H_
 #define WEBP_IMAGEIO_TIFFDEC_H_
 
+#include <stddef.h>
+
 #include "webp/types.h"
 
 #ifdef __cplusplus
diff --git a/imageio/webpdec.c b/imageio/webpdec.c
index aed60e14..72dc02bf 100644
--- a/imageio/webpdec.c
+++ b/imageio/webpdec.c
@@ -13,18 +13,19 @@
 #include "webp/config.h"
 #endif
 
-#include "./webpdec.h"
-
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "webp/decode.h"
-#include "webp/demux.h"
-#include "webp/encode.h"
 #include "../examples/unicode.h"
 #include "./imageio_util.h"
 #include "./metadata.h"
+#include "./webpdec.h"
+#include "webp/decode.h"
+#include "webp/demux.h"
+#include "webp/encode.h"
+#include "webp/mux_types.h"
+#include "webp/types.h"
 
 //------------------------------------------------------------------------------
 // WebP decoding
diff --git a/imageio/webpdec.h b/imageio/webpdec.h
index d329d41f..d1c6521b 100644
--- a/imageio/webpdec.h
+++ b/imageio/webpdec.h
@@ -12,7 +12,10 @@
 #ifndef WEBP_IMAGEIO_WEBPDEC_H_
 #define WEBP_IMAGEIO_WEBPDEC_H_
 
+#include <stddef.h>
+
 #include "webp/decode.h"
+#include "webp/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sharpyuv/sharpyuv.c b/sharpyuv/sharpyuv.c
index 14013ebe..25b842dd 100644
--- a/sharpyuv/sharpyuv.c
+++ b/sharpyuv/sharpyuv.c
@@ -19,10 +19,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "src/webp/types.h"
 #include "sharpyuv/sharpyuv_cpu.h"
 #include "sharpyuv/sharpyuv_dsp.h"
 #include "sharpyuv/sharpyuv_gamma.h"
+#include "src/webp/types.h"
 
 //------------------------------------------------------------------------------
 
diff --git a/sharpyuv/sharpyuv_csp.c b/sharpyuv/sharpyuv_csp.c
index ae03523e..9714130e 100644
--- a/sharpyuv/sharpyuv_csp.c
+++ b/sharpyuv/sharpyuv_csp.c
@@ -15,6 +15,8 @@
 #include <math.h>
 #include <stddef.h>
 
+#include "sharpyuv/sharpyuv.h"
+
 static int ToFixed16(float f) { return (int)floor(f * (1 << 16) + 0.5f); }
 
 void SharpYuvComputeConversionMatrix(const SharpYuvColorSpace* yuv_color_space,
diff --git a/sharpyuv/sharpyuv_dsp.c b/sharpyuv/sharpyuv_dsp.c
index 94a40ec6..3d2cf85f 100644
--- a/sharpyuv/sharpyuv_dsp.c
+++ b/sharpyuv/sharpyuv_dsp.c
@@ -17,6 +17,7 @@
 #include <stdlib.h>
 
 #include "sharpyuv/sharpyuv_cpu.h"
+#include "src/dsp/cpu.h"
 #include "src/webp/types.h"
 
 //-----------------------------------------------------------------------------
diff --git a/sharpyuv/sharpyuv_gamma.c b/sharpyuv/sharpyuv_gamma.c
index 09028428..f72be4b8 100644
--- a/sharpyuv/sharpyuv_gamma.c
+++ b/sharpyuv/sharpyuv_gamma.c
@@ -15,6 +15,7 @@
 #include <float.h>
 #include <math.h>
 
+#include "sharpyuv/sharpyuv.h"
 #include "src/webp/types.h"
 
 // Gamma correction compensates loss of resolution during chroma subsampling.
diff --git a/sharpyuv/sharpyuv_sse2.c b/sharpyuv/sharpyuv_sse2.c
index 9744d1bb..e085c43e 100644
--- a/sharpyuv/sharpyuv_sse2.c
+++ b/sharpyuv/sharpyuv_sse2.c
@@ -14,9 +14,13 @@
 #include "sharpyuv/sharpyuv_dsp.h"
 
 #if defined(WEBP_USE_SSE2)
-#include <stdlib.h>
 #include <emmintrin.h>
 
+#include <stdlib.h>
+
+#include "src/dsp/cpu.h"
+#include "src/webp/types.h"
+
 static uint16_t clip_SSE2(int v, int max) {
   return (v < 0) ? 0 : (v > max) ? max : (uint16_t)v;
 }
diff --git a/src/dec/alpha_dec.c b/src/dec/alpha_dec.c
index e04a2e5b..d90bfd2b 100644
--- a/src/dec/alpha_dec.c
+++ b/src/dec/alpha_dec.c
@@ -11,14 +11,18 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
+#include <assert.h>
 #include <stdlib.h>
+
 #include "src/dec/alphai_dec.h"
 #include "src/dec/vp8_dec.h"
 #include "src/dec/vp8i_dec.h"
 #include "src/dec/vp8li_dec.h"
+#include "src/dec/webpi_dec.h"
 #include "src/dsp/dsp.h"
 #include "src/utils/quant_levels_dec_utils.h"
 #include "src/utils/utils.h"
+#include "src/webp/decode.h"
 #include "src/webp/format_constants.h"
 #include "src/webp/types.h"
 
diff --git a/src/dec/alphai_dec.h b/src/dec/alphai_dec.h
index e0dc9165..49150318 100644
--- a/src/dec/alphai_dec.h
+++ b/src/dec/alphai_dec.h
@@ -14,7 +14,10 @@
 #ifndef WEBP_DEC_ALPHAI_DEC_H_
 #define WEBP_DEC_ALPHAI_DEC_H_
 
+#include "src/dec/vp8_dec.h"
+#include "src/webp/types.h"
 #include "src/dec/webpi_dec.h"
+#include "src/dsp/dsp.h"
 #include "src/utils/filters_utils.h"
 
 #ifdef __cplusplus
diff --git a/src/dec/buffer_dec.c b/src/dec/buffer_dec.c
index a61ed63c..290f7ab3 100644
--- a/src/dec/buffer_dec.c
+++ b/src/dec/buffer_dec.c
@@ -11,11 +11,16 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
+#include <assert.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "src/dec/vp8i_dec.h"
 #include "src/dec/webpi_dec.h"
+#include "src/utils/rescaler_utils.h"
 #include "src/utils/utils.h"
+#include "src/webp/decode.h"
+#include "src/webp/types.h"
 
 //------------------------------------------------------------------------------
 // WebPDecBuffer
diff --git a/src/dec/frame_dec.c b/src/dec/frame_dec.c
index 2e0351bc..87807722 100644
--- a/src/dec/frame_dec.c
+++ b/src/dec/frame_dec.c
@@ -11,9 +11,20 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
+#include <assert.h>
 #include <stdlib.h>
+#include <string.h>
+
+#include "src/dec/common_dec.h"
+#include "src/dec/vp8_dec.h"
 #include "src/dec/vp8i_dec.h"
+#include "src/dec/webpi_dec.h"
+#include "src/dsp/dsp.h"
+#include "src/utils/random_utils.h"
+#include "src/utils/thread_utils.h"
 #include "src/utils/utils.h"
+#include "src/webp/decode.h"
+#include "src/webp/types.h"
 
 //------------------------------------------------------------------------------
 // Main reconstruction function.
diff --git a/src/dec/idec_dec.c b/src/dec/idec_dec.c
index 6734ae88..7c0bb4d1 100644
--- a/src/dec/idec_dec.c
+++ b/src/dec/idec_dec.c
@@ -12,15 +12,20 @@
 // Author: somnath@google.com (Somnath Banerjee)
 
 #include <assert.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "src/dec/alphai_dec.h"
-#include "src/dec/webpi_dec.h"
 #include "src/dec/vp8_dec.h"
 #include "src/dec/vp8i_dec.h"
+#include "src/dec/vp8li_dec.h"
+#include "src/dec/webpi_dec.h"
+#include "src/utils/bit_reader_utils.h"
+#include "src/utils/thread_utils.h"
 #include "src/utils/utils.h"
 #include "src/webp/decode.h"
+#include "src/webp/format_constants.h"
+#include "src/webp/types.h"
 
 // In append mode, buffer allocations increase as multiples of this value.
 // Needs to be a power of 2.
diff --git a/src/dec/io_dec.c b/src/dec/io_dec.c
index 9a5ae82e..b6e720ed 100644
--- a/src/dec/io_dec.c
+++ b/src/dec/io_dec.c
@@ -14,12 +14,18 @@
 #include <assert.h>
 #include <stddef.h>
 #include <stdlib.h>
+#include <string.h>
 
+#include "src/dec/vp8_dec.h"
+#include "src/webp/types.h"
 #include "src/dec/vp8i_dec.h"
 #include "src/dec/webpi_dec.h"
+#include "src/dsp/cpu.h"
 #include "src/dsp/dsp.h"
 #include "src/dsp/yuv.h"
+#include "src/utils/rescaler_utils.h"
 #include "src/utils/utils.h"
+#include "src/webp/decode.h"
 
 //------------------------------------------------------------------------------
 // Main YUV<->RGB conversion functions
diff --git a/src/dec/quant_dec.c b/src/dec/quant_dec.c
index 39436c76..977bec56 100644
--- a/src/dec/quant_dec.c
+++ b/src/dec/quant_dec.c
@@ -11,7 +11,11 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
+#include "src/dec/common_dec.h"
+#include "src/dec/vp8_dec.h"
 #include "src/dec/vp8i_dec.h"
+#include "src/utils/bit_reader_utils.h"
+#include "src/webp/types.h"
 
 static WEBP_INLINE int clip(int v, int M) {
   return v < 0 ? 0 : v > M ? M : v;
@@ -112,4 +116,3 @@ void VP8ParseQuant(VP8Decoder* const dec) {
 }
 
 //------------------------------------------------------------------------------
-
diff --git a/src/dec/tree_dec.c b/src/dec/tree_dec.c
index ad53cf17..a3b00ef7 100644
--- a/src/dec/tree_dec.c
+++ b/src/dec/tree_dec.c
@@ -11,9 +11,15 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
+#include <string.h>
+
+#include "src/dec/common_dec.h"
+#include "src/webp/types.h"
+#include "src/dec/vp8_dec.h"
 #include "src/dec/vp8i_dec.h"
 #include "src/dsp/cpu.h"
 #include "src/utils/bit_reader_inl_utils.h"
+#include "src/utils/bit_reader_utils.h"
 
 #if !defined(USE_GENERIC_TREE)
 #if !defined(__arm__) && !defined(_M_ARM) && !WEBP_AARCH64 && \
diff --git a/src/dec/vp8_dec.c b/src/dec/vp8_dec.c
index 64b8f3e7..b1df3a0a 100644
--- a/src/dec/vp8_dec.c
+++ b/src/dec/vp8_dec.c
@@ -11,14 +11,25 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
+#include <assert.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "src/dec/alphai_dec.h"
+#include "src/dec/common_dec.h"
+#include "src/dec/vp8_dec.h"
 #include "src/dec/vp8i_dec.h"
 #include "src/dec/vp8li_dec.h"
 #include "src/dec/webpi_dec.h"
+#include "src/dsp/cpu.h"
+#include "src/dsp/dsp.h"
 #include "src/utils/bit_reader_inl_utils.h"
+#include "src/utils/bit_reader_utils.h"
+#include "src/utils/thread_utils.h"
 #include "src/utils/utils.h"
+#include "src/webp/decode.h"
+#include "src/webp/format_constants.h"
+#include "src/webp/types.h"
 
 //------------------------------------------------------------------------------
 
diff --git a/src/dec/vp8_dec.h b/src/dec/vp8_dec.h
index 91fe1040..eb292b14 100644
--- a/src/dec/vp8_dec.h
+++ b/src/dec/vp8_dec.h
@@ -14,6 +14,8 @@
 #ifndef WEBP_DEC_VP8_DEC_H_
 #define WEBP_DEC_VP8_DEC_H_
 
+#include <stddef.h>
+
 #include "src/webp/decode.h"
 #include "src/webp/types.h"
 
diff --git a/src/dec/vp8i_dec.h b/src/dec/vp8i_dec.h
index 7628367c..1e806b90 100644
--- a/src/dec/vp8i_dec.h
+++ b/src/dec/vp8i_dec.h
@@ -15,12 +15,16 @@
 #define WEBP_DEC_VP8I_DEC_H_
 
 #include <string.h>     // for memcpy()
+
 #include "src/dec/common_dec.h"
+#include "src/dec/vp8_dec.h"
 #include "src/dec/vp8li_dec.h"
+#include "src/dec/webpi_dec.h"
+#include "src/dsp/dsp.h"
 #include "src/utils/bit_reader_utils.h"
 #include "src/utils/random_utils.h"
 #include "src/utils/thread_utils.h"
-#include "src/dsp/dsp.h"
+#include "src/webp/decode.h"
 #include "src/webp/types.h"
 
 #ifdef __cplusplus
diff --git a/src/dec/vp8l_dec.c b/src/dec/vp8l_dec.c
index afccac72..cf8cd82c 100644
--- a/src/dec/vp8l_dec.c
+++ b/src/dec/vp8l_dec.c
@@ -15,15 +15,23 @@
 #include <assert.h>
 #include <stddef.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "src/dec/alphai_dec.h"
+#include "src/dec/vp8_dec.h"
 #include "src/dec/vp8li_dec.h"
+#include "src/dec/webpi_dec.h"
 #include "src/dsp/dsp.h"
 #include "src/dsp/lossless.h"
 #include "src/dsp/lossless_common.h"
+#include "src/utils/bit_reader_utils.h"
+#include "src/utils/color_cache_utils.h"
 #include "src/utils/huffman_utils.h"
+#include "src/utils/rescaler_utils.h"
 #include "src/utils/utils.h"
+#include "src/webp/decode.h"
 #include "src/webp/format_constants.h"
+#include "src/webp/types.h"
 
 #define NUM_ARGB_CACHE_ROWS          16
 
diff --git a/src/dec/vp8li_dec.h b/src/dec/vp8li_dec.h
index a2120ca6..4e2eadb3 100644
--- a/src/dec/vp8li_dec.h
+++ b/src/dec/vp8li_dec.h
@@ -16,10 +16,15 @@
 #define WEBP_DEC_VP8LI_DEC_H_
 
 #include <string.h>     // for memcpy()
+
+#include "src/dec/vp8_dec.h"
 #include "src/dec/webpi_dec.h"
 #include "src/utils/bit_reader_utils.h"
 #include "src/utils/color_cache_utils.h"
 #include "src/utils/huffman_utils.h"
+#include "src/utils/rescaler_utils.h"
+#include "src/webp/decode.h"
+#include "src/webp/format_constants.h"
 #include "src/webp/types.h"
 
 #ifdef __cplusplus
diff --git a/src/dec/webp_dec.c b/src/dec/webp_dec.c
index a0d19fb4..5e7c23fe 100644
--- a/src/dec/webp_dec.c
+++ b/src/dec/webp_dec.c
@@ -11,7 +11,9 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
+#include <assert.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "src/dec/common_dec.h"
 #include "src/dec/vp8_dec.h"
@@ -21,6 +23,7 @@
 #include "src/utils/rescaler_utils.h"
 #include "src/utils/utils.h"
 #include "src/webp/decode.h"
+#include "src/webp/format_constants.h"
 #include "src/webp/mux_types.h"  // ALPHA_FLAG
 #include "src/webp/types.h"
 
diff --git a/src/dec/webpi_dec.h b/src/dec/webpi_dec.h
index 77bf5264..19297964 100644
--- a/src/dec/webpi_dec.h
+++ b/src/dec/webpi_dec.h
@@ -18,9 +18,12 @@
 extern "C" {
 #endif
 
-#include "src/utils/rescaler_utils.h"
+#include <stddef.h>
+
 #include "src/dec/vp8_dec.h"
+#include "src/utils/rescaler_utils.h"
 #include "src/webp/decode.h"
+#include "src/webp/types.h"
 
 //------------------------------------------------------------------------------
 // WebPDecParams: Decoding output parameters. Transient internal object.
diff --git a/src/demux/anim_decode.c b/src/demux/anim_decode.c
index 5306cf0e..f046f506 100644
--- a/src/demux/anim_decode.c
+++ b/src/demux/anim_decode.c
@@ -20,6 +20,8 @@
 #include "src/utils/utils.h"
 #include "src/webp/decode.h"
 #include "src/webp/demux.h"
+#include "src/webp/mux.h"
+#include "src/webp/mux_types.h"
 #include "src/webp/types.h"
 
 #define NUM_CHANNELS 4
diff --git a/src/demux/demux.c b/src/demux/demux.c
index a8770479..54734420 100644
--- a/src/demux/demux.c
+++ b/src/demux/demux.c
@@ -22,6 +22,9 @@
 #include "src/webp/decode.h"     // WebPGetFeatures
 #include "src/webp/demux.h"
 #include "src/webp/format_constants.h"
+#include "src/webp/mux.h"
+#include "src/webp/mux_types.h"
+#include "src/webp/types.h"
 
 #define DMUX_MAJ_VERSION 1
 #define DMUX_MIN_VERSION 5
@@ -972,4 +975,3 @@ int WebPDemuxPrevChunk(WebPChunkIterator* iter) {
 void WebPDemuxReleaseChunkIterator(WebPChunkIterator* iter) {
   (void)iter;
 }
-
diff --git a/src/dsp/alpha_processing.c b/src/dsp/alpha_processing.c
index 1d152f24..4927e73e 100644
--- a/src/dsp/alpha_processing.c
+++ b/src/dsp/alpha_processing.c
@@ -12,7 +12,11 @@
 // Author: Skal (pascal.massimino@gmail.com)
 
 #include <assert.h>
+#include <stddef.h>
+
+#include "src/dsp/cpu.h"
 #include "src/dsp/dsp.h"
+#include "src/webp/types.h"
 
 // Tables can be faster on some platform but incur some extra binary size (~2k).
 #if !defined(USE_TABLES_FOR_ALPHA_MULT)
diff --git a/src/dsp/alpha_processing_sse2.c b/src/dsp/alpha_processing_sse2.c
index 7abdc737..1a6bfcb9 100644
--- a/src/dsp/alpha_processing_sse2.c
+++ b/src/dsp/alpha_processing_sse2.c
@@ -16,6 +16,7 @@
 #if defined(WEBP_USE_SSE2)
 #include <emmintrin.h>
 
+#include "src/webp/types.h"
 #include "src/dsp/cpu.h"
 
 //------------------------------------------------------------------------------
diff --git a/src/dsp/alpha_processing_sse41.c b/src/dsp/alpha_processing_sse41.c
index 1156ac34..ed95ea4e 100644
--- a/src/dsp/alpha_processing_sse41.c
+++ b/src/dsp/alpha_processing_sse41.c
@@ -11,10 +11,12 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
+#include "src/dsp/cpu.h"
+#include "src/webp/types.h"
 #include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE41)
-
+#include <emmintrin.h>
 #include <smmintrin.h>
 
 //------------------------------------------------------------------------------
diff --git a/src/dsp/cost.c b/src/dsp/cost.c
index 609f9264..acf6c219 100644
--- a/src/dsp/cost.c
+++ b/src/dsp/cost.c
@@ -9,8 +9,15 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
+#include <assert.h>
+#include <stddef.h>
+#include <stdlib.h>
+
+#include "src/dsp/cpu.h"
+#include "src/webp/types.h"
 #include "src/dsp/dsp.h"
 #include "src/enc/cost_enc.h"
+#include "src/enc/vp8i_enc.h"
 
 //------------------------------------------------------------------------------
 // Boolean-cost cost table
diff --git a/src/dsp/cost_sse2.c b/src/dsp/cost_sse2.c
index a869b48d..2fc3c1c0 100644
--- a/src/dsp/cost_sse2.c
+++ b/src/dsp/cost_sse2.c
@@ -16,6 +16,10 @@
 #if defined(WEBP_USE_SSE2)
 #include <emmintrin.h>
 
+#include <assert.h>
+
+#include "src/webp/types.h"
+#include "src/dsp/cpu.h"
 #include "src/enc/cost_enc.h"
 #include "src/enc/vp8i_enc.h"
 #include "src/utils/utils.h"
diff --git a/src/dsp/cpu.c b/src/dsp/cpu.c
index 8ba8f683..816892fb 100644
--- a/src/dsp/cpu.c
+++ b/src/dsp/cpu.c
@@ -22,6 +22,10 @@
 #include <cpu-features.h>
 #endif
 
+#include <stddef.h>
+
+#include "src/webp/types.h"
+
 //------------------------------------------------------------------------------
 // SSE2 detection.
 //
diff --git a/src/dsp/dec.c b/src/dsp/dec.c
index dc1a7625..4f383099 100644
--- a/src/dsp/dec.c
+++ b/src/dsp/dec.c
@@ -12,10 +12,15 @@
 // Author: Skal (pascal.massimino@gmail.com)
 
 #include <assert.h>
+#include <stddef.h>
+#include <string.h>
 
-#include "src/dsp/dsp.h"
+#include "src/dec/common_dec.h"
 #include "src/dec/vp8i_dec.h"
+#include "src/dsp/cpu.h"
+#include "src/dsp/dsp.h"
 #include "src/utils/utils.h"
+#include "src/webp/types.h"
 
 //------------------------------------------------------------------------------
 
diff --git a/src/dsp/dec_clip_tables.c b/src/dsp/dec_clip_tables.c
index 427b74f7..4c816ddb 100644
--- a/src/dsp/dec_clip_tables.c
+++ b/src/dsp/dec_clip_tables.c
@@ -11,6 +11,8 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
+#include "src/dsp/cpu.h"
+#include "src/webp/types.h"
 #include "src/dsp/dsp.h"
 
 // define to 0 to have run-time table initialization
diff --git a/src/dsp/dec_sse2.c b/src/dsp/dec_sse2.c
index b0faada8..d5f273e3 100644
--- a/src/dsp/dec_sse2.c
+++ b/src/dsp/dec_sse2.c
@@ -23,9 +23,12 @@
 #endif
 
 #include <emmintrin.h>
-#include "src/dsp/common_sse2.h"
+
 #include "src/dec/vp8i_dec.h"
+#include "src/dsp/common_sse2.h"
+#include "src/dsp/cpu.h"
 #include "src/utils/utils.h"
+#include "src/webp/types.h"
 
 //------------------------------------------------------------------------------
 // Transforms (Paragraph 14.4)
diff --git a/src/dsp/dec_sse41.c b/src/dsp/dec_sse41.c
index 08a36302..4f514b9b 100644
--- a/src/dsp/dec_sse41.c
+++ b/src/dsp/dec_sse41.c
@@ -14,9 +14,12 @@
 #include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE41)
-
+#include <emmintrin.h>
 #include <smmintrin.h>
+
+#include "src/webp/types.h"
 #include "src/dec/vp8i_dec.h"
+#include "src/dsp/cpu.h"
 #include "src/utils/utils.h"
 
 static void HE16_SSE41(uint8_t* dst) {     // horizontal
diff --git a/src/dsp/enc.c b/src/dsp/enc.c
index d061bb5f..f1ebb745 100644
--- a/src/dsp/enc.c
+++ b/src/dsp/enc.c
@@ -13,9 +13,13 @@
 
 #include <assert.h>
 #include <stdlib.h>  // for abs()
+#include <string.h>
 
+#include "src/dsp/cpu.h"
 #include "src/dsp/dsp.h"
 #include "src/enc/vp8i_enc.h"
+#include "src/utils/utils.h"
+#include "src/webp/types.h"
 
 static WEBP_INLINE uint8_t clip_8b(int v) {
   return (!(v & ~0xff)) ? v : (v < 0) ? 0 : 255;
diff --git a/src/dsp/enc_sse2.c b/src/dsp/enc_sse2.c
index ecc1fb1b..6fc04343 100644
--- a/src/dsp/enc_sse2.c
+++ b/src/dsp/enc_sse2.c
@@ -14,13 +14,18 @@
 #include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE2)
-#include <assert.h>
-#include <stdlib.h>  // for abs()
 #include <emmintrin.h>
 
+#include <assert.h>
+#include <stdlib.h>  // for abs()
+#include <string.h>
+
 #include "src/dsp/common_sse2.h"
+#include "src/dsp/cpu.h"
 #include "src/enc/cost_enc.h"
 #include "src/enc/vp8i_enc.h"
+#include "src/utils/utils.h"
+#include "src/webp/types.h"
 
 //------------------------------------------------------------------------------
 // Transforms (Paragraph 14.4)
diff --git a/src/dsp/enc_sse41.c b/src/dsp/enc_sse41.c
index 9b5bedc7..4d73e321 100644
--- a/src/dsp/enc_sse41.c
+++ b/src/dsp/enc_sse41.c
@@ -14,11 +14,15 @@
 #include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE41)
+#include <emmintrin.h>
 #include <smmintrin.h>
+
 #include <stdlib.h>  // for abs()
 
 #include "src/dsp/common_sse2.h"
+#include "src/dsp/cpu.h"
 #include "src/enc/vp8i_enc.h"
+#include "src/webp/types.h"
 
 //------------------------------------------------------------------------------
 // Compute susceptibility based on DCT-coeff histograms.
diff --git a/src/dsp/filters.c b/src/dsp/filters.c
index f5e1e5f9..38da5252 100644
--- a/src/dsp/filters.c
+++ b/src/dsp/filters.c
@@ -11,11 +11,14 @@
 //
 // Author: Urvang (urvang@google.com)
 
-#include "src/dsp/dsp.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "src/dsp/cpu.h"
+#include "src/dsp/dsp.h"
+#include "src/webp/types.h"
+
 //------------------------------------------------------------------------------
 // Helpful macro.
 
diff --git a/src/dsp/filters_sse2.c b/src/dsp/filters_sse2.c
index d2ba7894..b9a7aefd 100644
--- a/src/dsp/filters_sse2.c
+++ b/src/dsp/filters_sse2.c
@@ -20,6 +20,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "src/dsp/cpu.h"
+#include "src/webp/types.h"
+
 //------------------------------------------------------------------------------
 // Helpful macro.
 
diff --git a/src/dsp/lossless.h b/src/dsp/lossless.h
index c2c6065b..c66ec5da 100644
--- a/src/dsp/lossless.h
+++ b/src/dsp/lossless.h
@@ -16,6 +16,7 @@
 #define WEBP_DSP_LOSSLESS_H_
 
 #include "src/dsp/dsp.h"
+#include "src/webp/types.h"
 #include "src/webp/decode.h"
 
 #ifdef __cplusplus
diff --git a/src/dsp/lossless_avx2.c b/src/dsp/lossless_avx2.c
index 96d6fbae..dc866049 100644
--- a/src/dsp/lossless_avx2.c
+++ b/src/dsp/lossless_avx2.c
@@ -15,6 +15,7 @@
 
 #if defined(WEBP_USE_AVX2)
 
+#include <stddef.h>
 #include <immintrin.h>
 
 #include "src/dsp/cpu.h"
diff --git a/src/dsp/lossless_common.h b/src/dsp/lossless_common.h
index 68c71be4..c856679d 100644
--- a/src/dsp/lossless_common.h
+++ b/src/dsp/lossless_common.h
@@ -16,6 +16,9 @@
 #ifndef WEBP_DSP_LOSSLESS_COMMON_H_
 #define WEBP_DSP_LOSSLESS_COMMON_H_
 
+#include <assert.h>
+#include <stddef.h>
+
 #include "src/dsp/cpu.h"
 #include "src/utils/utils.h"
 #include "src/webp/types.h"
diff --git a/src/dsp/lossless_enc_avx2.c b/src/dsp/lossless_enc_avx2.c
index 1879410f..32f9fae0 100644
--- a/src/dsp/lossless_enc_avx2.c
+++ b/src/dsp/lossless_enc_avx2.c
@@ -14,9 +14,12 @@
 #include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_AVX2)
-#include <assert.h>
+#include <emmintrin.h>
 #include <immintrin.h>
 
+#include <assert.h>
+#include <stddef.h>
+
 #include "src/dsp/cpu.h"
 #include "src/dsp/lossless.h"
 #include "src/dsp/lossless_common.h"
diff --git a/src/dsp/lossless_enc_sse2.c b/src/dsp/lossless_enc_sse2.c
index b17ac3fb..88276f4f 100644
--- a/src/dsp/lossless_enc_sse2.c
+++ b/src/dsp/lossless_enc_sse2.c
@@ -14,9 +14,9 @@
 #include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE2)
+#include <emmintrin.h>
 
 #include <assert.h>
-#include <emmintrin.h>
 #include <string.h>
 
 #include "src/dsp/cpu.h"
diff --git a/src/dsp/lossless_enc_sse41.c b/src/dsp/lossless_enc_sse41.c
index ccde6133..2c2950a0 100644
--- a/src/dsp/lossless_enc_sse41.c
+++ b/src/dsp/lossless_enc_sse41.c
@@ -14,9 +14,10 @@
 #include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE41)
+#include <emmintrin.h>
+#include <smmintrin.h>
 
 #include <assert.h>
-#include <smmintrin.h>
 
 #include "src/dsp/cpu.h"
 #include "src/dsp/lossless.h"
diff --git a/src/dsp/lossless_sse41.c b/src/dsp/lossless_sse41.c
index b24683ac..598e6794 100644
--- a/src/dsp/lossless_sse41.c
+++ b/src/dsp/lossless_sse41.c
@@ -12,9 +12,10 @@
 #include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE41)
-
+#include <emmintrin.h>
 #include <smmintrin.h>
 
+#include "src/webp/types.h"
 #include "src/dsp/cpu.h"
 #include "src/dsp/lossless.h"
 
diff --git a/src/dsp/rescaler.c b/src/dsp/rescaler.c
index a96ca669..eafccd44 100644
--- a/src/dsp/rescaler.c
+++ b/src/dsp/rescaler.c
@@ -12,7 +12,10 @@
 // Author: Skal (pascal.massimino@gmail.com)
 
 #include <assert.h>
+#include <stddef.h>
 
+#include "src/dsp/cpu.h"
+#include "src/webp/types.h"
 #include "src/dsp/dsp.h"
 #include "src/utils/rescaler_utils.h"
 
diff --git a/src/dsp/rescaler_sse2.c b/src/dsp/rescaler_sse2.c
index e898e2ac..be5508ca 100644
--- a/src/dsp/rescaler_sse2.c
+++ b/src/dsp/rescaler_sse2.c
@@ -17,8 +17,12 @@
 #include <emmintrin.h>
 
 #include <assert.h>
+#include <stddef.h>
+
+#include "src/dsp/cpu.h"
 #include "src/utils/rescaler_utils.h"
 #include "src/utils/utils.h"
+#include "src/webp/types.h"
 
 //------------------------------------------------------------------------------
 // Implementations of critical functions ImportRow / ExportRow
diff --git a/src/dsp/ssim.c b/src/dsp/ssim.c
index 9a1341ed..3002d626 100644
--- a/src/dsp/ssim.c
+++ b/src/dsp/ssim.c
@@ -14,7 +14,9 @@
 #include <assert.h>
 #include <stdlib.h>  // for abs()
 
+#include "src/dsp/cpu.h"
 #include "src/dsp/dsp.h"
+#include "src/webp/types.h"
 
 #if !defined(WEBP_REDUCE_SIZE)
 
diff --git a/src/dsp/ssim_sse2.c b/src/dsp/ssim_sse2.c
index 1dcb0eb0..3ca3de4e 100644
--- a/src/dsp/ssim_sse2.c
+++ b/src/dsp/ssim_sse2.c
@@ -14,11 +14,13 @@
 #include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE2)
-
-#include <assert.h>
 #include <emmintrin.h>
 
+#include <assert.h>
+
 #include "src/dsp/common_sse2.h"
+#include "src/dsp/cpu.h"
+#include "src/webp/types.h"
 
 #if !defined(WEBP_DISABLE_STATS)
 
diff --git a/src/dsp/upsampling.c b/src/dsp/upsampling.c
index 5953fe48..c57f66c3 100644
--- a/src/dsp/upsampling.c
+++ b/src/dsp/upsampling.c
@@ -11,10 +11,14 @@
 //
 // Author: somnath@google.com (Somnath Banerjee)
 
+#include <assert.h>
+#include <stddef.h>
+
+#include "src/dsp/cpu.h"
+#include "src/webp/types.h"
 #include "src/dsp/dsp.h"
 #include "src/dsp/yuv.h"
-
-#include <assert.h>
+#include "src/webp/decode.h"
 
 //------------------------------------------------------------------------------
 // Fancy upsampler
diff --git a/src/dsp/upsampling_sse2.c b/src/dsp/upsampling_sse2.c
index 36226fb1..0eecb11c 100644
--- a/src/dsp/upsampling_sse2.c
+++ b/src/dsp/upsampling_sse2.c
@@ -14,11 +14,15 @@
 #include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE2)
+#include <emmintrin.h>
 
 #include <assert.h>
-#include <emmintrin.h>
 #include <string.h>
+
+#include "src/webp/types.h"
+#include "src/dsp/cpu.h"
 #include "src/dsp/yuv.h"
+#include "src/webp/decode.h"
 
 #ifdef FANCY_UPSAMPLING
 
diff --git a/src/dsp/upsampling_sse41.c b/src/dsp/upsampling_sse41.c
index 823633c4..cac9567a 100644
--- a/src/dsp/upsampling_sse41.c
+++ b/src/dsp/upsampling_sse41.c
@@ -14,11 +14,15 @@
 #include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE41)
+#include <smmintrin.h>
 
 #include <assert.h>
-#include <smmintrin.h>
 #include <string.h>
+
+#include "src/webp/types.h"
+#include "src/dsp/cpu.h"
 #include "src/dsp/yuv.h"
+#include "src/webp/decode.h"
 
 #ifdef FANCY_UPSAMPLING
 
diff --git a/src/dsp/yuv.c b/src/dsp/yuv.c
index c1320f28..62f1ecc1 100644
--- a/src/dsp/yuv.c
+++ b/src/dsp/yuv.c
@@ -11,11 +11,15 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "src/dsp/yuv.h"
-
 #include <assert.h>
 #include <stdlib.h>
 
+#include "src/dsp/cpu.h"
+#include "src/webp/types.h"
+#include "src/dsp/dsp.h"
+#include "src/dsp/yuv.h"
+#include "src/webp/decode.h"
+
 //-----------------------------------------------------------------------------
 // Plain-C version
 
diff --git a/src/dsp/yuv.h b/src/dsp/yuv.h
index 59b871ae..6f218cf7 100644
--- a/src/dsp/yuv.h
+++ b/src/dsp/yuv.h
@@ -35,8 +35,10 @@
 #ifndef WEBP_DSP_YUV_H_
 #define WEBP_DSP_YUV_H_
 
-#include "src/dsp/dsp.h"
 #include "src/dec/vp8_dec.h"
+#include "src/dsp/cpu.h"
+#include "src/dsp/dsp.h"
+#include "src/webp/types.h"
 
 //------------------------------------------------------------------------------
 // YUV -> RGB conversion
diff --git a/src/dsp/yuv_neon.c b/src/dsp/yuv_neon.c
index b1b7c604..44745cf7 100644
--- a/src/dsp/yuv_neon.c
+++ b/src/dsp/yuv_neon.c
@@ -18,6 +18,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include "src/dsp/dsp.h"
 #include "src/dsp/neon.h"
 
 //-----------------------------------------------------------------------------
diff --git a/src/dsp/yuv_sse2.c b/src/dsp/yuv_sse2.c
index a96b4522..f1abf217 100644
--- a/src/dsp/yuv_sse2.c
+++ b/src/dsp/yuv_sse2.c
@@ -14,12 +14,16 @@
 #include "src/dsp/yuv.h"
 
 #if defined(WEBP_USE_SSE2)
-
-#include <stdlib.h>
 #include <emmintrin.h>
 
+#include <stdlib.h>
+
 #include "src/dsp/common_sse2.h"
+#include "src/dsp/cpu.h"
+#include "src/dsp/dsp.h"
 #include "src/utils/utils.h"
+#include "src/webp/decode.h"
+#include "src/webp/types.h"
 
 //-----------------------------------------------------------------------------
 // Convert spans of 32 pixels to various RGB formats for the fancy upsampler.
diff --git a/src/dsp/yuv_sse41.c b/src/dsp/yuv_sse41.c
index 071e4908..e1b80846 100644
--- a/src/dsp/yuv_sse41.c
+++ b/src/dsp/yuv_sse41.c
@@ -14,12 +14,17 @@
 #include "src/dsp/yuv.h"
 
 #if defined(WEBP_USE_SSE41)
-
-#include <stdlib.h>
+#include <emmintrin.h>
 #include <smmintrin.h>
 
+#include <stdlib.h>
+
 #include "src/dsp/common_sse41.h"
+#include "src/dsp/cpu.h"
+#include "src/dsp/dsp.h"
 #include "src/utils/utils.h"
+#include "src/webp/decode.h"
+#include "src/webp/types.h"
 
 //-----------------------------------------------------------------------------
 // Convert spans of 32 pixels to various RGB formats for the fancy upsampler.
diff --git a/src/enc/alpha_enc.c b/src/enc/alpha_enc.c
index 62d3a576..7153fc24 100644
--- a/src/enc/alpha_enc.c
+++ b/src/enc/alpha_enc.c
@@ -15,10 +15,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "src/enc/vp8i_enc.h"
 #include "src/dsp/dsp.h"
+#include "src/webp/types.h"
+#include "src/enc/vp8i_enc.h"
+#include "src/utils/bit_writer_utils.h"
 #include "src/utils/filters_utils.h"
 #include "src/utils/quant_levels_utils.h"
+#include "src/utils/thread_utils.h"
 #include "src/utils/utils.h"
 #include "src/webp/encode.h"
 #include "src/webp/format_constants.h"
diff --git a/src/enc/analysis_enc.c b/src/enc/analysis_enc.c
index 63770d68..d2ae58fa 100644
--- a/src/enc/analysis_enc.c
+++ b/src/enc/analysis_enc.c
@@ -11,13 +11,18 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 
-#include "src/enc/vp8i_enc.h"
+#include "src/dec/common_dec.h"
+#include "src/dsp/dsp.h"
 #include "src/enc/cost_enc.h"
+#include "src/enc/vp8i_enc.h"
+#include "src/utils/thread_utils.h"
 #include "src/utils/utils.h"
+#include "src/webp/encode.h"
+#include "src/webp/types.h"
 
 #define MAX_ITERS_K_MEANS  6
 
@@ -480,4 +485,3 @@ int VP8EncAnalyze(VP8Encoder* const enc) {
   }
   return ok;
 }
-
diff --git a/src/enc/backward_references_enc.h b/src/enc/backward_references_enc.h
index ef04b3d4..b9738d06 100644
--- a/src/enc/backward_references_enc.h
+++ b/src/enc/backward_references_enc.h
@@ -15,9 +15,10 @@
 
 #include <assert.h>
 #include <stdlib.h>
-#include "src/webp/types.h"
+
 #include "src/webp/encode.h"
 #include "src/webp/format_constants.h"
+#include "src/webp/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/enc/config_enc.c b/src/enc/config_enc.c
index 20d1936b..6d3d4424 100644
--- a/src/enc/config_enc.c
+++ b/src/enc/config_enc.c
@@ -15,7 +15,10 @@
 #include "src/webp/config.h"
 #endif
 
+#include <stddef.h>
+
 #include "src/webp/encode.h"
+#include "src/webp/types.h"
 
 //------------------------------------------------------------------------------
 // WebPConfig
diff --git a/src/enc/cost_enc.c b/src/enc/cost_enc.c
index c392ab24..3ed4eea4 100644
--- a/src/enc/cost_enc.c
+++ b/src/enc/cost_enc.c
@@ -11,7 +11,13 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
+#include <stdlib.h>
+
+#include "src/dec/common_dec.h"
+#include "src/webp/types.h"
+#include "src/dsp/dsp.h"
 #include "src/enc/cost_enc.h"
+#include "src/enc/vp8i_enc.h"
 
 //------------------------------------------------------------------------------
 // Level cost tables
diff --git a/src/enc/cost_enc.h b/src/enc/cost_enc.h
index a3524f9f..d2ffcc12 100644
--- a/src/enc/cost_enc.h
+++ b/src/enc/cost_enc.h
@@ -16,7 +16,11 @@
 
 #include <assert.h>
 #include <stdlib.h>
+
+#include "src/dec/common_dec.h"
+#include "src/dsp/dsp.h"
 #include "src/enc/vp8i_enc.h"
+#include "src/webp/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/enc/filter_enc.c b/src/enc/filter_enc.c
index 1f425dcb..8790ac81 100644
--- a/src/enc/filter_enc.c
+++ b/src/enc/filter_enc.c
@@ -12,8 +12,13 @@
 // Author: somnath@google.com (Somnath Banerjee)
 
 #include <assert.h>
-#include "src/enc/vp8i_enc.h"
+#include <stddef.h>
+#include <string.h>
+
+#include "src/dec/common_dec.h"
+#include "src/webp/types.h"
 #include "src/dsp/dsp.h"
+#include "src/enc/vp8i_enc.h"
 
 // This table gives, for a given sharpness, the filtering strength to be
 // used (at least) in order to filter a given edge step delta.
diff --git a/src/enc/frame_enc.c b/src/enc/frame_enc.c
index ed044736..5a50085c 100644
--- a/src/enc/frame_enc.c
+++ b/src/enc/frame_enc.c
@@ -11,12 +11,17 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include <string.h>
+#include <assert.h>
 #include <math.h>
+#include <string.h>
 
+#include "src/dec/common_dec.h"
+#include "src/webp/types.h"
+#include "src/dsp/dsp.h"
 #include "src/enc/cost_enc.h"
 #include "src/enc/vp8i_enc.h"
-#include "src/dsp/dsp.h"
+#include "src/utils/bit_writer_utils.h"
+#include "src/webp/encode.h"
 #include "src/webp/format_constants.h"  // RIFF constants
 
 #define SEGMENT_VISU 0
diff --git a/src/enc/iterator_enc.c b/src/enc/iterator_enc.c
index 21c05cd7..bc807d5e 100644
--- a/src/enc/iterator_enc.c
+++ b/src/enc/iterator_enc.c
@@ -14,7 +14,10 @@
 #include <string.h>
 
 #include "src/dsp/cpu.h"
+#include "src/dsp/dsp.h"
 #include "src/enc/vp8i_enc.h"
+#include "src/utils/utils.h"
+#include "src/webp/types.h"
 
 //------------------------------------------------------------------------------
 // VP8Iterator
diff --git a/src/enc/near_lossless_enc.c b/src/enc/near_lossless_enc.c
index 5517a7e2..4bb0e891 100644
--- a/src/enc/near_lossless_enc.c
+++ b/src/enc/near_lossless_enc.c
@@ -16,10 +16,13 @@
 
 #include <assert.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "src/dsp/lossless_common.h"
-#include "src/utils/utils.h"
+#include "src/webp/types.h"
 #include "src/enc/vp8li_enc.h"
+#include "src/utils/utils.h"
+#include "src/webp/encode.h"
 
 #if (WEBP_NEAR_LOSSLESS == 1)
 
diff --git a/src/enc/picture_csp_enc.c b/src/enc/picture_csp_enc.c
index a9280e6c..bf3c2304 100644
--- a/src/enc/picture_csp_enc.c
+++ b/src/enc/picture_csp_enc.c
@@ -12,18 +12,21 @@
 // Author: Skal (pascal.massimino@gmail.com)
 
 #include <assert.h>
-#include <stdlib.h>
 #include <math.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "sharpyuv/sharpyuv.h"
 #include "sharpyuv/sharpyuv_csp.h"
-#include "src/enc/vp8i_enc.h"
-#include "src/utils/random_utils.h"
-#include "src/utils/utils.h"
+#include "src/dsp/cpu.h"
 #include "src/dsp/dsp.h"
 #include "src/dsp/lossless.h"
 #include "src/dsp/yuv.h"
-#include "src/dsp/cpu.h"
+#include "src/enc/vp8i_enc.h"
+#include "src/utils/random_utils.h"
+#include "src/utils/utils.h"
+#include "src/webp/encode.h"
+#include "src/webp/types.h"
 
 #if defined(WEBP_USE_THREAD) && !defined(_WIN32)
 #include <pthread.h>
diff --git a/src/enc/picture_enc.c b/src/enc/picture_enc.c
index d4c8917a..3638e849 100644
--- a/src/enc/picture_enc.c
+++ b/src/enc/picture_enc.c
@@ -14,9 +14,12 @@
 #include <assert.h>
 #include <limits.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "src/enc/vp8i_enc.h"
 #include "src/utils/utils.h"
+#include "src/webp/encode.h"
+#include "src/webp/types.h"
 
 //------------------------------------------------------------------------------
 // WebPPicture
diff --git a/src/enc/picture_psnr_enc.c b/src/enc/picture_psnr_enc.c
index 1a2f0bef..c6bb9b94 100644
--- a/src/enc/picture_psnr_enc.c
+++ b/src/enc/picture_psnr_enc.c
@@ -18,6 +18,7 @@
 #include <math.h>
 #include <stdlib.h>
 
+#include "src/webp/types.h"
 #include "src/dsp/dsp.h"
 #include "src/enc/vp8i_enc.h"
 #include "src/utils/utils.h"
diff --git a/src/enc/picture_rescale_enc.c b/src/enc/picture_rescale_enc.c
index ea90d825..097172bf 100644
--- a/src/enc/picture_rescale_enc.c
+++ b/src/enc/picture_rescale_enc.c
@@ -16,6 +16,8 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include "src/webp/types.h"
+#include "src/dsp/dsp.h"
 #include "src/enc/vp8i_enc.h"
 
 #if !defined(WEBP_REDUCE_SIZE)
diff --git a/src/enc/picture_tools_enc.c b/src/enc/picture_tools_enc.c
index 147cc186..a2ea3630 100644
--- a/src/enc/picture_tools_enc.c
+++ b/src/enc/picture_tools_enc.c
@@ -12,9 +12,14 @@
 // Author: Skal (pascal.massimino@gmail.com)
 
 #include <assert.h>
+#include <stddef.h>
+#include <string.h>
 
-#include "src/enc/vp8i_enc.h"
+#include "src/dsp/dsp.h"
 #include "src/dsp/yuv.h"
+#include "src/enc/vp8i_enc.h"
+#include "src/webp/encode.h"
+#include "src/webp/types.h"
 
 //------------------------------------------------------------------------------
 // Helper: clean up fully transparent area to help compressibility.
diff --git a/src/enc/quant_enc.c b/src/enc/quant_enc.c
index fb30eaf8..4b8cb5e9 100644
--- a/src/enc/quant_enc.c
+++ b/src/enc/quant_enc.c
@@ -14,10 +14,14 @@
 #include <assert.h>
 #include <math.h>
 #include <stdlib.h>  // for abs()
+#include <string.h>
 
+#include "src/dec/common_dec.h"
+#include "src/dsp/dsp.h"
 #include "src/dsp/quant.h"
-#include "src/enc/vp8i_enc.h"
 #include "src/enc/cost_enc.h"
+#include "src/enc/vp8i_enc.h"
+#include "src/webp/types.h"
 
 #define DO_TRELLIS_I4  1
 #define DO_TRELLIS_I16 1   // not a huge gain, but ok at low bitrate.
diff --git a/src/enc/syntax_enc.c b/src/enc/syntax_enc.c
index 7a56a8bc..6edc3c21 100644
--- a/src/enc/syntax_enc.c
+++ b/src/enc/syntax_enc.c
@@ -12,11 +12,16 @@
 // Author: Skal (pascal.massimino@gmail.com)
 
 #include <assert.h>
+#include <stddef.h>
 
+#include "src/dec/common_dec.h"
+#include "src/webp/types.h"
+#include "src/enc/vp8i_enc.h"
+#include "src/utils/bit_writer_utils.h"
 #include "src/utils/utils.h"
+#include "src/webp/encode.h"
 #include "src/webp/format_constants.h"  // RIFF constants
 #include "src/webp/mux_types.h"         // ALPHA_FLAG
-#include "src/enc/vp8i_enc.h"
 
 //------------------------------------------------------------------------------
 // Helper functions
@@ -389,4 +394,3 @@ int VP8EncWrite(VP8Encoder* const enc) {
 }
 
 //------------------------------------------------------------------------------
-
diff --git a/src/enc/token_enc.c b/src/enc/token_enc.c
index 9534491c..9c8b8ee9 100644
--- a/src/enc/token_enc.c
+++ b/src/enc/token_enc.c
@@ -20,9 +20,13 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "src/dec/common_dec.h"
+#include "src/dsp/dsp.h"
 #include "src/enc/cost_enc.h"
 #include "src/enc/vp8i_enc.h"
+#include "src/utils/bit_writer_utils.h"
 #include "src/utils/utils.h"
+#include "src/webp/types.h"
 
 #if !defined(DISABLE_TOKEN_BUFFER)
 
@@ -259,4 +263,3 @@ void VP8TBufferClear(VP8TBuffer* const b) {
 }
 
 #endif    // !DISABLE_TOKEN_BUFFER
-
diff --git a/src/enc/tree_enc.c b/src/enc/tree_enc.c
index 755575a6..f6dbb25f 100644
--- a/src/enc/tree_enc.c
+++ b/src/enc/tree_enc.c
@@ -11,7 +11,12 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
+#include <string.h>
+
+#include "src/dec/common_dec.h"
+#include "src/webp/types.h"
 #include "src/enc/vp8i_enc.h"
+#include "src/utils/bit_writer_utils.h"
 
 //------------------------------------------------------------------------------
 // Default probabilities
@@ -501,4 +506,3 @@ void VP8WriteProbas(VP8BitWriter* const bw, const VP8EncProba* const probas) {
     VP8PutBits(bw, probas->skip_proba, 8);
   }
 }
-
diff --git a/src/enc/vp8i_enc.h b/src/enc/vp8i_enc.h
index 5cb3b4a5..8c186079 100644
--- a/src/enc/vp8i_enc.h
+++ b/src/enc/vp8i_enc.h
@@ -15,6 +15,7 @@
 #define WEBP_ENC_VP8I_ENC_H_
 
 #include <string.h>     // for memcpy()
+
 #include "src/dec/common_dec.h"
 #include "src/dsp/cpu.h"
 #include "src/dsp/dsp.h"
@@ -22,6 +23,7 @@
 #include "src/utils/thread_utils.h"
 #include "src/utils/utils.h"
 #include "src/webp/encode.h"
+#include "src/webp/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/enc/vp8li_enc.h b/src/enc/vp8li_enc.h
index 36b4e93a..9193fe01 100644
--- a/src/enc/vp8li_enc.h
+++ b/src/enc/vp8li_enc.h
@@ -17,12 +17,16 @@
 #ifdef HAVE_CONFIG_H
 #include "src/webp/config.h"
 #endif
+
+#include <stddef.h>
+
 // Either WEBP_NEAR_LOSSLESS is defined as 0 in config.h when compiling to
 // disable near-lossless, or it is enabled by default.
 #ifndef WEBP_NEAR_LOSSLESS
 #define WEBP_NEAR_LOSSLESS 1
 #endif
 
+#include "src/webp/types.h"
 #include "src/enc/backward_references_enc.h"
 #include "src/enc/histogram_enc.h"
 #include "src/utils/bit_writer_utils.h"
diff --git a/src/enc/webp_enc.c b/src/enc/webp_enc.c
index 10b11e11..1e7ee67c 100644
--- a/src/enc/webp_enc.c
+++ b/src/enc/webp_enc.c
@@ -12,14 +12,18 @@
 // Author: Skal (pascal.massimino@gmail.com)
 
 #include <assert.h>
+#include <math.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
 
+#include "src/dec/common_dec.h"
+#include "src/webp/types.h"
+#include "src/dsp/dsp.h"
 #include "src/enc/cost_enc.h"
 #include "src/enc/vp8i_enc.h"
 #include "src/enc/vp8li_enc.h"
 #include "src/utils/utils.h"
+#include "src/webp/encode.h"
 
 // #define PRINT_MEMORY_INFO
 
diff --git a/src/mux/anim_encode.c b/src/mux/anim_encode.c
index 031c7668..baf4f816 100644
--- a/src/mux/anim_encode.c
+++ b/src/mux/anim_encode.c
@@ -15,6 +15,7 @@
 #include <math.h>    // for pow()
 #include <stdio.h>
 #include <stdlib.h>  // for abs()
+#include <string.h>
 
 #include "src/mux/animi.h"
 #include "src/utils/utils.h"
@@ -22,6 +23,7 @@
 #include "src/webp/encode.h"
 #include "src/webp/format_constants.h"
 #include "src/webp/mux.h"
+#include "src/webp/mux_types.h"
 #include "src/webp/types.h"
 
 #if defined(_MSC_VER) && _MSC_VER < 1900
diff --git a/src/mux/muxedit.c b/src/mux/muxedit.c
index 0007e50e..09a8acab 100644
--- a/src/mux/muxedit.c
+++ b/src/mux/muxedit.c
@@ -13,8 +13,16 @@
 //          Vikas (vikasa@google.com)
 
 #include <assert.h>
+#include <stddef.h>
+#include <string.h>
+
+#include "src/dec/vp8_dec.h"
 #include "src/mux/muxi.h"
 #include "src/utils/utils.h"
+#include "src/webp/format_constants.h"
+#include "src/webp/mux.h"
+#include "src/webp/mux_types.h"
+#include "src/webp/types.h"
 
 //------------------------------------------------------------------------------
 // Life of a mux object.
diff --git a/src/mux/muxi.h b/src/mux/muxi.h
index 0058c05a..b0c10af7 100644
--- a/src/mux/muxi.h
+++ b/src/mux/muxi.h
@@ -16,9 +16,13 @@
 
 #include <assert.h>
 #include <stdlib.h>
+
 #include "src/dec/vp8i_dec.h"
 #include "src/dec/vp8li_dec.h"
+#include "src/webp/format_constants.h"
 #include "src/webp/mux.h"
+#include "src/webp/mux_types.h"
+#include "src/webp/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/mux/muxinternal.c b/src/mux/muxinternal.c
index 708becf6..4460e064 100644
--- a/src/mux/muxinternal.c
+++ b/src/mux/muxinternal.c
@@ -13,8 +13,15 @@
 //          Vikas (vikasa@google.com)
 
 #include <assert.h>
+#include <stddef.h>
+#include <string.h>
+
 #include "src/mux/muxi.h"
+#include "src/webp/types.h"
 #include "src/utils/utils.h"
+#include "src/webp/format_constants.h"
+#include "src/webp/mux.h"
+#include "src/webp/mux_types.h"
 
 #define UNDEFINED_CHUNK_SIZE ((uint32_t)(-1))
 
@@ -546,4 +553,3 @@ WebPMuxError MuxValidate(const WebPMux* const mux) {
 #undef NO_FLAG
 
 //------------------------------------------------------------------------------
-
diff --git a/src/mux/muxread.c b/src/mux/muxread.c
index 9a7ba7c6..b778070f 100644
--- a/src/mux/muxread.c
+++ b/src/mux/muxread.c
@@ -13,8 +13,15 @@
 //          Vikas (vikasa@google.com)
 
 #include <assert.h>
+#include <stddef.h>
+
+#include "src/dec/vp8_dec.h"
 #include "src/mux/muxi.h"
 #include "src/utils/utils.h"
+#include "src/webp/format_constants.h"
+#include "src/webp/mux.h"
+#include "src/webp/mux_types.h"
+#include "src/webp/types.h"
 
 //------------------------------------------------------------------------------
 // Helper method(s).
diff --git a/src/utils/bit_reader_inl_utils.h b/src/utils/bit_reader_inl_utils.h
index d2ffd392..8179c2fa 100644
--- a/src/utils/bit_reader_inl_utils.h
+++ b/src/utils/bit_reader_inl_utils.h
@@ -20,12 +20,15 @@
 #include "src/webp/config.h"
 #endif
 
+#include <assert.h>
 #include <string.h>  // for memcpy
 
+#include "src/dsp/cpu.h"
 #include "src/dsp/dsp.h"
 #include "src/utils/bit_reader_utils.h"
 #include "src/utils/endian_inl_utils.h"
 #include "src/utils/utils.h"
+#include "src/webp/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/utils/bit_reader_utils.c b/src/utils/bit_reader_utils.c
index 5d4ea0b3..ec9a2341 100644
--- a/src/utils/bit_reader_utils.c
+++ b/src/utils/bit_reader_utils.c
@@ -15,10 +15,14 @@
 #include "src/webp/config.h"
 #endif
 
+#include <assert.h>
 #include <stddef.h>
 
+#include "src/webp/types.h"
 #include "src/dsp/cpu.h"
 #include "src/utils/bit_reader_inl_utils.h"
+#include "src/utils/bit_reader_utils.h"
+#include "src/utils/endian_inl_utils.h"
 #include "src/utils/utils.h"
 
 //------------------------------------------------------------------------------
diff --git a/src/utils/bit_reader_utils.h b/src/utils/bit_reader_utils.h
index c7b0e5eb..ddce8606 100644
--- a/src/utils/bit_reader_utils.h
+++ b/src/utils/bit_reader_utils.h
@@ -16,6 +16,8 @@
 #define WEBP_UTILS_BIT_READER_UTILS_H_
 
 #include <assert.h>
+#include <stddef.h>
+
 #ifdef _MSC_VER
 #include <stdlib.h>  // _byteswap_ulong
 #endif
diff --git a/src/utils/bit_writer_utils.c b/src/utils/bit_writer_utils.c
index 7c775333..12cee6e8 100644
--- a/src/utils/bit_writer_utils.c
+++ b/src/utils/bit_writer_utils.c
@@ -13,10 +13,11 @@
 //         Vikas Arora (vikaas.arora@gmail.com)
 
 #include <assert.h>
-#include <string.h>   // for memcpy()
 #include <stdlib.h>
+#include <string.h>   // for memcpy()
 
 #include "src/utils/bit_writer_utils.h"
+#include "src/webp/types.h"
 #include "src/utils/endian_inl_utils.h"
 #include "src/utils/utils.h"
 
diff --git a/src/utils/bit_writer_utils.h b/src/utils/bit_writer_utils.h
index 47236d8f..48a7bdbf 100644
--- a/src/utils/bit_writer_utils.h
+++ b/src/utils/bit_writer_utils.h
@@ -14,6 +14,8 @@
 #ifndef WEBP_UTILS_BIT_WRITER_UTILS_H_
 #define WEBP_UTILS_BIT_WRITER_UTILS_H_
 
+#include <stddef.h>
+
 #include "src/webp/types.h"
 
 #ifdef __cplusplus
diff --git a/src/utils/color_cache_utils.c b/src/utils/color_cache_utils.c
index 6989f587..cd8be1f7 100644
--- a/src/utils/color_cache_utils.c
+++ b/src/utils/color_cache_utils.c
@@ -14,7 +14,9 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "src/utils/color_cache_utils.h"
+#include "src/webp/types.h"
 #include "src/utils/utils.h"
 
 //------------------------------------------------------------------------------
diff --git a/src/utils/color_cache_utils.h b/src/utils/color_cache_utils.h
index f546569e..ac8d9815 100644
--- a/src/utils/color_cache_utils.h
+++ b/src/utils/color_cache_utils.h
@@ -17,6 +17,7 @@
 
 #include <assert.h>
 
+#include "src/dsp/cpu.h"
 #include "src/dsp/dsp.h"
 #include "src/webp/types.h"
 
diff --git a/src/utils/filters_utils.c b/src/utils/filters_utils.c
index bbc2c34d..9286d371 100644
--- a/src/utils/filters_utils.c
+++ b/src/utils/filters_utils.c
@@ -11,10 +11,13 @@
 //
 // Author: Urvang (urvang@google.com)
 
-#include "src/utils/filters_utils.h"
 #include <stdlib.h>
 #include <string.h>
 
+#include "src/dsp/dsp.h"
+#include "src/webp/types.h"
+#include "src/utils/filters_utils.h"
+
 // -----------------------------------------------------------------------------
 // Quick estimate of a potentially interesting filter mode to try.
 
diff --git a/src/utils/filters_utils.h b/src/utils/filters_utils.h
index 61da66e2..8e9418df 100644
--- a/src/utils/filters_utils.h
+++ b/src/utils/filters_utils.h
@@ -14,8 +14,8 @@
 #ifndef WEBP_UTILS_FILTERS_UTILS_H_
 #define WEBP_UTILS_FILTERS_UTILS_H_
 
-#include "src/webp/types.h"
 #include "src/dsp/dsp.h"
+#include "src/webp/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/utils/huffman_encode_utils.c b/src/utils/huffman_encode_utils.c
index 915c3bc9..1710063f 100644
--- a/src/utils/huffman_encode_utils.c
+++ b/src/utils/huffman_encode_utils.c
@@ -14,7 +14,9 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "src/utils/huffman_encode_utils.h"
+#include "src/webp/types.h"
 #include "src/utils/utils.h"
 #include "src/webp/format_constants.h"
 
diff --git a/src/utils/huffman_utils.c b/src/utils/huffman_utils.c
index 16f9faaa..b3f93a0f 100644
--- a/src/utils/huffman_utils.c
+++ b/src/utils/huffman_utils.c
@@ -14,9 +14,11 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "src/utils/huffman_utils.h"
 #include "src/utils/utils.h"
 #include "src/webp/format_constants.h"
+#include "src/webp/types.h"
 
 // Huffman data read via DecodeImageStream is represented in two (red and green)
 // bytes.
diff --git a/src/utils/huffman_utils.h b/src/utils/huffman_utils.h
index d511dc05..5e19a7e2 100644
--- a/src/utils/huffman_utils.h
+++ b/src/utils/huffman_utils.h
@@ -15,6 +15,7 @@
 #define WEBP_UTILS_HUFFMAN_UTILS_H_
 
 #include <assert.h>
+
 #include "src/webp/format_constants.h"
 #include "src/webp/types.h"
 
diff --git a/src/utils/palette.c b/src/utils/palette.c
index 8ae0a5cd..6251db19 100644
--- a/src/utils/palette.c
+++ b/src/utils/palette.c
@@ -15,12 +15,14 @@
 
 #include <assert.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "src/dsp/lossless_common.h"
 #include "src/utils/color_cache_utils.h"
 #include "src/utils/utils.h"
 #include "src/webp/encode.h"
 #include "src/webp/format_constants.h"
+#include "src/webp/types.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/src/utils/quant_levels_dec_utils.c b/src/utils/quant_levels_dec_utils.c
index 8336108d..b42aa1b3 100644
--- a/src/utils/quant_levels_dec_utils.c
+++ b/src/utils/quant_levels_dec_utils.c
@@ -19,6 +19,7 @@
 #include <string.h>   // for memset
 
 #include "src/utils/utils.h"
+#include "src/webp/types.h"
 
 // #define USE_DITHERING   // uncomment to enable ordered dithering (not vital)
 
diff --git a/src/utils/quant_levels_utils.c b/src/utils/quant_levels_utils.c
index d65ad3c2..549417e0 100644
--- a/src/utils/quant_levels_utils.c
+++ b/src/utils/quant_levels_utils.c
@@ -13,7 +13,9 @@
 // Author: Skal (pascal.massimino@gmail.com)
 
 #include <assert.h>
+#include <stddef.h>
 
+#include "src/webp/types.h"
 #include "src/utils/quant_levels_utils.h"
 
 #define NUM_SYMBOLS     256
@@ -137,4 +139,3 @@ int QuantizeLevels(uint8_t* const data, int width, int height,
 
   return 1;
 }
-
diff --git a/src/utils/random_utils.c b/src/utils/random_utils.c
index 3d2383c5..56380610 100644
--- a/src/utils/random_utils.c
+++ b/src/utils/random_utils.c
@@ -12,6 +12,8 @@
 // Author: Skal (pascal.massimino@gmail.com)
 
 #include <string.h>
+
+#include "src/webp/types.h"
 #include "src/utils/random_utils.h"
 
 //------------------------------------------------------------------------------
@@ -40,4 +42,3 @@ void VP8InitRandom(VP8Random* const rg, float dithering) {
 }
 
 //------------------------------------------------------------------------------
-
diff --git a/src/utils/random_utils.h b/src/utils/random_utils.h
index 1e8622e2..2fbb2002 100644
--- a/src/utils/random_utils.h
+++ b/src/utils/random_utils.h
@@ -15,6 +15,7 @@
 #define WEBP_UTILS_RANDOM_UTILS_H_
 
 #include <assert.h>
+
 #include "src/webp/types.h"
 
 #ifdef __cplusplus
diff --git a/src/utils/rescaler_utils.c b/src/utils/rescaler_utils.c
index a0581a14..32dd0af2 100644
--- a/src/utils/rescaler_utils.c
+++ b/src/utils/rescaler_utils.c
@@ -15,7 +15,9 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "src/dsp/dsp.h"
+#include "src/webp/types.h"
 #include "src/utils/rescaler_utils.h"
 #include "src/utils/utils.h"
 
diff --git a/src/utils/thread_utils.c b/src/utils/thread_utils.c
index b284a1b5..d61a0bb7 100644
--- a/src/utils/thread_utils.c
+++ b/src/utils/thread_utils.c
@@ -13,6 +13,7 @@
 
 #include <assert.h>
 #include <string.h>   // for memset()
+
 #include "src/utils/thread_utils.h"
 #include "src/utils/utils.h"
 
diff --git a/src/utils/utils.c b/src/utils/utils.c
index 6d2f5a4e..b80bae01 100644
--- a/src/utils/utils.c
+++ b/src/utils/utils.c
@@ -13,9 +13,11 @@
 
 #include "src/utils/utils.h"
 
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>  // for memcpy()
 
+#include "src/webp/types.h"
 #include "src/utils/palette.h"
 #include "src/webp/encode.h"
 
diff --git a/src/webp/decode.h b/src/webp/decode.h
index b95cd10b..1f0d0c22 100644
--- a/src/webp/decode.h
+++ b/src/webp/decode.h
@@ -14,6 +14,8 @@
 #ifndef WEBP_WEBP_DECODE_H_
 #define WEBP_WEBP_DECODE_H_
 
+#include <stddef.h>
+
 #include "./types.h"
 
 #ifdef __cplusplus
diff --git a/src/webp/demux.h b/src/webp/demux.h
index 8d246550..0f5bc2b8 100644
--- a/src/webp/demux.h
+++ b/src/webp/demux.h
@@ -48,6 +48,8 @@
 #ifndef WEBP_WEBP_DEMUX_H_
 #define WEBP_WEBP_DEMUX_H_
 
+#include <stddef.h>
+
 #include "./decode.h"     // for WEBP_CSP_MODE
 #include "./mux_types.h"
 #include "./types.h"
diff --git a/src/webp/encode.h b/src/webp/encode.h
index 8b59351e..ed493932 100644
--- a/src/webp/encode.h
+++ b/src/webp/encode.h
@@ -14,6 +14,8 @@
 #ifndef WEBP_WEBP_ENCODE_H_
 #define WEBP_WEBP_ENCODE_H_
 
+#include <stddef.h>
+
 #include "./types.h"
 
 #ifdef __cplusplus
diff --git a/src/webp/mux_types.h b/src/webp/mux_types.h
index c585d208..c1bbad39 100644
--- a/src/webp/mux_types.h
+++ b/src/webp/mux_types.h
@@ -15,6 +15,7 @@
 #define WEBP_WEBP_MUX_TYPES_H_
 
 #include <string.h>  // memset()
+
 #include "./types.h"
 
 #ifdef __cplusplus
diff --git a/src/webp/types.h b/src/webp/types.h
index a0363f1c..549a0a7d 100644
--- a/src/webp/types.h
+++ b/src/webp/types.h
@@ -14,10 +14,10 @@
 #ifndef WEBP_WEBP_TYPES_H_
 #define WEBP_WEBP_TYPES_H_
 
-#include <stddef.h>  // for size_t
+#include <stddef.h>  // IWYU pragma: export for size_t
 
 #ifndef _MSC_VER
-#include <inttypes.h>
+#include <inttypes.h>  // IWYU pragma: export
 #if defined(__cplusplus) || !defined(__STRICT_ANSI__) || \
     (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 #define WEBP_INLINE inline
diff --git a/swig/libwebp_go_wrap.c b/swig/libwebp_go_wrap.c
index 351d523f..eb531b74 100644
--- a/swig/libwebp_go_wrap.c
+++ b/swig/libwebp_go_wrap.c
@@ -195,6 +195,7 @@ static _gostring_ _swig_makegostring(const char *p, size_t l) {
 
 
 #include "webp/decode.h"
+#include "src/webp/types.h"
 #include "webp/encode.h"
 
 #ifdef __cplusplus
diff --git a/swig/libwebp_python_wrap.c b/swig/libwebp_python_wrap.c
index 3aa27285..8c32fd13 100644
--- a/swig/libwebp_python_wrap.c
+++ b/swig/libwebp_python_wrap.c
@@ -327,6 +327,9 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
 #endif
 
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <assert.h>
 #include <string.h>
 
 #ifdef __cplusplus
@@ -3381,6 +3384,7 @@ SWIG_AsVal_size_t (PyObject * obj, size_t *val)
 
 
 #include "webp/decode.h"
+#include "src/webp/types.h"
 #include "webp/encode.h"
 
 
diff --git a/tests/fuzzer/animencoder_fuzzer.cc b/tests/fuzzer/animencoder_fuzzer.cc
index 85b603a4..6288e030 100644
--- a/tests/fuzzer/animencoder_fuzzer.cc
+++ b/tests/fuzzer/animencoder_fuzzer.cc
@@ -59,7 +59,7 @@ int AddFrame(WebPAnimEncoder** const enc,
   if (enc == nullptr || width == nullptr || height == nullptr) {
     fprintf(stderr, "NULL parameters.\n");
     if (enc != nullptr) WebPAnimEncoderDelete(*enc);
-    abort();
+    std::abort();
   }
 
   // Init the source picture.
@@ -74,7 +74,7 @@ int AddFrame(WebPAnimEncoder** const enc,
       if (error_code == VP8_ENC_ERROR_OUT_OF_MEMORY) return 0;
       fprintf(stderr, "ExtractAndCropOrScale failed. Error code: %d\n",
               error_code);
-      abort();
+      std::abort();
     }
   } else {  // Other frames will be resized to the first frame's dimensions.
     if (!WebPPictureRescale(&pic, *width, *height)) {
@@ -85,7 +85,7 @@ int AddFrame(WebPAnimEncoder** const enc,
       fprintf(stderr,
               "WebPPictureRescale failed. Size: %d,%d. Error code: %d\n",
               *width, *height, error_code);
-      abort();
+      std::abort();
     }
   }
 
@@ -124,7 +124,7 @@ int AddFrame(WebPAnimEncoder** const enc,
       return 0;
     }
     fprintf(stderr, "WebPEncode failed. Error code: %d\n", error_code);
-    abort();
+    std::abort();
   }
 
   WebPPictureFree(&pic);
@@ -147,7 +147,7 @@ void AnimEncoderTest(std::string_view blob, bool minimize_size,
   WebPAnimEncoderOptions anim_config;
   if (!WebPAnimEncoderOptionsInit(&anim_config)) {
     fprintf(stderr, "WebPAnimEncoderOptionsInit failed.\n");
-    abort();
+    std::abort();
   }
   anim_config.minimize_size = minimize_size;
   anim_config.kmin = kmin_kmax.first;
@@ -170,7 +170,7 @@ void AnimEncoderTest(std::string_view blob, bool minimize_size,
     fprintf(stderr, "Last WebPAnimEncoderAdd failed: %s.\n",
             WebPAnimEncoderGetError(enc));
     WebPAnimEncoderDelete(enc);
-    abort();
+    std::abort();
   }
   WebPData webp_data;
   WebPDataInit(&webp_data);
@@ -182,7 +182,7 @@ void AnimEncoderTest(std::string_view blob, bool minimize_size,
             WebPAnimEncoderGetError(enc));
     WebPAnimEncoderDelete(enc);
     WebPDataClear(&webp_data);
-    abort();
+    std::abort();
   }
 
   WebPAnimEncoderDelete(enc);
diff --git a/tests/fuzzer/dec_fuzzer.cc b/tests/fuzzer/dec_fuzzer.cc
index b91c7ef3..4adbdfa3 100644
--- a/tests/fuzzer/dec_fuzzer.cc
+++ b/tests/fuzzer/dec_fuzzer.cc
@@ -16,6 +16,7 @@
 
 #include <cstdint>
 #include <cstdio>
+#include <cstdlib>
 #include <string_view>
 
 #include "src/webp/decode.h"
@@ -27,7 +28,7 @@ void DecodeWebP(std::string_view arbitrary_bytes) {
   WebPDecoderConfig decoder_config;
   if (!WebPInitDecoderConfig(&decoder_config)) {
     fprintf(stderr, "WebPInitDecoderConfig failed.\n");
-    abort();
+    std::abort();
   }
   const VP8StatusCode status =
       WebPDecode(reinterpret_cast<const uint8_t*>(arbitrary_bytes.data()),
@@ -36,7 +37,7 @@ void DecodeWebP(std::string_view arbitrary_bytes) {
   // The decoding may fail (because the fuzzed input can be anything) but not
   // for these reasons.
   if (status == VP8_STATUS_SUSPENDED || status == VP8_STATUS_USER_ABORT) {
-    abort();
+    std::abort();
   }
 }
 
diff --git a/tests/fuzzer/enc_dec_fuzzer.cc b/tests/fuzzer/enc_dec_fuzzer.cc
index c6769aef..401955ac 100644
--- a/tests/fuzzer/enc_dec_fuzzer.cc
+++ b/tests/fuzzer/enc_dec_fuzzer.cc
@@ -17,6 +17,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <cstdio>
+#include <cstdlib>
 
 #include "./fuzz_utils.h"
 #include "src/dsp/cpu.h"
@@ -42,7 +43,7 @@ void EncDecTest(bool use_argb, int source_image_index, WebPConfig config,
     if (error_code == VP8_ENC_ERROR_OUT_OF_MEMORY) return;
     fprintf(stderr, "ExtractAndCropOrScale failed. Error code: %d\n",
             error_code);
-    abort();
+    std::abort();
   }
 
   // Skip slow settings on big images, it's likely to timeout.
@@ -76,7 +77,7 @@ void EncDecTest(bool use_argb, int source_image_index, WebPConfig config,
       return;
     }
     fprintf(stderr, "WebPEncode failed. Error code: %d\n", error_code);
-    abort();
+    std::abort();
   }
 
   // Try decoding the result.
@@ -87,7 +88,7 @@ void EncDecTest(bool use_argb, int source_image_index, WebPConfig config,
     fprintf(stderr, "WebPInitDecoderConfig failed.\n");
     WebPMemoryWriterClear(&memory_writer);
     WebPPictureFree(&pic);
-    abort();
+    std::abort();
   }
 
   dec_config.output.colorspace = MODE_BGRA;
@@ -100,7 +101,7 @@ void EncDecTest(bool use_argb, int source_image_index, WebPConfig config,
     WebPFreeDecBuffer(&dec_config.output);
     WebPMemoryWriterClear(&memory_writer);
     WebPPictureFree(&pic);
-    abort();
+    std::abort();
   }
 
   if (status == VP8_STATUS_OK) {
@@ -127,7 +128,7 @@ void EncDecTest(bool use_argb, int source_image_index, WebPConfig config,
             WebPFreeDecBuffer(&dec_config.output);
             WebPMemoryWriterClear(&memory_writer);
             WebPPictureFree(&pic);
-            abort();
+            std::abort();
           }
         }
       }
diff --git a/tests/fuzzer/enc_fuzzer.cc b/tests/fuzzer/enc_fuzzer.cc
index 52de0b6e..bb9c27f5 100644
--- a/tests/fuzzer/enc_fuzzer.cc
+++ b/tests/fuzzer/enc_fuzzer.cc
@@ -17,6 +17,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <cstdlib>
+#include <cstdlib>
 #include <iostream>
 #include <string>
 #include <string_view>
@@ -41,7 +42,7 @@ void EncTest(std::string_view file, uint32_t optimization_index, bool use_argb,
   WebPPicture pic;
   if (!WebPPictureInit(&pic)) {
     std::cerr << "WebPPictureInit failed.\n";
-    abort();
+    std::abort();
   }
   pic.use_argb = use_argb;
 
@@ -57,7 +58,7 @@ void EncTest(std::string_view file, uint32_t optimization_index, bool use_argb,
     WebPPictureFree(&pic);
     if (error_code == VP8_ENC_ERROR_OUT_OF_MEMORY) return;
     std::cerr << "CropOrScale failed. Error code: " << error_code << "\n";
-    abort();
+    std::abort();
   }
 
   // Skip the cruncher except on small images, it's likely to timeout.
@@ -78,7 +79,7 @@ void EncTest(std::string_view file, uint32_t optimization_index, bool use_argb,
     if (error_code == VP8_ENC_ERROR_OUT_OF_MEMORY) return;
     std::cerr << "WebPEncode failed. Error code: " << error_code
               << " \nFile starts with: " << file.substr(0, 20) << "\n";
-    abort();
+    std::abort();
   }
 
   // Try decoding the result.
@@ -92,7 +93,7 @@ void EncTest(std::string_view file, uint32_t optimization_index, bool use_argb,
     WebPFree(rgba);
     WebPMemoryWriterClear(&memory_writer);
     WebPPictureFree(&pic);
-    abort();
+    std::abort();
   }
 
   // Compare the results if exact encoding.
@@ -117,7 +118,7 @@ void EncTest(std::string_view file, uint32_t optimization_index, bool use_argb,
           WebPFree(rgba);
           WebPMemoryWriterClear(&memory_writer);
           WebPPictureFree(&pic);
-          abort();
+          std::abort();
         }
       }
     }
diff --git a/tests/fuzzer/fuzz_utils.cc b/tests/fuzzer/fuzz_utils.cc
index f0941b08..818e7e41 100644
--- a/tests/fuzzer/fuzz_utils.cc
+++ b/tests/fuzzer/fuzz_utils.cc
@@ -21,8 +21,6 @@
 #include <cstddef>
 #include <cstdint>
 #include <cstdlib>
-#include <fstream>
-#include <iostream>
 #include <string>
 #include <string_view>
 #include <tuple>
@@ -40,7 +38,7 @@ namespace fuzz_utils {
 
 WebPPicture GetSourcePicture(int image_index, bool use_argb) {
   WebPPicture pic;
-  if (!WebPPictureInit(&pic)) abort();
+  if (!WebPPictureInit(&pic)) std::abort();
   pic.use_argb = use_argb;
 
   // Pick a source picture.
@@ -52,7 +50,7 @@ WebPPicture GetSourcePicture(int image_index, bool use_argb) {
   pic.argb_stride = pic.width * 4 * sizeof(uint8_t);
 
   // Read the bytes.
-  if (!WebPPictureImportRGBA(&pic, image_data, pic.argb_stride)) abort();
+  if (!WebPPictureImportRGBA(&pic, image_data, pic.argb_stride)) std::abort();
   return pic;
 }
 
diff --git a/tests/fuzzer/fuzz_utils.h b/tests/fuzzer/fuzz_utils.h
index 1d92a077..7cff43e1 100644
--- a/tests/fuzzer/fuzz_utils.h
+++ b/tests/fuzzer/fuzz_utils.h
@@ -29,9 +29,10 @@
 #include "./img_alpha.h"
 #include "./img_grid.h"
 #include "./img_peak.h"
+#include "fuzztest/fuzztest.h"
 #include "src/dsp/cpu.h"
 #include "src/webp/encode.h"
-#include "fuzztest/fuzztest.h"
+#include "src/webp/types.h"
 
 namespace fuzz_utils {
 
diff --git a/tests/fuzzer/huffman_fuzzer.cc b/tests/fuzzer/huffman_fuzzer.cc
index 6531573a..5b43795d 100644
--- a/tests/fuzzer/huffman_fuzzer.cc
+++ b/tests/fuzzer/huffman_fuzzer.cc
@@ -16,6 +16,7 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <cstring>
 #include <string_view>
 
 #include "./fuzz_utils.h"
diff --git a/tests/fuzzer/imageio_fuzzer.cc b/tests/fuzzer/imageio_fuzzer.cc
index 600c78a2..edb67d13 100644
--- a/tests/fuzzer/imageio_fuzzer.cc
+++ b/tests/fuzzer/imageio_fuzzer.cc
@@ -34,7 +34,7 @@ void TestReader(const uint8_t *data, size_t size, WebPImageReader reader,
   WebPPicture pic;
   if (!WebPPictureInit(&pic)) {
     std::cerr << "WebPPictureInit failed" << std::endl;
-    abort();
+    std::abort();
   }
   Metadata metadata;
   MetadataInit(&metadata);
diff --git a/tests/fuzzer/mux_demux_api_fuzzer.cc b/tests/fuzzer/mux_demux_api_fuzzer.cc
index 9d7307dd..24f0e170 100644
--- a/tests/fuzzer/mux_demux_api_fuzzer.cc
+++ b/tests/fuzzer/mux_demux_api_fuzzer.cc
@@ -21,6 +21,7 @@
 #include "./fuzz_utils.h"
 #include "src/webp/demux.h"
 #include "src/webp/mux.h"
+#include "src/webp/mux_types.h"
 
 namespace {
 
diff --git a/tests/fuzzer/simple_api_fuzzer.cc b/tests/fuzzer/simple_api_fuzzer.cc
index 3d1b5c3b..a8e0b491 100644
--- a/tests/fuzzer/simple_api_fuzzer.cc
+++ b/tests/fuzzer/simple_api_fuzzer.cc
@@ -16,10 +16,12 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <cstdlib>
 #include <string_view>
 
 #include "./fuzz_utils.h"
 #include "src/webp/decode.h"
+#include "src/webp/types.h"
 
 namespace {