Skip to content

Commit a6a825a

Browse files
tautschnigtautschnig
committed
Remove unused includes
... and sort the remaining ones lexicographically.
1 parent b04122e commit a6a825a

File tree

116 files changed

+308
-536
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+308
-536
lines changed

‎src/analyses/goto_rw.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ Date: April 2010
1212
#ifndef CPROVER_ANALYSES_GOTO_RW_H
1313
#define CPROVER_ANALYSES_GOTO_RW_H
1414

15-
#include <map>
1615
#include <iosfwd>
1716
#include <limits>
17+
#include <map>
1818
#include <memory> // unique_ptr
1919

2020
#include <util/guard.h>

‎src/ansi-c/ansi_c_entry_point.cpp

-9
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,10 @@ Author: Daniel Kroening, [email protected]
88

99
#include "ansi_c_entry_point.h"
1010

11-
#include <cassert>
12-
#include <cstdlib>
13-
1411
#include <util/arith_tools.h>
1512
#include <util/c_types.h>
1613
#include <util/config.h>
17-
#include <util/cprover_prefix.h>
18-
#include <util/namespace.h>
19-
#include <util/prefix.h>
20-
#include <util/std_code.h>
21-
#include <util/std_expr.h>
2214
#include <util/string_constant.h>
23-
#include <util/symbol.h>
2415

2516
#include <goto-programs/goto_functions.h>
2617

‎src/ansi-c/c_nondet_symbol_factory.cpp

-8
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,14 @@ Author: Diffblue Ltd.
1111

1212
#include "c_nondet_symbol_factory.h"
1313

14-
#include <set>
15-
#include <sstream>
16-
1714
#include <util/arith_tools.h>
1815
#include <util/c_types.h>
1916
#include <util/fresh_symbol.h>
2017
#include <util/namespace.h>
21-
#include <util/pointer_offset_size.h>
22-
#include <util/prefix.h>
23-
#include <util/std_code.h>
2418
#include <util/std_expr.h>
2519
#include <util/std_types.h>
2620
#include <util/string_constant.h>
2721

28-
#include <linking/zero_initializer.h>
29-
3022
#include <goto-programs/goto_functions.h>
3123

3224
/// Create a new temporary static symbol

‎src/ansi-c/c_typecheck_expr.cpp

+4-7
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,14 @@ Author: Daniel Kroening, [email protected]
1414
#include <cassert>
1515

1616
#include <util/arith_tools.h>
17+
#include <util/base_type.h>
1718
#include <util/c_types.h>
18-
#include <util/config.h>
19-
#include <util/std_types.h>
20-
#include <util/prefix.h>
2119
#include <util/cprover_prefix.h>
22-
#include <util/simplify_expr.h>
23-
#include <util/base_type.h>
24-
#include <util/std_expr.h>
25-
#include <util/string_constant.h>
20+
#include <util/ieee_float.h>
2621
#include <util/pointer_offset_size.h>
2722
#include <util/pointer_predicates.h>
23+
#include <util/simplify_expr.h>
24+
#include <util/string_constant.h>
2825

2926
#include "builtin_factory.h"
3027
#include "c_typecast.h"

‎src/ansi-c/c_typecheck_type.cpp

+3-6
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,16 @@ Author: Daniel Kroening, [email protected]
1313

1414
#include <unordered_set>
1515

16+
#include <util/arith_tools.h>
1617
#include <util/c_types.h>
1718
#include <util/config.h>
18-
#include <util/invariant.h>
19-
#include <util/simplify_expr.h>
20-
#include <util/arith_tools.h>
21-
#include <util/std_types.h>
2219
#include <util/pointer_offset_size.h>
20+
#include <util/simplify_expr.h>
2321

22+
#include "ansi_c_convert_type.h"
2423
#include "c_qualifiers.h"
25-
#include "ansi_c_declaration.h"
2624
#include "padding.h"
2725
#include "type2name.h"
28-
#include "ansi_c_convert_type.h"
2926

