use repo layout in `contrib/libs/brotli`

commit_hash:b4eac4cf131dd15c80c126415bebfca8a85d819d

94 files changed, 18 insertions, 18 deletions

diff --git a/contrib/libs/apache/arrow/ya.make b/contrib/libs/apache/arrow/ya.make
index f4ed4463d15..38aed36e40d 100644
--- a/contrib/libs/apache/arrow/ya.make
+++ b/contrib/libs/apache/arrow/ya.make
@@ -24,8 +24,8 @@ ORIGINAL_SOURCE(https://github.com/apache/arrow/archive/apache-arrow-5.0.0.tar.g
 
 PEERDIR(
     contrib/libs/apache/orc
-    contrib/libs/brotli/dec
-    contrib/libs/brotli/enc
+    contrib/libs/brotli/c/dec
+    contrib/libs/brotli/c/enc
     contrib/libs/double-conversion
     contrib/libs/lz4
     contrib/libs/rapidjson
diff --git a/contrib/libs/brotli/common/.yandex_meta/licenses.list.txt b/contrib/libs/brotli/c/common/.yandex_meta/licenses.list.txt
index 02bcf9ee20b..02bcf9ee20b 100644
--- a/contrib/libs/brotli/common/.yandex_meta/licenses.list.txt
+++ b/contrib/libs/brotli/c/common/.yandex_meta/licenses.list.txt
diff --git a/contrib/libs/brotli/common/constants.h b/contrib/libs/brotli/c/common/constants.h
index d1b88d12af3..d1b88d12af3 100644
--- a/contrib/libs/brotli/common/constants.h
+++ b/contrib/libs/brotli/c/common/constants.h
diff --git a/contrib/libs/brotli/common/context.h b/contrib/libs/brotli/c/common/context.h
index 24b3eb48f53..24b3eb48f53 100644
--- a/contrib/libs/brotli/common/context.h
+++ b/contrib/libs/brotli/c/common/context.h
diff --git a/contrib/libs/brotli/common/dictionary.bin b/contrib/libs/brotli/c/common/dictionary.bin
index a585c0e292e..a585c0e292e 100644
--- a/contrib/libs/brotli/common/dictionary.bin
+++ b/contrib/libs/brotli/c/common/dictionary.bin
diff --git a/contrib/libs/brotli/common/dictionary.bin.br b/contrib/libs/brotli/c/common/dictionary.bin.br
index 6a55d420a81..6a55d420a81 100644
--- a/contrib/libs/brotli/common/dictionary.bin.br
+++ b/contrib/libs/brotli/c/common/dictionary.bin.br
diff --git a/contrib/libs/brotli/common/dictionary.c b/contrib/libs/brotli/c/common/dictionary.c
index 64822a381bb..64822a381bb 100644
--- a/contrib/libs/brotli/common/dictionary.c
+++ b/contrib/libs/brotli/c/common/dictionary.c
diff --git a/contrib/libs/brotli/common/dictionary.h b/contrib/libs/brotli/c/common/dictionary.h
index b1c6f7f580e..b1c6f7f580e 100644
--- a/contrib/libs/brotli/common/dictionary.h
+++ b/contrib/libs/brotli/c/common/dictionary.h
diff --git a/contrib/libs/brotli/common/platform.h b/contrib/libs/brotli/c/common/platform.h
index 84c448c4cf8..84c448c4cf8 100644
--- a/contrib/libs/brotli/common/platform.h
+++ b/contrib/libs/brotli/c/common/platform.h
diff --git a/contrib/libs/brotli/common/transform.c b/contrib/libs/brotli/c/common/transform.c
index 426e635fd3d..426e635fd3d 100644
--- a/contrib/libs/brotli/common/transform.c
+++ b/contrib/libs/brotli/c/common/transform.c
diff --git a/contrib/libs/brotli/common/transform.h b/contrib/libs/brotli/c/common/transform.h
index 456c12db9b2..456c12db9b2 100644
--- a/contrib/libs/brotli/common/transform.h
+++ b/contrib/libs/brotli/c/common/transform.h
diff --git a/contrib/libs/brotli/common/version.h b/contrib/libs/brotli/c/common/version.h
index 0d0d0c79676..0d0d0c79676 100644
--- a/contrib/libs/brotli/common/version.h
+++ b/contrib/libs/brotli/c/common/version.h
diff --git a/contrib/libs/brotli/common/ya.make b/contrib/libs/brotli/c/common/ya.make
index 51318234221..f7fe20e84e5 100644
--- a/contrib/libs/brotli/common/ya.make
+++ b/contrib/libs/brotli/c/common/ya.make
@@ -10,7 +10,7 @@ NO_UTIL()
 
 NO_COMPILER_WARNINGS()
 
-ADDINCL(contrib/libs/brotli/include)
+ADDINCL(contrib/libs/brotli/c/include)
 
 SRCS(
     dictionary.c
diff --git a/contrib/libs/brotli/dec/.yandex_meta/licenses.list.txt b/contrib/libs/brotli/c/dec/.yandex_meta/licenses.list.txt
index d9192df852c..d9192df852c 100644
--- a/contrib/libs/brotli/dec/.yandex_meta/licenses.list.txt
+++ b/contrib/libs/brotli/c/dec/.yandex_meta/licenses.list.txt
diff --git a/contrib/libs/brotli/dec/bit_reader.c b/contrib/libs/brotli/c/dec/bit_reader.c
index 722fd906dd4..722fd906dd4 100644
--- a/contrib/libs/brotli/dec/bit_reader.c
+++ b/contrib/libs/brotli/c/dec/bit_reader.c
diff --git a/contrib/libs/brotli/dec/bit_reader.h b/contrib/libs/brotli/c/dec/bit_reader.h
index c06e91419f2..c06e91419f2 100644
--- a/contrib/libs/brotli/dec/bit_reader.h
+++ b/contrib/libs/brotli/c/dec/bit_reader.h
diff --git a/contrib/libs/brotli/dec/decode.c b/contrib/libs/brotli/c/dec/decode.c
index 08bd76ca16e..08bd76ca16e 100644
--- a/contrib/libs/brotli/dec/decode.c
+++ b/contrib/libs/brotli/c/dec/decode.c
diff --git a/contrib/libs/brotli/dec/huffman.c b/contrib/libs/brotli/c/dec/huffman.c
index 30c40d33f20..30c40d33f20 100644
--- a/contrib/libs/brotli/dec/huffman.c
+++ b/contrib/libs/brotli/c/dec/huffman.c
diff --git a/contrib/libs/brotli/dec/huffman.h b/contrib/libs/brotli/c/dec/huffman.h
index b9f0716c160..b9f0716c160 100644
--- a/contrib/libs/brotli/dec/huffman.h
+++ b/contrib/libs/brotli/c/dec/huffman.h
diff --git a/contrib/libs/brotli/dec/prefix.h b/contrib/libs/brotli/c/dec/prefix.h
index 3ea062d84a2..3ea062d84a2 100644
--- a/contrib/libs/brotli/dec/prefix.h
+++ b/contrib/libs/brotli/c/dec/prefix.h
diff --git a/contrib/libs/brotli/dec/state.c b/contrib/libs/brotli/c/dec/state.c
index e0b37c2dcd0..e0b37c2dcd0 100644
--- a/contrib/libs/brotli/dec/state.c
+++ b/contrib/libs/brotli/c/dec/state.c
diff --git a/contrib/libs/brotli/dec/state.h b/contrib/libs/brotli/c/dec/state.h
index d28b63920ef..d28b63920ef 100644
--- a/contrib/libs/brotli/dec/state.h
+++ b/contrib/libs/brotli/c/dec/state.h
diff --git a/contrib/libs/brotli/dec/ya.make b/contrib/libs/brotli/c/dec/ya.make
index 8f714a28df1..16235c670b2 100644
--- a/contrib/libs/brotli/dec/ya.make
+++ b/contrib/libs/brotli/c/dec/ya.make
@@ -10,10 +10,10 @@ NO_UTIL()
 
 NO_COMPILER_WARNINGS()
 
-ADDINCL(GLOBAL contrib/libs/brotli/include)
+ADDINCL(GLOBAL contrib/libs/brotli/c/include)
 
 PEERDIR(
-    contrib/libs/brotli/common
+    contrib/libs/brotli/c/common
 )
 
 SRCS(
diff --git a/contrib/libs/brotli/enc/.yandex_meta/licenses.list.txt b/contrib/libs/brotli/c/enc/.yandex_meta/licenses.list.txt
index 36a262b0c3c..36a262b0c3c 100644
--- a/contrib/libs/brotli/enc/.yandex_meta/licenses.list.txt
+++ b/contrib/libs/brotli/c/enc/.yandex_meta/licenses.list.txt
diff --git a/contrib/libs/brotli/enc/backward_references.c b/contrib/libs/brotli/c/enc/backward_references.c
index cd023d9b41c..cd023d9b41c 100644
--- a/contrib/libs/brotli/enc/backward_references.c
+++ b/contrib/libs/brotli/c/enc/backward_references.c
diff --git a/contrib/libs/brotli/enc/backward_references.h b/contrib/libs/brotli/c/enc/backward_references.h
index 3a4146647c4..3a4146647c4 100644
--- a/contrib/libs/brotli/enc/backward_references.h
+++ b/contrib/libs/brotli/c/enc/backward_references.h
diff --git a/contrib/libs/brotli/enc/backward_references_hq.c b/contrib/libs/brotli/c/enc/backward_references_hq.c
index 96b0e708de4..96b0e708de4 100644
--- a/contrib/libs/brotli/enc/backward_references_hq.c
+++ b/contrib/libs/brotli/c/enc/backward_references_hq.c
diff --git a/contrib/libs/brotli/enc/backward_references_hq.h b/contrib/libs/brotli/c/enc/backward_references_hq.h
index 1e4275d403f..1e4275d403f 100644
--- a/contrib/libs/brotli/enc/backward_references_hq.h
+++ b/contrib/libs/brotli/c/enc/backward_references_hq.h
diff --git a/contrib/libs/brotli/enc/backward_references_inc.h b/contrib/libs/brotli/c/enc/backward_references_inc.h
index c18cdb00cb9..c18cdb00cb9 100644
--- a/contrib/libs/brotli/enc/backward_references_inc.h
+++ b/contrib/libs/brotli/c/enc/backward_references_inc.h
diff --git a/contrib/libs/brotli/enc/bit_cost.c b/contrib/libs/brotli/c/enc/bit_cost.c
index 1f3f7ad5c90..1f3f7ad5c90 100644
--- a/contrib/libs/brotli/enc/bit_cost.c
+++ b/contrib/libs/brotli/c/enc/bit_cost.c
diff --git a/contrib/libs/brotli/enc/bit_cost.h b/contrib/libs/brotli/c/enc/bit_cost.h
index 6586469e62f..6586469e62f 100644
--- a/contrib/libs/brotli/enc/bit_cost.h
+++ b/contrib/libs/brotli/c/enc/bit_cost.h
diff --git a/contrib/libs/brotli/enc/bit_cost_inc.h b/contrib/libs/brotli/c/enc/bit_cost_inc.h
index 453c2260420..453c2260420 100644
--- a/contrib/libs/brotli/enc/bit_cost_inc.h
+++ b/contrib/libs/brotli/c/enc/bit_cost_inc.h
diff --git a/contrib/libs/brotli/enc/block_encoder_inc.h b/contrib/libs/brotli/c/enc/block_encoder_inc.h
index 8cbd5eac67b..8cbd5eac67b 100644
--- a/contrib/libs/brotli/enc/block_encoder_inc.h
+++ b/contrib/libs/brotli/c/enc/block_encoder_inc.h
diff --git a/contrib/libs/brotli/enc/block_splitter.c b/contrib/libs/brotli/c/enc/block_splitter.c
index d308eca59d3..d308eca59d3 100644
--- a/contrib/libs/brotli/enc/block_splitter.c
+++ b/contrib/libs/brotli/c/enc/block_splitter.c
diff --git a/contrib/libs/brotli/enc/block_splitter.h b/contrib/libs/brotli/c/enc/block_splitter.h
index a5e006c4b30..a5e006c4b30 100644
--- a/contrib/libs/brotli/enc/block_splitter.h
+++ b/contrib/libs/brotli/c/enc/block_splitter.h
diff --git a/contrib/libs/brotli/enc/block_splitter_inc.h b/contrib/libs/brotli/c/enc/block_splitter_inc.h
index 023712b84d3..023712b84d3 100644
--- a/contrib/libs/brotli/enc/block_splitter_inc.h
+++ b/contrib/libs/brotli/c/enc/block_splitter_inc.h
diff --git a/contrib/libs/brotli/enc/brotli_bit_stream.c b/contrib/libs/brotli/c/enc/brotli_bit_stream.c
index aaf2dad7dbd..aaf2dad7dbd 100644
--- a/contrib/libs/brotli/enc/brotli_bit_stream.c
+++ b/contrib/libs/brotli/c/enc/brotli_bit_stream.c
diff --git a/contrib/libs/brotli/enc/brotli_bit_stream.h b/contrib/libs/brotli/c/enc/brotli_bit_stream.h
index 2ed703bf799..2ed703bf799 100644
--- a/contrib/libs/brotli/enc/brotli_bit_stream.h
+++ b/contrib/libs/brotli/c/enc/brotli_bit_stream.h
diff --git a/contrib/libs/brotli/enc/cluster.c b/contrib/libs/brotli/c/enc/cluster.c
index a20dfd385ff..a20dfd385ff 100644
--- a/contrib/libs/brotli/enc/cluster.c
+++ b/contrib/libs/brotli/c/enc/cluster.c
diff --git a/contrib/libs/brotli/enc/cluster.h b/contrib/libs/brotli/c/enc/cluster.h
index bb26124d24d..bb26124d24d 100644
--- a/contrib/libs/brotli/enc/cluster.h
+++ b/contrib/libs/brotli/c/enc/cluster.h
diff --git a/contrib/libs/brotli/enc/cluster_inc.h b/contrib/libs/brotli/c/enc/cluster_inc.h
index 22ecb3cca80..22ecb3cca80 100644
--- a/contrib/libs/brotli/enc/cluster_inc.h
+++ b/contrib/libs/brotli/c/enc/cluster_inc.h
diff --git a/contrib/libs/brotli/enc/command.h b/contrib/libs/brotli/c/enc/command.h
index 1aac85689be..1aac85689be 100644
--- a/contrib/libs/brotli/enc/command.h
+++ b/contrib/libs/brotli/c/enc/command.h
diff --git a/contrib/libs/brotli/enc/compress_fragment.c b/contrib/libs/brotli/c/enc/compress_fragment.c
index 9e50b2098a0..9e50b2098a0 100644
--- a/contrib/libs/brotli/enc/compress_fragment.c
+++ b/contrib/libs/brotli/c/enc/compress_fragment.c
diff --git a/contrib/libs/brotli/enc/compress_fragment.h b/contrib/libs/brotli/c/enc/compress_fragment.h
index 80007f5dcad..80007f5dcad 100644
--- a/contrib/libs/brotli/enc/compress_fragment.h
+++ b/contrib/libs/brotli/c/enc/compress_fragment.h
diff --git a/contrib/libs/brotli/enc/compress_fragment_two_pass.c b/contrib/libs/brotli/c/enc/compress_fragment_two_pass.c
index f8a56063843..f8a56063843 100644
--- a/contrib/libs/brotli/enc/compress_fragment_two_pass.c
+++ b/contrib/libs/brotli/c/enc/compress_fragment_two_pass.c
diff --git a/contrib/libs/brotli/enc/compress_fragment_two_pass.h b/contrib/libs/brotli/c/enc/compress_fragment_two_pass.h
index 928677df426..928677df426 100644
--- a/contrib/libs/brotli/enc/compress_fragment_two_pass.h
+++ b/contrib/libs/brotli/c/enc/compress_fragment_two_pass.h
diff --git a/contrib/libs/brotli/enc/dictionary_hash.c b/contrib/libs/brotli/c/enc/dictionary_hash.c
index 3677d7ddb4e..3677d7ddb4e 100644
--- a/contrib/libs/brotli/enc/dictionary_hash.c
+++ b/contrib/libs/brotli/c/enc/dictionary_hash.c
diff --git a/contrib/libs/brotli/enc/dictionary_hash.h b/contrib/libs/brotli/c/enc/dictionary_hash.h
index b3bb9599f43..b3bb9599f43 100644
--- a/contrib/libs/brotli/enc/dictionary_hash.h
+++ b/contrib/libs/brotli/c/enc/dictionary_hash.h
diff --git a/contrib/libs/brotli/enc/encode.c b/contrib/libs/brotli/c/enc/encode.c
index 141e70aa2a3..141e70aa2a3 100644
--- a/contrib/libs/brotli/enc/encode.c
+++ b/contrib/libs/brotli/c/enc/encode.c
diff --git a/contrib/libs/brotli/enc/encoder_dict.c b/contrib/libs/brotli/c/enc/encoder_dict.c
index 8b2f6ad4a47..8b2f6ad4a47 100644
--- a/contrib/libs/brotli/enc/encoder_dict.c
+++ b/contrib/libs/brotli/c/enc/encoder_dict.c
diff --git a/contrib/libs/brotli/enc/encoder_dict.h b/contrib/libs/brotli/c/enc/encoder_dict.h
index 3cb6b0ac152..3cb6b0ac152 100644
--- a/contrib/libs/brotli/enc/encoder_dict.h
+++ b/contrib/libs/brotli/c/enc/encoder_dict.h
diff --git a/contrib/libs/brotli/enc/entropy_encode.c b/contrib/libs/brotli/c/enc/entropy_encode.c
index 97f9dfb82aa..97f9dfb82aa 100644
--- a/contrib/libs/brotli/enc/entropy_encode.c
+++ b/contrib/libs/brotli/c/enc/entropy_encode.c
diff --git a/contrib/libs/brotli/enc/entropy_encode.h b/contrib/libs/brotli/c/enc/entropy_encode.h
index f23d9c379d0..f23d9c379d0 100644
--- a/contrib/libs/brotli/enc/entropy_encode.h
+++ b/contrib/libs/brotli/c/enc/entropy_encode.h
diff --git a/contrib/libs/brotli/enc/entropy_encode_static.h b/contrib/libs/brotli/c/enc/entropy_encode_static.h
index 62b99a954c5..62b99a954c5 100644
--- a/contrib/libs/brotli/enc/entropy_encode_static.h
+++ b/contrib/libs/brotli/c/enc/entropy_encode_static.h
diff --git a/contrib/libs/brotli/enc/fast_log.h b/contrib/libs/brotli/c/enc/fast_log.h
index cade1235ade..cade1235ade 100644
--- a/contrib/libs/brotli/enc/fast_log.h
+++ b/contrib/libs/brotli/c/enc/fast_log.h
diff --git a/contrib/libs/brotli/enc/find_match_length.h b/contrib/libs/brotli/c/enc/find_match_length.h
index bc428cffdaf..bc428cffdaf 100644
--- a/contrib/libs/brotli/enc/find_match_length.h
+++ b/contrib/libs/brotli/c/enc/find_match_length.h
diff --git a/contrib/libs/brotli/enc/hash.h b/contrib/libs/brotli/c/enc/hash.h
index 8c5a7bb5ad5..8c5a7bb5ad5 100644
--- a/contrib/libs/brotli/enc/hash.h
+++ b/contrib/libs/brotli/c/enc/hash.h
diff --git a/contrib/libs/brotli/enc/hash_composite_inc.h b/contrib/libs/brotli/c/enc/hash_composite_inc.h
index b266aa2f8da..b266aa2f8da 100644
--- a/contrib/libs/brotli/enc/hash_composite_inc.h
+++ b/contrib/libs/brotli/c/enc/hash_composite_inc.h
diff --git a/contrib/libs/brotli/enc/hash_forgetful_chain_inc.h b/contrib/libs/brotli/c/enc/hash_forgetful_chain_inc.h
index 41cb3ff03ac..41cb3ff03ac 100644
--- a/contrib/libs/brotli/enc/hash_forgetful_chain_inc.h
+++ b/contrib/libs/brotli/c/enc/hash_forgetful_chain_inc.h
diff --git a/contrib/libs/brotli/enc/hash_longest_match64_inc.h b/contrib/libs/brotli/c/enc/hash_longest_match64_inc.h
index cb953a644fc..cb953a644fc 100644
--- a/contrib/libs/brotli/enc/hash_longest_match64_inc.h
+++ b/contrib/libs/brotli/c/enc/hash_longest_match64_inc.h
diff --git a/contrib/libs/brotli/enc/hash_longest_match_inc.h b/contrib/libs/brotli/c/enc/hash_longest_match_inc.h
index 457f5a9ed2e..457f5a9ed2e 100644
--- a/contrib/libs/brotli/enc/hash_longest_match_inc.h
+++ b/contrib/libs/brotli/c/enc/hash_longest_match_inc.h
diff --git a/contrib/libs/brotli/enc/hash_longest_match_quickly_inc.h b/contrib/libs/brotli/c/enc/hash_longest_match_quickly_inc.h
index a7b9639febf..a7b9639febf 100644
--- a/contrib/libs/brotli/enc/hash_longest_match_quickly_inc.h
+++ b/contrib/libs/brotli/c/enc/hash_longest_match_quickly_inc.h
diff --git a/contrib/libs/brotli/enc/hash_rolling_inc.h b/contrib/libs/brotli/c/enc/hash_rolling_inc.h
index 17f8a408e24..17f8a408e24 100644
--- a/contrib/libs/brotli/enc/hash_rolling_inc.h
+++ b/contrib/libs/brotli/c/enc/hash_rolling_inc.h
diff --git a/contrib/libs/brotli/enc/hash_to_binary_tree_inc.h b/contrib/libs/brotli/c/enc/hash_to_binary_tree_inc.h
index 7fb0356f556..7fb0356f556 100644
--- a/contrib/libs/brotli/enc/hash_to_binary_tree_inc.h
+++ b/contrib/libs/brotli/c/enc/hash_to_binary_tree_inc.h
diff --git a/contrib/libs/brotli/enc/histogram.c b/contrib/libs/brotli/c/enc/histogram.c
index 6da2ff6bb43..6da2ff6bb43 100644
--- a/contrib/libs/brotli/enc/histogram.c
+++ b/contrib/libs/brotli/c/enc/histogram.c
diff --git a/contrib/libs/brotli/enc/histogram.h b/contrib/libs/brotli/c/enc/histogram.h
index 42af3c3f9d1..42af3c3f9d1 100644
--- a/contrib/libs/brotli/enc/histogram.h
+++ b/contrib/libs/brotli/c/enc/histogram.h
diff --git a/contrib/libs/brotli/enc/histogram_inc.h b/contrib/libs/brotli/c/enc/histogram_inc.h
index 50eaf7468da..50eaf7468da 100644
--- a/contrib/libs/brotli/enc/histogram_inc.h
+++ b/contrib/libs/brotli/c/enc/histogram_inc.h
diff --git a/contrib/libs/brotli/enc/literal_cost.c b/contrib/libs/brotli/c/enc/literal_cost.c
index c231100e341..c231100e341 100644
--- a/contrib/libs/brotli/enc/literal_cost.c
+++ b/contrib/libs/brotli/c/enc/literal_cost.c
diff --git a/contrib/libs/brotli/enc/literal_cost.h b/contrib/libs/brotli/c/enc/literal_cost.h
index 8f53f39d3f2..8f53f39d3f2 100644
--- a/contrib/libs/brotli/enc/literal_cost.h
+++ b/contrib/libs/brotli/c/enc/literal_cost.h
diff --git a/contrib/libs/brotli/enc/memory.c b/contrib/libs/brotli/c/enc/memory.c
index f6ed7e3cb75..f6ed7e3cb75 100644
--- a/contrib/libs/brotli/enc/memory.c
+++ b/contrib/libs/brotli/c/enc/memory.c
diff --git a/contrib/libs/brotli/enc/memory.h b/contrib/libs/brotli/c/enc/memory.h
index ab928d019be..ab928d019be 100644
--- a/contrib/libs/brotli/enc/memory.h
+++ b/contrib/libs/brotli/c/enc/memory.h
diff --git a/contrib/libs/brotli/enc/metablock.c b/contrib/libs/brotli/c/enc/metablock.c
index 4e80044f318..4e80044f318 100644
--- a/contrib/libs/brotli/enc/metablock.c
+++ b/contrib/libs/brotli/c/enc/metablock.c
diff --git a/contrib/libs/brotli/enc/metablock.h b/contrib/libs/brotli/c/enc/metablock.h
index 334a79a443c..334a79a443c 100644
--- a/contrib/libs/brotli/enc/metablock.h
+++ b/contrib/libs/brotli/c/enc/metablock.h
diff --git a/contrib/libs/brotli/enc/metablock_inc.h b/contrib/libs/brotli/c/enc/metablock_inc.h
index dcc9d3c4a64..dcc9d3c4a64 100644
--- a/contrib/libs/brotli/enc/metablock_inc.h
+++ b/contrib/libs/brotli/c/enc/metablock_inc.h
diff --git a/contrib/libs/brotli/enc/params.h b/contrib/libs/brotli/c/enc/params.h
index 6ecf1d3f995..6ecf1d3f995 100644
--- a/contrib/libs/brotli/enc/params.h
+++ b/contrib/libs/brotli/c/enc/params.h
diff --git a/contrib/libs/brotli/enc/prefix.h b/contrib/libs/brotli/c/enc/prefix.h
index fd359a478d4..fd359a478d4 100644
--- a/contrib/libs/brotli/enc/prefix.h
+++ b/contrib/libs/brotli/c/enc/prefix.h
diff --git a/contrib/libs/brotli/enc/quality.h b/contrib/libs/brotli/c/enc/quality.h
index 5f4d0345037..5f4d0345037 100644
--- a/contrib/libs/brotli/enc/quality.h
+++ b/contrib/libs/brotli/c/enc/quality.h
diff --git a/contrib/libs/brotli/enc/ringbuffer.h b/contrib/libs/brotli/c/enc/ringbuffer.h
index 86079a89d35..86079a89d35 100644
--- a/contrib/libs/brotli/enc/ringbuffer.h
+++ b/contrib/libs/brotli/c/enc/ringbuffer.h
diff --git a/contrib/libs/brotli/enc/static_dict.c b/contrib/libs/brotli/c/enc/static_dict.c
index 7299ab7203b..7299ab7203b 100644
--- a/contrib/libs/brotli/enc/static_dict.c
+++ b/contrib/libs/brotli/c/enc/static_dict.c
diff --git a/contrib/libs/brotli/enc/static_dict.h b/contrib/libs/brotli/c/enc/static_dict.h
index 6b5d4eb0c98..6b5d4eb0c98 100644
--- a/contrib/libs/brotli/enc/static_dict.h
+++ b/contrib/libs/brotli/c/enc/static_dict.h
diff --git a/contrib/libs/brotli/enc/static_dict_lut.h b/contrib/libs/brotli/c/enc/static_dict_lut.h
index e299cda6d82..e299cda6d82 100644
--- a/contrib/libs/brotli/enc/static_dict_lut.h
+++ b/contrib/libs/brotli/c/enc/static_dict_lut.h
diff --git a/contrib/libs/brotli/enc/utf8_util.c b/contrib/libs/brotli/c/enc/utf8_util.c
index 04a7805161b..04a7805161b 100644
--- a/contrib/libs/brotli/enc/utf8_util.c
+++ b/contrib/libs/brotli/c/enc/utf8_util.c
diff --git a/contrib/libs/brotli/enc/utf8_util.h b/contrib/libs/brotli/c/enc/utf8_util.h
index 8fda80c2203..8fda80c2203 100644
--- a/contrib/libs/brotli/enc/utf8_util.h
+++ b/contrib/libs/brotli/c/enc/utf8_util.h
diff --git a/contrib/libs/brotli/enc/write_bits.h b/contrib/libs/brotli/c/enc/write_bits.h
index 36515a6893f..36515a6893f 100644
--- a/contrib/libs/brotli/enc/write_bits.h
+++ b/contrib/libs/brotli/c/enc/write_bits.h
diff --git a/contrib/libs/brotli/enc/ya.make b/contrib/libs/brotli/c/enc/ya.make
index 206e7e2d2df..e40f764b49a 100644
--- a/contrib/libs/brotli/enc/ya.make
+++ b/contrib/libs/brotli/c/enc/ya.make
@@ -10,11 +10,11 @@ NO_UTIL()
 
 NO_COMPILER_WARNINGS()
 
-ADDINCL(GLOBAL contrib/libs/brotli/include)
+ADDINCL(GLOBAL contrib/libs/brotli/c/include)
 
 PEERDIR(
-    contrib/libs/brotli/common
-    contrib/libs/brotli/dec
+    contrib/libs/brotli/c/common
+    contrib/libs/brotli/c/dec
 )
 
 SRCS(
diff --git a/contrib/libs/brotli/include/brotli/decode.h b/contrib/libs/brotli/c/include/brotli/decode.h
index 0f5c8f9d111..0f5c8f9d111 100644
--- a/contrib/libs/brotli/include/brotli/decode.h
+++ b/contrib/libs/brotli/c/include/brotli/decode.h
diff --git a/contrib/libs/brotli/include/brotli/encode.h b/contrib/libs/brotli/c/include/brotli/encode.h
index 0ced7e55be7..0ced7e55be7 100644
--- a/contrib/libs/brotli/include/brotli/encode.h
+++ b/contrib/libs/brotli/c/include/brotli/encode.h
diff --git a/contrib/libs/brotli/include/brotli/port.h b/contrib/libs/brotli/c/include/brotli/port.h
index 20dc2314d80..20dc2314d80 100644
--- a/contrib/libs/brotli/include/brotli/port.h
+++ b/contrib/libs/brotli/c/include/brotli/port.h
diff --git a/contrib/libs/brotli/include/brotli/types.h b/contrib/libs/brotli/c/include/brotli/types.h
index eff1a3cd07a..eff1a3cd07a 100644
--- a/contrib/libs/brotli/include/brotli/types.h
+++ b/contrib/libs/brotli/c/include/brotli/types.h
diff --git a/contrib/libs/curl/ya.make b/contrib/libs/curl/ya.make
index 3d6b8787277..157718c75ab 100644
--- a/contrib/libs/curl/ya.make
+++ b/contrib/libs/curl/ya.make
@@ -16,8 +16,8 @@ VERSION(8.5.0)
 ORIGINAL_SOURCE(https://github.com/curl/curl/releases/download/curl-8_5_0/curl-8.5.0.tar.bz2)
 
 PEERDIR(
-    contrib/libs/brotli/dec
-    contrib/libs/brotli/enc
+    contrib/libs/brotli/c/dec
+    contrib/libs/brotli/c/enc
     contrib/libs/libc_compat
     contrib/libs/libssh2
     contrib/libs/nghttp2
diff --git a/library/cpp/blockcodecs/codecs/brotli/brotli.cpp b/library/cpp/blockcodecs/codecs/brotli/brotli.cpp
index 6e3cd971bdc..42cd86e94ea 100644
--- a/library/cpp/blockcodecs/codecs/brotli/brotli.cpp
+++ b/library/cpp/blockcodecs/codecs/brotli/brotli.cpp
@@ -2,8 +2,8 @@
 #include <library/cpp/blockcodecs/core/common.h>
 #include <library/cpp/blockcodecs/core/register.h>
 
-#include <contrib/libs/brotli/include/brotli/encode.h>
-#include <contrib/libs/brotli/include/brotli/decode.h>
+#include <contrib/libs/brotli/c/include/brotli/encode.h>
+#include <contrib/libs/brotli/c/include/brotli/decode.h>
 
 using namespace NBlockCodecs;
 
diff --git a/library/cpp/blockcodecs/codecs/brotli/ya.make b/library/cpp/blockcodecs/codecs/brotli/ya.make
index f1983cef159..28f958e60be 100644
--- a/library/cpp/blockcodecs/codecs/brotli/ya.make
+++ b/library/cpp/blockcodecs/codecs/brotli/ya.make
@@ -1,8 +1,8 @@
 LIBRARY()
 
 PEERDIR(
-    contrib/libs/brotli/enc
-    contrib/libs/brotli/dec
+    contrib/libs/brotli/c/enc
+    contrib/libs/brotli/c/dec
     library/cpp/blockcodecs/core
 )
 
diff --git a/library/cpp/streams/brotli/brotli.cpp b/library/cpp/streams/brotli/brotli.cpp
index 4e6ce64531e..a8302f440ac 100644
--- a/library/cpp/streams/brotli/brotli.cpp
+++ b/library/cpp/streams/brotli/brotli.cpp
@@ -1,7 +1,7 @@
 #include "brotli.h"
 
-#include <contrib/libs/brotli/include/brotli/decode.h>
-#include <contrib/libs/brotli/include/brotli/encode.h>
+#include <contrib/libs/brotli/c/include/brotli/decode.h>
+#include <contrib/libs/brotli/c/include/brotli/encode.h>
 
 #include <util/generic/yexception.h>
 #include <util/memory/addstorage.h>
diff --git a/library/cpp/streams/brotli/ya.make b/library/cpp/streams/brotli/ya.make
index abc1006372c..d4483b0cce3 100644
--- a/library/cpp/streams/brotli/ya.make
+++ b/library/cpp/streams/brotli/ya.make
@@ -1,8 +1,8 @@
 LIBRARY()
 
 PEERDIR(
-    contrib/libs/brotli/enc
-    contrib/libs/brotli/dec
+    contrib/libs/brotli/c/enc
+    contrib/libs/brotli/c/dec
 )
 
 SRCS(