make include paths uniformly use path relative to src. #534

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

src/smt/arith_eq_adapter.cpp

@@ -17,13 +17,13 @@ Revision History:
 
 --*/
 
-#include"smt_context.h"
-#include"arith_eq_adapter.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
-#include"stats.h"
-#include"simplifier.h"
-#include"ast_smt2_pp.h"
+#include "smt/smt_context.h"
+#include "smt/arith_eq_adapter.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "util/stats.h"
+#include "ast/simplifier/simplifier.h"
+#include "ast/ast_smt2_pp.h"
 
 namespace smt {
 

src/smt/arith_eq_adapter.h

@@ -19,11 +19,11 @@ Revision History:
 #ifndef ARITH_EQ_ADAPTER_H_
 #define ARITH_EQ_ADAPTER_H_
 
-#include"smt_theory.h"
-#include"obj_pair_hashtable.h"
-#include"arith_decl_plugin.h"
-#include"statistics.h"
-#include"arith_simplifier_plugin.h"
+#include "smt/smt_theory.h"
+#include "util/obj_pair_hashtable.h"
+#include "ast/arith_decl_plugin.h"
+#include "util/statistics.h"
+#include "ast/simplifier/arith_simplifier_plugin.h"
 
 namespace smt {
 

src/smt/arith_eq_solver.cpp

@@ -14,7 +14,7 @@ Author:
     Nikolaj Bjorner (nbjorner) 2012-02-25
     
 --*/
-#include"arith_eq_solver.h"
+#include "smt/arith_eq_solver.h"
 
 
 arith_eq_solver::~arith_eq_solver() {

src/smt/arith_eq_solver.h

@@ -17,8 +17,8 @@ Author:
 #ifndef ARITH_EQ_SOLVER_H_
 #define ARITH_EQ_SOLVER_H_
 
-#include"arith_decl_plugin.h"
-#include"arith_rewriter.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/rewriter/arith_rewriter.h"
 
 /**
    \brief Simplifier for the arith family.

src/smt/asserted_formulas.cpp

@@ -16,31 +16,31 @@ Author:
 Revision History:
 
 --*/
-#include"asserted_formulas.h"
-#include"ast_ll_pp.h"
-#include"ast_pp.h"
-#include"arith_simplifier_plugin.h"
-#include"array_simplifier_plugin.h"
-#include"datatype_simplifier_plugin.h"
-#include"fpa_simplifier_plugin.h"
-#include"seq_simplifier_plugin.h"
-#include"bv_simplifier_plugin.h"
-#include"for_each_expr.h"
-#include"well_sorted.h"
-#include"pull_quant.h"
-#include"pull_ite_tree.h"
-#include"push_app_ite.h"
-#include"elim_term_ite.h"
-#include"pattern_inference.h"
-#include"nnf.h"
-#include"bv_elim.h"
-#include"inj_axiom.h"
-#include"der.h"
-#include"elim_bounds.h"
-#include"warning.h"
-#include"bit2int.h"
-#include"distribute_forall.h"
-#include"quasi_macros.h"
+#include "smt/asserted_formulas.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_pp.h"
+#include "ast/simplifier/arith_simplifier_plugin.h"
+#include "ast/simplifier/array_simplifier_plugin.h"
+#include "ast/simplifier/datatype_simplifier_plugin.h"
+#include "ast/simplifier/fpa_simplifier_plugin.h"
+#include "ast/simplifier/seq_simplifier_plugin.h"
+#include "ast/simplifier/bv_simplifier_plugin.h"
+#include "ast/for_each_expr.h"
+#include "ast/well_sorted.h"
+#include "ast/normal_forms/pull_quant.h"
+#include "ast/simplifier/pull_ite_tree.h"
+#include "ast/simplifier/push_app_ite.h"
+#include "smt/elim_term_ite.h"
+#include "ast/pattern/pattern_inference.h"
+#include "ast/normal_forms/nnf.h"
+#include "ast/simplifier/bv_elim.h"
+#include "ast/simplifier/inj_axiom.h"
+#include "ast/rewriter/der.h"
+#include "ast/simplifier/elim_bounds.h"
+#include "util/warning.h"
+#include "ast/simplifier/bit2int.h"
+#include "ast/rewriter/distribute_forall.h"
+#include "ast/macros/quasi_macros.h"
 
 asserted_formulas::asserted_formulas(ast_manager & m, smt_params & p):
     m(m),

src/smt/asserted_formulas.h

@@ -19,17 +19,17 @@ Revision History:
 #ifndef ASSERTED_FORMULAS_H_
 #define ASSERTED_FORMULAS_H_
 
-#include"smt_params.h"
-#include"simplifier.h"
-#include"basic_simplifier_plugin.h"
-#include"static_features.h" 
-#include"macro_manager.h"
-#include"macro_finder.h"
-#include"defined_names.h"
-#include"maximise_ac_sharing.h"
-#include"bit2int.h"
-#include"statistics.h"
-#include"pattern_inference.h"
+#include "smt/params/smt_params.h"
+#include "ast/simplifier/simplifier.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
+#include "ast/static_features.h"
+#include "ast/macros/macro_manager.h"
+#include "ast/macros/macro_finder.h"
+#include "ast/normal_forms/defined_names.h"
+#include "ast/simplifier/maximise_ac_sharing.h"
+#include "ast/simplifier/bit2int.h"
+#include "util/statistics.h"
+#include "ast/pattern/pattern_inference.h"
 
 class arith_simplifier_plugin;
 class bv_simplifier_plugin;

src/smt/cached_var_subst.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"cached_var_subst.h"
+#include "smt/cached_var_subst.h"
 
 bool cached_var_subst::key_eq_proc::operator()(cached_var_subst::key * k1, cached_var_subst::key * k2) const {
     if (k1->m_qa != k2->m_qa)

src/smt/cached_var_subst.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef CACHED_VAR_SUBST_H_
 #define CACHED_VAR_SUBST_H_
 
-#include"var_subst.h"
-#include"map.h"
-#include"smt_enode.h"
+#include "ast/rewriter/var_subst.h"
+#include "util/map.h"
+#include "smt/smt_enode.h"
 
 class cached_var_subst {
     struct key {

src/smt/cost_evaluator.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include"cost_evaluator.h"
-#include"warning.h"
+#include "smt/cost_evaluator.h"
+#include "util/warning.h"
 
 cost_evaluator::cost_evaluator(ast_manager & m):
     m_manager(m), 

src/smt/cost_evaluator.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef COST_EVALUATOR_H_
 #define COST_EVALUATOR_H_
 
-#include"ast.h"
-#include"arith_decl_plugin.h"
+#include "ast/ast.h"
+#include "ast/arith_decl_plugin.h"
 
 class cost_evaluator {
     ast_manager &   m_manager;

src/smt/diff_logic.h

@@ -19,12 +19,12 @@ Revision History:
 #ifndef DIFF_LOGIC_H_
 #define DIFF_LOGIC_H_
 
-#include"vector.h"
-#include"heap.h"
-#include"statistics.h"
-#include"trace.h"
-#include"warning.h"
-#include"uint_set.h"
+#include "util/vector.h"
+#include "util/heap.h"
+#include "util/statistics.h"
+#include "util/trace.h"
+#include "util/warning.h"
+#include "util/uint_set.h"
 #include<deque>
 
 typedef int dl_var;

src/smt/dyn_ack.cpp

@@ -16,9 +16,9 @@ Author:
 Revision History:
 
 --*/
-#include"smt_context.h"
-#include"dyn_ack.h"
-#include"ast_pp.h"
+#include "smt/smt_context.h"
+#include "smt/dyn_ack.h"
+#include "ast/ast_pp.h"
 
 namespace smt {
 

src/smt/dyn_ack.h

@@ -19,12 +19,12 @@ Revision History:
 #ifndef DYN_ACK_H_
 #define DYN_ACK_H_
 
-#include"ast.h"
-#include"dyn_ack_params.h"
-#include"obj_hashtable.h"
-#include"obj_pair_hashtable.h"
-#include"obj_triple_hashtable.h"
-#include"smt_clause.h"
+#include "ast/ast.h"
+#include "smt/params/dyn_ack_params.h"
+#include "util/obj_hashtable.h"
+#include "util/obj_pair_hashtable.h"
+#include "util/obj_triple_hashtable.h"
+#include "smt/smt_clause.h"
 
 namespace smt {
 

src/smt/elim_term_ite.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include"elim_term_ite.h"
-#include"ast_smt2_pp.h"
+#include "smt/elim_term_ite.h"
+#include "ast/ast_smt2_pp.h"
 
 void elim_term_ite::operator()(expr * n,                        
                                expr_ref_vector & new_defs,        

src/smt/elim_term_ite.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef ELIM_TERM_ITE_H_
 #define ELIM_TERM_ITE_H_
 
-#include"simplifier.h"
-#include"defined_names.h"
+#include "ast/simplifier/simplifier.h"
+#include "ast/normal_forms/defined_names.h"
 
 class elim_term_ite : public simplifier {
     defined_names &    m_defined_names;

src/smt/expr_context_simplifier.cpp

@@ -17,11 +17,11 @@ Revision History:
 
 --*/
 
-#include "expr_context_simplifier.h"
-#include "ast_pp.h"
-#include "obj_hashtable.h"
-#include "smt_kernel.h"
-#include "for_each_expr.h"
+#include "smt/expr_context_simplifier.h"
+#include "ast/ast_pp.h"
+#include "util/obj_hashtable.h"
+#include "smt/smt_kernel.h"
+#include "ast/for_each_expr.h"
 
 // table lookup before/after simplification.
 

src/smt/expr_context_simplifier.h

@@ -19,12 +19,12 @@ Revision History:
 #ifndef EXPR_CONTEXT_SIMPLIFIER_H_
 #define EXPR_CONTEXT_SIMPLIFIER_H_
 
-#include "ast.h"
-#include "obj_hashtable.h"
-#include "basic_simplifier_plugin.h"
-#include "smt_params.h"
-#include "smt_kernel.h"
-#include "arith_decl_plugin.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
+#include "smt/params/smt_params.h"
+#include "smt/smt_kernel.h"
+#include "ast/arith_decl_plugin.h"
 
 class expr_context_simplifier {
     typedef obj_map<expr, bool> context_map;

src/smt/fingerprints.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"fingerprints.h"
+#include "smt/fingerprints.h"
 
 namespace smt {
 

src/smt/fingerprints.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef FINGERPRINTS_H_
 #define FINGERPRINTS_H_
 
-#include"smt_enode.h"
+#include "smt/smt_enode.h"
 
 namespace smt {
 

src/smt/mam.cpp

@@ -16,14 +16,14 @@ Author:
 Revision History:
 
 --*/
-#include"mam.h"
-#include"smt_context.h"
-#include"pool.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
-#include"trail.h"
-#include"stopwatch.h"
-#include"ast_smt2_pp.h"
+#include "smt/mam.h"
+#include "smt/smt_context.h"
+#include "util/pool.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "util/trail.h"
+#include "util/stopwatch.h"
+#include "ast/ast_smt2_pp.h"
 #include<algorithm>
 
 // #define _PROFILE_MAM

src/smt/mam.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef MAM_H_
 #define MAM_H_
 
-#include"ast.h"
-#include"smt_types.h"
+#include "ast/ast.h"
+#include "smt/smt_types.h"
 
 namespace smt {
     /**

src/smt/old_interval.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 
-#include"old_interval.h"
+#include "smt/old_interval.h"
 
 void ext_numeral::neg() {
     switch (m_kind) {

src/smt/old_interval.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef OLD_INTERVAL_H_
 #define OLD_INTERVAL_H_
 
-#include"rational.h"
-#include"dependency.h"
+#include "util/rational.h"
+#include "util/dependency.h"
 
 class ext_numeral {
 public:

src/smt/params/dyn_ack_params.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"dyn_ack_params.h"
+#include "smt/params/dyn_ack_params.h"
 #include"smt_params_helper.hpp"
 
 void dyn_ack_params::updt_params(params_ref const & _p) {

src/smt/params/dyn_ack_params.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef DYN_ACK_PARAMS_H_
 #define DYN_ACK_PARAMS_H_
 
-#include"params.h"
+#include "util/params.h"
 
 enum dyn_ack_strategy {
     DACK_DISABLED,

src/smt/params/preprocessor_params.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"preprocessor_params.h"
+#include "smt/params/preprocessor_params.h"
 #include"smt_params_helper.hpp"
 
 void preprocessor_params::updt_local_params(params_ref const & _p) {

src/smt/params/preprocessor_params.h

@@ -19,10 +19,10 @@ Revision History:
 #ifndef PREPROCESSOR_PARAMS_H_
 #define PREPROCESSOR_PARAMS_H_
 
-#include"pattern_inference_params.h"
-#include"bit_blaster_params.h"
-#include"bv_simplifier_params.h"
-#include"arith_simplifier_params.h"
+#include "ast/pattern/pattern_inference_params.h"
+#include "ast/rewriter/bit_blaster/bit_blaster_params.h"
+#include "ast/simplifier/bv_simplifier_params.h"
+#include "ast/simplifier/arith_simplifier_params.h"
 
 enum lift_ite_kind {
     LI_NONE,

src/smt/params/qi_params.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"qi_params.h"
+#include "smt/params/qi_params.h"
 #include"smt_params_helper.hpp"
 
 void qi_params::updt_params(params_ref const & _p) {

src/smt/params/qi_params.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef QI_PARAMS_H_
 #define QI_PARAMS_H_
 
-#include"util.h"
-#include"params.h"
+#include "util/util.h"
+#include "util/params.h"
 
 enum quick_checker_mode {
     MC_NO,     // do not use (cheap) model checking based instantiation

src/smt/params/smt_params.cpp

@@ -16,10 +16,10 @@ Author:
 Revision History:
 
 --*/
-#include"smt_params.h"
+#include "smt/params/smt_params.h"
 #include"smt_params_helper.hpp"
 #include"model_params.hpp"
-#include"gparams.h"
+#include "util/gparams.h"
 
 void smt_params::updt_local_params(params_ref const & _p) {
     smt_params_helper p(_p);

src/smt/params/smt_params.h

@@ -19,17 +19,17 @@ Revision History:
 #ifndef SMT_PARAMS_H_
 #define SMT_PARAMS_H_
 
-#include"ast.h"
-#include"dyn_ack_params.h"
-#include"qi_params.h"
-#include"theory_arith_params.h"
-#include"theory_array_params.h"
-#include"theory_bv_params.h"
-#include"theory_str_params.h"
-#include"theory_pb_params.h"
-#include"theory_datatype_params.h"
-#include"preprocessor_params.h"
-#include"context_params.h"
+#include "ast/ast.h"
+#include "smt/params/dyn_ack_params.h"
+#include "smt/params/qi_params.h"
+#include "smt/params/theory_arith_params.h"
+#include "smt/params/theory_array_params.h"
+#include "smt/params/theory_bv_params.h"
+#include "smt/params/theory_str_params.h"
+#include "smt/params/theory_pb_params.h"
+#include "smt/params/theory_datatype_params.h"
+#include "smt/params/preprocessor_params.h"
+#include "cmd_context/context_params.h"
 
 enum phase_selection { 
     PS_ALWAYS_FALSE,

src/smt/params/theory_arith_params.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"theory_arith_params.h"
+#include "smt/params/theory_arith_params.h"
 #include"smt_params_helper.hpp"
 
 void theory_arith_params::updt_params(params_ref const & _p) {

src/smt/params/theory_arith_params.h

@@ -20,7 +20,7 @@ Revision History:
 #define THEORY_ARITH_PARAMS_H_
 
 #include<limits.h>
-#include"params.h"
+#include "util/params.h"
 
 enum arith_solver_id {
     AS_NO_ARITH,

src/smt/params/theory_array_params.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"theory_array_params.h"
+#include "smt/params/theory_array_params.h"
 #include"smt_params_helper.hpp"
 
 void theory_array_params::updt_params(params_ref const & _p) {

src/smt/params/theory_array_params.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef THEORY_ARRAY_PARAMS_H_
 #define THEORY_ARRAY_PARAMS_H_
 
-#include"array_simplifier_params.h"
+#include "ast/simplifier/array_simplifier_params.h"
 
 enum array_solver_id {
     AR_NO_ARRAY,

src/smt/params/theory_bv_params.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"theory_bv_params.h"
+#include "smt/params/theory_bv_params.h"
 #include"smt_params_helper.hpp"
 
 void theory_bv_params::updt_params(params_ref const & _p) {

src/smt/params/theory_bv_params.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef THEORY_BV_PARAMS_H_
 #define THEORY_BV_PARAMS_H_
 
-#include"params.h"
+#include "util/params.h"
 
 enum bv_solver_id {
     BS_NO_BV,

src/smt/params/theory_pb_params.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"theory_pb_params.h"
+#include "smt/params/theory_pb_params.h"
 #include"smt_params_helper.hpp"
 
 void theory_pb_params::updt_params(params_ref const & _p) {

src/smt/params/theory_pb_params.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef THEORY_PB_PARAMS_H_
 #define THEORY_PB_PARAMS_H_
 
-#include"params.h"
+#include "util/params.h"
 
 
 struct theory_pb_params {

src/smt/params/theory_str_params.cpp

@@ -15,7 +15,7 @@ Revision History:
 
 --*/
 
-#include"theory_str_params.h"
+#include "smt/params/theory_str_params.h"
 #include"smt_params_helper.hpp"
 
 void theory_str_params::updt_params(params_ref const & _p) {

src/smt/params/theory_str_params.h

@@ -18,7 +18,7 @@ Revision History:
 #ifndef THEORY_STR_PARAMS_H
 #define THEORY_STR_PARAMS_H
 
-#include"params.h"
+#include "util/params.h"
 
 struct theory_str_params {
     /*

src/smt/proto_model/array_factory.cpp

@@ -17,11 +17,11 @@ Revision History:
 
 --*/
 
-#include"array_factory.h"
-#include"array_decl_plugin.h"
-#include"proto_model.h"
-#include"func_interp.h"
-#include"ast_pp.h"
+#include "smt/proto_model/array_factory.h"
+#include "ast/array_decl_plugin.h"
+#include "smt/proto_model/proto_model.h"
+#include "model/func_interp.h"
+#include "ast/ast_pp.h"
 
 func_decl * mk_aux_decl_for_array_sort(ast_manager & m, sort * s) {
     ptr_buffer<sort> domain;

src/smt/proto_model/array_factory.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef ARRAY_FACTORY_H_
 #define ARRAY_FACTORY_H_
 
-#include"struct_factory.h"
+#include "smt/proto_model/struct_factory.h"
 
 class func_interp;
 

src/smt/proto_model/datatype_factory.cpp

@@ -16,11 +16,11 @@ Author:
 Revision History:
 
 --*/
-#include"datatype_factory.h"
-#include"proto_model.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
-#include"expr_functors.h"
+#include "smt/proto_model/datatype_factory.h"
+#include "smt/proto_model/proto_model.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/expr_functors.h"
 
 datatype_factory::datatype_factory(ast_manager & m, proto_model & md):
     struct_factory(m, m.mk_family_id("datatype"), md),

src/smt/proto_model/datatype_factory.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef DATATYPE_FACTORY_H_
 #define DATATYPE_FACTORY_H_
 
-#include"struct_factory.h"
-#include"datatype_decl_plugin.h"
+#include "smt/proto_model/struct_factory.h"
+#include "ast/datatype_decl_plugin.h"
 
 class datatype_factory : public struct_factory {
     datatype_util         m_util;

src/smt/proto_model/numeral_factory.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include"numeral_factory.h"
-#include"ast_pp.h"
+#include "smt/proto_model/numeral_factory.h"
+#include "ast/ast_pp.h"
 
 app * arith_factory::mk_value_core(rational const & val, sort * s) {
     return m_util.mk_numeral(val, s);

src/smt/proto_model/numeral_factory.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef NUMERAL_FACTORY_H_
 #define NUMERAL_FACTORY_H_
 
-#include"value_factory.h"
-#include"arith_decl_plugin.h"
-#include"bv_decl_plugin.h"
+#include "smt/proto_model/value_factory.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
 
 class numeral_factory : public simple_factory<rational> {
 public:

src/smt/proto_model/proto_model.cpp

@@ -16,15 +16,15 @@ Author:
 Revision History:
 
 --*/
-#include"proto_model.h"
+#include "smt/proto_model/proto_model.h"
 #include"model_params.hpp"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
-#include"var_subst.h"
-#include"array_decl_plugin.h"
-#include"well_sorted.h"
-#include"used_symbols.h"
-#include"model_v2_pp.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/well_sorted.h"
+#include "ast/used_symbols.h"
+#include "model/model_v2_pp.h"
 
 proto_model::proto_model(ast_manager & m, params_ref const & p):
     model_core(m),
@@ -441,8 +441,8 @@ model * proto_model::mk_model() {
 
 #if 0
 
-#include"simplifier.h"
-#include"basic_simplifier_plugin.h"
+#include "ast/simplifier/simplifier.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
 
 // Auxiliary function for computing fi(args[0], ..., args[fi.get_arity() - 1]).
 // The result is stored in result.

src/smt/proto_model/proto_model.h

@@ -28,15 +28,15 @@ Revision History:
 #ifndef PROTO_MODEL_H_
 #define PROTO_MODEL_H_
 
-#include"model_core.h"
-#include"model_evaluator.h"
-#include"value_factory.h"
-#include"plugin_manager.h"
-#include"arith_decl_plugin.h"
-#include"func_decl_dependencies.h"
-#include"model.h"
-#include"params.h"
-#include"th_rewriter.h"
+#include "model/model_core.h"
+#include "model/model_evaluator.h"
+#include "smt/proto_model/value_factory.h"
+#include "util/plugin_manager.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/func_decl_dependencies.h"
+#include "model/model.h"
+#include "util/params.h"
+#include "ast/rewriter/th_rewriter.h"
 
 class proto_model : public model_core {
     plugin_manager<value_factory> m_factories;

src/smt/proto_model/struct_factory.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include"struct_factory.h"
-#include"proto_model.h"
+#include "smt/proto_model/struct_factory.h"
+#include "smt/proto_model/proto_model.h"
 
 struct_factory::value_set * struct_factory::get_value_set(sort * s) {
     value_set * set = 0;

src/smt/proto_model/struct_factory.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef STRUCT_FACTORY_H_
 #define STRUCT_FACTORY_H_
 
-#include"value_factory.h"
-#include"obj_hashtable.h"
+#include "smt/proto_model/value_factory.h"
+#include "util/obj_hashtable.h"
 
 class proto_model;
 

src/smt/proto_model/value_factory.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 
-#include"value_factory.h"
+#include "smt/proto_model/value_factory.h"
 
 value_factory::value_factory(ast_manager & m, family_id fid):
     m_manager(m), 

src/smt/proto_model/value_factory.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef VALUE_FACTORY_H_
 #define VALUE_FACTORY_H_
 
-#include"ast.h"
-#include"obj_hashtable.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
 
 /**
    \brief Auxiliary object used during model construction.

src/smt/qi_queue.cpp

@@ -16,13 +16,13 @@ Author:
 Revision History:
 
 --*/
-#include"smt_context.h"
-#include"qi_queue.h"
-#include"warning.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
-#include"var_subst.h"
-#include"stats.h"
+#include "smt/smt_context.h"
+#include "smt/qi_queue.h"
+#include "util/warning.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/rewriter/var_subst.h"
+#include "util/stats.h"
 
 namespace smt {
 

src/smt/qi_queue.h

@@ -19,16 +19,16 @@ Revision History:
 #ifndef QI_QUEUE_H_
 #define QI_QUEUE_H_
 
-#include"ast.h"
-#include"smt_quantifier_stat.h"
-#include"smt_checker.h"
-#include"smt_quantifier.h"
-#include"qi_params.h"
-#include"fingerprints.h"
-#include"cost_parser.h"
-#include"cost_evaluator.h"
-#include"cached_var_subst.h"
-#include"statistics.h"
+#include "ast/ast.h"
+#include "smt/smt_quantifier_stat.h"
+#include "smt/smt_checker.h"
+#include "smt/smt_quantifier.h"
+#include "smt/params/qi_params.h"
+#include "smt/fingerprints.h"
+#include "parsers/util/cost_parser.h"
+#include "smt/cost_evaluator.h"
+#include "smt/cached_var_subst.h"
+#include "util/statistics.h"
 
 namespace smt {
     class context;

src/smt/smt2_extra_cmds.cpp

@@ -16,9 +16,9 @@ Author:
 Notes:
 
 --*/
-#include"cmd_context.h"
-#include"smt2parser.h"
-#include"smt2_extra_cmds.h"
+#include "cmd_context/cmd_context.h"
+#include "parsers/smt2/smt2parser.h"
+#include "smt/smt2_extra_cmds.h"
 
 class include_cmd : public cmd {
     char const * m_filename;

src/smt/smt_almost_cg_table.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 
-#include"smt_almost_cg_table.h"
+#include "smt/smt_almost_cg_table.h"
 
 namespace smt {
 

src/smt/smt_almost_cg_table.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef SMT_ALMOST_CG_TABLE_H_
 #define SMT_ALMOST_CG_TABLE_H_
 
-#include"smt_enode.h"
-#include"map.h"
+#include "smt/smt_enode.h"
+#include "util/map.h"
 
 namespace smt {
     

src/smt/smt_b_justification.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef SMT_B_JUSTIFICATION_H_
 #define SMT_B_JUSTIFICATION_H_
 
-#include"smt_literal.h"
-#include"smt_clause.h"
+#include "smt/smt_literal.h"
+#include "smt/smt_clause.h"
 
 namespace smt {
 

src/smt/smt_bool_var_data.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef SMT_BOOL_VAR_DATA_H_
 #define SMT_BOOL_VAR_DATA_H_
 
-#include"smt_b_justification.h"
+#include "smt/smt_b_justification.h"
 
 namespace smt {
 

src/smt/smt_case_split_queue.cpp

@@ -16,14 +16,14 @@ Author:
 Revision History:
 
 --*/
-#include"smt_context.h"
-#include"smt_case_split_queue.h"
-#include"warning.h"
-#include"stopwatch.h"
-#include"for_each_expr.h"
-#include"ast_pp.h"
-#include"map.h"
-#include"hashtable.h"
+#include "smt/smt_context.h"
+#include "smt/smt_case_split_queue.h"
+#include "util/warning.h"
+#include "util/stopwatch.h"
+#include "ast/for_each_expr.h"
+#include "ast/ast_pp.h"
+#include "util/map.h"
+#include "util/hashtable.h"
 
 namespace smt {
 

src/smt/smt_case_split_queue.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef SMT_CASE_SPLIT_QUEUE_H_
 #define SMT_CASE_SPLIT_QUEUE_H_
 
-#include"smt_types.h"
-#include"heap.h"
-#include"smt_params.h"
+#include "smt/smt_types.h"
+#include "util/heap.h"
+#include "smt/params/smt_params.h"
 
 namespace smt {
     class context;

src/smt/smt_cg_table.cpp

@@ -16,9 +16,9 @@ Author:
 Revision History:
 
 --*/
-#include"smt_cg_table.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
+#include "smt/smt_cg_table.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
 
 namespace smt {
 

src/smt/smt_cg_table.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef SMT_CG_TABLE_H_
 #define SMT_CG_TABLE_H_
 
-#include"smt_enode.h"
-#include"hashtable.h"
-#include"chashtable.h"
+#include "smt/smt_enode.h"
+#include "util/hashtable.h"
+#include "util/chashtable.h"
 
 namespace smt {
 

src/smt/smt_checker.cpp

@@ -16,9 +16,9 @@ Author:
 Revision History:
 
 --*/
-#include"smt_context.h"
-#include"smt_checker.h"
-#include"ast_ll_pp.h"
+#include "smt/smt_context.h"
+#include "smt/smt_checker.h"
+#include "ast/ast_ll_pp.h"
 
 namespace smt {
 

src/smt/smt_checker.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef SMT_CHECKER_H_
 #define SMT_CHECKER_H_
 
-#include"ast.h"
-#include"obj_hashtable.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
 
 namespace smt {
 

src/smt/smt_clause.cpp

@@ -16,9 +16,9 @@ Author:
 Revision History:
 
 --*/
-#include"smt_clause.h"
-#include"smt_justification.h"
-#include"ast_ll_pp.h"
+#include "smt/smt_clause.h"
+#include "smt/smt_justification.h"
+#include "ast/ast_ll_pp.h"
 
 namespace smt {
     /**

src/smt/smt_clause.h

@@ -19,11 +19,11 @@ Revision History:
 #ifndef SMT_CLAUSE_H_
 #define SMT_CLAUSE_H_
 
-#include"ast.h"
-#include"smt_literal.h"
-#include"tptr.h"
-#include"obj_hashtable.h"
-#include"smt_justification.h"
+#include "ast/ast.h"
+#include "smt/smt_literal.h"
+#include "util/tptr.h"
+#include "util/obj_hashtable.h"
+#include "smt/smt_justification.h"
 
 namespace smt {
 

src/smt/smt_conflict_resolution.cpp

@@ -16,10 +16,10 @@ Author:
 Revision History:
 
 --*/
-#include"smt_context.h"
-#include"smt_conflict_resolution.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
+#include "smt/smt_context.h"
+#include "smt/smt_conflict_resolution.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
 
 namespace smt {
 

src/smt/smt_conflict_resolution.h

@@ -19,17 +19,17 @@ Revision History:
 #ifndef SMT_CONFLICT_RESOLUTION_H_
 #define SMT_CONFLICT_RESOLUTION_H_
 
-#include"smt_literal.h"
-#include"smt_bool_var_data.h"
-#include"smt_justification.h"
-#include"smt_enode.h"
-#include"dyn_ack.h"
-#include"obj_pair_hashtable.h"
-#include"smt_params.h"
-#include"obj_pair_hashtable.h"
-#include"map.h"
-#include"watch_list.h"
-#include"obj_pair_set.h"
+#include "smt/smt_literal.h"
+#include "smt/smt_bool_var_data.h"
+#include "smt/smt_justification.h"
+#include "smt/smt_enode.h"
+#include "smt/dyn_ack.h"
+#include "util/obj_pair_hashtable.h"
+#include "smt/params/smt_params.h"
+#include "util/obj_pair_hashtable.h"
+#include "util/map.h"
+#include "smt/watch_list.h"
+#include "util/obj_pair_set.h"
 
 typedef approx_set_tpl<unsigned, u2u, unsigned> level_approx_set;
 

src/smt/smt_consequences.cpp

@@ -16,12 +16,12 @@ Author:
 Revision History:
 
 --*/
-#include "smt_context.h"
-#include "ast_util.h"
-#include "datatype_decl_plugin.h"
-#include "model_pp.h"
-#include "max_cliques.h"
-#include "stopwatch.h"
+#include "smt/smt_context.h"
+#include "ast/ast_util.h"
+#include "ast/datatype_decl_plugin.h"
+#include "model/model_pp.h"
+#include "util/max_cliques.h"
+#include "util/stopwatch.h"
 
 namespace smt {
 

src/smt/smt_context.cpp

@@ -17,26 +17,26 @@ Revision History:
 
 --*/
 #include<math.h>
-#include"smt_context.h"
-#include"luby.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
-#include"warning.h"
-#include"smt_quick_checker.h"
-#include"proof_checker.h"
-#include"ast_util.h"
-#include"uses_theory.h"
-#include"model.h"
-#include"smt_for_each_relevant_expr.h"
-#include"timeit.h"
-#include"well_sorted.h"
-#include"union_find.h"
-#include"smt_model_generator.h"
-#include"smt_model_checker.h"
-#include"smt_model_finder.h"
-#include"model_pp.h"
-#include"ast_smt2_pp.h"
-#include"ast_translation.h"
+#include "smt/smt_context.h"
+#include "util/luby.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "util/warning.h"
+#include "smt/smt_quick_checker.h"
+#include "ast/proof_checker/proof_checker.h"
+#include "ast/ast_util.h"
+#include "smt/uses_theory.h"
+#include "model/model.h"
+#include "smt/smt_for_each_relevant_expr.h"
+#include "util/timeit.h"
+#include "ast/well_sorted.h"
+#include "util/union_find.h"
+#include "smt/smt_model_generator.h"
+#include "smt/smt_model_checker.h"
+#include "smt/smt_model_finder.h"
+#include "model/model_pp.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/ast_translation.h"
 
 namespace smt {
 

src/smt/smt_context.h

@@ -19,36 +19,36 @@ Revision History:
 #ifndef SMT_CONTEXT_H_
 #define SMT_CONTEXT_H_
 
-#include"smt_clause.h"
-#include"smt_setup.h"
-#include"smt_enode.h"
-#include"smt_cg_table.h"
-#include"smt_b_justification.h"
-#include"smt_eq_justification.h"
-#include"smt_justification.h"
-#include"smt_bool_var_data.h"
-#include"smt_theory.h"
-#include"smt_quantifier.h"
-#include"smt_quantifier_stat.h"
-#include"smt_statistics.h"
-#include"smt_conflict_resolution.h"
-#include"smt_relevancy.h"
-#include"smt_case_split_queue.h"
-#include"smt_almost_cg_table.h"
-#include"smt_failure.h"
-#include"asserted_formulas.h"
-#include"smt_types.h"
-#include"dyn_ack.h"
-#include"ast_smt_pp.h"
-#include"watch_list.h"
-#include"trail.h"
-#include"fingerprints.h"
-#include"ref.h"
-#include"proto_model.h"
-#include"model.h"
-#include"timer.h"
-#include"statistics.h"
-#include"progress_callback.h"
+#include "smt/smt_clause.h"
+#include "smt/smt_setup.h"
+#include "smt/smt_enode.h"
+#include "smt/smt_cg_table.h"
+#include "smt/smt_b_justification.h"
+#include "smt/smt_eq_justification.h"
+#include "smt/smt_justification.h"
+#include "smt/smt_bool_var_data.h"
+#include "smt/smt_theory.h"
+#include "smt/smt_quantifier.h"
+#include "smt/smt_quantifier_stat.h"
+#include "smt/smt_statistics.h"
+#include "smt/smt_conflict_resolution.h"
+#include "smt/smt_relevancy.h"
+#include "smt/smt_case_split_queue.h"
+#include "smt/smt_almost_cg_table.h"
+#include "smt/smt_failure.h"
+#include "smt/asserted_formulas.h"
+#include "smt/smt_types.h"
+#include "smt/dyn_ack.h"
+#include "ast/ast_smt_pp.h"
+#include "smt/watch_list.h"
+#include "util/trail.h"
+#include "smt/fingerprints.h"
+#include "util/ref.h"
+#include "smt/proto_model/proto_model.h"
+#include "model/model.h"
+#include "util/timer.h"
+#include "util/statistics.h"
+#include "solver/progress_callback.h"
 
 // there is a significant space overhead with allocating 1000+ contexts in
 // the case that each context only references a few expressions.

src/smt/smt_context_inv.cpp

@@ -16,10 +16,10 @@ Author:
 Revision History:
 
 --*/
-#include"smt_context.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
-#include"ast_smt2_pp.h"
+#include "smt/smt_context.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_smt2_pp.h"
 
 namespace smt {
 

src/smt/smt_context_pp.cpp

@@ -16,11 +16,11 @@ Author:
 Revision History:
 
 --*/
-#include"smt_context.h"
-#include"ast_ll_pp.h"
-#include"ast_pp.h"
-#include"ast_smt_pp.h"
-#include"stats.h"
+#include "smt/smt_context.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_smt_pp.h"
+#include "util/stats.h"
 
 namespace smt {
 

src/smt/smt_context_stat.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include"smt_context.h"
-#include"ast_pp.h"
+#include "smt/smt_context.h"
+#include "ast/ast_pp.h"
 
 namespace smt {
 

src/smt/smt_enode.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include"smt_context.h"
-#include"smt_enode.h"
+#include "smt/smt_context.h"
+#include "smt/smt_enode.h"
 
 namespace smt {
     

src/smt/smt_enode.h

@@ -19,11 +19,11 @@ Revision History:
 #ifndef SMT_ENODE_H_
 #define SMT_ENODE_H_
 
-#include"ast.h"
-#include"smt_types.h"
-#include"smt_eq_justification.h"
-#include"smt_theory_var_list.h"
-#include"approx_set.h"
+#include "ast/ast.h"
+#include "smt/smt_types.h"
+#include "smt/smt_eq_justification.h"
+#include "smt/smt_theory_var_list.h"
+#include "util/approx_set.h"
 
 namespace smt {
     /**

src/smt/smt_eq_justification.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef SMT_EQ_JUSTIFICATION_H_
 #define SMT_EQ_JUSTIFICATION_H_
 
-#include"smt_literal.h"
-#include"tptr.h"
+#include "smt/smt_literal.h"
+#include "util/tptr.h"
 
 namespace smt {
 

src/smt/smt_farkas_util.cpp

@@ -19,10 +19,10 @@ Revision History:
 
 --*/
 
-#include "smt_farkas_util.h"
-#include "ast_pp.h"
-#include "th_rewriter.h"
-#include "bool_rewriter.h"
+#include "smt/smt_farkas_util.h"
+#include "ast/ast_pp.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "ast/rewriter/bool_rewriter.h"
 
 
 namespace smt {

src/smt/smt_farkas_util.h

@@ -22,7 +22,7 @@ Revision History:
 #ifndef FARKAS_UTIL_H_
 #define FARKAS_UTIL_H_
 
-#include "arith_decl_plugin.h"
+#include "ast/arith_decl_plugin.h"
 
 namespace smt {
 

src/smt/smt_for_each_relevant_expr.cpp

@@ -16,10 +16,10 @@ Author:
 Revision History:
 
 --*/
-#include"smt_context.h"
-#include"smt_for_each_relevant_expr.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
+#include "smt/smt_context.h"
+#include "smt/smt_for_each_relevant_expr.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
 
 namespace smt {
 

src/smt/smt_for_each_relevant_expr.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef SMT_FOR_EACH_RELEVANT_EXPR_H_
 #define SMT_FOR_EACH_RELEVANT_EXPR_H_
 
-#include"ast.h"
-#include"obj_hashtable.h"
-#include"vector.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
+#include "util/vector.h"
 
 namespace smt {
 

src/smt/smt_implied_equalities.cpp

@@ -19,16 +19,16 @@ Revision History:
 
 --*/
 
-#include "smt_implied_equalities.h"
-#include "union_find.h"
-#include "ast_pp.h"
-#include "array_decl_plugin.h"
-#include "uint_set.h"
-#include "smt_value_sort.h"
-#include "model_smt2_pp.h"
-#include "stopwatch.h"
-#include "model.h"
-#include "solver.h"
+#include "smt/smt_implied_equalities.h"
+#include "util/union_find.h"
+#include "ast/ast_pp.h"
+#include "ast/array_decl_plugin.h"
+#include "util/uint_set.h"
+#include "smt/smt_value_sort.h"
+#include "model/model_smt2_pp.h"
+#include "util/stopwatch.h"
+#include "model/model.h"
+#include "solver/solver.h"
 
 namespace smt {
 

src/smt/smt_implied_equalities.h

@@ -23,9 +23,9 @@ Revision History:
 #ifndef SMT_IMPLIED_EQUALITIES_H_
 #define SMT_IMPLIED_EQUALITIES_H_
 
-#include"smt_solver.h"
-#include"lbool.h"
-#include"ast.h"
+#include "smt/smt_solver.h"
+#include "util/lbool.h"
+#include "ast/ast.h"
 
 
 namespace smt {

src/smt/smt_internalizer.cpp

@@ -16,13 +16,13 @@ Author:
 Revision History:
 
 --*/
-#include"smt_context.h"
-#include"expr_stat.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
-#include"ast_smt2_pp.h"
-#include"smt_model_finder.h"
-#include"for_each_expr.h"
+#include "smt/smt_context.h"
+#include "ast/expr_stat.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_smt2_pp.h"
+#include "smt/smt_model_finder.h"
+#include "ast/for_each_expr.h"
 
 namespace smt {
 

src/smt/smt_justification.cpp

@@ -16,10 +16,10 @@ Author:
 Revision History:
 
 --*/
-#include"smt_context.h"
-#include"smt_conflict_resolution.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
+#include "smt/smt_context.h"
+#include "smt/smt_conflict_resolution.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
 
 namespace smt {
 

src/smt/smt_justification.h

@@ -19,10 +19,10 @@ Revision History:
 #ifndef SMT_JUSTIFICATION_H_
 #define SMT_JUSTIFICATION_H_
 
-#include"ast.h"
-#include"smt_types.h"
-#include"smt_literal.h"
-#include"smt_eq_justification.h"
+#include "ast/ast.h"
+#include "smt/smt_types.h"
+#include "smt/smt_literal.h"
+#include "smt/smt_eq_justification.h"
 
 namespace smt {
     

src/smt/smt_kernel.cpp

@@ -16,9 +16,9 @@ Author:
 Revision History:
 
 --*/
-#include"smt_kernel.h"
-#include"smt_context.h" 
-#include"ast_smt2_pp.h"
+#include "smt/smt_kernel.h"
+#include "smt/smt_context.h"
+#include "ast/ast_smt2_pp.h"
 #include"smt_params_helper.hpp"
 
 namespace smt {

src/smt/smt_kernel.h

@@ -27,12 +27,12 @@ Revision History:
 #ifndef SMT_KERNEL_H_
 #define SMT_KERNEL_H_
 
-#include"ast.h"
-#include"params.h"
-#include"model.h"
-#include"lbool.h"
-#include"statistics.h"
-#include"smt_failure.h"
+#include "ast/ast.h"
+#include "util/params.h"
+#include "model/model.h"
+#include "util/lbool.h"
+#include "util/statistics.h"
+#include "smt/smt_failure.h"
 
 struct smt_params;
 class progress_callback;

src/smt/smt_literal.cpp

@@ -16,9 +16,9 @@ Author:
 Revision History:
 
 --*/
-#include"smt_literal.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
+#include "smt/smt_literal.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
 
 namespace smt {
 

src/smt/smt_literal.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef SMT_LITERAL_H_
 #define SMT_LITERAL_H_
 
-#include"ast.h"
-#include"smt_types.h"
-#include"approx_set.h"
+#include "ast/ast.h"
+#include "smt/smt_types.h"
+#include "util/approx_set.h"
 
 namespace smt {
     /**

src/smt/smt_model_checker.cpp

@@ -17,16 +17,16 @@ Revision History:
 
 --*/
 
-#include"smt_model_checker.h"
-#include"smt_context.h"
-#include"smt_model_finder.h"
-#include"pull_quant.h"
-#include"for_each_expr.h"
-#include"var_subst.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
-#include"model_pp.h"
-#include"ast_smt2_pp.h"
+#include "smt/smt_model_checker.h"
+#include "smt/smt_context.h"
+#include "smt/smt_model_finder.h"
+#include "ast/normal_forms/pull_quant.h"
+#include "ast/for_each_expr.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "model/model_pp.h"
+#include "ast/ast_smt2_pp.h"
 
 namespace smt {
 

src/smt/smt_model_checker.h

@@ -21,11 +21,11 @@ Revision History:
 #ifndef SMT_MODEL_CHECKER_H_
 #define SMT_MODEL_CHECKER_H_
 
-#include"ast.h"
-#include"obj_hashtable.h"
-#include"qi_params.h"
-#include"smt_params.h"
-#include"region.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
+#include "smt/params/qi_params.h"
+#include "smt/params/smt_params.h"
+#include "util/region.h"
 
 class proto_model;
 class model;

src/smt/smt_model_finder.cpp

@@ -16,26 +16,26 @@ Author:
 Revision History:
 
 --*/
-#include"smt_model_finder.h"
-#include"smt_context.h"
-#include"ast_util.h"
-#include"macro_util.h"
-#include"arith_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"array_decl_plugin.h"
-#include"arith_simplifier_plugin.h"
-#include"bv_simplifier_plugin.h"
-#include"pull_quant.h"
-#include"var_subst.h"
-#include"backtrackable_set.h"
-#include"for_each_expr.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
-#include"well_sorted.h"
-#include"model_pp.h"
-#include"ast_smt2_pp.h"
-#include"cooperate.h"
-#include"tactic_exception.h"
+#include "smt/smt_model_finder.h"
+#include "smt/smt_context.h"
+#include "ast/ast_util.h"
+#include "ast/macros/macro_util.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/simplifier/arith_simplifier_plugin.h"
+#include "ast/simplifier/bv_simplifier_plugin.h"
+#include "ast/normal_forms/pull_quant.h"
+#include "ast/rewriter/var_subst.h"
+#include "util/backtrackable_set.h"
+#include "ast/for_each_expr.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/well_sorted.h"
+#include "model/model_pp.h"
+#include "ast/ast_smt2_pp.h"
+#include "util/cooperate.h"
+#include "tactic/tactic_exception.h"
 
 namespace smt {
 

src/smt/smt_model_finder.h

@@ -46,12 +46,12 @@ Revision History:
 #ifndef SMT_MODEL_FINDER_H_
 #define SMT_MODEL_FINDER_H_
 
-#include"ast.h"
-#include"func_decl_dependencies.h"
-#include"simplifier.h"
-#include"proto_model.h"
-#include"cooperate.h"
-#include"tactic_exception.h"
+#include "ast/ast.h"
+#include "ast/func_decl_dependencies.h"
+#include "ast/simplifier/simplifier.h"
+#include "smt/proto_model/proto_model.h"
+#include "util/cooperate.h"
+#include "tactic/tactic_exception.h"
 
 namespace smt {
     class context;

src/smt/smt_model_generator.cpp

@@ -17,14 +17,14 @@ Revision History:
 
 --*/
 
-#include"smt_context.h"
-#include"smt_model_generator.h"
-#include"proto_model.h"
-#include"ref_util.h"
-#include"for_each_expr.h"
-#include"ast_ll_pp.h"
-#include"ast_pp.h"
-#include"ast_smt2_pp.h"
+#include "smt/smt_context.h"
+#include "smt/smt_model_generator.h"
+#include "smt/proto_model/proto_model.h"
+#include "util/ref_util.h"
+#include "ast/for_each_expr.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_smt2_pp.h"
 
 namespace smt {
 

src/smt/smt_model_generator.h

@@ -28,10 +28,10 @@ Revision History:
 #ifndef SMT_MODEL_GENERATOR_H_
 #define SMT_MODEL_GENERATOR_H_
 
-#include"ast.h"
-#include"smt_types.h"
-#include"obj_hashtable.h"
-#include"map.h"
+#include "ast/ast.h"
+#include "smt/smt_types.h"
+#include "util/obj_hashtable.h"
+#include "util/map.h"
 
 class value_factory;
 class proto_model;

src/smt/smt_quantifier.cpp

@@ -16,15 +16,15 @@ Author:
 Revision History:
 
 --*/
-#include"smt_quantifier.h"
-#include"smt_context.h"
-#include"smt_quantifier_stat.h"
-#include"smt_model_finder.h"
-#include"smt_model_checker.h"
-#include"smt_quick_checker.h"
-#include"mam.h"
-#include"qi_queue.h"
-#include"ast_smt2_pp.h"
+#include "smt/smt_quantifier.h"
+#include "smt/smt_context.h"
+#include "smt/smt_quantifier_stat.h"
+#include "smt/smt_model_finder.h"
+#include "smt/smt_model_checker.h"
+#include "smt/smt_quick_checker.h"
+#include "smt/mam.h"
+#include "smt/qi_queue.h"
+#include "ast/ast_smt2_pp.h"
 
 namespace smt {
 

src/smt/smt_quantifier.h

@@ -19,10 +19,10 @@ Revision History:
 #ifndef SMT_QUANTIFIER_H_
 #define SMT_QUANTIFIER_H_
 
-#include"ast.h"
-#include"statistics.h"
-#include"params.h"
-#include"smt_types.h"
+#include "ast/ast.h"
+#include "util/statistics.h"
+#include "util/params.h"
+#include "smt/smt_types.h"
 
 class proto_model;
 struct smt_params;