3027
void c_typecheck_baset::typecheck_type(typet &type)
3128
{

‎src/ansi-c/expr2c.cpp

+4-9
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,18 @@ Author: Daniel Kroening, [email protected]
1313
#include <sstream>
1414

1515
#include <map>
16-
#include <set>
1716

1817
#include <util/arith_tools.h>
1918
#include <util/c_types.h>
2019
#include <util/config.h>
21-
#include <util/std_types.h>
22-
#include <util/std_code.h>
23-
#include <util/ieee_float.h>
20+
#include <util/find_symbols.h>
2421
#include <util/fixedbv.h>
25-
#include <util/prefix.h>
26-
#include <util/lispirep.h>
2722
#include <util/lispexpr.h>
23+
#include <util/lispirep.h>
2824
#include <util/namespace.h>
29-
#include <util/symbol.h>
30-
#include <util/suffix.h>
31-
#include <util/find_symbols.h>
3225
#include <util/pointer_offset_size.h>
26+
#include <util/suffix.h>
27+
#include <util/symbol.h>
3328

3429
#include "c_misc.h"
3530
#include "c_qualifiers.h"

‎src/ansi-c/type2name.cpp

+3-4
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,12 @@ Author: Daniel Kroening, [email protected]
1111

1212
#include "type2name.h"
1313

14-
#include <util/std_types.h>
1514
#include <util/arith_tools.h>
15+
#include <util/invariant.h>
1616
#include <util/namespace.h>
17-
#include <util/symbol.h>
18-
#include <util/symbol_table.h>
1917
#include <util/pointer_offset_size.h>
20-
#include <util/invariant.h>
18+
#include <util/std_types.h>
19+
#include <util/symbol_table.h>
2120

2221
typedef std::unordered_map<irep_idt, std::pair<size_t, bool>> symbol_numbert;
2322

‎src/cbmc/bmc.cpp

+3-16
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,22 @@ Author: Daniel Kroening, [email protected]
1212
#include "bmc.h"
1313

1414
#include <chrono>
15-
#include <exception>
16-
#include <fstream>
1715
#include <iostream>
18-
#include <memory>
1916

2017
#include <util/exit_codes.h>
2118
#include <util/string2int.h>
22-
#include <util/source_location.h>
2319
#include <util/string_utils.h>
24-
#include <util/memory_info.h>
25-
#include <util/message.h>
26-
#include <util/json.h>
27-
#include <util/json_stream.h>
28-
#include <util/cprover_prefix.h>
2920

30-
#include <langapi/mode.h>
3121
#include <langapi/language_util.h>
3222

33-
#include <goto-programs/goto_model.h>
34-
#include <goto-programs/xml_goto_trace.h>
35-
#include <goto-programs/json_goto_trace.h>
3623
#include <goto-programs/graphml_witness.h>
24+
#include <goto-programs/json_goto_trace.h>
25+
#include <goto-programs/xml_goto_trace.h>
3726

3827
#include <goto-symex/build_goto_trace.h>
28+
#include <goto-symex/memory_model_pso.h>
3929
#include <goto-symex/slice.h>
4030
#include <goto-symex/slice_by_trace.h>
41-
#include <goto-symex/memory_model_sc.h>
42-
#include <goto-symex/memory_model_tso.h>
43-
#include <goto-symex/memory_model_pso.h>
4431

4532
#include <linking/static_lifetime_init.h>
4633

‎src/cbmc/symex_coverage.cpp

+3-6
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,13 @@ Date: March 2016
1313

1414
#include "symex_coverage.h"
1515

16-
#include <ctime>
1716
#include <chrono>
18-
#include <iostream>
17+
#include <ctime>
1918
#include <fstream>
20-
#include <sstream>
19+
#include <iostream>
2120

22-
#include <util/xml.h>
2321
#include <util/string2int.h>
24-
#include <util/cprover_prefix.h>
25-
#include <util/prefix.h>
22+
#include <util/xml.h>
2623

2724
#include <langapi/language_util.h>
2825

‎src/cbmc/symex_coverage.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ Date: March 2016
1414
#ifndef CPROVER_CBMC_SYMEX_COVERAGE_H
1515
#define CPROVER_CBMC_SYMEX_COVERAGE_H
1616

17-
#include <string>
1817
#include <iosfwd>
1918
#include <map>
19+
#include <string>
2020

2121
#include <goto-programs/goto_program.h>
2222

‎src/cpp/cpp_template_type.h

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ Author: Daniel Kroening, [email protected]
1212

1313
#include <util/invariant.h>
1414
#include <util/type.h>
15-
#include <util/expr.h>
1615

1716
#include "cpp_template_parameter.h"
1817

‎src/cpp/cpp_typecheck_expr.cpp

+4-9
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,18 @@ Author: Daniel Kroening, [email protected]
1515
#include <iostream>
1616
#endif
1717

18-
#include <util/pointer_offset_size.h>
19-
#include <util/std_types.h>
2018
#include <util/arith_tools.h>
21-
#include <util/std_expr.h>
22-
#include <util/config.h>
23-
#include <util/simplify_expr.h>
2419
#include <util/base_type.h>
25-
#include <util/invariant.h>
26-
2720
#include <util/c_types.h>
21+
#include <util/config.h>
22+
#include <util/pointer_offset_size.h>
23+
2824
#include <ansi-c/c_qualifiers.h>
2925

3026
#include <linking/zero_initializer.h>
3127

32-
#include "cpp_type2name.h"
33-
#include "cpp_convert_type.h"
3428
#include "cpp_exception_id.h"
29+
#include "cpp_type2name.h"
3530
#include "expr2cpp.h"
3631

3732
bool cpp_typecheckt::find_parent(

‎src/cpp/cpp_typecheck_initializer.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@ Author: Daniel Kroening, [email protected]
1414
#include <util/arith_tools.h>
1515
#include <util/c_types.h>
1616
#include <util/pointer_offset_size.h>
17-
#include <util/std_expr.h>
1817

1918
#include <linking/zero_initializer.h>
2019

21-
#include "cpp_util.h"
22-
2320
/// Initialize an object with a value
2421
void cpp_typecheckt::convert_initializer(symbolt &symbol)
2522
{

‎src/goto-analyzer/static_show_domain.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ Author: Martin Brain, [email protected]
88

99
#include "static_show_domain.h"
1010

11+
#include <util/options.h>
12+
1113
#include <analyses/dependence_graph.h>
1214

1315
/// Runs the analyzer and then prints out the domain

‎src/goto-analyzer/static_show_domain.h

+4-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@ Author: Martin Brain, [email protected]
1111

1212
#include <iosfwd>
1313

14-
#include <util/message.h>
15-
#include <util/options.h>
16-
17-
#include <goto-programs/goto_model.h>
18-
19-
#include <analyses/ai.h>
14+
class ai_baset;
15+
class goto_modelt;
16+
class message_handlert;
17+
class optionst;
2018

2119
bool static_show_domain(
2220
const goto_modelt &,

‎src/goto-analyzer/static_simplifier.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ Author: Martin Brain, [email protected]
66
77
\*******************************************************************/
88

9+
#include "static_simplifier.h"
10+
11+
#include <util/message.h>
12+
#include <util/options.h>
13+
14+
#include <goto-programs/goto_model.h>
915
#include <goto-programs/remove_skip.h>
1016
#include <goto-programs/remove_unreachable.h>
1117
#include <goto-programs/write_goto_binary.h>
1218

13-
#include <util/xml.h>
14-
#include <util/xml_expr.h>
15-
#include <util/json.h>
16-
#include <util/json_expr.h>
17-
18-
#include "static_simplifier.h"
19-
19+
#include <analyses/ai.h>
2020

2121
/// Simplifies the program using the information in the abstract domain.
2222
/// \param goto_model: the program analyzed

‎src/goto-analyzer/static_simplifier.h

+4-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@ Author: Martin Brain, [email protected]
1111

1212
#include <iosfwd>
1313

14-
#include <util/message.h>
15-
#include <util/options.h>
16-
17-
#include <goto-programs/goto_model.h>
18-
19-
#include <analyses/ai.h>
14+
class ai_baset;
15+
class goto_modelt;
16+
class message_handlert;
17+
class optionst;
2018

2119
bool static_simplifier(
2220
goto_modelt &,

‎src/goto-analyzer/static_verifier.cpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@ Author: Martin Brain, [email protected]
88

99
#include "static_verifier.h"
1010

11-
#include <util/xml.h>
12-
#include <util/xml_expr.h>
13-
#include <util/json.h>
1411
#include <util/json_expr.h>
12+
#include <util/message.h>
13+
#include <util/namespace.h>
14+
#include <util/options.h>
1515

16+
#include <goto-programs/goto_model.h>
17+
18+
#include <analyses/ai.h>
1619

1720
/// Runs the analyzer and then prints out the domain
1821
/// \param goto_model: the program analyzed

‎src/goto-analyzer/static_verifier.h

+4-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@ Author: Martin Brain, [email protected]
1111

1212
#include <iosfwd>
1313

14-
#include <util/message.h>
15-
#include <util/options.h>
16-
17-
#include <goto-programs/goto_model.h>
18-
19-
#include <analyses/ai.h>
14+
class ai_baset;
15+
class goto_modelt;
16+
class message_handlert;
17+
class optionst;
2018

2119
bool static_verifier(
2220
const goto_modelt &,

‎src/goto-analyzer/unreachable_instructions.cpp

+5-7
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,16 @@ Date: April 2016
1313

1414
#include "unreachable_instructions.h"
1515

16-
#include <sstream>
17-
18-
#include <util/json.h>
19-
#include <util/json_expr.h>
2016
#include <util/file_util.h>
17+
#include <util/json_expr.h>
18+
#include <util/options.h>
2119
#include <util/xml.h>
2220

23-
#include <analyses/cfg_dominators.h>
24-
25-
#include <goto-programs/goto_model.h>
2621
#include <goto-programs/compute_called_functions.h>
2722

23+
#include <analyses/ai.h>
24+
#include <analyses/cfg_dominators.h>
25+
2826
typedef std::map<unsigned, goto_programt::const_targett> dead_mapt;
2927

3028
static void unreachable_instructions(

0 commit comments

Comments
 (0)