Remove unnecessary includes

Manual removal of includes based on include-what-you-use's output,
filtered for includes that should be removed. The goal is to avoid
unnecessary build dependencies, reducing the amount of code that needs
to be rebuilt during incremental builds.

This is a second iteration of this cleanup; the first round took place in
450845d.

Author: tautschnig

jbmc/src/java_bytecode/character_refine_preprocess.cpp

@@ -19,6 +19,8 @@ Date:   March 2017
 #include <util/bitvector_expr.h>
 #include <util/std_expr.h>
 
+#include <goto-programs/goto_instruction_code.h>
+
 /// converts based on a function on expressions
 /// \param expr_function: A reference to a function on expressions
 /// \param target: A position in a goto program

jbmc/src/java_bytecode/character_refine_preprocess.h

@@ -20,13 +20,13 @@ Date:   March 2017
 #ifndef CPROVER_JAVA_BYTECODE_CHARACTER_REFINE_PREPROCESS_H
 #define CPROVER_JAVA_BYTECODE_CHARACTER_REFINE_PREPROCESS_H
 
-#include <goto-programs/goto_instruction_code.h>
-
 #include <util/mp_arith.h>
-#include <util/std_code.h>
+#include <util/std_code_base.h>
 
 #include <unordered_map>
 
+class code_function_callt;
+
 class character_refine_preprocesst
 {
 public:

jbmc/src/java_bytecode/ci_lazy_methods.cpp

@@ -7,17 +7,19 @@ Author: Diffblue Ltd.
 \*******************************************************************/
 
 #include "ci_lazy_methods.h"
-#include "java_bytecode_language.h"
-#include "java_class_loader.h"
-#include "java_entry_point.h"
-#include "remove_exceptions.h"
 
 #include <util/expr_iterator.h>
 #include <util/namespace.h>
 #include <util/suffix.h>
+#include <util/symbol_table.h>
 
 #include <goto-programs/resolve_inherited_component.h>
 
+#include "java_bytecode_language.h"
+#include "java_class_loader.h"
+#include "java_entry_point.h"
+#include "remove_exceptions.h"
+
 /// Constructor for lazy-method loading
 /// \param symbol_table: the symbol table to use
 /// \param main_class: identifier of the entry point / main class

jbmc/src/java_bytecode/ci_lazy_methods_needed.cpp

@@ -13,7 +13,7 @@ Author: Chris Smowton, chris.smowton@diffblue.com
 
 #include <util/namespace.h>
 #include <util/std_types.h>
-#include <util/symbol_table.h>
+#include <util/symbol_table_base.h>
 
 #include <goto-programs/resolve_inherited_component.h>
 

jbmc/src/java_bytecode/code_with_references.cpp

@@ -9,8 +9,6 @@ Author: Romain Brenguier, romain.brenguier@diffblue.com
 #include "code_with_references.h"
 #include "java_types.h"
 
-#include <goto-programs/goto_instruction_code.h>
-
 #include <util/arith_tools.h>
 
 codet allocate_array(

jbmc/src/java_bytecode/create_array_with_type_intrinsic.h

@@ -12,7 +12,7 @@ Author: Diffblue Ltd.
 #ifndef CPROVER_JAVA_BYTECODE_CREATE_ARRAY_WITH_TYPE_INTRINSIC_H
 #define CPROVER_JAVA_BYTECODE_CREATE_ARRAY_WITH_TYPE_INTRINSIC_H
 
-#include <util/std_code.h>
+#include <util/std_code_base.h>
 
 class message_handlert;
 class symbol_table_baset;

jbmc/src/java_bytecode/java_bytecode_convert_class.cpp

@@ -15,17 +15,20 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <iostream>
 #endif
 
-#include "ci_lazy_methods.h"
-#include "java_bytecode_convert_method.h"
 #include "java_root_class.h"
-#include "java_types.h"
-#include "java_utils.h"
 
 #include <util/arith_tools.h>
 #include <util/expr_initializer.h>
 #include <util/namespace.h>
 #include <util/prefix.h>
 #include <util/std_expr.h>
+#include <util/symbol_table_base.h>
+
+#include "ci_lazy_methods.h"
+#include "java_bytecode_convert_method.h"
+#include "java_string_library_preprocess.h"
+#include "java_types.h"
+#include "java_utils.h"
 
 class java_bytecode_convert_classt
 {

jbmc/src/java_bytecode/java_bytecode_convert_method.cpp

@@ -26,6 +26,7 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <util/prefix.h>
 #include <util/prefix_filter.h> // IWYU pragma: keep
 #include <util/std_expr.h>
+#include <util/symbol_table_base.h>
 #include <util/threeval.h>
 
 #include <goto-programs/resolve_inherited_component.h>

jbmc/src/java_bytecode/java_bytecode_convert_method.h

@@ -12,13 +12,8 @@ Author: Daniel Kroening, kroening@kroening.com
 #ifndef CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_CONVERT_METHOD_H
 #define CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_CONVERT_METHOD_H
 
-#include "ci_lazy_methods_needed.h"
 #include "java_bytecode_convert_method_class.h"
 #include "java_bytecode_parse_tree.h"
-#include "java_string_library_preprocess.h"
-
-#include <util/message.h>
-#include <util/symbol_table.h>
 
 class class_hierarchyt;
 class prefix_filtert;

jbmc/src/java_bytecode/java_bytecode_convert_method_class.h

@@ -12,23 +12,24 @@ Author: Daniel Kroening, kroening@kroening.com
 #ifndef CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_CONVERT_METHOD_CLASS_H
 #define CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_CONVERT_METHOD_CLASS_H
 
-#include "ci_lazy_methods_needed.h"
-#include "java_bytecode_parse_tree.h"
 #include "java_bytecode_convert_class.h"
 
 #include <util/expanding_vector.h>
 #include <util/message.h>
+#include <util/namespace.h>
 #include <util/std_code.h>
 #include <util/std_expr.h>
 
 #include <analyses/cfg_dominators.h>
 
-#include <vector>
+#include "ci_lazy_methods_needed.h"
+#include "java_bytecode_parse_tree.h"
+
 #include <list>
+#include <vector>
 
 class class_hierarchyt;
 class prefix_filtert;
-class symbol_tablet;
 class symbolt;
 
 class java_bytecode_convert_methodt