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

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

src/util/approx_nat.cpp

@@ -17,7 +17,7 @@ Author:
 Notes:
 
 --*/
-#include"approx_nat.h"
+#include "util/approx_nat.h"
 
 approx_nat::approx_nat(unsigned val) {
     m_value = val > m_limit ? UINT_MAX : val;

src/util/approx_set.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 
-#include"approx_set.h"
+#include "util/approx_set.h"
 
 void approx_set::display(std::ostream & out) const {
     out << "{";

src/util/approx_set.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef APPROX_SET_H_
 #define APPROX_SET_H_
 #include<iostream>
-#include"debug.h"
+#include "util/debug.h"
 
 template<typename T> class approx_set_traits;
 

src/util/array_map.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef ARRAY_MAP_H_
 #define ARRAY_MAP_H_
 
-#include"vector.h"
-#include"optional.h"
+#include "util/vector.h"
+#include "util/optional.h"
 
 /**
    \brief Implements a mapping from Key to Data.

src/util/backtrackable_set.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef BACKTRACKABLE_SET_H_
 #define BACKTRACKABLE_SET_H_
 
-#include"vector.h"
+#include "util/vector.h"
 
 template<typename T>
 struct default_eh {

src/util/bit_util.cpp

@@ -16,9 +16,9 @@ Author:
 Revision History:
 
 --*/
-#include"bit_util.h"
-#include"util.h"
-#include"debug.h"
+#include "util/bit_util.h"
+#include "util/util.h"
+#include "util/debug.h"
 #include <cstring>
 
 /**

src/util/bit_vector.cpp

@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 #include<limits.h>
-#include"bit_vector.h"
-#include"trace.h"
+#include "util/bit_vector.h"
+#include "util/trace.h"
 
 #define DEFAULT_CAPACITY 2
 

src/util/bit_vector.h

@@ -20,9 +20,9 @@ Revision History:
 #define BIT_VECTOR_H_
 
 #include<string.h>
-#include"debug.h"
-#include"vector.h"
-#include"memory_manager.h"
+#include "util/debug.h"
+#include "util/vector.h"
+#include "util/memory_manager.h"
 
 COMPILE_TIME_ASSERT(sizeof(unsigned) == 4);
 #define BV_DEFAULT_CAPACITY 2

src/util/buffer.h

@@ -20,7 +20,7 @@ Revision History:
 #define BUFFER_H_
 
 #include<string.h>
-#include"memory_manager.h"
+#include "util/memory_manager.h"
 
 template<typename T, bool CallDestructors=true, unsigned INITIAL_SIZE=16>
 class buffer {

src/util/cancel_eh.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef CANCEL_EH_H_
 #define CANCEL_EH_H_
 
-#include"event_handler.h"
+#include "util/event_handler.h"
 
 /**
    \brief Generic event handler for invoking cancel method.

src/util/chashtable.h

@@ -28,11 +28,11 @@ Revision History:
 #ifndef CHASHTABLE_H_
 #define CHASHTABLE_H_
 
-#include"memory_manager.h"
-#include"debug.h"
-#include"trace.h"
+#include "util/memory_manager.h"
+#include "util/debug.h"
+#include "util/trace.h"
 #ifdef Z3DEBUG
-#include"hashtable.h"
+#include "util/hashtable.h"
 #endif
 
 #define CH_STATISTICS

src/util/checked_int64.h

@@ -24,8 +24,8 @@ Revision History:
 #ifndef CHECKED_INT64_H_
 #define CHECKED_INT64_H_
 
-#include"z3_exception.h"
-#include"rational.h"
+#include "util/z3_exception.h"
+#include "util/rational.h"
 
 template<bool CHECK>
 class checked_int64 {

src/util/cmd_context_types.cpp

@@ -15,7 +15,7 @@ Notes:
 
 --*/
 #include<iostream>
-#include"cmd_context_types.h"
+#include "util/cmd_context_types.h"
 
 std::ostream & operator<<(std::ostream & out, cmd_arg_kind k) {
     switch (k) {

src/util/cmd_context_types.h

@@ -17,8 +17,8 @@ Notes:
 #ifndef CMD_CONTEXT_TYPES_H_
 #define CMD_CONTEXT_TYPES_H_
 
-#include"symbol.h"
-#include"z3_exception.h"
+#include "util/symbol.h"
+#include "util/z3_exception.h"
 #include<sstream>
 class rational;
 class expr;

src/util/common_msgs.cpp

@@ -16,7 +16,7 @@ Author:
 Notes:
 
 --*/
-#include"common_msgs.h"
+#include "util/common_msgs.h"
 
 char const * common_msgs::g_canceled_msg   = "canceled";
 char const * common_msgs::g_max_memory_msg = "max. memory exceeded";

src/util/cooperate.cpp

@@ -16,10 +16,10 @@ Author:
 Notes:
 
 --*/
-#include"cooperate.h"
-#include"trace.h"
-#include"debug.h"
-#include"z3_omp.h"
+#include "util/cooperate.h"
+#include "util/trace.h"
+#include "util/debug.h"
+#include "util/z3_omp.h"
 
 struct cooperation_lock {
     omp_nest_lock_t  m_lock;

src/util/debug.cpp

@@ -21,8 +21,8 @@ Revision History:
 #include<unistd.h>
 #endif
 #include<iostream>
-#include"str_hashtable.h"
-#include"z3_exception.h"
+#include "util/str_hashtable.h"
+#include "util/z3_exception.h"
 
 static volatile bool g_enable_assertions = true;
 

src/util/debug.h

@@ -35,8 +35,8 @@ bool assertions_enabled();
 # define __has_builtin(x) 0
 #endif
 
-#include"error_codes.h"
-#include"warning.h"
+#include "util/error_codes.h"
+#include "util/warning.h"
 
 #ifdef Z3DEBUG
 #define DEBUG_CODE(CODE) { CODE } ((void) 0)

src/util/dependency.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef DEPENDENCY_H_
 #define DEPENDENCY_H_
 
-#include"vector.h"
-#include"region.h"
+#include "util/vector.h"
+#include "util/region.h"
 
 template<typename C>
 class dependency_manager {

src/util/dictionary.h

@@ -17,8 +17,8 @@ Notes:
 #ifndef DICTIONARY_H_
 #define DICTIONARY_H_
 
-#include"map.h"
-#include"symbol.h"
+#include "util/map.h"
+#include "util/symbol.h"
 
 template<typename T>
 class dictionary : public map<symbol, T, symbol_hash_proc, symbol_eq_proc> {

src/util/double_manager.h

@@ -23,10 +23,10 @@ Revision History:
 #include<string>
 #include<sstream>
 #include<iomanip>
-#include"util.h"
-#include"debug.h"
-#include"hash.h"
-#include"params.h"
+#include "util/util.h"
+#include "util/debug.h"
+#include "util/hash.h"
+#include "util/params.h"
 
 /**
    \brief Create an interface for manipulating double numbers compatible with the one for mpq.

src/util/env_params.cpp

@@ -16,11 +16,11 @@ Author:
 Notes:
 
 --*/
-#include"env_params.h"
-#include"params.h"
-#include"gparams.h"
-#include"util.h"
-#include"memory_manager.h"
+#include "util/env_params.h"
+#include "util/params.h"
+#include "util/gparams.h"
+#include "util/util.h"
+#include "util/memory_manager.h"
 
 void env_params::updt_params() {
     params_ref p = gparams::get();

src/util/ext_numeral.h

@@ -21,7 +21,7 @@ Revision History:
 #define EXT_NUMERAL_H_
 
 #include<iostream>
-#include"debug.h"
+#include "util/debug.h"
     
 enum ext_numeral_kind { EN_MINUS_INFINITY, EN_NUMERAL, EN_PLUS_INFINITY };
 

src/util/f2n.h

@@ -20,7 +20,7 @@ Revision History:
 #ifndef F2N_H_
 #define F2N_H_
 
-#include"mpf.h"
+#include "util/mpf.h"
 
 template<typename fmanager>
 class f2n {

src/util/fixed_bit_vector.cpp

@@ -20,9 +20,9 @@ Revision History:
 --*/
 
 #include<limits.h>
-#include"fixed_bit_vector.h"
-#include"trace.h"
-#include"hash.h"
+#include "util/fixed_bit_vector.h"
+#include "util/trace.h"
+#include "util/hash.h"
 
 void fixed_bit_vector::set(fixed_bit_vector const& other, unsigned hi, unsigned lo) {
     if ((lo % 32) == 0) {

src/util/fixed_bit_vector.h

@@ -22,8 +22,8 @@ Revision History:
 #define FIXED_BIT_VECTOR_H_
 
 #include<string.h>
-#include"debug.h"
-#include"small_object_allocator.h"
+#include "util/debug.h"
+#include "util/small_object_allocator.h"
 
 class fixed_bit_vector {
     friend class fixed_bit_vector_manager;

src/util/gparams.cpp

@@ -16,9 +16,9 @@ Author:
 Notes:
 
 --*/
-#include"gparams.h"
-#include"dictionary.h"
-#include"trace.h"
+#include "util/gparams.h"
+#include "util/dictionary.h"
+#include "util/trace.h"
 
 extern void gparams_register_modules();
 

src/util/gparams.h

@@ -19,7 +19,7 @@ Notes:
 #ifndef GPARAMS_H_
 #define GPARAMS_H_
 
-#include"params.h"
+#include "util/params.h"
 
 class gparams {
     struct imp;

src/util/hash.cpp

@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#include"debug.h"
-#include"hash.h"
+#include "util/debug.h"
+#include "util/hash.h"
 #include <string.h>
 
 static unsigned read_unsigned(const char *s) {

src/util/hash.h

@@ -20,7 +20,7 @@ Revision History:
 #define HASH_H_
 
 #include<algorithm>
-#include"util.h"
+#include "util/util.h"
 
 #define mix(a,b,c)              \
 {                               \

src/util/hashtable.h

@@ -18,12 +18,12 @@ Revision History:
 --*/
 #ifndef HASHTABLE_H_
 #define HASHTABLE_H_
-#include"debug.h"
+#include "util/debug.h"
 #include<ostream>
-#include"util.h"
+#include "util/util.h"
 #include<limits.h>
-#include"memory_manager.h"
-#include"hash.h"
+#include "util/memory_manager.h"
+#include "util/hash.h"
 
 #define DEFAULT_HASHTABLE_INITIAL_CAPACITY 8
 #define SMALL_TABLE_CAPACITY               64

src/util/heap.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef HEAP_H_
 #define HEAP_H_
 
-#include"vector.h"
-#include"debug.h"
+#include "util/vector.h"
+#include "util/debug.h"
 
 template<typename LT>
 class heap : private LT {

src/util/hwf.cpp

@@ -34,7 +34,7 @@ Revision History:
 #define USE_INTRINSICS
 #endif
 
-#include"hwf.h"
+#include "util/hwf.h"
 
 // Note:
 // Which FPU will be used is determined by compiler settings. On x64 it's always SSE2,

src/util/hwf.h

@@ -20,9 +20,9 @@ Revision History:
 #define HWF_H_
 
 #include<string>
-#include"mpz.h"
-#include"mpq.h"
-#include"mpf.h" // we use the same rounding modes as mpf's
+#include "util/mpz.h"
+#include "util/mpq.h"
+#include "util/mpf.h"
 
 class hwf {
     friend class hwf_manager;

src/util/id_gen.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef ID_GEN_H_
 #define ID_GEN_H_
 
-#include"vector.h"
-#include"util.h"
+#include "util/vector.h"
+#include "util/util.h"
 
 class id_gen {
     unsigned        m_next_id;

src/util/inf_eps_rational.h

@@ -20,10 +20,10 @@ Revision History:
 #define INF_EPS_RATIONAL_H_
 #include<stdlib.h>
 #include<string>
-#include"debug.h"
-#include"vector.h"
-#include"rational.h"
-#include"inf_rational.h"
+#include "util/debug.h"
+#include "util/vector.h"
+#include "util/rational.h"
+#include "util/inf_rational.h"
 
 template<typename Numeral>
 class inf_eps_rational {

src/util/inf_int_rational.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 #include<sstream>
-#include"inf_int_rational.h"
+#include "util/inf_int_rational.h"
 
 inf_int_rational inf_int_rational::m_zero;
 inf_int_rational inf_int_rational::m_one;

src/util/inf_int_rational.h

@@ -21,9 +21,9 @@ Revision History:
 #define INF_INT_RATIONAL_H_
 #include<stdlib.h>
 #include<string>
-#include"debug.h"
-#include"vector.h"
-#include"rational.h"
+#include "util/debug.h"
+#include "util/vector.h"
+#include "util/rational.h"
 
 
 class inf_int_rational {

src/util/inf_rational.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"inf_rational.h"
+#include "util/inf_rational.h"
 
 inf_rational inf_rational::m_zero;
 inf_rational inf_rational::m_one;

src/util/inf_rational.h

@@ -21,9 +21,9 @@ Revision History:
 #define INF_RATIONAL_H_
 #include<stdlib.h>
 #include<string>
-#include"debug.h"
-#include"vector.h"
-#include"rational.h"
+#include "util/debug.h"
+#include "util/vector.h"
+#include "util/rational.h"
 
 
 class inf_rational {

src/util/inf_s_integer.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 
-#include"inf_s_integer.h"
+#include "util/inf_s_integer.h"
 
 inf_s_integer inf_s_integer::m_zero(0);
 inf_s_integer inf_s_integer::m_one(1);

src/util/inf_s_integer.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef INF_S_INTEGER_H_
 #define INF_S_INTEGER_H_
 
-#include"s_integer.h"
-#include"rational.h"
+#include "util/s_integer.h"
+#include "util/rational.h"
 
 class inf_s_integer {
     static inf_s_integer m_zero;

src/util/lbool.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"lbool.h"
+#include "util/lbool.h"
 
 std::ostream & operator<<(std::ostream & out, lbool b) {
     switch(b) {

src/util/lbool.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef LBOOL_H_
 #define LBOOL_H_
 
-#include"util.h"
+#include "util/util.h"
 
 typedef enum { l_false = -1, l_undef, l_true } lbool;
 

src/util/list.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef LIST_H_
 #define LIST_H_
 
-#include"buffer.h"
-#include"region.h"
+#include "util/buffer.h"
+#include "util/region.h"
 
 template<typename T>
 class list {

src/util/lp/bound_analyzer_on_row.h

@@ -5,8 +5,8 @@
 #pragma once
 #include "util/vector.h"
 #include "util/lp/linear_combination_iterator.h"
-#include "implied_bound.h"
-#include "test_bound_analyzer.h"
+#include "util/lp/implied_bound.h"
+#include "util/lp/test_bound_analyzer.h"
 #include <functional>
 #include "util/lp/bound_propagator.h"
 // We have an equality : sum by j of row[j]*x[j] = rs

src/util/map.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef MAP_H_
 #define MAP_H_
 
-#include"hashtable.h"
+#include "util/hashtable.h"
 
 template<typename Key, typename Value>
 struct _key_data {

src/util/max_cliques.h

@@ -18,8 +18,8 @@ Notes:
 
 --*/
 
-#include "vector.h"
-#include "uint_set.h"
+#include "util/vector.h"
+#include "util/uint_set.h"
 
 
 template<class T>

src/util/memory_manager.cpp

@@ -7,10 +7,10 @@ Copyright (c) 2015 Microsoft Corporation
 #include<iostream>
 #include<stdlib.h>
 #include<limits.h>
-#include"trace.h"
-#include"memory_manager.h"
-#include"error_codes.h"
-#include"z3_omp.h"
+#include "util/trace.h"
+#include "util/memory_manager.h"
+#include "util/error_codes.h"
+#include "util/z3_omp.h"
 // The following two function are automatically generated by the mk_make.py script.
 // The script collects ADD_INITIALIZER and ADD_FINALIZER commands in the .h files.
 // For example, rational.h contains

src/util/memory_manager.h

@@ -21,7 +21,7 @@ Revision History:
 
 #include<cstdlib>
 #include<ostream>
-#include"z3_exception.h"
+#include "util/z3_exception.h"
 
 #ifndef __has_builtin
 # define __has_builtin(x) 0

src/util/mpbq.cpp

@@ -25,7 +25,7 @@ Revision History:
 
 --*/
 #include<sstream>
-#include"mpbq.h"
+#include "util/mpbq.h"
 
 #ifdef Z3DEBUG
 #define MPBQ_DEBUG

src/util/mpbq.h

@@ -27,9 +27,9 @@ Revision History:
 #ifndef MPBQ_H_
 #define MPBQ_H_
 
-#include"mpq.h"
-#include"rational.h"
-#include"vector.h"
+#include "util/mpq.h"
+#include "util/rational.h"
+#include "util/vector.h"
 
 class mpbq {
     mpz      m_num;

src/util/mpbqi.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef MPBQI_H_
 #define MPBQI_H_
 
-#include"mpbq.h"
-#include"basic_interval.h"
+#include "util/mpbq.h"
+#include "util/basic_interval.h"
 
 class mpbqi_manager : public basic_interval_manager<mpbq_manager, false> {
     typedef basic_interval_manager<mpbq_manager, false> super;

src/util/mpf.cpp

@@ -18,7 +18,7 @@ Revision History:
 --*/
 #include<sstream>
 #include<iomanip>
-#include"mpf.h"
+#include "util/mpf.h"
 
 mpf::mpf() :
     ebits(0),

src/util/mpf.h

@@ -20,12 +20,12 @@ Revision History:
 #define MPF_H_
 
 #include<string>
-#include"mpz.h"
-#include"mpq.h"
-#include"map.h"
-#include"scoped_numeral.h"
-#include"scoped_numeral_vector.h"
-#include"hash.h"
+#include "util/mpz.h"
+#include "util/mpq.h"
+#include "util/map.h"
+#include "util/scoped_numeral.h"
+#include "util/scoped_numeral_vector.h"
+#include "util/hash.h"
 
 typedef enum {
     MPF_ROUND_NEAREST_TEVEN,

src/util/mpff.cpp

@@ -20,12 +20,12 @@ Revision History:
 --*/
 #include<sstream>
 #include<iomanip>
-#include"mpff.h"
-#include"mpn.h"
-#include"mpz.h"
-#include"mpq.h"
-#include"bit_util.h"
-#include"trace.h"
+#include "util/mpff.h"
+#include "util/mpn.h"
+#include "util/mpz.h"
+#include "util/mpq.h"
+#include "util/bit_util.h"
+#include "util/trace.h"
 
 COMPILE_TIME_ASSERT(sizeof(mpn_digit) == sizeof(unsigned));
 COMPILE_TIME_ASSERT(sizeof(unsigned)  == 4);

src/util/mpff.h

@@ -23,13 +23,13 @@ Revision History:
 #ifndef MPFF_H_
 #define MPFF_H_
 
-#include"id_gen.h"
-#include"util.h"
-#include"vector.h"
-#include"z3_exception.h"
-#include"scoped_numeral.h"
-#include"scoped_numeral_vector.h"
-#include"mpn.h"
+#include "util/id_gen.h"
+#include "util/util.h"
+#include "util/vector.h"
+#include "util/z3_exception.h"
+#include "util/scoped_numeral.h"
+#include "util/scoped_numeral_vector.h"
+#include "util/mpn.h"
 
 class mpff_manager;
 

src/util/mpfx.cpp

@@ -18,12 +18,12 @@ Revision History:
 --*/
 #include<sstream>
 #include<iomanip>
-#include"mpfx.h"
-#include"mpn.h"
-#include"mpz.h"
-#include"mpq.h"
-#include"bit_util.h"
-#include"trace.h"
+#include "util/mpfx.h"
+#include "util/mpn.h"
+#include "util/mpz.h"
+#include "util/mpq.h"
+#include "util/bit_util.h"
+#include "util/trace.h"
 
 mpfx_manager::mpfx_manager(unsigned int_sz, unsigned frac_sz, unsigned initial_capacity) {
     SASSERT(initial_capacity > 0);

src/util/mpfx.h

@@ -19,13 +19,13 @@ Revision History:
 #ifndef MPFX_H_
 #define MPFX_H_
 
-#include"id_gen.h"
-#include"util.h"
-#include"vector.h"
-#include"z3_exception.h"
-#include"scoped_numeral.h"
-#include"scoped_numeral_vector.h"
-#include"mpn.h"
+#include "util/id_gen.h"
+#include "util/util.h"
+#include "util/vector.h"
+#include "util/z3_exception.h"
+#include "util/scoped_numeral.h"
+#include "util/scoped_numeral_vector.h"
+#include "util/mpn.h"
 
 class mpfx_manager;
 

src/util/mpn.cpp

@@ -16,10 +16,10 @@ Author:
 Revision History:
 
 --*/
-#include"debug.h"
-#include"trace.h"
-#include"buffer.h"
-#include"mpn.h"
+#include "util/debug.h"
+#include "util/trace.h"
+#include "util/buffer.h"
+#include "util/mpn.h"
 
 #define max(a,b)    (((a) > (b)) ? (a) : (b))
 

src/util/mpn.h

@@ -20,9 +20,9 @@ Revision History:
 #define MPN_H_
 
 #include<ostream>
-#include"util.h"
-#include"buffer.h"
-#include"z3_omp.h"
+#include "util/util.h"
+#include "util/buffer.h"
+#include "util/z3_omp.h"
 
 typedef unsigned int mpn_digit;
 

src/util/mpq.cpp

@@ -16,9 +16,9 @@ Author:
 Revision History:
 
 --*/
-#include"mpq.h"
-#include"warning.h"
-#include"z3_exception.h"
+#include "util/mpq.h"
+#include "util/warning.h"
+#include "util/z3_exception.h"
 
 template<bool SYNCH>
 mpq_manager<SYNCH>::mpq_manager() {

src/util/mpq.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef MPQ_H_
 #define MPQ_H_
 
-#include"mpz.h"
-#include"trace.h"
+#include "util/mpz.h"
+#include "util/trace.h"
 
 class mpq {
     mpz m_num;

src/util/mpq_inf.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"mpq_inf.h"
+#include "util/mpq_inf.h"
 
 template<bool SYNCH>
 std::string mpq_inf_manager<SYNCH>::to_string(mpq_inf const & a) {

src/util/mpq_inf.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef MPQ_INF_H_
 #define MPQ_INF_H_
 
-#include"mpq.h"
-#include"hash.h"
+#include "util/mpq.h"
+#include "util/hash.h"
 
 typedef std::pair<mpq, mpq> mpq_inf;
 

src/util/mpz.cpp

@@ -17,14 +17,14 @@ Revision History:
 
 --*/
 #include<sstream>
-#include"mpz.h"
-#include"buffer.h"
-#include"trace.h"
-#include"hash.h"
-#include"bit_util.h"
+#include "util/mpz.h"
+#include "util/buffer.h"
+#include "util/trace.h"
+#include "util/hash.h"
+#include "util/bit_util.h"
 
 #if defined(_MP_INTERNAL)
-#include"mpn.h"
+#include "util/mpn.h"
 #elif defined(_MP_GMP)
 #include<gmp.h>
 #else

src/util/mpz.h

@@ -21,13 +21,13 @@ Revision History:
 
 #include<limits.h>
 #include<string>
-#include"util.h"
-#include"small_object_allocator.h"
-#include"trace.h"
-#include"scoped_numeral.h"
-#include"scoped_numeral_vector.h"
-#include"z3_omp.h"
-#include"mpn.h"
+#include "util/util.h"
+#include "util/small_object_allocator.h"
+#include "util/trace.h"
+#include "util/scoped_numeral.h"
+#include "util/scoped_numeral_vector.h"
+#include "util/z3_omp.h"
+#include "util/mpn.h"
 
 unsigned u_gcd(unsigned u, unsigned v);
 uint64 u64_gcd(uint64 u, uint64 v);

src/util/mpzzp.h

@@ -26,7 +26,7 @@ Revision History:
 #ifndef MPZZP_H_
 #define MPZZP_H_
 
-#include "mpz.h"
+#include "util/mpz.h"
 
 class mpzzp_manager {
     typedef unsynch_mpz_manager numeral_manager;

src/util/nat_set.h

@@ -20,7 +20,7 @@ Revision History:
 #define NAT_SET_H_
 
 #include<limits.h>
-#include"vector.h"
+#include "util/vector.h"
 
 class nat_set {
     unsigned          m_curr_timestamp;

src/util/numeral_buffer.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef NUMERAL_BUFFER_H_
 #define NUMERAL_BUFFER_H_
 
-#include"vector.h"
+#include "util/vector.h"
 
 template<typename Numeral, typename NumeralManager>
 class numeral_buffer {

src/util/obj_hashtable.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef OBJ_HASHTABLE_H_
 #define OBJ_HASHTABLE_H_
 
-#include"hash.h"
-#include"hashtable.h"
+#include "util/hash.h"
+#include "util/hashtable.h"
 
 
 /**

src/util/obj_mark.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef OBJ_MARK_H_
 #define OBJ_MARK_H_
 
-#include"bit_vector.h"
+#include "util/bit_vector.h"
 
 template<typename T>
 struct default_t2uint {

src/util/obj_pair_hashtable.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef OBJ_PAIR_HASHTABLE_H_
 #define OBJ_PAIR_HASHTABLE_H_
 
-#include"hash.h"
-#include"hashtable.h"
+#include "util/hash.h"
+#include "util/hashtable.h"
 
 /**
    \brief Special entry for a hashtable of pairs of obj pointers (i.e.,

src/util/obj_pair_set.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef OBJ_PAIR_SET_H_
 #define OBJ_PAIR_SET_H_
 
-#include"chashtable.h"
+#include "util/chashtable.h"
 
 template<typename T1, typename T2>
 class obj_pair_set {

src/util/obj_triple_hashtable.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef OBJ_TRIPLE_HASHTABLE_H_
 #define OBJ_TRIPLE_HASHTABLE_H_
 
-#include"hashtable.h"
+#include "util/hashtable.h"
 
 /**
    \brief Special entry for a hashtable of pairs of obj pointers (i.e.,

src/util/object_allocator.h

@@ -20,8 +20,8 @@ Revision History:
 #ifndef OBJECT_ALLOCATOR_H_
 #define OBJECT_ALLOCATOR_H_
 
-#include"util.h"
-#include"vector.h"
+#include "util/util.h"
+#include "util/vector.h"
 
 #define DEFAULT_NUM_WORKERS 8
 #define NUM_OBJECTS_PER_PAGE 1024

src/util/page.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include"page.h"
-#include"debug.h"
+#include "util/page.h"
+#include "util/debug.h"
 
 inline void set_page_header(char * page, char * prev, bool default_page) {
     size_t header = reinterpret_cast<size_t>(prev) | static_cast<size_t>(default_page); 

src/util/page.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef PAGE_H_
 #define PAGE_H_
 
-#include"memory_manager.h"
+#include "util/memory_manager.h"
 
 #define PAGE_HEADER_SZ sizeof(size_t)
 #define DEFAULT_PAGE_SIZE (8192 - PAGE_HEADER_SZ)

src/util/params.cpp

@@ -16,10 +16,10 @@ Author:
 Notes:
 
 --*/
-#include"params.h"
-#include"rational.h"
-#include"symbol.h"
-#include"dictionary.h"
+#include "util/params.h"
+#include "util/rational.h"
+#include "util/symbol.h"
+#include "util/dictionary.h"
 
 params_ref params_ref::g_empty_params_ref;
 

src/util/params.h

@@ -19,8 +19,8 @@ Notes:
 #ifndef PARAMS_H_
 #define PARAMS_H_
 
-#include"cmd_context_types.h"
-#include"vector.h"
+#include "util/cmd_context_types.h"
+#include "util/vector.h"
 
 std::string norm_param_name(char const * n);
 std::string norm_param_name(symbol const & n);

src/util/parray.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef PARRAY_H_
 #define PARRAY_H_
 
-#include"vector.h"
-#include"trace.h"
+#include "util/vector.h"
+#include "util/trace.h"
 
 template<typename C>
 class parray_manager {

src/util/permutation.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"permutation.h"
+#include "util/permutation.h"
 
 permutation::permutation(unsigned size) {
     reset(size);

src/util/permutation.h

@@ -20,7 +20,7 @@ Revision History:
 #define PERMUTATION_H_
 
 #include<iostream>
-#include"vector.h"
+#include "util/vector.h"
 
 class permutation {
     unsigned_vector m_p;

src/util/plugin_manager.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef PLUGIN_MANAGER_H_
 #define PLUGIN_MANAGER_H_
 
-#include"util.h"
+#include "util/util.h"
 
 template<typename Plugin>
 class plugin_manager {

src/util/pool.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef POOL_H_
 #define POOL_H_
 
-#include"util.h"
-#include"vector.h"
+#include "util/util.h"
+#include "util/vector.h"
 
 template<typename T>
 class pool {

src/util/prime_generator.cpp

@@ -16,7 +16,7 @@ Author:
 Notes:
 
 --*/
-#include"prime_generator.h"
+#include "util/prime_generator.h"
 
 #define PRIME_LIST_MAX_SIZE 1<<20
 

src/util/prime_generator.h

@@ -19,9 +19,9 @@ Notes:
 #ifndef PRIME_GENERATOR_H_
 #define PRIME_GENERATOR_H_
 
-#include"vector.h"
-#include"z3_exception.h"
-#include"util.h"
+#include "util/vector.h"
+#include "util/z3_exception.h"
+#include "util/util.h"
 
 class prime_generator_exception : public default_exception {
 public:

src/util/ptr_scoped_buffer.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef PTR_SCOPED_BUFFER_H_
 #define PTR_SCOPED_BUFFER_H_
 
-#include"util.h"
-#include"debug.h"
-#include"buffer.h"
+#include "util/util.h"
+#include "util/debug.h"
+#include "util/buffer.h"
 
 template<typename T, unsigned INITIAL_SIZE=16, typename D = delete_proc<T> >
 class ptr_scoped_buffer : private ptr_buffer<T, INITIAL_SIZE> {

src/util/rational.cpp

@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 #include<sstream>
-#include"util.h"
-#include"rational.h"
+#include "util/util.h"
+#include "util/rational.h"
 #ifdef _WINDOWS
 #include<strsafe.h>
 #endif

src/util/rational.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef RATIONAL_H_
 #define RATIONAL_H_
 
-#include"mpq.h"
+#include "util/mpq.h"
 
 class rational {
     mpq   m_val;

src/util/ref_buffer.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef REF_BUFFER_H_
 #define REF_BUFFER_H_
 
-#include"buffer.h"
-#include"obj_ref.h"
-#include"ref_vector.h"
+#include "util/buffer.h"
+#include "util/obj_ref.h"
+#include "util/ref_vector.h"
 
 
 /**

src/util/ref_vector.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef REF_VECTOR_H_
 #define REF_VECTOR_H_
 
-#include"vector.h"
-#include"obj_ref.h"
+#include "util/vector.h"
+#include "util/obj_ref.h"
 
 /**
    \brief Vector of smart pointers.

src/util/region.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"region.h"
+#include "util/region.h"
 
 #ifdef Z3DEBUG
 
@@ -26,10 +26,10 @@ void region::display_mem_stats(std::ostream & out) const {
 
 #else
 
-#include"tptr.h"
-#include"debug.h"
-#include"memory_manager.h"
-#include"page.h"
+#include "util/tptr.h"
+#include "util/debug.h"
+#include "util/memory_manager.h"
+#include "util/page.h"
 
 inline void region::allocate_page() {
     m_curr_page     = allocate_default_page(m_curr_page, m_free_pages);

src/util/region.h

@@ -23,7 +23,7 @@ Revision History:
 
 #ifdef Z3DEBUG
 
-#include"vector.h"
+#include "util/vector.h"
 
 class region {
     ptr_vector<char> m_chuncks;

src/util/rlimit.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include "rlimit.h"
-#include "common_msgs.h"
+#include "util/rlimit.h"
+#include "util/common_msgs.h"
 
 reslimit::reslimit():
     m_cancel(0),

src/util/rlimit.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef RLIMIT_H_
 #define RLIMIT_H_
 
-#include "vector.h"
+#include "util/vector.h"
 
 class reslimit {
     volatile unsigned   m_cancel;

src/util/s_integer.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 
-#include"s_integer.h"
+#include "util/s_integer.h"
 
 s_integer s_integer::m_zero(0);
 s_integer s_integer::m_one(1);

src/util/s_integer.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef S_INTEGER_H_
 #define S_INTEGER_H_
 
-#include"rational.h"
+#include "util/rational.h"
 
 class s_integer {
     int m_val;

src/util/scoped_ctrl_c.cpp

@@ -18,7 +18,7 @@ Revision History:
 --*/
 #include<signal.h>
 #include<iostream>
-#include"scoped_ctrl_c.h"
+#include "util/scoped_ctrl_c.h"
 
 scoped_ctrl_c * scoped_ctrl_c::g_obj = 0;
 

src/util/scoped_ctrl_c.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef SCOPED_CTRL_C_H_
 #define SCOPED_CTRL_C_H_
 
-#include"event_handler.h"
-#include"util.h"
+#include "util/event_handler.h"
+#include "util/util.h"
 
 struct scoped_ctrl_c {
     event_handler & m_cancel_eh;