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

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

src/api/api_algebraic.cpp

@@ -17,14 +17,14 @@ Author:
 Notes:
 
 --*/
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_ast_vector.h"
-#include"algebraic_numbers.h"
-#include"expr2polynomial.h"
-#include"cancel_eh.h"
-#include"scoped_timer.h"
+#include "api/api_context.h"
+#include "api/api_ast_vector.h"
+#include "math/polynomial/algebraic_numbers.h"
+#include "ast/expr2polynomial.h"
+#include "util/cancel_eh.h"
+#include "util/scoped_timer.h"
 
 
 #define CHECK_IS_ALGEBRAIC(ARG, RET) {          \

src/api/api_arith.cpp

@@ -15,12 +15,12 @@ Author:
 Revision History:
 
 --*/
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"arith_decl_plugin.h"
-#include"algebraic_numbers.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "ast/arith_decl_plugin.h"
+#include "math/polynomial/algebraic_numbers.h"
 
 #define MK_ARITH_OP(NAME, OP) MK_NARY(NAME, mk_c(c)->get_arith_fid(), OP, SKIP)
 #define MK_BINARY_ARITH_OP(NAME, OP) MK_BINARY(NAME, mk_c(c)->get_arith_fid(), OP, SKIP)

src/api/api_array.cpp

