Remove unused includes

... and sort the remaining ones lexicographically.

src/ansi-c/ansi_c_entry_point.cpp

@@ -8,19 +8,10 @@ Author: Daniel Kroening, [email protected]
 
 #include "ansi_c_entry_point.h"
 
-#include <cassert>
-#include <cstdlib>
-
 #include <util/arith_tools.h>
-#include <util/c_types.h>
 #include <util/config.h>
-#include <util/cprover_prefix.h>
-#include <util/namespace.h>
-#include <util/prefix.h>
-#include <util/std_code.h>
-#include <util/std_expr.h>
+#include <util/c_types.h>
 #include <util/string_constant.h>
-#include <util/symbol.h>
 
 #include <goto-programs/goto_functions.h>
 

src/ansi-c/c_nondet_symbol_factory.cpp

@@ -11,22 +11,14 @@ Author: Diffblue Ltd.
 
 #include "c_nondet_symbol_factory.h"
 
-#include <set>
-#include <sstream>
-
 #include <util/arith_tools.h>
 #include <util/c_types.h>
 #include <util/fresh_symbol.h>
 #include <util/namespace.h>
-#include <util/pointer_offset_size.h>
-#include <util/prefix.h>
-#include <util/std_code.h>
 #include <util/std_expr.h>
 #include <util/std_types.h>
 #include <util/string_constant.h>
 
-#include <linking/zero_initializer.h>
-
 #include <goto-programs/goto_functions.h>
 
 /// Create a new temporary static symbol

src/ansi-c/c_typecheck_expr.cpp

@@ -14,17 +14,14 @@ Author: Daniel Kroening, [email protected]
 #include <cassert>
 
 #include <util/arith_tools.h>
-#include <util/c_types.h>
-#include <util/config.h>
-#include <util/std_types.h>
-#include <util/prefix.h>
-#include <util/cprover_prefix.h>
-#include <util/simplify_expr.h>
 #include <util/base_type.h>
-#include <util/std_expr.h>
-#include <util/string_constant.h>
+#include <util/cprover_prefix.h>
+#include <util/c_types.h>
+#include <util/ieee_float.h>
 #include <util/pointer_offset_size.h>
 #include <util/pointer_predicates.h>
+#include <util/simplify_expr.h>
+#include <util/string_constant.h>
 
 #include "builtin_factory.h"
 #include "c_typecast.h"

src/ansi-c/c_typecheck_type.cpp

@@ -13,19 +13,16 @@ Author: Daniel Kroening, [email protected]
 
 #include <unordered_set>
 
-#include <util/c_types.h>
-#include <util/config.h>
-#include <util/invariant.h>
-#include <util/simplify_expr.h>
 #include <util/arith_tools.h>
-#include <util/std_types.h>
+#include <util/config.h>
+#include <util/c_types.h>
 #include <util/pointer_offset_size.h>
+#include <util/simplify_expr.h>
 
+#include "ansi_c_convert_type.h"
 #include "c_qualifiers.h"
-#include "ansi_c_declaration.h"
 #include "padding.h"
 #include "type2name.h"
