From: Ulya Trofimovich <skvadrik@gmail.com>
Date: Wed, 9 Aug 2017 16:17:09 +0000 (+0100)
Subject: Fixed includes with 'include-what-you-use'.
X-Git-Tag: 1.0~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f0e7f8ff0701556b53a0199ddbd1fcb0c12efd8;p=re2c

Fixed includes with 'include-what-you-use'.

Command:

    $ configure CXX=include-what-you-use CXXFLAGS="--check-also" \
        && make -k 2>log \
        && python2 `which fix_inclydes.py` < log
---

diff --git a/re2c/src/adfa/adfa.cc b/re2c/src/adfa/adfa.cc
index cefb982a..c462b0f5 100644
--- a/re2c/src/adfa/adfa.cc
+++ b/re2c/src/adfa/adfa.cc
@@ -1,13 +1,14 @@
 #include <assert.h>
+#include <algorithm>
+#include <limits>
 #include <queue>
 #include <set>
-#include <vector>
 #include <utility>
+#include <vector>
 
-#include "src/code/go.h"
 #include "src/adfa/adfa.h"
+#include "src/code/go.h"
 #include "src/dfa/dfa.h"
-#include "src/skeleton/skeleton.h"
 #include "src/util/allocate.h"
 
 namespace re2c
diff --git a/re2c/src/adfa/adfa.h b/re2c/src/adfa/adfa.h
index 31d6174e..7df2d972 100644
--- a/re2c/src/adfa/adfa.h
+++ b/re2c/src/adfa/adfa.h
@@ -6,11 +6,13 @@
 #include <set>
 #include <string>
 #include <valarray>
+#include <vector>
 
+#include "src/adfa/action.h"
 #include "src/code/bitmap.h"
 #include "src/code/go.h"
 #include "src/code/label.h"
-#include "src/adfa/action.h"
+#include "src/dfa/tcmd.h"
 #include "src/re/rule.h"
 #include "src/re/tag.h"
 #include "src/util/forbid_copy.h"
