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

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

src/ast/rewriter/arith_rewriter.cpp

@@ -16,11 +16,11 @@ Author:
 Notes:
 
 --*/
-#include"arith_rewriter.h"
+#include "ast/rewriter/arith_rewriter.h"
 #include"arith_rewriter_params.hpp"
-#include"poly_rewriter_def.h"
-#include"algebraic_numbers.h"
-#include"ast_pp.h"
+#include "ast/rewriter/poly_rewriter_def.h"
+#include "math/polynomial/algebraic_numbers.h"
+#include "ast/ast_pp.h"
 
 void arith_rewriter::updt_local_params(params_ref const & _p) {
     arith_rewriter_params p(_p);

src/ast/rewriter/arith_rewriter.h

@@ -19,8 +19,8 @@ Notes:
 #ifndef ARITH_REWRITER_H_
 #define ARITH_REWRITER_H_
 
-#include"poly_rewriter.h"
-#include"arith_decl_plugin.h"
+#include "ast/rewriter/poly_rewriter.h"
+#include "ast/arith_decl_plugin.h"
 
 class arith_rewriter_core {
 protected:

src/ast/rewriter/array_rewriter.cpp

@@ -16,10 +16,10 @@ Author:
 Notes:
 
 --*/
-#include"array_rewriter.h"
+#include "ast/rewriter/array_rewriter.h"
 #include"array_rewriter_params.hpp"
-#include"ast_lt.h"
-#include"ast_pp.h"
+#include "ast/ast_lt.h"
+#include "ast/ast_pp.h"
 
 void array_rewriter::updt_params(params_ref const & _p) {
     array_rewriter_params p(_p);

src/ast/rewriter/array_rewriter.h

@@ -19,10 +19,10 @@ Notes:
 #ifndef ARRAY_REWRITER_H_
 #define ARRAY_REWRITER_H_
 
-#include"array_decl_plugin.h"
-#include"rewriter_types.h"
-#include"lbool.h"
-#include"params.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/rewriter/rewriter_types.h"
+#include "util/lbool.h"
+#include "util/params.h"
 
 /**
    \brief Cheap rewrite rules for Arrays

src/ast/rewriter/ast_counter.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 
-#include "ast_counter.h"
+#include "ast/rewriter/ast_counter.h"
 
 void counter::update(unsigned el, int delta) {
     int & counter = get(el);

src/ast/rewriter/ast_counter.h

@@ -24,10 +24,10 @@ Revision History:
 #ifndef AST_COUNTER_H_
 #define AST_COUNTER_H_
 
-#include "ast.h"
-#include "map.h"
-#include "uint_set.h"
-#include "var_subst.h"
+#include "ast/ast.h"
+#include "util/map.h"
+#include "util/uint_set.h"
+#include "ast/rewriter/var_subst.h"
 
 class counter {
 protected:

src/ast/rewriter/bit_blaster/bit_blaster.cpp

@@ -16,10 +16,10 @@ Author:
 Revision History:
 
 --*/
-#include"bit_blaster.h"
-#include"bit_blaster_tpl_def.h"
-#include"ast_pp.h"
-#include"bv_decl_plugin.h"
+#include "ast/rewriter/bit_blaster/bit_blaster.h"
+#include "ast/rewriter/bit_blaster/bit_blaster_tpl_def.h"
+#include "ast/ast_pp.h"
+#include "ast/bv_decl_plugin.h"
 
 bit_blaster_cfg::bit_blaster_cfg(bv_util & u, bit_blaster_params const & p, bool_rewriter& rw):
     m_util(u),

src/ast/rewriter/bit_blaster/bit_blaster.h

@@ -19,11 +19,11 @@ Revision History:
 #ifndef BIT_BLASTER_H_
 #define BIT_BLASTER_H_
 
-#include"bool_rewriter.h"
-#include"bit_blaster_params.h"
-#include"bit_blaster_tpl.h"
-#include"bv_decl_plugin.h"
-#include"rational.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/rewriter/bit_blaster/bit_blaster_params.h"
+#include "ast/rewriter/bit_blaster/bit_blaster_tpl.h"
+#include "ast/bv_decl_plugin.h"
+#include "util/rational.h"
 
 class bit_blaster_cfg {
 public:

src/ast/rewriter/bit_blaster/bit_blaster_rewriter.cpp

@@ -16,13 +16,13 @@ Author:
 Notes:
 
 --*/
-#include"bit_blaster_rewriter.h"
-#include"bv_decl_plugin.h"
-#include"bit_blaster_tpl_def.h"
-#include"rewriter_def.h"
-#include"bool_rewriter.h"
-#include"ref_util.h"
-#include"ast_smt2_pp.h"
+#include "ast/rewriter/bit_blaster/bit_blaster_rewriter.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/rewriter/bit_blaster/bit_blaster_tpl_def.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "util/ref_util.h"
+#include "ast/ast_smt2_pp.h"
 
 struct blaster_cfg {
     typedef rational numeral;

src/ast/rewriter/bit_blaster/bit_blaster_rewriter.h

@@ -19,9 +19,9 @@ Notes:
 #ifndef BIT_BLASTER_REWRITER_H_
 #define BIT_BLASTER_REWRITER_H_
 
-#include"ast.h"
-#include"obj_hashtable.h"
-#include"params.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
+#include "util/params.h"
 
 class bit_blaster_rewriter {
     struct imp;

src/ast/rewriter/bit_blaster/bit_blaster_tpl.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef BIT_BLASTER_TPL_H_
 #define BIT_BLASTER_TPL_H_
 
-#include"rational.h"
+#include "util/rational.h"
 
 template<typename Cfg>
 class bit_blaster_tpl : public Cfg {

src/ast/rewriter/bit_blaster/bit_blaster_tpl_def.h

@@ -16,12 +16,12 @@ Author:
 Revision History:
 
 --*/
-#include"bit_blaster_tpl.h"
-#include"rational.h"
-#include"ast_pp.h"
-#include"cooperate.h"
-#include"common_msgs.h"
-#include"rewriter_types.h"
+#include "ast/rewriter/bit_blaster/bit_blaster_tpl.h"
+#include "util/rational.h"
+#include "ast/ast_pp.h"
+#include "util/cooperate.h"
+#include "util/common_msgs.h"
+#include "ast/rewriter/rewriter_types.h"
 
 
 template<typename Cfg>

src/ast/rewriter/bool_rewriter.cpp

@@ -16,9 +16,9 @@ Author:
 Notes:
 
 --*/
-#include"bool_rewriter.h"
+#include "ast/rewriter/bool_rewriter.h"
 #include"bool_rewriter_params.hpp"
-#include"rewriter_def.h"
+#include "ast/rewriter/rewriter_def.h"
 
 void bool_rewriter::updt_params(params_ref const & _p) {
     bool_rewriter_params p(_p);

src/ast/rewriter/bool_rewriter.h

@@ -19,9 +19,9 @@ Notes:
 #ifndef BOOL_REWRITER_H_
 #define BOOL_REWRITER_H_
 
-#include"ast.h"
-#include"rewriter.h"
-#include"params.h"
+#include "ast/ast.h"
+#include "ast/rewriter/rewriter.h"
+#include "util/params.h"
 
 /**
    \brief Apply basic Boolean rewriting operations.

src/ast/rewriter/bv_bounds.cpp

@@ -14,8 +14,8 @@
 
  Revision History:
 --*/
-#include"bv_bounds.h"
-#include"ast_smt2_pp.h"
+#include "ast/rewriter/bv_bounds.h"
+#include "ast/ast_smt2_pp.h"
 
 bv_bounds::~bv_bounds() {
     reset();

src/ast/rewriter/bv_bounds.h

@@ -19,9 +19,9 @@
  --*/
 #ifndef BV_BOUNDS_H_23754
 #define BV_BOUNDS_H_23754
-#include"ast.h"
-#include"bv_decl_plugin.h"
-#include"rewriter_types.h"
+#include "ast/ast.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/rewriter/rewriter_types.h"
 
 /* \brief A class to analyze constraints on bit vectors.
 

src/ast/rewriter/bv_rewriter.cpp

@@ -16,10 +16,10 @@ Author:
 Notes:
 
 --*/
-#include"bv_rewriter.h"
+#include "ast/rewriter/bv_rewriter.h"
 #include"bv_rewriter_params.hpp"
-#include"poly_rewriter_def.h"
-#include"ast_smt2_pp.h"
+#include "ast/rewriter/poly_rewriter_def.h"
+#include "ast/ast_smt2_pp.h"
 
 
 void bv_rewriter::updt_local_params(params_ref const & _p) {
@@ -2314,7 +2314,7 @@ void bv_rewriter::mk_t1_add_t2_eq_c(expr * t1, expr * t2, expr * c, expr_ref & r
         result = m().mk_eq(t1, m_util.mk_bv_sub(c, t2));
 }
 
-#include "ast_pp.h"
+#include "ast/ast_pp.h"
 
 bool bv_rewriter::isolate_term(expr* lhs, expr* rhs, expr_ref& result) {
     if (!m_util.is_numeral(lhs) || !is_add(rhs)) {

src/ast/rewriter/bv_rewriter.h

@@ -19,11 +19,11 @@ Notes:
 #ifndef BV_REWRITER_H_
 #define BV_REWRITER_H_
 
-#include"poly_rewriter.h"
-#include"bv_decl_plugin.h"
-#include"arith_decl_plugin.h"
-#include"mk_extract_proc.h"
-#include"bv_trailing.h"
+#include "ast/rewriter/poly_rewriter.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/rewriter/mk_extract_proc.h"
+#include "ast/rewriter/bv_trailing.h"
 
 class bv_rewriter_core {
 protected:

src/ast/rewriter/bv_trailing.cpp

@@ -14,9 +14,9 @@
 
  Revision History:
 --*/
-#include"bv_trailing.h"
-#include"bv_decl_plugin.h"
-#include"ast_smt2_pp.h"
+#include "ast/rewriter/bv_trailing.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/ast_smt2_pp.h"
 
 // The analyzer gives up analysis after going TRAILING_DEPTH deep.
 // This number shouldn't be too big.

src/ast/rewriter/bv_trailing.h

@@ -18,9 +18,9 @@
  --*/
 #ifndef BV_TRAILING_H_
 #define BV_TRAILING_H_
-#include"ast.h"
-#include"rewriter_types.h"
-#include"mk_extract_proc.h"
+#include "ast/ast.h"
+#include "ast/rewriter/rewriter_types.h"
+#include "ast/rewriter/mk_extract_proc.h"
 class bv_trailing {
     public:
         bv_trailing(mk_extract_proc& ep);

src/ast/rewriter/datatype_rewriter.cpp

@@ -16,7 +16,7 @@ Author:
 Notes:
 
 --*/
-#include"datatype_rewriter.h"
+#include "ast/rewriter/datatype_rewriter.h"
 
 br_status datatype_rewriter::mk_app_core(func_decl * f, unsigned num_args, expr * const * args, expr_ref & result) {
     SASSERT(f->get_family_id() == get_fid());

src/ast/rewriter/datatype_rewriter.h

@@ -19,8 +19,8 @@ Notes:
 #ifndef DATATYPE_REWRITER_H_
 #define DATATYPE_REWRITER_H_
 
-#include"datatype_decl_plugin.h"
-#include"rewriter_types.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/rewriter/rewriter_types.h"
 
 class datatype_rewriter {
     datatype_util    m_util;

src/ast/rewriter/der.cpp

@@ -18,13 +18,13 @@ Revision History:
     Christoph Wintersteiger, 2010-03-30: Added Destr. Multi-Equality Resolution
 
 --*/
-#include"der.h"
-#include"occurs.h"
-#include"for_each_expr.h"
-#include"rewriter_def.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
-#include"ast_smt2_pp.h"
+#include "ast/rewriter/der.h"
+#include "ast/occurs.h"
+#include "ast/for_each_expr.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_smt2_pp.h"
 
 static bool is_var(expr * e, unsigned num_decls) {
     return is_var(e) && to_var(e)->get_idx() < num_decls;

src/ast/rewriter/der.h

@@ -21,8 +21,8 @@ Revision History:
 #ifndef DER_H_
 #define DER_H_
 
-#include"ast.h"
-#include"var_subst.h"
+#include "ast/ast.h"
+#include "ast/rewriter/var_subst.h"
 
 /*
   New DER: the class DER (above) eliminates variables one by one.

src/ast/rewriter/distribute_forall.cpp

@@ -18,11 +18,11 @@ Revision History:
     Christoph Wintersteiger 2010-04-06: Added implementation.
 
 --*/
-#include"var_subst.h"
-#include"ast_ll_pp.h"
-#include"ast_util.h"
-#include"distribute_forall.h"
-#include"bool_rewriter.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_util.h"
+#include "ast/rewriter/distribute_forall.h"
+#include "ast/rewriter/bool_rewriter.h"
 
 distribute_forall::distribute_forall(ast_manager & m) :
     m_manager(m),

src/ast/rewriter/distribute_forall.h

@@ -21,8 +21,8 @@ Revision History:
 #ifndef DISTRIBUTE_FORALL_H_
 #define DISTRIBUTE_FORALL_H_
 
-#include"ast.h"
-#include"act_cache.h"
+#include "ast/ast.h"
+#include "ast/act_cache.h"
 
 /**
    \brief Apply the following transformation

src/ast/rewriter/dl_rewriter.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 
-#include"dl_rewriter.h"
+#include "ast/rewriter/dl_rewriter.h"
     
     br_status dl_rewriter::mk_app_core(
         func_decl * f, unsigned num_args, expr* const* args, expr_ref& result) {

src/ast/rewriter/dl_rewriter.h

@@ -19,8 +19,8 @@ Notes:
 #ifndef DL_REWRITER_H_
 #define DL_REWRITER_H_
 
-#include"dl_decl_plugin.h"
-#include"rewriter_types.h"
+#include "ast/dl_decl_plugin.h"
+#include "ast/rewriter/rewriter_types.h"
 
 class dl_rewriter {
     datalog::dl_decl_util    m_util;

src/ast/rewriter/enum2bv_rewriter.cpp

@@ -17,11 +17,11 @@ Notes:
 
 --*/
 
-#include"rewriter.h"
-#include"rewriter_def.h"
-#include"enum2bv_rewriter.h"
-#include"ast_util.h"
-#include"ast_pp.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/rewriter/enum2bv_rewriter.h"
+#include "ast/ast_util.h"
+#include "ast/ast_pp.h"
 
 struct enum2bv_rewriter::imp {
     ast_manager&              m;

src/ast/rewriter/enum2bv_rewriter.h

@@ -19,9 +19,9 @@ Notes:
 #ifndef ENUM_REWRITER_H_
 #define ENUM_REWRITER_H_
 
-#include"datatype_decl_plugin.h"
-#include"rewriter_types.h"
-#include"expr_functors.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/rewriter/rewriter_types.h"
+#include "ast/expr_functors.h"
 
 class enum2bv_rewriter {
     struct imp;

src/ast/rewriter/expr_replacer.cpp

@@ -16,10 +16,10 @@ Author:
 Notes:
 
 --*/
-#include"expr_replacer.h"
-#include"rewriter_def.h"
-#include"th_rewriter.h"
-#include"cooperate.h"
+#include "ast/rewriter/expr_replacer.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "util/cooperate.h"
 
 void expr_replacer::operator()(expr * t, expr_ref & result, proof_ref & result_pr) {
     expr_dependency_ref result_dep(m());

src/ast/rewriter/expr_replacer.h

@@ -19,9 +19,9 @@ Notes:
 #ifndef EXPR_REPLACER_H_
 #define EXPR_REPLACER_H_
 
-#include"ast.h"
-#include"expr_substitution.h"
-#include"params.h"
+#include "ast/ast.h"
+#include "ast/expr_substitution.h"
+#include "util/params.h"
 
 /**
    \brief Abstract interface for functors that replace constants with expressions.

src/ast/rewriter/expr_safe_replace.cpp

@@ -18,9 +18,9 @@ Revision History:
 
 --*/
 
-#include "expr_safe_replace.h"
-#include "rewriter.h"
-#include "ast_pp.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/ast_pp.h"
 
 
 void expr_safe_replace::insert(expr* src, expr* dst) {

src/ast/rewriter/expr_safe_replace.h

@@ -22,7 +22,7 @@ Revision History:
 #ifndef EXPR_SAFE_REPLACE_H_
 #define EXPR_SAFE_REPLACE_H_
 
-#include "ast.h"
+#include "ast/ast.h"
 
 class expr_safe_replace {
     ast_manager& m;

src/ast/rewriter/factor_rewriter.cpp

@@ -18,9 +18,9 @@ Notes:
 
 --*/
 
-#include"factor_rewriter.h"
-#include"ast_pp.h"
-#include"rewriter_def.h"
+#include "ast/rewriter/factor_rewriter.h"
+#include "ast/ast_pp.h"
+#include "ast/rewriter/rewriter_def.h"
 
 factor_rewriter::factor_rewriter(ast_manager & m): m_manager(m), m_arith(m), m_factors(m) {
 }

src/ast/rewriter/factor_rewriter.h

@@ -20,9 +20,9 @@ Notes:
 #ifndef FACTOR_REWRITER_H_
 #define FACTOR_REWRITER_H_
 
-#include"ast.h"
-#include"rewriter.h"
-#include"arith_decl_plugin.h"
+#include "ast/ast.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/arith_decl_plugin.h"
 
 class factor_rewriter {
     typedef obj_map<expr,unsigned> powers_t;

src/ast/rewriter/fpa_rewriter.cpp

@@ -16,9 +16,9 @@ Author:
 Notes:
 
 --*/
-#include"fpa_rewriter.h"
+#include "ast/rewriter/fpa_rewriter.h"
 #include"fpa_rewriter_params.hpp"
-#include"ast_smt2_pp.h"
+#include "ast/ast_smt2_pp.h"
 
 fpa_rewriter::fpa_rewriter(ast_manager & m, params_ref const & p) :
     m_util(m),

src/ast/rewriter/fpa_rewriter.h

@@ -19,11 +19,11 @@ Notes:
 #ifndef FLOAT_REWRITER_H_
 #define FLOAT_REWRITER_H_
 
-#include"ast.h"
-#include"rewriter.h"
-#include"params.h"
-#include"fpa_decl_plugin.h"
-#include"mpf.h"
+#include "ast/ast.h"
+#include "ast/rewriter/rewriter.h"
+#include "util/params.h"
+#include "ast/fpa_decl_plugin.h"
+#include "util/mpf.h"
 
 class fpa_rewriter {
     fpa_util      m_util;

src/ast/rewriter/label_rewriter.cpp

@@ -17,9 +17,9 @@ Notes:
 
 --*/
 
-#include"rewriter.h"
-#include"rewriter_def.h"
-#include"label_rewriter.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/rewriter/label_rewriter.h"
 
 
 label_rewriter::label_rewriter(ast_manager & m) : 

src/ast/rewriter/label_rewriter.h

@@ -19,8 +19,8 @@ Notes:
 #ifndef LABEL_REWRITER_H_
 #define LABEL_REWRITER_H_
 
-#include"ast.h"
-#include"rewriter_types.h"
+#include "ast/ast.h"
+#include "ast/rewriter/rewriter_types.h"
 
 
 class label_rewriter : public default_rewriter_cfg {

src/ast/rewriter/mk_extract_proc.cpp

@@ -14,7 +14,7 @@
 
  Revision History:
 --*/
-#include"mk_extract_proc.h"
+#include "ast/rewriter/mk_extract_proc.h"
 mk_extract_proc::mk_extract_proc(bv_util & u):
     m_util(u),
     m_high(0),

src/ast/rewriter/mk_extract_proc.h

@@ -16,8 +16,8 @@
  --*/
 #ifndef MK_EXTRACT_PROC_H_
 #define MK_EXTRACT_PROC_H_
-#include"ast.h"
-#include"bv_decl_plugin.h"
+#include "ast/ast.h"
+#include "ast/bv_decl_plugin.h"
 class mk_extract_proc {
     bv_util &     m_util;
     unsigned      m_high;

src/ast/rewriter/mk_simplified_app.cpp

@@ -16,13 +16,13 @@ Author:
 Notes:
 
 --*/
-#include"mk_simplified_app.h"
-#include"bool_rewriter.h"
-#include"arith_rewriter.h"
-#include"bv_rewriter.h"
-#include"datatype_rewriter.h"
-#include"array_rewriter.h"
-#include"fpa_rewriter.h"
+#include "ast/rewriter/mk_simplified_app.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/rewriter/arith_rewriter.h"
+#include "ast/rewriter/bv_rewriter.h"
+#include "ast/rewriter/datatype_rewriter.h"
+#include "ast/rewriter/array_rewriter.h"
+#include "ast/rewriter/fpa_rewriter.h"
 
 struct mk_simplified_app::imp {
     ast_manager &         m;

src/ast/rewriter/mk_simplified_app.h

@@ -19,9 +19,9 @@ Notes:
 #ifndef MK_SIMPLIFIED_APP_H_
 #define MK_SIMPLIFIED_APP_H_
 
-#include"ast.h"
-#include"params.h"
-#include"rewriter_types.h"
+#include "ast/ast.h"
+#include "util/params.h"
+#include "ast/rewriter/rewriter_types.h"
 
 class mk_simplified_app {
     struct imp;

src/ast/rewriter/pb2bv_rewriter.cpp

@@ -17,14 +17,14 @@ Notes:
 
 --*/
 
-#include"rewriter.h"
-#include"rewriter_def.h"
-#include"statistics.h"
-#include"pb2bv_rewriter.h"
-#include"sorting_network.h"
-#include"ast_util.h"
-#include"ast_pp.h"
-#include"lbool.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "util/statistics.h"
+#include "ast/rewriter/pb2bv_rewriter.h"
+#include "util/sorting_network.h"
+#include "ast/ast_util.h"
+#include "ast/ast_pp.h"
+#include "util/lbool.h"
 
 
 struct pb2bv_rewriter::imp {

src/ast/rewriter/pb2bv_rewriter.h

@@ -19,9 +19,9 @@ Notes:
 #ifndef PB2BV_REWRITER_H_
 #define PB2BV_REWRITER_H_
 
-#include"pb_decl_plugin.h"
-#include"rewriter_types.h"
-#include"expr_functors.h"
+#include "ast/pb_decl_plugin.h"
+#include "ast/rewriter/rewriter_types.h"
+#include "ast/expr_functors.h"
 
 class pb2bv_rewriter {
     struct imp;

src/ast/rewriter/pb_rewriter.cpp

@@ -17,11 +17,11 @@ Notes:
 
 --*/
 
-#include "pb_rewriter.h"
-#include "pb_rewriter_def.h"
-#include "ast_pp.h"
-#include "ast_util.h"
-#include "ast_smt_pp.h"
+#include "ast/rewriter/pb_rewriter.h"
+#include "ast/rewriter/pb_rewriter_def.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_util.h"
+#include "ast/ast_smt_pp.h"
 
 
 class pb_ast_rewriter_util {

src/ast/rewriter/pb_rewriter.h

@@ -19,10 +19,10 @@ Notes:
 #ifndef PB_REWRITER_H_
 #define PB_REWRITER_H_
 
-#include"pb_decl_plugin.h"
-#include"rewriter_types.h"
-#include"params.h"
-#include"lbool.h"
+#include "ast/pb_decl_plugin.h"
+#include "ast/rewriter/rewriter_types.h"
+#include "util/params.h"
+#include "util/lbool.h"
 
 
 template<typename PBU>

src/ast/rewriter/pb_rewriter_def.h

@@ -19,7 +19,7 @@ Notes:
 #ifndef PB_REWRITER_DEF_H_
 #define PB_REWRITER_DEF_H_
 
-#include"pb_rewriter.h"
+#include "ast/rewriter/pb_rewriter.h"
 
 
 template<typename PBU>

src/ast/rewriter/poly_rewriter.h

@@ -19,10 +19,10 @@ Notes:
 #ifndef POLY_REWRITER_H_
 #define POLY_REWRITER_H_
 
-#include"ast.h"
-#include"obj_hashtable.h"
-#include"rewriter_types.h"
-#include"params.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
+#include "ast/rewriter/rewriter_types.h"
+#include "util/params.h"
 
 template<typename Config>
 class poly_rewriter : public Config {

src/ast/rewriter/poly_rewriter_def.h

@@ -16,11 +16,11 @@ Author:
 Notes:
 
 --*/
-#include"poly_rewriter.h"
+#include "ast/rewriter/poly_rewriter.h"
 #include"poly_rewriter_params.hpp"
-#include"ast_lt.h"
-#include"ast_ll_pp.h"
-#include"ast_smt2_pp.h"
+#include "ast/ast_lt.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_smt2_pp.h"
 
 
 template<typename Config>

src/ast/rewriter/quant_hoist.cpp

@@ -19,14 +19,14 @@ Revision History:
 
 --*/
 
-#include "quant_hoist.h"
-#include "expr_functors.h"
-#include "ast_smt_pp.h"
-#include "bool_rewriter.h"
-#include "var_subst.h"
-#include "ast_pp.h"
-#include "ast_counter.h"
-#include "expr_safe_replace.h"
+#include "ast/rewriter/quant_hoist.h"
+#include "ast/expr_functors.h"
+#include "ast/ast_smt_pp.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/ast_pp.h"
+#include "ast/rewriter/ast_counter.h"
+#include "ast/rewriter/expr_safe_replace.h"
 
 //
 // Bring quantifiers of common type into prenex form.

src/ast/rewriter/quant_hoist.h

@@ -22,7 +22,7 @@ Revision History:
 #ifndef QUANTIFIER_HOISTER_H_
 #define QUANTIFIER_HOISTER_H_
 
-#include "ast.h"
+#include "ast/ast.h"
 
 class quantifier_hoister {
     class impl;

src/ast/rewriter/rewriter.cpp

@@ -16,9 +16,9 @@ Author:
 Notes:
 
 --*/
-#include"rewriter_def.h"
-#include"ast_ll_pp.h"
-#include"ast_smt2_pp.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_smt2_pp.h"
 
 void rewriter_core::init_cache_stack() {
     SASSERT(m_cache_stack.empty());

src/ast/rewriter/rewriter.h

@@ -19,9 +19,9 @@ Notes:
 #ifndef REWRITER_H_
 #define REWRITER_H_
 
-#include"ast.h"
-#include"rewriter_types.h"
-#include"act_cache.h"
+#include "ast/ast.h"
+#include "ast/rewriter/rewriter_types.h"
+#include "ast/act_cache.h"
 
 /**
    \brief Common infrastructure for AST rewriters.

src/ast/rewriter/rewriter_def.h

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#include"rewriter.h"
-#include"ast_smt2_pp.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/ast_smt2_pp.h"
 
 template<typename Config>
 template<bool ProofGen>

src/ast/rewriter/rewriter_types.h

@@ -19,8 +19,8 @@ Notes:
 #ifndef REWRITER_TYPES_H_
 #define REWRITER_TYPES_H_
 
-#include"z3_exception.h"
-#include"common_msgs.h"
+#include "util/z3_exception.h"
+#include "util/common_msgs.h"
 
 /**
    \brief Builtin rewrite result status

src/ast/rewriter/seq_rewriter.cpp

@@ -18,15 +18,15 @@ Notes:
 
 --*/
 
-#include"seq_rewriter.h"
-#include"arith_decl_plugin.h"
-#include"ast_pp.h"
-#include"ast_util.h"
-#include"uint_set.h"
-#include"automaton.h"
-#include"well_sorted.h"
-#include"var_subst.h"
-#include"symbolic_automata_def.h"
+#include "ast/rewriter/seq_rewriter.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_util.h"
+#include "util/uint_set.h"
+#include "math/automata/automaton.h"
+#include "ast/well_sorted.h"
+#include "ast/rewriter/var_subst.h"
+#include "math/automata/symbolic_automata_def.h"
 
 
 expr_ref sym_expr::accept(expr* e) {

src/ast/rewriter/seq_rewriter.h

@@ -19,13 +19,13 @@ Notes:
 #ifndef SEQ_REWRITER_H_
 #define SEQ_REWRITER_H_
 
-#include"seq_decl_plugin.h"
-#include"arith_decl_plugin.h"
-#include"rewriter_types.h"
-#include"params.h"
-#include"lbool.h"
-#include"automaton.h"
-#include"symbolic_automata.h"
+#include "ast/seq_decl_plugin.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/rewriter/rewriter_types.h"
+#include "util/params.h"
+#include "util/lbool.h"
+#include "math/automata/automaton.h"
+#include "math/automata/symbolic_automata.h"
 
 class sym_expr {
     enum ty {

src/ast/rewriter/th_rewriter.cpp

@@ -16,24 +16,24 @@ Author:
 Notes:
 
 --*/
-#include"th_rewriter.h"
+#include "ast/rewriter/th_rewriter.h"
 #include"rewriter_params.hpp"
-#include"bool_rewriter.h"
-#include"arith_rewriter.h"
-#include"bv_rewriter.h"
-#include"datatype_rewriter.h"
-#include"array_rewriter.h"
-#include"fpa_rewriter.h"
-#include"dl_rewriter.h"
-#include"pb_rewriter.h"
-#include"seq_rewriter.h"
-#include"rewriter_def.h"
-#include"expr_substitution.h"
-#include"ast_smt2_pp.h"
-#include"cooperate.h"
-#include"var_subst.h"
-#include"ast_util.h"
-#include"well_sorted.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/rewriter/arith_rewriter.h"
+#include "ast/rewriter/bv_rewriter.h"
+#include "ast/rewriter/datatype_rewriter.h"
+#include "ast/rewriter/array_rewriter.h"
+#include "ast/rewriter/fpa_rewriter.h"
+#include "ast/rewriter/dl_rewriter.h"
+#include "ast/rewriter/pb_rewriter.h"
+#include "ast/rewriter/seq_rewriter.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/expr_substitution.h"
+#include "ast/ast_smt2_pp.h"
+#include "util/cooperate.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/ast_util.h"
+#include "ast/well_sorted.h"
 
 struct th_rewriter_cfg : public default_rewriter_cfg {
     bool_rewriter       m_b_rw;

src/ast/rewriter/th_rewriter.h

@@ -19,9 +19,9 @@ Notes:
 #ifndef TH_REWRITER_H_
 #define TH_REWRITER_H_
 
-#include"ast.h"
-#include"rewriter_types.h"
-#include"params.h"
+#include "ast/ast.h"
+#include "ast/rewriter/rewriter_types.h"
+#include "util/params.h"
 
 class expr_substitution;
 

src/ast/rewriter/var_subst.cpp

@@ -16,12 +16,12 @@ Author:
 Notes:
 
 --*/
-#include"var_subst.h"
-#include"ast_ll_pp.h"
-#include"ast_pp.h"
-#include"ast_smt2_pp.h"
-#include"well_sorted.h"
-#include"for_each_expr.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/well_sorted.h"
+#include "ast/for_each_expr.h"
 
 void var_subst::operator()(expr * n, unsigned num_args, expr * const * args, expr_ref & result) {
     SASSERT(is_well_sorted(result.m(), n));

src/ast/rewriter/var_subst.h

@@ -19,9 +19,9 @@ Notes:
 #ifndef VAR_SUBST_H_
 #define VAR_SUBST_H_
 
-#include"rewriter.h"
-#include"used_vars.h"
-#include"params.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/used_vars.h"
+#include "util/params.h"
 
 /**
    \brief Alias for var_shifter class.