diff --git a/c/common/constants.c b/c/common/constants.c
index 6bad9f6..89866b1 100644
--- a/c/common/constants.c
+++ b/c/common/constants.c
@@ -4,7 +4,7 @@
    See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
 */
 
-#include "./constants.h"
+#include "constants.h"
 
 const BrotliPrefixCodeRange
     _kBrotliPrefixCodeRanges[BROTLI_NUM_BLOCK_LEN_SYMBOLS] = {
diff --git a/c/common/constants.h b/c/common/constants.h
index e848195..433c7b2 100644
--- a/c/common/constants.h
+++ b/c/common/constants.h
@@ -12,7 +12,7 @@
 #ifndef BROTLI_COMMON_CONSTANTS_H_
 #define BROTLI_COMMON_CONSTANTS_H_
 
-#include "./platform.h"
+#include "platform.h"
 #include <brotli/port.h>
 #include <brotli/types.h>
 
diff --git a/c/common/context.c b/c/common/context.c
index 2c2dceb..7f9c958 100644
--- a/c/common/context.c
+++ b/c/common/context.c
@@ -1,4 +1,4 @@
-#include "./context.h"
+#include "context.h"
 
 #include <brotli/types.h>
 
diff --git a/c/common/dictionary.c b/c/common/dictionary.c
index f9e3041..e86d417 100644
--- a/c/common/dictionary.c
+++ b/c/common/dictionary.c
@@ -4,8 +4,8 @@
    See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
 */
 
-#include "./dictionary.h"
-#include "./platform.h"
+#include "dictionary.h"
+#include "platform.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/common/platform.c b/c/common/platform.c
index aef39e9..acdc452 100644
--- a/c/common/platform.c
+++ b/c/common/platform.c
@@ -6,7 +6,7 @@
 
 #include <stdlib.h>
 
-#include "./platform.h"
+#include "platform.h"
 #include <brotli/types.h>
 
 /* Default brotli_alloc_func */
diff --git a/c/common/shared_dictionary.c b/c/common/shared_dictionary.c
index c7d05c5..20ba73a 100644
--- a/c/common/shared_dictionary.c
+++ b/c/common/shared_dictionary.c
@@ -12,9 +12,9 @@
 #include <stdlib.h>  /* malloc, free */
 #include <stdio.h>
 
-#include "./dictionary.h"
-#include "./platform.h"
-#include "./shared_dictionary_internal.h"
+#include "dictionary.h"
+#include "platform.h"
+#include "shared_dictionary_internal.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/common/shared_dictionary_internal.h b/c/common/shared_dictionary_internal.h
index a2b76ee..87ab13b 100644
--- a/c/common/shared_dictionary_internal.h
+++ b/c/common/shared_dictionary_internal.h
@@ -9,9 +9,9 @@
 #ifndef BROTLI_COMMON_SHARED_DICTIONARY_INTERNAL_H_
 #define BROTLI_COMMON_SHARED_DICTIONARY_INTERNAL_H_
 
-#include "./dictionary.h"
+#include "dictionary.h"
 #include <brotli/shared_dictionary.h>
-#include "./transform.h"
+#include "transform.h"
 #include <brotli/types.h>
 
 #if defined(__cplusplus) || defined(c_plusplus)
diff --git a/c/common/transform.c b/c/common/transform.c
index f8fa433..49455fc 100644
--- a/c/common/transform.c
+++ b/c/common/transform.c
@@ -4,7 +4,7 @@
    See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
 */
 
-#include "./transform.h"
+#include "transform.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/dec/bit_reader.c b/c/dec/bit_reader.c
index 7f7b256..3dc848b 100644
--- a/c/dec/bit_reader.c
+++ b/c/dec/bit_reader.c
@@ -6,7 +6,7 @@
 
 /* Bit reading helpers */
 
-#include "./bit_reader.h"
+#include "bit_reader.h"
 
 #include "../common/platform.h"
 #include <brotli/types.h>
diff --git a/c/dec/decode.c b/c/dec/decode.c
index 12cd502..7370daa 100644
--- a/c/dec/decode.c
+++ b/c/dec/decode.c
@@ -16,10 +16,10 @@
 #include "../common/shared_dictionary_internal.h"
 #include "../common/transform.h"
 #include "../common/version.h"
-#include "./bit_reader.h"
-#include "./huffman.h"
-#include "./prefix.h"
-#include "./state.h"
+#include "bit_reader.h"
+#include "huffman.h"
+#include "prefix.h"
+#include "state.h"
 
 #if defined(BROTLI_TARGET_NEON)
 #include <arm_neon.h>
diff --git a/c/dec/huffman.c b/c/dec/huffman.c
index 30c40d3..8f127d7 100644
--- a/c/dec/huffman.c
+++ b/c/dec/huffman.c
@@ -6,7 +6,7 @@
 
 /* Utilities for building Huffman decoding tables. */
 
-#include "./huffman.h"
+#include "huffman.h"
 
 #include <string.h>  /* memcpy, memset */
 
diff --git a/c/dec/state.c b/c/dec/state.c
index 66d6820..e3170c1 100644
--- a/c/dec/state.c
+++ b/c/dec/state.c
@@ -4,13 +4,13 @@
    See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
 */
 
-#include "./state.h"
+#include "state.h"
 
 #include <stdlib.h>  /* free, malloc */
 
 #include "../common/dictionary.h"
 #include <brotli/types.h>
-#include "./huffman.h"
+#include "huffman.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/dec/state.h b/c/dec/state.h
index 7127581..81e6bb6 100644
--- a/c/dec/state.h
+++ b/c/dec/state.h
@@ -15,8 +15,8 @@
 #include <brotli/shared_dictionary.h>
 #include "../common/transform.h"
 #include <brotli/types.h>
-#include "./bit_reader.h"
-#include "./huffman.h"
+#include "bit_reader.h"
+#include "huffman.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/backward_references.c b/c/enc/backward_references.c
index 1ae1146..2cf01d8 100644
--- a/c/enc/backward_references.c
+++ b/c/enc/backward_references.c
@@ -6,18 +6,18 @@
 
 /* Function to find backward reference copies. */
 
-#include "./backward_references.h"
+#include "backward_references.h"
 
 #include "../common/constants.h"
 #include "../common/dictionary.h"
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./command.h"
-#include "./compound_dictionary.h"
-#include "./dictionary_hash.h"
-#include "./encoder_dict.h"
-#include "./memory.h"
-#include "./quality.h"
+#include "command.h"
+#include "compound_dictionary.h"
+#include "dictionary_hash.h"
+#include "encoder_dict.h"
+#include "memory.h"
+#include "quality.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
@@ -57,62 +57,62 @@ static BROTLI_INLINE size_t ComputeDistanceCode(size_t distance,
 
 #define HASHER() H2
 /* NOLINTNEXTLINE(build/include) */
-#include "./backward_references_inc.h"
+#include "backward_references_inc.h"
 #undef HASHER
 
 #define HASHER() H3
 /* NOLINTNEXTLINE(build/include) */
-#include "./backward_references_inc.h"
+#include "backward_references_inc.h"
 #undef HASHER
 
 #define HASHER() H4
 /* NOLINTNEXTLINE(build/include) */
-#include "./backward_references_inc.h"
+#include "backward_references_inc.h"
 #undef HASHER
 
 #define HASHER() H5
 /* NOLINTNEXTLINE(build/include) */
-#include "./backward_references_inc.h"
+#include "backward_references_inc.h"
 #undef HASHER
 
 #define HASHER() H6
 /* NOLINTNEXTLINE(build/include) */
-#include "./backward_references_inc.h"
+#include "backward_references_inc.h"
 #undef HASHER
 
 #define HASHER() H40
 /* NOLINTNEXTLINE(build/include) */
-#include "./backward_references_inc.h"
+#include "backward_references_inc.h"
 #undef HASHER
 
 #define HASHER() H41
 /* NOLINTNEXTLINE(build/include) */
-#include "./backward_references_inc.h"
+#include "backward_references_inc.h"
 #undef HASHER
 
 #define HASHER() H42
 /* NOLINTNEXTLINE(build/include) */
-#include "./backward_references_inc.h"
+#include "backward_references_inc.h"
 #undef HASHER
 
 #define HASHER() H54
 /* NOLINTNEXTLINE(build/include) */
-#include "./backward_references_inc.h"
+#include "backward_references_inc.h"
 #undef HASHER
 
 #define HASHER() H35
 /* NOLINTNEXTLINE(build/include) */
-#include "./backward_references_inc.h"
+#include "backward_references_inc.h"
 #undef HASHER
 
 #define HASHER() H55
 /* NOLINTNEXTLINE(build/include) */
-#include "./backward_references_inc.h"
+#include "backward_references_inc.h"
 #undef HASHER
 
 #define HASHER() H65
 /* NOLINTNEXTLINE(build/include) */
-#include "./backward_references_inc.h"
+#include "backward_references_inc.h"
 #undef HASHER
 
 #undef ENABLE_COMPOUND_DICTIONARY
@@ -122,31 +122,31 @@ static BROTLI_INLINE size_t ComputeDistanceCode(size_t distance,
 
 #define HASHER() H5
 /* NOLINTNEXTLINE(build/include) */
-#include "./backward_references_inc.h"
+#include "backward_references_inc.h"
 #undef HASHER
 #define HASHER() H6
 /* NOLINTNEXTLINE(build/include) */
-#include "./backward_references_inc.h"
+#include "backward_references_inc.h"
 #undef HASHER
 #define HASHER() H40
 /* NOLINTNEXTLINE(build/include) */
-#include "./backward_references_inc.h"
+#include "backward_references_inc.h"
 #undef HASHER
 #define HASHER() H41
 /* NOLINTNEXTLINE(build/include) */
-#include "./backward_references_inc.h"
+#include "backward_references_inc.h"
 #undef HASHER
 #define HASHER() H42
 /* NOLINTNEXTLINE(build/include) */
-#include "./backward_references_inc.h"
+#include "backward_references_inc.h"
 #undef HASHER
 #define HASHER() H55
 /* NOLINTNEXTLINE(build/include) */
-#include "./backward_references_inc.h"
+#include "backward_references_inc.h"
 #undef HASHER
 #define HASHER() H65
 /* NOLINTNEXTLINE(build/include) */
-#include "./backward_references_inc.h"
+#include "backward_references_inc.h"
 #undef HASHER
 
 #undef ENABLE_COMPOUND_DICTIONARY
diff --git a/c/enc/backward_references.h b/c/enc/backward_references.h
index 9589cc1..b051e18 100644
--- a/c/enc/backward_references.h
+++ b/c/enc/backward_references.h
@@ -14,9 +14,9 @@
 #include "../common/dictionary.h"
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./command.h"
-#include "./hash.h"
-#include "./quality.h"
+#include "command.h"
+#include "hash.h"
+#include "quality.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/backward_references_hq.c b/c/enc/backward_references_hq.c
index 5e17c84..c6a6c8c 100644
--- a/c/enc/backward_references_hq.c
+++ b/c/enc/backward_references_hq.c
@@ -6,23 +6,23 @@
 
 /* Function to find backward reference copies. */
 
-#include "./backward_references_hq.h"
+#include "backward_references_hq.h"
 
 #include <string.h>  /* memcpy, memset */
 
 #include "../common/constants.h"
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./command.h"
-#include "./compound_dictionary.h"
-#include "./encoder_dict.h"
-#include "./fast_log.h"
-#include "./find_match_length.h"
-#include "./literal_cost.h"
-#include "./memory.h"
-#include "./params.h"
-#include "./prefix.h"
-#include "./quality.h"
+#include "command.h"
+#include "compound_dictionary.h"
+#include "encoder_dict.h"
+#include "fast_log.h"
+#include "find_match_length.h"
+#include "literal_cost.h"
+#include "memory.h"
+#include "params.h"
+#include "prefix.h"
+#include "quality.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/backward_references_hq.h b/c/enc/backward_references_hq.h
index 36b75f2..c9dcc80 100644
--- a/c/enc/backward_references_hq.h
+++ b/c/enc/backward_references_hq.h
@@ -14,10 +14,10 @@
 #include "../common/dictionary.h"
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./command.h"
-#include "./hash.h"
-#include "./memory.h"
-#include "./quality.h"
+#include "command.h"
+#include "hash.h"
+#include "memory.h"
+#include "quality.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/bit_cost.c b/c/enc/bit_cost.c
index 1f3f7ad..8ca4ab1 100644
--- a/c/enc/bit_cost.c
+++ b/c/enc/bit_cost.c
@@ -6,28 +6,28 @@
 
 /* Functions to estimate the bit cost of Huffman trees. */
 
-#include "./bit_cost.h"
+#include "bit_cost.h"
 
 #include "../common/constants.h"
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./fast_log.h"
-#include "./histogram.h"
+#include "fast_log.h"
+#include "histogram.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
 
 #define FN(X) X ## Literal
-#include "./bit_cost_inc.h"  /* NOLINT(build/include) */
+#include "bit_cost_inc.h"  /* NOLINT(build/include) */
 #undef FN
 
 #define FN(X) X ## Command
-#include "./bit_cost_inc.h"  /* NOLINT(build/include) */
+#include "bit_cost_inc.h"  /* NOLINT(build/include) */
 #undef FN
 
 #define FN(X) X ## Distance
-#include "./bit_cost_inc.h"  /* NOLINT(build/include) */
+#include "bit_cost_inc.h"  /* NOLINT(build/include) */
 #undef FN
 
 #if defined(__cplusplus) || defined(c_plusplus)
diff --git a/c/enc/bit_cost.h b/c/enc/bit_cost.h
index 31838f1..4cf3b18 100644
--- a/c/enc/bit_cost.h
+++ b/c/enc/bit_cost.h
@@ -11,8 +11,8 @@
 
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./fast_log.h"
-#include "./histogram.h"
+#include "fast_log.h"
+#include "histogram.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/block_splitter.c b/c/enc/block_splitter.c
index 5c020ad..580f228 100644
--- a/c/enc/block_splitter.c
+++ b/c/enc/block_splitter.c
@@ -6,18 +6,18 @@
 
 /* Block split point selection utilities. */
 
-#include "./block_splitter.h"
+#include "block_splitter.h"
 
 #include <string.h>  /* memcpy, memset */
 
 #include "../common/platform.h"
-#include "./bit_cost.h"
-#include "./cluster.h"
-#include "./command.h"
-#include "./fast_log.h"
-#include "./histogram.h"
-#include "./memory.h"
-#include "./quality.h"
+#include "bit_cost.h"
+#include "cluster.h"
+#include "command.h"
+#include "fast_log.h"
+#include "histogram.h"
+#include "memory.h"
+#include "quality.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
@@ -90,19 +90,19 @@ static BROTLI_INLINE double BitCost(size_t count) {
 #define FN(X) X ## Literal
 #define DataType uint8_t
 /* NOLINTNEXTLINE(build/include) */
-#include "./block_splitter_inc.h"
+#include "block_splitter_inc.h"
 #undef DataType
 #undef FN
 
 #define FN(X) X ## Command
 #define DataType uint16_t
 /* NOLINTNEXTLINE(build/include) */
-#include "./block_splitter_inc.h"
+#include "block_splitter_inc.h"
 #undef FN
 
 #define FN(X) X ## Distance
 /* NOLINTNEXTLINE(build/include) */
-#include "./block_splitter_inc.h"
+#include "block_splitter_inc.h"
 #undef DataType
 #undef FN
 
diff --git a/c/enc/block_splitter.h b/c/enc/block_splitter.h
index a5e006c..1de072f 100644
--- a/c/enc/block_splitter.h
+++ b/c/enc/block_splitter.h
@@ -11,9 +11,9 @@
 
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./command.h"
-#include "./memory.h"
-#include "./quality.h"
+#include "command.h"
+#include "memory.h"
+#include "quality.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/brotli_bit_stream.c b/c/enc/brotli_bit_stream.c
index cbab3e2..a89aad9 100644
--- a/c/enc/brotli_bit_stream.c
+++ b/c/enc/brotli_bit_stream.c
@@ -8,7 +8,7 @@
    compression algorithms here, just the right ordering of bits to match the
    specs. */
 
-#include "./brotli_bit_stream.h"
+#include "brotli_bit_stream.h"
 
 #include <string.h>  /* memcpy, memset */
 
@@ -16,12 +16,12 @@
 #include "../common/context.h"
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./entropy_encode.h"
-#include "./entropy_encode_static.h"
-#include "./fast_log.h"
-#include "./histogram.h"
-#include "./memory.h"
-#include "./write_bits.h"
+#include "entropy_encode.h"
+#include "entropy_encode_static.h"
+#include "fast_log.h"
+#include "histogram.h"
+#include "memory.h"
+#include "write_bits.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
@@ -919,17 +919,17 @@ static void StoreSymbolWithContext(BlockEncoder* self, size_t symbol,
 
 #define FN(X) X ## Literal
 /* NOLINTNEXTLINE(build/include) */
-#include "./block_encoder_inc.h"
+#include "block_encoder_inc.h"
 #undef FN
 
 #define FN(X) X ## Command
 /* NOLINTNEXTLINE(build/include) */
-#include "./block_encoder_inc.h"
+#include "block_encoder_inc.h"
 #undef FN
 
 #define FN(X) X ## Distance
 /* NOLINTNEXTLINE(build/include) */
-#include "./block_encoder_inc.h"
+#include "block_encoder_inc.h"
 #undef FN
 
 static void JumpToByteBoundary(size_t* storage_ix, uint8_t* storage) {
diff --git a/c/enc/brotli_bit_stream.h b/c/enc/brotli_bit_stream.h
index 70b118e..7bc4252 100644
--- a/c/enc/brotli_bit_stream.h
+++ b/c/enc/brotli_bit_stream.h
@@ -19,10 +19,10 @@
 #include "../common/context.h"
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./command.h"
-#include "./entropy_encode.h"
-#include "./memory.h"
-#include "./metablock.h"
+#include "command.h"
+#include "entropy_encode.h"
+#include "memory.h"
+#include "metablock.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/cluster.c b/c/enc/cluster.c
index a20dfd3..b86bbfb 100644
--- a/c/enc/cluster.c
+++ b/c/enc/cluster.c
@@ -6,14 +6,14 @@
 
 /* Functions for clustering similar histograms together. */
 
-#include "./cluster.h"
+#include "cluster.h"
 
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./bit_cost.h"  /* BrotliPopulationCost */
-#include "./fast_log.h"
-#include "./histogram.h"
-#include "./memory.h"
+#include "bit_cost.h"  /* BrotliPopulationCost */
+#include "fast_log.h"
+#include "histogram.h"
+#include "memory.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
@@ -38,15 +38,15 @@ static BROTLI_INLINE double ClusterCostDiff(size_t size_a, size_t size_b) {
 #define CODE(X) X
 
 #define FN(X) X ## Literal
-#include "./cluster_inc.h"  /* NOLINT(build/include) */
+#include "cluster_inc.h"  /* NOLINT(build/include) */
 #undef FN
 
 #define FN(X) X ## Command
-#include "./cluster_inc.h"  /* NOLINT(build/include) */
+#include "cluster_inc.h"  /* NOLINT(build/include) */
 #undef FN
 
 #define FN(X) X ## Distance
-#include "./cluster_inc.h"  /* NOLINT(build/include) */
+#include "cluster_inc.h"  /* NOLINT(build/include) */
 #undef FN
 
 #undef CODE
diff --git a/c/enc/cluster.h b/c/enc/cluster.h
index bb26124..107e8a3 100644
--- a/c/enc/cluster.h
+++ b/c/enc/cluster.h
@@ -11,8 +11,8 @@
 
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./histogram.h"
-#include "./memory.h"
+#include "histogram.h"
+#include "memory.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
@@ -28,15 +28,15 @@ typedef struct HistogramPair {
 #define CODE(X) /* Declaration */;
 
 #define FN(X) X ## Literal
-#include "./cluster_inc.h"  /* NOLINT(build/include) */
+#include "cluster_inc.h"  /* NOLINT(build/include) */
 #undef FN
 
 #define FN(X) X ## Command
-#include "./cluster_inc.h"  /* NOLINT(build/include) */
+#include "cluster_inc.h"  /* NOLINT(build/include) */
 #undef FN
 
 #define FN(X) X ## Distance
-#include "./cluster_inc.h"  /* NOLINT(build/include) */
+#include "cluster_inc.h"  /* NOLINT(build/include) */
 #undef FN
 
 #undef CODE
diff --git a/c/enc/command.c b/c/enc/command.c
index 5e6c249..bf80561 100644
--- a/c/enc/command.c
+++ b/c/enc/command.c
@@ -4,7 +4,7 @@
    See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
 */
 
-#include "./command.h"
+#include "command.h"
 
 #include <brotli/types.h>
 
diff --git a/c/enc/command.h b/c/enc/command.h
index d84e373..43e35d7 100644
--- a/c/enc/command.h
+++ b/c/enc/command.h
@@ -12,9 +12,9 @@
 #include "../common/constants.h"
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./fast_log.h"
-#include "./params.h"
-#include "./prefix.h"
+#include "fast_log.h"
+#include "params.h"
+#include "prefix.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/compound_dictionary.c b/c/enc/compound_dictionary.c
index f2a3f37..10f76b2 100644
--- a/c/enc/compound_dictionary.c
+++ b/c/enc/compound_dictionary.c
@@ -4,12 +4,12 @@
    See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
 */
 
-#include "./compound_dictionary.h"
+#include "compound_dictionary.h"
 
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./memory.h"
-#include "./quality.h"
+#include "memory.h"
+#include "quality.h"
 
 static PreparedDictionary* CreatePreparedDictionaryWithParams(MemoryManager* m,
     const uint8_t* source, size_t source_size, uint32_t bucket_bits,
diff --git a/c/enc/compound_dictionary.h b/c/enc/compound_dictionary.h
index 5e1dfe2..60b12d2 100644
--- a/c/enc/compound_dictionary.h
+++ b/c/enc/compound_dictionary.h
@@ -11,7 +11,7 @@
 #include "../common/constants.h"
 #include <brotli/shared_dictionary.h>
 #include <brotli/types.h>
-#include "./memory.h"
+#include "memory.h"
 
 static const uint32_t kPreparedDictionaryMagic = 0xDEBCEDE0;
 static const uint64_t kPreparedDictionaryHashMul64Long =
diff --git a/c/enc/compress_fragment.c b/c/enc/compress_fragment.c
index a6a7e62..064c858 100644
--- a/c/enc/compress_fragment.c
+++ b/c/enc/compress_fragment.c
@@ -12,17 +12,17 @@
    Adapted from the CompressFragment() function in
    https://github.com/google/snappy/blob/master/snappy.cc */
 
-#include "./compress_fragment.h"
+#include "compress_fragment.h"
 
 #include <string.h>  /* memcmp, memcpy, memset */
 
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./brotli_bit_stream.h"
-#include "./entropy_encode.h"
-#include "./fast_log.h"
-#include "./find_match_length.h"
-#include "./write_bits.h"
+#include "brotli_bit_stream.h"
+#include "entropy_encode.h"
+#include "fast_log.h"
+#include "find_match_length.h"
+#include "write_bits.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/compress_fragment.h b/c/enc/compress_fragment.h
index a7d6a6a..099a979 100644
--- a/c/enc/compress_fragment.h
+++ b/c/enc/compress_fragment.h
@@ -15,7 +15,7 @@
 #include "../common/constants.h"
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./entropy_encode.h"
+#include "entropy_encode.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/compress_fragment_two_pass.c b/c/enc/compress_fragment_two_pass.c
index 4f14843..127519b 100644
--- a/c/enc/compress_fragment_two_pass.c
+++ b/c/enc/compress_fragment_two_pass.c
@@ -10,19 +10,19 @@
    second pass we emit them into the bit stream using prefix codes built based
    on the actual command and literal byte histograms. */
 
-#include "./compress_fragment_two_pass.h"
+#include "compress_fragment_two_pass.h"
 
 #include <string.h>  /* memcmp, memcpy, memset */
 
 #include "../common/constants.h"
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./bit_cost.h"
-#include "./brotli_bit_stream.h"
-#include "./entropy_encode.h"
-#include "./fast_log.h"
-#include "./find_match_length.h"
-#include "./write_bits.h"
+#include "bit_cost.h"
+#include "brotli_bit_stream.h"
+#include "entropy_encode.h"
+#include "fast_log.h"
+#include "find_match_length.h"
+#include "write_bits.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/compress_fragment_two_pass.h b/c/enc/compress_fragment_two_pass.h
index 9c082fe..f868f83 100644
--- a/c/enc/compress_fragment_two_pass.h
+++ b/c/enc/compress_fragment_two_pass.h
@@ -16,7 +16,7 @@
 #include "../common/constants.h"
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./entropy_encode.h"
+#include "entropy_encode.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/dictionary_hash.c b/c/enc/dictionary_hash.c
index 16d853f..2919042 100644
--- a/c/enc/dictionary_hash.c
+++ b/c/enc/dictionary_hash.c
@@ -7,7 +7,7 @@
 /* Hash table on the 4-byte prefixes of static dictionary words. */
 
 #include "../common/platform.h"
-#include "./dictionary_hash.h"
+#include "dictionary_hash.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/encode.c b/c/enc/encode.c
index 9720f19..3076e66 100644
--- a/c/enc/encode.c
+++ b/c/enc/encode.c
@@ -15,25 +15,25 @@
 #include "../common/context.h"
 #include "../common/platform.h"
 #include "../common/version.h"
-#include "./backward_references.h"
-#include "./backward_references_hq.h"
-#include "./bit_cost.h"
-#include "./brotli_bit_stream.h"
-#include "./compress_fragment.h"
-#include "./compress_fragment_two_pass.h"
-#include "./dictionary_hash.h"
-#include "./encoder_dict.h"
-#include "./entropy_encode.h"
-#include "./fast_log.h"
-#include "./hash.h"
-#include "./histogram.h"
-#include "./memory.h"
-#include "./metablock.h"
-#include "./prefix.h"
-#include "./quality.h"
-#include "./ringbuffer.h"
-#include "./utf8_util.h"
-#include "./write_bits.h"
+#include "backward_references.h"
+#include "backward_references_hq.h"
+#include "bit_cost.h"
+#include "brotli_bit_stream.h"
+#include "compress_fragment.h"
+#include "compress_fragment_two_pass.h"
+#include "dictionary_hash.h"
+#include "encoder_dict.h"
+#include "entropy_encode.h"
+#include "fast_log.h"
+#include "hash.h"
+#include "histogram.h"
+#include "memory.h"
+#include "metablock.h"
+#include "prefix.h"
+#include "quality.h"
+#include "ringbuffer.h"
+#include "utf8_util.h"
+#include "write_bits.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/encoder_dict.c b/c/enc/encoder_dict.c
index 098727c..81c4518 100644
--- a/c/enc/encoder_dict.c
+++ b/c/enc/encoder_dict.c
@@ -4,7 +4,7 @@
    See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
 */
 
-#include "./encoder_dict.h"
+#include "encoder_dict.h"
 
 #include <stdlib.h>  /* malloc, free */
 
@@ -12,11 +12,11 @@
 #include "../common/platform.h"
 #include "../common/shared_dictionary_internal.h"
 #include "../common/transform.h"
-#include "./compound_dictionary.h"
-#include "./dictionary_hash.h"
-#include "./memory.h"
-#include "./quality.h"
-#include "./hash.h"
+#include "compound_dictionary.h"
+#include "dictionary_hash.h"
+#include "memory.h"
+#include "quality.h"
+#include "hash.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/encoder_dict.h b/c/enc/encoder_dict.h
index dfeb796..b5b591d 100644
--- a/c/enc/encoder_dict.h
+++ b/c/enc/encoder_dict.h
@@ -11,9 +11,9 @@
 #include "../common/platform.h"
 #include <brotli/shared_dictionary.h>
 #include <brotli/types.h>
-#include "./compound_dictionary.h"
-#include "./memory.h"
-#include "./static_dict_lut.h"
+#include "compound_dictionary.h"
+#include "memory.h"
+#include "static_dict_lut.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/entropy_encode.c b/c/enc/entropy_encode.c
index b50ccb5..b2dcbbd 100644
--- a/c/enc/entropy_encode.c
+++ b/c/enc/entropy_encode.c
@@ -6,7 +6,7 @@
 
 /* Entropy encoding (Huffman) utilities. */
 
-#include "./entropy_encode.h"
+#include "entropy_encode.h"
 
 #include <string.h>  /* memset */
 
diff --git a/c/enc/entropy_encode_static.h b/c/enc/entropy_encode_static.h
index 62b99a9..793780c 100644
--- a/c/enc/entropy_encode_static.h
+++ b/c/enc/entropy_encode_static.h
@@ -12,7 +12,7 @@
 #include "../common/constants.h"
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./write_bits.h"
+#include "write_bits.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/fast_log.c b/c/enc/fast_log.c
index 2319bae..2fa0efc 100644
--- a/c/enc/fast_log.c
+++ b/c/enc/fast_log.c
@@ -4,7 +4,7 @@
    See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
 */
 
-#include "./fast_log.h"
+#include "fast_log.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/hash.h b/c/enc/hash.h
index 7a54be2..9ead9e6 100644
--- a/c/enc/hash.h
+++ b/c/enc/hash.h
@@ -17,12 +17,12 @@
 #include "../common/dictionary.h"
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./encoder_dict.h"
-#include "./fast_log.h"
-#include "./find_match_length.h"
-#include "./memory.h"
-#include "./quality.h"
-#include "./static_dict.h"
+#include "encoder_dict.h"
+#include "fast_log.h"
+#include "find_match_length.h"
+#include "memory.h"
+#include "quality.h"
+#include "static_dict.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
@@ -246,7 +246,7 @@ static BROTLI_INLINE size_t BackwardMatchLengthCode(const BackwardMatch* self) {
 #define BUCKET_BITS 17
 #define MAX_TREE_SEARCH_DEPTH 64
 #define MAX_TREE_COMP_LENGTH 128
-#include "./hash_to_binary_tree_inc.h"  /* NOLINT(build/include) */
+#include "hash_to_binary_tree_inc.h"  /* NOLINT(build/include) */
 #undef MAX_TREE_SEARCH_DEPTH
 #undef MAX_TREE_COMP_LENGTH
 #undef BUCKET_BITS
@@ -263,7 +263,7 @@ static BROTLI_INLINE size_t BackwardMatchLengthCode(const BackwardMatch* self) {
 #define BUCKET_SWEEP_BITS 0
 #define HASH_LEN 5
 #define USE_DICTIONARY 1
-#include "./hash_longest_match_quickly_inc.h"  /* NOLINT(build/include) */
+#include "hash_longest_match_quickly_inc.h"  /* NOLINT(build/include) */
 #undef BUCKET_SWEEP_BITS
 #undef USE_DICTIONARY
 #undef HASHER
@@ -271,7 +271,7 @@ static BROTLI_INLINE size_t BackwardMatchLengthCode(const BackwardMatch* self) {
 #define HASHER() H3
 #define BUCKET_SWEEP_BITS 1
 #define USE_DICTIONARY 0
-#include "./hash_longest_match_quickly_inc.h"  /* NOLINT(build/include) */
+#include "hash_longest_match_quickly_inc.h"  /* NOLINT(build/include) */
 #undef USE_DICTIONARY
 #undef BUCKET_SWEEP_BITS
 #undef BUCKET_BITS
@@ -281,7 +281,7 @@ static BROTLI_INLINE size_t BackwardMatchLengthCode(const BackwardMatch* self) {
 #define BUCKET_BITS 17
 #define BUCKET_SWEEP_BITS 2
 #define USE_DICTIONARY 1
-#include "./hash_longest_match_quickly_inc.h"  /* NOLINT(build/include) */
+#include "hash_longest_match_quickly_inc.h"  /* NOLINT(build/include) */
 #undef USE_DICTIONARY
 #undef HASH_LEN
 #undef BUCKET_SWEEP_BITS
@@ -289,11 +289,11 @@ static BROTLI_INLINE size_t BackwardMatchLengthCode(const BackwardMatch* self) {
 #undef HASHER
 
 #define HASHER() H5
-#include "./hash_longest_match_inc.h"  /* NOLINT(build/include) */
+#include "hash_longest_match_inc.h"  /* NOLINT(build/include) */
 #undef HASHER
 
 #define HASHER() H6
-#include "./hash_longest_match64_inc.h"  /* NOLINT(build/include) */
+#include "hash_longest_match64_inc.h"  /* NOLINT(build/include) */
 #undef HASHER
 
 #define BUCKET_BITS 15
@@ -302,13 +302,13 @@ static BROTLI_INLINE size_t BackwardMatchLengthCode(const BackwardMatch* self) {
 #define NUM_BANKS 1
 #define BANK_BITS 16
 #define HASHER() H40
-#include "./hash_forgetful_chain_inc.h"  /* NOLINT(build/include) */
+#include "hash_forgetful_chain_inc.h"  /* NOLINT(build/include) */
 #undef HASHER
 #undef NUM_LAST_DISTANCES_TO_CHECK
 
 #define NUM_LAST_DISTANCES_TO_CHECK 10
 #define HASHER() H41
-#include "./hash_forgetful_chain_inc.h"  /* NOLINT(build/include) */
+#include "hash_forgetful_chain_inc.h"  /* NOLINT(build/include) */
 #undef HASHER
 #undef NUM_LAST_DISTANCES_TO_CHECK
 #undef NUM_BANKS
@@ -318,7 +318,7 @@ static BROTLI_INLINE size_t BackwardMatchLengthCode(const BackwardMatch* self) {
 #define NUM_BANKS 512
 #define BANK_BITS 9
 #define HASHER() H42
-#include "./hash_forgetful_chain_inc.h"  /* NOLINT(build/include) */
+#include "hash_forgetful_chain_inc.h"  /* NOLINT(build/include) */
 #undef HASHER
 #undef NUM_LAST_DISTANCES_TO_CHECK
 #undef NUM_BANKS
@@ -331,7 +331,7 @@ static BROTLI_INLINE size_t BackwardMatchLengthCode(const BackwardMatch* self) {
 #define BUCKET_SWEEP_BITS 2
 #define HASH_LEN 7
 #define USE_DICTIONARY 0
-#include "./hash_longest_match_quickly_inc.h"  /* NOLINT(build/include) */
+#include "hash_longest_match_quickly_inc.h"  /* NOLINT(build/include) */
 #undef USE_DICTIONARY
 #undef HASH_LEN
 #undef BUCKET_SWEEP_BITS
@@ -345,14 +345,14 @@ static BROTLI_INLINE size_t BackwardMatchLengthCode(const BackwardMatch* self) {
 #define JUMP 4
 #define NUMBUCKETS 16777216
 #define MASK ((NUMBUCKETS * 64) - 1)
-#include "./hash_rolling_inc.h"  /* NOLINT(build/include) */
+#include "hash_rolling_inc.h"  /* NOLINT(build/include) */
 #undef JUMP
 #undef HASHER
 
 
 #define HASHER() HROLLING
 #define JUMP 1
-#include "./hash_rolling_inc.h"  /* NOLINT(build/include) */
+#include "hash_rolling_inc.h"  /* NOLINT(build/include) */
 #undef MASK
 #undef NUMBUCKETS
 #undef JUMP
@@ -362,7 +362,7 @@ static BROTLI_INLINE size_t BackwardMatchLengthCode(const BackwardMatch* self) {
 #define HASHER() H35
 #define HASHER_A H3
 #define HASHER_B HROLLING_FAST
-#include "./hash_composite_inc.h"  /* NOLINT(build/include) */
+#include "hash_composite_inc.h"  /* NOLINT(build/include) */
 #undef HASHER_A
 #undef HASHER_B
 #undef HASHER
@@ -370,7 +370,7 @@ static BROTLI_INLINE size_t BackwardMatchLengthCode(const BackwardMatch* self) {
 #define HASHER() H55
 #define HASHER_A H54
 #define HASHER_B HROLLING_FAST
-#include "./hash_composite_inc.h"  /* NOLINT(build/include) */
+#include "hash_composite_inc.h"  /* NOLINT(build/include) */
 #undef HASHER_A
 #undef HASHER_B
 #undef HASHER
@@ -378,7 +378,7 @@ static BROTLI_INLINE size_t BackwardMatchLengthCode(const BackwardMatch* self) {
 #define HASHER() H65
 #define HASHER_A H6
 #define HASHER_B HROLLING
-#include "./hash_composite_inc.h"  /* NOLINT(build/include) */
+#include "hash_composite_inc.h"  /* NOLINT(build/include) */
 #undef HASHER_A
 #undef HASHER_B
 #undef HASHER
diff --git a/c/enc/histogram.c b/c/enc/histogram.c
index 6da2ff6..8cb7610 100644
--- a/c/enc/histogram.c
+++ b/c/enc/histogram.c
@@ -6,11 +6,11 @@
 
 /* Build per-context histograms of literals, commands and distance codes. */
 
-#include "./histogram.h"
+#include "histogram.h"
 
 #include "../common/context.h"
-#include "./block_splitter.h"
-#include "./command.h"
+#include "block_splitter.h"
+#include "command.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/histogram.h b/c/enc/histogram.h
index 42af3c3..b213a8b 100644
--- a/c/enc/histogram.h
+++ b/c/enc/histogram.h
@@ -15,8 +15,8 @@
 #include "../common/context.h"
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./block_splitter.h"
-#include "./command.h"
+#include "block_splitter.h"
+#include "command.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
@@ -28,7 +28,7 @@ extern "C" {
 #define FN(X) X ## Literal
 #define DATA_SIZE BROTLI_NUM_LITERAL_SYMBOLS
 #define DataType uint8_t
-#include "./histogram_inc.h"  /* NOLINT(build/include) */
+#include "histogram_inc.h"  /* NOLINT(build/include) */
 #undef DataType
 #undef DATA_SIZE
 #undef FN
@@ -36,13 +36,13 @@ extern "C" {
 #define FN(X) X ## Command
 #define DataType uint16_t
 #define DATA_SIZE BROTLI_NUM_COMMAND_SYMBOLS
-#include "./histogram_inc.h"  /* NOLINT(build/include) */
+#include "histogram_inc.h"  /* NOLINT(build/include) */
 #undef DATA_SIZE
 #undef FN
 
 #define FN(X) X ## Distance
 #define DATA_SIZE BROTLI_NUM_HISTOGRAM_DISTANCE_SYMBOLS
-#include "./histogram_inc.h"  /* NOLINT(build/include) */
+#include "histogram_inc.h"  /* NOLINT(build/include) */
 #undef DataType
 #undef DATA_SIZE
 #undef FN
diff --git a/c/enc/literal_cost.c b/c/enc/literal_cost.c
index f410974..4e5068e 100644
--- a/c/enc/literal_cost.c
+++ b/c/enc/literal_cost.c
@@ -7,14 +7,14 @@
 /* Literal cost model to allow backward reference replacement to be efficient.
 */
 
-#include "./literal_cost.h"
+#include "literal_cost.h"
 
 #include <string.h>  /* memset */
 
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./fast_log.h"
-#include "./utf8_util.h"
+#include "fast_log.h"
+#include "utf8_util.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/memory.c b/c/enc/memory.c
index 7663d31..f3afebc 100644
--- a/c/enc/memory.c
+++ b/c/enc/memory.c
@@ -7,7 +7,7 @@
 /* Algorithms for distributing the literals and commands of a metablock between
    block types and contexts. */
 
-#include "./memory.h"
+#include "memory.h"
 
 #include <stdlib.h>  /* exit, free, malloc */
 #include <string.h>  /* memcpy */
diff --git a/c/enc/metablock.c b/c/enc/metablock.c
index 18a1d93..47b577b 100644
--- a/c/enc/metablock.c
+++ b/c/enc/metablock.c
@@ -7,19 +7,19 @@
 /* Algorithms for distributing the literals and commands of a metablock between
    block types and contexts. */
 
-#include "./metablock.h"
+#include "metablock.h"
 
 #include "../common/constants.h"
 #include "../common/context.h"
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./bit_cost.h"
-#include "./block_splitter.h"
-#include "./cluster.h"
-#include "./entropy_encode.h"
-#include "./histogram.h"
-#include "./memory.h"
-#include "./quality.h"
+#include "bit_cost.h"
+#include "block_splitter.h"
+#include "cluster.h"
+#include "entropy_encode.h"
+#include "histogram.h"
+#include "memory.h"
+#include "quality.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
@@ -286,15 +286,15 @@ void BrotliBuildMetaBlock(MemoryManager* m,
 }
 
 #define FN(X) X ## Literal
-#include "./metablock_inc.h"  /* NOLINT(build/include) */
+#include "metablock_inc.h"  /* NOLINT(build/include) */
 #undef FN
 
 #define FN(X) X ## Command
-#include "./metablock_inc.h"  /* NOLINT(build/include) */
+#include "metablock_inc.h"  /* NOLINT(build/include) */
 #undef FN
 
 #define FN(X) X ## Distance
-#include "./metablock_inc.h"  /* NOLINT(build/include) */
+#include "metablock_inc.h"  /* NOLINT(build/include) */
 #undef FN
 
 #define BROTLI_MAX_STATIC_CONTEXTS 13
diff --git a/c/enc/metablock.h b/c/enc/metablock.h
index 4eb40f5..50bd294 100644
--- a/c/enc/metablock.h
+++ b/c/enc/metablock.h
@@ -13,11 +13,11 @@
 #include "../common/context.h"
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./block_splitter.h"
-#include "./command.h"
-#include "./histogram.h"
-#include "./memory.h"
-#include "./quality.h"
+#include "block_splitter.h"
+#include "command.h"
+#include "histogram.h"
+#include "memory.h"
+#include "quality.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/params.h b/c/enc/params.h
index cc329b5..9c26d30 100644
--- a/c/enc/params.h
+++ b/c/enc/params.h
@@ -10,7 +10,7 @@
 #define BROTLI_ENC_PARAMS_H_
 
 #include <brotli/encode.h>
-#include "./encoder_dict.h"
+#include "encoder_dict.h"
 
 typedef struct BrotliHasherParams {
   int type;
diff --git a/c/enc/prefix.h b/c/enc/prefix.h
index fd359a4..b58d50b 100644
--- a/c/enc/prefix.h
+++ b/c/enc/prefix.h
@@ -13,7 +13,7 @@
 #include "../common/constants.h"
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./fast_log.h"
+#include "fast_log.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/quality.h b/c/enc/quality.h
index 5f4d034..392ab00 100644
--- a/c/enc/quality.h
+++ b/c/enc/quality.h
@@ -12,7 +12,7 @@
 
 #include "../common/platform.h"
 #include <brotli/encode.h>
-#include "./params.h"
+#include "params.h"
 
 #define FAST_ONE_PASS_COMPRESSION_QUALITY 0
 #define FAST_TWO_PASS_COMPRESSION_QUALITY 1
diff --git a/c/enc/ringbuffer.h b/c/enc/ringbuffer.h
index 8dce148..0db88cf 100644
--- a/c/enc/ringbuffer.h
+++ b/c/enc/ringbuffer.h
@@ -13,8 +13,8 @@
 
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./memory.h"
-#include "./quality.h"
+#include "memory.h"
+#include "quality.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/static_dict.c b/c/enc/static_dict.c
index c0e0ec4..04a852b 100644
--- a/c/enc/static_dict.c
+++ b/c/enc/static_dict.c
@@ -4,13 +4,13 @@
    See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
 */
 
-#include "./static_dict.h"
+#include "static_dict.h"
 
 #include "../common/dictionary.h"
 #include "../common/platform.h"
 #include "../common/transform.h"
-#include "./encoder_dict.h"
-#include "./find_match_length.h"
+#include "encoder_dict.h"
+#include "find_match_length.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/static_dict.h b/c/enc/static_dict.h
index 6b5d4eb..f572bc6 100644
--- a/c/enc/static_dict.h
+++ b/c/enc/static_dict.h
@@ -12,7 +12,7 @@
 #include "../common/dictionary.h"
 #include "../common/platform.h"
 #include <brotli/types.h>
-#include "./encoder_dict.h"
+#include "encoder_dict.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/c/enc/utf8_util.c b/c/enc/utf8_util.c
index e802b6a..65ec3f5 100644
--- a/c/enc/utf8_util.c
+++ b/c/enc/utf8_util.c
@@ -6,7 +6,7 @@
 
 /* Heuristics for deciding about the UTF8-ness of strings. */
 
-#include "./utf8_util.h"
+#include "utf8_util.h"
 
 #include <brotli/types.h>
 
diff --git a/c/tools/brotli.md b/c/tools/brotli.md
index 86253b8..895c955 100644
--- a/c/tools/brotli.md
+++ b/c/tools/brotli.md
@@ -80,7 +80,7 @@ OPTIONS
 * `-v`, `--verbose`:
     increase output verbosity
 * `-w NUM`, `--lgwin=NUM`:
-    set LZ77 window size (0, 10-24) (default: 22); window size is
+    set LZ77 window size (0, 10-24) (default: 24); window size is
     `(2**NUM - 16)`; 0 lets compressor decide over the optimal value; bigger
     windows size improve density; decoder might require up to window size
     memory to operate
diff --git a/docs/brotli.1 b/docs/brotli.1
index a3c9a13..1970606 100644
--- a/docs/brotli.1
+++ b/docs/brotli.1
@@ -103,7 +103,7 @@ Conflicting or duplicate \fIoptions\fR are not allowed\.
   increase output verbosity
 .IP \(bu 2
 \fB\-w NUM\fP, \fB\-\-lgwin=NUM\fP:
-  set LZ77 window size (0, 10\-24) (default: 22); window size is
+  set LZ77 window size (0, 10\-24) (default: 24); window size is
   \fB(2**NUM \- 16)\fP; 0 lets compressor decide over the optimal value; bigger
   windows size improve density; decoder might require up to window size
   memory to operate
diff --git a/java/org/brotli/wrapper/dec/decoder_jni.cc b/java/org/brotli/wrapper/dec/decoder_jni.cc
index d6e60e9..ba341a3 100644
--- a/java/org/brotli/wrapper/dec/decoder_jni.cc
+++ b/java/org/brotli/wrapper/dec/decoder_jni.cc
@@ -4,7 +4,7 @@
    See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
 */
 
-#include "./decoder_jni.h"
+#include "decoder_jni.h"
 
 #include <new>
 
diff --git a/java/org/brotli/wrapper/dec/decoder_jni_onload.cc b/java/org/brotli/wrapper/dec/decoder_jni_onload.cc
index 12f8eba..2f93de0 100644
--- a/java/org/brotli/wrapper/dec/decoder_jni_onload.cc
+++ b/java/org/brotli/wrapper/dec/decoder_jni_onload.cc
@@ -6,7 +6,7 @@
 
 #include <jni.h>
 
-#include "./decoder_jni.h"
+#include "decoder_jni.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/research/deorummolae.cc b/research/deorummolae.cc
index 23ac1aa..27e06a6 100644
--- a/research/deorummolae.cc
+++ b/research/deorummolae.cc
@@ -1,4 +1,4 @@
-#include "./deorummolae.h"
+#include "deorummolae.h"
 
 #include <array>
 #include <cstdio>
diff --git a/research/dictionary_generator.cc b/research/dictionary_generator.cc
index 7df55ad..c30e49b 100644
--- a/research/dictionary_generator.cc
+++ b/research/dictionary_generator.cc
@@ -8,9 +8,9 @@
 #endif
 #include <vector>
 
-#include "./deorummolae.h"
-#include "./durchschlag.h"
-#include "./sieve.h"
+#include "deorummolae.h"
+#include "durchschlag.h"
+#include "sieve.h"
 
 /* This isn't a definitive list of "--foo" arguments, only those that take an
  * additional "=#" integer parameter, like "--foo=20" or "--foo=32K".
diff --git a/research/draw_histogram.cc b/research/draw_histogram.cc
index 5341dc1..3ae42dd 100644
--- a/research/draw_histogram.cc
+++ b/research/draw_histogram.cc
@@ -19,7 +19,7 @@
 using gflags::ParseCommandLineFlags;
 
 #include "third_party/absl/flags/flag.h"
-#include "./read_dist.h"
+#include "read_dist.h"
 
 DEFINE_int32(height, 1000, "Height of the resulting histogam.");
 DEFINE_int32(width, 8000, "Width of the resulting histogam.");
diff --git a/research/durchschlag.cc b/research/durchschlag.cc
index 6cbdd8c..9a98a50 100644
--- a/research/durchschlag.cc
+++ b/research/durchschlag.cc
@@ -1,4 +1,4 @@
-#include "./durchschlag.h"
+#include "durchschlag.h"
 
 #include <algorithm>
 #include <exception>  /* terminate */
diff --git a/research/sieve.cc b/research/sieve.cc
index 4d147e1..15572ee 100644
--- a/research/sieve.cc
+++ b/research/sieve.cc
@@ -1,4 +1,4 @@
-#include "./sieve.h"
+#include "sieve.h"
 
 /* Pointer to position in (combined corpus) text. */
 typedef uint32_t TextIdx;