internal change PiperOrigin-RevId: 794568395
diff --git a/c/dec/state.h b/c/dec/state.h index caefef0..aa371fb 100644 --- a/c/dec/state.h +++ b/c/dec/state.h
@@ -9,13 +9,10 @@ #ifndef BROTLI_DEC_STATE_H_ #define BROTLI_DEC_STATE_H_ -#include <brotli/decode.h> -#include <brotli/shared_dictionary.h> - #include "../common/constants.h" -#include "../common/dictionary.h" #include "../common/platform.h" -#include "../common/transform.h" +#include <brotli/shared_dictionary.h> +#include <brotli/decode.h> #include "bit_reader.h" #include "huffman.h"
diff --git a/c/enc/compound_dictionary.c b/c/enc/compound_dictionary.c index 6a79510..bf323a4 100644 --- a/c/enc/compound_dictionary.c +++ b/c/enc/compound_dictionary.c
@@ -6,9 +6,8 @@ #include "compound_dictionary.h" -#include <brotli/shared_dictionary.h> - #include "../common/platform.h" +#include <brotli/shared_dictionary.h> #include "memory.h" static PreparedDictionary* CreatePreparedDictionaryWithParams(MemoryManager* m,
diff --git a/c/enc/compound_dictionary.h b/c/enc/compound_dictionary.h index 6f5a13a..686f92f 100644 --- a/c/enc/compound_dictionary.h +++ b/c/enc/compound_dictionary.h
@@ -7,9 +7,8 @@ #ifndef BROTLI_ENC_PREPARED_DICTIONARY_H_ #define BROTLI_ENC_PREPARED_DICTIONARY_H_ -#include <brotli/shared_dictionary.h> - #include "../common/platform.h" +#include <brotli/shared_dictionary.h> #include "memory.h" /* "Fat" prepared dictionary, could be cooked outside of C implementation,
diff --git a/c/enc/encode.c b/c/enc/encode.c index 417cc25..279f173 100644 --- a/c/enc/encode.c +++ b/c/enc/encode.c
@@ -7,11 +7,11 @@ /* Implementation of Brotli compressor. */ #include <brotli/encode.h> -#include <brotli/shared_dictionary.h> #include "../common/constants.h" #include "../common/context.h" #include "../common/platform.h" +#include <brotli/shared_dictionary.h> #include "../common/version.h" #include "backward_references_hq.h" #include "backward_references.h"
diff --git a/c/enc/encoder_dict.c b/c/enc/encoder_dict.c index bc4e0e6..f75ee59 100644 --- a/c/enc/encoder_dict.c +++ b/c/enc/encoder_dict.c
@@ -6,13 +6,12 @@ #include "encoder_dict.h" -#include <brotli/encode.h> -#include <brotli/shared_dictionary.h> - #include "../common/dictionary.h" #include "../common/platform.h" +#include <brotli/shared_dictionary.h> #include "../common/shared_dictionary_internal.h" #include "../common/transform.h" +#include <brotli/encode.h> #include "compound_dictionary.h" #include "dictionary_hash.h" #include "hash_base.h"
diff --git a/c/enc/encoder_dict.h b/c/enc/encoder_dict.h index dcb6aef..76f0379 100644 --- a/c/enc/encoder_dict.h +++ b/c/enc/encoder_dict.h
@@ -7,9 +7,8 @@ #ifndef BROTLI_ENC_ENCODER_DICT_H_ #define BROTLI_ENC_ENCODER_DICT_H_ -#include <brotli/shared_dictionary.h> - #include "../common/dictionary.h" +#include <brotli/shared_dictionary.h> #include "../common/platform.h" #include "compound_dictionary.h" #include "memory.h"
diff --git a/c/enc/params.h b/c/enc/params.h index 78b2ab6..fd1de00 100644 --- a/c/enc/params.h +++ b/c/enc/params.h
@@ -10,7 +10,6 @@ #define BROTLI_ENC_PARAMS_H_ #include <brotli/encode.h> - #include "encoder_dict.h" typedef struct BrotliHasherParams {
diff --git a/c/enc/quality.h b/c/enc/quality.h index 1065f23..45d67bf 100644 --- a/c/enc/quality.h +++ b/c/enc/quality.h
@@ -10,9 +10,8 @@ #ifndef BROTLI_ENC_QUALITY_H_ #define BROTLI_ENC_QUALITY_H_ -#include <brotli/encode.h> - #include "../common/platform.h" +#include <brotli/encode.h> #include "params.h" #define FAST_ONE_PASS_COMPRESSION_QUALITY 0
diff --git a/c/tools/brotli.c b/c/tools/brotli.c index 0dc99bd..fe088d4 100644 --- a/c/tools/brotli.c +++ b/c/tools/brotli.c
@@ -7,6 +7,7 @@ /* Command line interface for Brotli library. */ /* Mute strerror/strcpy warnings. */ +#include <brotli/shared_dictionary.h> #if !defined(_CRT_SECURE_NO_WARNINGS) #define _CRT_SECURE_NO_WARNINGS #endif @@ -20,12 +21,11 @@ #include <sys/types.h> #include <time.h> -#include <brotli/decode.h> -#include <brotli/encode.h> #include <brotli/types.h> - #include "../common/constants.h" #include "../common/version.h" +#include <brotli/decode.h> +#include <brotli/encode.h> #if defined(_WIN32) #include <io.h>
diff --git a/java/org/brotli/wrapper/dec/decoder_jni.cc b/java/org/brotli/wrapper/dec/decoder_jni.cc index 42e6bae..e7d51ae 100644 --- a/java/org/brotli/wrapper/dec/decoder_jni.cc +++ b/java/org/brotli/wrapper/dec/decoder_jni.cc
@@ -6,10 +6,15 @@ #include "decoder_jni.h" // NOLINT: build/include -#include <brotli/decode.h> +#include <jni.h> +#include <cstddef> +#include <cstdint> #include <new> +#include <brotli/shared_dictionary.h> +#include <brotli/decode.h> + namespace { /* A structure used to persist the decoder's state in between calls. */ typedef struct DecoderHandle {
diff --git a/java/org/brotli/wrapper/enc/encoder_jni.cc b/java/org/brotli/wrapper/enc/encoder_jni.cc index 796908b..b4ba530 100644 --- a/java/org/brotli/wrapper/enc/encoder_jni.cc +++ b/java/org/brotli/wrapper/enc/encoder_jni.cc
@@ -4,11 +4,15 @@ See file LICENSE for detail or copy at https://opensource.org/licenses/MIT */ -#include <brotli/encode.h> #include <jni.h> +#include <cstddef> +#include <cstdint> #include <new> +#include <brotli/shared_dictionary.h> +#include <brotli/encode.h> + namespace { /* A structure used to persist the encoder's state in between calls. */ typedef struct EncoderHandle {
diff --git a/python/_brotli.c b/python/_brotli.c index f86b04f..9f6c017 100644 --- a/python/_brotli.c +++ b/python/_brotli.c
@@ -1,8 +1,13 @@ +#include <assert.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> #define PY_SSIZE_T_CLEAN 1 #include <Python.h> #include <bytesobject.h> #include <structmember.h> +#include <brotli/types.h> #include <brotli/decode.h> #include <brotli/encode.h>