use goto_function.h when only goto_functiont is used

Author: Daniel Kroening

src/analyses/local_cfg.h

@@ -14,7 +14,7 @@ Author: Daniel Kroening, [email protected]
 
 #include <util/numbering.h>
 
-#include <goto-programs/goto_functions.h>
+#include <goto-programs/goto_program.h>
 
 class local_cfgt
 {

src/analyses/locals.h

@@ -14,13 +14,11 @@ Date: March 2013
 #ifndef CPROVER_ANALYSES_LOCALS_H
 #define CPROVER_ANALYSES_LOCALS_H
 
-#include <goto-programs/goto_functions.h>
+#include <goto-programs/goto_function.h>
 
 class localst
 {
 public:
-  typedef goto_functionst::goto_functiont goto_functiont;
-
   explicit localst(const goto_functiont &goto_function)
   {
     build(goto_function);

src/goto-instrument/alignment_checks.cpp

@@ -12,7 +12,11 @@ Module: Alignment Checks
 #include "alignment_checks.h"
 
 #include <util/config.h>
+#include <util/namespace.h>
 #include <util/pointer_offset_size.h>
+#include <util/std_types.h>
+
+#include <ostream>
 
 void print_struct_alignment_problems(
   const symbol_tablet &symbol_table,

src/goto-instrument/alignment_checks.h

@@ -14,7 +14,7 @@ Module: Alignment Checks
 
 #include <iosfwd>
 
-#include <goto-programs/goto_functions.h>
+#include <util/symbol_table.h>
 
 void print_struct_alignment_problems(
   const symbol_tablet &symbol_table,

src/goto-programs/generate_function_bodies.h

@@ -12,7 +12,7 @@ Author: Diffblue Ltd.
 #include <memory>
 #include <regex>
 
-#include <goto-programs/goto_functions.h>
+#include <goto-programs/goto_function.h>
 #include <goto-programs/goto_model.h>
 #include <util/cmdline.h>
 #include <util/message.h>

src/goto-symex/goto_symex_state.h

@@ -24,7 +24,7 @@ Author: Daniel Kroening, [email protected]
 #include <util/make_unique.h>
 
 #include <pointer-analysis/value_set.h>
-#include <goto-programs/goto_functions.h>
+#include <goto-programs/goto_function.h>
 
 #include "symex_target_equation.h"
 
@@ -365,7 +365,7 @@ class goto_symex_statet final
   bool l2_thread_write_encoding(const ssa_exprt &expr, const namespacet &ns);
 
   void populate_dirty_for_function(
-    const irep_idt &id, const goto_functionst::goto_functiont &);
+    const irep_idt &id, const goto_functiont &);
 
   void switch_to_thread(unsigned t);
   bool record_events;