clean up the includes in prop_conv.h

Author: Daniel Kroening

src/goto-checker/goto_symex_property_decider.cpp

@@ -11,6 +11,11 @@ Author: Daniel Kroening, Peter Schrammel
 
 #include "goto_symex_property_decider.h"
 
+#include <solvers/prop/literal_expr.h>
+#include <solvers/prop/prop.h>
+
+#include <util/threeval.h>
+
 goto_symex_property_decidert::goto_symex_property_decidert(
   const optionst &options,
   ui_message_handlert &ui_message_handler,

src/solvers/flattening/functions.h

@@ -12,6 +12,7 @@ Author: Daniel Kroening, [email protected]
 #ifndef CPROVER_SOLVERS_FLATTENING_FUNCTIONS_H
 #define CPROVER_SOLVERS_FLATTENING_FUNCTIONS_H
 
+#include <map>
 #include <set>
 
 #include <util/mathematical_expr.h>

src/solvers/prop/cover_goals.cpp

@@ -12,6 +12,7 @@ Author: Daniel Kroening, [email protected]
 #include "cover_goals.h"
 
 #include <util/message.h>
+#include <util/threeval.h>
 
 #include "literal_expr.h"
 #include "prop_conv.h"

src/solvers/prop/prop_conv.h

@@ -10,17 +10,7 @@ Author: Daniel Kroening, [email protected]
 #ifndef CPROVER_SOLVERS_PROP_PROP_CONV_H
 #define CPROVER_SOLVERS_PROP_PROP_CONV_H
 
-#include <string>
-#include <map>
-
-#include <util/expr.h>
-#include <util/message.h>
-#include <util/std_expr.h>
-
 #include "decision_procedure.h"
-#include "literal.h"
-#include "literal_expr.h"
-#include "prop.h"
 
 // API that provides a "handle" in the form of a literalt
 // for expressions.

src/solvers/smt2/smt2_conv.cpp

@@ -31,6 +31,7 @@ Author: Daniel Kroening, [email protected]
 #include <solvers/flattening/c_bit_field_replacement_type.h>
 #include <solvers/floatbv/float_bv.h>
 #include <solvers/lowering/expr_lowering.h>
+#include <solvers/prop/literal_expr.h>
 
 // Mark different kinds of error conditions
 

src/solvers/smt2/smt2_dec.h

@@ -10,10 +10,12 @@ Author: Daniel Kroening, [email protected]
 #ifndef CPROVER_SOLVERS_SMT2_SMT2_DEC_H
 #define CPROVER_SOLVERS_SMT2_SMT2_DEC_H
 
-#include <fstream>
-
 #include "smt2_conv.h"
 
+#include <util/message.h>
+
+#include <fstream>
+
 class smt2_stringstreamt
 {
 protected: