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

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

src/ast/act_cache.cpp

@@ -17,7 +17,7 @@ Author:
 Notes:
 
 --*/
-#include"act_cache.h"
+#include "ast/act_cache.h"
 
 #define MIN_MAX_UNUSED   1024
 #define INITIAL_CAPACITY 128

src/ast/act_cache.h

@@ -20,9 +20,9 @@ Notes:
 #ifndef ACT_CACHE_H_
 #define ACT_CACHE_H_
 
-#include"ast.h"
-#include"obj_hashtable.h"
-#include"chashtable.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
+#include "util/chashtable.h"
 
 class act_cache {
     ast_manager &        m_manager;

src/ast/arith_decl_plugin.cpp

@@ -16,11 +16,11 @@ Author:
 Revision History:
 
 --*/
-#include"arith_decl_plugin.h"
-#include"warning.h"
-#include"algebraic_numbers.h"
-#include"id_gen.h"
-#include"ast_smt2_pp.h"
+#include "ast/arith_decl_plugin.h"
+#include "util/warning.h"
+#include "math/polynomial/algebraic_numbers.h"
+#include "util/id_gen.h"
+#include "ast/ast_smt2_pp.h"
 
 struct arith_decl_plugin::algebraic_numbers_wrapper {
     unsynch_mpq_manager           m_qmanager;

src/ast/arith_decl_plugin.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef ARITH_DECL_PLUGIN_H_
 #define ARITH_DECL_PLUGIN_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 class sexpr;
 
 namespace algebraic_numbers {

src/ast/array_decl_plugin.cpp

@@ -17,10 +17,10 @@ Revision History:
 
 --*/
 #include<sstream>
-#include"array_decl_plugin.h"
-#include"warning.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
+#include "ast/array_decl_plugin.h"
+#include "util/warning.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
 
 array_decl_plugin::array_decl_plugin():
     m_store_sym("store"),

src/ast/array_decl_plugin.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef ARRAY_DECL_PLUGIN_H_
 #define ARRAY_DECL_PLUGIN_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 
 
 inline sort* get_array_range(sort const * s) {

src/ast/ast.cpp

@@ -18,14 +18,14 @@ Revision History:
 --*/
 #include<sstream>
 #include<cstring>
-#include"ast.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
-#include"buffer.h"
-#include"warning.h"
-#include"string_buffer.h"
-#include"ast_util.h"
-#include"ast_smt2_pp.h"
+#include "ast/ast.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "util/buffer.h"
+#include "util/warning.h"
+#include "util/string_buffer.h"
+#include "ast/ast_util.h"
+#include "ast/ast_smt2_pp.h"
 
 // -----------------------------------
 //

src/ast/ast.h

@@ -19,32 +19,32 @@ Revision History:
 #ifndef AST_H_
 #define AST_H_
 
-#include"vector.h"
-#include"hashtable.h"
-#include"buffer.h"
-#include"symbol.h"
-#include"rational.h"
-#include"hash.h"
-#include"optional.h"
-#include"trace.h"
-#include"bit_vector.h"
-#include"symbol_table.h"
-#include"tptr.h"
-#include"memory_manager.h"
-#include"small_object_allocator.h"
-#include"obj_ref.h"
-#include"ref_vector.h"
-#include"ref_buffer.h"
-#include"obj_mark.h"
-#include"obj_hashtable.h"
-#include"id_gen.h"
-#include"map.h"
-#include"parray.h"
-#include"dictionary.h"
-#include"chashtable.h"
-#include"z3_exception.h"
-#include"dependency.h"
-#include"rlimit.h"
+#include "util/vector.h"
+#include "util/hashtable.h"
+#include "util/buffer.h"
+#include "util/symbol.h"
+#include "util/rational.h"
+#include "util/hash.h"
+#include "util/optional.h"
+#include "util/trace.h"
+#include "util/bit_vector.h"
+#include "util/symbol_table.h"
+#include "util/tptr.h"
+#include "util/memory_manager.h"
+#include "util/small_object_allocator.h"
+#include "util/obj_ref.h"
+#include "util/ref_vector.h"
+#include "util/ref_buffer.h"
+#include "util/obj_mark.h"
+#include "util/obj_hashtable.h"
+#include "util/id_gen.h"
+#include "util/map.h"
+#include "util/parray.h"
+#include "util/dictionary.h"
+#include "util/chashtable.h"
+#include "util/z3_exception.h"
+#include "util/dependency.h"
+#include "util/rlimit.h"
 
 #define RECYCLE_FREE_AST_INDICES
 

src/ast/ast_ll_pp.cpp

@@ -18,8 +18,8 @@ Revision History:
 --*/
 
 #include<iostream>
-#include"for_each_ast.h"
-#include"arith_decl_plugin.h"
+#include "ast/for_each_ast.h"
+#include "ast/arith_decl_plugin.h"
 
 // #define AST_LL_PP_SHOW_FAMILY_NAME
 

src/ast/ast_ll_pp.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef AST_LL_PP_H_
 #define AST_LL_PP_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 #include<iostream>
 
 void ast_ll_pp(std::ostream & out, ast_manager & m, ast * n, bool only_exprs=true, bool compact=true);

src/ast/ast_lt.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"ast.h"
+#include "ast/ast.h"
 
 #define check_symbol(S1,S2) if (S1 != S2) return lt(S1,S2)
 #define check_value(V1,V2) if (V1 != V2) return V1 < V2

src/ast/ast_pp.h

@@ -21,7 +21,7 @@ Revision History:
 #ifndef AST_PP_H_
 #define AST_PP_H_
 
-#include"ast_smt2_pp.h"
+#include "ast/ast_smt2_pp.h"
 
 struct mk_pp : public mk_ismt2_pp {
     mk_pp(ast * t, ast_manager & m, params_ref const & p, unsigned indent = 0, unsigned num_vars = 0, char const * var_prefix = 0):

src/ast/ast_pp_util.cpp

@@ -17,9 +17,9 @@ Revision History:
 
 --*/
 
-#include "ast_pp_util.h"
-#include "ast_smt2_pp.h"
-#include "ast_smt_pp.h"
+#include "ast/ast_pp_util.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/ast_smt_pp.h"
 
 void ast_pp_util::collect(expr* e) {
     coll.visit(e);

src/ast/ast_pp_util.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef AST_PP_UTIL_H_
 #define AST_PP_UTIL_H_
 
-#include "decl_collector.h"
+#include "ast/decl_collector.h"
 
 class ast_pp_util {
     ast_manager&        m;

src/ast/ast_printer.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include"ast_printer.h"
-#include"pp.h"
+#include "ast/ast_printer.h"
+#include "ast/pp.h"
 
 class simple_ast_printer_context : public ast_printer_context {
     ast_manager & m_manager;

src/ast/ast_printer.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef AST_PRINTER_H_
 #define AST_PRINTER_H_
 
-#include"ast.h"
-#include"ast_smt2_pp.h"
+#include "ast/ast.h"
+#include "ast/ast_smt2_pp.h"
 
 class ast_printer {
 public:

src/ast/ast_smt2_pp.cpp

@@ -18,12 +18,12 @@ Author:
 Revision History:
 
 --*/
-#include"ast_smt2_pp.h"
-#include"shared_occs.h"
-#include"pp.h"
-#include"ast_ll_pp.h"
-#include"ast_pp.h"
-#include"algebraic_numbers.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/shared_occs.h"
+#include "ast/pp.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_pp.h"
+#include "math/polynomial/algebraic_numbers.h"
 #include"pp_params.hpp"
 using namespace format_ns;
 

src/ast/ast_smt2_pp.h

@@ -22,16 +22,16 @@ Revision History:
 #ifndef AST_SMT2_PP_H_
 #define AST_SMT2_PP_H_
 
-#include"format.h"
-#include"params.h"
-#include"arith_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"array_decl_plugin.h"
-#include"fpa_decl_plugin.h"
-#include"dl_decl_plugin.h"
-#include"seq_decl_plugin.h"
-#include"datatype_decl_plugin.h"
-#include"smt2_util.h"
+#include "ast/format.h"
+#include "util/params.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/fpa_decl_plugin.h"
+#include "ast/dl_decl_plugin.h"
+#include "ast/seq_decl_plugin.h"
+#include "ast/datatype_decl_plugin.h"
+#include "util/smt2_util.h"
 
 class smt2_pp_environment {
 protected:

src/ast/ast_smt_pp.cpp

@@ -21,17 +21,17 @@ Revision History:
 
 #include<sstream>
 #include<iostream>
-#include"ast_smt_pp.h"
-#include"arith_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"array_decl_plugin.h"
-#include"datatype_decl_plugin.h"
-#include"fpa_decl_plugin.h"
-#include"vector.h"
-#include"for_each_ast.h"
-#include"decl_collector.h"
-#include"smt2_util.h"
-#include"seq_decl_plugin.h"
+#include "ast/ast_smt_pp.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/fpa_decl_plugin.h"
+#include "util/vector.h"
+#include "ast/for_each_ast.h"
+#include "ast/decl_collector.h"
+#include "util/smt2_util.h"
+#include "ast/seq_decl_plugin.h"
 
 // ---------------------------------------
 // smt_renaming

src/ast/ast_smt_pp.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef AST_SMT_PP_H_
 #define AST_SMT_PP_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 #include<string>
-#include"map.h"
+#include "util/map.h"
 
 class smt_renaming {
     typedef map<symbol, symbol, symbol_hash_proc, symbol_eq_proc> symbol2symbol;

src/ast/ast_trail.h

@@ -22,8 +22,8 @@ Revision History:
 #ifndef AST_TRAIL_H_
 #define AST_TRAIL_H_
 
-#include"ast.h"
-#include"trail.h"
+#include "ast/ast.h"
+#include "util/trail.h"
 
 
 template<typename S, typename T>

src/ast/ast_translation.cpp

@@ -16,13 +16,13 @@ Author:
 Revision History:
 
 --*/
-#include "arith_decl_plugin.h"
-#include "bv_decl_plugin.h"
-#include "datatype_decl_plugin.h"
-#include "array_decl_plugin.h"
-#include "format.h"
-#include "ast_translation.h"
-#include "ast_ll_pp.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/format.h"
+#include "ast/ast_translation.h"
+#include "ast/ast_ll_pp.h"
 
 ast_translation::~ast_translation() {
     reset_cache();

src/ast/ast_translation.h

@@ -21,7 +21,7 @@ Revision History:
 #ifndef AST_TRANSLATION_H_
 #define AST_TRANSLATION_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 
 class ast_translation {
     struct frame {

src/ast/ast_util.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include "ast_util.h"
+#include "ast/ast_util.h"
 
 app * mk_list_assoc_app(ast_manager & m, func_decl * f, unsigned num_args, expr * const * args) {
     SASSERT(f->is_associative());

src/ast/ast_util.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef AST_UTIL_H_
 #define AST_UTIL_H_
 
-#include"ast.h"
-#include"obj_hashtable.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
 
 template<typename C>
 void remove_duplicates(C & v) {

src/ast/bv_decl_plugin.cpp

@@ -17,11 +17,11 @@ Revision History:
 
 --*/
 #include<sstream>
-#include"bv_decl_plugin.h"
-#include"arith_decl_plugin.h"
-#include"warning.h"
-#include"ast_pp.h"
-#include"ast_smt2_pp.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/arith_decl_plugin.h"
+#include "util/warning.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_smt2_pp.h"
 
 bv_decl_plugin::bv_decl_plugin():
     m_bv_sym("bv"),

src/ast/bv_decl_plugin.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef BV_DECL_PLUGIN_H_
 #define BV_DECL_PLUGIN_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 
 enum bv_sort_kind {
     BV_SORT

src/ast/datatype_decl_plugin.cpp

@@ -16,9 +16,9 @@ Author:
 Revision History:
 
 --*/
-#include"datatype_decl_plugin.h"
-#include"warning.h"
-#include"ast_smt2_pp.h"
+#include "ast/datatype_decl_plugin.h"
+#include "util/warning.h"
+#include "ast/ast_smt2_pp.h"
 
 
 /**

src/ast/datatype_decl_plugin.h

@@ -19,10 +19,10 @@ Revision History:
 #ifndef DATATYPE_DECL_PLUGIN_H_
 #define DATATYPE_DECL_PLUGIN_H_
 
-#include"ast.h"
-#include"tptr.h"
-#include"buffer.h"
-#include"obj_hashtable.h"
+#include "ast/ast.h"
+#include "util/tptr.h"
+#include "util/buffer.h"
+#include "util/obj_hashtable.h"
 
 enum datatype_sort_kind {
     DATATYPE_SORT

src/ast/decl_collector.cpp

@@ -17,7 +17,7 @@ Author:
 Revision History:
 
 --*/
-#include"decl_collector.h"
+#include "ast/decl_collector.h"
 
 void decl_collector::visit_sort(sort * n) {
     family_id fid = n->get_family_id();

src/ast/decl_collector.h

@@ -20,8 +20,8 @@ Revision History:
 #ifndef SMT_DECL_COLLECTOR_H_
 #define SMT_DECL_COLLECTOR_H_
 
-#include"ast.h"
-#include"datatype_decl_plugin.h"
+#include "ast/ast.h"
+#include "ast/datatype_decl_plugin.h"
 
 class decl_collector {
     ast_manager &         m_manager;

src/ast/dl_decl_plugin.cpp

@@ -18,12 +18,12 @@ Revision History:
 --*/
 #include<sstream>
 
-#include "ast_pp.h"
-#include "array_decl_plugin.h"
-#include "datatype_decl_plugin.h"
-#include "dl_decl_plugin.h"
-#include "warning.h"
-#include "reg_decl_plugins.h"
+#include "ast/ast_pp.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/dl_decl_plugin.h"
+#include "util/warning.h"
+#include "ast/reg_decl_plugins.h"
 
 namespace datalog {
 

src/ast/dl_decl_plugin.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef DL_DECL_PLUGIN_H_
 #define DL_DECL_PLUGIN_H_
 
-#include"ast.h"
-#include "arith_decl_plugin.h"
-#include "bv_decl_plugin.h"
+#include "ast/ast.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
 
 namespace datalog {
 

src/ast/expr2polynomial.cpp

@@ -17,13 +17,13 @@ Author:
 Notes:
 
 --*/
-#include"expr2polynomial.h"
-#include"expr2var.h"
-#include"arith_decl_plugin.h"
-#include"ast_smt2_pp.h"
-#include"z3_exception.h"
-#include"cooperate.h"
-#include"common_msgs.h"
+#include "ast/expr2polynomial.h"
+#include "ast/expr2var.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/ast_smt2_pp.h"
+#include "util/z3_exception.h"
+#include "util/cooperate.h"
+#include "util/common_msgs.h"
 
 struct expr2polynomial::imp {
     struct frame {

src/ast/expr2polynomial.h

@@ -20,8 +20,8 @@ Notes:
 #ifndef EXPR2POLYNOMIAL_H_
 #define EXPR2POLYNOMIAL_H_
 
-#include"ast.h"
-#include"polynomial.h"
+#include "ast/ast.h"
+#include "math/polynomial/polynomial.h"
 
 class expr2var;
 

src/ast/expr2var.cpp

@@ -20,9 +20,9 @@ Author:
 Notes:
 
 --*/
-#include"expr2var.h"
-#include"ast_smt2_pp.h"
-#include"ref_util.h"
+#include "ast/expr2var.h"
+#include "ast/ast_smt2_pp.h"
+#include "util/ref_util.h"
 
 void expr2var::insert(expr * n, var v) {
     if (!is_uninterp_const(n)) {

src/ast/expr2var.h

@@ -23,8 +23,8 @@ Notes:
 #ifndef EXPR2VAR_H_
 #define EXPR2VAR_H_
 
-#include"ast.h"
-#include"obj_hashtable.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
 
 /**
    \brief The mapping between Z3 expressions and (low level) variables.

src/ast/expr_abstract.cpp

@@ -17,8 +17,8 @@ Notes:
 
 --*/    
 
-#include "expr_abstract.h"
-#include "map.h"
+#include "ast/expr_abstract.h"
+#include "util/map.h"
 
 void expr_abstractor::operator()(unsigned base, unsigned num_bound, expr* const* bound, expr* n, expr_ref& result) {
     

src/ast/expr_abstract.h

@@ -19,7 +19,7 @@ Notes:
 #ifndef EXPR_ABSTRACT_H_
 #define EXPR_ABSTRACT_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 
 class expr_abstractor {
     ast_manager& m;

src/ast/expr_functors.cpp

@@ -19,7 +19,7 @@ Revision History:
 
 --*/
 
-#include "expr_functors.h"
+#include "ast/expr_functors.h"
 
 // ----------
 // check_pred

src/ast/expr_functors.h

@@ -22,8 +22,8 @@ Revision History:
 #ifndef EXPR_FUNCTORS_H_
 #define EXPR_FUNCTORS_H_
 
-#include "ast.h"
-#include "expr_map.h"
+#include "ast/ast.h"
+#include "ast/expr_map.h"
 
 class i_expr_pred {
 public:

src/ast/expr_map.cpp

@@ -18,8 +18,8 @@ Author:
 Notes:
 
 --*/
-#include"expr_map.h"
-#include"dec_ref_util.h"
+#include "ast/expr_map.h"
+#include "util/dec_ref_util.h"
 
 expr_map::expr_map(ast_manager & m):
     m_manager(m),

src/ast/expr_map.h

@@ -21,8 +21,8 @@ Notes:
 #ifndef EXPR_MAP_H_
 #define EXPR_MAP_H_
 
-#include"ast.h"
-#include"obj_hashtable.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
 
 /**
    \brief Map from expressions to expressions+proofs.

src/ast/expr_stat.cpp

@@ -19,8 +19,8 @@ Author:
 Revision History:
 
 --*/
-#include"for_each_expr.h"
-#include"expr_stat.h"
+#include "ast/for_each_expr.h"
+#include "ast/expr_stat.h"
 
 void get_expr_stat(expr * n, expr_stat & r) {
     typedef std::pair<expr *, unsigned> pair;

src/ast/expr_substitution.cpp

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#include"expr_substitution.h"
-#include"ref_util.h"
+#include "ast/expr_substitution.h"
+#include "util/ref_util.h"
 
 typedef obj_map<expr, proof*> expr2proof;
 typedef obj_map<expr, expr_dependency*> expr2expr_dependency;

src/ast/expr_substitution.h

@@ -19,7 +19,7 @@ Notes:
 #ifndef EXPR_SUBSTITUTION_H_
 #define EXPR_SUBSTITUTION_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 
 class expr_substitution {
     ast_manager &                                m_manager;

src/ast/for_each_ast.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 
-#include"for_each_ast.h"
+#include "ast/for_each_ast.h"
 
 struct ast_counter_proc {
     unsigned m_num;

src/ast/for_each_ast.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef FOR_EACH_AST_H_
 #define FOR_EACH_AST_H_
 
-#include"ast.h"
-#include"trace.h"
-#include"map.h"
+#include "ast/ast.h"
+#include "util/trace.h"
+#include "util/map.h"
 
 template<typename T>
 bool for_each_ast_args(ptr_vector<ast> & stack, ast_mark & visited, unsigned num_args, T * const * args) {

src/ast/for_each_expr.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 
-#include"for_each_expr.h"
+#include "ast/for_each_expr.h"
 
 struct expr_counter_proc {
     unsigned m_num;

src/ast/for_each_expr.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef FOR_EACH_EXPR_H_
 #define FOR_EACH_EXPR_H_
 
-#include"ast.h"
-#include"trace.h"
+#include "ast/ast.h"
+#include "util/trace.h"
 
 template<typename ForEachProc, typename ExprMark, bool MarkAll, bool IgnorePatterns>
 void for_each_expr_core(ForEachProc & proc, ExprMark & visited, expr * n) {

src/ast/format.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include"format.h"
-#include"recurse_expr_def.h"
+#include "ast/format.h"
+#include "ast/recurse_expr_def.h"
 
 namespace format_ns {
 

src/ast/format.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef FORMAT_H_
 #define FORMAT_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 
 namespace format_ns {
     typedef app format;

src/ast/fpa/bv2fpa_converter.cpp

@@ -18,12 +18,12 @@ Notes:
 --*/
 #include<math.h>
 
-#include"ast_smt2_pp.h"
-#include"well_sorted.h"
-#include"th_rewriter.h"
-#include"fpa_rewriter.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/well_sorted.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "ast/rewriter/fpa_rewriter.h"
 
-#include"bv2fpa_converter.h"
+#include "ast/fpa/bv2fpa_converter.h"
 
 
 bv2fpa_converter::bv2fpa_converter(ast_manager & m) :

src/ast/fpa/bv2fpa_converter.h

@@ -19,11 +19,11 @@ Notes:
 #ifndef BV2FPA_CONVERTER_H_
 #define BV2FPA_CONVERTER_H_
 
-#include"fpa_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"th_rewriter.h"
-#include"model_core.h"
-#include"fpa2bv_converter.h"
+#include "ast/fpa_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "model/model_core.h"
+#include "ast/fpa/fpa2bv_converter.h"
 
 
 class bv2fpa_converter {

src/ast/fpa/fpa2bv_converter.cpp

@@ -18,12 +18,12 @@ Notes:
 --*/
 #include<math.h>
 
-#include"ast_smt2_pp.h"
-#include"well_sorted.h"
-#include"th_rewriter.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/well_sorted.h"
+#include "ast/rewriter/th_rewriter.h"
 
-#include"fpa2bv_converter.h"
-#include"fpa_rewriter.h"
+#include "ast/fpa/fpa2bv_converter.h"
+#include "ast/rewriter/fpa_rewriter.h"
 
 #define BVULT(X,Y,R) { expr_ref bvult_eq(m), bvult_not(m); m_simp.mk_eq(X, Y, bvult_eq); m_simp.mk_not(bvult_eq, bvult_not); expr_ref t(m); t = m_bv_util.mk_ule(X,Y); m_simp.mk_and(t, bvult_not, R); }
 

src/ast/fpa/fpa2bv_converter.h

@@ -19,17 +19,17 @@ Notes:
 #ifndef FPA2BV_CONVERTER_H_
 #define FPA2BV_CONVERTER_H_
 
-#include"ast.h"
-#include"obj_hashtable.h"
-#include"ref_util.h"
-#include"fpa_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"array_decl_plugin.h"
-#include"datatype_decl_plugin.h"
-#include"dl_decl_plugin.h"
-#include"pb_decl_plugin.h"
-#include"seq_decl_plugin.h"
-#include"basic_simplifier_plugin.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
+#include "util/ref_util.h"
+#include "ast/fpa_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/dl_decl_plugin.h"
+#include "ast/pb_decl_plugin.h"
+#include "ast/seq_decl_plugin.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
 
 class fpa2bv_converter {
 public:

src/ast/fpa/fpa2bv_rewriter.cpp

@@ -18,9 +18,9 @@ Notes:
 --*/
 
 
-#include"rewriter_def.h"
-#include"fpa2bv_rewriter.h"
-#include"cooperate.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/fpa/fpa2bv_rewriter.h"
+#include "util/cooperate.h"
 #include"fpa2bv_rewriter_params.hpp"
 
 

src/ast/fpa/fpa2bv_rewriter.h

@@ -20,9 +20,9 @@ Notes:
 #ifndef FPA2BV_REWRITER_H_
 #define FPA2BV_REWRITER_H_
 
-#include"rewriter.h"
-#include"bv_decl_plugin.h"
-#include"fpa2bv_converter.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/fpa/fpa2bv_converter.h"
 
 struct fpa2bv_rewriter_cfg : public default_rewriter_cfg {
     ast_manager              & m_manager;

src/ast/fpa_decl_plugin.cpp

@@ -16,9 +16,9 @@ Author:
 Revision History:
 
 --*/
-#include"fpa_decl_plugin.h"
-#include"arith_decl_plugin.h"
-#include"bv_decl_plugin.h"
+#include "ast/fpa_decl_plugin.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
 
 fpa_decl_plugin::fpa_decl_plugin():
     m_values(m_fm),

src/ast/fpa_decl_plugin.h

@@ -19,11 +19,11 @@ Revision History:
 #ifndef fpa_decl_plugin_H_
 #define fpa_decl_plugin_H_
 
-#include"ast.h"
-#include"id_gen.h"
-#include"arith_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"mpf.h"
+#include "ast/ast.h"
+#include "util/id_gen.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "util/mpf.h"
 
 enum fpa_sort_kind {
     FLOATING_POINT_SORT,

src/ast/func_decl_dependencies.cpp

@@ -16,9 +16,9 @@ Author:
 Revision History:
 
 --*/
-#include"func_decl_dependencies.h"
-#include"for_each_expr.h"
-#include"ast_util.h"
+#include "ast/func_decl_dependencies.h"
+#include "ast/for_each_expr.h"
+#include "ast/ast_util.h"
 
 struct collect_dependencies_proc {
     ast_manager &     m_manager;

src/ast/func_decl_dependencies.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef FUNC_DECL_DEPENDENCIES_H_
 #define FUNC_DECL_DEPENDENCIES_H_
 
-#include"ast.h"
-#include"obj_hashtable.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
 
 // Set of dependencies
 typedef obj_hashtable<func_decl> func_decl_set;

src/ast/has_free_vars.cpp

@@ -16,9 +16,9 @@ Author:
 Revision History:
 
 --*/
-#include"ast.h"
-#include"expr_delta_pair.h"
-#include"hashtable.h"
+#include "ast/ast.h"
+#include "ast/expr_delta_pair.h"
+#include "util/hashtable.h"
 
 class contains_vars {
     typedef hashtable<expr_delta_pair, obj_hash<expr_delta_pair>, default_eq<expr_delta_pair> > cache;

src/ast/macro_substitution.cpp

@@ -18,8 +18,8 @@ Author:
 Notes:
 
 --*/
-#include"macro_substitution.h"
-#include"ref_util.h"
+#include "ast/macro_substitution.h"
+#include "util/ref_util.h"
 
 typedef obj_map<func_decl, proof*>           func_decl2proof;
 typedef obj_map<func_decl, expr_dependency*> func_decl2expr_dependency;

src/ast/macro_substitution.h

@@ -21,7 +21,7 @@ Notes:
 #ifndef MACRO_SUBSTITUTION_H_
 #define MACRO_SUBSTITUTION_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 
 class macro_substitution {
     ast_manager &                                      m_manager;

src/ast/macros/macro_finder.cpp

@@ -17,10 +17,10 @@ Revision History:
 
 --*/
 
-#include"macro_finder.h"
-#include"occurs.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
+#include "ast/macros/macro_finder.h"
+#include "ast/occurs.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
 
 bool macro_finder::is_macro(expr * n, app_ref & head, expr_ref & def) {
     if (!is_quantifier(n) || !to_quantifier(n)->is_forall())

src/ast/macros/macro_finder.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef MACRO_FINDER_H_
 #define MACRO_FINDER_H_
 
-#include"macro_manager.h"
-#include"arith_simplifier_plugin.h"
+#include "ast/macros/macro_manager.h"
+#include "ast/simplifier/arith_simplifier_plugin.h"
 
 
 bool is_macro_head(expr * n, unsigned num_decls);

src/ast/macros/macro_manager.cpp

@@ -19,11 +19,11 @@ Revision History:
     Leonardo de Moura (leonardo) 2010-12-15: Moved dependency management to func_decl_dependencies.h
 
 --*/
-#include"macro_manager.h"
-#include"for_each_expr.h"
-#include"var_subst.h"
-#include"ast_pp.h"
-#include"recurse_expr_def.h"
+#include "ast/macros/macro_manager.h"
+#include "ast/for_each_expr.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/ast_pp.h"
+#include "ast/recurse_expr_def.h"
 
 macro_manager::macro_manager(ast_manager & m, simplifier & s):
     m_manager(m),

src/ast/macros/macro_manager.h

@@ -19,12 +19,12 @@ Revision History:
 #ifndef MACRO_MANAGER_H_
 #define MACRO_MANAGER_H_
 
-#include"ast_util.h"
-#include"obj_hashtable.h"
-#include"simplifier.h"
-#include"recurse_expr.h"
-#include"func_decl_dependencies.h"
-#include"macro_util.h"
+#include "ast/ast_util.h"
+#include "util/obj_hashtable.h"
+#include "ast/simplifier/simplifier.h"
+#include "ast/recurse_expr.h"
+#include "ast/func_decl_dependencies.h"
+#include "ast/macros/macro_util.h"
 
 /**
    \brief Macros are universally quantified formulas of the form:

src/ast/macros/macro_util.cpp

@@ -17,17 +17,17 @@ Author:
 Revision History:
 
 --*/
-#include"macro_util.h"
-#include"occurs.h"
-#include"ast_util.h"
-#include"arith_simplifier_plugin.h"
-#include"bv_simplifier_plugin.h"
-#include"var_subst.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
-#include"for_each_expr.h"
-#include"well_sorted.h"
-#include"bool_rewriter.h"
+#include "ast/macros/macro_util.h"
+#include "ast/occurs.h"
+#include "ast/ast_util.h"
+#include "ast/simplifier/arith_simplifier_plugin.h"
+#include "ast/simplifier/bv_simplifier_plugin.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/for_each_expr.h"
+#include "ast/well_sorted.h"
+#include "ast/rewriter/bool_rewriter.h"
 
 macro_util::macro_util(ast_manager & m, simplifier & s):
     m_manager(m),

src/ast/macros/macro_util.h

@@ -20,9 +20,9 @@ Revision History:
 #ifndef MACRO_UTIL_H_
 #define MACRO_UTIL_H_
 
-#include"ast.h"
-#include"obj_hashtable.h"
-#include"simplifier.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
+#include "ast/simplifier/simplifier.h"
 
 class poly_simplifier_plugin;
 class arith_simplifier_plugin;

src/ast/macros/quasi_macros.cpp

@@ -16,11 +16,11 @@ Author:
 Revision History:
 
 --*/
-#include"quasi_macros.h"
-#include"for_each_expr.h"
-#include"ast_pp.h"
-#include"uint_set.h"
-#include"var_subst.h"
+#include "ast/macros/quasi_macros.h"
+#include "ast/for_each_expr.h"
+#include "ast/ast_pp.h"
+#include "util/uint_set.h"
+#include "ast/rewriter/var_subst.h"
 
 quasi_macros::quasi_macros(ast_manager & m, macro_manager & mm, simplifier & s) :
   m_manager(m),

src/ast/macros/quasi_macros.h

@@ -20,9 +20,9 @@ Revision History:
 #define QUASI_MACROS_H_
 
 #include<sstream>
-#include"macro_manager.h"
-#include"basic_simplifier_plugin.h"
-#include"simplifier.h"
+#include "ast/macros/macro_manager.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
+#include "ast/simplifier/simplifier.h"
 
 /**
    \brief Finds quasi macros and applies them.

src/ast/normal_forms/defined_names.cpp

@@ -16,12 +16,12 @@ Author:
 Revision History:
 
 --*/
-#include"defined_names.h"
-#include"obj_hashtable.h"
-#include"used_vars.h"
-#include"var_subst.h"
-#include"ast_smt2_pp.h"
-#include"ast_pp.h"
+#include "ast/normal_forms/defined_names.h"
+#include "util/obj_hashtable.h"
+#include "ast/used_vars.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/ast_pp.h"
 
 struct defined_names::impl {
     typedef obj_map<expr, app *>   expr2name;

src/ast/normal_forms/defined_names.h

@@ -20,7 +20,7 @@ Revision History:
 #ifndef DEFINED_NAMES_H_
 #define DEFINED_NAMES_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 
 /**
    \brief Mapping from expressions to skolem functions that are used to name them.

src/ast/normal_forms/name_exprs.cpp

@@ -16,9 +16,9 @@ Author:
 Notes:
 
 --*/
-#include"name_exprs.h"
-#include"rewriter_def.h"
-#include"ast_smt2_pp.h"
+#include "ast/normal_forms/name_exprs.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/ast_smt2_pp.h"
 
 class name_exprs_core : public name_exprs {
     struct cfg : public default_rewriter_cfg {

src/ast/normal_forms/name_exprs.h

@@ -19,8 +19,8 @@ Notes:
 #ifndef NAME_EXPRS_H_
 #define NAME_EXPRS_H_
 
-#include"ast.h"
-#include"defined_names.h"
+#include "ast/ast.h"
+#include "ast/normal_forms/defined_names.h"
 
 class expr_predicate {
 public:

src/ast/normal_forms/nnf.cpp

@@ -17,18 +17,18 @@ Notes:
     Major revision on 2011-10-06
 
 --*/
-#include"nnf.h"
+#include "ast/normal_forms/nnf.h"
 #include"nnf_params.hpp"
-#include"warning.h"
-#include"used_vars.h"
-#include"well_sorted.h"
-#include"var_subst.h"
+#include "util/warning.h"
+#include "ast/used_vars.h"
+#include "ast/well_sorted.h"
+#include "ast/rewriter/var_subst.h"
 
-#include"name_exprs.h"
-#include"act_cache.h"
-#include"cooperate.h"
+#include "ast/normal_forms/name_exprs.h"
+#include "ast/act_cache.h"
+#include "util/cooperate.h"
 
-#include"ast_smt2_pp.h"
+#include "ast/ast_smt2_pp.h"
 
 /**
    \brief NNF translation mode.  The cheapest mode is NNF_SKOLEM, and

src/ast/normal_forms/nnf.h

@@ -20,9 +20,9 @@ Notes:
 #ifndef NNF_H_
 #define NNF_H_
 
-#include"ast.h"
-#include"params.h"
-#include"defined_names.h"
+#include "ast/ast.h"
+#include "util/params.h"
+#include "ast/normal_forms/defined_names.h"
 
 class nnf {
     struct imp;

src/ast/normal_forms/pull_quant.cpp

@@ -16,10 +16,10 @@ Author:
 Notes:
 
 --*/
-#include"pull_quant.h"
-#include"var_subst.h"
-#include"rewriter_def.h"
-#include"ast_pp.h"
+#include "ast/normal_forms/pull_quant.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/ast_pp.h"
 
 struct pull_quant::imp {
     

src/ast/normal_forms/pull_quant.h

@@ -19,7 +19,7 @@ Notes:
 #ifndef PULL_QUANT_H_
 #define PULL_QUANT_H_
 
-#include"ast.h"
+#include "ast/ast.h"
 
 /**
    \brief Pull nested quantifiers in a formula. 

src/ast/num_occurs.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 
-#include"num_occurs.h"
+#include "ast/num_occurs.h"
 
 void num_occurs::process(expr * t, expr_fast_mark1 & visited) {
     ptr_buffer<expr, 128> stack;

src/ast/num_occurs.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef NUM_OCCURS_H_
 #define NUM_OCCURS_H_
 
-#include"ast.h"
-#include"obj_hashtable.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
 
 /**
    \brief Functor for computing the number of occurrences of each sub-expression in a expression F.

src/ast/occurs.cpp

@@ -16,9 +16,9 @@ Author:
 Revision History:
 
 --*/
-#include"occurs.h"
+#include "ast/occurs.h"
 
-#include"for_each_expr.h"
+#include "ast/for_each_expr.h"
 
 // -----------------------------------
 //

src/ast/pattern/expr_pattern_match.cpp

@@ -29,13 +29,13 @@ Notes:
 
 --*/
 
-#include"ast.h"
-#include"expr_pattern_match.h"
-#include"for_each_ast.h"
-#include"ast_ll_pp.h"
-#include"ast_pp.h"
-#include"cmd_context.h"
-#include"smt2parser.h"
+#include "ast/ast.h"
+#include "ast/pattern/expr_pattern_match.h"
+#include "ast/for_each_ast.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_pp.h"
+#include "cmd_context/cmd_context.h"
+#include "parsers/smt2/smt2parser.h"
 
 expr_pattern_match::expr_pattern_match(ast_manager & manager):
     m_manager(manager), m_precompiled(manager) {        

src/ast/pattern/expr_pattern_match.h

@@ -20,8 +20,8 @@ Notes:
 #ifndef EXPR_PATTERN_MATCH_H_
 #define EXPR_PATTERN_MATCH_H_
 
-#include"ast.h"
-#include"map.h"
+#include "ast/ast.h"
+#include "util/map.h"
 
 class expr_pattern_match {
 

src/ast/pattern/pattern_inference.cpp

@@ -16,15 +16,15 @@ Author:
 Revision History:
 
 --*/
-#include"pattern_inference.h"
-#include"ast_ll_pp.h"
-#include"ast_pp.h"
-#include"ast_util.h"
-#include"warning.h"
-#include"arith_decl_plugin.h"
-#include"pull_quant.h"
-#include"well_sorted.h"
-#include"for_each_expr.h"
+#include "ast/pattern/pattern_inference.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_util.h"
+#include "util/warning.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/normal_forms/pull_quant.h"
+#include "ast/well_sorted.h"
+#include "ast/for_each_expr.h"
 
 void smaller_pattern::save(expr * p1, expr * p2) {
     expr_pair e(p1, p2);
@@ -576,7 +576,7 @@ void pattern_inference::mk_patterns(unsigned num_bindings,
     m_candidates.reset();
 }
 
-#include"database.h" // defines g_pattern_database
+#include "smt/database.h"
 
 void pattern_inference::reduce1_quantifier(quantifier * q) {
     TRACE("pattern_inference", tout << "processing:\n" << mk_pp(q, m) << "\n";);

src/ast/pattern/pattern_inference.h

@@ -19,16 +19,16 @@ Revision History:
 #ifndef PATTERN_INFERENCE_H_
 #define PATTERN_INFERENCE_H_
 
-#include"ast.h"
-#include"simplifier.h"
-#include"pattern_inference_params.h"
-#include"vector.h"
-#include"uint_set.h"
-#include"nat_set.h"
-#include"obj_hashtable.h"
-#include"obj_pair_hashtable.h"
-#include"map.h"
-#include"expr_pattern_match.h"
+#include "ast/ast.h"
+#include "ast/simplifier/simplifier.h"
+#include "ast/pattern/pattern_inference_params.h"
+#include "util/vector.h"
+#include "util/uint_set.h"
+#include "util/nat_set.h"
+#include "util/obj_hashtable.h"
+#include "util/obj_pair_hashtable.h"
+#include "util/map.h"
+#include "ast/pattern/expr_pattern_match.h"
 
 /**
    \brief A pattern p_1 is smaller than a pattern p_2 iff 

src/ast/pattern/pattern_inference_params.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"pattern_inference_params.h"
+#include "ast/pattern/pattern_inference_params.h"
 #include"pattern_inference_params_helper.hpp"
 
 void pattern_inference_params::updt_params(params_ref const & _p) {

src/ast/pattern/pattern_inference_params.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef PATTERN_INFERENCE_PARAMS_H_
 #define PATTERN_INFERENCE_PARAMS_H_
 
-#include"params.h"
+#include "util/params.h"
 
 enum arith_pattern_inference_kind {
     AP_NO,           // do not infer patterns with arithmetic terms

src/ast/pb_decl_plugin.cpp

@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#include "pb_decl_plugin.h"
-#include "ast_util.h"
+#include "ast/pb_decl_plugin.h"
+#include "ast/ast_util.h"
 
 pb_decl_plugin::pb_decl_plugin():
     m_at_most_sym("at-most"),

src/ast/pb_decl_plugin.h

@@ -27,7 +27,7 @@ hence:
 #ifndef PB_DECL_PLUGIN_H_
 #define PB_DECL_PLUGIN_H_
 
-#include"ast.h"
+#include "ast/ast.h"
  
 enum pb_op_kind {
     OP_AT_MOST_K,  // at most K Booleans are true.

src/ast/pp.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"pp.h"
+#include "ast/pp.h"
 #include"pp_params.hpp"
 using namespace format_ns;
 

src/ast/pp.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef PP_H_
 #define PP_H_
 
-#include"format.h"
-#include"params.h"
+#include "ast/format.h"
+#include "util/params.h"
 
 void pp(std::ostream & out, format_ns::format * f, ast_manager & m, params_ref const & p = params_ref());
 

src/ast/proof_checker/proof_checker.cpp

@@ -4,14 +4,14 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "proof_checker.h"
-#include "ast_ll_pp.h"
-#include "ast_pp.h"
+#include "ast/proof_checker/proof_checker.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_pp.h"
 // include "spc_decl_plugin.h"
-#include "ast_smt_pp.h"
-#include "arith_decl_plugin.h"
-#include "th_rewriter.h"
-#include "var_subst.h"
+#include "ast/ast_smt_pp.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "ast/rewriter/var_subst.h"
 
 #define IS_EQUIV(_e_) (m.is_eq(_e_) || m.is_iff(_e_))
 

src/ast/proof_checker/proof_checker.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef PROOF_CHECKER_H_
 #define PROOF_CHECKER_H_
 
-#include "ast.h"
-#include "map.h"
+#include "ast/ast.h"
+#include "util/map.h"
 
 class proof_checker {
     ast_manager&     m;

src/ast/recurse_expr.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef RECURSE_EXPR_H_
 #define RECURSE_EXPR_H_
 
-#include"ast.h"
-#include"obj_hashtable.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
 
 template<typename T, typename Visitor, bool IgnorePatterns=false, bool CallDestructors=true>
 class recurse_expr : public Visitor {

src/ast/recurse_expr_def.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef RECURSE_EXPR_DEF_H_
 #define RECURSE_EXPR_DEF_H_
 
-#include"recurse_expr.h"
+#include "ast/recurse_expr.h"
 
 template<typename T, typename Visitor, bool IgnorePatterns, bool CallDestructors>
 inline void recurse_expr<T, Visitor, IgnorePatterns, CallDestructors>::visit(expr * n, bool & visited) {

src/ast/reg_decl_plugins.cpp

@@ -17,15 +17,15 @@ Author:
 Revision History:
 
 --*/
-#include"ast.h"
-#include"arith_decl_plugin.h"
-#include"array_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"datatype_decl_plugin.h"
-#include"dl_decl_plugin.h"
-#include"seq_decl_plugin.h"
-#include"pb_decl_plugin.h"
-#include"fpa_decl_plugin.h"
+#include "ast/ast.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/dl_decl_plugin.h"
+#include "ast/seq_decl_plugin.h"
+#include "ast/pb_decl_plugin.h"
+#include "ast/fpa_decl_plugin.h"
 
 void reg_decl_plugins(ast_manager & m) {
     if (!m.get_plugin(m.mk_family_id(symbol("arith")))) {

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);