Be consistent with the includes in non-src folders.

BUG: 470992419 Change-Id: I55618205da7dcfe17d96a7c3ee69d924a63d1acf
2025-12-25 14:29:13 +01:00 · 2025-12-23 12:33:21 +01:00
parent 9b78419750
commit d52b9ee34d
33 changed files with 91 additions and 97 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -349,11 +349,14 @@ endfunction()

 parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/sharpyuv "WEBP_SHARPYUV_SRCS" "")
 add_library(sharpyuv ${WEBP_SHARPYUV_SRCS})
-target_link_libraries(sharpyuv ${SHARPYUV_DEP_LIBRARIES})
+target_link_libraries(sharpyuv PRIVATE ${SHARPYUV_DEP_LIBRARIES})
 set_version(sharpyuv/Makefile.am sharpyuv sharpyuv)
 target_include_directories(
-  sharpyuv PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
-                   ${CMAKE_CURRENT_SOURCE_DIR}/src)
+  sharpyuv
+  PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/webp>
+  PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
+          ${CMAKE_CURRENT_SOURCE_DIR}/src)
 set_target_properties(
  sharpyuv
  PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/sharpyuv/sharpyuv.h;\
@@ -377,12 +380,12 @@ else()
  add_compile_options(-Wall)
 endif()
 include_directories(${WEBP_DEP_INCLUDE_DIRS})
-add_library(webpdecode OBJECT ${WEBP_DEC_SRCS})
-target_include_directories(webpdecode PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
-                                              ${CMAKE_CURRENT_SOURCE_DIR})
 add_library(webpdspdecode OBJECT ${WEBP_DSP_COMMON_SRCS} ${WEBP_DSP_DEC_SRCS})
-target_include_directories(webpdspdecode PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
-                                                 ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(webpdspdecode PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
+                           PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+add_library(webpdecode OBJECT ${WEBP_DEC_SRCS})
+target_link_libraries(webpdecode PRIVATE webpdspdecode)
+target_include_directories(webpdecode PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 add_library(webputilsdecode OBJECT ${WEBP_UTILS_COMMON_SRCS}
                                   ${WEBP_UTILS_DEC_SRCS})
 target_include_directories(webputilsdecode PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
@@ -395,11 +398,9 @@ if(XCODE)
 endif()
 target_link_libraries(webpdecoder ${WEBP_DEP_LIBRARIES})
 target_include_directories(
-  webpdecoder
-  PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
-  INTERFACE
-    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_CURRENT_BINARY_DIR}>"
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+  webpdecoder PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
+  INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
 set_target_properties(
  webpdecoder
  PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/src/webp/decode.h;\
@@ -437,9 +438,9 @@ if(XCODE)
 endif()
 target_link_libraries(webp ${WEBP_DEP_LIBRARIES})
 target_include_directories(
-  webp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
-  PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
-         $<INSTALL_INTERFACE:include>)
+  webp PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+              $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 set_target_properties(
  webp
  PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/src/webp/decode.h;\
@@ -565,8 +566,7 @@ if(WEBP_BUILD_CWEBP)
  parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "CWEBP_SRCS" "cwebp")
  add_executable(cwebp ${CWEBP_SRCS})
  target_link_libraries(cwebp exampleutil imagedec webp)
-  target_include_directories(cwebp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src
-                                           ${CMAKE_CURRENT_SOURCE_DIR})
+  target_include_directories(cwebp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
  install(TARGETS cwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()

@@ -595,8 +595,7 @@ if(WEBP_BUILD_GIF2WEBP)
  add_executable(gif2webp ${GIF2WEBP_SRCS})
  target_link_libraries(gif2webp exampleutil imageioutil webp libwebpmux
                        ${WEBP_DEP_GIF_LIBRARIES})
-  target_include_directories(gif2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src
-                                              ${CMAKE_CURRENT_SOURCE_DIR})
+  target_include_directories(gif2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
  install(TARGETS gif2webp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()

@@ -608,8 +607,7 @@ if(WEBP_BUILD_IMG2WEBP)
  add_executable(img2webp ${IMG2WEBP_SRCS})
  target_link_libraries(img2webp exampleutil imagedec imageioutil webp
                        libwebpmux)
-  target_include_directories(img2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src
-                                              ${CMAKE_CURRENT_SOURCE_DIR})
+  target_include_directories(img2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
  install(TARGETS img2webp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()

@@ -648,8 +646,7 @@ if(WEBP_BUILD_WEBPINFO)
                    "webpinfo")
  add_executable(webpinfo ${WEBPINFO_SRCS})
  target_link_libraries(webpinfo exampleutil imageioutil)
-  target_include_directories(webpinfo PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src
-                                              ${CMAKE_CURRENT_SOURCE_DIR}/src)
+  target_include_directories(webpinfo PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
  install(TARGETS webpinfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()

@@ -672,30 +669,25 @@ if(WEBP_BUILD_EXTRAS)

  # libextras
  add_library(extras STATIC ${WEBP_EXTRAS_SRCS})
-  target_include_directories(
-    extras PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
-                   ${CMAKE_CURRENT_SOURCE_DIR}/src)
+  target_link_libraries(extras PUBLIC webp PRIVATE webpdspdecode)

  # get_disto
  add_executable(get_disto ${GET_DISTO_SRCS})
  target_link_libraries(get_disto imagedec)
-  target_include_directories(get_disto PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
-                                               ${CMAKE_CURRENT_BINARY_DIR}/src)
+  target_include_directories(get_disto PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)

  # webp_quality
  add_executable(webp_quality ${WEBP_QUALITY_SRCS})
  target_link_libraries(webp_quality exampleutil imagedec extras)
-  target_include_directories(webp_quality PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
-                                                  ${CMAKE_CURRENT_BINARY_DIR})
+  target_include_directories(webp_quality PRIVATE ${CMAKE_CURRENT_BINARY_DIR})

  # vwebp_sdl
  find_package(SDL2 QUIET)
  if(WEBP_BUILD_VWEBP AND SDL2_FOUND)
    add_executable(vwebp_sdl ${VWEBP_SDL_SRCS})
    target_link_libraries(vwebp_sdl ${SDL2_LIBRARIES} imageioutil webp)
-    target_include_directories(
-      vwebp_sdl PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
-                        ${CMAKE_CURRENT_BINARY_DIR}/src ${SDL2_INCLUDE_DIRS})
+    target_include_directories(vwebp_sdl PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src
+                                                 ${SDL2_INCLUDE_DIRS})
    set(WEBP_HAVE_SDL 1)
    target_compile_definitions(vwebp_sdl PUBLIC WEBP_HAVE_SDL)

@@ -733,7 +725,7 @@ if(WEBP_BUILD_WEBP_JS)
    # JavaScript version
    add_executable(webp_js ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c)
    target_link_libraries(webp_js webpdecoder SDL2)
-    target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+    target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
    set(WEBP_HAVE_SDL 1)
    set_target_properties(
      webp_js
@@ -753,7 +745,7 @@ if(WEBP_BUILD_WEBP_JS)
  # WASM version
  add_executable(webp_wasm ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c)
  target_link_libraries(webp_wasm webpdecoder SDL2)
-  target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+  target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
  set_target_properties(
    webp_wasm
    PROPERTIES
--- a/examples/cwebp.c
+++ b/examples/cwebp.c
@@ -21,10 +21,10 @@
 #include "webp/config.h"
 #endif

-#include "../examples/example_util.h"
 #include "../imageio/image_dec.h"
 #include "../imageio/imageio_util.h"
 #include "../imageio/webpdec.h"
+#include "./example_util.h"
 #include "./stopwatch.h"
 #include "./unicode.h"
 #include "imageio/metadata.h"
--- a/examples/dwebp.c
+++ b/examples/dwebp.c
@@ -20,9 +20,9 @@
 #include "webp/config.h"
 #endif

-#include "../examples/example_util.h"
 #include "../imageio/image_enc.h"
 #include "../imageio/webpdec.h"
+#include "./example_util.h"
 #include "./stopwatch.h"
 #include "./unicode.h"
 #include "webp/decode.h"
--- a/examples/gif2webp.c
+++ b/examples/gif2webp.c
@@ -29,8 +29,8 @@

 #include <gif_lib.h>

-#include "../examples/example_util.h"
 #include "../imageio/imageio_util.h"
+#include "./example_util.h"
 #include "./gifdec.h"
 #include "./unicode.h"
 #include "./unicode_gif.h"
--- a/examples/img2webp.c
+++ b/examples/img2webp.c
@@ -23,9 +23,9 @@
 #include "webp/config.h"
 #endif

-#include "../examples/example_util.h"
 #include "../imageio/image_dec.h"
 #include "../imageio/imageio_util.h"
+#include "./example_util.h"
 #include "./stopwatch.h"
 #include "./unicode.h"
 #include "sharpyuv/sharpyuv.h"
--- a/examples/vwebp.c
+++ b/examples/vwebp.c
@@ -38,8 +38,8 @@
 #include <qcms.h>
 #endif

-#include "../examples/example_util.h"
 #include "../imageio/imageio_util.h"
+#include "./example_util.h"
 #include "./unicode.h"
 #include "webp/decode.h"
 #include "webp/demux.h"
--- a/examples/webpmux.c
+++ b/examples/webpmux.c
@@ -60,8 +60,8 @@
 #include <stdlib.h>
 #include <string.h>

-#include "../examples/example_util.h"
 #include "../imageio/imageio_util.h"
+#include "./example_util.h"
 #include "./unicode.h"
 #include "webp/decode.h"
 #include "webp/mux.h"
--- a/extras/extras.c
+++ b/extras/extras.c
@@ -10,17 +10,17 @@
 //  Additional WebP utilities.
 //

-#include "extras/extras.h"
+#include "./extras.h"

 #include <assert.h>
 #include <limits.h>
 #include <string.h>

-#include "extras/sharpyuv_risk_table.h"
+#include "./sharpyuv_risk_table.h"
 #include "sharpyuv/sharpyuv.h"
 #include "src/dsp/dsp.h"
 #include "src/utils/utils.h"
-#include "src/webp/encode.h"
+#include "webp/encode.h"
 #include "webp/format_constants.h"
 #include "webp/types.h"

--- a/extras/get_disto.c
+++ b/extras/get_disto.c
@@ -26,8 +26,8 @@
 #include "../examples/unicode.h"
 #include "imageio/image_dec.h"
 #include "imageio/imageio_util.h"
-#include "src/webp/types.h"
 #include "webp/encode.h"
+#include "webp/types.h"

 static size_t ReadPicture(const char* const filename, WebPPicture* const pic,
                          int keep_alpha) {
--- a/extras/quality_estimate.c
+++ b/extras/quality_estimate.c
@@ -14,9 +14,9 @@
 #include <math.h>
 #include <stddef.h>

-#include "extras/extras.h"
-#include "src/webp/types.h"
+#include "./extras.h"
 #include "webp/decode.h"
+#include "webp/types.h"

 //------------------------------------------------------------------------------

--- a/extras/sharpyuv_risk_table.c
+++ b/extras/sharpyuv_risk_table.c
@@ -9,7 +9,7 @@
 //
 // Precomputed data for 420 risk estimation.

-#include "src/webp/types.h"
+#include "webp/types.h"

 const int kSharpYuvPrecomputedRiskYuvSampling = 7;

--- a/extras/sharpyuv_risk_table.h
+++ b/extras/sharpyuv_risk_table.h
@@ -12,7 +12,7 @@
 #ifndef WEBP_EXTRAS_SHARPYUV_RISK_TABLE_H_
 #define WEBP_EXTRAS_SHARPYUV_RISK_TABLE_H_

-#include "src/webp/types.h"
+#include "webp/types.h"

 extern const int kSharpYuvPrecomputedRiskYuvSampling;
 // Table of precomputed risk scores when chroma subsampling images with two
--- a/extras/webp_quality.c
+++ b/extras/webp_quality.c
@@ -12,9 +12,9 @@
 #include <string.h>

 #include "../examples/unicode.h"
-#include "extras/extras.h"
+#include "./extras.h"
 #include "imageio/imageio_util.h"
-#include "src/webp/types.h"
+#include "webp/types.h"

 // Returns EXIT_SUCCESS on success, EXIT_FAILURE on failure.
 int main(int argc, const char* argv[]) {
--- a/extras/webp_to_sdl.c
+++ b/extras/webp_to_sdl.c
@@ -12,14 +12,14 @@
 // Author: James Zern (jzern@google.com)

 #ifdef HAVE_CONFIG_H
-#include "src/webp/config.h"
+#include "webp/config.h"
 #endif

 #if defined(WEBP_HAVE_SDL)

 #include <stdio.h>

-#include "src/webp/decode.h"
+#include "webp/decode.h"
 #include "webp_to_sdl.h"

 #if defined(WEBP_HAVE_JUST_SDL_H)
--- a/sharpyuv/sharpyuv.c
+++ b/sharpyuv/sharpyuv.c
@@ -11,7 +11,7 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)

-#include "sharpyuv/sharpyuv.h"
+#include "./sharpyuv.h"

 #include <assert.h>
 #include <limits.h>
@@ -19,10 +19,10 @@
 #include <stdlib.h>
 #include <string.h>

-#include "sharpyuv/sharpyuv_cpu.h"
-#include "sharpyuv/sharpyuv_dsp.h"
-#include "sharpyuv/sharpyuv_gamma.h"
-#include "src/webp/types.h"
+#include "./sharpyuv_cpu.h"
+#include "./sharpyuv_dsp.h"
+#include "./sharpyuv_gamma.h"
+#include "webp/types.h"

 //------------------------------------------------------------------------------

--- a/sharpyuv/sharpyuv_dsp.c
+++ b/sharpyuv/sharpyuv_dsp.c
@@ -11,14 +11,14 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)

-#include "sharpyuv/sharpyuv_dsp.h"
+#include "./sharpyuv_dsp.h"

 #include <assert.h>
 #include <stdlib.h>

-#include "sharpyuv/sharpyuv_cpu.h"
+#include "./sharpyuv_cpu.h"
 #include "src/dsp/cpu.h"
-#include "src/webp/types.h"
+#include "webp/types.h"

 //-----------------------------------------------------------------------------

--- a/sharpyuv/sharpyuv_dsp.h
+++ b/sharpyuv/sharpyuv_dsp.h
@@ -12,8 +12,8 @@
 #ifndef WEBP_SHARPYUV_SHARPYUV_DSP_H_
 #define WEBP_SHARPYUV_SHARPYUV_DSP_H_

-#include "sharpyuv/sharpyuv_cpu.h"
-#include "src/webp/types.h"
+#include "./sharpyuv_cpu.h"
+#include "webp/types.h"

 extern uint64_t (*SharpYuvUpdateY)(const uint16_t* src, const uint16_t* ref,
                                   uint16_t* dst, int len, int bit_depth);
--- a/sharpyuv/sharpyuv_gamma.c
+++ b/sharpyuv/sharpyuv_gamma.c
@@ -9,14 +9,14 @@
 //
 // Gamma correction utilities.

-#include "sharpyuv/sharpyuv_gamma.h"
+#include "./sharpyuv_gamma.h"

 #include <assert.h>
 #include <float.h>
 #include <math.h>

-#include "sharpyuv/sharpyuv.h"
-#include "src/webp/types.h"
+#include "./sharpyuv.h"
+#include "webp/types.h"

 // Gamma correction compensates loss of resolution during chroma subsampling.
 // Size of pre-computed table for converting from gamma to linear.
--- a/sharpyuv/sharpyuv_gamma.h
+++ b/sharpyuv/sharpyuv_gamma.h
@@ -12,8 +12,8 @@
 #ifndef WEBP_SHARPYUV_SHARPYUV_GAMMA_H_
 #define WEBP_SHARPYUV_SHARPYUV_GAMMA_H_

-#include "sharpyuv/sharpyuv.h"
-#include "src/webp/types.h"
+#include "./sharpyuv.h"
+#include "webp/types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/sharpyuv/sharpyuv_sse2.c
+++ b/sharpyuv/sharpyuv_sse2.c
@@ -11,14 +11,14 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)

-#include "sharpyuv/sharpyuv_dsp.h"
+#include "./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 "webp/types.h"

 static uint16_t clip_SSE2(int v, int max) {
  return (v < 0) ? 0 : (v > max) ? max : (uint16_t)v;
--- a/tests/fuzzer/CMakeLists.txt
+++ b/tests/fuzzer/CMakeLists.txt
@@ -47,6 +47,8 @@ fuzztest_setup_fuzzing_flags()
 add_library(fuzz_utils fuzz_utils.h fuzz_utils.cc img_alpha.h img_grid.h
                       img_peak.h)
 target_link_libraries(fuzz_utils PUBLIC webpdecoder)
+target_include_directories(fuzz_utils PUBLIC ${CMAKE_SOURCE_DIR}
+                                             ${CMAKE_BINARY_DIR})
 link_fuzztest(fuzz_utils)

 add_webp_fuzztest(advanced_api_fuzzer webpdecode webpdspdecode webputilsdecode)
--- a/tests/fuzzer/advanced_api_fuzzer.cc
+++ b/tests/fuzzer/advanced_api_fuzzer.cc
@@ -23,7 +23,7 @@
 #include "./fuzz_utils.h"
 #include "src/dec/webpi_dec.h"
 #include "src/utils/rescaler_utils.h"
-#include "src/webp/decode.h"
+#include "webp/decode.h"

 namespace {

--- a/tests/fuzzer/animation_api_fuzzer.cc
+++ b/tests/fuzzer/animation_api_fuzzer.cc
@@ -19,9 +19,9 @@
 #include <string_view>

 #include "./fuzz_utils.h"
-#include "src/webp/decode.h"
-#include "src/webp/demux.h"
-#include "src/webp/mux_types.h"
+#include "webp/decode.h"
+#include "webp/demux.h"
+#include "webp/mux_types.h"

 namespace {

--- a/tests/fuzzer/animdecoder_fuzzer.cc
+++ b/tests/fuzzer/animdecoder_fuzzer.cc
@@ -21,9 +21,9 @@
 #include "./fuzz_utils.h"
 #include "./nalloc.h"
 #include "imageio/imageio_util.h"
-#include "src/webp/decode.h"
-#include "src/webp/demux.h"
-#include "src/webp/mux_types.h"
+#include "webp/decode.h"
+#include "webp/demux.h"
+#include "webp/mux_types.h"

 namespace {

--- a/tests/fuzzer/animencoder_fuzzer.cc
+++ b/tests/fuzzer/animencoder_fuzzer.cc
@@ -22,9 +22,9 @@

 #include "./fuzz_utils.h"
 #include "src/dsp/cpu.h"
-#include "src/webp/encode.h"
-#include "src/webp/mux.h"
-#include "src/webp/mux_types.h"
+#include "webp/encode.h"
+#include "webp/mux.h"
+#include "webp/mux_types.h"

 namespace {

--- a/tests/fuzzer/dec_fuzzer.cc
+++ b/tests/fuzzer/dec_fuzzer.cc
@@ -21,8 +21,8 @@
 #include <string_view>

 #include "./nalloc.h"
-#include "src/webp/decode.h"
 #include "tests/fuzzer/fuzz_utils.h"
+#include "webp/decode.h"

 namespace {

--- a/tests/fuzzer/enc_dec_fuzzer.cc
+++ b/tests/fuzzer/enc_dec_fuzzer.cc
@@ -24,8 +24,8 @@
 #include "./fuzz_utils.h"
 #include "src/dsp/cpu.h"
 #include "src/utils/rescaler_utils.h"
-#include "src/webp/decode.h"
-#include "src/webp/encode.h"
+#include "webp/decode.h"
+#include "webp/encode.h"

 namespace {

--- a/tests/fuzzer/enc_fuzzer.cc
+++ b/tests/fuzzer/enc_fuzzer.cc
@@ -24,10 +24,10 @@

 #include "imageio/image_dec.h"
 #include "src/dsp/cpu.h"
-#include "src/webp/decode.h"
-#include "src/webp/encode.h"
-#include "src/webp/types.h"
 #include "tests/fuzzer/fuzz_utils.h"
+#include "webp/decode.h"
+#include "webp/encode.h"
+#include "webp/types.h"

 namespace {

--- a/tests/fuzzer/fuzz_utils.cc
+++ b/tests/fuzzer/fuzz_utils.cc
@@ -30,9 +30,9 @@
 #include "./img_grid.h"
 #include "./img_peak.h"
 #include "src/dsp/cpu.h"
-#include "src/webp/decode.h"
-#include "src/webp/encode.h"
-#include "src/webp/types.h"
+#include "webp/decode.h"
+#include "webp/encode.h"
+#include "webp/types.h"

 namespace fuzz_utils {

--- a/tests/fuzzer/huffman_fuzzer.cc
+++ b/tests/fuzzer/huffman_fuzzer.cc
@@ -24,7 +24,7 @@
 #include "src/utils/bit_reader_utils.h"
 #include "src/utils/huffman_utils.h"
 #include "src/utils/utils.h"
-#include "src/webp/format_constants.h"
+#include "webp/format_constants.h"

 namespace {

--- a/tests/fuzzer/mux_demux_api_fuzzer.cc
+++ b/tests/fuzzer/mux_demux_api_fuzzer.cc
@@ -19,9 +19,9 @@
 #include <string_view>

 #include "./fuzz_utils.h"
-#include "src/webp/demux.h"
-#include "src/webp/mux.h"
-#include "src/webp/mux_types.h"
+#include "webp/demux.h"
+#include "webp/mux.h"
+#include "webp/mux_types.h"

 namespace {

--- a/tests/fuzzer/simple_api_fuzzer.cc
+++ b/tests/fuzzer/simple_api_fuzzer.cc
@@ -20,8 +20,8 @@
 #include <string_view>

 #include "./fuzz_utils.h"
-#include "src/webp/decode.h"
-#include "src/webp/types.h"
+#include "webp/decode.h"
+#include "webp/types.h"

 namespace {

--- a/tests/fuzzer/webp_info_fuzzer.cc
+++ b/tests/fuzzer/webp_info_fuzzer.cc
@@ -18,8 +18,8 @@
 #include <string_view>

 #include "./nalloc.h"
-#include "src/webp/mux_types.h"
 #include "tests/fuzzer/fuzz_utils.h"
+#include "webp/mux_types.h"

 // Don't do that at home!
 #define main exec_main