examples/anim_diff.c

@@ -22,7 +22,6 @@
 #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

examples/anim_dump.c

@@ -15,11 +15,10 @@
 #include <stdlib.h>
 #include <string.h>  // for 'strcmp'.
 
-#include "../imageio/image_enc.h"
 #include "./anim_util.h"
-#include "./unicode.h"
 #include "webp/decode.h"
-#include "webp/types.h"
+#include "../imageio/image_enc.h"
+#include "./unicode.h"
 
 #if defined(_MSC_VER) && _MSC_VER < 1900
 #define snprintf _snprintf

examples/anim_util.c

@@ -19,16 +19,13 @@
 #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

examples/cwebp.c

@@ -27,10 +27,8 @@
 #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

examples/dwebp.c

@@ -25,8 +25,6 @@
 #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;

examples/example_util.c

@@ -17,9 +17,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../imageio/imageio_util.h"
 #include "webp/mux_types.h"
-#include "webp/types.h"
+#include "../imageio/imageio_util.h"
 
 //------------------------------------------------------------------------------
 // String parsing

examples/gifdec.c

@@ -19,7 +19,6 @@
 #include <string.h>
 
 #include "webp/encode.h"
-#include "webp/types.h"
 #include "webp/mux_types.h"
 
 #define GIF_TRANSPARENT_COLOR 0x00000000u

examples/gifdec.h

@@ -13,7 +13,6 @@
 #define WEBP_EXAMPLES_GIFDEC_H_
 
 #include <stdio.h>
-
 #include "webp/types.h"
 
 #ifdef HAVE_CONFIG_H

examples/img2webp.c

@@ -31,8 +31,6 @@
 #include "sharpyuv/sharpyuv.h"
 #include "webp/encode.h"
 #include "webp/mux.h"
-#include "webp/mux_types.h"
-#include "webp/types.h"
 
 //------------------------------------------------------------------------------
 

examples/webpinfo.c

@@ -15,7 +15,6 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #ifdef HAVE_CONFIG_H
 #include "webp/config.h"
@@ -26,7 +25,6 @@
 #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

examples/webpmux.c

@@ -60,13 +60,11 @@
 #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.

extras/extras.c

@@ -20,7 +20,6 @@
 #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"
 

extras/extras.h

@@ -11,8 +11,6 @@
 #ifndef WEBP_EXTRAS_EXTRAS_H_
 #define WEBP_EXTRAS_EXTRAS_H_
 
-#include <stddef.h>
-
 #include "webp/types.h"
 
 #ifdef __cplusplus

extras/get_disto.c

@@ -23,11 +23,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../examples/unicode.h"
+#include "webp/encode.h"
 #include "imageio/image_dec.h"
 #include "imageio/imageio_util.h"