-#include "ansi_c_convert_type.h"
 
 void c_typecheck_baset::typecheck_type(typet &type)
 {

src/ansi-c/expr2c.cpp

@@ -13,23 +13,18 @@ Author: Daniel Kroening, [email protected]
 #include <sstream>
 
 #include <map>
-#include <set>
 
 #include <util/arith_tools.h>
-#include <util/c_types.h>
 #include <util/config.h>
-#include <util/std_types.h>
-#include <util/std_code.h>
-#include <util/ieee_float.h>
+#include <util/c_types.h>
+#include <util/find_symbols.h>
 #include <util/fixedbv.h>
-#include <util/prefix.h>
-#include <util/lispirep.h>
 #include <util/lispexpr.h>
+#include <util/lispirep.h>
 #include <util/namespace.h>
-#include <util/symbol.h>
-#include <util/suffix.h>
-#include <util/find_symbols.h>
 #include <util/pointer_offset_size.h>
+#include <util/suffix.h>
+#include <util/symbol.h>
 
 #include "c_misc.h"
 #include "c_qualifiers.h"

src/ansi-c/type2name.cpp

@@ -11,13 +11,12 @@ Author: Daniel Kroening, [email protected]
 
 #include "type2name.h"
 
-#include <util/std_types.h>
 #include <util/arith_tools.h>
+#include <util/invariant.h>
 #include <util/namespace.h>
-#include <util/symbol.h>
-#include <util/symbol_table.h>
 #include <util/pointer_offset_size.h>
-#include <util/invariant.h>
+#include <util/std_types.h>
+#include <util/symbol_table.h>
 
 typedef std::unordered_map<irep_idt, std::pair<size_t, bool>> symbol_numbert;
 

src/cbmc/bmc.cpp

@@ -12,35 +12,22 @@ Author: Daniel Kroening, [email protected]
 #include "bmc.h"
 
 #include <chrono>
-#include <exception>
-#include <fstream>
 #include <iostream>
-#include <memory>
 
 #include <util/exit_codes.h>
 #include <util/string2int.h>
-#include <util/source_location.h>
 #include <util/string_utils.h>
-#include <util/memory_info.h>
-#include <util/message.h>
-#include <util/json.h>
-#include <util/json_stream.h>
-#include <util/cprover_prefix.h>
 
-#include <langapi/mode.h>
 #include <langapi/language_util.h>
 
-#include <goto-programs/goto_model.h>
-#include <goto-programs/xml_goto_trace.h>
-#include <goto-programs/json_goto_trace.h>
 #include <goto-programs/graphml_witness.h>
+#include <goto-programs/json_goto_trace.h>
+#include <goto-programs/xml_goto_trace.h>
 
 #include <goto-symex/build_goto_trace.h>
-#include <goto-symex/slice.h>
-#include <goto-symex/slice_by_trace.h>
-#include <goto-symex/memory_model_sc.h>
-#include <goto-symex/memory_model_tso.h>
 #include <goto-symex/memory_model_pso.h>
+#include <goto-symex/slice_by_trace.h>
+#include <goto-symex/slice.h>
 
 #include <linking/static_lifetime_init.h>
 

src/cbmc/symex_coverage.cpp

@@ -13,16 +13,12 @@ Date: March 2016
 
 #include "symex_coverage.h"
 
-#include <ctime>
 #include <chrono>
 #include <iostream>
 #include <fstream>
-#include <sstream>
 
-#include <util/xml.h>
 #include <util/string2int.h>
-#include <util/cprover_prefix.h>
-#include <util/prefix.h>
+#include <util/xml.h>
 
 #include <langapi/language_util.h>
 

src/cpp/cpp_template_type.h

@@ -12,7 +12,6 @@ Author: Daniel Kroening, [email protected]
 
 #include <util/invariant.h>
 #include <util/type.h>
-#include <util/expr.h>
 
 #include "cpp_template_parameter.h"
 

src/cpp/cpp_typecheck_expr.cpp

@@ -15,23 +15,18 @@ Author: Daniel Kroening, [email protected]
 #include <iostream>
 #endif
 
-#include <util/pointer_offset_size.h>
-#include <util/std_types.h>
 #include <util/arith_tools.h>
-#include <util/std_expr.h>
-#include <util/config.h>
-#include <util/simplify_expr.h>
 #include <util/base_type.h>
-#include <util/invariant.h>
-
+#include <util/config.h>
 #include <util/c_types.h>
+#include <util/pointer_offset_size.h>
+
 #include <ansi-c/c_qualifiers.h>
 
 #include <linking/zero_initializer.h>
 
-#include "cpp_type2name.h"
-#include "cpp_convert_type.h"
 #include "cpp_exception_id.h"
+#include "cpp_type2name.h"
 #include "expr2cpp.h"
 
 bool cpp_typecheckt::find_parent(

src/cpp/cpp_typecheck_initializer.cpp

@@ -14,12 +14,9 @@ Author: Daniel Kroening, [email protected]
 #include <util/arith_tools.h>
 #include <util/c_types.h>
 #include <util/pointer_offset_size.h>
-#include <util/std_expr.h>
 
 #include <linking/zero_initializer.h>
 
-#include "cpp_util.h"
-
 /// Initialize an object with a value
 void cpp_typecheckt::convert_initializer(symbolt &symbol)
 {

src/goto-analyzer/static_show_domain.cpp

@@ -8,6 +8,8 @@ Author: Martin Brain, [email protected]
 
 #include "static_show_domain.h"
 
+#include <util/options.h>
+
 #include <analyses/dependence_graph.h>
 
 /// Runs the analyzer and then prints out the domain

src/goto-analyzer/static_show_domain.h

@@ -11,12 +11,10 @@ Author: Martin Brain, [email protected]
 
 #include <iosfwd>
 
-#include <util/message.h>
-#include <util/options.h>
-
-#include <goto-programs/goto_model.h>
-
-#include <analyses/ai.h>
+class ai_baset;
+class goto_modelt;
+class message_handlert;
+class optionst;
 
 bool static_show_domain(
   const goto_modelt &,

src/goto-analyzer/static_simplifier.cpp

@@ -6,17 +6,17 @@ Author: Martin Brain, [email protected]
 
 \*******************************************************************/
 
+#include "static_simplifier.h"
+
+#include <util/message.h>
+#include <util/options.h>
+
+#include <goto-programs/goto_model.h>
 #include <goto-programs/remove_skip.h>
 #include <goto-programs/remove_unreachable.h>
 #include <goto-programs/write_goto_binary.h>
 
-#include <util/xml.h>
-#include <util/xml_expr.h>
-#include <util/json.h>
-#include <util/json_expr.h>
-
-#include "static_simplifier.h"
-
+#include <analyses/ai.h>
 
 /// Simplifies the program using the information in the abstract domain.
 /// \param goto_model: the program analyzed

src/goto-analyzer/static_simplifier.h

@@ -11,12 +11,10 @@ Author: Martin Brain, [email protected]
 
 #include <iosfwd>
 
-#include <util/message.h>
-#include <util/options.h>
-
-#include <goto-programs/goto_model.h>
-
-#include <analyses/ai.h>
+class ai_baset;
+class goto_modelt;
+class message_handlert;
+class optionst;
 
 bool static_simplifier(
   goto_modelt &,

src/goto-analyzer/static_verifier.cpp

@@ -8,11 +8,14 @@ Author: Martin Brain, [email protected]
 
 #include "static_verifier.h"
 
-#include <util/xml.h>
-#include <util/xml_expr.h>
-#include <util/json.h>
+#include <util/message.h>
+#include <util/namespace.h>
+#include <util/options.h>
 #include <util/json_expr.h>
 
+#include <goto-programs/goto_model.h>
+
+#include <analyses/ai.h>
 
 /// Runs the analyzer and then prints out the domain
 /// \param goto_model: the program analyzed

src/goto-analyzer/static_verifier.h

@@ -11,12 +11,10 @@ Author: Martin Brain, [email protected]
 
 #include <iosfwd>
 
-#include <util/message.h>
-#include <util/options.h>
-
-#include <goto-programs/goto_model.h>
-
-#include <analyses/ai.h>
+class ai_baset;
+class goto_modelt;
+class message_handlert;
+class optionst;
 
 bool static_verifier(
   const goto_modelt &,

src/goto-analyzer/unreachable_instructions.cpp

@@ -13,18 +13,16 @@ Date: April 2016
 
 #include "unreachable_instructions.h"
 
-#include <sstream>
-
-#include <util/json.h>
-#include <util/json_expr.h>
 #include <util/file_util.h>
+#include <util/options.h>
+#include <util/json_expr.h>
 #include <util/xml.h>
 
-#include <analyses/cfg_dominators.h>
-
-#include <goto-programs/goto_model.h>
 #include <goto-programs/compute_called_functions.h>
 
+#include <analyses/ai.h>
+#include <analyses/cfg_dominators.h>
+
 typedef std::map<unsigned, goto_programt::const_targett> dead_mapt;
 
 static void unreachable_instructions(

src/goto-analyzer/unreachable_instructions.h

@@ -14,14 +14,12 @@ Date: April 2016
 #ifndef CPROVER_GOTO_ANALYZER_UNREACHABLE_INSTRUCTIONS_H
 #define CPROVER_GOTO_ANALYZER_UNREACHABLE_INSTRUCTIONS_H
 
-#include <ostream>
-
-#include <analyses/ai.h>
-
-#include <util/options.h>
-#include <util/message.h>
+#include <iosfwd>
 
+class ai_baset;
 class goto_modelt;
+class message_handlert;
+class optionst;
 
 void unreachable_instructions(
   const goto_modelt &,