245 files changed, 7 insertions, 7 deletions

diff --git a/lib/libzstd/Makefile b/lib/libzstd/Makefile
index 16e9be51d920..4f290dd462ff 100644
--- a/lib/libzstd/Makefile
+++ b/lib/libzstd/Makefile
@@ -33,7 +33,7 @@ LIBADD=	pthread
 
 PRIVATELIB=	yes
 
-ZSTDDIR=	${SRCTOP}/contrib/zstd
+ZSTDDIR=	${SRCTOP}/sys/contrib/zstd
 .PATH:	${ZSTDDIR}/lib/common ${ZSTDDIR}/lib/compress \
 	${ZSTDDIR}/lib/decompress ${ZSTDDIR}/lib/deprecated \
 	${ZSTDDIR}/lib/dictBuilder ${ZSTDDIR}/lib
diff --git a/contrib/zstd/.buckconfig b/sys/contrib/zstd/.buckconfig
index 483f6053b265..483f6053b265 100644
--- a/contrib/zstd/.buckconfig
+++ b/sys/contrib/zstd/.buckconfig
diff --git a/contrib/zstd/.buckversion b/sys/contrib/zstd/.buckversion
index 892fad966fce..892fad966fce 100644
--- a/contrib/zstd/.buckversion
+++ b/sys/contrib/zstd/.buckversion
diff --git a/contrib/zstd/.gitattributes b/sys/contrib/zstd/.gitattributes
index 9eb12c0ef62e..9eb12c0ef62e 100644
--- a/contrib/zstd/.gitattributes
+++ b/sys/contrib/zstd/.gitattributes
diff --git a/contrib/zstd/CONTRIBUTING.md b/sys/contrib/zstd/CONTRIBUTING.md
index dd013f8084fa..dd013f8084fa 100644
--- a/contrib/zstd/CONTRIBUTING.md
+++ b/sys/contrib/zstd/CONTRIBUTING.md
diff --git a/contrib/zstd/COPYING b/sys/contrib/zstd/COPYING
index ecbc0593737b..ecbc0593737b 100644
--- a/contrib/zstd/COPYING
+++ b/sys/contrib/zstd/COPYING
diff --git a/contrib/zstd/LICENSE b/sys/contrib/zstd/LICENSE
index a793a8028925..a793a8028925 100644
--- a/contrib/zstd/LICENSE
+++ b/sys/contrib/zstd/LICENSE
diff --git a/contrib/zstd/Makefile b/sys/contrib/zstd/Makefile
index 2805c8ad4b54..2805c8ad4b54 100644
--- a/contrib/zstd/Makefile
+++ b/sys/contrib/zstd/Makefile
diff --git a/contrib/zstd/NEWS b/sys/contrib/zstd/NEWS
index 215c0a329ba6..215c0a329ba6 100644
--- a/contrib/zstd/NEWS
+++ b/sys/contrib/zstd/NEWS
diff --git a/contrib/zstd/README.md b/sys/contrib/zstd/README.md
index 377ae0843978..377ae0843978 100644
--- a/contrib/zstd/README.md
+++ b/sys/contrib/zstd/README.md
diff --git a/contrib/zstd/TESTING.md b/sys/contrib/zstd/TESTING.md
index 1fa5fe8c2d69..1fa5fe8c2d69 100644
--- a/contrib/zstd/TESTING.md
+++ b/sys/contrib/zstd/TESTING.md
diff --git a/contrib/zstd/appveyor.yml b/sys/contrib/zstd/appveyor.yml
index 0f9142b4715a..0f9142b4715a 100644
--- a/contrib/zstd/appveyor.yml
+++ b/sys/contrib/zstd/appveyor.yml
diff --git a/contrib/zstd/circle.yml b/sys/contrib/zstd/circle.yml
index 5bc0ce643204..5bc0ce643204 100644
--- a/contrib/zstd/circle.yml
+++ b/sys/contrib/zstd/circle.yml
diff --git a/contrib/zstd/contrib/cleanTabs b/sys/contrib/zstd/contrib/cleanTabs
index 215913a90ace..215913a90ace 100755
--- a/contrib/zstd/contrib/cleanTabs
+++ b/sys/contrib/zstd/contrib/cleanTabs
diff --git a/contrib/zstd/contrib/gen_html/.gitignore b/sys/contrib/zstd/contrib/gen_html/.gitignore
index 34461142872a..34461142872a 100644
--- a/contrib/zstd/contrib/gen_html/.gitignore
+++ b/sys/contrib/zstd/contrib/gen_html/.gitignore
diff --git a/contrib/zstd/contrib/gen_html/Makefile b/sys/contrib/zstd/contrib/gen_html/Makefile
index d9b32e351273..d9b32e351273 100644
--- a/contrib/zstd/contrib/gen_html/Makefile
+++ b/sys/contrib/zstd/contrib/gen_html/Makefile
diff --git a/contrib/zstd/contrib/gen_html/README.md b/sys/contrib/zstd/contrib/gen_html/README.md
index 63a4caa25061..63a4caa25061 100644
--- a/contrib/zstd/contrib/gen_html/README.md
+++ b/sys/contrib/zstd/contrib/gen_html/README.md
diff --git a/contrib/zstd/contrib/gen_html/gen-zstd-manual.sh b/sys/contrib/zstd/contrib/gen_html/gen-zstd-manual.sh
index 57a8b6ea512a..57a8b6ea512a 100755
--- a/contrib/zstd/contrib/gen_html/gen-zstd-manual.sh
+++ b/sys/contrib/zstd/contrib/gen_html/gen-zstd-manual.sh
diff --git a/contrib/zstd/contrib/gen_html/gen_html.cpp b/sys/contrib/zstd/contrib/gen_html/gen_html.cpp
index 90d5b21a3aa6..90d5b21a3aa6 100644
--- a/contrib/zstd/contrib/gen_html/gen_html.cpp
+++ b/sys/contrib/zstd/contrib/gen_html/gen_html.cpp
diff --git a/contrib/zstd/contrib/meson/README b/sys/contrib/zstd/contrib/meson/README
index 0b5331e6dbfc..0b5331e6dbfc 100644
--- a/contrib/zstd/contrib/meson/README
+++ b/sys/contrib/zstd/contrib/meson/README
diff --git a/contrib/zstd/contrib/meson/meson.build b/sys/contrib/zstd/contrib/meson/meson.build
index 8cbdcabec72f..8cbdcabec72f 100644
--- a/contrib/zstd/contrib/meson/meson.build
+++ b/sys/contrib/zstd/contrib/meson/meson.build
diff --git a/contrib/zstd/contrib/meson/meson_options.txt b/sys/contrib/zstd/contrib/meson/meson_options.txt
index 0a12f43e1967..0a12f43e1967 100644
--- a/contrib/zstd/contrib/meson/meson_options.txt
+++ b/sys/contrib/zstd/contrib/meson/meson_options.txt
diff --git a/contrib/zstd/contrib/pzstd/.gitignore b/sys/contrib/zstd/contrib/pzstd/.gitignore
index 84e68fb07d50..84e68fb07d50 100644
--- a/contrib/zstd/contrib/pzstd/.gitignore
+++ b/sys/contrib/zstd/contrib/pzstd/.gitignore
diff --git a/contrib/zstd/contrib/pzstd/BUCK b/sys/contrib/zstd/contrib/pzstd/BUCK
index d04eeedd8a1a..d04eeedd8a1a 100644
--- a/contrib/zstd/contrib/pzstd/BUCK
+++ b/sys/contrib/zstd/contrib/pzstd/BUCK
diff --git a/contrib/zstd/contrib/pzstd/ErrorHolder.h b/sys/contrib/zstd/contrib/pzstd/ErrorHolder.h
index 829651c5961e..829651c5961e 100644
--- a/contrib/zstd/contrib/pzstd/ErrorHolder.h
+++ b/sys/contrib/zstd/contrib/pzstd/ErrorHolder.h
diff --git a/contrib/zstd/contrib/pzstd/Logging.h b/sys/contrib/zstd/contrib/pzstd/Logging.h
index 16a63932c0a3..16a63932c0a3 100644
--- a/contrib/zstd/contrib/pzstd/Logging.h
+++ b/sys/contrib/zstd/contrib/pzstd/Logging.h
diff --git a/contrib/zstd/contrib/pzstd/Makefile b/sys/contrib/zstd/contrib/pzstd/Makefile
index 40531e216539..40531e216539 100644
--- a/contrib/zstd/contrib/pzstd/Makefile
+++ b/sys/contrib/zstd/contrib/pzstd/Makefile
diff --git a/contrib/zstd/contrib/pzstd/Options.cpp b/sys/contrib/zstd/contrib/pzstd/Options.cpp
index d9b216b42951..d9b216b42951 100644
--- a/contrib/zstd/contrib/pzstd/Options.cpp
+++ b/sys/contrib/zstd/contrib/pzstd/Options.cpp
diff --git a/contrib/zstd/contrib/pzstd/Options.h b/sys/contrib/zstd/contrib/pzstd/Options.h
index f4f2aaa499cb..f4f2aaa499cb 100644
--- a/contrib/zstd/contrib/pzstd/Options.h
+++ b/sys/contrib/zstd/contrib/pzstd/Options.h
diff --git a/contrib/zstd/contrib/pzstd/Pzstd.cpp b/sys/contrib/zstd/contrib/pzstd/Pzstd.cpp
index 1eb4ce14cf15..1eb4ce14cf15 100644
--- a/contrib/zstd/contrib/pzstd/Pzstd.cpp
+++ b/sys/contrib/zstd/contrib/pzstd/Pzstd.cpp
diff --git a/contrib/zstd/contrib/pzstd/Pzstd.h b/sys/contrib/zstd/contrib/pzstd/Pzstd.h
index 79d1fcca2653..79d1fcca2653 100644
--- a/contrib/zstd/contrib/pzstd/Pzstd.h
+++ b/sys/contrib/zstd/contrib/pzstd/Pzstd.h
diff --git a/contrib/zstd/contrib/pzstd/README.md b/sys/contrib/zstd/contrib/pzstd/README.md
index 84d945815838..84d945815838 100644
--- a/contrib/zstd/contrib/pzstd/README.md
+++ b/sys/contrib/zstd/contrib/pzstd/README.md
diff --git a/contrib/zstd/contrib/pzstd/SkippableFrame.cpp b/sys/contrib/zstd/contrib/pzstd/SkippableFrame.cpp
index 769866dfc815..769866dfc815 100644
--- a/contrib/zstd/contrib/pzstd/SkippableFrame.cpp
+++ b/sys/contrib/zstd/contrib/pzstd/SkippableFrame.cpp
diff --git a/contrib/zstd/contrib/pzstd/SkippableFrame.h b/sys/contrib/zstd/contrib/pzstd/SkippableFrame.h
index 60deed0405be..60deed0405be 100644
--- a/contrib/zstd/contrib/pzstd/SkippableFrame.h
+++ b/sys/contrib/zstd/contrib/pzstd/SkippableFrame.h
diff --git a/contrib/zstd/contrib/pzstd/images/Cspeed.png b/sys/contrib/zstd/contrib/pzstd/images/Cspeed.png
index aca4f663ea2e..aca4f663ea2e 100644
--- a/contrib/zstd/contrib/pzstd/images/Cspeed.png
+++ b/sys/contrib/zstd/contrib/pzstd/images/Cspeed.png
diff --git a/contrib/zstd/contrib/pzstd/images/Dspeed.png b/sys/contrib/zstd/contrib/pzstd/images/Dspeed.png
index e48881bcd05b..e48881bcd05b 100644
--- a/contrib/zstd/contrib/pzstd/images/Dspeed.png
+++ b/sys/contrib/zstd/contrib/pzstd/images/Dspeed.png
diff --git a/contrib/zstd/contrib/pzstd/main.cpp b/sys/contrib/zstd/contrib/pzstd/main.cpp
index b93f043b16b1..b93f043b16b1 100644
--- a/contrib/zstd/contrib/pzstd/main.cpp
+++ b/sys/contrib/zstd/contrib/pzstd/main.cpp
diff --git a/contrib/zstd/contrib/pzstd/test/BUCK b/sys/contrib/zstd/contrib/pzstd/test/BUCK
index 6d3fdd3c269b..6d3fdd3c269b 100644
--- a/contrib/zstd/contrib/pzstd/test/BUCK
+++ b/sys/contrib/zstd/contrib/pzstd/test/BUCK
diff --git a/contrib/zstd/contrib/pzstd/test/OptionsTest.cpp b/sys/contrib/zstd/contrib/pzstd/test/OptionsTest.cpp
index e601148255d4..e601148255d4 100644
--- a/contrib/zstd/contrib/pzstd/test/OptionsTest.cpp
+++ b/sys/contrib/zstd/contrib/pzstd/test/OptionsTest.cpp
diff --git a/contrib/zstd/contrib/pzstd/test/PzstdTest.cpp b/sys/contrib/zstd/contrib/pzstd/test/PzstdTest.cpp
index 5c7d66310805..5c7d66310805 100644
--- a/contrib/zstd/contrib/pzstd/test/PzstdTest.cpp
+++ b/sys/contrib/zstd/contrib/pzstd/test/PzstdTest.cpp
diff --git a/contrib/zstd/contrib/pzstd/test/RoundTrip.h b/sys/contrib/zstd/contrib/pzstd/test/RoundTrip.h
index c6364ecb4227..c6364ecb4227 100644
--- a/contrib/zstd/contrib/pzstd/test/RoundTrip.h
+++ b/sys/contrib/zstd/contrib/pzstd/test/RoundTrip.h
diff --git a/contrib/zstd/contrib/pzstd/test/RoundTripTest.cpp b/sys/contrib/zstd/contrib/pzstd/test/RoundTripTest.cpp
index 36af0673ae6a..36af0673ae6a 100644
--- a/contrib/zstd/contrib/pzstd/test/RoundTripTest.cpp
+++ b/sys/contrib/zstd/contrib/pzstd/test/RoundTripTest.cpp
diff --git a/contrib/zstd/contrib/pzstd/utils/BUCK b/sys/contrib/zstd/contrib/pzstd/utils/BUCK
index e757f412070b..e757f412070b 100644
--- a/contrib/zstd/contrib/pzstd/utils/BUCK
+++ b/sys/contrib/zstd/contrib/pzstd/utils/BUCK
diff --git a/contrib/zstd/contrib/pzstd/utils/Buffer.h b/sys/contrib/zstd/contrib/pzstd/utils/Buffer.h
index f69c3b4d9f7a..f69c3b4d9f7a 100644
--- a/contrib/zstd/contrib/pzstd/utils/Buffer.h
+++ b/sys/contrib/zstd/contrib/pzstd/utils/Buffer.h
diff --git a/contrib/zstd/contrib/pzstd/utils/FileSystem.h b/sys/contrib/zstd/contrib/pzstd/utils/FileSystem.h
index 3cfbe86e507e..3cfbe86e507e 100644
--- a/contrib/zstd/contrib/pzstd/utils/FileSystem.h
+++ b/sys/contrib/zstd/contrib/pzstd/utils/FileSystem.h
diff --git a/contrib/zstd/contrib/pzstd/utils/Likely.h b/sys/contrib/zstd/contrib/pzstd/utils/Likely.h
index 7cea8da2771f..7cea8da2771f 100644
--- a/contrib/zstd/contrib/pzstd/utils/Likely.h
+++ b/sys/contrib/zstd/contrib/pzstd/utils/Likely.h
diff --git a/contrib/zstd/contrib/pzstd/utils/Range.h b/sys/contrib/zstd/contrib/pzstd/utils/Range.h
index 7e2559cc9e3d..7e2559cc9e3d 100644
--- a/contrib/zstd/contrib/pzstd/utils/Range.h
+++ b/sys/contrib/zstd/contrib/pzstd/utils/Range.h
diff --git a/contrib/zstd/contrib/pzstd/utils/ResourcePool.h b/sys/contrib/zstd/contrib/pzstd/utils/ResourcePool.h
index a6ff5ffc5db3..a6ff5ffc5db3 100644
--- a/contrib/zstd/contrib/pzstd/utils/ResourcePool.h
+++ b/sys/contrib/zstd/contrib/pzstd/utils/ResourcePool.h
diff --git a/contrib/zstd/contrib/pzstd/utils/ScopeGuard.h b/sys/contrib/zstd/contrib/pzstd/utils/ScopeGuard.h
index 31768f43d22c..31768f43d22c 100644
--- a/contrib/zstd/contrib/pzstd/utils/ScopeGuard.h
+++ b/sys/contrib/zstd/contrib/pzstd/utils/ScopeGuard.h
diff --git a/contrib/zstd/contrib/pzstd/utils/ThreadPool.h b/sys/contrib/zstd/contrib/pzstd/utils/ThreadPool.h
index 8ece8e0da4eb..8ece8e0da4eb 100644
--- a/contrib/zstd/contrib/pzstd/utils/ThreadPool.h
+++ b/sys/contrib/zstd/contrib/pzstd/utils/ThreadPool.h
diff --git a/contrib/zstd/contrib/pzstd/utils/WorkQueue.h b/sys/contrib/zstd/contrib/pzstd/utils/WorkQueue.h
index 1d14d922c648..1d14d922c648 100644
--- a/contrib/zstd/contrib/pzstd/utils/WorkQueue.h
+++ b/sys/contrib/zstd/contrib/pzstd/utils/WorkQueue.h
diff --git a/contrib/zstd/contrib/pzstd/utils/test/BUCK b/sys/contrib/zstd/contrib/pzstd/utils/test/BUCK
index a5113cab6b0e..a5113cab6b0e 100644
--- a/contrib/zstd/contrib/pzstd/utils/test/BUCK
+++ b/sys/contrib/zstd/contrib/pzstd/utils/test/BUCK
diff --git a/contrib/zstd/contrib/pzstd/utils/test/BufferTest.cpp b/sys/contrib/zstd/contrib/pzstd/utils/test/BufferTest.cpp
index fbba74e82628..fbba74e82628 100644
--- a/contrib/zstd/contrib/pzstd/utils/test/BufferTest.cpp
+++ b/sys/contrib/zstd/contrib/pzstd/utils/test/BufferTest.cpp
diff --git a/contrib/zstd/contrib/pzstd/utils/test/RangeTest.cpp b/sys/contrib/zstd/contrib/pzstd/utils/test/RangeTest.cpp
index 755b50fa6e80..755b50fa6e80 100644
--- a/contrib/zstd/contrib/pzstd/utils/test/RangeTest.cpp
+++ b/sys/contrib/zstd/contrib/pzstd/utils/test/RangeTest.cpp
diff --git a/contrib/zstd/contrib/pzstd/utils/test/ResourcePoolTest.cpp b/sys/contrib/zstd/contrib/pzstd/utils/test/ResourcePoolTest.cpp
index 6fe145180be9..6fe145180be9 100644
--- a/contrib/zstd/contrib/pzstd/utils/test/ResourcePoolTest.cpp
+++ b/sys/contrib/zstd/contrib/pzstd/utils/test/ResourcePoolTest.cpp
diff --git a/contrib/zstd/contrib/pzstd/utils/test/ScopeGuardTest.cpp b/sys/contrib/zstd/contrib/pzstd/utils/test/ScopeGuardTest.cpp
index 7bc624da79b2..7bc624da79b2 100644
--- a/contrib/zstd/contrib/pzstd/utils/test/ScopeGuardTest.cpp
+++ b/sys/contrib/zstd/contrib/pzstd/utils/test/ScopeGuardTest.cpp
diff --git a/contrib/zstd/contrib/pzstd/utils/test/ThreadPoolTest.cpp b/sys/contrib/zstd/contrib/pzstd/utils/test/ThreadPoolTest.cpp
index 703fd4c9ca17..703fd4c9ca17 100644
--- a/contrib/zstd/contrib/pzstd/utils/test/ThreadPoolTest.cpp
+++ b/sys/contrib/zstd/contrib/pzstd/utils/test/ThreadPoolTest.cpp
diff --git a/contrib/zstd/contrib/pzstd/utils/test/WorkQueueTest.cpp b/sys/contrib/zstd/contrib/pzstd/utils/test/WorkQueueTest.cpp
index 14cf77304f21..14cf77304f21 100644
--- a/contrib/zstd/contrib/pzstd/utils/test/WorkQueueTest.cpp
+++ b/sys/contrib/zstd/contrib/pzstd/utils/test/WorkQueueTest.cpp
diff --git a/contrib/zstd/contrib/seekable_format/examples/.gitignore b/sys/contrib/zstd/contrib/seekable_format/examples/.gitignore
index df2f9ab07499..df2f9ab07499 100644
--- a/contrib/zstd/contrib/seekable_format/examples/.gitignore
+++ b/sys/contrib/zstd/contrib/seekable_format/examples/.gitignore
diff --git a/contrib/zstd/contrib/seekable_format/examples/Makefile b/sys/contrib/zstd/contrib/seekable_format/examples/Makefile
index 1847aa7e7b39..1847aa7e7b39 100644
--- a/contrib/zstd/contrib/seekable_format/examples/Makefile
+++ b/sys/contrib/zstd/contrib/seekable_format/examples/Makefile
diff --git a/contrib/zstd/contrib/seekable_format/examples/parallel_compression.c b/sys/contrib/zstd/contrib/seekable_format/examples/parallel_compression.c
index 69644d2b3c80..69644d2b3c80 100644
--- a/contrib/zstd/contrib/seekable_format/examples/parallel_compression.c
+++ b/sys/contrib/zstd/contrib/seekable_format/examples/parallel_compression.c
diff --git a/contrib/zstd/contrib/seekable_format/examples/parallel_processing.c b/sys/contrib/zstd/contrib/seekable_format/examples/parallel_processing.c
index da3477632e2c..da3477632e2c 100644
--- a/contrib/zstd/contrib/seekable_format/examples/parallel_processing.c
+++ b/sys/contrib/zstd/contrib/seekable_format/examples/parallel_processing.c
diff --git a/contrib/zstd/contrib/seekable_format/examples/seekable_compression.c b/sys/contrib/zstd/contrib/seekable_format/examples/seekable_compression.c
index 9485bf26fc46..9485bf26fc46 100644
--- a/contrib/zstd/contrib/seekable_format/examples/seekable_compression.c
+++ b/sys/contrib/zstd/contrib/seekable_format/examples/seekable_compression.c
diff --git a/contrib/zstd/contrib/seekable_format/examples/seekable_decompression.c b/sys/contrib/zstd/contrib/seekable_format/examples/seekable_decompression.c
index 9cd232922636..9cd232922636 100644
--- a/contrib/zstd/contrib/seekable_format/examples/seekable_decompression.c
+++ b/sys/contrib/zstd/contrib/seekable_format/examples/seekable_decompression.c
diff --git a/contrib/zstd/contrib/seekable_format/zstd_seekable.h b/sys/contrib/zstd/contrib/seekable_format/zstd_seekable.h
index 438ac20149f8..438ac20149f8 100644
--- a/contrib/zstd/contrib/seekable_format/zstd_seekable.h
+++ b/sys/contrib/zstd/contrib/seekable_format/zstd_seekable.h
diff --git a/contrib/zstd/contrib/seekable_format/zstd_seekable_compression_format.md b/sys/contrib/zstd/contrib/seekable_format/zstd_seekable_compression_format.md
index bf3080f7bbed..bf3080f7bbed 100644
--- a/contrib/zstd/contrib/seekable_format/zstd_seekable_compression_format.md
+++ b/sys/contrib/zstd/contrib/seekable_format/zstd_seekable_compression_format.md
diff --git a/contrib/zstd/contrib/seekable_format/zstdseek_compress.c b/sys/contrib/zstd/contrib/seekable_format/zstdseek_compress.c
index df2074988e63..df2074988e63 100644
--- a/contrib/zstd/contrib/seekable_format/zstdseek_compress.c
+++ b/sys/contrib/zstd/contrib/seekable_format/zstdseek_compress.c
diff --git a/contrib/zstd/contrib/seekable_format/zstdseek_decompress.c b/sys/contrib/zstd/contrib/seekable_format/zstdseek_decompress.c
index d740e16be465..d740e16be465 100644
--- a/contrib/zstd/contrib/seekable_format/zstdseek_decompress.c
+++ b/sys/contrib/zstd/contrib/seekable_format/zstdseek_decompress.c
diff --git a/contrib/zstd/doc/README.md b/sys/contrib/zstd/doc/README.md
index 47cfe36172af..47cfe36172af 100644
--- a/contrib/zstd/doc/README.md
+++ b/sys/contrib/zstd/doc/README.md
diff --git a/contrib/zstd/doc/educational_decoder/Makefile b/sys/contrib/zstd/doc/educational_decoder/Makefile
index ace1294f8e73..ace1294f8e73 100644
--- a/contrib/zstd/doc/educational_decoder/Makefile
+++ b/sys/contrib/zstd/doc/educational_decoder/Makefile
diff --git a/contrib/zstd/doc/educational_decoder/README.md b/sys/contrib/zstd/doc/educational_decoder/README.md
index e3b9bf58e5ae..e3b9bf58e5ae 100644
--- a/contrib/zstd/doc/educational_decoder/README.md
+++ b/sys/contrib/zstd/doc/educational_decoder/README.md
diff --git a/contrib/zstd/doc/educational_decoder/harness.c b/sys/contrib/zstd/doc/educational_decoder/harness.c
index 47882b168953..47882b168953 100644
--- a/contrib/zstd/doc/educational_decoder/harness.c
+++ b/sys/contrib/zstd/doc/educational_decoder/harness.c
diff --git a/contrib/zstd/doc/educational_decoder/zstd_decompress.c b/sys/contrib/zstd/doc/educational_decoder/zstd_decompress.c
index bea0e0ce1f45..bea0e0ce1f45 100644
--- a/contrib/zstd/doc/educational_decoder/zstd_decompress.c
+++ b/sys/contrib/zstd/doc/educational_decoder/zstd_decompress.c
diff --git a/contrib/zstd/doc/educational_decoder/zstd_decompress.h b/sys/contrib/zstd/doc/educational_decoder/zstd_decompress.h
index a01fde331fb8..a01fde331fb8 100644
--- a/contrib/zstd/doc/educational_decoder/zstd_decompress.h
+++ b/sys/contrib/zstd/doc/educational_decoder/zstd_decompress.h
diff --git a/contrib/zstd/doc/images/Cspeed4.png b/sys/contrib/zstd/doc/images/Cspeed4.png
index 318204c00e96..318204c00e96 100644
--- a/contrib/zstd/doc/images/Cspeed4.png
+++ b/sys/contrib/zstd/doc/images/Cspeed4.png
diff --git a/contrib/zstd/doc/images/DCspeed5.png b/sys/contrib/zstd/doc/images/DCspeed5.png
index 900b0242f6d2..900b0242f6d2 100644
--- a/contrib/zstd/doc/images/DCspeed5.png
+++ b/sys/contrib/zstd/doc/images/DCspeed5.png
diff --git a/contrib/zstd/doc/images/Dspeed4.png b/sys/contrib/zstd/doc/images/Dspeed4.png
index b7baef1ff3f7..b7baef1ff3f7 100644
--- a/contrib/zstd/doc/images/Dspeed4.png
+++ b/sys/contrib/zstd/doc/images/Dspeed4.png
diff --git a/contrib/zstd/doc/images/dict-cr.png b/sys/contrib/zstd/doc/images/dict-cr.png
index f3a9ce2bdda6..f3a9ce2bdda6 100644
--- a/contrib/zstd/doc/images/dict-cr.png
+++ b/sys/contrib/zstd/doc/images/dict-cr.png
diff --git a/contrib/zstd/doc/images/dict-cs.png b/sys/contrib/zstd/doc/images/dict-cs.png
index 55e5ef518fed..55e5ef518fed 100644
--- a/contrib/zstd/doc/images/dict-cs.png
+++ b/sys/contrib/zstd/doc/images/dict-cs.png
diff --git a/contrib/zstd/doc/images/dict-ds.png b/sys/contrib/zstd/doc/images/dict-ds.png
index 1153f1b95fd5..1153f1b95fd5 100644
--- a/contrib/zstd/doc/images/dict-ds.png
+++ b/sys/contrib/zstd/doc/images/dict-ds.png
diff --git a/contrib/zstd/doc/zstd_compression_format.md b/sys/contrib/zstd/doc/zstd_compression_format.md
index aa86d1420eef..aa86d1420eef 100644
--- a/contrib/zstd/doc/zstd_compression_format.md
+++ b/sys/contrib/zstd/doc/zstd_compression_format.md
diff --git a/contrib/zstd/doc/zstd_manual.html b/sys/contrib/zstd/doc/zstd_manual.html
index b4720adac263..b4720adac263 100644
--- a/contrib/zstd/doc/zstd_manual.html
+++ b/sys/contrib/zstd/doc/zstd_manual.html
diff --git a/contrib/zstd/lib/.gitignore b/sys/contrib/zstd/lib/.gitignore
index 4cd50ac61e52..4cd50ac61e52 100644
--- a/contrib/zstd/lib/.gitignore
+++ b/sys/contrib/zstd/lib/.gitignore
diff --git a/contrib/zstd/lib/BUCK b/sys/contrib/zstd/lib/BUCK
index 6812c1b1e54c..6812c1b1e54c 100644
--- a/contrib/zstd/lib/BUCK
+++ b/sys/contrib/zstd/lib/BUCK
diff --git a/contrib/zstd/lib/Makefile b/sys/contrib/zstd/lib/Makefile
index cdfdc5cdfd46..cdfdc5cdfd46 100644
--- a/contrib/zstd/lib/Makefile
+++ b/sys/contrib/zstd/lib/Makefile
diff --git a/contrib/zstd/lib/README.md b/sys/contrib/zstd/lib/README.md
index df136c4867d2..df136c4867d2 100644
--- a/contrib/zstd/lib/README.md
+++ b/sys/contrib/zstd/lib/README.md
diff --git a/contrib/zstd/lib/common/bitstream.h b/sys/contrib/zstd/lib/common/bitstream.h
index 2094823fe240..2094823fe240 100644
--- a/contrib/zstd/lib/common/bitstream.h
+++ b/sys/contrib/zstd/lib/common/bitstream.h
diff --git a/contrib/zstd/lib/common/compiler.h b/sys/contrib/zstd/lib/common/compiler.h
index 3a7553c3807e..3a7553c3807e 100644
--- a/contrib/zstd/lib/common/compiler.h
+++ b/sys/contrib/zstd/lib/common/compiler.h
diff --git a/contrib/zstd/lib/common/entropy_common.c b/sys/contrib/zstd/lib/common/entropy_common.c
index b37a082fee2c..b37a082fee2c 100644
--- a/contrib/zstd/lib/common/entropy_common.c
+++ b/sys/contrib/zstd/lib/common/entropy_common.c
diff --git a/contrib/zstd/lib/common/error_private.c b/sys/contrib/zstd/lib/common/error_private.c
index 11f7cdab1c60..11f7cdab1c60 100644
--- a/contrib/zstd/lib/common/error_private.c
+++ b/sys/contrib/zstd/lib/common/error_private.c
diff --git a/contrib/zstd/lib/common/error_private.h b/sys/contrib/zstd/lib/common/error_private.h
index 0d2fa7e34b01..0d2fa7e34b01 100644
--- a/contrib/zstd/lib/common/error_private.h
+++ b/sys/contrib/zstd/lib/common/error_private.h
diff --git a/contrib/zstd/lib/common/fse.h b/sys/contrib/zstd/lib/common/fse.h
index afd78019635a..afd78019635a 100644
--- a/contrib/zstd/lib/common/fse.h
+++ b/sys/contrib/zstd/lib/common/fse.h
diff --git a/contrib/zstd/lib/common/fse_decompress.c b/sys/contrib/zstd/lib/common/fse_decompress.c
index 8e3f0035f69a..8e3f0035f69a 100644
--- a/contrib/zstd/lib/common/fse_decompress.c
+++ b/sys/contrib/zstd/lib/common/fse_decompress.c
diff --git a/contrib/zstd/lib/common/huf.h b/sys/contrib/zstd/lib/common/huf.h
index 522bf9b6c003..522bf9b6c003 100644
--- a/contrib/zstd/lib/common/huf.h
+++ b/sys/contrib/zstd/lib/common/huf.h
diff --git a/contrib/zstd/lib/common/mem.h b/sys/contrib/zstd/lib/common/mem.h
index 23335c3146d7..23335c3146d7 100644
--- a/contrib/zstd/lib/common/mem.h
+++ b/sys/contrib/zstd/lib/common/mem.h
diff --git a/contrib/zstd/lib/common/pool.c b/sys/contrib/zstd/lib/common/pool.c
index 1b0fe1035d2d..1b0fe1035d2d 100644
--- a/contrib/zstd/lib/common/pool.c
+++ b/sys/contrib/zstd/lib/common/pool.c
diff --git a/contrib/zstd/lib/common/pool.h b/sys/contrib/zstd/lib/common/pool.h
index 08c63715aaa6..08c63715aaa6 100644
--- a/contrib/zstd/lib/common/pool.h
+++ b/sys/contrib/zstd/lib/common/pool.h
diff --git a/contrib/zstd/lib/common/threading.c b/sys/contrib/zstd/lib/common/threading.c
index 8be8c8da948a..8be8c8da948a 100644
--- a/contrib/zstd/lib/common/threading.c
+++ b/sys/contrib/zstd/lib/common/threading.c
diff --git a/contrib/zstd/lib/common/threading.h b/sys/contrib/zstd/lib/common/threading.h
index 197770db27a8..197770db27a8 100644
--- a/contrib/zstd/lib/common/threading.h
+++ b/sys/contrib/zstd/lib/common/threading.h
diff --git a/contrib/zstd/lib/common/xxhash.c b/sys/contrib/zstd/lib/common/xxhash.c
index ae3d76fd1cc5..ae3d76fd1cc5 100644
--- a/contrib/zstd/lib/common/xxhash.c
+++ b/sys/contrib/zstd/lib/common/xxhash.c
diff --git a/contrib/zstd/lib/common/xxhash.h b/sys/contrib/zstd/lib/common/xxhash.h
index 9bad1f59f63a..9bad1f59f63a 100644
--- a/contrib/zstd/lib/common/xxhash.h
+++ b/sys/contrib/zstd/lib/common/xxhash.h
diff --git a/contrib/zstd/lib/common/zstd_common.c b/sys/contrib/zstd/lib/common/zstd_common.c
index c2041053be7f..c2041053be7f 100644
--- a/contrib/zstd/lib/common/zstd_common.c
+++ b/sys/contrib/zstd/lib/common/zstd_common.c
diff --git a/contrib/zstd/lib/common/zstd_errors.h b/sys/contrib/zstd/lib/common/zstd_errors.h
index 4bcb7769fe77..4bcb7769fe77 100644
--- a/contrib/zstd/lib/common/zstd_errors.h
+++ b/sys/contrib/zstd/lib/common/zstd_errors.h
diff --git a/contrib/zstd/lib/common/zstd_internal.h b/sys/contrib/zstd/lib/common/zstd_internal.h
index e91cd20baa79..e91cd20baa79 100644
--- a/contrib/zstd/lib/common/zstd_internal.h
+++ b/sys/contrib/zstd/lib/common/zstd_internal.h
diff --git a/contrib/zstd/lib/compress/fse_compress.c b/sys/contrib/zstd/lib/compress/fse_compress.c
index 549c115d4238..549c115d4238 100644
--- a/contrib/zstd/lib/compress/fse_compress.c
+++ b/sys/contrib/zstd/lib/compress/fse_compress.c
diff --git a/contrib/zstd/lib/compress/huf_compress.c b/sys/contrib/zstd/lib/compress/huf_compress.c
index 5692d56e003d..5692d56e003d 100644
--- a/contrib/zstd/lib/compress/huf_compress.c
+++ b/sys/contrib/zstd/lib/compress/huf_compress.c
diff --git a/contrib/zstd/lib/compress/zstd_compress.c b/sys/contrib/zstd/lib/compress/zstd_compress.c
index 2c46c79f1c16..2c46c79f1c16 100644
--- a/contrib/zstd/lib/compress/zstd_compress.c
+++ b/sys/contrib/zstd/lib/compress/zstd_compress.c
diff --git a/contrib/zstd/lib/compress/zstd_compress.h b/sys/contrib/zstd/lib/compress/zstd_compress.h
index 94606edc935e..94606edc935e 100644
--- a/contrib/zstd/lib/compress/zstd_compress.h
+++ b/sys/contrib/zstd/lib/compress/zstd_compress.h
diff --git a/contrib/zstd/lib/compress/zstd_double_fast.c b/sys/contrib/zstd/lib/compress/zstd_double_fast.c
index 876a36042ce8..876a36042ce8 100644
--- a/contrib/zstd/lib/compress/zstd_double_fast.c
+++ b/sys/contrib/zstd/lib/compress/zstd_double_fast.c
diff --git a/contrib/zstd/lib/compress/zstd_double_fast.h b/sys/contrib/zstd/lib/compress/zstd_double_fast.h
index 3dba6c7108e5..3dba6c7108e5 100644
--- a/contrib/zstd/lib/compress/zstd_double_fast.h
+++ b/sys/contrib/zstd/lib/compress/zstd_double_fast.h
diff --git a/contrib/zstd/lib/compress/zstd_fast.c b/sys/contrib/zstd/lib/compress/zstd_fast.c
index 2e057017b92e..2e057017b92e 100644
--- a/contrib/zstd/lib/compress/zstd_fast.c
+++ b/sys/contrib/zstd/lib/compress/zstd_fast.c
diff --git a/contrib/zstd/lib/compress/zstd_fast.h b/sys/contrib/zstd/lib/compress/zstd_fast.h
index 4205141a9aa0..4205141a9aa0 100644
--- a/contrib/zstd/lib/compress/zstd_fast.h
+++ b/sys/contrib/zstd/lib/compress/zstd_fast.h
diff --git a/contrib/zstd/lib/compress/zstd_lazy.c b/sys/contrib/zstd/lib/compress/zstd_lazy.c
index 2a7f6a0fe2be..2a7f6a0fe2be 100644
--- a/contrib/zstd/lib/compress/zstd_lazy.c
+++ b/sys/contrib/zstd/lib/compress/zstd_lazy.c
diff --git a/contrib/zstd/lib/compress/zstd_lazy.h b/sys/contrib/zstd/lib/compress/zstd_lazy.h
index a9c4daed2582..a9c4daed2582 100644
--- a/contrib/zstd/lib/compress/zstd_lazy.h
+++ b/sys/contrib/zstd/lib/compress/zstd_lazy.h
diff --git a/contrib/zstd/lib/compress/zstd_ldm.c b/sys/contrib/zstd/lib/compress/zstd_ldm.c
index be50872cf767..be50872cf767 100644
--- a/contrib/zstd/lib/compress/zstd_ldm.c
+++ b/sys/contrib/zstd/lib/compress/zstd_ldm.c
diff --git a/contrib/zstd/lib/compress/zstd_ldm.h b/sys/contrib/zstd/lib/compress/zstd_ldm.h
index d6d3d42c337f..d6d3d42c337f 100644
--- a/contrib/zstd/lib/compress/zstd_ldm.h
+++ b/sys/contrib/zstd/lib/compress/zstd_ldm.h
diff --git a/contrib/zstd/lib/compress/zstd_opt.c b/sys/contrib/zstd/lib/compress/zstd_opt.c
index c47ce23ad535..c47ce23ad535 100644
--- a/contrib/zstd/lib/compress/zstd_opt.c
+++ b/sys/contrib/zstd/lib/compress/zstd_opt.c
diff --git a/contrib/zstd/lib/compress/zstd_opt.h b/sys/contrib/zstd/lib/compress/zstd_opt.h
index 816a1fabbf16..816a1fabbf16 100644
--- a/contrib/zstd/lib/compress/zstd_opt.h
+++ b/sys/contrib/zstd/lib/compress/zstd_opt.h
diff --git a/contrib/zstd/lib/compress/zstdmt_compress.c b/sys/contrib/zstd/lib/compress/zstdmt_compress.c
index 7831cd3bd81a..7831cd3bd81a 100644
--- a/contrib/zstd/lib/compress/zstdmt_compress.c
+++ b/sys/contrib/zstd/lib/compress/zstdmt_compress.c
diff --git a/contrib/zstd/lib/compress/zstdmt_compress.h b/sys/contrib/zstd/lib/compress/zstdmt_compress.h
index 8c59c684f1a3..8c59c684f1a3 100644
--- a/contrib/zstd/lib/compress/zstdmt_compress.h
+++ b/sys/contrib/zstd/lib/compress/zstdmt_compress.h
diff --git a/contrib/zstd/lib/decompress/huf_decompress.c b/sys/contrib/zstd/lib/decompress/huf_decompress.c
index 79ded96bf613..79ded96bf613 100644
--- a/contrib/zstd/lib/decompress/huf_decompress.c
+++ b/sys/contrib/zstd/lib/decompress/huf_decompress.c
diff --git a/contrib/zstd/lib/decompress/zstd_decompress.c b/sys/contrib/zstd/lib/decompress/zstd_decompress.c
index 96fc60908960..96fc60908960 100644
--- a/contrib/zstd/lib/decompress/zstd_decompress.c
+++ b/sys/contrib/zstd/lib/decompress/zstd_decompress.c
diff --git a/contrib/zstd/lib/deprecated/zbuff.h b/sys/contrib/zstd/lib/deprecated/zbuff.h
index a93115da4a1c..a93115da4a1c 100644
--- a/contrib/zstd/lib/deprecated/zbuff.h
+++ b/sys/contrib/zstd/lib/deprecated/zbuff.h
diff --git a/contrib/zstd/lib/deprecated/zbuff_common.c b/sys/contrib/zstd/lib/deprecated/zbuff_common.c
index 661b9b0e18c5..661b9b0e18c5 100644
--- a/contrib/zstd/lib/deprecated/zbuff_common.c
+++ b/sys/contrib/zstd/lib/deprecated/zbuff_common.c
diff --git a/contrib/zstd/lib/deprecated/zbuff_compress.c b/sys/contrib/zstd/lib/deprecated/zbuff_compress.c
index 8adbaec260d5..8adbaec260d5 100644
--- a/contrib/zstd/lib/deprecated/zbuff_compress.c
+++ b/sys/contrib/zstd/lib/deprecated/zbuff_compress.c
diff --git a/contrib/zstd/lib/deprecated/zbuff_decompress.c b/sys/contrib/zstd/lib/deprecated/zbuff_decompress.c
index 923c22b73c57..923c22b73c57 100644
--- a/contrib/zstd/lib/deprecated/zbuff_decompress.c
+++ b/sys/contrib/zstd/lib/deprecated/zbuff_decompress.c
diff --git a/contrib/zstd/lib/dictBuilder/cover.c b/sys/contrib/zstd/lib/dictBuilder/cover.c
index efdffddbf930..efdffddbf930 100644
--- a/contrib/zstd/lib/dictBuilder/cover.c
+++ b/sys/contrib/zstd/lib/dictBuilder/cover.c
diff --git a/contrib/zstd/lib/dictBuilder/divsufsort.c b/sys/contrib/zstd/lib/dictBuilder/divsufsort.c
index 60cceb088321..60cceb088321 100644
--- a/contrib/zstd/lib/dictBuilder/divsufsort.c
+++ b/sys/contrib/zstd/lib/dictBuilder/divsufsort.c
diff --git a/contrib/zstd/lib/dictBuilder/divsufsort.h b/sys/contrib/zstd/lib/dictBuilder/divsufsort.h
index 5440994af15c..5440994af15c 100644
--- a/contrib/zstd/lib/dictBuilder/divsufsort.h
+++ b/sys/contrib/zstd/lib/dictBuilder/divsufsort.h
diff --git a/contrib/zstd/lib/dictBuilder/zdict.c b/sys/contrib/zstd/lib/dictBuilder/zdict.c
index 1bb8b0683d04..1bb8b0683d04 100644
--- a/contrib/zstd/lib/dictBuilder/zdict.c
+++ b/sys/contrib/zstd/lib/dictBuilder/zdict.c
diff --git a/contrib/zstd/lib/dictBuilder/zdict.h b/sys/contrib/zstd/lib/dictBuilder/zdict.h
index 5f0000b1c7c8..5f0000b1c7c8 100644
--- a/contrib/zstd/lib/dictBuilder/zdict.h
+++ b/sys/contrib/zstd/lib/dictBuilder/zdict.h
diff --git a/contrib/zstd/lib/legacy/zstd_legacy.h b/sys/contrib/zstd/lib/legacy/zstd_legacy.h
index 487ff0b284b5..487ff0b284b5 100644
--- a/contrib/zstd/lib/legacy/zstd_legacy.h
+++ b/sys/contrib/zstd/lib/legacy/zstd_legacy.h
diff --git a/contrib/zstd/lib/legacy/zstd_v01.c b/sys/contrib/zstd/lib/legacy/zstd_v01.c
index 70003cbedffd..70003cbedffd 100644
--- a/contrib/zstd/lib/legacy/zstd_v01.c
+++ b/sys/contrib/zstd/lib/legacy/zstd_v01.c
diff --git a/contrib/zstd/lib/legacy/zstd_v01.h b/sys/contrib/zstd/lib/legacy/zstd_v01.h
index 42f0897c7d23..42f0897c7d23 100644
--- a/contrib/zstd/lib/legacy/zstd_v01.h
+++ b/sys/contrib/zstd/lib/legacy/zstd_v01.h
diff --git a/contrib/zstd/lib/legacy/zstd_v02.c b/sys/contrib/zstd/lib/legacy/zstd_v02.c
index b935a4d18005..b935a4d18005 100644
--- a/contrib/zstd/lib/legacy/zstd_v02.c
+++ b/sys/contrib/zstd/lib/legacy/zstd_v02.c
diff --git a/contrib/zstd/lib/legacy/zstd_v02.h b/sys/contrib/zstd/lib/legacy/zstd_v02.h
index 0dde7a63773c..0dde7a63773c 100644
--- a/contrib/zstd/lib/legacy/zstd_v02.h
+++ b/sys/contrib/zstd/lib/legacy/zstd_v02.h
diff --git a/contrib/zstd/lib/legacy/zstd_v03.c b/sys/contrib/zstd/lib/legacy/zstd_v03.c
index 35370dd0ca61..35370dd0ca61 100644
--- a/contrib/zstd/lib/legacy/zstd_v03.c
+++ b/sys/contrib/zstd/lib/legacy/zstd_v03.c
diff --git a/contrib/zstd/lib/legacy/zstd_v03.h b/sys/contrib/zstd/lib/legacy/zstd_v03.h
index b4449e2999e0..b4449e2999e0 100644
--- a/contrib/zstd/lib/legacy/zstd_v03.h
+++ b/sys/contrib/zstd/lib/legacy/zstd_v03.h
diff --git a/contrib/zstd/lib/legacy/zstd_v04.c b/sys/contrib/zstd/lib/legacy/zstd_v04.c
index 1b5f6f3b0cdb..1b5f6f3b0cdb 100644
--- a/contrib/zstd/lib/legacy/zstd_v04.c
+++ b/sys/contrib/zstd/lib/legacy/zstd_v04.c
diff --git a/contrib/zstd/lib/legacy/zstd_v04.h b/sys/contrib/zstd/lib/legacy/zstd_v04.h
index 6391631fc432..6391631fc432 100644
--- a/contrib/zstd/lib/legacy/zstd_v04.h
+++ b/sys/contrib/zstd/lib/legacy/zstd_v04.h
diff --git a/contrib/zstd/lib/legacy/zstd_v05.c b/sys/contrib/zstd/lib/legacy/zstd_v05.c
index 23188f504d38..23188f504d38 100644
--- a/contrib/zstd/lib/legacy/zstd_v05.c
+++ b/sys/contrib/zstd/lib/legacy/zstd_v05.c
diff --git a/contrib/zstd/lib/legacy/zstd_v05.h b/sys/contrib/zstd/lib/legacy/zstd_v05.h
index b68fd578ee9f..b68fd578ee9f 100644
--- a/contrib/zstd/lib/legacy/zstd_v05.h
+++ b/sys/contrib/zstd/lib/legacy/zstd_v05.h
diff --git a/contrib/zstd/lib/legacy/zstd_v06.c b/sys/contrib/zstd/lib/legacy/zstd_v06.c
index 62683f994a95..62683f994a95 100644
--- a/contrib/zstd/lib/legacy/zstd_v06.c
+++ b/sys/contrib/zstd/lib/legacy/zstd_v06.c
diff --git a/contrib/zstd/lib/legacy/zstd_v06.h b/sys/contrib/zstd/lib/legacy/zstd_v06.h
index fb4eb37c89e2..fb4eb37c89e2 100644
--- a/contrib/zstd/lib/legacy/zstd_v06.h
+++ b/sys/contrib/zstd/lib/legacy/zstd_v06.h
diff --git a/contrib/zstd/lib/legacy/zstd_v07.c b/sys/contrib/zstd/lib/legacy/zstd_v07.c
index aad9b1f659f8..aad9b1f659f8 100644
--- a/contrib/zstd/lib/legacy/zstd_v07.c
+++ b/sys/contrib/zstd/lib/legacy/zstd_v07.c
diff --git a/contrib/zstd/lib/legacy/zstd_v07.h b/sys/contrib/zstd/lib/legacy/zstd_v07.h
index 6591cd3014b0..6591cd3014b0 100644
--- a/contrib/zstd/lib/legacy/zstd_v07.h
+++ b/sys/contrib/zstd/lib/legacy/zstd_v07.h
diff --git a/contrib/zstd/lib/libzstd.pc.in b/sys/contrib/zstd/lib/libzstd.pc.in
index 1d07b91f25ab..1d07b91f25ab 100644
--- a/contrib/zstd/lib/libzstd.pc.in
+++ b/sys/contrib/zstd/lib/libzstd.pc.in
diff --git a/contrib/zstd/lib/zstd.h b/sys/contrib/zstd/lib/zstd.h
index 2194a3b23d6d..2194a3b23d6d 100644
--- a/contrib/zstd/lib/zstd.h
+++ b/sys/contrib/zstd/lib/zstd.h
diff --git a/contrib/zstd/programs/.gitignore b/sys/contrib/zstd/programs/.gitignore
index 701830c777c2..701830c777c2 100644
--- a/contrib/zstd/programs/.gitignore
+++ b/sys/contrib/zstd/programs/.gitignore
diff --git a/contrib/zstd/programs/BUCK b/sys/contrib/zstd/programs/BUCK
index 069403042993..069403042993 100644
--- a/contrib/zstd/programs/BUCK
+++ b/sys/contrib/zstd/programs/BUCK
diff --git a/contrib/zstd/programs/Makefile b/sys/contrib/zstd/programs/Makefile
index cbb67e9fe349..cbb67e9fe349 100644
--- a/contrib/zstd/programs/Makefile
+++ b/sys/contrib/zstd/programs/Makefile
diff --git a/contrib/zstd/programs/README.md b/sys/contrib/zstd/programs/README.md
index 2da9a6db1261..2da9a6db1261 100644
--- a/contrib/zstd/programs/README.md
+++ b/sys/contrib/zstd/programs/README.md
diff --git a/contrib/zstd/programs/bench.c b/sys/contrib/zstd/programs/bench.c
index ec99c61cebf6..ec99c61cebf6 100644
--- a/contrib/zstd/programs/bench.c
+++ b/sys/contrib/zstd/programs/bench.c
diff --git a/contrib/zstd/programs/bench.h b/sys/contrib/zstd/programs/bench.h
index 82bb345696a7..82bb345696a7 100644
--- a/contrib/zstd/programs/bench.h
+++ b/sys/contrib/zstd/programs/bench.h
diff --git a/contrib/zstd/programs/datagen.c b/sys/contrib/zstd/programs/datagen.c
index a489d6af08d7..a489d6af08d7 100644
--- a/contrib/zstd/programs/datagen.c
+++ b/sys/contrib/zstd/programs/datagen.c
diff --git a/contrib/zstd/programs/datagen.h b/sys/contrib/zstd/programs/datagen.h
index 2fcc980e5e76..2fcc980e5e76 100644
--- a/contrib/zstd/programs/datagen.h
+++ b/sys/contrib/zstd/programs/datagen.h
diff --git a/contrib/zstd/programs/dibio.c b/sys/contrib/zstd/programs/dibio.c
index 2cb2a42671a0..2cb2a42671a0 100644
--- a/contrib/zstd/programs/dibio.c
+++ b/sys/contrib/zstd/programs/dibio.c
diff --git a/contrib/zstd/programs/dibio.h b/sys/contrib/zstd/programs/dibio.h
index 499e3036520c..499e3036520c 100644
--- a/contrib/zstd/programs/dibio.h
+++ b/sys/contrib/zstd/programs/dibio.h
diff --git a/contrib/zstd/programs/fileio.c b/sys/contrib/zstd/programs/fileio.c
index dedea009a941..dedea009a941 100644
--- a/contrib/zstd/programs/fileio.c
+++ b/sys/contrib/zstd/programs/fileio.c
diff --git a/contrib/zstd/programs/fileio.h b/sys/contrib/zstd/programs/fileio.h
index aa4484fdce0c..aa4484fdce0c 100644
--- a/contrib/zstd/programs/fileio.h
+++ b/sys/contrib/zstd/programs/fileio.h
diff --git a/contrib/zstd/programs/platform.h b/sys/contrib/zstd/programs/platform.h
index a4d7850fd714..a4d7850fd714 100644
--- a/contrib/zstd/programs/platform.h
+++ b/sys/contrib/zstd/programs/platform.h
diff --git a/contrib/zstd/programs/util.h b/sys/contrib/zstd/programs/util.h
index c8be5f5fb574..c8be5f5fb574 100644
--- a/contrib/zstd/programs/util.h
+++ b/sys/contrib/zstd/programs/util.h
diff --git a/contrib/zstd/programs/zstd.1 b/sys/contrib/zstd/programs/zstd.1
index 8187c7403509..8187c7403509 100644
--- a/contrib/zstd/programs/zstd.1
+++ b/sys/contrib/zstd/programs/zstd.1
diff --git a/contrib/zstd/programs/zstd.1.md b/sys/contrib/zstd/programs/zstd.1.md
index eea68548982e..eea68548982e 100644
--- a/contrib/zstd/programs/zstd.1.md
+++ b/sys/contrib/zstd/programs/zstd.1.md
diff --git a/contrib/zstd/programs/zstdcli.c b/sys/contrib/zstd/programs/zstdcli.c
index e76e6d75a4d1..e76e6d75a4d1 100644
--- a/contrib/zstd/programs/zstdcli.c
+++ b/sys/contrib/zstd/programs/zstdcli.c
diff --git a/contrib/zstd/programs/zstdgrep b/sys/contrib/zstd/programs/zstdgrep
index 9f871c03f1aa..9f871c03f1aa 100755
--- a/contrib/zstd/programs/zstdgrep
+++ b/sys/contrib/zstd/programs/zstdgrep
diff --git a/contrib/zstd/programs/zstdless b/sys/contrib/zstd/programs/zstdless
index 893799e7d95a..893799e7d95a 100755
--- a/contrib/zstd/programs/zstdless
+++ b/sys/contrib/zstd/programs/zstdless
diff --git a/contrib/zstd/tests/.gitignore b/sys/contrib/zstd/tests/.gitignore
index b16e26e3d490..b16e26e3d490 100644
--- a/contrib/zstd/tests/.gitignore
+++ b/sys/contrib/zstd/tests/.gitignore
diff --git a/contrib/zstd/tests/Makefile b/sys/contrib/zstd/tests/Makefile
index 651833bbbaae..651833bbbaae 100644
--- a/contrib/zstd/tests/Makefile
+++ b/sys/contrib/zstd/tests/Makefile
diff --git a/contrib/zstd/tests/README.md b/sys/contrib/zstd/tests/README.md
index 24a28ab7b9d0..24a28ab7b9d0 100644
--- a/contrib/zstd/tests/README.md
+++ b/sys/contrib/zstd/tests/README.md
diff --git a/contrib/zstd/tests/datagencli.c b/sys/contrib/zstd/tests/datagencli.c
index 4814974e27f5..4814974e27f5 100644
--- a/contrib/zstd/tests/datagencli.c
+++ b/sys/contrib/zstd/tests/datagencli.c
diff --git a/contrib/zstd/tests/decodecorpus.c b/sys/contrib/zstd/tests/decodecorpus.c
index e697e519cfc1..e697e519cfc1 100644
--- a/contrib/zstd/tests/decodecorpus.c
+++ b/sys/contrib/zstd/tests/decodecorpus.c
diff --git a/contrib/zstd/tests/files/huffman-compressed-larger b/sys/contrib/zstd/tests/files/huffman-compressed-larger
index f594f1ae9816..f594f1ae9816 100644
--- a/contrib/zstd/tests/files/huffman-compressed-larger
+++ b/sys/contrib/zstd/tests/files/huffman-compressed-larger
diff --git a/contrib/zstd/tests/fullbench.c b/sys/contrib/zstd/tests/fullbench.c
index db00ce217b0e..db00ce217b0e 100644
--- a/contrib/zstd/tests/fullbench.c
+++ b/sys/contrib/zstd/tests/fullbench.c
diff --git a/contrib/zstd/tests/fuzz/Makefile b/sys/contrib/zstd/tests/fuzz/Makefile
index d9b00fd2af79..d9b00fd2af79 100644
--- a/contrib/zstd/tests/fuzz/Makefile
+++ b/sys/contrib/zstd/tests/fuzz/Makefile
diff --git a/contrib/zstd/tests/fuzz/README.md b/sys/contrib/zstd/tests/fuzz/README.md
index f184be646ef6..f184be646ef6 100644
--- a/contrib/zstd/tests/fuzz/README.md
+++ b/sys/contrib/zstd/tests/fuzz/README.md
diff --git a/contrib/zstd/tests/fuzz/block_decompress.c b/sys/contrib/zstd/tests/fuzz/block_decompress.c
index 3cccc32f4e52..3cccc32f4e52 100644
--- a/contrib/zstd/tests/fuzz/block_decompress.c
+++ b/sys/contrib/zstd/tests/fuzz/block_decompress.c
diff --git a/contrib/zstd/tests/fuzz/block_round_trip.c b/sys/contrib/zstd/tests/fuzz/block_round_trip.c
index 64ca5fc40f9c..64ca5fc40f9c 100644
--- a/contrib/zstd/tests/fuzz/block_round_trip.c
+++ b/sys/contrib/zstd/tests/fuzz/block_round_trip.c
diff --git a/contrib/zstd/tests/fuzz/default.options b/sys/contrib/zstd/tests/fuzz/default.options
index 8ea8588375d7..8ea8588375d7 100644
--- a/contrib/zstd/tests/fuzz/default.options
+++ b/sys/contrib/zstd/tests/fuzz/default.options
diff --git a/contrib/zstd/tests/fuzz/fuzz.h b/sys/contrib/zstd/tests/fuzz/fuzz.h
index a64845473c2b..a64845473c2b 100644
--- a/contrib/zstd/tests/fuzz/fuzz.h
+++ b/sys/contrib/zstd/tests/fuzz/fuzz.h
diff --git a/contrib/zstd/tests/fuzz/fuzz.py b/sys/contrib/zstd/tests/fuzz/fuzz.py
index b591e4f6734e..b591e4f6734e 100755
--- a/contrib/zstd/tests/fuzz/fuzz.py
+++ b/sys/contrib/zstd/tests/fuzz/fuzz.py
diff --git a/contrib/zstd/tests/fuzz/fuzz_helpers.h b/sys/contrib/zstd/tests/fuzz/fuzz_helpers.h
index 468c39fb42d4..468c39fb42d4 100644
--- a/contrib/zstd/tests/fuzz/fuzz_helpers.h
+++ b/sys/contrib/zstd/tests/fuzz/fuzz_helpers.h
diff --git a/contrib/zstd/tests/fuzz/regression_driver.c b/sys/contrib/zstd/tests/fuzz/regression_driver.c
index 2b714d29e9dd..2b714d29e9dd 100644
--- a/contrib/zstd/tests/fuzz/regression_driver.c
+++ b/sys/contrib/zstd/tests/fuzz/regression_driver.c
diff --git a/contrib/zstd/tests/fuzz/simple_decompress.c b/sys/contrib/zstd/tests/fuzz/simple_decompress.c
index bba272c62256..bba272c62256 100644
--- a/contrib/zstd/tests/fuzz/simple_decompress.c
+++ b/sys/contrib/zstd/tests/fuzz/simple_decompress.c
diff --git a/contrib/zstd/tests/fuzz/simple_round_trip.c b/sys/contrib/zstd/tests/fuzz/simple_round_trip.c
index 0921106dea8e..0921106dea8e 100644
--- a/contrib/zstd/tests/fuzz/simple_round_trip.c
+++ b/sys/contrib/zstd/tests/fuzz/simple_round_trip.c
diff --git a/contrib/zstd/tests/fuzz/stream_decompress.c b/sys/contrib/zstd/tests/fuzz/stream_decompress.c
index 7ad571221dff..7ad571221dff 100644
--- a/contrib/zstd/tests/fuzz/stream_decompress.c
+++ b/sys/contrib/zstd/tests/fuzz/stream_decompress.c
diff --git a/contrib/zstd/tests/fuzz/stream_round_trip.c b/sys/contrib/zstd/tests/fuzz/stream_round_trip.c
index 72d70495f836..72d70495f836 100644
--- a/contrib/zstd/tests/fuzz/stream_round_trip.c
+++ b/sys/contrib/zstd/tests/fuzz/stream_round_trip.c
diff --git a/contrib/zstd/tests/fuzz/zstd_helpers.c b/sys/contrib/zstd/tests/fuzz/zstd_helpers.c
index 602898479bc2..602898479bc2 100644
--- a/contrib/zstd/tests/fuzz/zstd_helpers.c
+++ b/sys/contrib/zstd/tests/fuzz/zstd_helpers.c
diff --git a/contrib/zstd/tests/fuzz/zstd_helpers.h b/sys/contrib/zstd/tests/fuzz/zstd_helpers.h
index 3856bebecf7e..3856bebecf7e 100644
--- a/contrib/zstd/tests/fuzz/zstd_helpers.h
+++ b/sys/contrib/zstd/tests/fuzz/zstd_helpers.h
diff --git a/contrib/zstd/tests/fuzzer.c b/sys/contrib/zstd/tests/fuzzer.c
index 76df77af9015..76df77af9015 100644
--- a/contrib/zstd/tests/fuzzer.c
+++ b/sys/contrib/zstd/tests/fuzzer.c
diff --git a/contrib/zstd/tests/gzip/Makefile b/sys/contrib/zstd/tests/gzip/Makefile
index 40a0ba97d2b3..40a0ba97d2b3 100644
--- a/contrib/zstd/tests/gzip/Makefile
+++ b/sys/contrib/zstd/tests/gzip/Makefile
diff --git a/contrib/zstd/tests/gzip/gzip-env.sh b/sys/contrib/zstd/tests/gzip/gzip-env.sh
index 120e52d78d49..120e52d78d49 100755
--- a/contrib/zstd/tests/gzip/gzip-env.sh
+++ b/sys/contrib/zstd/tests/gzip/gzip-env.sh
diff --git a/contrib/zstd/tests/gzip/helin-segv.sh b/sys/contrib/zstd/tests/gzip/helin-segv.sh
index f182c8066f34..f182c8066f34 100755
--- a/contrib/zstd/tests/gzip/helin-segv.sh
+++ b/sys/contrib/zstd/tests/gzip/helin-segv.sh
diff --git a/contrib/zstd/tests/gzip/help-version.sh b/sys/contrib/zstd/tests/gzip/help-version.sh
index ee0c19f7d1fc..ee0c19f7d1fc 100755
--- a/contrib/zstd/tests/gzip/help-version.sh
+++ b/sys/contrib/zstd/tests/gzip/help-version.sh
diff --git a/contrib/zstd/tests/gzip/hufts-segv.gz b/sys/contrib/zstd/tests/gzip/hufts-segv.gz
index 32cb2a256844..32cb2a256844 100644
--- a/contrib/zstd/tests/gzip/hufts-segv.gz
+++ b/sys/contrib/zstd/tests/gzip/hufts-segv.gz
diff --git a/contrib/zstd/tests/gzip/hufts.sh b/sys/contrib/zstd/tests/gzip/hufts.sh
index 9b9576ce34e5..9b9576ce34e5 100755
--- a/contrib/zstd/tests/gzip/hufts.sh
+++ b/sys/contrib/zstd/tests/gzip/hufts.sh
diff --git a/contrib/zstd/tests/gzip/init.cfg b/sys/contrib/zstd/tests/gzip/init.cfg
index 901209ceae96..901209ceae96 100644
--- a/contrib/zstd/tests/gzip/init.cfg
+++ b/sys/contrib/zstd/tests/gzip/init.cfg
diff --git a/contrib/zstd/tests/gzip/init.sh b/sys/contrib/zstd/tests/gzip/init.sh
index 97e4e4ba5e69..97e4e4ba5e69 100755
--- a/contrib/zstd/tests/gzip/init.sh
+++ b/sys/contrib/zstd/tests/gzip/init.sh
diff --git a/contrib/zstd/tests/gzip/keep.sh b/sys/contrib/zstd/tests/gzip/keep.sh
index ab9a21811d31..ab9a21811d31 100755
--- a/contrib/zstd/tests/gzip/keep.sh
+++ b/sys/contrib/zstd/tests/gzip/keep.sh
diff --git a/contrib/zstd/tests/gzip/list.sh b/sys/contrib/zstd/tests/gzip/list.sh
index 75912e1e26d7..75912e1e26d7 100755
--- a/contrib/zstd/tests/gzip/list.sh
+++ b/sys/contrib/zstd/tests/gzip/list.sh
diff --git a/contrib/zstd/tests/gzip/memcpy-abuse.sh b/sys/contrib/zstd/tests/gzip/memcpy-abuse.sh
index 7d5c056debc6..7d5c056debc6 100755
--- a/contrib/zstd/tests/gzip/memcpy-abuse.sh
+++ b/sys/contrib/zstd/tests/gzip/memcpy-abuse.sh
diff --git a/contrib/zstd/tests/gzip/mixed.sh b/sys/contrib/zstd/tests/gzip/mixed.sh
index 383a54f5e46e..383a54f5e46e 100755
--- a/contrib/zstd/tests/gzip/mixed.sh
+++ b/sys/contrib/zstd/tests/gzip/mixed.sh
diff --git a/contrib/zstd/tests/gzip/null-suffix-clobber.sh b/sys/contrib/zstd/tests/gzip/null-suffix-clobber.sh
index 0efd0e344908..0efd0e344908 100755
--- a/contrib/zstd/tests/gzip/null-suffix-clobber.sh
+++ b/sys/contrib/zstd/tests/gzip/null-suffix-clobber.sh
diff --git a/contrib/zstd/tests/gzip/stdin.sh b/sys/contrib/zstd/tests/gzip/stdin.sh
index eef4cd8b1078..eef4cd8b1078 100755
--- a/contrib/zstd/tests/gzip/stdin.sh
+++ b/sys/contrib/zstd/tests/gzip/stdin.sh
diff --git a/contrib/zstd/tests/gzip/test-driver.sh b/sys/contrib/zstd/tests/gzip/test-driver.sh
index 649c084e4b0f..649c084e4b0f 100755
--- a/contrib/zstd/tests/gzip/test-driver.sh
+++ b/sys/contrib/zstd/tests/gzip/test-driver.sh
diff --git a/contrib/zstd/tests/gzip/trailing-nul.sh b/sys/contrib/zstd/tests/gzip/trailing-nul.sh
index 7b15d5e55788..7b15d5e55788 100755
--- a/contrib/zstd/tests/gzip/trailing-nul.sh
+++ b/sys/contrib/zstd/tests/gzip/trailing-nul.sh
diff --git a/contrib/zstd/tests/gzip/unpack-invalid.sh b/sys/contrib/zstd/tests/gzip/unpack-invalid.sh
index fe8384d73cde..fe8384d73cde 100755
--- a/contrib/zstd/tests/gzip/unpack-invalid.sh
+++ b/sys/contrib/zstd/tests/gzip/unpack-invalid.sh
diff --git a/contrib/zstd/tests/gzip/z-suffix.sh b/sys/contrib/zstd/tests/gzip/z-suffix.sh
index a870a5408de0..a870a5408de0 100755
--- a/contrib/zstd/tests/gzip/z-suffix.sh
+++ b/sys/contrib/zstd/tests/gzip/z-suffix.sh
diff --git a/contrib/zstd/tests/gzip/zdiff.sh b/sys/contrib/zstd/tests/gzip/zdiff.sh
index d62a84606ba4..d62a84606ba4 100755
--- a/contrib/zstd/tests/gzip/zdiff.sh
+++ b/sys/contrib/zstd/tests/gzip/zdiff.sh
diff --git a/contrib/zstd/tests/gzip/zgrep-context.sh b/sys/contrib/zstd/tests/gzip/zgrep-context.sh
index c8648b7e4f55..c8648b7e4f55 100755
--- a/contrib/zstd/tests/gzip/zgrep-context.sh
+++ b/sys/contrib/zstd/tests/gzip/zgrep-context.sh
diff --git a/contrib/zstd/tests/gzip/zgrep-f.sh b/sys/contrib/zstd/tests/gzip/zgrep-f.sh
index d0cf27f7e231..d0cf27f7e231 100755
--- a/contrib/zstd/tests/gzip/zgrep-f.sh
+++ b/sys/contrib/zstd/tests/gzip/zgrep-f.sh
diff --git a/contrib/zstd/tests/gzip/zgrep-signal.sh b/sys/contrib/zstd/tests/gzip/zgrep-signal.sh
index a8c53881adde..a8c53881adde 100755
--- a/contrib/zstd/tests/gzip/zgrep-signal.sh
+++ b/sys/contrib/zstd/tests/gzip/zgrep-signal.sh
diff --git a/contrib/zstd/tests/gzip/znew-k.sh b/sys/contrib/zstd/tests/gzip/znew-k.sh
index 6c239e28ea8f..6c239e28ea8f 100755
--- a/contrib/zstd/tests/gzip/znew-k.sh
+++ b/sys/contrib/zstd/tests/gzip/znew-k.sh
diff --git a/contrib/zstd/tests/invalidDictionaries.c b/sys/contrib/zstd/tests/invalidDictionaries.c
index b23db036f489..b23db036f489 100644
--- a/contrib/zstd/tests/invalidDictionaries.c
+++ b/sys/contrib/zstd/tests/invalidDictionaries.c
diff --git a/contrib/zstd/tests/legacy.c b/sys/contrib/zstd/tests/legacy.c
index 46a8206c4422..46a8206c4422 100644
--- a/contrib/zstd/tests/legacy.c
+++ b/sys/contrib/zstd/tests/legacy.c
diff --git a/contrib/zstd/tests/longmatch.c b/sys/contrib/zstd/tests/longmatch.c
index ed3861571d9b..ed3861571d9b 100644
--- a/contrib/zstd/tests/longmatch.c
+++ b/sys/contrib/zstd/tests/longmatch.c
diff --git a/contrib/zstd/tests/namespaceTest.c b/sys/contrib/zstd/tests/namespaceTest.c
index 5b7095f67c80..5b7095f67c80 100644
--- a/contrib/zstd/tests/namespaceTest.c
+++ b/sys/contrib/zstd/tests/namespaceTest.c
diff --git a/contrib/zstd/tests/paramgrill.c b/sys/contrib/zstd/tests/paramgrill.c
index 317ec461ca91..317ec461ca91 100644
--- a/contrib/zstd/tests/paramgrill.c
+++ b/sys/contrib/zstd/tests/paramgrill.c
diff --git a/contrib/zstd/tests/playTests.sh b/sys/contrib/zstd/tests/playTests.sh
index bc021648cfcb..bc021648cfcb 100755
--- a/contrib/zstd/tests/playTests.sh
+++ b/sys/contrib/zstd/tests/playTests.sh
diff --git a/contrib/zstd/tests/poolTests.c b/sys/contrib/zstd/tests/poolTests.c
index 00ee830154c9..00ee830154c9 100644
--- a/contrib/zstd/tests/poolTests.c
+++ b/sys/contrib/zstd/tests/poolTests.c
diff --git a/contrib/zstd/tests/roundTripCrash.c b/sys/contrib/zstd/tests/roundTripCrash.c
index 180fa9b6f6dc..180fa9b6f6dc 100644
--- a/contrib/zstd/tests/roundTripCrash.c
+++ b/sys/contrib/zstd/tests/roundTripCrash.c
diff --git a/contrib/zstd/tests/symbols.c b/sys/contrib/zstd/tests/symbols.c
index c0bed2e5d96e..c0bed2e5d96e 100644
--- a/contrib/zstd/tests/symbols.c
+++ b/sys/contrib/zstd/tests/symbols.c
diff --git a/contrib/zstd/tests/test-zstd-speed.py b/sys/contrib/zstd/tests/test-zstd-speed.py
index 1096d5e4e224..1096d5e4e224 100755
--- a/contrib/zstd/tests/test-zstd-speed.py
+++ b/sys/contrib/zstd/tests/test-zstd-speed.py
diff --git a/contrib/zstd/tests/test-zstd-versions.py b/sys/contrib/zstd/tests/test-zstd-versions.py
index f2deac1f28da..f2deac1f28da 100755
--- a/contrib/zstd/tests/test-zstd-versions.py
+++ b/sys/contrib/zstd/tests/test-zstd-versions.py
diff --git a/contrib/zstd/tests/zbufftest.c b/sys/contrib/zstd/tests/zbufftest.c
index e64c886a5e75..e64c886a5e75 100644
--- a/contrib/zstd/tests/zbufftest.c
+++ b/sys/contrib/zstd/tests/zbufftest.c
diff --git a/contrib/zstd/tests/zstreamtest.c b/sys/contrib/zstd/tests/zstreamtest.c
index 8b4c836940a6..8b4c836940a6 100644
--- a/contrib/zstd/tests/zstreamtest.c
+++ b/sys/contrib/zstd/tests/zstreamtest.c
diff --git a/contrib/zstd/zlibWrapper/.gitignore b/sys/contrib/zstd/zlibWrapper/.gitignore
index 6167ca4dac88..6167ca4dac88 100644
--- a/contrib/zstd/zlibWrapper/.gitignore
+++ b/sys/contrib/zstd/zlibWrapper/.gitignore
diff --git a/contrib/zstd/zlibWrapper/BUCK b/sys/contrib/zstd/zlibWrapper/BUCK
index a3b74ac3f9fa..a3b74ac3f9fa 100644
--- a/contrib/zstd/zlibWrapper/BUCK
+++ b/sys/contrib/zstd/zlibWrapper/BUCK
diff --git a/contrib/zstd/zlibWrapper/Makefile b/sys/contrib/zstd/zlibWrapper/Makefile
index c1896f8b80a3..c1896f8b80a3 100644
--- a/contrib/zstd/zlibWrapper/Makefile
+++ b/sys/contrib/zstd/zlibWrapper/Makefile
diff --git a/contrib/zstd/zlibWrapper/README.md b/sys/contrib/zstd/zlibWrapper/README.md
index 164b69ace81f..164b69ace81f 100644
--- a/contrib/zstd/zlibWrapper/README.md
+++ b/sys/contrib/zstd/zlibWrapper/README.md
diff --git a/contrib/zstd/zlibWrapper/examples/example.c b/sys/contrib/zstd/zlibWrapper/examples/example.c
index 9000f7a3295e..9000f7a3295e 100644
--- a/contrib/zstd/zlibWrapper/examples/example.c
+++ b/sys/contrib/zstd/zlibWrapper/examples/example.c
diff --git a/contrib/zstd/zlibWrapper/examples/example_original.c b/sys/contrib/zstd/zlibWrapper/examples/example_original.c
index 649882bf0a77..649882bf0a77 100644
--- a/contrib/zstd/zlibWrapper/examples/example_original.c
+++ b/sys/contrib/zstd/zlibWrapper/examples/example_original.c
diff --git a/contrib/zstd/zlibWrapper/examples/fitblk.c b/sys/contrib/zstd/zlibWrapper/examples/fitblk.c
index ee413c3ae916..ee413c3ae916 100644
--- a/contrib/zstd/zlibWrapper/examples/fitblk.c
+++ b/sys/contrib/zstd/zlibWrapper/examples/fitblk.c
diff --git a/contrib/zstd/zlibWrapper/examples/fitblk_original.c b/sys/contrib/zstd/zlibWrapper/examples/fitblk_original.c
index c61de5c99672..c61de5c99672 100644
--- a/contrib/zstd/zlibWrapper/examples/fitblk_original.c
+++ b/sys/contrib/zstd/zlibWrapper/examples/fitblk_original.c
diff --git a/contrib/zstd/zlibWrapper/examples/minigzip.c b/sys/contrib/zstd/zlibWrapper/examples/minigzip.c
index 521d047117c5..521d047117c5 100644
--- a/contrib/zstd/zlibWrapper/examples/minigzip.c
+++ b/sys/contrib/zstd/zlibWrapper/examples/minigzip.c
diff --git a/contrib/zstd/zlibWrapper/examples/zwrapbench.c b/sys/contrib/zstd/zlibWrapper/examples/zwrapbench.c
index 25a23f885737..25a23f885737 100644
--- a/contrib/zstd/zlibWrapper/examples/zwrapbench.c
+++ b/sys/contrib/zstd/zlibWrapper/examples/zwrapbench.c
diff --git a/contrib/zstd/zlibWrapper/gzclose.c b/sys/contrib/zstd/zlibWrapper/gzclose.c
index d4493d010d74..d4493d010d74 100644
--- a/contrib/zstd/zlibWrapper/gzclose.c
+++ b/sys/contrib/zstd/zlibWrapper/gzclose.c
diff --git a/contrib/zstd/zlibWrapper/gzcompatibility.h b/sys/contrib/zstd/zlibWrapper/gzcompatibility.h
index ea8d50c8238a..ea8d50c8238a 100644
--- a/contrib/zstd/zlibWrapper/gzcompatibility.h
+++ b/sys/contrib/zstd/zlibWrapper/gzcompatibility.h
diff --git a/contrib/zstd/zlibWrapper/gzguts.h b/sys/contrib/zstd/zlibWrapper/gzguts.h
index 84651b88d389..84651b88d389 100644
--- a/contrib/zstd/zlibWrapper/gzguts.h
+++ b/sys/contrib/zstd/zlibWrapper/gzguts.h
diff --git a/contrib/zstd/zlibWrapper/gzlib.c b/sys/contrib/zstd/zlibWrapper/gzlib.c
index 8235cff4fda1..8235cff4fda1 100644
--- a/contrib/zstd/zlibWrapper/gzlib.c
+++ b/sys/contrib/zstd/zlibWrapper/gzlib.c
diff --git a/contrib/zstd/zlibWrapper/gzread.c b/sys/contrib/zstd/zlibWrapper/gzread.c
index 88fc06c77f42..88fc06c77f42 100644
--- a/contrib/zstd/zlibWrapper/gzread.c
+++ b/sys/contrib/zstd/zlibWrapper/gzread.c
diff --git a/contrib/zstd/zlibWrapper/gzwrite.c b/sys/contrib/zstd/zlibWrapper/gzwrite.c
index d1250b90084d..d1250b90084d 100644
--- a/contrib/zstd/zlibWrapper/gzwrite.c
+++ b/sys/contrib/zstd/zlibWrapper/gzwrite.c
diff --git a/contrib/zstd/zlibWrapper/zstd_zlibwrapper.c b/sys/contrib/zstd/zlibWrapper/zstd_zlibwrapper.c
index c5fbdf98e19d..c5fbdf98e19d 100644
--- a/contrib/zstd/zlibWrapper/zstd_zlibwrapper.c
+++ b/sys/contrib/zstd/zlibWrapper/zstd_zlibwrapper.c
diff --git a/contrib/zstd/zlibWrapper/zstd_zlibwrapper.h b/sys/contrib/zstd/zlibWrapper/zstd_zlibwrapper.h
index f828d3191b87..f828d3191b87 100644
--- a/contrib/zstd/zlibWrapper/zstd_zlibwrapper.h
+++ b/sys/contrib/zstd/zlibWrapper/zstd_zlibwrapper.h
diff --git a/usr.bin/zstd/Makefile b/usr.bin/zstd/Makefile
index 8499b65a0dde..73bcbbcc371c 100644
--- a/usr.bin/zstd/Makefile
+++ b/usr.bin/zstd/Makefile
@@ -7,11 +7,11 @@ SRCS=	bench.c \
 	fileio.c \
 	zstdcli.c
 
-CFLAGS+=	-I${SRCTOP}/contrib/zstd/programs \
-		-I${SRCTOP}/contrib/zstd/lib/common \
-		-I${SRCTOP}/contrib/zstd/lib/compress \
-		-I${SRCTOP}/contrib/zstd/lib/dictBuilder \
-		-I${SRCTOP}/contrib/zstd/lib \
+CFLAGS+=	-I${SRCTOP}/sys/contrib/zstd/programs \
+		-I${SRCTOP}/sys/contrib/zstd/lib/common \
+		-I${SRCTOP}/sys/contrib/zstd/lib/compress \
+		-I${SRCTOP}/sys/contrib/zstd/lib/dictBuilder \
+		-I${SRCTOP}/sys/contrib/zstd/lib \
 		-DXXH_NAMESPACE=ZSTD_ \
 		-DHAVE_THREAD=1 \
 		-DZSTD_MULTITHREAD=1
@@ -25,6 +25,6 @@ MLINKS=	zstd.1 unzstd.1 \
 
 WARNS=	2
 LIBADD=	zstd
-.PATH: ${SRCTOP}/contrib/zstd/programs
+.PATH: ${SRCTOP}/sys/contrib/zstd/programs
 
 .include <bsd.prog.mk>