@@ -15,11 +15,11 @@ Author:
 Revision History:
 
 --*/
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"array_decl_plugin.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "ast/array_decl_plugin.h"
 
 extern "C" {
 

src/api/api_ast.cpp

@@ -17,26 +17,26 @@ Revision History:
 --*/
 #include<iostream>
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"well_sorted.h"
-#include"arith_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"datatype_decl_plugin.h"
-#include"array_decl_plugin.h"
-#include"pb_decl_plugin.h"
-#include"ast_translation.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
-#include"ast_smt_pp.h"
-#include"ast_smt2_pp.h"
-#include"th_rewriter.h"
-#include"var_subst.h"
-#include"expr_safe_replace.h"
-#include"pp.h"
-#include"scoped_ctrl_c.h"
-#include"cancel_eh.h"
-#include"scoped_timer.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "ast/well_sorted.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/pb_decl_plugin.h"
+#include "ast/ast_translation.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
+#include "ast/ast_smt_pp.h"
+#include "ast/ast_smt2_pp.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "ast/rewriter/var_subst.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "ast/pp.h"
+#include "util/scoped_ctrl_c.h"
+#include "util/cancel_eh.h"
+#include "util/scoped_timer.h"
 #include"pp_params.hpp"
 
 extern bool is_numeral_sort(Z3_context c, Z3_sort ty);

src/api/api_ast_map.cpp

@@ -16,13 +16,13 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_ast_map.h"
-#include"api_ast_vector.h"
-#include"ast_smt2_pp.h"
-#include"dec_ref_util.h"
+#include "api/api_context.h"
+#include "api/api_ast_map.h"
+#include "api/api_ast_vector.h"
+#include "ast/ast_smt2_pp.h"
+#include "util/dec_ref_util.h"
 
 Z3_ast_map_ref::~Z3_ast_map_ref() {
     dec_ref_key_values(m, m_map);

src/api/api_ast_map.h

@@ -18,8 +18,8 @@ Revision History:
 #ifndef API_AST_MAP_H_
 #define API_AST_MAP_H_
 
-#include"api_util.h"
-#include"obj_hashtable.h"
+#include "api/api_util.h"
+#include "util/obj_hashtable.h"
 
 struct Z3_ast_map_ref : public api::object {
     ast_manager &            m;

src/api/api_ast_vector.cpp

@@ -16,12 +16,12 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_ast_vector.h"
-#include"ast_translation.h"
-#include"ast_smt2_pp.h"
+#include "api/api_context.h"
+#include "api/api_ast_vector.h"
+#include "ast/ast_translation.h"
+#include "ast/ast_smt2_pp.h"
 
 extern "C" {
 

src/api/api_ast_vector.h

@@ -18,7 +18,7 @@ Revision History:
 #ifndef API_AST_VECTOR_H_
 #define API_AST_VECTOR_H_
 
-#include"api_util.h"
+#include "api/api_util.h"
 
 namespace api {
     class context;

src/api/api_bv.cpp

@@ -15,11 +15,11 @@ Author:
 Revision History:
 
 --*/
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"bv_decl_plugin.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "ast/bv_decl_plugin.h"
 
 extern "C" {
 

src/api/api_config_params.cpp

@@ -15,16 +15,16 @@ Author:
 Revision History:
 
 --*/
-#include"z3.h"
-#include"api_context.h"
-#include"pp.h"
+#include "api/z3.h"
+#include "api/api_context.h"
+#include "ast/pp.h"
 #include"api_log_macros.h"
-#include"api_util.h"
-#include"cmd_context.h"
-#include"symbol.h"
-#include"gparams.h"
-#include"env_params.h"
-#include"context_params.h"
+#include "api/api_util.h"
+#include "cmd_context/cmd_context.h"
+#include "util/symbol.h"
+#include "util/gparams.h"
+#include "util/env_params.h"
+#include "cmd_context/context_params.h"
 
 extern "C" {
     void Z3_API Z3_global_param_set(Z3_string param_id, Z3_string param_value) {

src/api/api_context.cpp

@@ -18,15 +18,15 @@ Revision History:
 
 --*/
 #include<typeinfo>
-#include"api_context.h"
-#include"smtparser.h"
+#include "api/api_context.h"
+#include "parsers/smt/smtparser.h"
 #include"version.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
 #include"api_log_macros.h"
-#include"api_util.h"
-#include"reg_decl_plugins.h"
-#include"realclosure.h"
+#include "api/api_util.h"
+#include "ast/reg_decl_plugins.h"
+#include "math/realclosure/realclosure.h"
 
 // The install_tactics procedure is automatically generated
 void install_tactics(tactic_manager & ctx);

src/api/api_context.h

@@ -20,22 +20,22 @@ Revision History:
 #ifndef API_CONTEXT_H_
 #define API_CONTEXT_H_
 
-#include"z3.h"
-#include"ast.h"
-#include"api_util.h"
-#include"arith_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"seq_decl_plugin.h"
-#include"datatype_decl_plugin.h"
-#include"dl_decl_plugin.h"
-#include"fpa_decl_plugin.h"
-#include"smt_kernel.h"
-#include"smt_params.h"
-#include"event_handler.h"
-#include"tactic_manager.h"
-#include"context_params.h"
-#include"api_polynomial.h"
-#include"hashtable.h"
+#include "api/z3.h"
+#include "ast/ast.h"
+#include "api/api_util.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/seq_decl_plugin.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/dl_decl_plugin.h"
+#include "ast/fpa_decl_plugin.h"
+#include "smt/smt_kernel.h"
+#include "smt/params/smt_params.h"
+#include "util/event_handler.h"
+#include "cmd_context/tactic_manager.h"
+#include "cmd_context/context_params.h"
+#include "api/api_polynomial.h"
+#include "util/hashtable.h"
 
 namespace smtlib {
     class parser;

src/api/api_datalog.cpp

@@ -15,24 +15,24 @@ Author:
 Revision History:
 
 --*/
-#include"api_datalog.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"ast_pp.h"
-#include"api_ast_vector.h"
+#include "api/api_datalog.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "ast/ast_pp.h"
+#include "api/api_ast_vector.h"
 #include"api_log_macros.h"
-#include"api_stats.h"
-#include"datalog_parser.h"
-#include"cancel_eh.h"
-#include"scoped_timer.h"
-#include"dl_cmds.h"
-#include"cmd_context.h"
-#include"smt2parser.h"
-#include"dl_context.h"
-#include"dl_register_engine.h"
-#include"dl_external_relation.h"
-#include"dl_decl_plugin.h"
-#include"rel_context.h"
+#include "api/api_stats.h"
+#include "muz/fp/datalog_parser.h"
+#include "util/cancel_eh.h"
+#include "util/scoped_timer.h"
+#include "muz/fp/dl_cmds.h"
+#include "cmd_context/cmd_context.h"
+#include "parsers/smt2/smt2parser.h"
+#include "muz/base/dl_context.h"
+#include "muz/fp/dl_register_engine.h"
+#include "muz/rel/dl_external_relation.h"
+#include "ast/dl_decl_plugin.h"
+#include "muz/rel/rel_context.h"
 
 namespace api {
 

src/api/api_datalog.h

@@ -19,11 +19,11 @@ Revision History:
 #ifndef API_DATALOG_H_
 #define API_DATALOG_H_
 
-#include"z3.h"
-#include"ast.h"
-#include"smt_params.h"
-#include"smt_kernel.h"
-#include"api_util.h"
+#include "api/z3.h"
+#include "ast/ast.h"
+#include "smt/params/smt_params.h"
+#include "smt/smt_kernel.h"
+#include "api/api_util.h"
 
 typedef void (*reduce_app_callback_fptr)(void*, func_decl*, unsigned, expr*const*, expr**);
 typedef void (*reduce_assign_callback_fptr)(void*, func_decl*, unsigned, expr*const*, unsigned, expr*const*);

src/api/api_datatype.cpp

@@ -15,11 +15,11 @@ Author:
 Revision History:
 
 --*/
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"datatype_decl_plugin.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "ast/datatype_decl_plugin.h"
 
 extern "C" {
 

src/api/api_fpa.cpp

@@ -17,10 +17,10 @@ Notes:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"fpa_decl_plugin.h"
+#include "api/api_context.h"
+#include "ast/fpa_decl_plugin.h"
 
 bool is_fp_sort(Z3_context c, Z3_sort s) {
     return mk_c(c)->fpautil().is_float(to_sort(s));

src/api/api_goal.cpp

@@ -16,11 +16,11 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_goal.h"
-#include"ast_translation.h"
+#include "api/api_context.h"
+#include "api/api_goal.h"
+#include "ast/ast_translation.h"
 
 extern "C" {
 

src/api/api_goal.h

@@ -18,8 +18,8 @@ Revision History:
 #ifndef API_GOAL_H_
 #define API_GOAL_H_
 
-#include"api_util.h"
-#include"goal.h"
+#include "api/api_util.h"
+#include "tactic/goal.h"
 
 struct Z3_goal_ref : public api::object {
     goal_ref m_goal;

src/api/api_interp.cpp

@@ -17,27 +17,27 @@
   --*/
 #include<sstream>
 #include<vector>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_tactic.h"
-#include"api_solver.h"
-#include"api_model.h"
-#include"api_stats.h"
-#include"api_ast_vector.h"
-#include"tactic2solver.h"
-#include"scoped_ctrl_c.h"
-#include"cancel_eh.h"
-#include"scoped_timer.h"
-#include"smt_strategic_solver.h"
-#include"smt_solver.h"
-#include"smt_implied_equalities.h"
-#include"iz3interp.h"
-#include"iz3profiling.h"
-#include"iz3hash.h"
-#include"iz3pp.h"
-#include"iz3checker.h"
-#include"scoped_proof.h"
+#include "api/api_context.h"
+#include "api/api_tactic.h"
+#include "api/api_solver.h"
+#include "api/api_model.h"
+#include "api/api_stats.h"
+#include "api/api_ast_vector.h"
+#include "solver/tactic2solver.h"
+#include "util/scoped_ctrl_c.h"
+#include "util/cancel_eh.h"
+#include "util/scoped_timer.h"
+#include "tactic/portfolio/smt_strategic_solver.h"
+#include "smt/smt_solver.h"
+#include "smt/smt_implied_equalities.h"
+#include "interp/iz3interp.h"
+#include "interp/iz3profiling.h"
+#include "interp/iz3hash.h"
+#include "interp/iz3pp.h"
+#include "interp/iz3checker.h"
+#include "ast/scoped_proof.h"
 
 using namespace stl_ext;
 

src/api/api_log.cpp

@@ -16,9 +16,9 @@ Revision History:
 
 --*/
 #include<fstream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"util.h"
+#include "util/util.h"
 #include"version.h"
 
 std::ostream * g_z3_log = 0;

src/api/api_model.cpp

@@ -16,15 +16,15 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_model.h"
-#include"api_ast_vector.h"
-#include"array_decl_plugin.h"
-#include"model.h"
-#include"model_v2_pp.h"
-#include"model_smt2_pp.h"
+#include "api/api_context.h"
+#include "api/api_model.h"
+#include "api/api_ast_vector.h"
+#include "ast/array_decl_plugin.h"
+#include "model/model.h"
+#include "model/model_v2_pp.h"
+#include "model/model_smt2_pp.h"
 #include"model_params.hpp"
 #include"model_evaluator_params.hpp"
 

src/api/api_model.h

@@ -18,8 +18,8 @@ Revision History:
 #ifndef API_MODEL_H_
 #define API_MODEL_H_
 
-#include"api_util.h"
-#include"model.h"
+#include "api/api_util.h"
+#include "model/model.h"
 
 struct Z3_model_ref : public api::object {
     model_ref  m_model;

src/api/api_numeral.cpp

@@ -16,14 +16,14 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"arith_decl_plugin.h"
-#include"bv_decl_plugin.h"
-#include"algebraic_numbers.h"
-#include"fpa_decl_plugin.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "math/polynomial/algebraic_numbers.h"
+#include "ast/fpa_decl_plugin.h"
 
 bool is_numeral_sort(Z3_context c, Z3_sort ty) {
     sort * _ty = to_sort(ty);

src/api/api_opt.cpp

@@ -16,18 +16,18 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_stats.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"api_model.h"
-#include"opt_context.h"
-#include"opt_cmds.h"
-#include"cancel_eh.h"
-#include"scoped_timer.h"
-#include"smt2parser.h"
-#include"api_ast_vector.h"
+#include "api/api_stats.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "api/api_model.h"
+#include "opt/opt_context.h"
+#include "opt/opt_cmds.h"
+#include "util/cancel_eh.h"
+#include "util/scoped_timer.h"
+#include "parsers/smt2/smt2parser.h"
+#include "api/api_ast_vector.h"
 
 extern "C" {
 

src/api/api_params.cpp

@@ -18,11 +18,11 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"params.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "util/params.h"
 
 extern "C" {
     

src/api/api_parsers.cpp

@@ -16,14 +16,14 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"cmd_context.h"
-#include"smt2parser.h"
-#include"smtparser.h"
-#include"solver_na2as.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "cmd_context/cmd_context.h"
+#include "parsers/smt2/smt2parser.h"
+#include "parsers/smt/smtparser.h"
+#include "solver/solver_na2as.h"
 
 extern "C" {
 

src/api/api_pb.cpp

@@ -15,11 +15,11 @@ Author:
 Revision History:
 
 --*/
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"pb_decl_plugin.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "ast/pb_decl_plugin.h"
 
 extern "C" {
 

src/api/api_polynomial.cpp

@@ -16,15 +16,15 @@ Author:
 Notes:
 
 --*/
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_polynomial.h"
-#include"api_ast_vector.h"
-#include"expr2polynomial.h"
-#include"cancel_eh.h"
-#include"scoped_timer.h"
-#include"expr2var.h"
+#include "api/api_context.h"
+#include "api/api_polynomial.h"
+#include "api/api_ast_vector.h"
+#include "ast/expr2polynomial.h"
+#include "util/cancel_eh.h"
+#include "util/scoped_timer.h"
+#include "ast/expr2var.h"
 
 namespace api {
 

src/api/api_polynomial.h

@@ -19,7 +19,7 @@ Notes:
 #ifndef API_POLYNOMIAL_H_
 #define API_POLYNOMIAL_H_
 
-#include"polynomial.h"
+#include "math/polynomial/polynomial.h"
 
 namespace api {
     

src/api/api_quant.cpp

@@ -15,12 +15,12 @@ Author:
 Revision History:
 
 --*/
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"pattern_validation.h"
-#include"expr_abstract.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "parsers/util/pattern_validation.h"
+#include "ast/expr_abstract.h"
 
 extern "C" {
 

src/api/api_rcf.cpp

@@ -20,10 +20,10 @@ Notes:
     
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"realclosure.h"
+#include "api/api_context.h"
+#include "math/realclosure/realclosure.h"
 
 static rcmanager & rcfm(Z3_context c) {
     return mk_c(c)->rcfm();

src/api/api_seq.cpp

@@ -16,11 +16,11 @@ Author:
 Revision History:
 
 --*/
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_util.h"
-#include"ast_pp.h"
+#include "api/api_context.h"
+#include "api/api_util.h"
+#include "ast/ast_pp.h"
 
 extern "C" {
 

src/api/api_solver.cpp

@@ -17,22 +17,22 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_tactic.h"
-#include"api_solver.h"
-#include"api_model.h"
-#include"api_stats.h"
-#include"api_ast_vector.h"
-#include"tactic2solver.h"
-#include"scoped_ctrl_c.h"
-#include"cancel_eh.h"
-#include"scoped_timer.h"
-#include"smt_strategic_solver.h"
-#include"smt_solver.h"
-#include"smt_implied_equalities.h"
-#include"smt_logics.h"
+#include "api/api_context.h"
+#include "api/api_tactic.h"
+#include "api/api_solver.h"
+#include "api/api_model.h"
+#include "api/api_stats.h"
+#include "api/api_ast_vector.h"
+#include "solver/tactic2solver.h"
+#include "util/scoped_ctrl_c.h"
+#include "util/cancel_eh.h"
+#include "util/scoped_timer.h"
+#include "tactic/portfolio/smt_strategic_solver.h"
+#include "smt/smt_solver.h"
+#include "smt/smt_implied_equalities.h"
+#include "solver/smt_logics.h"
 
 extern "C" {
 

src/api/api_solver.h

@@ -18,8 +18,8 @@ Revision History:
 #ifndef API_SOLVER_H_
 #define API_SOLVER_H_
 
-#include"api_util.h"
-#include"solver.h"
+#include "api/api_util.h"
+#include "solver/solver.h"
 
 struct Z3_solver_ref : public api::object {
     scoped_ptr<solver_factory> m_solver_factory;

src/api/api_stats.cpp

@@ -16,10 +16,10 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_stats.h"
+#include "api/api_context.h"
+#include "api/api_stats.h"
 
 extern "C" {
 

src/api/api_stats.h

@@ -18,8 +18,8 @@ Revision History:
 #ifndef API_STATS_H_
 #define API_STATS_H_
 
-#include"api_util.h"
-#include"statistics.h"
+#include "api/api_util.h"
+#include "util/statistics.h"
 
 struct Z3_stats_ref : public api::object {
     statistics m_stats;

src/api/api_tactic.cpp

@@ -16,14 +16,14 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3.h"
+#include "api/z3.h"
 #include"api_log_macros.h"
-#include"api_context.h"
-#include"api_tactic.h"
-#include"api_model.h"
-#include"scoped_ctrl_c.h"
-#include"cancel_eh.h"
-#include"scoped_timer.h"
+#include "api/api_context.h"
+#include "api/api_tactic.h"
+#include "api/api_model.h"
+#include "util/scoped_ctrl_c.h"
+#include "util/cancel_eh.h"
+#include "util/scoped_timer.h"
 
 Z3_apply_result_ref::Z3_apply_result_ref(api::context& c, ast_manager & m): api::object(c), m_core(m) {
 }

src/api/api_tactic.h

@@ -18,8 +18,8 @@ Revision History:
 #ifndef API_TACTIC_H_
 #define API_TACTIC_H_
 
-#include"api_goal.h"
-#include"tactical.h"
+#include "api/api_goal.h"
+#include "tactic/tactical.h"
 
 namespace api {
     class context;

src/api/api_util.h

@@ -18,9 +18,9 @@ Revision History:
 #ifndef API_UTIL_H_
 #define API_UTIL_H_
 
-#include"params.h"
-#include"lbool.h"
-#include"ast.h"
+#include "util/params.h"
+#include "util/lbool.h"
+#include "ast/ast.h"
 
 #define Z3_TRY try {
 #define Z3_CATCH_CORE(CODE) } catch (z3_exception & ex) { mk_c(c)->handle_exception(ex); CODE }

src/api/z3.h

@@ -22,16 +22,16 @@ Notes:
 #define Z3_H_
 
 #include<stdio.h>
-#include"z3_macros.h"
-#include"z3_api.h"
-#include"z3_ast_containers.h"
-#include"z3_algebraic.h"
-#include"z3_polynomial.h"
-#include"z3_rcf.h"
-#include"z3_fixedpoint.h"
-#include"z3_optimization.h"
-#include"z3_interp.h"
-#include"z3_fpa.h"
+#include "api/z3_macros.h"
+#include "api/z3_api.h"
+#include "api/z3_ast_containers.h"
+#include "api/z3_algebraic.h"
+#include "api/z3_polynomial.h"
+#include "api/z3_rcf.h"
+#include "api/z3_fixedpoint.h"
+#include "api/z3_optimization.h"
+#include "api/z3_interp.h"
+#include "api/z3_fpa.h"
 
 #endif
 

src/api/z3_logger.h

@@ -17,7 +17,7 @@ Notes:
     
 --*/
 #include<iostream>
-#include"symbol.h"
+#include "util/symbol.h"
 struct ll_escaped { char const * m_str; ll_escaped(char const * str):m_str(str) {} };
 static std::ostream & operator<<(std::ostream & out, ll_escaped const & d);
 

src/api/z3_private.h

@@ -19,8 +19,8 @@ Notes:
 --*/
 
 #include<iostream>
-#include"rational.h"
-#include"z3_macros.h"
+#include "util/rational.h"
+#include "api/z3_macros.h"
 
 #ifndef Z3_PRIVATE_H_
 #define Z3_PRIVATE_H_

src/api/z3_replayer.cpp

@@ -16,12 +16,12 @@ Author:
 Notes:
 
 --*/
-#include"vector.h"
-#include"map.h"
-#include"z3_replayer.h"
-#include"stream_buffer.h"
-#include"symbol.h"
-#include"trace.h"
+#include "util/vector.h"
+#include "util/map.h"
+#include "api/z3_replayer.h"
+#include "util/stream_buffer.h"
+#include "util/symbol.h"
+#include "util/trace.h"
 #include<sstream>
 #include<vector>
 

src/api/z3_replayer.h

@@ -20,8 +20,8 @@ Notes:
 #define Z3_REPLAYER_H_
 
 #include<iostream>
-#include"z3.h"
-#include"z3_exception.h"
+#include "api/z3.h"
+#include "util/z3_exception.h"
 
 class z3_replayer;
 

src/api/z3_v1.h

@@ -21,7 +21,7 @@ Notes:
 #ifndef Z3_V1_H_
 #define Z3_V1_H_
 
-#include"z3.h"
+#include "api/z3.h"
 
 // Backwards compatibility
 #define Z3_type_ast            Z3_sort