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

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

src/muz/rel/aig_exporter.cpp

@@ -11,8 +11,8 @@ Abstract:
 
 --*/
 
-#include "aig_exporter.h"
-#include "dl_context.h"
+#include "muz/rel/aig_exporter.h"
+#include "muz/base/dl_context.h"
 #include <set>
 
 namespace datalog {

src/muz/rel/aig_exporter.h

@@ -14,11 +14,11 @@ Abstract:
 #ifndef AIG_EXPORTER_H_
 #define AIG_EXPORTER_H_
 
-#include "aig.h"
-#include "dl_rule_set.h"
+#include "tactic/aig/aig.h"
+#include "muz/base/dl_rule_set.h"
 #include <map>
 #include <sstream>
-#include "rel_context.h"
+#include "muz/rel/rel_context.h"
 
 namespace datalog {
     class aig_exporter {

src/muz/rel/check_relation.cpp

@@ -4,10 +4,10 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "check_relation.h"
-#include "dl_relation_manager.h"
-#include "ast_util.h"
-#include "smt_kernel.h"
+#include "muz/rel/check_relation.h"
+#include "muz/rel/dl_relation_manager.h"
+#include "ast/ast_util.h"
+#include "smt/smt_kernel.h"
 #include <typeinfo>
 
 

src/muz/rel/check_relation.h

@@ -22,8 +22,8 @@ Revision History:
 #ifndef CHECK_RELATION_H_
 #define CHECK_RELATION_H_
 
-#include "doc.h"
-#include "dl_base.h"
+#include "muz/rel/doc.h"
+#include "muz/rel/dl_base.h"
 
 namespace datalog {
     class check_relation_plugin;

src/muz/rel/dl_base.cpp

@@ -18,13 +18,13 @@ Revision History:
 --*/
 
 
-#include"ast_pp.h"
-#include"union_find.h"
-#include"vector.h"
-#include"dl_context.h"
-#include"dl_base.h"
-#include"bool_rewriter.h"
-#include"dl_relation_manager.h"
+#include "ast/ast_pp.h"
+#include "util/union_find.h"
+#include "util/vector.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/dl_base.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "muz/rel/dl_relation_manager.h"
 #include<sstream>
 
 

src/muz/rel/dl_base.h

@@ -23,12 +23,12 @@ Revision History:
 
 #include<iosfwd>
 
-#include"ast.h"
-#include"map.h"
-#include"vector.h"
-#include"ref.h"
-#include"dl_util.h"
-#include"dl_context.h"
+#include "ast/ast.h"
+#include "util/map.h"
+#include "util/vector.h"
+#include "util/ref.h"
+#include "muz/base/dl_util.h"
+#include "muz/base/dl_context.h"
 
 namespace datalog {
 

src/muz/rel/dl_bound_relation.cpp

@@ -17,9 +17,9 @@ Revision History:
 
 --*/
 
-#include "dl_bound_relation.h"
-#include "debug.h"
-#include "ast_pp.h"
+#include "muz/rel/dl_bound_relation.h"
+#include "util/debug.h"
+#include "ast/ast_pp.h"
 
 namespace datalog {
 

src/muz/rel/dl_bound_relation.h

@@ -19,14 +19,14 @@ Revision History:
 #ifndef DL_BOUND_RELATION_H_
 #define DL_BOUND_RELATION_H_
 
-#include "dl_context.h"
-#include "dl_relation_manager.h"
-#include "dl_base.h"
-#include "uint_set.h"
-#include "dl_vector_relation.h"
-#include "dl_interval_relation.h"
-#include "arith_decl_plugin.h"
-#include "basic_simplifier_plugin.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/dl_relation_manager.h"
+#include "muz/rel/dl_base.h"
+#include "util/uint_set.h"
+#include "muz/rel/dl_vector_relation.h"
+#include "muz/rel/dl_interval_relation.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
 
 namespace datalog {
 

src/muz/rel/dl_check_table.cpp

@@ -19,8 +19,8 @@ Revision History:
 --*/
 
 
-#include "dl_check_table.h"
-#include "dl_table.h"
+#include "muz/rel/dl_check_table.h"
+#include "muz/rel/dl_table.h"
 
 
 namespace datalog {

src/muz/rel/dl_check_table.h

@@ -21,9 +21,9 @@ Revision History:
 #ifndef DL_CHECK_TABLE_H_
 #define DL_CHECK_TABLE_H_
 
-#include "dl_base.h"
-#include "dl_decl_plugin.h"
-#include "dl_relation_manager.h"
+#include "muz/rel/dl_base.h"
+#include "ast/dl_decl_plugin.h"
+#include "muz/rel/dl_relation_manager.h"
 
 namespace datalog {
     class check_table;

src/muz/rel/dl_compiler.cpp

@@ -19,15 +19,15 @@ Revision History:
 
 
 #include <sstream>
-#include"ref_vector.h"
-#include"dl_context.h"
-#include"rel_context.h"
-#include"dl_rule.h"
-#include"dl_util.h"
-#include"dl_compiler.h"
-#include"ast_pp.h"
+#include "util/ref_vector.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/rel_context.h"
+#include "muz/base/dl_rule.h"
+#include "muz/base/dl_util.h"
+#include "muz/rel/dl_compiler.h"
+#include "ast/ast_pp.h"
 // include"ast_smt2_pp.h"
-#include"ast_util.h"
+#include "ast/ast_util.h"
 
 
 namespace datalog {

src/muz/rel/dl_compiler.h

@@ -23,16 +23,16 @@ Revision History:
 #include<list>
 #include<utility>
 
-#include "ast.h"
-#include "hashtable.h"
-#include "map.h"
-#include "obj_pair_hashtable.h"
-#include "ref_vector.h"
-#include "vector.h"
+#include "ast/ast.h"
+#include "util/hashtable.h"
+#include "util/map.h"
+#include "util/obj_pair_hashtable.h"
+#include "util/ref_vector.h"
+#include "util/vector.h"
 
-#include "dl_base.h"
-#include "dl_context.h"
-#include "dl_instruction.h"
+#include "muz/rel/dl_base.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/dl_instruction.h"
 
 namespace datalog {
 

src/muz/rel/dl_external_relation.cpp

@@ -17,11 +17,11 @@ Revision History:
 
 --*/
 
-#include "debug.h"
-#include "ast_pp.h"
-#include "dl_context.h"
-#include "dl_external_relation.h"
-#include "dl_decl_plugin.h"
+#include "util/debug.h"
+#include "ast/ast_pp.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/dl_external_relation.h"
+#include "ast/dl_decl_plugin.h"
 
 namespace datalog {
        

src/muz/rel/dl_external_relation.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef DL_EXTERNAL_RELATION_H_
 #define DL_EXTERNAL_RELATION_H_
 
-#include "dl_base.h"
+#include "muz/rel/dl_base.h"
 
 namespace datalog {
 

src/muz/rel/dl_finite_product_relation.cpp

@@ -19,11 +19,11 @@ Revision History:
 
 
 #include<string>
-#include"dl_context.h"
-#include"dl_relation_manager.h"
-#include"dl_table_relation.h"
-#include"dl_finite_product_relation.h"
-#include"bool_rewriter.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/dl_relation_manager.h"
+#include "muz/rel/dl_table_relation.h"
+#include "muz/rel/dl_finite_product_relation.h"
+#include "ast/rewriter/bool_rewriter.h"
 
 namespace datalog {
 

src/muz/rel/dl_finite_product_relation.h

@@ -20,9 +20,9 @@ Revision History:
 #define DL_FINITE_PRODUCT_RELATION_H_
 
 
-#include "dl_base.h"
-#include "dl_relation_manager.h"
-#include "dl_table_relation.h"
+#include "muz/rel/dl_base.h"
+#include "muz/rel/dl_relation_manager.h"
+#include "muz/rel/dl_table_relation.h"
 
 namespace datalog {
 

src/muz/rel/dl_instruction.cpp

@@ -17,14 +17,14 @@ Revision History:
 
 --*/
 
-#include"ast_pp.h"
-#include"stopwatch.h"
-#include"dl_context.h"
-#include"dl_util.h"
-#include"dl_instruction.h"
-#include"rel_context.h"
-#include"debug.h"
-#include"warning.h"
+#include "ast/ast_pp.h"
+#include "util/stopwatch.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_util.h"
+#include "muz/rel/dl_instruction.h"
+#include "muz/rel/rel_context.h"
+#include "util/debug.h"
+#include "util/warning.h"
 
 namespace datalog {
 

src/muz/rel/dl_instruction.h

@@ -22,11 +22,11 @@ Revision History:
 #include<iostream>
 #include<string>
 #include<utility>
-#include "ast.h"
-#include "vector.h"
-#include "dl_base.h"
-#include "dl_costs.h"
-#include "dl_context.h"
+#include "ast/ast.h"
+#include "util/vector.h"
+#include "muz/rel/dl_base.h"
+#include "muz/base/dl_costs.h"
+#include "muz/base/dl_context.h"
 
 namespace datalog {
 

src/muz/rel/dl_interval_relation.cpp

@@ -17,12 +17,12 @@ Revision History:
 
 --*/
 
-#include "debug.h"
-#include "optional.h"
-#include "ast_pp.h"
-#include "dl_interval_relation.h"
-#include "dl_relation_manager.h"
-#include "bool_rewriter.h"
+#include "util/debug.h"
+#include "util/optional.h"
+#include "ast/ast_pp.h"
+#include "muz/rel/dl_interval_relation.h"
+#include "muz/rel/dl_relation_manager.h"
+#include "ast/rewriter/bool_rewriter.h"
 
 
 namespace datalog {

src/muz/rel/dl_interval_relation.h

@@ -20,13 +20,13 @@ Revision History:
 #define DL_INTERVAL_RELATION_H_
 
 
-#include "dl_context.h"
-#include "dl_relation_manager.h"
-#include "dl_base.h"
-#include "old_interval.h"
-#include "dl_vector_relation.h"
-#include "arith_decl_plugin.h"
-#include "basic_simplifier_plugin.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/dl_relation_manager.h"
+#include "muz/rel/dl_base.h"
+#include "smt/old_interval.h"
+#include "muz/rel/dl_vector_relation.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
 
 namespace datalog {
 

src/muz/rel/dl_lazy_table.cpp

@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#include "dl_lazy_table.h"
-#include "dl_relation_manager.h"
+#include "muz/rel/dl_lazy_table.h"
+#include "muz/rel/dl_relation_manager.h"
 #include <sstream>
 
 namespace datalog {

src/muz/rel/dl_lazy_table.h

@@ -21,8 +21,8 @@ Revision History:
 #ifndef DL_LAZY_TABLE_H_
 #define DL_LAZY_TABLE_H_
 
-#include "dl_base.h"
-#include "ref.h"
+#include "muz/rel/dl_base.h"
+#include "util/ref.h"
 
 namespace datalog {
     

src/muz/rel/dl_mk_explanations.cpp

@@ -19,12 +19,12 @@ Revision History:
 
 
 #include <sstream>
-#include"ast_pp.h"
-#include"ast_smt_pp.h"
-#include"dl_finite_product_relation.h"
-#include"dl_product_relation.h"
-#include"dl_sieve_relation.h"
-#include"dl_mk_explanations.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_smt_pp.h"
+#include "muz/rel/dl_finite_product_relation.h"
+#include "muz/rel/dl_product_relation.h"
+#include "muz/rel/dl_sieve_relation.h"
+#include "muz/rel/dl_mk_explanations.h"
 
 namespace datalog {
 

src/muz/rel/dl_mk_explanations.h

@@ -20,8 +20,8 @@ Revision History:
 #ifndef DL_MK_EXPLANATIONS_H_
 #define DL_MK_EXPLANATIONS_H_
 
-#include "dl_context.h"
-#include "dl_rule_transformer.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule_transformer.h"
 
 namespace datalog {
 

src/muz/rel/dl_mk_similarity_compressor.cpp

@@ -19,8 +19,8 @@ Revision History:
 
 #include<utility>
 #include<sstream>
-#include"dl_mk_similarity_compressor.h"
-#include"dl_relation_manager.h"
+#include "muz/rel/dl_mk_similarity_compressor.h"
+#include "muz/rel/dl_relation_manager.h"
 
 namespace datalog {
 

src/muz/rel/dl_mk_similarity_compressor.h

@@ -21,12 +21,12 @@ Revision History:
 
 #include<utility>
 
-#include"map.h"
-#include"obj_pair_hashtable.h"
+#include "util/map.h"
+#include "util/obj_pair_hashtable.h"
 
-#include"dl_context.h"
-#include"dl_rule_set.h"
-#include"dl_rule_transformer.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule_set.h"
+#include "muz/base/dl_rule_transformer.h"
 
 namespace datalog {
 

src/muz/rel/dl_mk_simple_joins.cpp

@@ -20,10 +20,10 @@ Revision History:
 #include<utility>
 #include<sstream>
 #include<limits>
-#include"dl_mk_simple_joins.h"
-#include"dl_relation_manager.h"
-#include"ast_pp.h"
-#include"trace.h"
+#include "muz/rel/dl_mk_simple_joins.h"
+#include "muz/rel/dl_relation_manager.h"
+#include "ast/ast_pp.h"
+#include "util/trace.h"
 
 
 namespace datalog {

src/muz/rel/dl_mk_simple_joins.h

@@ -19,12 +19,12 @@ Revision History:
 #ifndef DL_MK_SIMPLE_JOINS_H_
 #define DL_MK_SIMPLE_JOINS_H_
 
-#include"map.h"
-#include"obj_pair_hashtable.h"
+#include "util/map.h"
+#include "util/obj_pair_hashtable.h"
 
-#include"dl_context.h"
-#include"dl_rule_set.h"
-#include"dl_rule_transformer.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_rule_set.h"
+#include "muz/base/dl_rule_transformer.h"
 
 namespace datalog {
 

src/muz/rel/dl_product_relation.cpp

@@ -42,11 +42,11 @@ Notes:
 --*/
 
 
-#include "dl_sieve_relation.h"
-#include "dl_table_relation.h"
-#include "dl_product_relation.h"
-#include "bool_rewriter.h"
-#include "ast_pp.h"
+#include "muz/rel/dl_sieve_relation.h"
+#include "muz/rel/dl_table_relation.h"
+#include "muz/rel/dl_product_relation.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/ast_pp.h"
 
 namespace datalog {
 

src/muz/rel/dl_product_relation.h

@@ -20,8 +20,8 @@ Revision History:
 #define DL_PRODUCT_RELATION_H_
 
 
-#include "dl_context.h"
-#include "dl_relation_manager.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/dl_relation_manager.h"
 
 namespace datalog {
 

src/muz/rel/dl_relation_manager.cpp

@@ -19,14 +19,14 @@ Revision History:
 
 
 #include <sstream>
-#include"ast_pp.h"
-#include"dl_check_table.h"
-#include"dl_context.h"
-#include"dl_finite_product_relation.h"
-#include"dl_product_relation.h"
-#include"dl_sieve_relation.h"
-#include"dl_table_relation.h"
-#include"dl_relation_manager.h"
+#include "ast/ast_pp.h"
+#include "muz/rel/dl_check_table.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/dl_finite_product_relation.h"
+#include "muz/rel/dl_product_relation.h"
+#include "muz/rel/dl_sieve_relation.h"
+#include "muz/rel/dl_table_relation.h"
+#include "muz/rel/dl_relation_manager.h"
 
 namespace datalog {
 

src/muz/rel/dl_relation_manager.h

@@ -20,9 +20,9 @@ Revision History:
 #define DL_RELATION_MANAGER_H_
 
 
-#include"map.h"
-#include"vector.h"
-#include"dl_base.h"
+#include "util/map.h"
+#include "util/vector.h"
+#include "muz/rel/dl_base.h"
 
 namespace datalog {
 

src/muz/rel/dl_sieve_relation.cpp

@@ -18,8 +18,8 @@ Revision History:
 --*/
 
 #include <sstream>
-#include"ast_pp.h"
-#include"dl_sieve_relation.h"
+#include "ast/ast_pp.h"
+#include "muz/rel/dl_sieve_relation.h"
 
 namespace datalog {
 

src/muz/rel/dl_sieve_relation.h

@@ -20,8 +20,8 @@ Revision History:
 #ifndef DL_SIEVE_RELATION_H_
 #define DL_SIEVE_RELATION_H_
 
-#include "dl_context.h"
-#include "dl_relation_manager.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/dl_relation_manager.h"
 
 namespace datalog {
 

src/muz/rel/dl_sparse_table.cpp

@@ -18,9 +18,9 @@ Revision History:
 --*/
 
 #include<utility>
-#include"dl_context.h"
-#include"dl_util.h"
-#include"dl_sparse_table.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_util.h"
+#include "muz/rel/dl_sparse_table.h"
 
 namespace datalog {
 

src/muz/rel/dl_sparse_table.h

@@ -24,15 +24,15 @@ Revision History:
 #include<list>
 #include<utility>
 
-#include "ast.h"
-#include "bit_vector.h"
-#include "buffer.h"
-#include "hashtable.h"
-#include "map.h"
-#include "ref_vector.h"
-#include "vector.h"
+#include "ast/ast.h"
+#include "util/bit_vector.h"
+#include "util/buffer.h"
+#include "util/hashtable.h"
+#include "util/map.h"
+#include "util/ref_vector.h"
+#include "util/vector.h"
 
-#include "dl_base.h"
+#include "muz/rel/dl_base.h"
 
 
 namespace datalog {

src/muz/rel/dl_table.cpp

@@ -17,10 +17,10 @@ Revision History:
 
 --*/
 
-#include"dl_context.h"
-#include"dl_util.h"
-#include"dl_table.h"
-#include"dl_relation_manager.h"
+#include "muz/base/dl_context.h"
+#include "muz/base/dl_util.h"
+#include "muz/rel/dl_table.h"
+#include "muz/rel/dl_relation_manager.h"
 
 namespace datalog {
 

src/muz/rel/dl_table.h

@@ -23,17 +23,17 @@ Revision History:
 #include<list>
 #include<utility>
 
-#include "ast.h"
-#include "bit_vector.h"
-#include "buffer.h"
-#include "hashtable.h"
-#include "map.h"
-#include "ref_vector.h"
-#include "vector.h"
-#include "union_find.h"
-#include "dl_base.h"
-#include "dl_util.h"
-#include "bit_vector.h"
+#include "ast/ast.h"
+#include "util/bit_vector.h"
+#include "util/buffer.h"
+#include "util/hashtable.h"
+#include "util/map.h"
+#include "util/ref_vector.h"
+#include "util/vector.h"
+#include "util/union_find.h"
+#include "muz/rel/dl_base.h"
+#include "muz/base/dl_util.h"
+#include "util/bit_vector.h"
 
 
 namespace datalog {

src/muz/rel/dl_table_plugin.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef DL_TABLE_PLUGIN_H_
 #define DL_TABLE_PLUGIN_H_
 
-#include"ast.h"
-#include"map.h"
-#include"vector.h"
+#include "ast/ast.h"
+#include "util/map.h"
+#include "util/vector.h"
 
 #include"dl_table_ops.h"
 

src/muz/rel/dl_table_relation.cpp

@@ -19,9 +19,9 @@ Revision History:
 
 
 #include<string>
-#include"dl_context.h"
-#include"dl_relation_manager.h"
-#include"dl_table_relation.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/dl_relation_manager.h"
+#include "muz/rel/dl_table_relation.h"
 
 
 namespace datalog {

src/muz/rel/dl_table_relation.h

@@ -20,8 +20,8 @@ Revision History:
 #define DL_TABLE_RELATION_H_
 
 
-#include "dl_base.h"
-#include "dl_util.h"
+#include "muz/rel/dl_base.h"
+#include "muz/base/dl_util.h"
 
 namespace datalog {
 

src/muz/rel/dl_vector_relation.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef DL_VECTOR_RELATION_H_
 #define DL_VECTOR_RELATION_H_
 
-#include "ast_pp.h"
-#include "dl_context.h"
-#include "union_find.h"
+#include "ast/ast_pp.h"
+#include "muz/base/dl_context.h"
+#include "util/union_find.h"
 
 namespace datalog {
    

src/muz/rel/doc.cpp

@@ -20,12 +20,12 @@ Revision History:
 
 --*/
 
-#include "doc.h"
-#include "smt_kernel.h"
-#include "expr_safe_replace.h"
-#include "smt_params.h"
-#include "ast_util.h"
-#include "ast_pp.h"
+#include "muz/rel/doc.h"
+#include "smt/smt_kernel.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "smt/params/smt_params.h"
+#include "ast/ast_util.h"
+#include "ast/ast_pp.h"
 
 doc_manager::doc_manager(unsigned n): m(n), m_alloc("doc") {
     m_full = m.allocateX();

src/muz/rel/doc.h

@@ -23,9 +23,9 @@ Revision History:
 #ifndef DOC_H_
 #define DOC_H_
 
-#include "tbv.h"
-#include "union_find.h"
-#include "buffer.h"
+#include "muz/rel/tbv.h"
+#include "util/union_find.h"
+#include "util/buffer.h"
 
 
 class doc;

src/muz/rel/karr_relation.cpp

@@ -4,9 +4,9 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "karr_relation.h"
-#include "bool_rewriter.h"
-#include "ast_util.h"
+#include "muz/rel/karr_relation.h"
+#include "ast/rewriter/bool_rewriter.h"
+#include "ast/ast_util.h"
 
 namespace datalog {
     class karr_relation : public relation_base {              

src/muz/rel/karr_relation.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef KARR_RELATION_H_
 #define KARR_RELATION_H_
 
-#include"dl_mk_karr_invariants.h"
-#include"dl_relation_manager.h"
+#include "muz/transforms/dl_mk_karr_invariants.h"
+#include "muz/rel/dl_relation_manager.h"
 
 namespace datalog {
 

src/muz/rel/rel_context.cpp

@@ -20,36 +20,36 @@ Revision History:
 --*/
 
 
-#include"rel_context.h"
-#include"stopwatch.h"
-#include"dl_context.h"
-#include"dl_compiler.h"
-#include"dl_instruction.h"
-#include"dl_mk_explanations.h"
-#include"dl_mk_magic_sets.h"
-#include"dl_product_relation.h"
-#include"dl_bound_relation.h"
-#include"dl_interval_relation.h"
-#include"karr_relation.h"
-#include"dl_finite_product_relation.h"
-#include"udoc_relation.h"
-#include"check_relation.h"
-#include"dl_lazy_table.h"
-#include"dl_sparse_table.h"
-#include"dl_table.h"
-#include"dl_table_relation.h"
-#include"aig_exporter.h"
-#include"dl_mk_simple_joins.h"
-#include"dl_mk_similarity_compressor.h"
-#include"dl_mk_unbound_compressor.h"
-#include"dl_mk_subsumption_checker.h"
-#include"dl_mk_coi_filter.h"
-#include"dl_mk_filter_rules.h"
-#include"dl_mk_rule_inliner.h"
-#include"dl_mk_interp_tail_simplifier.h"
-#include"dl_mk_bit_blast.h"
-#include"dl_mk_separate_negated_tails.h"
-#include"ast_util.h"
+#include "muz/rel/rel_context.h"
+#include "util/stopwatch.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/dl_compiler.h"
+#include "muz/rel/dl_instruction.h"
+#include "muz/rel/dl_mk_explanations.h"
+#include "muz/transforms/dl_mk_magic_sets.h"
+#include "muz/rel/dl_product_relation.h"
+#include "muz/rel/dl_bound_relation.h"
+#include "muz/rel/dl_interval_relation.h"
+#include "muz/rel/karr_relation.h"
+#include "muz/rel/dl_finite_product_relation.h"
+#include "muz/rel/udoc_relation.h"
+#include "muz/rel/check_relation.h"
+#include "muz/rel/dl_lazy_table.h"
+#include "muz/rel/dl_sparse_table.h"
+#include "muz/rel/dl_table.h"
+#include "muz/rel/dl_table_relation.h"
+#include "muz/rel/aig_exporter.h"
+#include "muz/rel/dl_mk_simple_joins.h"
+#include "muz/rel/dl_mk_similarity_compressor.h"
+#include "muz/transforms/dl_mk_unbound_compressor.h"
+#include "muz/transforms/dl_mk_subsumption_checker.h"
+#include "muz/transforms/dl_mk_coi_filter.h"
+#include "muz/transforms/dl_mk_filter_rules.h"
+#include "muz/transforms/dl_mk_rule_inliner.h"
+#include "muz/transforms/dl_mk_interp_tail_simplifier.h"
+#include "muz/transforms/dl_mk_bit_blast.h"
+#include "muz/transforms/dl_mk_separate_negated_tails.h"
+#include "ast/ast_util.h"
 
 
 namespace datalog {

src/muz/rel/rel_context.h

@@ -20,12 +20,12 @@ Revision History:
 --*/
 #ifndef REL_CONTEXT_H_
 #define REL_CONTEXT_H_
-#include "ast.h"
-#include "dl_relation_manager.h"
-#include "dl_instruction.h"
-#include "dl_engine_base.h"
-#include "dl_context.h"
-#include "lbool.h"
+#include "ast/ast.h"
+#include "muz/rel/dl_relation_manager.h"
+#include "muz/rel/dl_instruction.h"
+#include "muz/base/dl_engine_base.h"
+#include "muz/base/dl_context.h"
+#include "util/lbool.h"
 
 namespace datalog {
 

src/muz/rel/tbv.cpp

@@ -18,9 +18,9 @@ Revision History:
 
 --*/
 
-#include "tbv.h"
-#include "hashtable.h"
-#include "ast_util.h"
+#include "muz/rel/tbv.h"
+#include "util/hashtable.h"
+#include "ast/ast_util.h"
 
 
 static bool s_debug_alloc = false;

src/muz/rel/tbv.h

@@ -21,9 +21,9 @@ Revision History:
 #ifndef TBV_H_
 #define TBV_H_
 
-#include "fixed_bit_vector.h"
-#include "rational.h"
-#include "ast.h"
+#include "util/fixed_bit_vector.h"
+#include "util/rational.h"
+#include "ast/ast.h"
 
 class tbv;
 

src/muz/rel/udoc_relation.cpp

@@ -21,10 +21,10 @@ Revision History:
 Notes:
 
 --*/
-#include "udoc_relation.h"
-#include "dl_relation_manager.h"
-#include "ast_util.h"
-#include "smt_kernel.h"
+#include "muz/rel/udoc_relation.h"
+#include "muz/rel/dl_relation_manager.h"
+#include "ast/ast_util.h"
+#include "smt/smt_kernel.h"
 
 
 namespace datalog {

src/muz/rel/udoc_relation.h

@@ -22,8 +22,8 @@ Revision History:
 #ifndef UDOC_RELATION_H_
 #define UDOC_RELATION_H_
 
-#include "doc.h"
-#include "dl_base.h"
+#include "muz/rel/doc.h"
+#include "muz/rel/dl_base.h"
 
 namespace datalog {
     class udoc_plugin;