-#include "src/webp/types.h"
-#include "webp/encode.h"
+#include "../examples/unicode.h"
 
 static size_t ReadPicture(const char* const filename, WebPPicture* const pic,
                           int keep_alpha) {

extras/quality_estimate.c

@@ -11,13 +11,11 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include <math.h>
-#include <stddef.h>
-
 #include "extras/extras.h"
-#include "src/webp/types.h"
 #include "webp/decode.h"
 
+#include <math.h>
+
 //------------------------------------------------------------------------------
 
 #define INVALID_BIT_POS (1ull << 63)

extras/webp_quality.c

@@ -11,10 +11,9 @@
 #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[]) {

imageio/image_dec.c

@@ -9,12 +9,7 @@
 //
 // 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"

imageio/image_dec.h

@@ -14,8 +14,6 @@
 #ifndef WEBP_IMAGEIO_IMAGE_DEC_H_
 #define WEBP_IMAGEIO_IMAGE_DEC_H_
 
-#include <stddef.h>
-
 #include "webp/types.h"
 
 #ifdef HAVE_CONFIG_H

imageio/image_enc.c

@@ -12,7 +12,6 @@
 #include "./image_enc.h"
 
 #include <assert.h>
-#include <stdio.h>
 #include <string.h>
 
 #ifdef WEBP_HAVE_PNG
@@ -35,10 +34,8 @@
 #include <wincodec.h>
 #endif
 
-#include "../examples/unicode.h"
 #include "./imageio_util.h"
-#include "webp/decode.h"
-#include "webp/types.h"
+#include "../examples/unicode.h"
 
 //------------------------------------------------------------------------------
 // PNG

imageio/imageio_util.c

@@ -16,11 +16,8 @@
 #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"
 
 // -----------------------------------------------------------------------------

imageio/imageio_util.h

@@ -14,7 +14,6 @@
 #define WEBP_IMAGEIO_IMAGEIO_UTIL_H_
 
 #include <stdio.h>
-
 #include "webp/types.h"
 
 #ifdef __cplusplus

imageio/jpegdec.c

@@ -24,10 +24,9 @@
 #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

imageio/jpegdec.h

@@ -12,8 +12,6 @@
 #ifndef WEBP_IMAGEIO_JPEGDEC_H_
 #define WEBP_IMAGEIO_JPEGDEC_H_
 
-#include <stddef.h>
-
 #include "webp/types.h"
 
 #ifdef __cplusplus

imageio/metadata.h

@@ -13,8 +13,6 @@
 #ifndef WEBP_IMAGEIO_METADATA_H_
 #define WEBP_IMAGEIO_METADATA_H_
 
-#include <stddef.h>
-
 #include "webp/types.h"
 
 #ifdef __cplusplus

imageio/pngdec.c

@@ -22,15 +22,13 @@
 #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) \

imageio/pngdec.h

@@ -12,8 +12,6 @@
 #ifndef WEBP_IMAGEIO_PNGDEC_H_
 #define WEBP_IMAGEIO_PNGDEC_H_
 
-#include <stddef.h>
-
 #include "webp/types.h"
 
 #ifdef __cplusplus

imageio/pnmdec.c

@@ -17,9 +17,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "./imageio_util.h"
 #include "webp/encode.h"
-#include "webp/types.h"
+#include "./imageio_util.h"
 
 #if defined(_MSC_VER) && _MSC_VER < 1900
 #define snprintf _snprintf

imageio/pnmdec.h

@@ -12,8 +12,6 @@
 #ifndef WEBP_IMAGEIO_PNMDEC_H_
 #define WEBP_IMAGEIO_PNMDEC_H_
 
-#include <stddef.h>
-
 #include "webp/types.h"
 
 #ifdef __cplusplus

imageio/tiffdec.c

@@ -22,10 +22,9 @@
 #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;

imageio/tiffdec.h

@@ -12,8 +12,6 @@
 #ifndef WEBP_IMAGEIO_TIFFDEC_H_
 #define WEBP_IMAGEIO_TIFFDEC_H_
 
-#include <stddef.h>
-
 #include "webp/types.h"
 
 #ifdef __cplusplus

imageio/webpdec.c

@@ -13,19 +13,18 @@
 #include "webp/config.h"
 #endif
 
+#include "./webpdec.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.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"
+#include "../examples/unicode.h"
+#include "./imageio_util.h"
+#include "./metadata.h"
 
 //------------------------------------------------------------------------------
 // WebP decoding

imageio/webpdec.h

@@ -12,10 +12,7 @@
 #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" {

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"
 
 //------------------------------------------------------------------------------
 

sharpyuv/sharpyuv_csp.c

@@ -15,8 +15,6 @@
 #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,

sharpyuv/sharpyuv_dsp.c

@@ -17,7 +17,6 @@
 #include <stdlib.h>
 
 #include "sharpyuv/sharpyuv_cpu.h"
-#include "src/dsp/cpu.h"
 #include "src/webp/types.h"
 
 //-----------------------------------------------------------------------------

sharpyuv/sharpyuv_gamma.c

@@ -15,7 +15,6 @@
 #include <float.h>
 #include <math.h>
 
-#include "sharpyuv/sharpyuv.h"
 #include "src/webp/types.h"
 
 // Gamma correction compensates loss of resolution during chroma subsampling.

sharpyuv/sharpyuv_sse2.c

@@ -14,12 +14,8 @@
 #include "sharpyuv/sharpyuv_dsp.h"
 
 #if defined(WEBP_USE_SSE2)
-#include <emmintrin.h>
-
 #include <stdlib.h>
-
-#include "src/dsp/cpu.h"
-#include "src/webp/types.h"
+#include <emmintrin.h>
 
 static uint16_t clip_SSE2(int v, int max) {
   return (v < 0) ? 0 : (v > max) ? max : (uint16_t)v;

src/dec/alpha_dec.c

@@ -11,18 +11,14 @@
 //
 // 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"
 

src/dec/alphai_dec.h

@@ -14,10 +14,7 @@
 #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

src/dec/buffer_dec.c

@@ -11,16 +11,11 @@
 //
 // 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

src/dec/frame_dec.c

@@ -11,20 +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"
 #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.

src/dec/idec_dec.c

@@ -12,20 +12,15 @@
 // Author: somnath@google.com (Somnath Banerjee)
 
 #include <assert.h>
-#include <stdlib.h>
 #include <string.h>
+#include <stdlib.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.

src/dec/io_dec.c

@@ -14,18 +14,12 @@
 #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

src/dec/quant_dec.c

@@ -11,11 +11,7 @@
 //
 // 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;
@@ -116,3 +112,4 @@ void VP8ParseQuant(VP8Decoder* const dec) {
 }
 
 //------------------------------------------------------------------------------
+

src/dec/tree_dec.c

@@ -11,15 +11,9 @@
 //
 // 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 && \

src/dec/vp8_dec.c

@@ -11,25 +11,14 @@
 //
 // 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"
 
 //------------------------------------------------------------------------------
 

src/dec/vp8_dec.h

@@ -14,8 +14,6 @@
 #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"
 

src/dec/vp8i_dec.h

@@ -15,16 +15,12 @@
 #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/webp/decode.h"
+#include "src/dsp/dsp.h"
 #include "src/webp/types.h"
 
 #ifdef __cplusplus

src/dec/vp8l_dec.c

@@ -15,23 +15,15 @@
 #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
 

src/dec/vp8li_dec.h

@@ -16,15 +16,10 @@
 #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

src/dec/webp_dec.c

@@ -11,9 +11,7 @@
 //
 // 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"
@@ -23,7 +21,6 @@
 #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"
 

src/dec/webpi_dec.h

@@ -18,12 +18,9 @@
 extern "C" {
 #endif
 
-#include <stddef.h>
-
-#include "src/dec/vp8_dec.h"
 #include "src/utils/rescaler_utils.h"
+#include "src/dec/vp8_dec.h"
 #include "src/webp/decode.h"
-#include "src/webp/types.h"
 
 //------------------------------------------------------------------------------
 // WebPDecParams: Decoding output parameters. Transient internal object.

src/demux/anim_decode.c

@@ -20,8 +20,6 @@
 #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

src/demux/demux.c

@@ -22,9 +22,6 @@
 #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
@@ -975,3 +972,4 @@ int WebPDemuxPrevChunk(WebPChunkIterator* iter) {
 void WebPDemuxReleaseChunkIterator(WebPChunkIterator* iter) {
   (void)iter;
 }
+

src/dsp/alpha_processing.c

@@ -12,11 +12,7 @@
 // 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)

src/dsp/alpha_processing_sse2.c

@@ -16,7 +16,6 @@
 #if defined(WEBP_USE_SSE2)
 #include <emmintrin.h>
 
-#include "src/webp/types.h"
 #include "src/dsp/cpu.h"
 
 //------------------------------------------------------------------------------

src/dsp/alpha_processing_sse41.c

@@ -11,12 +11,10 @@
 //
 // 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>
 
 //------------------------------------------------------------------------------

src/dsp/cost.c

@@ -9,15 +9,8 @@
 //
 // 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

src/dsp/cost_sse2.c

@@ -16,10 +16,6 @@
 #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"

src/dsp/cpu.c

@@ -22,10 +22,6 @@
 #include <cpu-features.h>
 #endif
 
-#include <stddef.h>
-
-#include "src/webp/types.h"
-
 //------------------------------------------------------------------------------
 // SSE2 detection.
 //

src/dsp/dec.c

@@ -12,15 +12,10 @@
 // Author: Skal (pascal.massimino@gmail.com)
 
 #include <assert.h>
-#include <stddef.h>
-#include <string.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/dec/vp8i_dec.h"
 #include "src/utils/utils.h"
-#include "src/webp/types.h"
 
 //------------------------------------------------------------------------------
 

src/dsp/dec_clip_tables.c

@@ -11,8 +11,6 @@
 //
 // 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

src/dsp/dec_sse2.c

@@ -23,12 +23,9 @@
 #endif
 
 #include <emmintrin.h>
-
-#include "src/dec/vp8i_dec.h"
 #include "src/dsp/common_sse2.h"
-#include "src/dsp/cpu.h"
+#include "src/dec/vp8i_dec.h"
 #include "src/utils/utils.h"
-#include "src/webp/types.h"
 
 //------------------------------------------------------------------------------
 // Transforms (Paragraph 14.4)

src/dsp/dec_sse41.c

@@ -14,12 +14,9 @@
 #include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE41)
-#include <emmintrin.h>
-#include <smmintrin.h>
 
-#include "src/webp/types.h"
+#include <smmintrin.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

src/dsp/enc.c

@@ -13,13 +13,9 @@
 
 #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;

src/dsp/enc_sse2.c

@@ -14,18 +14,13 @@
 #include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE2)
-#include <emmintrin.h>
-
 #include <assert.h>
 #include <stdlib.h>  // for abs()
-#include <string.h>
+#include <emmintrin.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)

src/dsp/enc_sse41.c

@@ -14,15 +14,11 @@
 #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.

src/dsp/filters.c

@@ -11,14 +11,11 @@
 //
 // 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.
 

src/dsp/filters_sse2.c

@@ -20,9 +20,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "src/dsp/cpu.h"
-#include "src/webp/types.h"
-
 //------------------------------------------------------------------------------
 // Helpful macro.
 

src/dsp/lossless.h

@@ -16,7 +16,6 @@
 #define WEBP_DSP_LOSSLESS_H_
 
 #include "src/dsp/dsp.h"
-#include "src/webp/types.h"
 #include "src/webp/decode.h"
 
 #ifdef __cplusplus

src/dsp/lossless_avx2.c

@@ -15,7 +15,6 @@
 
 #if defined(WEBP_USE_AVX2)
 
-#include <stddef.h>
 #include <immintrin.h>
 
 #include "src/dsp/cpu.h"

src/dsp/lossless_common.h

@@ -16,9 +16,6 @@
 #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"

src/dsp/lossless_enc_avx2.c

@@ -14,11 +14,8 @@
 #include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_AVX2)
-#include <emmintrin.h>
-#include <immintrin.h>
-
 #include <assert.h>
-#include <stddef.h>
+#include <immintrin.h>
 
 #include "src/dsp/cpu.h"
 #include "src/dsp/lossless.h"

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"

src/dsp/lossless_enc_sse41.c

@@ -14,10 +14,9 @@
 #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"

src/dsp/lossless_sse41.c

@@ -12,10 +12,9 @@
 #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"
 

src/dsp/rescaler.c

@@ -12,10 +12,7 @@
 // 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"
 

src/dsp/rescaler_sse2.c

@@ -17,12 +17,8 @@
 #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

src/dsp/ssim.c

@@ -14,9 +14,7 @@
 #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)
 

src/dsp/ssim_sse2.c

@@ -14,13 +14,11 @@
 #include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE2)
-#include <emmintrin.h>
 
 #include <assert.h>
+#include <emmintrin.h>
 
 #include "src/dsp/common_sse2.h"
-#include "src/dsp/cpu.h"
-#include "src/webp/types.h"
 
 #if !defined(WEBP_DISABLE_STATS)
 

src/dsp/upsampling.c

@@ -11,14 +11,10 @@
 //
 // 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 "src/webp/decode.h"
+
+#include <assert.h>
 
 //------------------------------------------------------------------------------
 // Fancy upsampler

src/dsp/upsampling_sse2.c

@@ -14,15 +14,11 @@
 #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
 

src/dsp/upsampling_sse41.c

@@ -14,15 +14,11 @@
 #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
 

src/dsp/yuv.c

@@ -11,15 +11,11 @@
 //
 // 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
 

src/dsp/yuv.h

@@ -35,10 +35,8 @@
 #ifndef WEBP_DSP_YUV_H_
 #define WEBP_DSP_YUV_H_
 
-#include "src/dec/vp8_dec.h"
-#include "src/dsp/cpu.h"
 #include "src/dsp/dsp.h"
-#include "src/webp/types.h"
+#include "src/dec/vp8_dec.h"
 
 //------------------------------------------------------------------------------
 // YUV -> RGB conversion

src/dsp/yuv_neon.c

@@ -18,7 +18,6 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "src/dsp/dsp.h"
 #include "src/dsp/neon.h"
 
 //-----------------------------------------------------------------------------

src/dsp/yuv_sse2.c

@@ -14,16 +14,12 @@
 #include "src/dsp/yuv.h"
 
 #if defined(WEBP_USE_SSE2)
-#include <emmintrin.h>
 
 #include <stdlib.h>
+#include <emmintrin.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.

src/dsp/yuv_sse41.c

@@ -14,17 +14,12 @@
 #include "src/dsp/yuv.h"
 
 #if defined(WEBP_USE_SSE41)
-#include <emmintrin.h>
-#include <smmintrin.h>
 
 #include <stdlib.h>
+#include <smmintrin.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.

src/enc/alpha_enc.c

@@ -15,13 +15,10 @@
 #include <stdlib.h>
 #include <string.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/dsp/dsp.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"

src/enc/analysis_enc.c

@@ -11,17 +11,13 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 
-#include "src/dec/common_dec.h"
-#include "src/dsp/dsp.h"
 #include "src/enc/vp8i_enc.h"
-#include "src/utils/thread_utils.h"
+#include "src/enc/cost_enc.h"
 #include "src/utils/utils.h"
-#include "src/webp/encode.h"
-#include "src/webp/types.h"
 
 #define MAX_ITERS_K_MEANS  6
 
@@ -484,3 +480,4 @@ int VP8EncAnalyze(VP8Encoder* const enc) {
   }
   return ok;
 }
+

src/enc/backward_references_enc.h

@@ -15,10 +15,9 @@
 
 #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" {

src/enc/config_enc.c

@@ -15,10 +15,7 @@
 #include "src/webp/config.h"
 #endif
 
-#include <stddef.h>
-
 #include "src/webp/encode.h"
-#include "src/webp/types.h"
 
 //------------------------------------------------------------------------------
 // WebPConfig

src/enc/cost_enc.c

@@ -11,13 +11,7 @@
 //
 // 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

src/enc/cost_enc.h

@@ -16,11 +16,7 @@
 
 #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" {

src/enc/filter_enc.c

@@ -12,13 +12,8 @@
 // Author: somnath@google.com (Somnath Banerjee)
 
 #include <assert.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"
+#include "src/dsp/dsp.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.

src/enc/frame_enc.c

@@ -11,17 +11,12 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include <assert.h>
-#include <math.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/utils/bit_writer_utils.h"
-#include "src/webp/encode.h"
+#include "src/dsp/dsp.h"
 #include "src/webp/format_constants.h"  // RIFF constants
 
 #define SEGMENT_VISU 0

src/enc/iterator_enc.c

@@ -14,10 +14,7 @@
 #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

src/enc/near_lossless_enc.c

@@ -16,13 +16,10 @@
 
 #include <assert.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "src/dsp/lossless_common.h"
-#include "src/webp/types.h"
-#include "src/enc/vp8li_enc.h"
 #include "src/utils/utils.h"
-#include "src/webp/encode.h"
+#include "src/enc/vp8li_enc.h"
 
 #if (WEBP_NEAR_LOSSLESS == 1)
 

src/enc/picture_csp_enc.c

@@ -12,21 +12,18 @@
 // Author: Skal (pascal.massimino@gmail.com)
 
 #include <assert.h>
-#include <math.h>
 #include <stdlib.h>
-#include <string.h>
+#include <math.h>
 
 #include "sharpyuv/sharpyuv.h"
 #include "sharpyuv/sharpyuv_csp.h"
-#include "src/dsp/cpu.h"
-#include "src/dsp/dsp.h"
-#include "src/dsp/lossless.h"
-#include "src/dsp/yuv.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"
+#include "src/dsp/dsp.h"
+#include "src/dsp/lossless.h"
+#include "src/dsp/yuv.h"
+#include "src/dsp/cpu.h"
 
 #if defined(WEBP_USE_THREAD) && !defined(_WIN32)
 #include <pthread.h>

src/enc/picture_enc.c

@@ -14,12 +14,9 @@
 #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