@@ -18,8 +20,9 @@
 namespace re2c
 {
 
-struct Output;
+struct opt_t;
 class OutputFile;
+struct Output;
 struct dfa_t;
 
 struct State
diff --git a/re2c/src/adfa/dump.cc b/re2c/src/adfa/dump.cc
index 34bd95d7..fd7c70e4 100644
--- a/re2c/src/adfa/dump.cc
+++ b/re2c/src/adfa/dump.cc
@@ -1,7 +1,18 @@
+#include "src/util/c99_stdint.h"
 #include <stdio.h>
+#include <string>
+#include <utility>
+#include <valarray>
+#include <vector>
 
-#include "src/dfa/dump.h"
+#include "src/adfa/action.h"
+#include "src/adfa/adfa.h"
 #include "src/adfa/dump.h"
+#include "src/code/go.h"
+#include "src/dfa/dump.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/rule.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {
diff --git a/re2c/src/adfa/dump.h b/re2c/src/adfa/dump.h
index 1a3999f7..352f4532 100644
--- a/re2c/src/adfa/dump.h
+++ b/re2c/src/adfa/dump.h
@@ -6,6 +6,8 @@
 namespace re2c
 {
 
+struct DFA;
+
 void dump_adfa(const DFA &dfa);
 
 } // namespace re2c
diff --git a/re2c/src/adfa/prepare.cc b/re2c/src/adfa/prepare.cc
index c8202d97..f4a5f16e 100644
--- a/re2c/src/adfa/prepare.cc
+++ b/re2c/src/adfa/prepare.cc
@@ -1,12 +1,19 @@
+#include <assert.h>
 #include "src/util/c99_stdint.h"
 #include <string.h>
-#include <map>
+#include <algorithm>
+#include <utility>
+#include <valarray>
+#include <vector>
 
+#include "src/adfa/action.h"
+#include "src/adfa/adfa.h"
 #include "src/code/bitmap.h"
 #include "src/code/go.h"
 #include "src/conf/msg.h"
-#include "src/adfa/action.h"
-#include "src/adfa/adfa.h"
+#include "src/conf/opt.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/rule.h"
 #include "src/util/allocate.h"
 
 namespace re2c {
diff --git a/re2c/src/ast/ast.cc b/re2c/src/ast/ast.cc
index 67e9959e..612641e9 100644
--- a/re2c/src/ast/ast.cc
+++ b/re2c/src/ast/ast.cc
@@ -1,6 +1,7 @@
 #include <limits>
 
 #include "src/ast/ast.h"
+#include "src/util/free_list.h"
 
 namespace re2c
 {
diff --git a/re2c/src/ast/ast.h b/re2c/src/ast/ast.h
index f059485d..e4685f76 100644
--- a/re2c/src/ast/ast.h
+++ b/re2c/src/ast/ast.h
@@ -14,6 +14,9 @@
 namespace re2c
 {
 
+struct Code;
+template <class _Ty> class free_list;
+
 struct ASTChar
 {
 	uint32_t chr;
diff --git a/re2c/src/ast/normalize.cc b/re2c/src/ast/normalize.cc
index 40e0232b..dda268de 100644
--- a/re2c/src/ast/normalize.cc
+++ b/re2c/src/ast/normalize.cc
@@ -1,4 +1,8 @@
+#include <string>
+#include <vector>
+
 #include "src/ast/ast.h"
+#include "src/re/rule.h"
 
 namespace re2c {
 
diff --git a/re2c/src/ast/parser.h b/re2c/src/ast/parser.h
index 52ab03de..88469ae1 100644
--- a/re2c/src/ast/parser.h
+++ b/re2c/src/ast/parser.h
@@ -4,14 +4,17 @@
 #include <set>
 #include <string>
 
-#include "src/conf/msg.h"
 #include "src/ast/ast.h"
-#include "src/conf/opt.h"
 #include "src/ast/scanner.h"
+#include "src/conf/msg.h"
+#include "src/conf/opt.h"
 
 namespace re2c
 {
 
+class Scanner;
+struct Opt;
+
 typedef std::set<std::string> CondList;
 
 struct context_t
diff --git a/re2c/src/ast/scanner.cc b/re2c/src/ast/scanner.cc
index 34e2b516..9dd4dcfe 100644
--- a/re2c/src/ast/scanner.cc
+++ b/re2c/src/ast/scanner.cc
@@ -1,13 +1,8 @@
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <new>
 
-#include "src/conf/msg.h"
-#include "src/code/label.h"
-#include "src/code/output.h"
 #include "src/ast/scanner.h"
-#include "src/util/counter.h"
+#include "src/conf/msg.h"
 
 // used by Scanner::fatal_at and Scanner::fatalf
 #if defined(_MSC_VER) && !defined(vsnprintf)
@@ -16,6 +11,8 @@
 
 namespace re2c {
 
+class Warn;
+
 const uint32_t Scanner::BSIZE = 8192;
 
 ScannerState::ScannerState ()
diff --git a/re2c/src/ast/scanner.h b/re2c/src/ast/scanner.h
index 9ff5122b..78c47374 100644
--- a/re2c/src/ast/scanner.h
+++ b/re2c/src/ast/scanner.h
@@ -1,22 +1,27 @@
 #ifndef _RE2C_AST_SCANNER_
 #define _RE2C_AST_SCANNER_
 
-#include "src/util/c99_stdint.h"
 #include <stddef.h>
+#include "src/util/c99_stdint.h"
+#include <sys/types.h>
 #include <string>
 
+#include "src/ast/input.h"
 #include "src/conf/opt.h"
 #include "src/conf/warn.h"
-#include "src/ast/input.h"
+#include "src/re/encoding/enc.h"
 #include "src/util/attribute.h"
 #include "src/util/forbid_copy.h"
 
 namespace re2c
 {
 
+class Warn;
+struct Opt;
+struct conopt_t;
+class OutputFile;
 class Range;
 struct AST;
-class OutputFile;
 
 struct ScannerState
 {
diff --git a/re2c/src/ast/validate.cc b/re2c/src/ast/validate.cc
index 238039f4..9f95f767 100644
--- a/re2c/src/ast/validate.cc
+++ b/re2c/src/ast/validate.cc
@@ -1,5 +1,11 @@
-#include "src/conf/msg.h"
+#include "src/util/c99_stdint.h"
+#include <string>
+#include <vector>
+
 #include "src/ast/ast.h"
+#include "src/ast/scanner.h"
+#include "src/conf/msg.h"
+#include "src/re/rule.h"
 
 namespace re2c {
 
diff --git a/re2c/src/code/bitmap.cc b/re2c/src/code/bitmap.cc
index dfc3d171..b6b0a927 100644
--- a/re2c/src/code/bitmap.cc
+++ b/re2c/src/code/bitmap.cc
@@ -1,9 +1,11 @@
-#include <algorithm> // min
 #include <string.h> // memset
+#include <algorithm> // min
 
 #include "src/code/bitmap.h"
 #include "src/code/go.h"
 #include "src/code/output.h"
+#include "src/conf/opt.h"
+#include "src/dfa/tcmd.h"
 
 namespace re2c
 {
diff --git a/re2c/src/code/bitmap.h b/re2c/src/code/bitmap.h
index d8c63e14..4ece4726 100644
--- a/re2c/src/code/bitmap.h
+++ b/re2c/src/code/bitmap.h
@@ -8,10 +8,10 @@
 
 namespace re2c {
 
+class OutputFile;
 struct Go;
 struct Span;
 struct State;
-class OutputFile;
 
 struct bitmap_t
 {
diff --git a/re2c/src/code/emit_action.cc b/re2c/src/code/emit_action.cc
index c5632e69..3a9dfc27 100644
--- a/re2c/src/code/emit_action.cc
+++ b/re2c/src/code/emit_action.cc
@@ -1,21 +1,30 @@
-#include "src/util/c99_stdint.h"
+#include <assert.h>
 #include <stddef.h>
+#include "src/util/c99_stdint.h"
+#include <iosfwd>
 #include <set>
 #include <string>
+#include <utility>
+#include <valarray>
+#include <vector>
 
+#include "src/adfa/action.h"
+#include "src/adfa/adfa.h"
 #include "src/code/emit.h"
+#include "src/code/go.h"
 #include "src/code/input_api.h"
+#include "src/code/label.h"
 #include "src/code/output.h"
-#include "src/adfa/action.h"
-#include "src/adfa/adfa.h"
+#include "src/conf/opt.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/rule.h"
+#include "src/re/tag.h"
 #include "src/skeleton/skeleton.h"
 #include "src/util/string_utils.h"
 
 namespace re2c
 {
 
-class label_t;
-
 static void need               (OutputFile &o, uint32_t ind, size_t some);
 static void emit_accept_binary (OutputFile &o, uint32_t ind, const DFA &dfa, const accept_t &acc, size_t l, size_t r);
 static void emit_accept        (OutputFile &o, uint32_t ind, const DFA &dfa, const accept_t &acc);
diff --git a/re2c/src/code/emit_dfa.cc b/re2c/src/code/emit_dfa.cc
index 5c0f8cb8..8f73b314 100644
--- a/re2c/src/code/emit_dfa.cc
+++ b/re2c/src/code/emit_dfa.cc
@@ -1,18 +1,23 @@
-#include "src/util/c99_stdint.h"
 #include <stddef.h>
+#include "src/util/c99_stdint.h"
+#include <ostream>
 #include <set>
 #include <string>
 #include <utility>
+#include <valarray>
 #include <vector>
 
+#include "src/adfa/action.h"
+#include "src/adfa/adfa.h"
 #include "src/code/bitmap.h"
 #include "src/code/emit.h"
 #include "src/code/go.h"
 #include "src/code/input_api.h"
 #include "src/code/label.h"
 #include "src/code/output.h"
-#include "src/adfa/action.h"
-#include "src/adfa/adfa.h"
+#include "src/conf/opt.h"
+#include "src/re/rule.h"
+#include "src/re/tag.h"
 #include "src/skeleton/skeleton.h"
 #include "src/util/counter.h"
 #include "src/util/string_utils.h"
diff --git a/re2c/src/code/go_construct.cc b/re2c/src/code/go_construct.cc
index 9a4d46f2..eec4cef5 100644
--- a/re2c/src/code/go_construct.cc
+++ b/re2c/src/code/go_construct.cc
@@ -5,9 +5,12 @@
 #include <utility>
 #include <vector>
 
+#include "src/adfa/action.h"
+#include "src/adfa/adfa.h"
 #include "src/code/bitmap.h"
 #include "src/code/go.h"
-#include "src/adfa/adfa.h"
+#include "src/conf/opt.h"
+#include "src/dfa/tcmd.h"
 #include "src/util/allocate.h"
 
 namespace re2c
diff --git a/re2c/src/code/go_destruct.cc b/re2c/src/code/go_destruct.cc
index 062652cf..9876491b 100644
--- a/re2c/src/code/go_destruct.cc
+++ b/re2c/src/code/go_destruct.cc
@@ -1,6 +1,4 @@
 #include "src/util/c99_stdint.h"
-#include <utility>
-#include <vector>
 
 #include "src/code/go.h"
 
diff --git a/re2c/src/code/go_emit.cc b/re2c/src/code/go_emit.cc
index 11a4beb7..d96bd7cb 100644
--- a/re2c/src/code/go_emit.cc
+++ b/re2c/src/code/go_emit.cc
@@ -4,14 +4,15 @@
 #include <utility>
 #include <vector>
 
+#include "src/adfa/adfa.h"
 #include "src/code/bitmap.h"
-#include "src/code/go.h"
 #include "src/code/emit.h"
-#include "src/code/input_api.h"
+#include "src/code/go.h"
 #include "src/code/label.h"
 #include "src/code/output.h"
 #include "src/code/print.h"
-#include "src/adfa/adfa.h"
+#include "src/conf/opt.h"
+#include "src/dfa/tcmd.h"
 #include "src/re/encoding/enc.h"
 
 namespace re2c
diff --git a/re2c/src/code/go_used_labels.cc b/re2c/src/code/go_used_labels.cc
index 939fec72..5ce70d94 100644
--- a/re2c/src/code/go_used_labels.cc
+++ b/re2c/src/code/go_used_labels.cc
@@ -1,16 +1,15 @@
 #include <stddef.h>
 #include "src/util/c99_stdint.h"
 #include <set>
-#include <utility>
-#include <vector>
 
-#include "src/code/go.h"
-#include "src/code/label.h"
 #include "src/adfa/adfa.h"
+#include "src/code/go.h"
 
 namespace re2c
 {
 
+class label_t;
+
 void Cases::used_labels (std::set<label_t> & used) const
 {
 	for (uint32_t i = 0; i < cases_size; ++i)
diff --git a/re2c/src/code/input_api.cc b/re2c/src/code/input_api.cc
index ce7c3d64..3b91ec2b 100644
--- a/re2c/src/code/input_api.cc
+++ b/re2c/src/code/input_api.cc
@@ -3,6 +3,7 @@
 
 #include "src/code/emit.h"
 #include "src/code/input_api.h"
+#include "src/conf/opt.h"
 
 namespace re2c
 {
diff --git a/re2c/src/code/input_api.h b/re2c/src/code/input_api.h
index a5b95b3e..abb6289c 100644
--- a/re2c/src/code/input_api.h
+++ b/re2c/src/code/input_api.h
@@ -1,7 +1,9 @@
 #ifndef _RE2C_CODE_INPUT_API_
 #define _RE2C_CODE_INPUT_API_
 
+#include <stddef.h>
 #include "src/util/c99_stdint.h"
+#include <iosfwd>
 #include <string>
 
 namespace re2c
diff --git a/re2c/src/code/label.h b/re2c/src/code/label.h
index ca184d6b..bf29628a 100644
--- a/re2c/src/code/label.h
+++ b/re2c/src/code/label.h
@@ -1,9 +1,8 @@
 #ifndef _RE2C_CODE_LABEL_
 #define _RE2C_CODE_LABEL_
 
-#include <iosfwd> // ostream
-
 #include "src/util/c99_stdint.h"
+#include <iosfwd> // ostream
 
 namespace re2c {
 
diff --git a/re2c/src/code/output.cc b/re2c/src/code/output.cc
index 4ee267f4..a1c52985 100644
--- a/re2c/src/code/output.cc
+++ b/re2c/src/code/output.cc
@@ -2,11 +2,17 @@
 #include <time.h>
 #include <iomanip>
 
+#include "config.h"
 #include "src/code/emit.h"
+#include "src/code/input_api.h"
 #include "src/code/output.h"
 #include "src/code/print.h"
 #include "src/conf/msg.h"
+#include "src/conf/opt.h"
+#include "src/conf/warn.h"
+#include "src/re/encoding/enc.h"
 #include "src/util/string_utils.h"
+#include "src/util/uniq_vector.h"
 
 namespace re2c
 {
diff --git a/re2c/src/code/output.h b/re2c/src/code/output.h
index 0d9382db..5f093c4c 100644
--- a/re2c/src/code/output.h
+++ b/re2c/src/code/output.h
@@ -1,8 +1,8 @@
 #ifndef _RE2C_CODE_OUTPUT_
 #define _RE2C_CODE_OUTPUT_
 
-#include "src/util/c99_stdint.h"
 #include <stddef.h>
+#include "src/util/c99_stdint.h"
 #include <stdio.h>
 #include <fstream>
 #include <set>
@@ -20,6 +20,11 @@
 namespace re2c
 {
 
+class Warn;
+struct Opt;
+struct opt_t;
+template <typename value_t> class uniq_vector_t;
+
 struct ConfTags
 {
 	std::string format;
diff --git a/re2c/src/compile.cc b/re2c/src/compile.cc
index 1056ef29..21c3439a 100644
--- a/re2c/src/compile.cc
+++ b/re2c/src/compile.cc
@@ -1,23 +1,35 @@
+#include <stddef.h>
+#include "src/util/c99_stdint.h"
 #include <algorithm>
 #include <ostream>
-#include <set>
+#include <string>
+#include <vector>
 
-#include "src/code/output.h"
-#include "src/conf/msg.h"
-#include "src/compile.h"
 #include "src/adfa/adfa.h"
 #include "src/adfa/dump.h"
+#include "src/ast/ast.h"
 #include "src/ast/parser.h"
+#include "src/ast/scanner.h"
+#include "src/code/label.h"
+#include "src/code/output.h"
+#include "src/compile.h"
+#include "src/conf/opt.h"
 #include "src/dfa/dfa.h"
 #include "src/dfa/dump.h"
 #include "src/nfa/nfa.h"
 #include "src/re/encoding/range_suffix.h"
+#include "src/re/re.h"
+#include "src/re/rule.h"
 #include "src/skeleton/skeleton.h"
-#include "src/ast/ast.h"
+#include "src/util/counter.h"
+#include "src/util/free_list.h"
+#include "src/util/range.h"
 #include "src/util/smart_ptr.h"
 
 namespace re2c {
 
+class Warn;
+
 static std::string make_name(const std::string &cond, uint32_t line)
 {
 	std::ostringstream os;
diff --git a/re2c/src/compile.h b/re2c/src/compile.h
index 0ace6504..ee1a8a09 100644
--- a/re2c/src/compile.h
+++ b/re2c/src/compile.h
@@ -8,6 +8,10 @@
 namespace re2c
 {
 
+class Scanner;
+struct Opt;
+struct Output;
+
 void compile(Scanner &input, Output &output, Opt &opts);
 
 } // namespace re2c
diff --git a/re2c/src/conf/msg.h b/re2c/src/conf/msg.h
index 5d6140f7..74781ce4 100644
--- a/re2c/src/conf/msg.h
+++ b/re2c/src/conf/msg.h
@@ -1,10 +1,10 @@
 #ifndef _RE2C_CONF_MSG_
 #define _RE2C_CONF_MSG_
 
+#include "src/util/c99_stdint.h"
 #include <string>
 
 #include "src/util/attribute.h"
-#include "src/util/c99_stdint.h"
 
 namespace re2c {
 
diff --git a/re2c/src/conf/opt.h b/re2c/src/conf/opt.h
index bb0b8191..f6380835 100644
--- a/re2c/src/conf/opt.h
+++ b/re2c/src/conf/opt.h
@@ -1,8 +1,8 @@
 #ifndef _RE2C_CONF_OPT_
 #define _RE2C_CONF_OPT_
 
-#include "src/util/c99_stdint.h"
 #include <stddef.h>
+#include "src/util/c99_stdint.h"
 #include <string>
 
 #include "src/code/input_api.h"
@@ -15,6 +15,8 @@
 namespace re2c
 {
 
+class Warn;
+
 enum target_t
 {
 	TARGET_CODE,
diff --git a/re2c/src/conf/warn.cc b/re2c/src/conf/warn.cc
index fe1ded7a..2bf406b1 100644
--- a/re2c/src/conf/warn.cc
+++ b/re2c/src/conf/warn.cc
@@ -1,11 +1,12 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <algorithm>
-#include <utility>
+#include <set>
 
 #include "src/conf/msg.h"
 #include "src/conf/warn.h"
 #include "src/skeleton/path.h"
+#include "src/re/rule.h"
 #include "src/skeleton/skeleton.h"
 
 namespace re2c {
diff --git a/re2c/src/conf/warn.h b/re2c/src/conf/warn.h
index cef97e4e..c89cfbb2 100644
--- a/re2c/src/conf/warn.h
+++ b/re2c/src/conf/warn.h
@@ -1,6 +1,7 @@
 #ifndef _RE2C_CONF_WARN_
 #define _RE2C_CONF_WARN_
 
+#include <stddef.h>
 #include "src/util/c99_stdint.h"
 #include <string>
 #include <vector>
@@ -10,6 +11,7 @@
 namespace re2c {
 
 class path_t;
+struct Rule;
 struct Skeleton;
 
 #define RE2C_WARNING_TYPES \
diff --git a/re2c/src/dfa/cfg/cfg.cc b/re2c/src/dfa/cfg/cfg.cc
index fc9c6740..00acf968 100644
--- a/re2c/src/dfa/cfg/cfg.cc
+++ b/re2c/src/dfa/cfg/cfg.cc
@@ -1,11 +1,19 @@
 #include <string.h>
+#include <algorithm>
+#include <new>
+#include <valarray>
+#include <vector>
 
 #include "src/dfa/cfg/cfg.h"
+#include "src/dfa/dfa.h"
 #include "src/util/allocate.h"
 
 namespace re2c
 {
 
+struct Rule;
+struct tcmd_t;
+
 static void map_arcs_to_bblocks(const dfa_t &dfa, cfg_ix_t *arc2bb, cfg_ix_t &nbbarc, cfg_ix_t &nbbfin, cfg_ix_t &nbbfall);
 static cfg_bb_t *create_bblocks(dfa_t &dfa, const cfg_ix_t *arc2bb, cfg_ix_t nbbfin, cfg_ix_t nbbfall);
 static void successors(const dfa_t &dfa, const cfg_ix_t *arc2bb, bool *been, cfg_ix_t *&succ, size_t x);
diff --git a/re2c/src/dfa/cfg/cfg.h b/re2c/src/dfa/cfg/cfg.h
index 7a64f8fe..ccb54fd9 100644
--- a/re2c/src/dfa/cfg/cfg.h
+++ b/re2c/src/dfa/cfg/cfg.h
@@ -1,11 +1,18 @@
 #ifndef _RE2C_DFA_CFG_CFG_
 #define _RE2C_DFA_CFG_CFG_
 
-#include "src/util/forbid_copy.h"
+#include "src/util/c99_stdint.h"
+
 #include "src/dfa/dfa.h"
+#include "src/re/tag.h"
+#include "src/util/forbid_copy.h"
 
 namespace re2c {
 
+struct Rule;
+struct dfa_t;
+struct tcmd_t;
+
 typedef uint32_t cfg_ix_t;
 
 // basic block
diff --git a/re2c/src/dfa/cfg/compact.cc b/re2c/src/dfa/cfg/compact.cc
index f55c0aae..e67e8e5e 100644
--- a/re2c/src/dfa/cfg/compact.cc
+++ b/re2c/src/dfa/cfg/compact.cc
@@ -1,4 +1,11 @@
+#include <stddef.h>
+#include <algorithm>
+#include <vector>
+
 #include "src/dfa/cfg/cfg.h"
+#include "src/dfa/dfa.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {
diff --git a/re2c/src/dfa/cfg/dce.cc b/re2c/src/dfa/cfg/dce.cc
index d4bc2cb8..88b97efd 100644
--- a/re2c/src/dfa/cfg/dce.cc
+++ b/re2c/src/dfa/cfg/dce.cc
@@ -1,4 +1,7 @@
 #include "src/dfa/cfg/cfg.h"
+#include "src/dfa/dfa.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {
diff --git a/re2c/src/dfa/cfg/dump.cc b/re2c/src/dfa/cfg/dump.cc
index 0368868e..d3757c1f 100644
--- a/re2c/src/dfa/cfg/dump.cc
+++ b/re2c/src/dfa/cfg/dump.cc
@@ -1,6 +1,10 @@
 #include <stdio.h>
 
 #include "src/dfa/cfg/cfg.h"
+#include "src/dfa/dfa.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/rule.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {
diff --git a/re2c/src/dfa/cfg/freeze.cc b/re2c/src/dfa/cfg/freeze.cc
index 6b8e9fb5..926089d3 100644
--- a/re2c/src/dfa/cfg/freeze.cc
+++ b/re2c/src/dfa/cfg/freeze.cc
@@ -1,4 +1,8 @@
+#include <stddef.h>
+#include <vector>
+
 #include "src/dfa/dfa.h"
+#include "src/dfa/tcmd.h"
 
 namespace re2c
 {
diff --git a/re2c/src/dfa/cfg/interfere.cc b/re2c/src/dfa/cfg/interfere.cc
index 0c9d7f6f..45da84bc 100644
--- a/re2c/src/dfa/cfg/interfere.cc
+++ b/re2c/src/dfa/cfg/interfere.cc
@@ -1,6 +1,11 @@
 #include <string.h>
+#include <set>
+#include <vector>
 
 #include "src/dfa/cfg/cfg.h"
+#include "src/dfa/dfa.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {
diff --git a/re2c/src/dfa/cfg/liveanal.cc b/re2c/src/dfa/cfg/liveanal.cc
index a3634723..4123f3fd 100644
--- a/re2c/src/dfa/cfg/liveanal.cc
+++ b/re2c/src/dfa/cfg/liveanal.cc
@@ -1,7 +1,12 @@
 #include <assert.h>
 #include <string.h>
+#include <vector>
 
 #include "src/dfa/cfg/cfg.h"
+#include "src/dfa/dfa.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/rule.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {
diff --git a/re2c/src/dfa/cfg/normalize.cc b/re2c/src/dfa/cfg/normalize.cc
index fcc7e0a5..ac6f09e0 100644
--- a/re2c/src/dfa/cfg/normalize.cc
+++ b/re2c/src/dfa/cfg/normalize.cc
@@ -1,7 +1,12 @@
 #include <assert.h>
+#include "src/util/c99_stdint.h"
 #include <string.h>
+#include <algorithm>
 
 #include "src/dfa/cfg/cfg.h"
+#include "src/dfa/dfa.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {
diff --git a/re2c/src/dfa/cfg/optimize.cc b/re2c/src/dfa/cfg/optimize.cc
index f1fc7827..c2ea2ed6 100644
--- a/re2c/src/dfa/cfg/optimize.cc
+++ b/re2c/src/dfa/cfg/optimize.cc
@@ -1,5 +1,9 @@
+#include <stddef.h>
+#include "src/util/c99_stdint.h"
+
 #include "src/dfa/cfg/cfg.h"
 #include "src/dfa/dfa.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {
diff --git a/re2c/src/dfa/cfg/rename.cc b/re2c/src/dfa/cfg/rename.cc
index f271c2e8..615bbf08 100644
--- a/re2c/src/dfa/cfg/rename.cc
+++ b/re2c/src/dfa/cfg/rename.cc
@@ -1,4 +1,11 @@
+#include <stddef.h>
+#include <set>
+#include <vector>
+
 #include "src/dfa/cfg/cfg.h"
+#include "src/dfa/dfa.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {
diff --git a/re2c/src/dfa/cfg/varalloc.cc b/re2c/src/dfa/cfg/varalloc.cc
index 4f0384e4..75d449c7 100644
--- a/re2c/src/dfa/cfg/varalloc.cc
+++ b/re2c/src/dfa/cfg/varalloc.cc
@@ -1,6 +1,10 @@
+#include <algorithm>
 #include <limits>
 
 #include "src/dfa/cfg/cfg.h"
+#include "src/dfa/dfa.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {
diff --git a/re2c/src/dfa/closure.cc b/re2c/src/dfa/closure.cc
index 194e6181..a097aafe 100644
--- a/re2c/src/dfa/closure.cc
+++ b/re2c/src/dfa/closure.cc
@@ -1,9 +1,20 @@
+#include <assert.h>
+#include "src/util/c99_stdint.h"
+#include <stdlib.h>
 #include <string.h>
+#include <algorithm>
+#include <set>
+#include <stack>
+#include <utility>
+#include <valarray>
 
+#include "src/conf/opt.h"
 #include "src/dfa/closure.h"
+#include "src/dfa/dfa.h"
 #include "src/dfa/tagpool.h"
+#include "src/dfa/tcmd.h"
 #include "src/nfa/nfa.h"
-#include "src/util/local_increment.h"
+#include "src/re/rule.h"
 
 namespace re2c
 {
diff --git a/re2c/src/dfa/closure.h b/re2c/src/dfa/closure.h
index 77fca4e5..ed30ca35 100644
--- a/re2c/src/dfa/closure.h
+++ b/re2c/src/dfa/closure.h
@@ -1,15 +1,22 @@
 #ifndef _RE2C_DFA_CLOSURE_
 #define _RE2C_DFA_CLOSURE_
 
-#include "src/util/c99_stdint.h"
+#include <stddef.h>
 #include <map>
+#include <vector>
 
 #include "src/dfa/dfa.h"
+#include "src/dfa/tagtree.h"
 #include "src/nfa/nfa.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {
 
+struct Tagpool;
+struct dfa_t;
+struct tcmd_t;
+
 struct clos_t
 {
 	nfa_state_t *origin; // for debug only
diff --git a/re2c/src/dfa/dead_rules.cc b/re2c/src/dfa/dead_rules.cc
index 11a48b10..296b1f6b 100644
--- a/re2c/src/dfa/dead_rules.cc
+++ b/re2c/src/dfa/dead_rules.cc
@@ -1,11 +1,19 @@
 #include <string.h>
+#include <set>
+#include <string>
+#include <valarray>
+#include <vector>
 
+#include "src/conf/warn.h"
 #include "src/dfa/dfa.h"
+#include "src/re/rule.h"
 #include "src/util/forbid_copy.h"
 
 namespace re2c
 {
 
+struct tcmd_t;
+
 /* note [unreachable rules]
  *
  * DFA may contain useless final states. Such states may
diff --git a/re2c/src/dfa/determinization.cc b/re2c/src/dfa/determinization.cc
index 492a3ff1..f2f8347a 100644
--- a/re2c/src/dfa/determinization.cc
+++ b/re2c/src/dfa/determinization.cc
@@ -1,14 +1,25 @@
-#include <limits>
+#include <assert.h>
+#include "src/util/c99_stdint.h"
 #include <string.h>
+#include <algorithm>
+#include <limits>
+#include <set>
+#include <string>
+#include <valarray>
 #include <vector>
 
 #include "src/conf/opt.h"
+#include "src/conf/warn.h"
 #include "src/dfa/closure.h"
 #include "src/dfa/dfa.h"
 #include "src/dfa/dump.h"
 #include "src/dfa/find_state.h"
 #include "src/dfa/tagpool.h"
+#include "src/dfa/tagtree.h"
+#include "src/dfa/tcmd.h"
 #include "src/nfa/nfa.h"
+#include "src/re/rule.h"
+#include "src/re/tag.h"
 #include "src/util/range.h"
 
 namespace re2c
diff --git a/re2c/src/dfa/dump.cc b/re2c/src/dfa/dump.cc
index 8c11c25c..7f8d505e 100644
--- a/re2c/src/dfa/dump.cc
+++ b/re2c/src/dfa/dump.cc
@@ -1,7 +1,18 @@
 #include <stdio.h>
+#include <stdlib.h>
+#include <string>
+#include <valarray>
+#include <vector>
 
+#include "src/conf/opt.h"
+#include "src/dfa/dfa.h"
 #include "src/dfa/dump.h"
 #include "src/dfa/tagpool.h"
+#include "src/dfa/tagtree.h"
+#include "src/dfa/tcmd.h"
+#include "src/nfa/nfa.h"
+#include "src/re/rule.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {
diff --git a/re2c/src/dfa/dump.h b/re2c/src/dfa/dump.h
index 3381ac4c..c58e2810 100644
--- a/re2c/src/dfa/dump.h
+++ b/re2c/src/dfa/dump.h
@@ -1,12 +1,22 @@
 #ifndef _RE2C_DFA_DUMP_
 #define _RE2C_DFA_DUMP_
 
+#include <stddef.h>
+#include "src/util/c99_stdint.h"
+
 #include "src/dfa/closure.h"
 #include "src/dfa/dfa.h"
+#include "src/util/forbid_copy.h"
 
 namespace re2c
 {
 
+struct Tagpool;
+struct dfa_t;
+struct nfa_state_t;
+struct nfa_t;
+struct tcmd_t;
+
 struct dump_dfa_t
 {
 	const bool debug;
diff --git a/re2c/src/dfa/fallback_tags.cc b/re2c/src/dfa/fallback_tags.cc
index 9c56f897..5eee2563 100644
--- a/re2c/src/dfa/fallback_tags.cc
+++ b/re2c/src/dfa/fallback_tags.cc
@@ -1,4 +1,10 @@
+#include <stddef.h>
+#include <algorithm>
+#include <vector>
+
 #include "src/dfa/dfa.h"
+#include "src/dfa/tcmd.h"
+#include "src/re/tag.h"
 
 namespace re2c
 {
diff --git a/re2c/src/dfa/fillpoints.cc b/re2c/src/dfa/fillpoints.cc
index 130f17ee..1e2c844b 100644
--- a/re2c/src/dfa/fillpoints.cc
+++ b/re2c/src/dfa/fillpoints.cc
@@ -1,3 +1,4 @@
+#include <stddef.h>
 #include <limits>
 #include <stack>
 #include <vector>
diff --git a/re2c/src/dfa/find_state.cc b/re2c/src/dfa/find_state.cc
index 09b75f1b..fe044bca 100644
--- a/re2c/src/dfa/find_state.cc
+++ b/re2c/src/dfa/find_state.cc
@@ -1,7 +1,16 @@
+#include <assert.h>
+#include <stdlib.h>
 #include <string.h>
+#include <algorithm>
+#include <valarray>
 
+#include "src/dfa/dfa.h"
+#include "src/dfa/dump.h"
 #include "src/dfa/find_state.h"
 #include "src/dfa/tagpool.h"
+#include "src/dfa/tcmd.h"
+#include "src/nfa/nfa.h"
+#include "src/re/rule.h"
 #include "src/util/hash32.h"
 
 namespace re2c
diff --git a/re2c/src/dfa/find_state.h b/re2c/src/dfa/find_state.h
index e7a58499..0f084125 100644
--- a/re2c/src/dfa/find_state.h
+++ b/re2c/src/dfa/find_state.h
@@ -1,14 +1,27 @@
 #ifndef _RE2C_DFA_FIND_STATE_
 #define _RE2C_DFA_FIND_STATE_
 
+#include <stddef.h>
+#include "src/util/c99_stdint.h"
+#include <vector>
+
 #include "src/dfa/closure.h"
 #include "src/dfa/dump.h"
+#include "src/dfa/tagtree.h"
+#include "src/re/tag.h"
 #include "src/util/forbid_copy.h"
 #include "src/util/lookup.h"
 
 namespace re2c
 {
 
+class tcpool_t;
+struct Tagpool;
+struct dfa_t;
+struct dump_dfa_t;
+struct nfa_state_t;
+struct tcmd_t;
+
 struct kernel_t
 {
 	size_t size;
diff --git a/re2c/src/dfa/minimization.cc b/re2c/src/dfa/minimization.cc
index 2f30ca43..6404b45d 100644
--- a/re2c/src/dfa/minimization.cc
+++ b/re2c/src/dfa/minimization.cc
@@ -1,9 +1,10 @@
-#include <map>
 #include <string.h>
+#include <map>
 #include <utility>
 #include <vector>
 
 #include "src/dfa/dfa.h"
+#include "src/dfa/tcmd.h"
 
 namespace re2c
 {
diff --git a/re2c/src/dfa/tagpool.cc b/re2c/src/dfa/tagpool.cc
index 5dc387bc..b4fd90af 100644
--- a/re2c/src/dfa/tagpool.cc
+++ b/re2c/src/dfa/tagpool.cc
@@ -1,5 +1,7 @@
+#include "src/util/c99_stdint.h"
 #include <stdlib.h> // malloc
 #include <string.h> // memcpy, memcmp
+#include <algorithm>
 
 #include "src/dfa/tagpool.h"
 #include "src/util/hash32.h"
diff --git a/re2c/src/dfa/tagpool.h b/re2c/src/dfa/tagpool.h
index e8315385..f06de0af 100644
--- a/re2c/src/dfa/tagpool.h
+++ b/re2c/src/dfa/tagpool.h
@@ -1,17 +1,19 @@
 #ifndef _RE2C_DFA_TAGPOOL_
 #define _RE2C_DFA_TAGPOOL_
 
+#include <stddef.h>
 #include <stack>
 
 #include "src/dfa/closure.h"
 #include "src/dfa/tagtree.h"
 #include "src/re/tag.h"
-#include "src/util/lookup.h"
 #include "src/util/forbid_copy.h"
+#include "src/util/lookup.h"
 
 namespace re2c
 {
 
+struct nfa_state_t;
 struct opt_t;
 
 static const size_t ZERO_TAGS = 0;
diff --git a/re2c/src/dfa/tagtree.cc b/re2c/src/dfa/tagtree.cc
index 5e9afcc0..a5966a18 100644
--- a/re2c/src/dfa/tagtree.cc
+++ b/re2c/src/dfa/tagtree.cc
@@ -1,6 +1,5 @@
 #include <assert.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "src/dfa/tagtree.h"
 
diff --git a/re2c/src/dfa/tagtree.h b/re2c/src/dfa/tagtree.h
index 6fc66734..7f3bf4bb 100644
--- a/re2c/src/dfa/tagtree.h
+++ b/re2c/src/dfa/tagtree.h
@@ -1,6 +1,9 @@
 #ifndef _RE2C_DFA_TAGTREE_
 #define _RE2C_DFA_TAGTREE_
 
+#include <stddef.h>
+#include "src/util/c99_stdint.h"
+#include <sys/types.h>
 #include <vector>
 
 #include "src/re/tag.h"
diff --git a/re2c/src/dfa/tcmd.h b/re2c/src/dfa/tcmd.h
index 948efe98..88d12fa4 100644
--- a/re2c/src/dfa/tcmd.h
+++ b/re2c/src/dfa/tcmd.h
@@ -1,9 +1,11 @@
 #ifndef _RE2C_DFA_TCMD_
 #define _RE2C_DFA_TCMD_
 
+#include <stddef.h>
+#include "src/util/c99_stdint.h"
+
 #include "src/dfa/tagtree.h"
 #include "src/re/tag.h"
-#include "src/util/c99_stdint.h"
 #include "src/util/forbid_copy.h"
 #include "src/util/lookup.h"
 #include "src/util/slab_allocator.h"
diff --git a/re2c/src/main.cc b/re2c/src/main.cc
index 06b3a31e..55d0499e 100644
--- a/re2c/src/main.cc
+++ b/re2c/src/main.cc
@@ -1,12 +1,10 @@
-#include "src/util/c99_stdint.h"
-#include <string>
-
+#include "src/ast/input.h"
+#include "src/ast/scanner.h"
+#include "src/code/output.h"
 #include "src/compile.h"
 #include "src/conf/msg.h"
 #include "src/conf/opt.h"
 #include "src/conf/warn.h"
-#include "src/ast/input.h"
-#include "src/ast/scanner.h"
 
 using namespace re2c;
 
diff --git a/re2c/src/nfa/dump.cc b/re2c/src/nfa/dump.cc
index 47e175aa..4d418b8b 100644
--- a/re2c/src/nfa/dump.cc
+++ b/re2c/src/nfa/dump.cc
@@ -1,6 +1,11 @@
+#include "src/util/c99_stdint.h"
 #include <stdio.h>
+#include <string>
+#include <vector>
 
 #include "src/nfa/nfa.h"
+#include "src/re/tag.h"
+#include "src/util/range.h"
 
 namespace re2c
 {
diff --git a/re2c/src/nfa/estimate_size.cc b/re2c/src/nfa/estimate_size.cc
index 32663b8d..98c2143f 100644
--- a/re2c/src/nfa/estimate_size.cc
+++ b/re2c/src/nfa/estimate_size.cc
@@ -1,4 +1,9 @@
-#include "src/nfa/nfa.h"
+
+#include <stddef.h>
+#include <vector>
+
+#include "src/ast/ast.h"
+#include "src/re/re.h"
 
 namespace re2c {
 
diff --git a/re2c/src/nfa/re_to_nfa.cc b/re2c/src/nfa/re_to_nfa.cc
index f80e8b1d..e2d1f19a 100644
--- a/re2c/src/nfa/re_to_nfa.cc
+++ b/re2c/src/nfa/re_to_nfa.cc
@@ -1,4 +1,11 @@
+#include <stddef.h>
+#include "src/util/c99_stdint.h"
+#include <vector>
+
+#include "src/ast/ast.h"
 #include "src/nfa/nfa.h"
+#include "src/re/re.h"
+#include "src/re/tag.h"
 
 namespace re2c {
 
diff --git a/re2c/src/re/ast_to_re.cc b/re2c/src/re/ast_to_re.cc
index 7c97ac89..dbcd0d07 100644
--- a/re2c/src/re/ast_to_re.cc
+++ b/re2c/src/re/ast_to_re.cc
@@ -1,10 +1,25 @@
+#include <stddef.h>
+#include "src/util/c99_stdint.h"
+#include <algorithm>
+#include <set>
+#include <string>
+#include <utility>
+#include <valarray>
+#include <vector>
+
+#include "src/ast/ast.h"
 #include "src/conf/msg.h"
-#include "src/re/re.h"
+#include "src/conf/opt.h"
+#include "src/conf/warn.h"
 #include "src/re/empty_class_policy.h"
 #include "src/re/encoding/case.h"
 #include "src/re/encoding/enc.h"
 #include "src/re/encoding/utf16/utf16_regexp.h"
 #include "src/re/encoding/utf8/utf8_regexp.h"
+#include "src/re/re.h"
+#include "src/re/rule.h"
+#include "src/re/tag.h"
+#include "src/util/range.h"
 
 namespace re2c {
 
diff --git a/re2c/src/re/default_tags.cc b/re2c/src/re/default_tags.cc
index ef69c06b..226e7058 100644
--- a/re2c/src/re/default_tags.cc
+++ b/re2c/src/re/default_tags.cc
@@ -1,3 +1,6 @@
+#include <stddef.h>
+#include <vector>
+
 #include "src/re/re.h"
 
 namespace re2c {
diff --git a/re2c/src/re/encoding/enc.cc b/re2c/src/re/encoding/enc.cc
index 2fed6db7..5f65e821 100644
--- a/re2c/src/re/encoding/enc.cc
+++ b/re2c/src/re/encoding/enc.cc
@@ -1,4 +1,7 @@
 #include "src/re/encoding/enc.h"
+
+#include <stddef.h>
+
 #include "src/util/range.h"
 
 namespace re2c {
diff --git a/re2c/src/re/encoding/range_suffix.h b/re2c/src/re/encoding/range_suffix.h
index 4d3529c6..ae7a6a59 100644
--- a/re2c/src/re/encoding/range_suffix.h
+++ b/re2c/src/re/encoding/range_suffix.h
@@ -1,8 +1,8 @@
 #ifndef _RE2C_RE_ENCODING_RANGE_SUFFIX_
 #define _RE2C_RE_ENCODING_RANGE_SUFFIX_
 
-#include "src/util/c99_stdint.h"
 #include <stddef.h> // NULL
+#include "src/util/c99_stdint.h"
 
 #include "src/re/re.h"
 #include "src/util/forbid_copy.h"
diff --git a/re2c/src/re/encoding/utf16/utf16_range.cc b/re2c/src/re/encoding/utf16/utf16_range.cc
index 1d78ada0..f0164d12 100644
--- a/re2c/src/re/encoding/utf16/utf16_range.cc
+++ b/re2c/src/re/encoding/utf16/utf16_range.cc
@@ -1,4 +1,7 @@
 #include "src/re/encoding/utf16/utf16_range.h"
+
+#include <stddef.h>
+
 #include "src/re/encoding/range_suffix.h"
 
 namespace re2c {
diff --git a/re2c/src/re/encoding/utf16/utf16_regexp.cc b/re2c/src/re/encoding/utf16/utf16_regexp.cc
index 2778a332..43fed267 100644
--- a/re2c/src/re/encoding/utf16/utf16_regexp.cc
+++ b/re2c/src/re/encoding/utf16/utf16_regexp.cc
@@ -1,8 +1,9 @@
+#include <stddef.h>
 #include "src/util/c99_stdint.h"
 
-#include "src/re/encoding/utf16/utf16_regexp.h"
 #include "src/re/encoding/range_suffix.h"
 #include "src/re/encoding/utf16/utf16_range.h"
+#include "src/re/encoding/utf16/utf16_regexp.h"
 #include "src/util/range.h"
 
 namespace re2c {
diff --git a/re2c/src/re/encoding/utf8/utf8_range.cc b/re2c/src/re/encoding/utf8/utf8_range.cc
index c93eeaa7..18ef7565 100644
--- a/re2c/src/re/encoding/utf8/utf8_range.cc
+++ b/re2c/src/re/encoding/utf8/utf8_range.cc
@@ -1,4 +1,7 @@
 #include "src/re/encoding/utf8/utf8_range.h"
+
+#include <stddef.h>
+
 #include "src/re/encoding/range_suffix.h"
 
 namespace re2c {
diff --git a/re2c/src/re/encoding/utf8/utf8_regexp.cc b/re2c/src/re/encoding/utf8/utf8_regexp.cc
index 55bdd79a..370663dd 100644
--- a/re2c/src/re/encoding/utf8/utf8_regexp.cc
+++ b/re2c/src/re/encoding/utf8/utf8_regexp.cc
@@ -1,8 +1,9 @@
+#include <stddef.h>
 #include "src/util/c99_stdint.h"
 
-#include "src/re/encoding/utf8/utf8_regexp.h"
 #include "src/re/encoding/range_suffix.h"
 #include "src/re/encoding/utf8/utf8_range.h"
+#include "src/re/encoding/utf8/utf8_regexp.h"
 #include "src/util/range.h"
 
 namespace re2c {
diff --git a/re2c/src/re/fixed_tags.cc b/re2c/src/re/fixed_tags.cc
index c19ad510..03d5f495 100644
--- a/re2c/src/re/fixed_tags.cc
+++ b/re2c/src/re/fixed_tags.cc
@@ -1,4 +1,10 @@
+#include <stddef.h>
+#include <vector>
+
+#include "src/code/input_api.h"
+#include "src/conf/opt.h"
 #include "src/re/re.h"
+#include "src/re/tag.h"
 
 namespace re2c {
 
diff --git a/re2c/src/re/nullable.cc b/re2c/src/re/nullable.cc
index 9aa7c521..40cb7921 100644
--- a/re2c/src/re/nullable.cc
+++ b/re2c/src/re/nullable.cc
@@ -1,4 +1,12 @@
+#include <stddef.h>
+#include <string>
+#include <valarray>
+#include <vector>
+
+#include "src/conf/warn.h"
 #include "src/re/re.h"
+#include "src/re/rule.h"
+#include "src/re/tag.h"
 
 namespace re2c {
 
diff --git a/re2c/src/re/rule.h b/re2c/src/re/rule.h
index 7488e0ce..1f9dcf58 100644
--- a/re2c/src/re/rule.h
+++ b/re2c/src/re/rule.h
@@ -1,13 +1,14 @@
 #ifndef _RE2C_RE_RULE_
 #define _RE2C_RE_RULE_
 
+#include <stddef.h>
 #include "src/util/c99_stdint.h"
 #include <set>
 #include <string>
 
 #include "src/re/tag.h"
-#include "src/util/free_list.h"
 #include "src/util/forbid_copy.h"
+#include "src/util/free_list.h"
 
 namespace re2c
 {
diff --git a/re2c/src/re/split_charset.cc b/re2c/src/re/split_charset.cc
index 21c282df..d2bef13a 100644
--- a/re2c/src/re/split_charset.cc
+++ b/re2c/src/re/split_charset.cc
@@ -1,8 +1,12 @@
 #include "src/util/c99_stdint.h"
 #include <set>
 #include <stack>
+#include <vector>
 
+#include "src/conf/opt.h"
+#include "src/re/encoding/enc.h"
 #include "src/re/re.h"
+#include "src/util/range.h"
 
 namespace re2c {
 
diff --git a/re2c/src/re/tag.h b/re2c/src/re/tag.h
index e389b830..9a9a05e4 100644
--- a/re2c/src/re/tag.h
+++ b/re2c/src/re/tag.h
@@ -1,12 +1,12 @@
 #ifndef _RE2C_RE_TAG_
 #define _RE2C_RE_TAG_
 
+#include <stddef.h>
+#include "src/util/c99_stdint.h"
 #include <limits>
 #include <string>
 #include <vector>
 
-#include "src/util/c99_stdint.h"
-
 namespace re2c
 {
 
diff --git a/re2c/src/skeleton/control_flow.cc b/re2c/src/skeleton/control_flow.cc
index a1b3a204..138def51 100644
--- a/re2c/src/skeleton/control_flow.cc
+++ b/re2c/src/skeleton/control_flow.cc
@@ -1,6 +1,12 @@
+#include "src/util/c99_stdint.h"
+#include <stdio.h>
+#include <map>
+#include <utility>
 #include <valarray>
 #include <vector>
 
+#include "src/conf/warn.h"
+#include "src/re/rule.h"
 #include "src/skeleton/path.h"
 #include "src/skeleton/skeleton.h"
 #include "src/util/u32lim.h"
diff --git a/re2c/src/skeleton/generate_code.cc b/re2c/src/skeleton/generate_code.cc
index 30ed8c87..e5b6ef60 100644
--- a/re2c/src/skeleton/generate_code.cc
+++ b/re2c/src/skeleton/generate_code.cc
@@ -1,14 +1,18 @@
-#include "src/util/c99_stdint.h"
 #include <stddef.h>
-#include <algorithm>
+#include "src/util/c99_stdint.h"
 #include <set>
 #include <string>
+#include <valarray>
+#include <vector>
 
+#include "src/adfa/adfa.h"
 #include "src/code/bitmap.h"
 #include "src/code/emit.h"
 #include "src/code/output.h"
+#include "src/conf/opt.h"
 #include "src/re/encoding/enc.h"
-#include "src/adfa/adfa.h"
+#include "src/re/rule.h"
+#include "src/re/tag.h"
 #include "src/skeleton/skeleton.h"
 
 namespace re2c
diff --git a/re2c/src/skeleton/generate_data.cc b/re2c/src/skeleton/generate_data.cc
index 9b690a49..f2f16207 100644
--- a/re2c/src/skeleton/generate_data.cc
+++ b/re2c/src/skeleton/generate_data.cc
@@ -1,20 +1,25 @@
-#include "src/util/c99_stdint.h"
 #include <assert.h>
 #include <stddef.h>
+#include "src/util/c99_stdint.h"
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <algorithm>
 #include <map>
 #include <string>
 #include <utility>
+#include <valarray>
 #include <vector>
 
 #include "src/conf/msg.h"
+#include "src/conf/opt.h"
+#include "src/dfa/tcmd.h"
 #include "src/re/encoding/enc.h"
+#include "src/re/rule.h"
+#include "src/re/tag.h"
 #include "src/skeleton/path.h"
 #include "src/skeleton/skeleton.h"
+#include "src/util/forbid_copy.h"
 #include "src/util/u32lim.h"
+#include "src/util/wrap_iter.h"
 
 namespace re2c
 {
diff --git a/re2c/src/skeleton/maxpath.cc b/re2c/src/skeleton/maxpath.cc
index 8fada329..3daa3a56 100644
--- a/re2c/src/skeleton/maxpath.cc
+++ b/re2c/src/skeleton/maxpath.cc
@@ -1,6 +1,11 @@
+#include <stddef.h>
 #include "src/util/c99_stdint.h"
 #include <algorithm>
 #include <limits>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "src/conf/msg.h"
 #include "src/skeleton/skeleton.h"
diff --git a/re2c/src/skeleton/skeleton.cc b/re2c/src/skeleton/skeleton.cc
index acf90da9..5f551ab5 100644
--- a/re2c/src/skeleton/skeleton.cc
+++ b/re2c/src/skeleton/skeleton.cc
@@ -1,14 +1,15 @@
 #include <assert.h>
 #include <algorithm>
-#include <string.h>
 
 #include "src/dfa/dfa.h"
-#include "src/skeleton/path.h"
 #include "src/skeleton/skeleton.h"
 
 namespace re2c
 {
 
+struct opt_t;
+struct tcmd_t;
+
 Node::Node()
 	: arcs()
 	, rule(Rule::NONE)
diff --git a/re2c/src/skeleton/skeleton.h b/re2c/src/skeleton/skeleton.h
index 26c2b363..206365e1 100644
--- a/re2c/src/skeleton/skeleton.h
+++ b/re2c/src/skeleton/skeleton.h
@@ -7,26 +7,31 @@
 #include <map>
 #include <set>
 #include <string>
+#include <utility>
 #include <valarray>
 #include <vector>
-#include <utility>
 
 #include "src/code/bitmap.h"
 #include "src/conf/opt.h"
 #include "src/dfa/tcmd.h"
 #include "src/re/rule.h"
-#include "src/util/local_increment.h"
+#include "src/re/tag.h"
 #include "src/util/forbid_copy.h"
+#include "src/util/local_increment.h"
 #include "src/util/wrap_iter.h"
 
 namespace re2c
 {
 
-struct dfa_t;
-struct dfa_state_t;
-struct DFA;
 class OutputFile;
 class path_t;
+struct DFA;
+struct dfa_state_t;
+struct dfa_t;
+class Warn;
+class bitmaps_t;
+struct opt_t;
+struct tcmd_t;
 
 typedef local_increment_t<uint8_t> local_inc;
 
diff --git a/re2c/src/util/range.h b/re2c/src/util/range.h
index 9a9cf03b..afc142cc 100644
--- a/re2c/src/util/range.h
+++ b/re2c/src/util/range.h
@@ -1,9 +1,9 @@
 #ifndef _RE2C_UTIL_RANGE_
 #define _RE2C_UTIL_RANGE_
 
-#include "src/util/c99_stdint.h"
 #include <assert.h>
 #include <stddef.h> // NULL
+#include "src/util/c99_stdint.h"
 
 #include "src/test/range/test.h"
 #include "src/util/forbid_copy.h"
diff --git a/re2c/src/util/s_to_n32_unsafe.h b/re2c/src/util/s_to_n32_unsafe.h
index e733c161..27c1e1cc 100644
--- a/re2c/src/util/s_to_n32_unsafe.h
+++ b/re2c/src/util/s_to_n32_unsafe.h
@@ -1,9 +1,10 @@
 #ifndef _RE2C_UTIL_S_TO_N32_UNSAFE_
 #define _RE2C_UTIL_S_TO_N32_UNSAFE_
 
-#include "src/util/attribute.h"
 #include "src/util/c99_stdint.h"
 
+#include "src/util/attribute.h"
+
 bool s_to_u32_unsafe (const char * s, const char * s_end, uint32_t & number) RE2C_GXX_ATTRIBUTE ((warn_unused_result));
 bool s_to_i32_unsafe (const char * s, const char * s_end, int32_t & number) RE2C_GXX_ATTRIBUTE ((warn_unused_result));
 
diff --git a/release.sh b/release.sh
index 8c7d0271..edf0e6a3 100755
--- a/release.sh
+++ b/release.sh
@@ -2,6 +2,7 @@
 
 set -e
 
+echo 'RUNME: configure CXX=include-what-you-use CXXFLAGS="--check-also" && make -k 2>log && python2 `which fix_inclydes.py` < log'
 echo 'RUNME: cppcheck --enable=all --inconclusive --std=posix --quiet --force -I. src/'
 echo 'RUNME: for h in $(find src/ -name ''*.h*''); do echo "CHECKING $h"; g++ -I. -c $h -o foo.o; done'
 echo "RUNME: uselex `find <objdir> -type f -name '*.o'`"