Optimize imports

Author: peterschrammel

src/goto-checker/solver_factory.cpp

@@ -11,22 +11,27 @@ Author: Daniel Kroening, Peter Schrammel
 
 #include "solver_factory.h"
 
-#include <fstream>
 #include <iostream>
-#include <memory>
-#include <string>
 
 #include <util/exception_utils.h>
 #include <util/make_unique.h>
-#include <util/unicode.h>
+#include <util/message.h>
+#include <util/namespace.h>
+#include <util/options.h>
+#include <util/symbol_table.h>
 #include <util/version.h>
 
+#ifdef _MSC_VER
+#include <util/unicode.h>
+#endif
+
 #include <solvers/flattening/bv_dimacs.h>
+#include <solvers/prop/prop.h>
+#include <solvers/prop/prop_conv.h>
 #include <solvers/refinement/bv_refinement.h>
 #include <solvers/refinement/string_refinement.h>
 #include <solvers/sat/dimacs_cnf.h>
 #include <solvers/sat/satcheck.h>
-#include <solvers/smt2/smt2_dec.h>
 
 solver_factoryt::solver_factoryt(
   const optionst &_options,

src/goto-checker/solver_factory.h

@@ -12,19 +12,17 @@ Author: Daniel Kroening, Peter Schrammel
 #ifndef CPROVER_GOTO_CHECKER_SOLVER_FACTORY_H
 #define CPROVER_GOTO_CHECKER_SOLVER_FACTORY_H
 
-#include <list>
-#include <map>
 #include <memory>
 
-#include <util/options.h>
-
-#include <goto-symex/symex_target_equation.h>
-#include <solvers/prop/prop.h>
-#include <solvers/prop/prop_conv.h>
-#include <solvers/sat/cnf.h>
-#include <solvers/sat/satcheck.h>
 #include <solvers/smt2/smt2_dec.h>
 
+class message_handlert;
+class namespacet;
+class optionst;
+class propt;
+class prop_convt;
+class symbol_tablet;
+
 class solver_factoryt
 {
 public: