summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/api/cpp/cvc5_checks.h4
-rw-r--r--src/base/check.h6
-rw-r--r--src/base/configuration.h6
-rw-r--r--src/base/configuration_private.h6
-rw-r--r--src/base/exception.h6
-rw-r--r--src/base/listener.h6
-rw-r--r--src/base/map_util.h6
-rw-r--r--src/base/modal_exception.h6
-rw-r--r--src/base/output.h6
-rw-r--r--src/context/backtrackable.h6
-rw-r--r--src/context/cdhashmap.h6
-rw-r--r--src/context/cdhashmap_forward.h6
-rw-r--r--src/context/cdhashset.h6
-rw-r--r--src/context/cdhashset_forward.h6
-rw-r--r--src/context/cdinsert_hashmap_forward.h6
-rw-r--r--src/context/cdlist.h6
-rw-r--r--src/context/cdlist_forward.h6
-rw-r--r--src/context/cdo.h6
-rw-r--r--src/context/cdqueue.h6
-rw-r--r--src/context/cdtrail_queue.h6
-rw-r--r--src/context/context.h6
-rw-r--r--src/context/context_mm.h6
-rw-r--r--src/decision/decision_attributes.h6
-rw-r--r--src/decision/decision_engine.h6
-rw-r--r--src/decision/decision_strategy.h6
-rw-r--r--src/decision/justification_heuristic.h6
-rw-r--r--src/expr/array_store_all.h6
-rw-r--r--src/expr/ascription_type.h6
-rw-r--r--src/expr/attribute.h6
-rw-r--r--src/expr/attribute_internals.h6
-rw-r--r--src/expr/bound_var_manager.h6
-rw-r--r--src/expr/buffered_proof_generator.h6
-rw-r--r--src/expr/datatype_index.h6
-rw-r--r--src/expr/dtype.h4
-rw-r--r--src/expr/dtype_cons.h4
-rw-r--r--src/expr/dtype_selector.h4
-rw-r--r--src/expr/emptybag.h6
-rw-r--r--src/expr/emptyset.h6
-rw-r--r--src/expr/expr_iomanip.h6
-rw-r--r--src/expr/kind_map.h6
-rw-r--r--src/expr/kind_template.h6
-rw-r--r--src/expr/lazy_proof.h6
-rw-r--r--src/expr/lazy_proof_chain.h6
-rw-r--r--src/expr/match_trie.h6
-rw-r--r--src/expr/metakind_template.h10
-rw-r--r--src/expr/node.h6
-rw-r--r--src/expr/node_algorithm.h4
-rw-r--r--src/expr/node_builder.h6
-rw-r--r--src/expr/node_manager.h10
-rw-r--r--src/expr/node_self_iterator.h6
-rw-r--r--src/expr/node_traversal.h6
-rw-r--r--src/expr/node_trie.h6
-rw-r--r--src/expr/node_value.h6
-rw-r--r--src/expr/proof.h6
-rw-r--r--src/expr/proof_checker.h6
-rw-r--r--src/expr/proof_ensure_closed.h6
-rw-r--r--src/expr/proof_generator.h6
-rw-r--r--src/expr/proof_node.h6
-rw-r--r--src/expr/proof_node_algorithm.h6
-rw-r--r--src/expr/proof_node_manager.h6
-rw-r--r--src/expr/proof_node_to_sexpr.h6
-rw-r--r--src/expr/proof_node_updater.h4
-rw-r--r--src/expr/proof_rule.h6
-rw-r--r--src/expr/proof_set.h6
-rw-r--r--src/expr/proof_step_buffer.h6
-rw-r--r--src/expr/record.h6
-rw-r--r--src/expr/sequence.h6
-rw-r--r--src/expr/skolem_manager.h6
-rw-r--r--src/expr/subs.h6
-rw-r--r--src/expr/sygus_datatype.h4
-rw-r--r--src/expr/symbol_manager.h6
-rw-r--r--src/expr/symbol_table.h6
-rw-r--r--src/expr/tconv_seq_proof_generator.h6
-rw-r--r--src/expr/term_canonize.h6
-rw-r--r--src/expr/term_context.h6
-rw-r--r--src/expr/term_context_node.h6
-rw-r--r--src/expr/term_context_stack.h6
-rw-r--r--src/expr/term_conversion_proof_generator.h6
-rw-r--r--src/expr/type_checker.h6
-rw-r--r--src/expr/type_matcher.h6
-rw-r--r--src/expr/type_node.h6
-rw-r--r--src/expr/type_properties_template.h6
-rw-r--r--src/expr/uninterpreted_constant.h6
-rw-r--r--src/lib/clock_gettime.h6
-rw-r--r--src/lib/ffs.h6
-rw-r--r--src/lib/replacements.h6
-rw-r--r--src/lib/strtok_r.h6
-rw-r--r--src/main/command_executor.h6
-rw-r--r--src/main/interactive_shell.h6
-rw-r--r--src/main/main.h6
-rw-r--r--src/main/signal_handlers.h6
-rw-r--r--src/main/time_limit.h6
-rw-r--r--src/omt/bitvector_optimizer.h6
-rw-r--r--src/omt/integer_optimizer.h6
-rw-r--r--src/omt/omt_optimizer.h6
-rw-r--r--src/options/base_handlers.h6
-rw-r--r--src/options/decision_weight.h6
-rw-r--r--src/options/language.h6
-rw-r--r--src/options/module_template.h6
-rw-r--r--src/options/open_ostream.h6
-rw-r--r--src/options/option_exception.h6
-rw-r--r--src/options/options.h6
-rw-r--r--src/options/options_handler.h6
-rw-r--r--src/options/options_holder_template.h6
-rw-r--r--src/options/options_listener.h6
-rw-r--r--src/options/printer_modes.h6
-rw-r--r--src/options/set_language.h6
-rw-r--r--src/parser/antlr_input.h6
-rw-r--r--src/parser/antlr_line_buffered_input.h6
-rw-r--r--src/parser/antlr_tracing.h6
-rw-r--r--src/parser/bounded_token_buffer.h6
-rw-r--r--src/parser/bounded_token_factory.h6
-rw-r--r--src/parser/cvc/cvc.h6
-rw-r--r--src/parser/cvc/cvc_input.h6
-rw-r--r--src/parser/input.h6
-rw-r--r--src/parser/line_buffer.h6
-rw-r--r--src/parser/memory_mapped_input_buffer.h6
-rw-r--r--src/parser/parse_op.h6
-rw-r--r--src/parser/parser.h6
-rw-r--r--src/parser/parser_builder.h6
-rw-r--r--src/parser/parser_exception.h6
-rw-r--r--src/parser/smt2/smt2.h6
-rw-r--r--src/parser/smt2/smt2_input.h6
-rw-r--r--src/parser/smt2/sygus_input.h6
-rw-r--r--src/parser/tptp/tptp.h6
-rw-r--r--src/parser/tptp/tptp_input.h6
-rw-r--r--src/preprocessing/assertion_pipeline.h6
-rw-r--r--src/preprocessing/passes/ackermann.h6
-rw-r--r--src/preprocessing/passes/apply_substs.h4
-rw-r--r--src/preprocessing/passes/bool_to_bv.h6
-rw-r--r--src/preprocessing/passes/bv_abstraction.h6
-rw-r--r--src/preprocessing/passes/bv_eager_atoms.h6
-rw-r--r--src/preprocessing/passes/bv_gauss.h4
-rw-r--r--src/preprocessing/passes/bv_intro_pow2.h6
-rw-r--r--src/preprocessing/passes/bv_to_bool.h6
-rw-r--r--src/preprocessing/passes/bv_to_int.h6
-rw-r--r--src/preprocessing/passes/extended_rewriter_pass.h6
-rw-r--r--src/preprocessing/passes/foreign_theory_rewrite.h6
-rw-r--r--src/preprocessing/passes/fun_def_fmf.h6
-rw-r--r--src/preprocessing/passes/global_negate.h6
-rw-r--r--src/preprocessing/passes/ho_elim.h6
-rw-r--r--src/preprocessing/passes/int_to_bv.h6
-rw-r--r--src/preprocessing/passes/ite_removal.h6
-rw-r--r--src/preprocessing/passes/ite_simp.h4
-rw-r--r--src/preprocessing/passes/miplib_trick.h6
-rw-r--r--src/preprocessing/passes/nl_ext_purify.h6
-rw-r--r--src/preprocessing/passes/non_clausal_simp.h4
-rw-r--r--src/preprocessing/passes/pseudo_boolean_processor.h6
-rw-r--r--src/preprocessing/passes/quantifier_macros.h6
-rw-r--r--src/preprocessing/passes/quantifiers_preprocess.h6
-rw-r--r--src/preprocessing/passes/real_to_int.h6
-rw-r--r--src/preprocessing/passes/rewrite.h7
-rw-r--r--src/preprocessing/passes/sep_skolem_emp.h6
-rw-r--r--src/preprocessing/passes/sort_infer.h6
-rw-r--r--src/preprocessing/passes/static_learning.h6
-rw-r--r--src/preprocessing/passes/strings_eager_pp.h6
-rw-r--r--src/preprocessing/passes/sygus_inference.h6
-rw-r--r--src/preprocessing/passes/synth_rew_rules.h6
-rw-r--r--src/preprocessing/passes/theory_preprocess.h6
-rw-r--r--src/preprocessing/passes/theory_rewrite_eq.h6
-rw-r--r--src/preprocessing/passes/unconstrained_simplifier.h4
-rw-r--r--src/preprocessing/preprocessing_pass.h6
-rw-r--r--src/preprocessing/preprocessing_pass_context.h6
-rw-r--r--src/preprocessing/preprocessing_pass_registry.h6
-rw-r--r--src/preprocessing/util/ite_utilities.h4
-rw-r--r--src/printer/ast/ast_printer.h6
-rw-r--r--src/printer/cvc/cvc_printer.h6
-rw-r--r--src/printer/let_binding.h4
-rw-r--r--src/printer/printer.h6
-rw-r--r--src/printer/smt2/smt2_printer.h6
-rw-r--r--src/printer/tptp/tptp_printer.h6
-rw-r--r--src/proof/clause_id.h6
-rw-r--r--src/proof/cnf_proof.h6
-rw-r--r--src/proof/dot/dot_printer.h4
-rw-r--r--src/proof/proof_manager.h6
-rw-r--r--src/proof/sat_proof.h6
-rw-r--r--src/proof/sat_proof_implementation.h6
-rw-r--r--src/proof/unsat_core.h6
-rw-r--r--src/prop/bv_sat_solver_notify.h4
-rw-r--r--src/prop/cadical.h6
-rw-r--r--src/prop/cnf_stream.h6
-rw-r--r--src/prop/cryptominisat.h6
-rw-r--r--src/prop/kissat.h6
-rw-r--r--src/prop/proof_cnf_stream.h4
-rw-r--r--src/prop/proof_post_processor.h4
-rw-r--r--src/prop/prop_engine.h6
-rw-r--r--src/prop/prop_proof_manager.h6
-rw-r--r--src/prop/registrar.h6
-rw-r--r--src/prop/sat_proof_manager.h6
-rw-r--r--src/prop/sat_solver.h6
-rw-r--r--src/prop/sat_solver_factory.h6
-rw-r--r--src/prop/skolem_def_manager.h6
-rw-r--r--src/prop/theory_proxy.h6
-rw-r--r--src/smt/abduction_solver.h6
-rw-r--r--src/smt/abstract_values.h4
-rw-r--r--src/smt/assertions.h4
-rw-r--r--src/smt/check_models.h4
-rw-r--r--src/smt/command.h6
-rw-r--r--src/smt/defined_function.h6
-rw-r--r--src/smt/dump.h6
-rw-r--r--src/smt/dump_manager.h4
-rw-r--r--src/smt/env.h6
-rw-r--r--src/smt/expand_definitions.h4
-rw-r--r--src/smt/interpolation_solver.h6
-rw-r--r--src/smt/listeners.h4
-rw-r--r--src/smt/logic_exception.h6
-rw-r--r--src/smt/managed_ostreams.h6
-rw-r--r--src/smt/model.h6
-rw-r--r--src/smt/model_blocker.h6
-rw-r--r--src/smt/model_core_builder.h6
-rw-r--r--src/smt/node_command.h6
-rw-r--r--src/smt/optimization_solver.h6
-rw-r--r--src/smt/options_manager.h6
-rw-r--r--src/smt/output_manager.h6
-rw-r--r--src/smt/preprocess_proof_generator.h4
-rw-r--r--src/smt/preprocessor.h4
-rw-r--r--src/smt/process_assertions.h4
-rw-r--r--src/smt/proof_manager.h6
-rw-r--r--src/smt/proof_post_processor.h4
-rw-r--r--src/smt/quant_elim_solver.h6
-rw-r--r--src/smt/set_defaults.h6
-rw-r--r--src/smt/smt_engine.h6
-rw-r--r--src/smt/smt_engine_scope.h6
-rw-r--r--src/smt/smt_engine_state.h4
-rw-r--r--src/smt/smt_engine_stats.h6
-rw-r--r--src/smt/smt_mode.h4
-rw-r--r--src/smt/smt_solver.h6
-rw-r--r--src/smt/sygus_solver.h6
-rw-r--r--src/smt/unsat_core_manager.h6
-rw-r--r--src/smt/update_ostream.h6
-rw-r--r--src/smt/witness_form.h4
-rw-r--r--src/smt_util/boolean_simplification.h6
-rw-r--r--src/theory/arith/arith_ite_utils.h6
-rw-r--r--src/theory/arith/arith_msum.h6
-rw-r--r--src/theory/arith/arith_preprocess.h4
-rw-r--r--src/theory/arith/arith_rewriter.h6
-rw-r--r--src/theory/arith/arith_state.h4
-rw-r--r--src/theory/arith/arith_static_learner.h6
-rw-r--r--src/theory/arith/arith_utilities.h6
-rw-r--r--src/theory/arith/arithvar_node_map.h7
-rw-r--r--src/theory/arith/bound_inference.h4
-rw-r--r--src/theory/arith/constraint.h6
-rw-r--r--src/theory/arith/constraint_forward.h6
-rw-r--r--src/theory/arith/dio_solver.h7
-rw-r--r--src/theory/arith/inference_manager.h4
-rw-r--r--src/theory/arith/nl/cad/cdcac.h4
-rw-r--r--src/theory/arith/nl/cad/cdcac_utils.h4
-rw-r--r--src/theory/arith/nl/cad/constraints.h4
-rw-r--r--src/theory/arith/nl/cad/projections.h4
-rw-r--r--src/theory/arith/nl/cad/proof_checker.h6
-rw-r--r--src/theory/arith/nl/cad/proof_generator.h4
-rw-r--r--src/theory/arith/nl/cad/variable_ordering.h4
-rw-r--r--src/theory/arith/nl/cad_solver.h6
-rw-r--r--src/theory/arith/nl/ext/constraint.h6
-rw-r--r--src/theory/arith/nl/ext/ext_state.h4
-rw-r--r--src/theory/arith/nl/ext/factoring_check.h4
-rw-r--r--src/theory/arith/nl/ext/monomial.h6
-rw-r--r--src/theory/arith/nl/ext/monomial_bounds_check.h4
-rw-r--r--src/theory/arith/nl/ext/monomial_check.h4
-rw-r--r--src/theory/arith/nl/ext/proof_checker.h6
-rw-r--r--src/theory/arith/nl/ext/split_zero_check.h4
-rw-r--r--src/theory/arith/nl/ext/tangent_plane_check.h4
-rw-r--r--src/theory/arith/nl/ext_theory_callback.h6
-rw-r--r--src/theory/arith/nl/iand_solver.h6
-rw-r--r--src/theory/arith/nl/iand_utils.h6
-rw-r--r--src/theory/arith/nl/icp/candidate.h4
-rw-r--r--src/theory/arith/nl/icp/contraction_origins.h4
-rw-r--r--src/theory/arith/nl/icp/icp_solver.h4
-rw-r--r--src/theory/arith/nl/icp/intersection.h4
-rw-r--r--src/theory/arith/nl/icp/interval.h4
-rw-r--r--src/theory/arith/nl/nl_lemma_utils.h6
-rw-r--r--src/theory/arith/nl/nl_model.h6
-rw-r--r--src/theory/arith/nl/nonlinear_extension.h6
-rw-r--r--src/theory/arith/nl/poly_conversion.h4
-rw-r--r--src/theory/arith/nl/stats.h6
-rw-r--r--src/theory/arith/nl/strategy.h6
-rw-r--r--src/theory/arith/nl/transcendental/exponential_solver.h6
-rw-r--r--src/theory/arith/nl/transcendental/proof_checker.h6
-rw-r--r--src/theory/arith/nl/transcendental/sine_solver.h6
-rw-r--r--src/theory/arith/nl/transcendental/taylor_generator.h6
-rw-r--r--src/theory/arith/nl/transcendental/transcendental_solver.h6
-rw-r--r--src/theory/arith/nl/transcendental/transcendental_state.h6
-rw-r--r--src/theory/arith/normal_form.h6
-rw-r--r--src/theory/arith/partial_model.h6
-rw-r--r--src/theory/arith/proof_checker.h6
-rw-r--r--src/theory/arith/proof_macros.h6
-rw-r--r--src/theory/arith/rewrites.h6
-rw-r--r--src/theory/arith/theory_arith_type_rules.h6
-rw-r--r--src/theory/arith/type_enumerator.h6
-rw-r--r--src/theory/arrays/array_info.h6
-rw-r--r--src/theory/arrays/inference_manager.h4
-rw-r--r--src/theory/arrays/proof_checker.h6
-rw-r--r--src/theory/arrays/skolem_cache.h4
-rw-r--r--src/theory/arrays/theory_arrays.h6
-rw-r--r--src/theory/arrays/theory_arrays_rewriter.h6
-rw-r--r--src/theory/arrays/theory_arrays_type_rules.h6
-rw-r--r--src/theory/arrays/type_enumerator.h6
-rw-r--r--src/theory/arrays/union_find.h6
-rw-r--r--src/theory/assertion.h6
-rw-r--r--src/theory/bags/bag_solver.h6
-rw-r--r--src/theory/bags/bags_rewriter.h6
-rw-r--r--src/theory/bags/bags_statistics.h6
-rw-r--r--src/theory/bags/infer_info.h6
-rw-r--r--src/theory/bags/inference_generator.h6
-rw-r--r--src/theory/bags/inference_manager.h6
-rw-r--r--src/theory/bags/make_bag_op.h6
-rw-r--r--src/theory/bags/normal_form.h6
-rw-r--r--src/theory/bags/rewrites.h6
-rw-r--r--src/theory/bags/solver_state.h6
-rw-r--r--src/theory/bags/term_registry.h6
-rw-r--r--src/theory/bags/theory_bags.h6
-rw-r--r--src/theory/bags/theory_bags_type_enumerator.h6
-rw-r--r--src/theory/bags/theory_bags_type_rules.h6
-rw-r--r--src/theory/booleans/circuit_propagator.h6
-rw-r--r--src/theory/booleans/proof_checker.h6
-rw-r--r--src/theory/booleans/proof_circuit_propagator.h4
-rw-r--r--src/theory/booleans/theory_bool.h6
-rw-r--r--src/theory/booleans/theory_bool_rewriter.h6
-rw-r--r--src/theory/booleans/theory_bool_type_rules.h6
-rw-r--r--src/theory/booleans/type_enumerator.h6
-rw-r--r--src/theory/builtin/proof_checker.h6
-rw-r--r--src/theory/builtin/theory_builtin.h6
-rw-r--r--src/theory/builtin/theory_builtin_rewriter.h6
-rw-r--r--src/theory/builtin/theory_builtin_type_rules.h6
-rw-r--r--src/theory/builtin/type_enumerator.h6
-rw-r--r--src/theory/bv/abstraction.h4
-rw-r--r--src/theory/bv/bitblast/aig_bitblaster.h6
-rw-r--r--src/theory/bv/bitblast/bitblast_strategies_template.h4
-rw-r--r--src/theory/bv/bitblast/bitblast_utils.h7
-rw-r--r--src/theory/bv/bitblast/bitblaster.h6
-rw-r--r--src/theory/bv/bitblast/eager_bitblaster.h6
-rw-r--r--src/theory/bv/bitblast/lazy_bitblaster.h6
-rw-r--r--src/theory/bv/bitblast/proof_bitblaster.h4
-rw-r--r--src/theory/bv/bitblast/simple_bitblaster.h4
-rw-r--r--src/theory/bv/bv_eager_solver.h6
-rw-r--r--src/theory/bv/bv_inequality_graph.h6
-rw-r--r--src/theory/bv/bv_quick_check.h6
-rw-r--r--src/theory/bv/bv_solver.h6
-rw-r--r--src/theory/bv/bv_solver_bitblast.h4
-rw-r--r--src/theory/bv/bv_solver_lazy.h6
-rw-r--r--src/theory/bv/bv_solver_simple.h4
-rw-r--r--src/theory/bv/bv_subtheory.h6
-rw-r--r--src/theory/bv/bv_subtheory_inequality.h6
-rw-r--r--src/theory/bv/int_blaster.h6
-rw-r--r--src/theory/bv/proof_checker.h6
-rw-r--r--src/theory/bv/slicer.h6
-rw-r--r--src/theory/bv/theory_bv.h6
-rw-r--r--src/theory/bv/theory_bv_rewriter.h6
-rw-r--r--src/theory/bv/theory_bv_type_rules.h6
-rw-r--r--src/theory/bv/type_enumerator.h6
-rw-r--r--src/theory/care_graph.h6
-rw-r--r--src/theory/combination_care_graph.h6
-rw-r--r--src/theory/combination_engine.h6
-rw-r--r--src/theory/datatypes/datatypes_rewriter.h6
-rw-r--r--src/theory/datatypes/infer_proof_cons.h6
-rw-r--r--src/theory/datatypes/inference.h4
-rw-r--r--src/theory/datatypes/inference_manager.h4
-rw-r--r--src/theory/datatypes/proof_checker.h6
-rw-r--r--src/theory/datatypes/sygus_datatype_utils.h4
-rw-r--r--src/theory/datatypes/sygus_extension.h4
-rw-r--r--src/theory/datatypes/sygus_simple_sym.h6
-rw-r--r--src/theory/datatypes/theory_datatypes.h6
-rw-r--r--src/theory/datatypes/theory_datatypes_type_rules.h6
-rw-r--r--src/theory/datatypes/theory_datatypes_utils.h4
-rw-r--r--src/theory/datatypes/tuple_project_op.h6
-rw-r--r--src/theory/datatypes/type_enumerator.h6
-rw-r--r--src/theory/decision_manager.h6
-rw-r--r--src/theory/decision_strategy.h6
-rw-r--r--src/theory/eager_proof_generator.h6
-rw-r--r--src/theory/ee_manager.h6
-rw-r--r--src/theory/ee_manager_distributed.h6
-rw-r--r--src/theory/ee_setup_info.h6
-rw-r--r--src/theory/engine_output_channel.h6
-rw-r--r--src/theory/evaluator.h6
-rw-r--r--src/theory/ext_theory.h6
-rw-r--r--src/theory/fp/fp_converter.h6
-rw-r--r--src/theory/fp/theory_fp.h6
-rw-r--r--src/theory/fp/theory_fp_rewriter.h6
-rw-r--r--src/theory/fp/theory_fp_type_rules.h4
-rw-r--r--src/theory/fp/type_enumerator.h6
-rw-r--r--src/theory/incomplete_id.h6
-rw-r--r--src/theory/inference_id.h6
-rw-r--r--src/theory/inference_manager_buffered.h4
-rw-r--r--src/theory/interrupted.h6
-rw-r--r--src/theory/lazy_tree_proof_generator.h4
-rw-r--r--src/theory/logic_info.h6
-rw-r--r--src/theory/model_manager.h6
-rw-r--r--src/theory/model_manager_distributed.h6
-rw-r--r--src/theory/output_channel.h6
-rw-r--r--src/theory/quantifiers/alpha_equivalence.h4
-rw-r--r--src/theory/quantifiers/bv_inverter.h6
-rw-r--r--src/theory/quantifiers/bv_inverter_utils.h4
-rw-r--r--src/theory/quantifiers/candidate_rewrite_database.h6
-rw-r--r--src/theory/quantifiers/candidate_rewrite_filter.h6
-rw-r--r--src/theory/quantifiers/cegqi/ceg_arith_instantiator.h6
-rw-r--r--src/theory/quantifiers/cegqi/ceg_bv_instantiator.h6
-rw-r--r--src/theory/quantifiers/cegqi/ceg_bv_instantiator_utils.h4
-rw-r--r--src/theory/quantifiers/cegqi/ceg_dt_instantiator.h6
-rw-r--r--src/theory/quantifiers/cegqi/ceg_instantiator.h4
-rw-r--r--src/theory/quantifiers/cegqi/inst_strategy_cegqi.h4
-rw-r--r--src/theory/quantifiers/cegqi/nested_qe.h4
-rw-r--r--src/theory/quantifiers/cegqi/vts_term_cache.h6
-rw-r--r--src/theory/quantifiers/dynamic_rewrite.h6
-rw-r--r--src/theory/quantifiers/ematching/candidate_generator.h6
-rw-r--r--src/theory/quantifiers/ematching/ho_trigger.h6
-rw-r--r--src/theory/quantifiers/ematching/im_generator.h4
-rw-r--r--src/theory/quantifiers/ematching/inst_match_generator.h4
-rw-r--r--src/theory/quantifiers/ematching/inst_match_generator_multi.h4
-rw-r--r--src/theory/quantifiers/ematching/inst_match_generator_multi_linear.h4
-rw-r--r--src/theory/quantifiers/ematching/inst_match_generator_simple.h4
-rw-r--r--src/theory/quantifiers/ematching/inst_strategy.h6
-rw-r--r--src/theory/quantifiers/ematching/inst_strategy_e_matching.h4
-rw-r--r--src/theory/quantifiers/ematching/inst_strategy_e_matching_user.h4
-rw-r--r--src/theory/quantifiers/ematching/instantiation_engine.h6
-rw-r--r--src/theory/quantifiers/ematching/pattern_term_selector.h4
-rw-r--r--src/theory/quantifiers/ematching/trigger.h6
-rw-r--r--src/theory/quantifiers/ematching/trigger_database.h6
-rw-r--r--src/theory/quantifiers/ematching/trigger_term_info.h4
-rw-r--r--src/theory/quantifiers/ematching/trigger_trie.h6
-rw-r--r--src/theory/quantifiers/ematching/var_match_generator.h4
-rw-r--r--src/theory/quantifiers/equality_query.h6
-rw-r--r--src/theory/quantifiers/expr_miner.h6
-rw-r--r--src/theory/quantifiers/expr_miner_manager.h6
-rw-r--r--src/theory/quantifiers/extended_rewrite.h6
-rw-r--r--src/theory/quantifiers/first_order_model.h6
-rw-r--r--src/theory/quantifiers/fmf/bounded_integers.h4
-rw-r--r--src/theory/quantifiers/fmf/first_order_model_fmc.h6
-rw-r--r--src/theory/quantifiers/fmf/full_model_check.h6
-rw-r--r--src/theory/quantifiers/fmf/model_builder.h6
-rw-r--r--src/theory/quantifiers/fmf/model_engine.h6
-rw-r--r--src/theory/quantifiers/fun_def_evaluator.h4
-rw-r--r--src/theory/quantifiers/index_trie.h4
-rw-r--r--src/theory/quantifiers/inst_match.h6
-rw-r--r--src/theory/quantifiers/inst_match_trie.h6
-rw-r--r--src/theory/quantifiers/inst_strategy_enumerative.h4
-rw-r--r--src/theory/quantifiers/instantiate.h6
-rw-r--r--src/theory/quantifiers/instantiation_list.h6
-rw-r--r--src/theory/quantifiers/lazy_trie.h6
-rw-r--r--src/theory/quantifiers/proof_checker.h6
-rw-r--r--src/theory/quantifiers/quant_bound_inference.h6
-rw-r--r--src/theory/quantifiers/quant_module.h6
-rw-r--r--src/theory/quantifiers/quant_relevance.h6
-rw-r--r--src/theory/quantifiers/quant_rep_bound_ext.h6
-rw-r--r--src/theory/quantifiers/quant_split.h4
-rw-r--r--src/theory/quantifiers/quant_util.h6
-rw-r--r--src/theory/quantifiers/quantifiers_attributes.h4
-rw-r--r--src/theory/quantifiers/quantifiers_inference_manager.h6
-rw-r--r--src/theory/quantifiers/quantifiers_modules.h6
-rw-r--r--src/theory/quantifiers/quantifiers_registry.h6
-rw-r--r--src/theory/quantifiers/quantifiers_rewriter.h6
-rw-r--r--src/theory/quantifiers/quantifiers_state.h6
-rw-r--r--src/theory/quantifiers/quantifiers_statistics.h6
-rw-r--r--src/theory/quantifiers/query_generator.h6
-rw-r--r--src/theory/quantifiers/relevant_domain.h6
-rw-r--r--src/theory/quantifiers/single_inv_partition.h6
-rw-r--r--src/theory/quantifiers/skolemize.h6
-rw-r--r--src/theory/quantifiers/solution_filter.h6
-rw-r--r--src/theory/quantifiers/sygus/ce_guided_single_inv.h4
-rw-r--r--src/theory/quantifiers/sygus/cegis.h6
-rw-r--r--src/theory/quantifiers/sygus/cegis_core_connective.h6
-rw-r--r--src/theory/quantifiers/sygus/cegis_unif.h4
-rw-r--r--src/theory/quantifiers/sygus/enum_stream_substitution.h4
-rw-r--r--src/theory/quantifiers/sygus/example_eval_cache.h4
-rw-r--r--src/theory/quantifiers/sygus/example_infer.h4
-rw-r--r--src/theory/quantifiers/sygus/example_min_eval.h4
-rw-r--r--src/theory/quantifiers/sygus/rcons_obligation_info.h6
-rw-r--r--src/theory/quantifiers/sygus/rcons_type_info.h6
-rw-r--r--src/theory/quantifiers/sygus/sygus_abduct.h6
-rw-r--r--src/theory/quantifiers/sygus/sygus_enumerator.h6
-rw-r--r--src/theory/quantifiers/sygus/sygus_enumerator_basic.h6
-rw-r--r--src/theory/quantifiers/sygus/sygus_eval_unfold.h6
-rw-r--r--src/theory/quantifiers/sygus/sygus_explain.h6
-rw-r--r--src/theory/quantifiers/sygus/sygus_grammar_cons.h4
-rw-r--r--src/theory/quantifiers/sygus/sygus_grammar_norm.h4
-rw-r--r--src/theory/quantifiers/sygus/sygus_grammar_red.h6
-rw-r--r--src/theory/quantifiers/sygus/sygus_interpol.h6
-rw-r--r--src/theory/quantifiers/sygus/sygus_invariance.h6
-rw-r--r--src/theory/quantifiers/sygus/sygus_module.h6
-rw-r--r--src/theory/quantifiers/sygus/sygus_pbe.h4
-rw-r--r--src/theory/quantifiers/sygus/sygus_process_conj.h4
-rw-r--r--src/theory/quantifiers/sygus/sygus_qe_preproc.h6
-rw-r--r--src/theory/quantifiers/sygus/sygus_reconstruct.h6
-rw-r--r--src/theory/quantifiers/sygus/sygus_repair_const.h6
-rw-r--r--src/theory/quantifiers/sygus/sygus_stats.h4
-rw-r--r--src/theory/quantifiers/sygus/sygus_unif.h6
-rw-r--r--src/theory/quantifiers/sygus/sygus_unif_io.h6
-rw-r--r--src/theory/quantifiers/sygus/sygus_unif_rl.h6
-rw-r--r--src/theory/quantifiers/sygus/sygus_unif_strat.h6
-rw-r--r--src/theory/quantifiers/sygus/sygus_utils.h6
-rw-r--r--src/theory/quantifiers/sygus/synth_conjecture.h4
-rw-r--r--src/theory/quantifiers/sygus/synth_engine.h4
-rw-r--r--src/theory/quantifiers/sygus/template_infer.h4
-rw-r--r--src/theory/quantifiers/sygus/term_database_sygus.h6
-rw-r--r--src/theory/quantifiers/sygus/transition_inference.h4
-rw-r--r--src/theory/quantifiers/sygus/type_info.h6
-rw-r--r--src/theory/quantifiers/sygus/type_node_id_trie.h6
-rw-r--r--src/theory/quantifiers/sygus_inst.h4
-rw-r--r--src/theory/quantifiers/sygus_sampler.h6
-rw-r--r--src/theory/quantifiers/term_database.h6
-rw-r--r--src/theory/quantifiers/term_enumeration.h6
-rw-r--r--src/theory/quantifiers/term_pools.h6
-rw-r--r--src/theory/quantifiers/term_registry.h6
-rw-r--r--src/theory/quantifiers/term_tuple_enumerator.h4
-rw-r--r--src/theory/quantifiers/term_util.h6
-rw-r--r--src/theory/quantifiers/theory_quantifiers.h6
-rw-r--r--src/theory/quantifiers/theory_quantifiers_type_rules.h6
-rw-r--r--src/theory/quantifiers_engine.h6
-rw-r--r--src/theory/relevance_manager.h6
-rw-r--r--src/theory/rep_set.h6
-rw-r--r--src/theory/sep/theory_sep.h6
-rw-r--r--src/theory/sep/theory_sep_rewriter.h6
-rw-r--r--src/theory/sep/theory_sep_type_rules.h6
-rw-r--r--src/theory/sets/cardinality_extension.h4
-rw-r--r--src/theory/sets/inference_manager.h6
-rw-r--r--src/theory/sets/normal_form.h4
-rw-r--r--src/theory/sets/singleton_op.h6
-rw-r--r--src/theory/sets/skolem_cache.h6
-rw-r--r--src/theory/sets/solver_state.h6
-rw-r--r--src/theory/sets/term_registry.h6
-rw-r--r--src/theory/sets/theory_sets.h6
-rw-r--r--src/theory/sets/theory_sets_private.h6
-rw-r--r--src/theory/sets/theory_sets_rewriter.h6
-rw-r--r--src/theory/sets/theory_sets_type_enumerator.h6
-rw-r--r--src/theory/sets/theory_sets_type_rules.h6
-rw-r--r--src/theory/shared_solver.h6
-rw-r--r--src/theory/shared_solver_distributed.h6
-rw-r--r--src/theory/skolem_lemma.h6
-rw-r--r--src/theory/smt_engine_subsolver.h6
-rw-r--r--src/theory/sort_inference.h4
-rw-r--r--src/theory/strings/arith_entail.h4
-rw-r--r--src/theory/strings/base_solver.h6
-rw-r--r--src/theory/strings/core_solver.h6
-rw-r--r--src/theory/strings/eager_solver.h6
-rw-r--r--src/theory/strings/eqc_info.h6
-rw-r--r--src/theory/strings/extf_solver.h6
-rw-r--r--src/theory/strings/infer_info.h6
-rw-r--r--src/theory/strings/infer_proof_cons.h6
-rw-r--r--src/theory/strings/inference_manager.h4
-rw-r--r--src/theory/strings/normal_form.h6
-rw-r--r--src/theory/strings/proof_checker.h6
-rw-r--r--src/theory/strings/regexp_elim.h6
-rw-r--r--src/theory/strings/regexp_entail.h6
-rw-r--r--src/theory/strings/regexp_operation.h6
-rw-r--r--src/theory/strings/regexp_solver.h6
-rw-r--r--src/theory/strings/rewrites.h6
-rw-r--r--src/theory/strings/sequences_rewriter.h6
-rw-r--r--src/theory/strings/sequences_stats.h6
-rw-r--r--src/theory/strings/skolem_cache.h6
-rw-r--r--src/theory/strings/solver_state.h6
-rw-r--r--src/theory/strings/strategy.h6
-rw-r--r--src/theory/strings/strings_entail.h6
-rw-r--r--src/theory/strings/strings_fmf.h6
-rw-r--r--src/theory/strings/strings_rewriter.h6
-rw-r--r--src/theory/strings/term_registry.h6
-rw-r--r--src/theory/strings/theory_strings.h6
-rw-r--r--src/theory/strings/theory_strings_preprocess.h6
-rw-r--r--src/theory/strings/theory_strings_type_rules.h6
-rw-r--r--src/theory/strings/theory_strings_utils.h4
-rw-r--r--src/theory/strings/type_enumerator.h6
-rw-r--r--src/theory/strings/word.h4
-rw-r--r--src/theory/subs_minimize.h6
-rw-r--r--src/theory/substitutions.h6
-rw-r--r--src/theory/theory.h6
-rw-r--r--src/theory/theory_engine.h6
-rw-r--r--src/theory/theory_engine_proof_generator.h6
-rw-r--r--src/theory/theory_eq_notify.h4
-rw-r--r--src/theory/theory_id.h4
-rw-r--r--src/theory/theory_inference.h4
-rw-r--r--src/theory/theory_inference_manager.h6
-rw-r--r--src/theory/theory_model.h6
-rw-r--r--src/theory/theory_model_builder.h6
-rw-r--r--src/theory/theory_preprocessor.h6
-rw-r--r--src/theory/theory_proof_step_buffer.h6
-rw-r--r--src/theory/theory_rewriter.h6
-rw-r--r--src/theory/theory_state.h6
-rw-r--r--src/theory/trust_node.h6
-rw-r--r--src/theory/trust_substitutions.h6
-rw-r--r--src/theory/type_enumerator.h6
-rw-r--r--src/theory/type_set.h6
-rw-r--r--src/theory/uf/cardinality_extension.h6
-rw-r--r--src/theory/uf/equality_engine.h4
-rw-r--r--src/theory/uf/equality_engine_iterator.h4
-rw-r--r--src/theory/uf/equality_engine_notify.h4
-rw-r--r--src/theory/uf/equality_engine_types.h6
-rw-r--r--src/theory/uf/ho_extension.h6
-rw-r--r--src/theory/uf/proof_checker.h6
-rw-r--r--src/theory/uf/proof_equality_engine.h6
-rw-r--r--src/theory/uf/symmetry_breaker.h6
-rw-r--r--src/theory/uf/theory_uf.h6
-rw-r--r--src/theory/uf/theory_uf_model.h4
-rw-r--r--src/theory/uf/theory_uf_rewriter.h6
-rw-r--r--src/theory/uf/theory_uf_type_rules.h6
-rw-r--r--src/theory/valuation.h6
-rw-r--r--src/util/bin_heap.h6
-rw-r--r--src/util/bitvector.h6
-rw-r--r--src/util/bool.h6
-rw-r--r--src/util/cardinality.h6
-rw-r--r--src/util/cardinality_class.h4
-rw-r--r--src/util/divisible.h6
-rw-r--r--src/util/floatingpoint.h6
-rw-r--r--src/util/floatingpoint_literal_symfpu.h.in4
-rw-r--r--src/util/floatingpoint_literal_symfpu_traits.h.in4
-rw-r--r--src/util/floatingpoint_size.h4
-rw-r--r--src/util/gmp_util.h6
-rw-r--r--src/util/hash.h6
-rw-r--r--src/util/iand.h6
-rw-r--r--src/util/index.h6
-rw-r--r--src/util/indexed_root_predicate.h4
-rw-r--r--src/util/integer_cln_imp.h6
-rw-r--r--src/util/integer_gmp_imp.h6
-rw-r--r--src/util/maybe.h6
-rw-r--r--src/util/ostream_util.h6
-rw-r--r--src/util/poly_util.h6
-rw-r--r--src/util/random.h4
-rw-r--r--src/util/rational_cln_imp.h6
-rw-r--r--src/util/rational_gmp_imp.h6
-rw-r--r--src/util/real_algebraic_number_poly_imp.h6
-rw-r--r--src/util/regexp.h6
-rw-r--r--src/util/resource_manager.h6
-rw-r--r--src/util/result.h6
-rw-r--r--src/util/roundingmode.h4
-rw-r--r--src/util/safe_print.h6
-rw-r--r--src/util/sampler.h6
-rw-r--r--src/util/sexpr.h6
-rw-r--r--src/util/smt2_quote_string.h6
-rw-r--r--src/util/statistics.h6
-rw-r--r--src/util/statistics_public.h4
-rw-r--r--src/util/statistics_reg.h4
-rw-r--r--src/util/statistics_registry.h6
-rw-r--r--src/util/statistics_stats.h4
-rw-r--r--src/util/statistics_value.h4
-rw-r--r--src/util/stats_base.h4
-rw-r--r--src/util/stats_histogram.h4
-rw-r--r--src/util/stats_timer.h4
-rw-r--r--src/util/stats_utils.h4
-rw-r--r--src/util/string.h6
-rw-r--r--src/util/tuple.h6
-rw-r--r--src/util/unsafe_interrupt_exception.h6
-rw-r--r--src/util/utility.h6
639 files changed, 1783 insertions, 1787 deletions
diff --git a/src/api/cpp/cvc5_checks.h b/src/api/cpp/cvc5_checks.h
index e4505c1e6..02ab7d39f 100644
--- a/src/api/cpp/cvc5_checks.h
+++ b/src/api/cpp/cvc5_checks.h
@@ -16,8 +16,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__API__CHECKS_H
-#define CVC4__API__CHECKS_H
+#ifndef CVC5__API__CHECKS_H
+#define CVC5__API__CHECKS_H
namespace cvc4 {
namespace api {
diff --git a/src/base/check.h b/src/base/check.h
index 719c962bf..91184336b 100644
--- a/src/base/check.h
+++ b/src/base/check.h
@@ -31,8 +31,8 @@
#include "cvc4_private_library.h"
-#ifndef CVC4__CHECK_H
-#define CVC4__CHECK_H
+#ifndef CVC5__CHECK_H
+#define CVC5__CHECK_H
#include <cstdarg>
#include <ostream>
@@ -247,4 +247,4 @@ class AssertArgumentException : public Exception
} // namespace cvc5
-#endif /* CVC4__CHECK_H */
+#endif /* CVC5__CHECK_H */
diff --git a/src/base/configuration.h b/src/base/configuration.h
index e277739dc..6754923ed 100644
--- a/src/base/configuration.h
+++ b/src/base/configuration.h
@@ -18,8 +18,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__CONFIGURATION_H
-#define CVC4__CONFIGURATION_H
+#ifndef CVC5__CONFIGURATION_H
+#define CVC5__CONFIGURATION_H
#include <string>
@@ -144,4 +144,4 @@ public:
} // namespace cvc5
-#endif /* CVC4__CONFIGURATION_H */
+#endif /* CVC5__CONFIGURATION_H */
diff --git a/src/base/configuration_private.h b/src/base/configuration_private.h
index a39393814..754c8002f 100644
--- a/src/base/configuration_private.h
+++ b/src/base/configuration_private.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__CONFIGURATION_PRIVATE_H
-#define CVC4__CONFIGURATION_PRIVATE_H
+#ifndef CVC5__CONFIGURATION_PRIVATE_H
+#define CVC5__CONFIGURATION_PRIVATE_H
#include <string>
@@ -178,4 +178,4 @@ namespace cvc5 {
} // namespace cvc5
-#endif /* CVC4__CONFIGURATION_PRIVATE_H */
+#endif /* CVC5__CONFIGURATION_PRIVATE_H */
diff --git a/src/base/exception.h b/src/base/exception.h
index 99404b45e..f3a5326fc 100644
--- a/src/base/exception.h
+++ b/src/base/exception.h
@@ -16,8 +16,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__EXCEPTION_H
-#define CVC4__EXCEPTION_H
+#ifndef CVC5__EXCEPTION_H
+#define CVC5__EXCEPTION_H
#include <exception>
#include <iosfwd>
@@ -161,4 +161,4 @@ private:
} // namespace cvc5
-#endif /* CVC4__EXCEPTION_H */
+#endif /* CVC5__EXCEPTION_H */
diff --git a/src/base/listener.h b/src/base/listener.h
index 58577b814..dc5078862 100644
--- a/src/base/listener.h
+++ b/src/base/listener.h
@@ -17,8 +17,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__LISTENER_H
-#define CVC4__LISTENER_H
+#ifndef CVC5__LISTENER_H
+#define CVC5__LISTENER_H
namespace cvc5 {
@@ -39,4 +39,4 @@ class Listener
} // namespace cvc5
-#endif /* CVC4__LISTENER_H */
+#endif /* CVC5__LISTENER_H */
diff --git a/src/base/map_util.h b/src/base/map_util.h
index e13120f52..93dac21f2 100644
--- a/src/base/map_util.h
+++ b/src/base/map_util.h
@@ -35,8 +35,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__BASE__MAP_UTIL_H
-#define CVC4__BASE__MAP_UTIL_H
+#ifndef CVC5__BASE__MAP_UTIL_H
+#define CVC5__BASE__MAP_UTIL_H
#include "base/check.h"
@@ -94,4 +94,4 @@ const MapMappedTypeT<M>& FindOrDie(const M& map, const MapKeyTypeT<M>& key)
} // namespace cvc5
-#endif /* CVC4__BASE__MAP_UTIL_H */
+#endif /* CVC5__BASE__MAP_UTIL_H */
diff --git a/src/base/modal_exception.h b/src/base/modal_exception.h
index d00b0a877..d6b941dd3 100644
--- a/src/base/modal_exception.h
+++ b/src/base/modal_exception.h
@@ -19,8 +19,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__SMT__MODAL_EXCEPTION_H
-#define CVC4__SMT__MODAL_EXCEPTION_H
+#ifndef CVC5__SMT__MODAL_EXCEPTION_H
+#define CVC5__SMT__MODAL_EXCEPTION_H
#include "base/exception.h"
@@ -60,4 +60,4 @@ class RecoverableModalException : public cvc5::ModalException
} // namespace cvc5
-#endif /* CVC4__SMT__MODAL_EXCEPTION_H */
+#endif /* CVC5__SMT__MODAL_EXCEPTION_H */
diff --git a/src/base/output.h b/src/base/output.h
index cb08736bb..856b81333 100644
--- a/src/base/output.h
+++ b/src/base/output.h
@@ -16,8 +16,8 @@
#include "cvc4_private_library.h"
-#ifndef CVC4__OUTPUT_H
-#define CVC4__OUTPUT_H
+#ifndef CVC5__OUTPUT_H
+#define CVC5__OUTPUT_H
#include <cstdio>
#include <ios>
@@ -581,4 +581,4 @@ inline IndentedScope::~IndentedScope() {}
} // namespace cvc5
-#endif /* CVC4__OUTPUT_H */
+#endif /* CVC5__OUTPUT_H */
diff --git a/src/context/backtrackable.h b/src/context/backtrackable.h
index 2c4fdff41..b128313a6 100644
--- a/src/context/backtrackable.h
+++ b/src/context/backtrackable.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__UTIL__BACKTRACKABLE_H
-#define CVC4__UTIL__BACKTRACKABLE_H
+#ifndef CVC5__UTIL__BACKTRACKABLE_H
+#define CVC5__UTIL__BACKTRACKABLE_H
#include <cstdlib>
#include <vector>
@@ -219,4 +219,4 @@ template <class T> void Backtracker<T>::checkConsistency() {
} // namespace cvc5
-#endif /* CVC4__UTIL__BACKTRACKABLE_H */
+#endif /* CVC5__UTIL__BACKTRACKABLE_H */
diff --git a/src/context/cdhashmap.h b/src/context/cdhashmap.h
index a9f81d529..9a8ae925f 100644
--- a/src/context/cdhashmap.h
+++ b/src/context/cdhashmap.h
@@ -80,8 +80,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__CONTEXT__CDHASHMAP_H
-#define CVC4__CONTEXT__CDHASHMAP_H
+#ifndef CVC5__CONTEXT__CDHASHMAP_H
+#define CVC5__CONTEXT__CDHASHMAP_H
#include <functional>
#include <iterator>
@@ -455,4 +455,4 @@ public:
} // namespace context
} // namespace cvc5
-#endif /* CVC4__CONTEXT__CDHASHMAP_H */
+#endif /* CVC5__CONTEXT__CDHASHMAP_H */
diff --git a/src/context/cdhashmap_forward.h b/src/context/cdhashmap_forward.h
index b6907322c..e7ca68bb4 100644
--- a/src/context/cdhashmap_forward.h
+++ b/src/context/cdhashmap_forward.h
@@ -23,8 +23,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__CONTEXT__CDHASHMAP_FORWARD_H
-#define CVC4__CONTEXT__CDHASHMAP_FORWARD_H
+#ifndef CVC5__CONTEXT__CDHASHMAP_FORWARD_H
+#define CVC5__CONTEXT__CDHASHMAP_FORWARD_H
#include <functional>
@@ -39,4 +39,4 @@ class CDHashMap;
/// \endcond
-#endif /* CVC4__CONTEXT__CDHASHMAP_FORWARD_H */
+#endif /* CVC5__CONTEXT__CDHASHMAP_FORWARD_H */
diff --git a/src/context/cdhashset.h b/src/context/cdhashset.h
index 1a31e6022..b7e9b051b 100644
--- a/src/context/cdhashset.h
+++ b/src/context/cdhashset.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__CONTEXT__CDHASHSET_H
-#define CVC4__CONTEXT__CDHASHSET_H
+#ifndef CVC5__CONTEXT__CDHASHSET_H
+#define CVC5__CONTEXT__CDHASHSET_H
#include "base/check.h"
#include "context/cdinsert_hashmap.h"
@@ -158,4 +158,4 @@ public:
} // namespace context
} // namespace cvc5
-#endif /* CVC4__CONTEXT__CDHASHSET_H */
+#endif /* CVC5__CONTEXT__CDHASHSET_H */
diff --git a/src/context/cdhashset_forward.h b/src/context/cdhashset_forward.h
index 387c10ada..2601dfed8 100644
--- a/src/context/cdhashset_forward.h
+++ b/src/context/cdhashset_forward.h
@@ -23,8 +23,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__CONTEXT__CDSET_FORWARD_H
-#define CVC4__CONTEXT__CDSET_FORWARD_H
+#ifndef CVC5__CONTEXT__CDSET_FORWARD_H
+#define CVC5__CONTEXT__CDSET_FORWARD_H
#include <functional>
@@ -35,4 +35,4 @@ class CDHashSet;
} // namespace context
} // namespace cvc5
-#endif /* CVC4__CONTEXT__CDSET_FORWARD_H */
+#endif /* CVC5__CONTEXT__CDSET_FORWARD_H */
diff --git a/src/context/cdinsert_hashmap_forward.h b/src/context/cdinsert_hashmap_forward.h
index d636be1c1..5b9c0eb78 100644
--- a/src/context/cdinsert_hashmap_forward.h
+++ b/src/context/cdinsert_hashmap_forward.h
@@ -23,8 +23,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__CONTEXT__CDINSERT_HASHMAP_FORWARD_H
-#define CVC4__CONTEXT__CDINSERT_HASHMAP_FORWARD_H
+#ifndef CVC5__CONTEXT__CDINSERT_HASHMAP_FORWARD_H
+#define CVC5__CONTEXT__CDINSERT_HASHMAP_FORWARD_H
#include <functional>
@@ -35,4 +35,4 @@ class CDInsertHashMap;
} // namespace context
} // namespace cvc5
-#endif /* CVC4__CONTEXT__CDINSERT_HASHMAP_FORWARD_H */
+#endif /* CVC5__CONTEXT__CDINSERT_HASHMAP_FORWARD_H */
diff --git a/src/context/cdlist.h b/src/context/cdlist.h
index 20b0f1e3d..c379e21c8 100644
--- a/src/context/cdlist.h
+++ b/src/context/cdlist.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__CONTEXT__CDLIST_H
-#define CVC4__CONTEXT__CDLIST_H
+#ifndef CVC5__CONTEXT__CDLIST_H
+#define CVC5__CONTEXT__CDLIST_H
#include <cstring>
#include <iterator>
@@ -437,4 +437,4 @@ class CDList<T, CleanUp, ContextMemoryAllocator<T> > : public ContextObj {
} // namespace context
} // namespace cvc5
-#endif /* CVC4__CONTEXT__CDLIST_H */
+#endif /* CVC5__CONTEXT__CDLIST_H */
diff --git a/src/context/cdlist_forward.h b/src/context/cdlist_forward.h
index 5758b71ba..9575881e0 100644
--- a/src/context/cdlist_forward.h
+++ b/src/context/cdlist_forward.h
@@ -29,8 +29,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__CONTEXT__CDLIST_FORWARD_H
-#define CVC4__CONTEXT__CDLIST_FORWARD_H
+#ifndef CVC5__CONTEXT__CDLIST_FORWARD_H
+#define CVC5__CONTEXT__CDLIST_FORWARD_H
#include <memory>
@@ -53,4 +53,4 @@ class CDList;
} // namespace context
} // namespace cvc5
-#endif /* CVC4__CONTEXT__CDLIST_FORWARD_H */
+#endif /* CVC5__CONTEXT__CDLIST_FORWARD_H */
diff --git a/src/context/cdo.h b/src/context/cdo.h
index 393b584f1..7e3d892d7 100644
--- a/src/context/cdo.h
+++ b/src/context/cdo.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__CONTEXT__CDO_H
-#define CVC4__CONTEXT__CDO_H
+#ifndef CVC5__CONTEXT__CDO_H
+#define CVC5__CONTEXT__CDO_H
#include "context/context.h"
@@ -178,4 +178,4 @@ public:
} // namespace context
} // namespace cvc5
-#endif /* CVC4__CONTEXT__CDO_H */
+#endif /* CVC5__CONTEXT__CDO_H */
diff --git a/src/context/cdqueue.h b/src/context/cdqueue.h
index 12ca02754..acd31020a 100644
--- a/src/context/cdqueue.h
+++ b/src/context/cdqueue.h
@@ -22,8 +22,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__CONTEXT__CDQUEUE_H
-#define CVC4__CONTEXT__CDQUEUE_H
+#ifndef CVC5__CONTEXT__CDQUEUE_H
+#define CVC5__CONTEXT__CDQUEUE_H
#include "context/context.h"
#include "context/cdlist.h"
@@ -165,4 +165,4 @@ public:
} // namespace context
} // namespace cvc5
-#endif /* CVC4__CONTEXT__CDQUEUE_H */
+#endif /* CVC5__CONTEXT__CDQUEUE_H */
diff --git a/src/context/cdtrail_queue.h b/src/context/cdtrail_queue.h
index abdd83f99..1cc8b1f70 100644
--- a/src/context/cdtrail_queue.h
+++ b/src/context/cdtrail_queue.h
@@ -19,8 +19,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__CONTEXT__CDTRAIL_QUEUE_H
-#define CVC4__CONTEXT__CDTRAIL_QUEUE_H
+#ifndef CVC5__CONTEXT__CDTRAIL_QUEUE_H
+#define CVC5__CONTEXT__CDTRAIL_QUEUE_H
#include "context/cdlist.h"
#include "context/cdo.h"
@@ -92,4 +92,4 @@ public:
} // namespace context
} // namespace cvc5
-#endif /* CVC4__CONTEXT__CDTRAIL_QUEUE_H */
+#endif /* CVC5__CONTEXT__CDTRAIL_QUEUE_H */
diff --git a/src/context/context.h b/src/context/context.h
index 438d9c28a..d6b458701 100644
--- a/src/context/context.h
+++ b/src/context/context.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__CONTEXT__CONTEXT_H
-#define CVC4__CONTEXT__CONTEXT_H
+#ifndef CVC5__CONTEXT__CONTEXT_H
+#define CVC5__CONTEXT__CONTEXT_H
#include <cstdlib>
#include <iostream>
@@ -742,4 +742,4 @@ inline void Scope::addToChain(ContextObj* pContextObj)
} // namespace context
} // namespace cvc5
-#endif /* CVC4__CONTEXT__CONTEXT_H */
+#endif /* CVC5__CONTEXT__CONTEXT_H */
diff --git a/src/context/context_mm.h b/src/context/context_mm.h
index cf597908a..22852b9a6 100644
--- a/src/context/context_mm.h
+++ b/src/context/context_mm.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__CONTEXT__CONTEXT_MM_H
-#define CVC4__CONTEXT__CONTEXT_MM_H
+#ifndef CVC5__CONTEXT__CONTEXT_MM_H
+#define CVC5__CONTEXT__CONTEXT_MM_H
#ifndef CVC4_DEBUG_CONTEXT_MEMORY_MANAGER
#include <deque>
@@ -264,4 +264,4 @@ inline bool operator!=(const ContextMemoryAllocator<T>& a1,
} // namespace context
} // namespace cvc5
-#endif /* CVC4__CONTEXT__CONTEXT_MM_H */
+#endif /* CVC5__CONTEXT__CONTEXT_MM_H */
diff --git a/src/decision/decision_attributes.h b/src/decision/decision_attributes.h
index c34abd179..91525d081 100644
--- a/src/decision/decision_attributes.h
+++ b/src/decision/decision_attributes.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__DECISION__DECISION_ATTRIBUTES_H
-#define CVC4__DECISION__DECISION_ATTRIBUTES_H
+#ifndef CVC5__DECISION__DECISION_ATTRIBUTES_H
+#define CVC5__DECISION__DECISION_ATTRIBUTES_H
#include "options/decision_weight.h"
#include "expr/attribute.h"
@@ -33,4 +33,4 @@ typedef expr::Attribute<attr::DecisionWeightTag, DecisionWeight> DecisionWeightA
} // namespace decision
} // namespace cvc5
-#endif /* CVC4__DECISION__DECISION_ATTRIBUTES_H */
+#endif /* CVC5__DECISION__DECISION_ATTRIBUTES_H */
diff --git a/src/decision/decision_engine.h b/src/decision/decision_engine.h
index cbb6b897d..b9ca74464 100644
--- a/src/decision/decision_engine.h
+++ b/src/decision/decision_engine.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__DECISION__DECISION_ENGINE_H
-#define CVC4__DECISION__DECISION_ENGINE_H
+#ifndef CVC5__DECISION__DECISION_ENGINE_H
+#define CVC5__DECISION__DECISION_ENGINE_H
#include "base/output.h"
#include "context/cdo.h"
@@ -162,4 +162,4 @@ class DecisionEngine {
} // namespace cvc5
-#endif /* CVC4__DECISION__DECISION_ENGINE_H */
+#endif /* CVC5__DECISION__DECISION_ENGINE_H */
diff --git a/src/decision/decision_strategy.h b/src/decision/decision_strategy.h
index 4a1828a8f..f14c13318 100644
--- a/src/decision/decision_strategy.h
+++ b/src/decision/decision_strategy.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__DECISION__DECISION_STRATEGY_H
-#define CVC4__DECISION__DECISION_STRATEGY_H
+#ifndef CVC5__DECISION__DECISION_STRATEGY_H
+#define CVC5__DECISION__DECISION_STRATEGY_H
#include <vector>
@@ -68,4 +68,4 @@ public:
} // namespace decision
} // namespace cvc5
-#endif /* CVC4__DECISION__DECISION_STRATEGY_H */
+#endif /* CVC5__DECISION__DECISION_STRATEGY_H */
diff --git a/src/decision/justification_heuristic.h b/src/decision/justification_heuristic.h
index 06864470e..0356650ae 100644
--- a/src/decision/justification_heuristic.h
+++ b/src/decision/justification_heuristic.h
@@ -20,8 +20,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__DECISION__JUSTIFICATION_HEURISTIC
-#define CVC4__DECISION__JUSTIFICATION_HEURISTIC
+#ifndef CVC5__DECISION__JUSTIFICATION_HEURISTIC
+#define CVC5__DECISION__JUSTIFICATION_HEURISTIC
#include <unordered_set>
#include <utility>
@@ -197,4 +197,4 @@ private:
}/* namespace decision */
} // namespace cvc5
-#endif /* CVC4__DECISION__JUSTIFICATION_HEURISTIC */
+#endif /* CVC5__DECISION__JUSTIFICATION_HEURISTIC */
diff --git a/src/expr/array_store_all.h b/src/expr/array_store_all.h
index 65385b0c4..49031e28a 100644
--- a/src/expr/array_store_all.h
+++ b/src/expr/array_store_all.h
@@ -18,8 +18,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__ARRAY_STORE_ALL_H
-#define CVC4__ARRAY_STORE_ALL_H
+#ifndef CVC5__ARRAY_STORE_ALL_H
+#define CVC5__ARRAY_STORE_ALL_H
#include <iosfwd>
#include <memory>
@@ -71,4 +71,4 @@ struct ArrayStoreAllHashFunction
} // namespace cvc5
-#endif /* CVC4__ARRAY_STORE_ALL_H */
+#endif /* CVC5__ARRAY_STORE_ALL_H */
diff --git a/src/expr/ascription_type.h b/src/expr/ascription_type.h
index b216a0fa1..fe6f2c23f 100644
--- a/src/expr/ascription_type.h
+++ b/src/expr/ascription_type.h
@@ -16,8 +16,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__ASCRIPTION_TYPE_H
-#define CVC4__ASCRIPTION_TYPE_H
+#ifndef CVC5__ASCRIPTION_TYPE_H
+#define CVC5__ASCRIPTION_TYPE_H
#include <iosfwd>
#include <memory>
@@ -62,4 +62,4 @@ std::ostream& operator<<(std::ostream& out, AscriptionType at);
} // namespace cvc5
-#endif /* CVC4__ASCRIPTION_TYPE_H */
+#endif /* CVC5__ASCRIPTION_TYPE_H */
diff --git a/src/expr/attribute.h b/src/expr/attribute.h
index 6156ccc2d..9f2301d7e 100644
--- a/src/expr/attribute.h
+++ b/src/expr/attribute.h
@@ -21,8 +21,8 @@
#include "expr/node.h"
#include "expr/type_node.h"
-#ifndef CVC4__EXPR__ATTRIBUTE_H
-#define CVC4__EXPR__ATTRIBUTE_H
+#ifndef CVC5__EXPR__ATTRIBUTE_H
+#define CVC5__EXPR__ATTRIBUTE_H
#include <string>
#include "expr/attribute_unique_id.h"
@@ -623,4 +623,4 @@ NodeManager::setAttribute(TypeNode n, const AttrKind&,
} // namespace cvc5
-#endif /* CVC4__EXPR__ATTRIBUTE_H */
+#endif /* CVC5__EXPR__ATTRIBUTE_H */
diff --git a/src/expr/attribute_internals.h b/src/expr/attribute_internals.h
index db3e57675..2293e4b5a 100644
--- a/src/expr/attribute_internals.h
+++ b/src/expr/attribute_internals.h
@@ -20,8 +20,8 @@
# error expr/attribute_internals.h should only be included by expr/attribute.h
#endif /* CVC4_ATTRIBUTE_H__INCLUDING__ATTRIBUTE_INTERNALS_H */
-#ifndef CVC4__EXPR__ATTRIBUTE_INTERNALS_H
-#define CVC4__EXPR__ATTRIBUTE_INTERNALS_H
+#ifndef CVC5__EXPR__ATTRIBUTE_INTERNALS_H
+#define CVC5__EXPR__ATTRIBUTE_INTERNALS_H
#include <unordered_map>
@@ -514,4 +514,4 @@ const uint64_t Attribute<T, bool, context_dep>::s_id =
} // namespace expr
} // namespace cvc5
-#endif /* CVC4__EXPR__ATTRIBUTE_INTERNALS_H */
+#endif /* CVC5__EXPR__ATTRIBUTE_INTERNALS_H */
diff --git a/src/expr/bound_var_manager.h b/src/expr/bound_var_manager.h
index ebd107737..d1d1c1a38 100644
--- a/src/expr/bound_var_manager.h
+++ b/src/expr/bound_var_manager.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__BOUND_VAR_MANAGER_H
-#define CVC4__EXPR__BOUND_VAR_MANAGER_H
+#ifndef CVC5__EXPR__BOUND_VAR_MANAGER_H
+#define CVC5__EXPR__BOUND_VAR_MANAGER_H
#include <string>
#include <unordered_set>
@@ -100,4 +100,4 @@ class BoundVarManager
} // namespace cvc5
-#endif /* CVC4__EXPR__BOUND_VAR_MANAGER_H */
+#endif /* CVC5__EXPR__BOUND_VAR_MANAGER_H */
diff --git a/src/expr/buffered_proof_generator.h b/src/expr/buffered_proof_generator.h
index 7399b3741..228af460c 100644
--- a/src/expr/buffered_proof_generator.h
+++ b/src/expr/buffered_proof_generator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__BUFFERED_PROOF_GENERATOR_H
-#define CVC4__EXPR__BUFFERED_PROOF_GENERATOR_H
+#ifndef CVC5__EXPR__BUFFERED_PROOF_GENERATOR_H
+#define CVC5__EXPR__BUFFERED_PROOF_GENERATOR_H
#include "context/cdhashmap.h"
#include "expr/proof_generator.h"
@@ -59,4 +59,4 @@ class BufferedProofGenerator : public ProofGenerator
} // namespace cvc5
-#endif /* CVC4__EXPR__BUFFERED_PROOF_GENERATOR_H */
+#endif /* CVC5__EXPR__BUFFERED_PROOF_GENERATOR_H */
diff --git a/src/expr/datatype_index.h b/src/expr/datatype_index.h
index a239c387b..ca4d6d743 100644
--- a/src/expr/datatype_index.h
+++ b/src/expr/datatype_index.h
@@ -14,8 +14,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__DATATYPE_INDEX_H
-#define CVC4__DATATYPE_INDEX_H
+#ifndef CVC5__DATATYPE_INDEX_H
+#define CVC5__DATATYPE_INDEX_H
#include <iosfwd>
@@ -66,4 +66,4 @@ struct DatatypeIndexConstantHashFunction
} // namespace cvc5
-#endif /* CVC4__DATATYPE_H */
+#endif /* CVC5__DATATYPE_H */
diff --git a/src/expr/dtype.h b/src/expr/dtype.h
index 524702bdd..e0f37d811 100644
--- a/src/expr/dtype.h
+++ b/src/expr/dtype.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__DTYPE_H
-#define CVC4__EXPR__DTYPE_H
+#ifndef CVC5__EXPR__DTYPE_H
+#define CVC5__EXPR__DTYPE_H
#include <map>
#include <string>
diff --git a/src/expr/dtype_cons.h b/src/expr/dtype_cons.h
index d444d9261..52b0a4d69 100644
--- a/src/expr/dtype_cons.h
+++ b/src/expr/dtype_cons.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__DTYPE_CONS_H
-#define CVC4__EXPR__DTYPE_CONS_H
+#ifndef CVC5__EXPR__DTYPE_CONS_H
+#define CVC5__EXPR__DTYPE_CONS_H
#include <map>
#include <string>
diff --git a/src/expr/dtype_selector.h b/src/expr/dtype_selector.h
index d45bcf8c5..66a4f4f4f 100644
--- a/src/expr/dtype_selector.h
+++ b/src/expr/dtype_selector.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__DTYPE_SELECTOR_H
-#define CVC4__EXPR__DTYPE_SELECTOR_H
+#ifndef CVC5__EXPR__DTYPE_SELECTOR_H
+#define CVC5__EXPR__DTYPE_SELECTOR_H
#include <string>
#include "expr/node.h"
diff --git a/src/expr/emptybag.h b/src/expr/emptybag.h
index f45bd9e96..19efe3a94 100644
--- a/src/expr/emptybag.h
+++ b/src/expr/emptybag.h
@@ -14,8 +14,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__EMPTY_BAG_H
-#define CVC4__EMPTY_BAG_H
+#ifndef CVC5__EMPTY_BAG_H
+#define CVC5__EMPTY_BAG_H
#include <iosfwd>
#include <memory>
@@ -60,4 +60,4 @@ struct EmptyBagHashFunction
} // namespace cvc5
-#endif /* CVC4__EMPTY_BAG_H */
+#endif /* CVC5__EMPTY_BAG_H */
diff --git a/src/expr/emptyset.h b/src/expr/emptyset.h
index aa6d5e143..b1c00a5ad 100644
--- a/src/expr/emptyset.h
+++ b/src/expr/emptyset.h
@@ -17,8 +17,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__EMPTY_SET_H
-#define CVC4__EMPTY_SET_H
+#ifndef CVC5__EMPTY_SET_H
+#define CVC5__EMPTY_SET_H
#include <iosfwd>
#include <memory>
@@ -62,4 +62,4 @@ struct EmptySetHashFunction
} // namespace cvc5
-#endif /* CVC4__EMPTY_SET_H */
+#endif /* CVC5__EMPTY_SET_H */
diff --git a/src/expr/expr_iomanip.h b/src/expr/expr_iomanip.h
index 674d4c6fd..91b0fcc2e 100644
--- a/src/expr/expr_iomanip.h
+++ b/src/expr/expr_iomanip.h
@@ -16,8 +16,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__EXPR__EXPR_IOMANIP_H
-#define CVC4__EXPR__EXPR_IOMANIP_H
+#ifndef CVC5__EXPR__EXPR_IOMANIP_H
+#define CVC5__EXPR__EXPR_IOMANIP_H
#include <iosfwd>
@@ -175,4 +175,4 @@ std::ostream& operator<<(std::ostream& out, ExprSetDepth sd);
} // namespace cvc5
-#endif /* CVC4__EXPR__EXPR_IOMANIP_H */
+#endif /* CVC5__EXPR__EXPR_IOMANIP_H */
diff --git a/src/expr/kind_map.h b/src/expr/kind_map.h
index 0716ff4d0..28cbf5c37 100644
--- a/src/expr/kind_map.h
+++ b/src/expr/kind_map.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__KIND_MAP_H
-#define CVC4__KIND_MAP_H
+#ifndef CVC5__KIND_MAP_H
+#define CVC5__KIND_MAP_H
#include <bitset>
@@ -53,4 +53,4 @@ class KindMap
} // namespace cvc5
-#endif /* CVC4__KIND_MAP_H */
+#endif /* CVC5__KIND_MAP_H */
diff --git a/src/expr/kind_template.h b/src/expr/kind_template.h
index 484e8c273..d24f46551 100644
--- a/src/expr/kind_template.h
+++ b/src/expr/kind_template.h
@@ -16,8 +16,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__KIND_H
-#define CVC4__KIND_H
+#ifndef CVC5__KIND_H
+#define CVC5__KIND_H
#include <iosfwd>
@@ -104,4 +104,4 @@ namespace theory {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__KIND_H */
+#endif /* CVC5__KIND_H */
diff --git a/src/expr/lazy_proof.h b/src/expr/lazy_proof.h
index 3ab0ca49e..b60bfd409 100644
--- a/src/expr/lazy_proof.h
+++ b/src/expr/lazy_proof.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__LAZY_PROOF_H
-#define CVC4__EXPR__LAZY_PROOF_H
+#ifndef CVC5__EXPR__LAZY_PROOF_H
+#define CVC5__EXPR__LAZY_PROOF_H
#include "expr/proof.h"
@@ -107,4 +107,4 @@ class LazyCDProof : public CDProof
} // namespace cvc5
-#endif /* CVC4__EXPR__LAZY_PROOF_H */
+#endif /* CVC5__EXPR__LAZY_PROOF_H */
diff --git a/src/expr/lazy_proof_chain.h b/src/expr/lazy_proof_chain.h
index 41488c821..87881fae1 100644
--- a/src/expr/lazy_proof_chain.h
+++ b/src/expr/lazy_proof_chain.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__LAZY_PROOF_CHAIN_H
-#define CVC4__EXPR__LAZY_PROOF_CHAIN_H
+#ifndef CVC5__EXPR__LAZY_PROOF_CHAIN_H
+#define CVC5__EXPR__LAZY_PROOF_CHAIN_H
#include <vector>
@@ -150,4 +150,4 @@ class LazyCDProofChain : public ProofGenerator
} // namespace cvc5
-#endif /* CVC4__EXPR__LAZY_PROOF_CHAIN_H */
+#endif /* CVC5__EXPR__LAZY_PROOF_CHAIN_H */
diff --git a/src/expr/match_trie.h b/src/expr/match_trie.h
index 70ce549e1..6f85d20c9 100644
--- a/src/expr/match_trie.h
+++ b/src/expr/match_trie.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__MATCH_TRIE_H
-#define CVC4__EXPR__MATCH_TRIE_H
+#ifndef CVC5__EXPR__MATCH_TRIE_H
+#define CVC5__EXPR__MATCH_TRIE_H
#include <map>
#include <vector>
@@ -79,4 +79,4 @@ class MatchTrie
} // namespace expr
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_FILTER_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_FILTER_H */
diff --git a/src/expr/metakind_template.h b/src/expr/metakind_template.h
index 5c78d87d3..7f232b4e2 100644
--- a/src/expr/metakind_template.h
+++ b/src/expr/metakind_template.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__KIND__METAKIND_H
-#define CVC4__KIND__METAKIND_H
+#ifndef CVC5__KIND__METAKIND_H
+#define CVC5__KIND__METAKIND_H
#include <iosfwd>
@@ -128,11 +128,11 @@ struct NodeValuePoolEq {
#include "expr/node_value.h"
-#endif /* CVC4__KIND__METAKIND_H */
+#endif /* CVC5__KIND__METAKIND_H */
${metakind_includes}
-#ifdef CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP
+#ifdef CVC5__NODE_MANAGER_NEEDS_CONSTANT_MAP
namespace cvc5 {
@@ -207,4 +207,4 @@ Kind operatorToKind(::cvc5::expr::NodeValue* nv);
} // namespace cvc5
-#endif /* CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP */
+#endif /* CVC5__NODE_MANAGER_NEEDS_CONSTANT_MAP */
diff --git a/src/expr/node.h b/src/expr/node.h
index fb3cf1478..b8e44a4cb 100644
--- a/src/expr/node.h
+++ b/src/expr/node.h
@@ -19,8 +19,8 @@
// circular dependency
#include "expr/node_value.h"
-#ifndef CVC4__NODE_H
-#define CVC4__NODE_H
+#ifndef CVC5__NODE_H
+#define CVC5__NODE_H
#include <iostream>
#include <map>
@@ -1492,4 +1492,4 @@ static void __attribute__((used)) debugPrintRawTNode(const NodeTemplate<false>&
} // namespace cvc5
-#endif /* CVC4__NODE_H */
+#endif /* CVC5__NODE_H */
diff --git a/src/expr/node_algorithm.h b/src/expr/node_algorithm.h
index 7ae56e5ba..09630cb28 100644
--- a/src/expr/node_algorithm.h
+++ b/src/expr/node_algorithm.h
@@ -18,8 +18,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__NODE_ALGORITHM_H
-#define CVC4__EXPR__NODE_ALGORITHM_H
+#ifndef CVC5__EXPR__NODE_ALGORITHM_H
+#define CVC5__EXPR__NODE_ALGORITHM_H
#include <unordered_map>
#include <vector>
diff --git a/src/expr/node_builder.h b/src/expr/node_builder.h
index 218a08766..271a217dc 100644
--- a/src/expr/node_builder.h
+++ b/src/expr/node_builder.h
@@ -137,8 +137,8 @@
/* strong dependency; make sure node is included first */
#include "expr/node.h"
-#ifndef CVC4__NODE_BUILDER_H
-#define CVC4__NODE_BUILDER_H
+#ifndef CVC5__NODE_BUILDER_H
+#define CVC5__NODE_BUILDER_H
#include <iostream>
#include <vector>
@@ -407,4 +407,4 @@ std::ostream& operator<<(std::ostream& out, const NodeBuilder& nb);
} // namespace cvc5
-#endif /* CVC4__NODE_BUILDER_H */
+#endif /* CVC5__NODE_BUILDER_H */
diff --git a/src/expr/node_manager.h b/src/expr/node_manager.h
index 465ddf588..98eb111bc 100644
--- a/src/expr/node_manager.h
+++ b/src/expr/node_manager.h
@@ -23,8 +23,8 @@
#include "expr/node.h"
#include "expr/type_node.h"
-#ifndef CVC4__NODE_MANAGER_H
-#define CVC4__NODE_MANAGER_H
+#ifndef CVC5__NODE_MANAGER_H
+#define CVC5__NODE_MANAGER_H
#include <vector>
#include <string>
@@ -1197,9 +1197,9 @@ inline void NodeManager::poolRemove(expr::NodeValue* nv) {
} // namespace cvc5
-#define CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP
+#define CVC5__NODE_MANAGER_NEEDS_CONSTANT_MAP
#include "expr/metakind.h"
-#undef CVC4__NODE_MANAGER_NEEDS_CONSTANT_MAP
+#undef CVC5__NODE_MANAGER_NEEDS_CONSTANT_MAP
#include "expr/node_builder.h"
@@ -1572,4 +1572,4 @@ NodeClass NodeManager::mkConstInternal(const T& val) {
} // namespace cvc5
-#endif /* CVC4__NODE_MANAGER_H */
+#endif /* CVC5__NODE_MANAGER_H */
diff --git a/src/expr/node_self_iterator.h b/src/expr/node_self_iterator.h
index d8558de97..73fecf4ef 100644
--- a/src/expr/node_self_iterator.h
+++ b/src/expr/node_self_iterator.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__NODE_SELF_ITERATOR_H
-#define CVC4__EXPR__NODE_SELF_ITERATOR_H
+#ifndef CVC5__EXPR__NODE_SELF_ITERATOR_H
+#define CVC5__EXPR__NODE_SELF_ITERATOR_H
#include <iterator>
@@ -125,4 +125,4 @@ inline bool NodeSelfIterator::operator!=(NodeSelfIterator i) const {
} // namespace expr
} // namespace cvc5
-#endif /* CVC4__EXPR__NODE_SELF_ITERATOR_H */
+#endif /* CVC5__EXPR__NODE_SELF_ITERATOR_H */
diff --git a/src/expr/node_traversal.h b/src/expr/node_traversal.h
index 015bcec06..4b695d2ba 100644
--- a/src/expr/node_traversal.h
+++ b/src/expr/node_traversal.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__NODE_TRAVERSAL_H
-#define CVC4__EXPR__NODE_TRAVERSAL_H
+#ifndef CVC5__EXPR__NODE_TRAVERSAL_H
+#define CVC5__EXPR__NODE_TRAVERSAL_H
#include <iterator>
#include <unordered_map>
@@ -146,4 +146,4 @@ class NodeDfsIterable
} // namespace cvc5
-#endif // CVC4__EXPR__NODE_TRAVERSAL_H
+#endif // CVC5__EXPR__NODE_TRAVERSAL_H
diff --git a/src/expr/node_trie.h b/src/expr/node_trie.h
index 2f42b6a52..c2c686295 100644
--- a/src/expr/node_trie.h
+++ b/src/expr/node_trie.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__NODE_TRIE_H
-#define CVC4__EXPR__NODE_TRIE_H
+#ifndef CVC5__EXPR__NODE_TRIE_H
+#define CVC5__EXPR__NODE_TRIE_H
#include <map>
#include "expr/node.h"
@@ -109,4 +109,4 @@ typedef NodeTemplateTrie<false> TNodeTrie;
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__EXPR__NODE_TRIE_H */
+#endif /* CVC5__EXPR__NODE_TRIE_H */
diff --git a/src/expr/node_value.h b/src/expr/node_value.h
index 3f4b7602e..3e1ccd67e 100644
--- a/src/expr/node_value.h
+++ b/src/expr/node_value.h
@@ -23,8 +23,8 @@
// circular dependency
#include "expr/metakind.h"
-#ifndef CVC4__EXPR__NODE_VALUE_H
-#define CVC4__EXPR__NODE_VALUE_H
+#ifndef CVC5__EXPR__NODE_VALUE_H
+#define CVC5__EXPR__NODE_VALUE_H
#include <iterator>
#include <string>
@@ -546,4 +546,4 @@ static void __attribute__((used)) debugPrintRawNodeValue(const expr::NodeValue*
} // namespace cvc5
-#endif /* CVC4__EXPR__NODE_VALUE_H */
+#endif /* CVC5__EXPR__NODE_VALUE_H */
diff --git a/src/expr/proof.h b/src/expr/proof.h
index af859df93..5cea5354e 100644
--- a/src/expr/proof.h
+++ b/src/expr/proof.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__PROOF_H
-#define CVC4__EXPR__PROOF_H
+#ifndef CVC5__EXPR__PROOF_H
+#define CVC5__EXPR__PROOF_H
#include <vector>
@@ -275,4 +275,4 @@ class CDProof : public ProofGenerator
} // namespace cvc5
-#endif /* CVC4__EXPR__PROOF_MANAGER_H */
+#endif /* CVC5__EXPR__PROOF_MANAGER_H */
diff --git a/src/expr/proof_checker.h b/src/expr/proof_checker.h
index 99f9f3ec8..06e813e2d 100644
--- a/src/expr/proof_checker.h
+++ b/src/expr/proof_checker.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__PROOF_CHECKER_H
-#define CVC4__EXPR__PROOF_CHECKER_H
+#ifndef CVC5__EXPR__PROOF_CHECKER_H
+#define CVC5__EXPR__PROOF_CHECKER_H
#include <map>
@@ -204,4 +204,4 @@ class ProofChecker
} // namespace cvc5
-#endif /* CVC4__EXPR__PROOF_CHECKER_H */
+#endif /* CVC5__EXPR__PROOF_CHECKER_H */
diff --git a/src/expr/proof_ensure_closed.h b/src/expr/proof_ensure_closed.h
index d610147d4..8a7461287 100644
--- a/src/expr/proof_ensure_closed.h
+++ b/src/expr/proof_ensure_closed.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__PROOF_ENSURE_CLOSED_H
-#define CVC4__EXPR__PROOF_ENSURE_CLOSED_H
+#ifndef CVC5__EXPR__PROOF_ENSURE_CLOSED_H
+#define CVC5__EXPR__PROOF_ENSURE_CLOSED_H
#include "expr/node.h"
@@ -69,4 +69,4 @@ void pfnEnsureClosedWrt(ProofNode* pn,
const char* ctx);
} // namespace cvc5
-#endif /* CVC4__EXPR__PROOF_ENSURE_CLOSED_H */
+#endif /* CVC5__EXPR__PROOF_ENSURE_CLOSED_H */
diff --git a/src/expr/proof_generator.h b/src/expr/proof_generator.h
index 76a2c9b3b..2cc64e083 100644
--- a/src/expr/proof_generator.h
+++ b/src/expr/proof_generator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__PROOF_GENERATOR_H
-#define CVC4__EXPR__PROOF_GENERATOR_H
+#ifndef CVC5__EXPR__PROOF_GENERATOR_H
+#define CVC5__EXPR__PROOF_GENERATOR_H
#include "expr/node.h"
@@ -109,4 +109,4 @@ class ProofGenerator
} // namespace cvc5
-#endif /* CVC4__EXPR__PROOF_GENERATOR_H */
+#endif /* CVC5__EXPR__PROOF_GENERATOR_H */
diff --git a/src/expr/proof_node.h b/src/expr/proof_node.h
index ddd8e1e27..b849e2391 100644
--- a/src/expr/proof_node.h
+++ b/src/expr/proof_node.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__PROOF_NODE_H
-#define CVC4__EXPR__PROOF_NODE_H
+#ifndef CVC5__EXPR__PROOF_NODE_H
+#define CVC5__EXPR__PROOF_NODE_H
#include <vector>
@@ -141,4 +141,4 @@ std::ostream& operator<<(std::ostream& out, const ProofNode& pn);
} // namespace cvc5
-#endif /* CVC4__EXPR__PROOF_NODE_H */
+#endif /* CVC5__EXPR__PROOF_NODE_H */
diff --git a/src/expr/proof_node_algorithm.h b/src/expr/proof_node_algorithm.h
index 01faa8a40..6aa045481 100644
--- a/src/expr/proof_node_algorithm.h
+++ b/src/expr/proof_node_algorithm.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__PROOF_NODE_ALGORITHM_H
-#define CVC4__EXPR__PROOF_NODE_ALGORITHM_H
+#ifndef CVC5__EXPR__PROOF_NODE_ALGORITHM_H
+#define CVC5__EXPR__PROOF_NODE_ALGORITHM_H
#include <vector>
@@ -72,4 +72,4 @@ bool containsSubproof(ProofNode* pn,
} // namespace expr
} // namespace cvc5
-#endif /* CVC4__EXPR__PROOF_NODE_ALGORITHM_H */
+#endif /* CVC5__EXPR__PROOF_NODE_ALGORITHM_H */
diff --git a/src/expr/proof_node_manager.h b/src/expr/proof_node_manager.h
index 32513cd0d..251d43ed3 100644
--- a/src/expr/proof_node_manager.h
+++ b/src/expr/proof_node_manager.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__PROOF_NODE_MANAGER_H
-#define CVC4__EXPR__PROOF_NODE_MANAGER_H
+#ifndef CVC5__EXPR__PROOF_NODE_MANAGER_H
+#define CVC5__EXPR__PROOF_NODE_MANAGER_H
#include <vector>
@@ -202,4 +202,4 @@ class ProofNodeManager
} // namespace cvc5
-#endif /* CVC4__EXPR__PROOF_NODE_H */
+#endif /* CVC5__EXPR__PROOF_NODE_H */
diff --git a/src/expr/proof_node_to_sexpr.h b/src/expr/proof_node_to_sexpr.h
index bbbde39f6..31b04466e 100644
--- a/src/expr/proof_node_to_sexpr.h
+++ b/src/expr/proof_node_to_sexpr.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__PROOF_NODE_TO_SEXPR_H
-#define CVC4__EXPR__PROOF_NODE_TO_SEXPR_H
+#ifndef CVC5__EXPR__PROOF_NODE_TO_SEXPR_H
+#define CVC5__EXPR__PROOF_NODE_TO_SEXPR_H
#include <map>
@@ -66,4 +66,4 @@ class ProofNodeToSExpr
} // namespace cvc5
-#endif /* CVC4__EXPR__PROOF_RULE_H */
+#endif /* CVC5__EXPR__PROOF_RULE_H */
diff --git a/src/expr/proof_node_updater.h b/src/expr/proof_node_updater.h
index 268fcda5e..6f3e5b420 100644
--- a/src/expr/proof_node_updater.h
+++ b/src/expr/proof_node_updater.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__PROOF_NODE_UPDATER_H
-#define CVC4__EXPR__PROOF_NODE_UPDATER_H
+#ifndef CVC5__EXPR__PROOF_NODE_UPDATER_H
+#define CVC5__EXPR__PROOF_NODE_UPDATER_H
#include <map>
#include <memory>
diff --git a/src/expr/proof_rule.h b/src/expr/proof_rule.h
index cec85cc99..8aaf697d4 100644
--- a/src/expr/proof_rule.h
+++ b/src/expr/proof_rule.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__PROOF_RULE_H
-#define CVC4__EXPR__PROOF_RULE_H
+#ifndef CVC5__EXPR__PROOF_RULE_H
+#define CVC5__EXPR__PROOF_RULE_H
#include <iosfwd>
@@ -1385,4 +1385,4 @@ struct PfRuleHashFunction
} // namespace cvc5
-#endif /* CVC4__EXPR__PROOF_RULE_H */
+#endif /* CVC5__EXPR__PROOF_RULE_H */
diff --git a/src/expr/proof_set.h b/src/expr/proof_set.h
index 0509ed9d4..f684045c6 100644
--- a/src/expr/proof_set.h
+++ b/src/expr/proof_set.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__PROOF_SET_H
-#define CVC4__EXPR__PROOF_SET_H
+#ifndef CVC5__EXPR__PROOF_SET_H
+#define CVC5__EXPR__PROOF_SET_H
#include <memory>
@@ -72,4 +72,4 @@ class CDProofSet
} // namespace cvc5
-#endif /* CVC4__EXPR__LAZY_PROOF_SET_H */
+#endif /* CVC5__EXPR__LAZY_PROOF_SET_H */
diff --git a/src/expr/proof_step_buffer.h b/src/expr/proof_step_buffer.h
index 99a7608ff..ef57540c7 100644
--- a/src/expr/proof_step_buffer.h
+++ b/src/expr/proof_step_buffer.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__PROOF_STEP_BUFFER_H
-#define CVC4__EXPR__PROOF_STEP_BUFFER_H
+#ifndef CVC5__EXPR__PROOF_STEP_BUFFER_H
+#define CVC5__EXPR__PROOF_STEP_BUFFER_H
#include <vector>
@@ -94,4 +94,4 @@ class ProofStepBuffer
} // namespace cvc5
-#endif /* CVC4__EXPR__PROOF_STEP_BUFFER_H */
+#endif /* CVC5__EXPR__PROOF_STEP_BUFFER_H */
diff --git a/src/expr/record.h b/src/expr/record.h
index 436b5b269..fa6a34395 100644
--- a/src/expr/record.h
+++ b/src/expr/record.h
@@ -16,8 +16,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__RECORD_H
-#define CVC4__RECORD_H
+#ifndef CVC5__RECORD_H
+#define CVC5__RECORD_H
#include <iostream>
#include <string>
@@ -58,4 +58,4 @@ using Record = std::vector<std::pair<std::string, TypeNode>>;
} // namespace cvc5
-#endif /* CVC4__RECORD_H */
+#endif /* CVC5__RECORD_H */
diff --git a/src/expr/sequence.h b/src/expr/sequence.h
index e42851f58..e75c38956 100644
--- a/src/expr/sequence.h
+++ b/src/expr/sequence.h
@@ -14,8 +14,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__EXPR__SEQUENCE_H
-#define CVC4__EXPR__SEQUENCE_H
+#ifndef CVC5__EXPR__SEQUENCE_H
+#define CVC5__EXPR__SEQUENCE_H
#include <memory>
#include <vector>
@@ -175,4 +175,4 @@ std::ostream& operator<<(std::ostream& os, const Sequence& s);
} // namespace cvc5
-#endif /* CVC4__EXPR__SEQUENCE_H */
+#endif /* CVC5__EXPR__SEQUENCE_H */
diff --git a/src/expr/skolem_manager.h b/src/expr/skolem_manager.h
index 6cebee5d9..b69853a85 100644
--- a/src/expr/skolem_manager.h
+++ b/src/expr/skolem_manager.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__SKOLEM_MANAGER_H
-#define CVC4__EXPR__SKOLEM_MANAGER_H
+#ifndef CVC5__EXPR__SKOLEM_MANAGER_H
+#define CVC5__EXPR__SKOLEM_MANAGER_H
#include <string>
@@ -314,4 +314,4 @@ class SkolemManager
} // namespace cvc5
-#endif /* CVC4__EXPR__PROOF_SKOLEM_CACHE_H */
+#endif /* CVC5__EXPR__PROOF_SKOLEM_CACHE_H */
diff --git a/src/expr/subs.h b/src/expr/subs.h
index fdb8e4551..d351eeaa7 100644
--- a/src/expr/subs.h
+++ b/src/expr/subs.h
@@ -12,8 +12,8 @@
** \brief Simple substitution utility
**/
-#ifndef CVC4__EXPR__SUBS_H
-#define CVC4__EXPR__SUBS_H
+#ifndef CVC5__EXPR__SUBS_H
+#define CVC5__EXPR__SUBS_H
#include <map>
#include <vector>
@@ -82,4 +82,4 @@ std::ostream& operator<<(std::ostream& out, const Subs& s);
} // namespace cvc5
-#endif /* CVC4__EXPR__SUBS_H */
+#endif /* CVC5__EXPR__SUBS_H */
diff --git a/src/expr/sygus_datatype.h b/src/expr/sygus_datatype.h
index e5d1de740..b3130a028 100644
--- a/src/expr/sygus_datatype.h
+++ b/src/expr/sygus_datatype.h
@@ -13,8 +13,8 @@
**/
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__SYGUS_DATATYPE_H
-#define CVC4__EXPR__SYGUS_DATATYPE_H
+#ifndef CVC5__EXPR__SYGUS_DATATYPE_H
+#define CVC5__EXPR__SYGUS_DATATYPE_H
#include <string>
#include <vector>
diff --git a/src/expr/symbol_manager.h b/src/expr/symbol_manager.h
index 4ff307bc2..96bc3954d 100644
--- a/src/expr/symbol_manager.h
+++ b/src/expr/symbol_manager.h
@@ -14,8 +14,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__EXPR__SYMBOL_MANAGER_H
-#define CVC4__EXPR__SYMBOL_MANAGER_H
+#ifndef CVC5__EXPR__SYMBOL_MANAGER_H
+#define CVC5__EXPR__SYMBOL_MANAGER_H
#include <map>
#include <memory>
@@ -158,4 +158,4 @@ class CVC4_EXPORT SymbolManager
} // namespace cvc5
-#endif /* CVC4__EXPR__SYMBOL_MANAGER_H */
+#endif /* CVC5__EXPR__SYMBOL_MANAGER_H */
diff --git a/src/expr/symbol_table.h b/src/expr/symbol_table.h
index fbb1969dd..98cba9ff8 100644
--- a/src/expr/symbol_table.h
+++ b/src/expr/symbol_table.h
@@ -16,8 +16,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__SYMBOL_TABLE_H
-#define CVC4__SYMBOL_TABLE_H
+#ifndef CVC5__SYMBOL_TABLE_H
+#define CVC5__SYMBOL_TABLE_H
#include <memory>
#include <string>
@@ -212,4 +212,4 @@ class CVC4_EXPORT SymbolTable
} // namespace cvc5
-#endif /* CVC4__SYMBOL_TABLE_H */
+#endif /* CVC5__SYMBOL_TABLE_H */
diff --git a/src/expr/tconv_seq_proof_generator.h b/src/expr/tconv_seq_proof_generator.h
index 151cd511d..2e14acb98 100644
--- a/src/expr/tconv_seq_proof_generator.h
+++ b/src/expr/tconv_seq_proof_generator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__TCONV_SEQ_PROOF_GENERATOR_H
-#define CVC4__EXPR__TCONV_SEQ_PROOF_GENERATOR_H
+#ifndef CVC5__EXPR__TCONV_SEQ_PROOF_GENERATOR_H
+#define CVC5__EXPR__TCONV_SEQ_PROOF_GENERATOR_H
#include "context/cdhashmap.h"
#include "expr/node.h"
@@ -117,4 +117,4 @@ class TConvSeqProofGenerator : public ProofGenerator
} // namespace cvc5
-#endif /* CVC4__EXPR__TCONV_SEQ_PROOF_GENERATOR_H */
+#endif /* CVC5__EXPR__TCONV_SEQ_PROOF_GENERATOR_H */
diff --git a/src/expr/term_canonize.h b/src/expr/term_canonize.h
index f15bb2df0..a032f3a84 100644
--- a/src/expr/term_canonize.h
+++ b/src/expr/term_canonize.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__TERM_CANONIZE_H
-#define CVC4__EXPR__TERM_CANONIZE_H
+#ifndef CVC5__EXPR__TERM_CANONIZE_H
+#define CVC5__EXPR__TERM_CANONIZE_H
#include <map>
#include "expr/node.h"
@@ -102,4 +102,4 @@ class TermCanonize
} // namespace expr
} // namespace cvc5
-#endif /* CVC4__EXPR__TERM_CANONIZE_H */
+#endif /* CVC5__EXPR__TERM_CANONIZE_H */
diff --git a/src/expr/term_context.h b/src/expr/term_context.h
index 062104fc2..5bdab4fca 100644
--- a/src/expr/term_context.h
+++ b/src/expr/term_context.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__TERM_CONTEXT_H
-#define CVC4__EXPR__TERM_CONTEXT_H
+#ifndef CVC5__EXPR__TERM_CONTEXT_H
+#define CVC5__EXPR__TERM_CONTEXT_H
#include "expr/node.h"
@@ -165,4 +165,4 @@ class PolarityTermContext : public TermContext
} // namespace cvc5
-#endif /* CVC4__EXPR__TERM_CONVERSION_PROOF_GENERATOR_H */
+#endif /* CVC5__EXPR__TERM_CONVERSION_PROOF_GENERATOR_H */
diff --git a/src/expr/term_context_node.h b/src/expr/term_context_node.h
index 5af435a56..1c3542b57 100644
--- a/src/expr/term_context_node.h
+++ b/src/expr/term_context_node.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__TERM_CONTEXT_NODE_H
-#define CVC4__EXPR__TERM_CONTEXT_NODE_H
+#ifndef CVC5__EXPR__TERM_CONTEXT_NODE_H
+#define CVC5__EXPR__TERM_CONTEXT_NODE_H
#include "expr/node.h"
@@ -76,4 +76,4 @@ class TCtxNode
} // namespace cvc5
-#endif /* CVC4__EXPR__TERM_CONVERSION_PROOF_GENERATOR_H */
+#endif /* CVC5__EXPR__TERM_CONVERSION_PROOF_GENERATOR_H */
diff --git a/src/expr/term_context_stack.h b/src/expr/term_context_stack.h
index 0042091ed..48892e654 100644
--- a/src/expr/term_context_stack.h
+++ b/src/expr/term_context_stack.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__TERM_CONTEXT_STACK_H
-#define CVC4__EXPR__TERM_CONTEXT_STACK_H
+#ifndef CVC5__EXPR__TERM_CONTEXT_STACK_H
+#define CVC5__EXPR__TERM_CONTEXT_STACK_H
#include "expr/term_context_node.h"
@@ -70,4 +70,4 @@ class TCtxStack
} // namespace cvc5
-#endif /* CVC4__EXPR__TERM_CONTEXT_STACK_H */
+#endif /* CVC5__EXPR__TERM_CONTEXT_STACK_H */
diff --git a/src/expr/term_conversion_proof_generator.h b/src/expr/term_conversion_proof_generator.h
index e1f2b90e8..961ac61cc 100644
--- a/src/expr/term_conversion_proof_generator.h
+++ b/src/expr/term_conversion_proof_generator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__TERM_CONVERSION_PROOF_GENERATOR_H
-#define CVC4__EXPR__TERM_CONVERSION_PROOF_GENERATOR_H
+#ifndef CVC5__EXPR__TERM_CONVERSION_PROOF_GENERATOR_H
+#define CVC5__EXPR__TERM_CONVERSION_PROOF_GENERATOR_H
#include "context/cdhashmap.h"
#include "expr/lazy_proof.h"
@@ -244,4 +244,4 @@ class TConvProofGenerator : public ProofGenerator
} // namespace cvc5
-#endif /* CVC4__EXPR__TERM_CONVERSION_PROOF_GENERATOR_H */
+#endif /* CVC5__EXPR__TERM_CONVERSION_PROOF_GENERATOR_H */
diff --git a/src/expr/type_checker.h b/src/expr/type_checker.h
index fee02de75..5b806e671 100644
--- a/src/expr/type_checker.h
+++ b/src/expr/type_checker.h
@@ -19,8 +19,8 @@
// ordering dependence
#include "expr/node.h"
-#ifndef CVC4__EXPR__TYPE_CHECKER_H
-#define CVC4__EXPR__TYPE_CHECKER_H
+#ifndef CVC5__EXPR__TYPE_CHECKER_H
+#define CVC5__EXPR__TYPE_CHECKER_H
namespace cvc5 {
namespace expr {
@@ -38,4 +38,4 @@ public:
} // namespace expr
} // namespace cvc5
-#endif /* CVC4__EXPR__TYPE_CHECKER_H */
+#endif /* CVC5__EXPR__TYPE_CHECKER_H */
diff --git a/src/expr/type_matcher.h b/src/expr/type_matcher.h
index a75bb7b8b..6df955c06 100644
--- a/src/expr/type_matcher.h
+++ b/src/expr/type_matcher.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__EXPR__TYPE_MATCHER_H
-#define CVC4__EXPR__TYPE_MATCHER_H
+#ifndef CVC5__EXPR__TYPE_MATCHER_H
+#define CVC5__EXPR__TYPE_MATCHER_H
#include <vector>
@@ -70,4 +70,4 @@ class TypeMatcher
} // namespace cvc5
-#endif /* CVC4__MATCHER_H */
+#endif /* CVC5__MATCHER_H */
diff --git a/src/expr/type_node.h b/src/expr/type_node.h
index f8cc5a44b..41f9afe6f 100644
--- a/src/expr/type_node.h
+++ b/src/expr/type_node.h
@@ -19,8 +19,8 @@
// circular dependency
#include "expr/node_value.h"
-#ifndef CVC4__TYPE_NODE_H
-#define CVC4__TYPE_NODE_H
+#ifndef CVC5__TYPE_NODE_H
+#define CVC5__TYPE_NODE_H
#include <iostream>
#include <string>
@@ -1070,4 +1070,4 @@ static void __attribute__((used)) debugPrintRawTypeNode(const TypeNode& n) {
} // namespace cvc5
-#endif /* CVC4__NODE_H */
+#endif /* CVC5__NODE_H */
diff --git a/src/expr/type_properties_template.h b/src/expr/type_properties_template.h
index ce2696c5b..c6fb29b71 100644
--- a/src/expr/type_properties_template.h
+++ b/src/expr/type_properties_template.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__TYPE_PROPERTIES_H
-#define CVC4__TYPE_PROPERTIES_H
+#ifndef CVC5__TYPE_PROPERTIES_H
+#define CVC5__TYPE_PROPERTIES_H
#include <sstream>
@@ -116,4 +116,4 @@ ${type_groundterms}
} // namespace kind
} // namespace cvc5
-#endif /* CVC4__TYPE_PROPERTIES_H */
+#endif /* CVC5__TYPE_PROPERTIES_H */
diff --git a/src/expr/uninterpreted_constant.h b/src/expr/uninterpreted_constant.h
index 94d7f85ed..841b32626 100644
--- a/src/expr/uninterpreted_constant.h
+++ b/src/expr/uninterpreted_constant.h
@@ -16,8 +16,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__UNINTERPRETED_CONSTANT_H
-#define CVC4__UNINTERPRETED_CONSTANT_H
+#ifndef CVC5__UNINTERPRETED_CONSTANT_H
+#define CVC5__UNINTERPRETED_CONSTANT_H
#include <iosfwd>
#include <memory>
@@ -62,4 +62,4 @@ struct UninterpretedConstantHashFunction
} // namespace cvc5
-#endif /* CVC4__UNINTERPRETED_CONSTANT_H */
+#endif /* CVC5__UNINTERPRETED_CONSTANT_H */
diff --git a/src/lib/clock_gettime.h b/src/lib/clock_gettime.h
index f177b2ddd..15c5020a1 100644
--- a/src/lib/clock_gettime.h
+++ b/src/lib/clock_gettime.h
@@ -16,8 +16,8 @@
#include "cvc4_private_library.h"
-#ifndef CVC4__LIB__CLOCK_GETTIME_H
-#define CVC4__LIB__CLOCK_GETTIME_H
+#ifndef CVC5__LIB__CLOCK_GETTIME_H
+#define CVC5__LIB__CLOCK_GETTIME_H
#include "lib/replacements.h"
@@ -72,4 +72,4 @@ long clock_gettime(clockid_t which_clock, struct timespec* tp);
#endif /* __cplusplus */
#endif /* HAVE_CLOCK_GETTIME */
-#endif /*CVC4__LIB__CLOCK_GETTIME_H */
+#endif /*CVC5__LIB__CLOCK_GETTIME_H */
diff --git a/src/lib/ffs.h b/src/lib/ffs.h
index abc9cdee5..aed8be25e 100644
--- a/src/lib/ffs.h
+++ b/src/lib/ffs.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__LIB__FFS_H
-#define CVC4__LIB__FFS_H
+#ifndef CVC5__LIB__FFS_H
+#define CVC5__LIB__FFS_H
//We include this for HAVE_FFS
#include "cvc4autoconfig.h"
@@ -42,4 +42,4 @@ int ffs(int i);
#endif /* __cplusplus */
#endif /* HAVE_FFS */
-#endif /* CVC4__LIB__FFS_H */
+#endif /* CVC5__LIB__FFS_H */
diff --git a/src/lib/replacements.h b/src/lib/replacements.h
index 3434a3c7f..8a6527f15 100644
--- a/src/lib/replacements.h
+++ b/src/lib/replacements.h
@@ -14,8 +14,8 @@
** Common header for replacement function sources.
**/
-#ifndef CVC4__LIB__REPLACEMENTS_H
-#define CVC4__LIB__REPLACEMENTS_H
+#ifndef CVC5__LIB__REPLACEMENTS_H
+#define CVC5__LIB__REPLACEMENTS_H
#if (defined(__BUILDING_CVC4LIB) || defined(__BUILDING_CVC4LIB_UNIT_TEST)) && !defined(__BUILDING_STATISTICS_FOR_EXPORT)
# include "cvc4_private.h"
@@ -31,4 +31,4 @@
# endif
#endif
-#endif /* CVC4__LIB__REPLACEMENTS_H */
+#endif /* CVC5__LIB__REPLACEMENTS_H */
diff --git a/src/lib/strtok_r.h b/src/lib/strtok_r.h
index 84267b366..971e2703e 100644
--- a/src/lib/strtok_r.h
+++ b/src/lib/strtok_r.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__LIB__STRTOK_R_H
-#define CVC4__LIB__STRTOK_R_H
+#ifndef CVC5__LIB__STRTOK_R_H
+#define CVC5__LIB__STRTOK_R_H
#ifdef HAVE_STRTOK_R
@@ -39,4 +39,4 @@ char* strtok_r(char *str, const char *delim, char **saveptr);
#endif /* __cplusplus */
#endif /* HAVE_STRTOK_R */
-#endif /* CVC4__LIB__STRTOK_R_H */
+#endif /* CVC5__LIB__STRTOK_R_H */
diff --git a/src/main/command_executor.h b/src/main/command_executor.h
index 1b68e01e6..5a848bad0 100644
--- a/src/main/command_executor.h
+++ b/src/main/command_executor.h
@@ -12,8 +12,8 @@
** \brief An additional layer between commands and invoking them.
**/
-#ifndef CVC4__MAIN__COMMAND_EXECUTOR_H
-#define CVC4__MAIN__COMMAND_EXECUTOR_H
+#ifndef CVC5__MAIN__COMMAND_EXECUTOR_H
+#define CVC5__MAIN__COMMAND_EXECUTOR_H
#include <iosfwd>
#include <string>
@@ -119,4 +119,4 @@ bool solverInvoke(api::Solver* solver,
} // namespace main
} // namespace cvc5
-#endif /* CVC4__MAIN__COMMAND_EXECUTOR_H */
+#endif /* CVC5__MAIN__COMMAND_EXECUTOR_H */
diff --git a/src/main/interactive_shell.h b/src/main/interactive_shell.h
index 2f7f0af21..5ae3b40ef 100644
--- a/src/main/interactive_shell.h
+++ b/src/main/interactive_shell.h
@@ -12,8 +12,8 @@
** \brief Interactive shell for CVC4
**/
-#ifndef CVC4__INTERACTIVE_SHELL_H
-#define CVC4__INTERACTIVE_SHELL_H
+#ifndef CVC5__INTERACTIVE_SHELL_H
+#define CVC5__INTERACTIVE_SHELL_H
#include <iosfwd>
#include <string>
@@ -74,4 +74,4 @@ public:
} // namespace cvc5
-#endif /* CVC4__INTERACTIVE_SHELL_H */
+#endif /* CVC5__INTERACTIVE_SHELL_H */
diff --git a/src/main/main.h b/src/main/main.h
index 6f485a1f5..3f35a9ad4 100644
--- a/src/main/main.h
+++ b/src/main/main.h
@@ -23,8 +23,8 @@
#include "cvc4autoconfig.h"
#include "options/options.h"
-#ifndef CVC4__MAIN__MAIN_H
-#define CVC4__MAIN__MAIN_H
+#ifndef CVC5__MAIN__MAIN_H
+#define CVC5__MAIN__MAIN_H
namespace cvc5 {
namespace main {
@@ -78,4 +78,4 @@ void cvc4_shutdown() noexcept;
int runCvc4(int argc, char* argv[], cvc5::Options&);
void printUsage(cvc5::Options&, bool full = false);
-#endif /* CVC4__MAIN__MAIN_H */
+#endif /* CVC5__MAIN__MAIN_H */
diff --git a/src/main/signal_handlers.h b/src/main/signal_handlers.h
index f8fdaf7fd..c7506de4f 100644
--- a/src/main/signal_handlers.h
+++ b/src/main/signal_handlers.h
@@ -14,8 +14,8 @@
** Implementation of signal handlers.
**/
-#ifndef CVC4__MAIN__SIGNAL_HANDLERS_H
-#define CVC4__MAIN__SIGNAL_HANDLERS_H
+#ifndef CVC5__MAIN__SIGNAL_HANDLERS_H
+#define CVC5__MAIN__SIGNAL_HANDLERS_H
namespace cvc5 {
namespace main {
@@ -43,4 +43,4 @@ void cleanup();
} // namespace main
} // namespace cvc5
-#endif /* CVC4__MAIN__SIGNAL_HANDLERS_H */
+#endif /* CVC5__MAIN__SIGNAL_HANDLERS_H */
diff --git a/src/main/time_limit.h b/src/main/time_limit.h
index ce55523f1..1e87a21bc 100644
--- a/src/main/time_limit.h
+++ b/src/main/time_limit.h
@@ -14,8 +14,8 @@
** Implementation of time limits that are imposed by the --tlimit option.
**/
-#ifndef CVC4__MAIN__TIME_LIMIT_H
-#define CVC4__MAIN__TIME_LIMIT_H
+#ifndef CVC5__MAIN__TIME_LIMIT_H
+#define CVC5__MAIN__TIME_LIMIT_H
#include "options/options.h"
@@ -49,4 +49,4 @@ TimeLimit install_time_limit(const Options& opts);
} // namespace main
} // namespace cvc5
-#endif /* CVC4__MAIN__TIME_LIMIT_H */
+#endif /* CVC5__MAIN__TIME_LIMIT_H */
diff --git a/src/omt/bitvector_optimizer.h b/src/omt/bitvector_optimizer.h
index 9cafea38b..29031bbe3 100644
--- a/src/omt/bitvector_optimizer.h
+++ b/src/omt/bitvector_optimizer.h
@@ -12,8 +12,8 @@
** \brief Optimizer for BitVector type
**/
-#ifndef CVC4__OMT__BITVECTOR_OPTIMIZER_H
-#define CVC4__OMT__BITVECTOR_OPTIMIZER_H
+#ifndef CVC5__OMT__BITVECTOR_OPTIMIZER_H
+#define CVC5__OMT__BITVECTOR_OPTIMIZER_H
#include "omt/omt_optimizer.h"
@@ -47,4 +47,4 @@ class OMTOptimizerBitVector : public OMTOptimizer
} // namespace cvc5::omt
-#endif /* CVC4__OMT__BITVECTOR_OPTIMIZER_H */
+#endif /* CVC5__OMT__BITVECTOR_OPTIMIZER_H */
diff --git a/src/omt/integer_optimizer.h b/src/omt/integer_optimizer.h
index 398aed616..89687547f 100644
--- a/src/omt/integer_optimizer.h
+++ b/src/omt/integer_optimizer.h
@@ -12,8 +12,8 @@
** \brief Optimizer for Integer type
**/
-#ifndef CVC4__OMT__INTEGER_OPTIMIZER_H
-#define CVC4__OMT__INTEGER_OPTIMIZER_H
+#ifndef CVC5__OMT__INTEGER_OPTIMIZER_H
+#define CVC5__OMT__INTEGER_OPTIMIZER_H
#include "omt/omt_optimizer.h"
@@ -44,4 +44,4 @@ class OMTOptimizerInteger : public OMTOptimizer
} // namespace cvc5::omt
-#endif /* CVC4__OMT__INTEGER_OPTIMIZER_H */
+#endif /* CVC5__OMT__INTEGER_OPTIMIZER_H */
diff --git a/src/omt/omt_optimizer.h b/src/omt/omt_optimizer.h
index da84556da..8f20894c4 100644
--- a/src/omt/omt_optimizer.h
+++ b/src/omt/omt_optimizer.h
@@ -12,8 +12,8 @@
** \brief The base class for optimizers of individual CVC4 type
**/
-#ifndef CVC4__OMT__OMT_OPTIMIZER_H
-#define CVC4__OMT__OMT_OPTIMIZER_H
+#ifndef CVC5__OMT__OMT_OPTIMIZER_H
+#define CVC5__OMT__OMT_OPTIMIZER_H
#include "smt/optimization_solver.h"
@@ -81,4 +81,4 @@ class OMTOptimizer
} // namespace cvc5::omt
-#endif /* CVC4__OMT__OMT_OPTIMIZER_H */
+#endif /* CVC5__OMT__OMT_OPTIMIZER_H */
diff --git a/src/options/base_handlers.h b/src/options/base_handlers.h
index 895a450a3..027412f5a 100644
--- a/src/options/base_handlers.h
+++ b/src/options/base_handlers.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__BASE_HANDLERS_H
-#define CVC4__BASE_HANDLERS_H
+#ifndef CVC5__BASE_HANDLERS_H
+#define CVC5__BASE_HANDLERS_H
#include <iostream>
#include <string>
@@ -83,4 +83,4 @@ struct not_equal : public comparator<std::not_equal_to> {
} // namespace options
} // namespace cvc5
-#endif /* CVC4__BASE_HANDLERS_H */
+#endif /* CVC5__BASE_HANDLERS_H */
diff --git a/src/options/decision_weight.h b/src/options/decision_weight.h
index 851efc565..ffc2a3626 100644
--- a/src/options/decision_weight.h
+++ b/src/options/decision_weight.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__OPTIONS__DECISION_WEIGHT_H
-#define CVC4__OPTIONS__DECISION_WEIGHT_H
+#ifndef CVC5__OPTIONS__DECISION_WEIGHT_H
+#define CVC5__OPTIONS__DECISION_WEIGHT_H
namespace cvc5 {
namespace decision {
@@ -27,4 +27,4 @@ typedef uint64_t DecisionWeight;
} // namespace decision
} // namespace cvc5
-#endif /* CVC4__OPTIONS__DECISION_WEIGHT_H */
+#endif /* CVC5__OPTIONS__DECISION_WEIGHT_H */
diff --git a/src/options/language.h b/src/options/language.h
index 9ed7fb4d4..69a349c61 100644
--- a/src/options/language.h
+++ b/src/options/language.h
@@ -16,8 +16,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__LANGUAGE_H
-#define CVC4__LANGUAGE_H
+#ifndef CVC5__LANGUAGE_H
+#define CVC5__LANGUAGE_H
#include <ostream>
#include <string>
@@ -179,4 +179,4 @@ OutputLanguage toOutputLanguage(std::string language) CVC4_EXPORT;
} // namespace language
} // namespace cvc5
-#endif /* CVC4__LANGUAGE_H */
+#endif /* CVC5__LANGUAGE_H */
diff --git a/src/options/module_template.h b/src/options/module_template.h
index 7e4b7775d..2e5e402fc 100644
--- a/src/options/module_template.h
+++ b/src/options/module_template.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__OPTIONS__${id}$_H
-#define CVC4__OPTIONS__${id}$_H
+#ifndef CVC5__OPTIONS__${id}$_H
+#define CVC5__OPTIONS__${id}$_H
#include "options/options.h"
@@ -44,5 +44,5 @@ ${inls}$
} // namespace options
} // namespace cvc5
-#endif /* CVC4__OPTIONS__${id}$_H */
+#endif /* CVC5__OPTIONS__${id}$_H */
//clang-format on
diff --git a/src/options/open_ostream.h b/src/options/open_ostream.h
index 22e3ca16b..4fbb99ecf 100644
--- a/src/options/open_ostream.h
+++ b/src/options/open_ostream.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__OPEN_OSTREAM_H
-#define CVC4__OPEN_OSTREAM_H
+#ifndef CVC5__OPEN_OSTREAM_H
+#define CVC5__OPEN_OSTREAM_H
#include <iosfwd>
#include <map>
@@ -57,4 +57,4 @@ std::string cvc4_errno_failreason();
} // namespace cvc5
-#endif /* CVC4__OPEN_OSTREAM_H */
+#endif /* CVC5__OPEN_OSTREAM_H */
diff --git a/src/options/option_exception.h b/src/options/option_exception.h
index bfaa2a421..a62fa2b80 100644
--- a/src/options/option_exception.h
+++ b/src/options/option_exception.h
@@ -16,8 +16,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__OPTION_EXCEPTION_H
-#define CVC4__OPTION_EXCEPTION_H
+#ifndef CVC5__OPTION_EXCEPTION_H
+#define CVC5__OPTION_EXCEPTION_H
#include "base/exception.h"
#include "cvc4_export.h"
@@ -71,4 +71,4 @@ class UnrecognizedOptionException : public cvc5::OptionException
} // namespace cvc5
-#endif /* CVC4__OPTION_EXCEPTION_H */
+#endif /* CVC5__OPTION_EXCEPTION_H */
diff --git a/src/options/options.h b/src/options/options.h
index 1c62d5a07..f68465a0a 100644
--- a/src/options/options.h
+++ b/src/options/options.h
@@ -16,8 +16,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__OPTIONS__OPTIONS_H
-#define CVC4__OPTIONS__OPTIONS_H
+#ifndef CVC5__OPTIONS__OPTIONS_H
+#define CVC5__OPTIONS__OPTIONS_H
#include <fstream>
#include <ostream>
@@ -308,4 +308,4 @@ public:
} // namespace cvc5
-#endif /* CVC4__OPTIONS__OPTIONS_H */
+#endif /* CVC5__OPTIONS__OPTIONS_H */
diff --git a/src/options/options_handler.h b/src/options/options_handler.h
index ce174d32e..7d1b1802a 100644
--- a/src/options/options_handler.h
+++ b/src/options/options_handler.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__OPTIONS__OPTIONS_HANDLER_H
-#define CVC4__OPTIONS__OPTIONS_HANDLER_H
+#ifndef CVC5__OPTIONS__OPTIONS_HANDLER_H
+#define CVC5__OPTIONS__OPTIONS_HANDLER_H
#include <ostream>
#include <string>
@@ -136,4 +136,4 @@ void OptionsHandler::checkSatSolverEnabled(std::string option, T m)
} // namespace options
} // namespace cvc5
-#endif /* CVC4__OPTIONS__OPTIONS_HANDLER_H */
+#endif /* CVC5__OPTIONS__OPTIONS_HANDLER_H */
diff --git a/src/options/options_holder_template.h b/src/options/options_holder_template.h
index 956cd87bf..776bd51d6 100644
--- a/src/options/options_holder_template.h
+++ b/src/options/options_holder_template.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__OPTIONS__OPTIONS_HOLDER_H
-#define CVC4__OPTIONS__OPTIONS_HOLDER_H
+#ifndef CVC5__OPTIONS__OPTIONS_HOLDER_H
+#define CVC5__OPTIONS__OPTIONS_HOLDER_H
// clang-format off
${headers_module}$
@@ -35,5 +35,5 @@ struct OptionsHolder
} // namespace options
} // namespace cvc5
-#endif /* CVC4__OPTIONS__OPTIONS_HOLDER_H */
+#endif /* CVC5__OPTIONS__OPTIONS_HOLDER_H */
// clang-format on
diff --git a/src/options/options_listener.h b/src/options/options_listener.h
index a5a2218b2..e15164bfb 100644
--- a/src/options/options_listener.h
+++ b/src/options/options_listener.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__OPTIONS__OPTIONS_LISTENER_H
-#define CVC4__OPTIONS__OPTIONS_LISTENER_H
+#ifndef CVC5__OPTIONS__OPTIONS_LISTENER_H
+#define CVC5__OPTIONS__OPTIONS_LISTENER_H
#include <string>
@@ -34,4 +34,4 @@ class OptionsListener
} // namespace cvc5
-#endif /* CVC4__OPTIONS__OPTION_LISTENER_H */
+#endif /* CVC5__OPTIONS__OPTION_LISTENER_H */
diff --git a/src/options/printer_modes.h b/src/options/printer_modes.h
index f5da12b36..d9a511903 100644
--- a/src/options/printer_modes.h
+++ b/src/options/printer_modes.h
@@ -17,8 +17,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__PRINTER__MODES_H
-#define CVC4__PRINTER__MODES_H
+#ifndef CVC5__PRINTER__MODES_H
+#define CVC5__PRINTER__MODES_H
#include <iostream>
@@ -41,4 +41,4 @@ std::ostream& operator<<(std::ostream& out, options::InstFormatMode mode);
} // namespace cvc5
-#endif /* CVC4__PRINTER__MODEL_FORMAT_H */
+#endif /* CVC5__PRINTER__MODEL_FORMAT_H */
diff --git a/src/options/set_language.h b/src/options/set_language.h
index cebd4f65e..029ff4157 100644
--- a/src/options/set_language.h
+++ b/src/options/set_language.h
@@ -16,8 +16,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__OPTIONS__SET_LANGUAGE_H
-#define CVC4__OPTIONS__SET_LANGUAGE_H
+#ifndef CVC5__OPTIONS__SET_LANGUAGE_H
+#define CVC5__OPTIONS__SET_LANGUAGE_H
#include <iostream>
@@ -93,4 +93,4 @@ std::ostream& operator<<(std::ostream& out, SetLanguage l) CVC4_EXPORT;
} // namespace language
} // namespace cvc5
-#endif /* CVC4__OPTIONS__SET_LANGUAGE_H */
+#endif /* CVC5__OPTIONS__SET_LANGUAGE_H */
diff --git a/src/parser/antlr_input.h b/src/parser/antlr_input.h
index c7cb60af7..8f763911c 100644
--- a/src/parser/antlr_input.h
+++ b/src/parser/antlr_input.h
@@ -14,8 +14,8 @@
** Base for ANTLR parser classes.
**/
-#ifndef CVC4__PARSER__ANTLR_INPUT_H
-#define CVC4__PARSER__ANTLR_INPUT_H
+#ifndef CVC5__PARSER__ANTLR_INPUT_H
+#define CVC5__PARSER__ANTLR_INPUT_H
#include <antlr3.h>
@@ -294,4 +294,4 @@ inline BitVector AntlrInput::tokenToBitvector(pANTLR3_COMMON_TOKEN number, pANTL
} // namespace parser
} // namespace cvc5
-#endif /* CVC4__PARSER__ANTLR_INPUT_H */
+#endif /* CVC5__PARSER__ANTLR_INPUT_H */
diff --git a/src/parser/antlr_line_buffered_input.h b/src/parser/antlr_line_buffered_input.h
index d687550a4..ca6831e5e 100644
--- a/src/parser/antlr_line_buffered_input.h
+++ b/src/parser/antlr_line_buffered_input.h
@@ -22,8 +22,8 @@
#include "cvc4parser_private.h"
-#ifndef CVC4__PARSER__ANTLR_LINE_BUFFERED_INPUT_H
-#define CVC4__PARSER__ANTLR_LINE_BUFFERED_INPUT_H
+#ifndef CVC5__PARSER__ANTLR_LINE_BUFFERED_INPUT_H
+#define CVC5__PARSER__ANTLR_LINE_BUFFERED_INPUT_H
#include <antlr3.h>
#include <istream>
@@ -47,4 +47,4 @@ pANTLR3_INPUT_STREAM antlr3LineBufferedStreamNew(std::istream& in,
} // namespace parser
} // namespace cvc5
-#endif /* CVC4__PARSER__ANTLR_LINE_BUFFERED_INPUT_H */
+#endif /* CVC5__PARSER__ANTLR_LINE_BUFFERED_INPUT_H */
diff --git a/src/parser/antlr_tracing.h b/src/parser/antlr_tracing.h
index d82b9e49c..317b6ea98 100644
--- a/src/parser/antlr_tracing.h
+++ b/src/parser/antlr_tracing.h
@@ -15,8 +15,8 @@
** \todo document this file
**/
-#ifndef CVC4__PARSER__ANTLR_TRACING_H
-#define CVC4__PARSER__ANTLR_TRACING_H
+#ifndef CVC5__PARSER__ANTLR_TRACING_H
+#define CVC5__PARSER__ANTLR_TRACING_H
// only enable the hack with -DCVC4_TRACE_ANTLR
#ifdef CVC4_TRACE_ANTLR
@@ -83,4 +83,4 @@ static struct __Cvc4System {
#endif /* CVC4_TRACE_ANTLR */
-#endif /* CVC4__PARSER__ANTLR_TRACING_H */
+#endif /* CVC5__PARSER__ANTLR_TRACING_H */
diff --git a/src/parser/bounded_token_buffer.h b/src/parser/bounded_token_buffer.h
index 79bfe0d40..48db57df5 100644
--- a/src/parser/bounded_token_buffer.h
+++ b/src/parser/bounded_token_buffer.h
@@ -25,8 +25,8 @@
#include "cvc4parser_private.h"
-#ifndef CVC4__PARSER__BOUNDED_TOKEN_BUFFER_H
-#define CVC4__PARSER__BOUNDED_TOKEN_BUFFER_H
+#ifndef CVC5__PARSER__BOUNDED_TOKEN_BUFFER_H
+#define CVC5__PARSER__BOUNDED_TOKEN_BUFFER_H
#include <antlr3defs.h>
@@ -61,4 +61,4 @@ BoundedTokenBufferFree(pBOUNDED_TOKEN_BUFFER buffer);
} // namespace parser
} // namespace cvc5
-#endif /* CVC4__PARSER__BOUNDED_TOKEN_BUFFER_H */
+#endif /* CVC5__PARSER__BOUNDED_TOKEN_BUFFER_H */
diff --git a/src/parser/bounded_token_factory.h b/src/parser/bounded_token_factory.h
index 3aa347d52..1de4fee5d 100644
--- a/src/parser/bounded_token_factory.h
+++ b/src/parser/bounded_token_factory.h
@@ -19,8 +19,8 @@
#include "cvc4parser_private.h"
-#ifndef CVC4__PARSER__BOUNDED_TOKEN_FACTORY_H
-#define CVC4__PARSER__BOUNDED_TOKEN_FACTORY_H
+#ifndef CVC5__PARSER__BOUNDED_TOKEN_FACTORY_H
+#define CVC5__PARSER__BOUNDED_TOKEN_FACTORY_H
namespace cvc5 {
namespace parser {
@@ -48,4 +48,4 @@ BoundedTokenFactoryNew(pANTLR3_INPUT_STREAM input,ANTLR3_UINT32 size);
} // namespace parser
} // namespace cvc5
-#endif /* CVC4__PARSER__BOUNDED_TOKEN_FACTORY_H */
+#endif /* CVC5__PARSER__BOUNDED_TOKEN_FACTORY_H */
diff --git a/src/parser/cvc/cvc.h b/src/parser/cvc/cvc.h
index ad3642e20..bfd9fdcfc 100644
--- a/src/parser/cvc/cvc.h
+++ b/src/parser/cvc/cvc.h
@@ -16,8 +16,8 @@
#include "cvc4parser_private.h"
-#ifndef CVC4__PARSER__CVC_H
-#define CVC4__PARSER__CVC_H
+#ifndef CVC5__PARSER__CVC_H
+#define CVC5__PARSER__CVC_H
#include "api/cpp/cvc5.h"
#include "parser/parser.h"
@@ -50,4 +50,4 @@ class Cvc : public Parser
} // namespace parser
} // namespace cvc5
-#endif /* CVC4__PARSER__CVC_H */
+#endif /* CVC5__PARSER__CVC_H */
diff --git a/src/parser/cvc/cvc_input.h b/src/parser/cvc/cvc_input.h
index 82b2d652c..e7b8640e4 100644
--- a/src/parser/cvc/cvc_input.h
+++ b/src/parser/cvc/cvc_input.h
@@ -16,8 +16,8 @@
#include "cvc4parser_private.h"
-#ifndef CVC4__PARSER__CVC_INPUT_H
-#define CVC4__PARSER__CVC_INPUT_H
+#ifndef CVC5__PARSER__CVC_INPUT_H
+#define CVC5__PARSER__CVC_INPUT_H
#include "parser/antlr_input.h"
#include "parser/cvc/CvcLexer.h"
@@ -75,4 +75,4 @@ class CvcInput : public AntlrInput {
} // namespace parser
} // namespace cvc5
-#endif /* CVC4__PARSER__CVC_INPUT_H */
+#endif /* CVC5__PARSER__CVC_INPUT_H */
diff --git a/src/parser/input.h b/src/parser/input.h
index d54cb95ab..a4b537821 100644
--- a/src/parser/input.h
+++ b/src/parser/input.h
@@ -16,8 +16,8 @@
#include "cvc4parser_public.h"
-#ifndef CVC4__PARSER__INPUT_H
-#define CVC4__PARSER__INPUT_H
+#ifndef CVC5__PARSER__INPUT_H
+#define CVC5__PARSER__INPUT_H
#include <stdio.h>
@@ -179,4 +179,4 @@ class CVC4_EXPORT Input
} // namespace parser
} // namespace cvc5
-#endif /* CVC4__PARSER__ANTLR_INPUT_H */
+#endif /* CVC5__PARSER__ANTLR_INPUT_H */
diff --git a/src/parser/line_buffer.h b/src/parser/line_buffer.h
index a8a4e993c..10a9e06ac 100644
--- a/src/parser/line_buffer.h
+++ b/src/parser/line_buffer.h
@@ -18,8 +18,8 @@
#include "cvc4parser_private.h"
-#ifndef CVC4__PARSER__LINE_BUFFER_H
-#define CVC4__PARSER__LINE_BUFFER_H
+#ifndef CVC5__PARSER__LINE_BUFFER_H
+#define CVC5__PARSER__LINE_BUFFER_H
#include <cstdlib>
#include <istream>
@@ -73,4 +73,4 @@ class LineBuffer {
} // namespace parser
} // namespace cvc5
-#endif /* CVC4__PARSER__LINE_BUFFER_H */
+#endif /* CVC5__PARSER__LINE_BUFFER_H */
diff --git a/src/parser/memory_mapped_input_buffer.h b/src/parser/memory_mapped_input_buffer.h
index 96009674e..69f229796 100644
--- a/src/parser/memory_mapped_input_buffer.h
+++ b/src/parser/memory_mapped_input_buffer.h
@@ -16,8 +16,8 @@
#include "cvc4parser_private.h"
-#ifndef CVC4__PARSER__MEMORY_MAPPED_INPUT_BUFFER_H
-#define CVC4__PARSER__MEMORY_MAPPED_INPUT_BUFFER_H
+#ifndef CVC5__PARSER__MEMORY_MAPPED_INPUT_BUFFER_H
+#define CVC5__PARSER__MEMORY_MAPPED_INPUT_BUFFER_H
#include <antlr3input.h>
#include <string>
@@ -39,4 +39,4 @@ MemoryMappedInputBufferNew(const std::string& filename);
} // namespace parser
} // namespace cvc5
-#endif /* CVC4__PARSER__MEMORY_MAPPED_INPUT_BUFFER_H */
+#endif /* CVC5__PARSER__MEMORY_MAPPED_INPUT_BUFFER_H */
diff --git a/src/parser/parse_op.h b/src/parser/parse_op.h
index 592fce4f7..f862c178d 100644
--- a/src/parser/parse_op.h
+++ b/src/parser/parse_op.h
@@ -14,8 +14,8 @@
#include "cvc4parser_public.h"
-#ifndef CVC4__PARSER__PARSE_OP_H
-#define CVC4__PARSER__PARSE_OP_H
+#ifndef CVC5__PARSER__PARSE_OP_H
+#define CVC5__PARSER__PARSE_OP_H
#include <string>
@@ -81,4 +81,4 @@ std::ostream& operator<<(std::ostream& os, const ParseOp& p);
} // namespace cvc5
-#endif /* CVC4__PARSER__PARSE_OP_H */
+#endif /* CVC5__PARSER__PARSE_OP_H */
diff --git a/src/parser/parser.h b/src/parser/parser.h
index 79b975fc4..210e53ccf 100644
--- a/src/parser/parser.h
+++ b/src/parser/parser.h
@@ -16,8 +16,8 @@
#include "cvc4parser_public.h"
-#ifndef CVC4__PARSER__PARSER_H
-#define CVC4__PARSER__PARSER_H
+#ifndef CVC5__PARSER__PARSER_H
+#define CVC5__PARSER__PARSER_H
#include <list>
#include <set>
@@ -776,4 +776,4 @@ public:
} // namespace parser
} // namespace cvc5
-#endif /* CVC4__PARSER__PARSER_STATE_H */
+#endif /* CVC5__PARSER__PARSER_STATE_H */
diff --git a/src/parser/parser_builder.h b/src/parser/parser_builder.h
index 0575dd21d..db2cc0a7e 100644
--- a/src/parser/parser_builder.h
+++ b/src/parser/parser_builder.h
@@ -16,8 +16,8 @@
#include "cvc4parser_public.h"
-#ifndef CVC4__PARSER__PARSER_BUILDER_H
-#define CVC4__PARSER__PARSER_BUILDER_H
+#ifndef CVC5__PARSER__PARSER_BUILDER_H
+#define CVC5__PARSER__PARSER_BUILDER_H
#include <string>
@@ -191,4 +191,4 @@ class CVC4_EXPORT ParserBuilder
} // namespace parser
} // namespace cvc5
-#endif /* CVC4__PARSER__PARSER_BUILDER_H */
+#endif /* CVC5__PARSER__PARSER_BUILDER_H */
diff --git a/src/parser/parser_exception.h b/src/parser/parser_exception.h
index 7fcbce213..a2f614dc7 100644
--- a/src/parser/parser_exception.h
+++ b/src/parser/parser_exception.h
@@ -16,8 +16,8 @@
#include "cvc4parser_public.h"
-#ifndef CVC4__PARSER__PARSER_EXCEPTION_H
-#define CVC4__PARSER__PARSER_EXCEPTION_H
+#ifndef CVC5__PARSER__PARSER_EXCEPTION_H
+#define CVC5__PARSER__PARSER_EXCEPTION_H
#include <iostream>
#include <string>
@@ -102,4 +102,4 @@ class ParserEndOfFileException : public ParserException
} // namespace parser
} // namespace cvc5
-#endif /* CVC4__PARSER__PARSER_EXCEPTION_H */
+#endif /* CVC5__PARSER__PARSER_EXCEPTION_H */
diff --git a/src/parser/smt2/smt2.h b/src/parser/smt2/smt2.h
index 645209c61..8ac1c14cc 100644
--- a/src/parser/smt2/smt2.h
+++ b/src/parser/smt2/smt2.h
@@ -16,8 +16,8 @@
#include "cvc4parser_private.h"
-#ifndef CVC4__PARSER__SMT2_H
-#define CVC4__PARSER__SMT2_H
+#ifndef CVC5__PARSER__SMT2_H
+#define CVC5__PARSER__SMT2_H
#include <sstream>
#include <stack>
@@ -432,4 +432,4 @@ class Smt2 : public Parser
} // namespace parser
} // namespace cvc5
-#endif /* CVC4__PARSER__SMT2_H */
+#endif /* CVC5__PARSER__SMT2_H */
diff --git a/src/parser/smt2/smt2_input.h b/src/parser/smt2/smt2_input.h
index 1c892909e..78b2cf051 100644
--- a/src/parser/smt2/smt2_input.h
+++ b/src/parser/smt2/smt2_input.h
@@ -16,8 +16,8 @@
#include "cvc4parser_private.h"
-#ifndef CVC4__PARSER__SMT2_INPUT_H
-#define CVC4__PARSER__SMT2_INPUT_H
+#ifndef CVC5__PARSER__SMT2_INPUT_H
+#define CVC5__PARSER__SMT2_INPUT_H
#include "parser/antlr_input.h"
#include "parser/smt2/Smt2Lexer.h"
@@ -84,4 +84,4 @@ class Smt2Input : public AntlrInput {
} // namespace parser
} // namespace cvc5
-#endif /* CVC4__PARSER__SMT2_INPUT_H */
+#endif /* CVC5__PARSER__SMT2_INPUT_H */
diff --git a/src/parser/smt2/sygus_input.h b/src/parser/smt2/sygus_input.h
index 8ad398cf9..96b3f1eed 100644
--- a/src/parser/smt2/sygus_input.h
+++ b/src/parser/smt2/sygus_input.h
@@ -16,8 +16,8 @@
#include "cvc4parser_private.h"
-#ifndef CVC4__PARSER__SYGUS_INPUT_H
-#define CVC4__PARSER__SYGUS_INPUT_H
+#ifndef CVC5__PARSER__SYGUS_INPUT_H
+#define CVC5__PARSER__SYGUS_INPUT_H
#include "parser/antlr_input.h"
#include "parser/smt2/Smt2Lexer.h"
@@ -84,4 +84,4 @@ class SygusInput : public AntlrInput {
} // namespace parser
} // namespace cvc5
-#endif /* CVC4__PARSER__SYGUS_INPUT_H */
+#endif /* CVC5__PARSER__SYGUS_INPUT_H */
diff --git a/src/parser/tptp/tptp.h b/src/parser/tptp/tptp.h
index ab2e0db51..41203a809 100644
--- a/src/parser/tptp/tptp.h
+++ b/src/parser/tptp/tptp.h
@@ -16,8 +16,8 @@
#include "cvc4parser_private.h"
-#ifndef CVC4__PARSER__TPTP_H
-#define CVC4__PARSER__TPTP_H
+#ifndef CVC5__PARSER__TPTP_H
+#define CVC5__PARSER__TPTP_H
#include <unordered_map>
#include <unordered_set>
@@ -240,4 +240,4 @@ enum NonAssoc {
} // namespace parser
} // namespace cvc5
-#endif /* CVC4__PARSER__TPTP_INPUT_H */
+#endif /* CVC5__PARSER__TPTP_INPUT_H */
diff --git a/src/parser/tptp/tptp_input.h b/src/parser/tptp/tptp_input.h
index ff4ac590f..a4d33b3cb 100644
--- a/src/parser/tptp/tptp_input.h
+++ b/src/parser/tptp/tptp_input.h
@@ -16,8 +16,8 @@
#include "cvc4parser_private.h"
-#ifndef CVC4__PARSER__TPTP_INPUT_H
-#define CVC4__PARSER__TPTP_INPUT_H
+#ifndef CVC5__PARSER__TPTP_INPUT_H
+#define CVC5__PARSER__TPTP_INPUT_H
#include "parser/antlr_input.h"
#include "parser/tptp/TptpLexer.h"
@@ -84,4 +84,4 @@ class TptpInput : public AntlrInput {
} // namespace parser
} // namespace cvc5
-#endif /* CVC4__PARSER__TPTP_INPUT_H */
+#endif /* CVC5__PARSER__TPTP_INPUT_H */
diff --git a/src/preprocessing/assertion_pipeline.h b/src/preprocessing/assertion_pipeline.h
index aa4ffbca2..a04c03c22 100644
--- a/src/preprocessing/assertion_pipeline.h
+++ b/src/preprocessing/assertion_pipeline.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__ASSERTION_PIPELINE_H
-#define CVC4__PREPROCESSING__ASSERTION_PIPELINE_H
+#ifndef CVC5__PREPROCESSING__ASSERTION_PIPELINE_H
+#define CVC5__PREPROCESSING__ASSERTION_PIPELINE_H
#include <vector>
@@ -200,4 +200,4 @@ class AssertionPipeline
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__ASSERTION_PIPELINE_H */
+#endif /* CVC5__PREPROCESSING__ASSERTION_PIPELINE_H */
diff --git a/src/preprocessing/passes/ackermann.h b/src/preprocessing/passes/ackermann.h
index 14f8f713f..05709b227 100644
--- a/src/preprocessing/passes/ackermann.h
+++ b/src/preprocessing/passes/ackermann.h
@@ -23,8 +23,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__ACKERMANN_H
-#define CVC4__PREPROCESSING__PASSES__ACKERMANN_H
+#ifndef CVC5__PREPROCESSING__PASSES__ACKERMANN_H
+#define CVC5__PREPROCESSING__PASSES__ACKERMANN_H
#include <unordered_map>
@@ -84,4 +84,4 @@ class Ackermann : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__ACKERMANN_H */
+#endif /* CVC5__PREPROCESSING__PASSES__ACKERMANN_H */
diff --git a/src/preprocessing/passes/apply_substs.h b/src/preprocessing/passes/apply_substs.h
index d94943dc3..0dead915e 100644
--- a/src/preprocessing/passes/apply_substs.h
+++ b/src/preprocessing/passes/apply_substs.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__APPLY_SUBSTS_H
-#define CVC4__PREPROCESSING__PASSES__APPLY_SUBSTS_H
+#ifndef CVC5__PREPROCESSING__PASSES__APPLY_SUBSTS_H
+#define CVC5__PREPROCESSING__PASSES__APPLY_SUBSTS_H
#include "preprocessing/preprocessing_pass.h"
diff --git a/src/preprocessing/passes/bool_to_bv.h b/src/preprocessing/passes/bool_to_bv.h
index 1245dbd34..c55ce2168 100644
--- a/src/preprocessing/passes/bool_to_bv.h
+++ b/src/preprocessing/passes/bool_to_bv.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_H
-#define CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_H
+#ifndef CVC5__PREPROCESSING__PASSES__BOOL_TO_BV_H
+#define CVC5__PREPROCESSING__PASSES__BOOL_TO_BV_H
#include "expr/node.h"
#include "options/bv_options.h"
@@ -123,4 +123,4 @@ class BoolToBV : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__BOOL_TO_BV_H */
+#endif /* CVC5__PREPROCESSING__PASSES__BOOL_TO_BV_H */
diff --git a/src/preprocessing/passes/bv_abstraction.h b/src/preprocessing/passes/bv_abstraction.h
index d699b288f..c5d30124c 100644
--- a/src/preprocessing/passes/bv_abstraction.h
+++ b/src/preprocessing/passes/bv_abstraction.h
@@ -23,8 +23,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__BV_ABSTRACTION_H
-#define CVC4__PREPROCESSING__PASSES__BV_ABSTRACTION_H
+#ifndef CVC5__PREPROCESSING__PASSES__BV_ABSTRACTION_H
+#define CVC5__PREPROCESSING__PASSES__BV_ABSTRACTION_H
#include "preprocessing/preprocessing_pass.h"
@@ -46,4 +46,4 @@ class BvAbstraction : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__BV_ABSTRACTION_H */
+#endif /* CVC5__PREPROCESSING__PASSES__BV_ABSTRACTION_H */
diff --git a/src/preprocessing/passes/bv_eager_atoms.h b/src/preprocessing/passes/bv_eager_atoms.h
index e0b53ad1b..85d86e3f7 100644
--- a/src/preprocessing/passes/bv_eager_atoms.h
+++ b/src/preprocessing/passes/bv_eager_atoms.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__BV_EAGER_ATOMS_H
-#define CVC4__PREPROCESSING__PASSES__BV_EAGER_ATOMS_H
+#ifndef CVC5__PREPROCESSING__PASSES__BV_EAGER_ATOMS_H
+#define CVC5__PREPROCESSING__PASSES__BV_EAGER_ATOMS_H
#include "preprocessing/preprocessing_pass.h"
@@ -40,4 +40,4 @@ class BvEagerAtoms : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__BV_EAGER_ATOMS_H */
+#endif /* CVC5__PREPROCESSING__PASSES__BV_EAGER_ATOMS_H */
diff --git a/src/preprocessing/passes/bv_gauss.h b/src/preprocessing/passes/bv_gauss.h
index e75b41868..f680fa652 100644
--- a/src/preprocessing/passes/bv_gauss.h
+++ b/src/preprocessing/passes/bv_gauss.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__BV_GAUSS_ELIM_H
-#define CVC4__PREPROCESSING__PASSES__BV_GAUSS_ELIM_H
+#ifndef CVC5__PREPROCESSING__PASSES__BV_GAUSS_ELIM_H
+#define CVC5__PREPROCESSING__PASSES__BV_GAUSS_ELIM_H
#include "expr/node.h"
#include "preprocessing/preprocessing_pass.h"
diff --git a/src/preprocessing/passes/bv_intro_pow2.h b/src/preprocessing/passes/bv_intro_pow2.h
index c51383d2c..63c8e5345 100644
--- a/src/preprocessing/passes/bv_intro_pow2.h
+++ b/src/preprocessing/passes/bv_intro_pow2.h
@@ -18,8 +18,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__BV_INTRO_POW2_H
-#define CVC4__PREPROCESSING__PASSES__BV_INTRO_POW2_H
+#ifndef CVC5__PREPROCESSING__PASSES__BV_INTRO_POW2_H
+#define CVC5__PREPROCESSING__PASSES__BV_INTRO_POW2_H
#include "preprocessing/preprocessing_pass.h"
@@ -41,4 +41,4 @@ class BvIntroPow2 : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__BV_INTRO_POW2_H */
+#endif /* CVC5__PREPROCESSING__PASSES__BV_INTRO_POW2_H */
diff --git a/src/preprocessing/passes/bv_to_bool.h b/src/preprocessing/passes/bv_to_bool.h
index b6b847140..270d4b243 100644
--- a/src/preprocessing/passes/bv_to_bool.h
+++ b/src/preprocessing/passes/bv_to_bool.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__BV_TO_BOOL_H
-#define CVC4__PREPROCESSING__PASSES__BV_TO_BOOL_H
+#ifndef CVC5__PREPROCESSING__PASSES__BV_TO_BOOL_H
+#define CVC5__PREPROCESSING__PASSES__BV_TO_BOOL_H
#include "expr/node.h"
#include "preprocessing/preprocessing_pass.h"
@@ -75,4 +75,4 @@ class BVToBool : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__BV_TO_BOOL_H */
+#endif /* CVC5__PREPROCESSING__PASSES__BV_TO_BOOL_H */
diff --git a/src/preprocessing/passes/bv_to_int.h b/src/preprocessing/passes/bv_to_int.h
index c0d96d462..6ac2a956b 100644
--- a/src/preprocessing/passes/bv_to_int.h
+++ b/src/preprocessing/passes/bv_to_int.h
@@ -65,8 +65,8 @@
#include "cvc4_private.h"
-#ifndef __CVC4__PREPROCESSING__PASSES__BV_TO_INT_H
-#define __CVC4__PREPROCESSING__PASSES__BV_TO_INT_H
+#ifndef __CVC5__PREPROCESSING__PASSES__BV_TO_INT_H
+#define __CVC5__PREPROCESSING__PASSES__BV_TO_INT_H
#include "context/cdhashmap.h"
#include "context/cdhashset.h"
@@ -287,4 +287,4 @@ class BVToInt : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* __CVC4__PREPROCESSING__PASSES__BV_TO_INT_H */
+#endif /* __CVC5__PREPROCESSING__PASSES__BV_TO_INT_H */
diff --git a/src/preprocessing/passes/extended_rewriter_pass.h b/src/preprocessing/passes/extended_rewriter_pass.h
index 8fabecbaa..f4688582a 100644
--- a/src/preprocessing/passes/extended_rewriter_pass.h
+++ b/src/preprocessing/passes/extended_rewriter_pass.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__EXTENDED_REWRITER_PASS_H
-#define CVC4__PREPROCESSING__PASSES__EXTENDED_REWRITER_PASS_H
+#ifndef CVC5__PREPROCESSING__PASSES__EXTENDED_REWRITER_PASS_H
+#define CVC5__PREPROCESSING__PASSES__EXTENDED_REWRITER_PASS_H
#include "preprocessing/preprocessing_pass.h"
@@ -39,4 +39,4 @@ class ExtRewPre : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__EXTENDED_REWRITER_PASS_H */
+#endif /* CVC5__PREPROCESSING__PASSES__EXTENDED_REWRITER_PASS_H */
diff --git a/src/preprocessing/passes/foreign_theory_rewrite.h b/src/preprocessing/passes/foreign_theory_rewrite.h
index eb228ca67..0af4f487a 100644
--- a/src/preprocessing/passes/foreign_theory_rewrite.h
+++ b/src/preprocessing/passes/foreign_theory_rewrite.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__FOREIGN_THEORY_REWRITE_H
-#define CVC4__PREPROCESSING__PASSES__FOREIGN_THEORY_REWRITE_H
+#ifndef CVC5__PREPROCESSING__PASSES__FOREIGN_THEORY_REWRITE_H
+#define CVC5__PREPROCESSING__PASSES__FOREIGN_THEORY_REWRITE_H
#include "context/cdhashmap.h"
#include "expr/node.h"
@@ -64,4 +64,4 @@ class ForeignTheoryRewrite : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__FOREIGN_THEORY_REWRITE_H */
+#endif /* CVC5__PREPROCESSING__PASSES__FOREIGN_THEORY_REWRITE_H */
diff --git a/src/preprocessing/passes/fun_def_fmf.h b/src/preprocessing/passes/fun_def_fmf.h
index cb461d6e9..908f15654 100644
--- a/src/preprocessing/passes/fun_def_fmf.h
+++ b/src/preprocessing/passes/fun_def_fmf.h
@@ -12,8 +12,8 @@
** \brief Function definition processor for finite model finding
**/
-#ifndef CVC4__PREPROCESSING__PASSES__FUN_DEF_FMF_H
-#define CVC4__PREPROCESSING__PASSES__FUN_DEF_FMF_H
+#ifndef CVC5__PREPROCESSING__PASSES__FUN_DEF_FMF_H
+#define CVC5__PREPROCESSING__PASSES__FUN_DEF_FMF_H
#include <map>
#include <vector>
@@ -102,4 +102,4 @@ class FunDefFmf : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__SYGUS_INFERENCE_H_ */
+#endif /* CVC5__PREPROCESSING__PASSES__SYGUS_INFERENCE_H_ */
diff --git a/src/preprocessing/passes/global_negate.h b/src/preprocessing/passes/global_negate.h
index 263fa636b..2d0357490 100644
--- a/src/preprocessing/passes/global_negate.h
+++ b/src/preprocessing/passes/global_negate.h
@@ -23,8 +23,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__GLOBAL_NEGATE_H
-#define CVC4__PREPROCESSING__PASSES__GLOBAL_NEGATE_H
+#ifndef CVC5__PREPROCESSING__PASSES__GLOBAL_NEGATE_H
+#define CVC5__PREPROCESSING__PASSES__GLOBAL_NEGATE_H
#include "expr/node.h"
#include "preprocessing/preprocessing_pass.h"
@@ -50,4 +50,4 @@ class GlobalNegate : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING_PASSES__GLOBAL_NEGATE_H */
+#endif /* CVC5__PREPROCESSING_PASSES__GLOBAL_NEGATE_H */
diff --git a/src/preprocessing/passes/ho_elim.h b/src/preprocessing/passes/ho_elim.h
index ba23a1973..fe22ada98 100644
--- a/src/preprocessing/passes/ho_elim.h
+++ b/src/preprocessing/passes/ho_elim.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef __CVC4__PREPROCESSING__PASSES__HO_ELIM_PASS_H
-#define __CVC4__PREPROCESSING__PASSES__HO_ELIM_PASS_H
+#ifndef __CVC5__PREPROCESSING__PASSES__HO_ELIM_PASS_H
+#define __CVC5__PREPROCESSING__PASSES__HO_ELIM_PASS_H
#include <map>
#include <unordered_map>
@@ -152,4 +152,4 @@ class HoElim : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* __CVC4__PREPROCESSING__PASSES__HO_ELIM_PASS_H */
+#endif /* __CVC5__PREPROCESSING__PASSES__HO_ELIM_PASS_H */
diff --git a/src/preprocessing/passes/int_to_bv.h b/src/preprocessing/passes/int_to_bv.h
index da9d54229..01b5c8ee0 100644
--- a/src/preprocessing/passes/int_to_bv.h
+++ b/src/preprocessing/passes/int_to_bv.h
@@ -18,8 +18,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__INT_TO_BV_H
-#define CVC4__PREPROCESSING__PASSES__INT_TO_BV_H
+#ifndef CVC5__PREPROCESSING__PASSES__INT_TO_BV_H
+#define CVC5__PREPROCESSING__PASSES__INT_TO_BV_H
#include "preprocessing/preprocessing_pass.h"
@@ -41,4 +41,4 @@ class IntToBV : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__INT_TO_BV_H */
+#endif /* CVC5__PREPROCESSING__PASSES__INT_TO_BV_H */
diff --git a/src/preprocessing/passes/ite_removal.h b/src/preprocessing/passes/ite_removal.h
index 4c4923647..8f771fbcc 100644
--- a/src/preprocessing/passes/ite_removal.h
+++ b/src/preprocessing/passes/ite_removal.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__ITE_REMOVAL_H
-#define CVC4__PREPROCESSING__PASSES__ITE_REMOVAL_H
+#ifndef CVC5__PREPROCESSING__PASSES__ITE_REMOVAL_H
+#define CVC5__PREPROCESSING__PASSES__ITE_REMOVAL_H
#include "preprocessing/preprocessing_pass.h"
@@ -39,4 +39,4 @@ class IteRemoval : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif // CVC4__PREPROCESSING__PASSES__ITE_REMOVAL_H
+#endif // CVC5__PREPROCESSING__PASSES__ITE_REMOVAL_H
diff --git a/src/preprocessing/passes/ite_simp.h b/src/preprocessing/passes/ite_simp.h
index abb3ec6f5..dc5d99175 100644
--- a/src/preprocessing/passes/ite_simp.h
+++ b/src/preprocessing/passes/ite_simp.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__ITE_SIMP_H
-#define CVC4__PREPROCESSING__PASSES__ITE_SIMP_H
+#ifndef CVC5__PREPROCESSING__PASSES__ITE_SIMP_H
+#define CVC5__PREPROCESSING__PASSES__ITE_SIMP_H
#include "preprocessing/preprocessing_pass.h"
#include "preprocessing/util/ite_utilities.h"
diff --git a/src/preprocessing/passes/miplib_trick.h b/src/preprocessing/passes/miplib_trick.h
index cad786c6b..3619d5882 100644
--- a/src/preprocessing/passes/miplib_trick.h
+++ b/src/preprocessing/passes/miplib_trick.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__MIPLIB_TRICK_H
-#define CVC4__PREPROCESSING__PASSES__MIPLIB_TRICK_H
+#ifndef CVC5__PREPROCESSING__PASSES__MIPLIB_TRICK_H
+#define CVC5__PREPROCESSING__PASSES__MIPLIB_TRICK_H
#include "expr/node.h"
#include "preprocessing/preprocessing_pass.h"
@@ -59,4 +59,4 @@ class MipLibTrick : public PreprocessingPass, public NodeManagerListener
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__MIPLIB_TRICK_H */
+#endif /* CVC5__PREPROCESSING__PASSES__MIPLIB_TRICK_H */
diff --git a/src/preprocessing/passes/nl_ext_purify.h b/src/preprocessing/passes/nl_ext_purify.h
index 2718639d6..4f306e326 100644
--- a/src/preprocessing/passes/nl_ext_purify.h
+++ b/src/preprocessing/passes/nl_ext_purify.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__NL_EXT_PURIFY_H
-#define CVC4__PREPROCESSING__PASSES__NL_EXT_PURIFY_H
+#ifndef CVC5__PREPROCESSING__PASSES__NL_EXT_PURIFY_H
+#define CVC5__PREPROCESSING__PASSES__NL_EXT_PURIFY_H
#include <unordered_map>
#include <vector>
@@ -53,4 +53,4 @@ class NlExtPurify : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__NL_EXT_PURIFY_H */
+#endif /* CVC5__PREPROCESSING__PASSES__NL_EXT_PURIFY_H */
diff --git a/src/preprocessing/passes/non_clausal_simp.h b/src/preprocessing/passes/non_clausal_simp.h
index 679a6216d..2e5d17dbd 100644
--- a/src/preprocessing/passes/non_clausal_simp.h
+++ b/src/preprocessing/passes/non_clausal_simp.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__NON_CLAUSAL_SIMP_H
-#define CVC4__PREPROCESSING__PASSES__NON_CLAUSAL_SIMP_H
+#ifndef CVC5__PREPROCESSING__PASSES__NON_CLAUSAL_SIMP_H
+#define CVC5__PREPROCESSING__PASSES__NON_CLAUSAL_SIMP_H
#include "context/cdlist.h"
#include "expr/node.h"
diff --git a/src/preprocessing/passes/pseudo_boolean_processor.h b/src/preprocessing/passes/pseudo_boolean_processor.h
index 47a1eb7dc..49061dcb8 100644
--- a/src/preprocessing/passes/pseudo_boolean_processor.h
+++ b/src/preprocessing/passes/pseudo_boolean_processor.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__PSEUDO_BOOLEAN_PROCESSOR_H
-#define CVC4__PREPROCESSING__PASSES__PSEUDO_BOOLEAN_PROCESSOR_H
+#ifndef CVC5__PREPROCESSING__PASSES__PSEUDO_BOOLEAN_PROCESSOR_H
+#define CVC5__PREPROCESSING__PASSES__PSEUDO_BOOLEAN_PROCESSOR_H
#include <unordered_set>
#include <vector>
@@ -112,4 +112,4 @@ class PseudoBooleanProcessor : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif // CVC4__PREPROCESSING__PASSES__PSEUDO_BOOLEAN_PROCESSOR_H
+#endif // CVC5__PREPROCESSING__PASSES__PSEUDO_BOOLEAN_PROCESSOR_H
diff --git a/src/preprocessing/passes/quantifier_macros.h b/src/preprocessing/passes/quantifier_macros.h
index 4b5b21a5d..64cdc39b7 100644
--- a/src/preprocessing/passes/quantifier_macros.h
+++ b/src/preprocessing/passes/quantifier_macros.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__QUANTIFIER_MACROS_H
-#define CVC4__PREPROCESSING__PASSES__QUANTIFIER_MACROS_H
+#ifndef CVC5__PREPROCESSING__PASSES__QUANTIFIER_MACROS_H
+#define CVC5__PREPROCESSING__PASSES__QUANTIFIER_MACROS_H
#include <map>
#include <vector>
@@ -93,4 +93,4 @@ class QuantifierMacros : public PreprocessingPass
} // preprocessing
} // namespace cvc5
-#endif /*CVC4__PREPROCESSING__PASSES__QUANTIFIER_MACROS_H */
+#endif /*CVC5__PREPROCESSING__PASSES__QUANTIFIER_MACROS_H */
diff --git a/src/preprocessing/passes/quantifiers_preprocess.h b/src/preprocessing/passes/quantifiers_preprocess.h
index 6aa5c58f0..c0835c90e 100644
--- a/src/preprocessing/passes/quantifiers_preprocess.h
+++ b/src/preprocessing/passes/quantifiers_preprocess.h
@@ -19,8 +19,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__QUANTIFIERS_PREPROCESS_H
-#define CVC4__PREPROCESSING__PASSES__QUANTIFIERS_PREPROCESS_H
+#ifndef CVC5__PREPROCESSING__PASSES__QUANTIFIERS_PREPROCESS_H
+#define CVC5__PREPROCESSING__PASSES__QUANTIFIERS_PREPROCESS_H
#include "preprocessing/preprocessing_pass.h"
@@ -42,4 +42,4 @@ class QuantifiersPreprocess : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__QUANTIFIERS_PREPROCESS_H */
+#endif /* CVC5__PREPROCESSING__PASSES__QUANTIFIERS_PREPROCESS_H */
diff --git a/src/preprocessing/passes/real_to_int.h b/src/preprocessing/passes/real_to_int.h
index d961f10f2..3ee0e45d0 100644
--- a/src/preprocessing/passes/real_to_int.h
+++ b/src/preprocessing/passes/real_to_int.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__REAL_TO_INT_H
-#define CVC4__PREPROCESSING__PASSES__REAL_TO_INT_H
+#ifndef CVC5__PREPROCESSING__PASSES__REAL_TO_INT_H
+#define CVC5__PREPROCESSING__PASSES__REAL_TO_INT_H
#include <vector>
@@ -47,4 +47,4 @@ class RealToInt : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__REAL_TO_INT_H */
+#endif /* CVC5__PREPROCESSING__PASSES__REAL_TO_INT_H */
diff --git a/src/preprocessing/passes/rewrite.h b/src/preprocessing/passes/rewrite.h
index 50443c2c6..ae083c7ac 100644
--- a/src/preprocessing/passes/rewrite.h
+++ b/src/preprocessing/passes/rewrite.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__REWRITE_H
-#define CVC4__PREPROCESSING__PASSES__REWRITE_H
+#ifndef CVC5__PREPROCESSING__PASSES__REWRITE_H
+#define CVC5__PREPROCESSING__PASSES__REWRITE_H
#include "preprocessing/preprocessing_pass.h"
@@ -39,5 +39,4 @@ class Rewrite : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__REWRITE_H */
-
+#endif /* CVC5__PREPROCESSING__PASSES__REWRITE_H */
diff --git a/src/preprocessing/passes/sep_skolem_emp.h b/src/preprocessing/passes/sep_skolem_emp.h
index a5b4120cb..628b05975 100644
--- a/src/preprocessing/passes/sep_skolem_emp.h
+++ b/src/preprocessing/passes/sep_skolem_emp.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__SEP_SKOLEM_EMP_H
-#define CVC4__PREPROCESSING__PASSES__SEP_SKOLEM_EMP_H
+#ifndef CVC5__PREPROCESSING__PASSES__SEP_SKOLEM_EMP_H
+#define CVC5__PREPROCESSING__PASSES__SEP_SKOLEM_EMP_H
#include "preprocessing/preprocessing_pass.h"
@@ -38,4 +38,4 @@ class SepSkolemEmp : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__SEP_SKOLEM_EMP_H */
+#endif /* CVC5__PREPROCESSING__PASSES__SEP_SKOLEM_EMP_H */
diff --git a/src/preprocessing/passes/sort_infer.h b/src/preprocessing/passes/sort_infer.h
index 167697206..d83e679d2 100644
--- a/src/preprocessing/passes/sort_infer.h
+++ b/src/preprocessing/passes/sort_infer.h
@@ -12,8 +12,8 @@
** \brief Sort inference preprocessing pass
**/
-#ifndef CVC4__PREPROCESSING__PASSES__SORT_INFERENCE_PASS_H_
-#define CVC4__PREPROCESSING__PASSES__SORT_INFERENCE_PASS_H_
+#ifndef CVC5__PREPROCESSING__PASSES__SORT_INFERENCE_PASS_H_
+#define CVC5__PREPROCESSING__PASSES__SORT_INFERENCE_PASS_H_
#include "preprocessing/preprocessing_pass.h"
@@ -40,4 +40,4 @@ class SortInferencePass : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__SORT_INFERENCE_PASS_H_ */
+#endif /* CVC5__PREPROCESSING__PASSES__SORT_INFERENCE_PASS_H_ */
diff --git a/src/preprocessing/passes/static_learning.h b/src/preprocessing/passes/static_learning.h
index 8f83e60b5..d9f1f2b60 100644
--- a/src/preprocessing/passes/static_learning.h
+++ b/src/preprocessing/passes/static_learning.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__STATIC_LEARNING_H
-#define CVC4__PREPROCESSING__PASSES__STATIC_LEARNING_H
+#ifndef CVC5__PREPROCESSING__PASSES__STATIC_LEARNING_H
+#define CVC5__PREPROCESSING__PASSES__STATIC_LEARNING_H
#include "preprocessing/preprocessing_pass.h"
@@ -38,4 +38,4 @@ class StaticLearning : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__STATIC_LEARNING_H */
+#endif /* CVC5__PREPROCESSING__PASSES__STATIC_LEARNING_H */
diff --git a/src/preprocessing/passes/strings_eager_pp.h b/src/preprocessing/passes/strings_eager_pp.h
index b4058a659..74d12d731 100644
--- a/src/preprocessing/passes/strings_eager_pp.h
+++ b/src/preprocessing/passes/strings_eager_pp.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__STRINGS_EAGER_PP_H
-#define CVC4__PREPROCESSING__PASSES__STRINGS_EAGER_PP_H
+#ifndef CVC5__PREPROCESSING__PASSES__STRINGS_EAGER_PP_H
+#define CVC5__PREPROCESSING__PASSES__STRINGS_EAGER_PP_H
#include "preprocessing/preprocessing_pass.h"
@@ -41,4 +41,4 @@ class StringsEagerPp : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__STRINGS_EAGER_PP_H */
+#endif /* CVC5__PREPROCESSING__PASSES__STRINGS_EAGER_PP_H */
diff --git a/src/preprocessing/passes/sygus_inference.h b/src/preprocessing/passes/sygus_inference.h
index 094788adc..1ffc73c3b 100644
--- a/src/preprocessing/passes/sygus_inference.h
+++ b/src/preprocessing/passes/sygus_inference.h
@@ -12,8 +12,8 @@
** \brief SygusInference
**/
-#ifndef CVC4__PREPROCESSING__PASSES__SYGUS_INFERENCE_H_
-#define CVC4__PREPROCESSING__PASSES__SYGUS_INFERENCE_H_
+#ifndef CVC5__PREPROCESSING__PASSES__SYGUS_INFERENCE_H_
+#define CVC5__PREPROCESSING__PASSES__SYGUS_INFERENCE_H_
#include <vector>
#include "expr/node.h"
@@ -65,4 +65,4 @@ class SygusInference : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__SYGUS_INFERENCE_H_ */
+#endif /* CVC5__PREPROCESSING__PASSES__SYGUS_INFERENCE_H_ */
diff --git a/src/preprocessing/passes/synth_rew_rules.h b/src/preprocessing/passes/synth_rew_rules.h
index 016395029..d23cf6145 100644
--- a/src/preprocessing/passes/synth_rew_rules.h
+++ b/src/preprocessing/passes/synth_rew_rules.h
@@ -13,8 +13,8 @@
** where t1 and t2 are subterms of the input.
**/
-#ifndef CVC4__PREPROCESSING__PASSES__SYNTH_REW_RULES_H
-#define CVC4__PREPROCESSING__PASSES__SYNTH_REW_RULES_H
+#ifndef CVC5__PREPROCESSING__PASSES__SYNTH_REW_RULES_H
+#define CVC5__PREPROCESSING__PASSES__SYNTH_REW_RULES_H
#include "preprocessing/preprocessing_pass.h"
@@ -73,4 +73,4 @@ class SynthRewRulesPass : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__SYNTH_REW_RULES_H */
+#endif /* CVC5__PREPROCESSING__PASSES__SYNTH_REW_RULES_H */
diff --git a/src/preprocessing/passes/theory_preprocess.h b/src/preprocessing/passes/theory_preprocess.h
index cc74792d1..b74b6b5dd 100644
--- a/src/preprocessing/passes/theory_preprocess.h
+++ b/src/preprocessing/passes/theory_preprocess.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__THEORY_PREPROCESS_H
-#define CVC4__PREPROCESSING__PASSES__THEORY_PREPROCESS_H
+#ifndef CVC5__PREPROCESSING__PASSES__THEORY_PREPROCESS_H
+#define CVC5__PREPROCESSING__PASSES__THEORY_PREPROCESS_H
#include "preprocessing/preprocessing_pass.h"
@@ -39,4 +39,4 @@ class TheoryPreprocess : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__THEORY_PREPROCESS_H */
+#endif /* CVC5__PREPROCESSING__PASSES__THEORY_PREPROCESS_H */
diff --git a/src/preprocessing/passes/theory_rewrite_eq.h b/src/preprocessing/passes/theory_rewrite_eq.h
index f6651d39c..8f620f580 100644
--- a/src/preprocessing/passes/theory_rewrite_eq.h
+++ b/src/preprocessing/passes/theory_rewrite_eq.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PASSES__THEORY_REWRITE_EQ_H
-#define CVC4__PREPROCESSING__PASSES__THEORY_REWRITE_EQ_H
+#ifndef CVC5__PREPROCESSING__PASSES__THEORY_REWRITE_EQ_H
+#define CVC5__PREPROCESSING__PASSES__THEORY_REWRITE_EQ_H
#include "expr/node.h"
#include "preprocessing/preprocessing_pass.h"
@@ -53,4 +53,4 @@ class TheoryRewriteEq : public PreprocessingPass
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PASSES__THEORY_REWRITE_EQ_H */
+#endif /* CVC5__PREPROCESSING__PASSES__THEORY_REWRITE_EQ_H */
diff --git a/src/preprocessing/passes/unconstrained_simplifier.h b/src/preprocessing/passes/unconstrained_simplifier.h
index 5416abf51..23d7545a6 100644
--- a/src/preprocessing/passes/unconstrained_simplifier.h
+++ b/src/preprocessing/passes/unconstrained_simplifier.h
@@ -18,8 +18,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING_PASSES_UNCONSTRAINED_SIMPLIFIER_H
-#define CVC4__PREPROCESSING_PASSES_UNCONSTRAINED_SIMPLIFIER_H
+#ifndef CVC5__PREPROCESSING_PASSES_UNCONSTRAINED_SIMPLIFIER_H
+#define CVC5__PREPROCESSING_PASSES_UNCONSTRAINED_SIMPLIFIER_H
#include <unordered_map>
#include <unordered_set>
diff --git a/src/preprocessing/preprocessing_pass.h b/src/preprocessing/preprocessing_pass.h
index 7f65129f8..c1fcf7715 100644
--- a/src/preprocessing/preprocessing_pass.h
+++ b/src/preprocessing/preprocessing_pass.h
@@ -28,8 +28,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PREPROCESSING_PASS_H
-#define CVC4__PREPROCESSING__PREPROCESSING_PASS_H
+#ifndef CVC5__PREPROCESSING__PREPROCESSING_PASS_H
+#define CVC5__PREPROCESSING__PREPROCESSING_PASS_H
#include <string>
@@ -83,4 +83,4 @@ class PreprocessingPass {
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PREPROCESSING_PASS_H */
+#endif /* CVC5__PREPROCESSING__PREPROCESSING_PASS_H */
diff --git a/src/preprocessing/preprocessing_pass_context.h b/src/preprocessing/preprocessing_pass_context.h
index 17f049748..44352519a 100644
--- a/src/preprocessing/preprocessing_pass_context.h
+++ b/src/preprocessing/preprocessing_pass_context.h
@@ -18,8 +18,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PREPROCESSING_PASS_CONTEXT_H
-#define CVC4__PREPROCESSING__PREPROCESSING_PASS_CONTEXT_H
+#ifndef CVC5__PREPROCESSING__PREPROCESSING_PASS_CONTEXT_H
+#define CVC5__PREPROCESSING__PREPROCESSING_PASS_CONTEXT_H
#include "context/cdhashset.h"
#include "smt/smt_engine.h"
@@ -108,4 +108,4 @@ class PreprocessingPassContext
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PREPROCESSING_PASS_CONTEXT_H */
+#endif /* CVC5__PREPROCESSING__PREPROCESSING_PASS_CONTEXT_H */
diff --git a/src/preprocessing/preprocessing_pass_registry.h b/src/preprocessing/preprocessing_pass_registry.h
index bd9e724da..895b344ad 100644
--- a/src/preprocessing/preprocessing_pass_registry.h
+++ b/src/preprocessing/preprocessing_pass_registry.h
@@ -16,8 +16,8 @@
**/
#include "cvc4_private.h"
-#ifndef CVC4__PREPROCESSING__PREPROCESSING_PASS_REGISTRY_H
-#define CVC4__PREPROCESSING__PREPROCESSING_PASS_REGISTRY_H
+#ifndef CVC5__PREPROCESSING__PREPROCESSING_PASS_REGISTRY_H
+#define CVC5__PREPROCESSING__PREPROCESSING_PASS_REGISTRY_H
#include <functional>
#include <string>
@@ -96,4 +96,4 @@ class PreprocessingPassRegistry {
} // namespace preprocessing
} // namespace cvc5
-#endif /* CVC4__PREPROCESSING__PREPROCESSING_PASS_REGISTRY_H */
+#endif /* CVC5__PREPROCESSING__PREPROCESSING_PASS_REGISTRY_H */
diff --git a/src/preprocessing/util/ite_utilities.h b/src/preprocessing/util/ite_utilities.h
index 059bac45c..a633e8d57 100644
--- a/src/preprocessing/util/ite_utilities.h
+++ b/src/preprocessing/util/ite_utilities.h
@@ -20,8 +20,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__ITE_UTILITIES_H
-#define CVC4__ITE_UTILITIES_H
+#ifndef CVC5__ITE_UTILITIES_H
+#define CVC5__ITE_UTILITIES_H
#include <unordered_map>
#include <vector>
diff --git a/src/printer/ast/ast_printer.h b/src/printer/ast/ast_printer.h
index 7d24aa0fe..671c4612f 100644
--- a/src/printer/ast/ast_printer.h
+++ b/src/printer/ast/ast_printer.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PRINTER__AST_PRINTER_H
-#define CVC4__PRINTER__AST_PRINTER_H
+#ifndef CVC5__PRINTER__AST_PRINTER_H
+#define CVC5__PRINTER__AST_PRINTER_H
#include <iostream>
@@ -198,4 +198,4 @@ class AstPrinter : public cvc5::Printer
} // namespace printer
} // namespace cvc5
-#endif /* CVC4__PRINTER__AST_PRINTER_H */
+#endif /* CVC5__PRINTER__AST_PRINTER_H */
diff --git a/src/printer/cvc/cvc_printer.h b/src/printer/cvc/cvc_printer.h
index f7458c3f5..3ef098f64 100644
--- a/src/printer/cvc/cvc_printer.h
+++ b/src/printer/cvc/cvc_printer.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PRINTER__CVC_PRINTER_H
-#define CVC4__PRINTER__CVC_PRINTER_H
+#ifndef CVC5__PRINTER__CVC_PRINTER_H
+#define CVC5__PRINTER__CVC_PRINTER_H
#include <iostream>
@@ -206,4 +206,4 @@ class CvcPrinter : public cvc5::Printer
} // namespace printer
} // namespace cvc5
-#endif /* CVC4__PRINTER__CVC_PRINTER_H */
+#endif /* CVC5__PRINTER__CVC_PRINTER_H */
diff --git a/src/printer/let_binding.h b/src/printer/let_binding.h
index b0560a025..223f27775 100644
--- a/src/printer/let_binding.h
+++ b/src/printer/let_binding.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PRINTER__LET_BINDING_H
-#define CVC4__PRINTER__LET_BINDING_H
+#ifndef CVC5__PRINTER__LET_BINDING_H
+#define CVC5__PRINTER__LET_BINDING_H
#include <vector>
diff --git a/src/printer/printer.h b/src/printer/printer.h
index 65b4a7ccb..4653eb305 100644
--- a/src/printer/printer.h
+++ b/src/printer/printer.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PRINTER__PRINTER_H
-#define CVC4__PRINTER__PRINTER_H
+#ifndef CVC5__PRINTER__PRINTER_H
+#define CVC5__PRINTER__PRINTER_H
#include <string>
@@ -310,4 +310,4 @@ class Printer
} // namespace cvc5
-#endif /* CVC4__PRINTER__PRINTER_H */
+#endif /* CVC5__PRINTER__PRINTER_H */
diff --git a/src/printer/smt2/smt2_printer.h b/src/printer/smt2/smt2_printer.h
index a3ab9721c..1eb1a6f8f 100644
--- a/src/printer/smt2/smt2_printer.h
+++ b/src/printer/smt2/smt2_printer.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PRINTER__SMT2_PRINTER_H
-#define CVC4__PRINTER__SMT2_PRINTER_H
+#ifndef CVC5__PRINTER__SMT2_PRINTER_H
+#define CVC5__PRINTER__SMT2_PRINTER_H
#include "printer/printer.h"
@@ -277,4 +277,4 @@ class Smt2Printer : public cvc5::Printer
} // namespace printer
} // namespace cvc5
-#endif /* CVC4__PRINTER__SMT2_PRINTER_H */
+#endif /* CVC5__PRINTER__SMT2_PRINTER_H */
diff --git a/src/printer/tptp/tptp_printer.h b/src/printer/tptp/tptp_printer.h
index c59e18ae2..30124879b 100644
--- a/src/printer/tptp/tptp_printer.h
+++ b/src/printer/tptp/tptp_printer.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PRINTER__TPTP_PRINTER_H
-#define CVC4__PRINTER__TPTP_PRINTER_H
+#ifndef CVC5__PRINTER__TPTP_PRINTER_H
+#define CVC5__PRINTER__TPTP_PRINTER_H
#include <iostream>
@@ -66,4 +66,4 @@ class TptpPrinter : public cvc5::Printer
} // namespace printer
} // namespace cvc5
-#endif /* CVC4__PRINTER__TPTP_PRINTER_H */
+#endif /* CVC5__PRINTER__TPTP_PRINTER_H */
diff --git a/src/proof/clause_id.h b/src/proof/clause_id.h
index 7ce8a384a..e5a63fa4f 100644
--- a/src/proof/clause_id.h
+++ b/src/proof/clause_id.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PROOF__CLAUSE_ID_H
-#define CVC4__PROOF__CLAUSE_ID_H
+#ifndef CVC5__PROOF__CLAUSE_ID_H
+#define CVC5__PROOF__CLAUSE_ID_H
namespace cvc5 {
@@ -37,4 +37,4 @@ const ClauseId ClauseIdError(-3);
} // namespace cvc5
-#endif /* CVC4__PROOF__CLAUSE_ID_H */
+#endif /* CVC5__PROOF__CLAUSE_ID_H */
diff --git a/src/proof/cnf_proof.h b/src/proof/cnf_proof.h
index 88eb885aa..9fa491c3d 100644
--- a/src/proof/cnf_proof.h
+++ b/src/proof/cnf_proof.h
@@ -18,8 +18,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__CNF_PROOF_H
-#define CVC4__CNF_PROOF_H
+#ifndef CVC5__CNF_PROOF_H
+#define CVC5__CNF_PROOF_H
#include <unordered_map>
#include <unordered_set>
@@ -97,4 +97,4 @@ public:
} // namespace cvc5
-#endif /* CVC4__CNF_PROOF_H */
+#endif /* CVC5__CNF_PROOF_H */
diff --git a/src/proof/dot/dot_printer.h b/src/proof/dot/dot_printer.h
index 3bcc1cd73..a56eab50d 100644
--- a/src/proof/dot/dot_printer.h
+++ b/src/proof/dot/dot_printer.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PROOF__DOT__DOT_PRINTER_H
-#define CVC4__PROOF__DOT__DOT_PRINTER_H
+#ifndef CVC5__PROOF__DOT__DOT_PRINTER_H
+#define CVC5__PROOF__DOT__DOT_PRINTER_H
#include <iostream>
diff --git a/src/proof/proof_manager.h b/src/proof/proof_manager.h
index b6e6c1b2c..28be23e54 100644
--- a/src/proof/proof_manager.h
+++ b/src/proof/proof_manager.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PROOF_MANAGER_H
-#define CVC4__PROOF_MANAGER_H
+#ifndef CVC5__PROOF_MANAGER_H
+#define CVC5__PROOF_MANAGER_H
#include <memory>
#include <unordered_map>
@@ -122,4 +122,4 @@ private:
} // namespace cvc5
-#endif /* CVC4__PROOF_MANAGER_H */
+#endif /* CVC5__PROOF_MANAGER_H */
diff --git a/src/proof/sat_proof.h b/src/proof/sat_proof.h
index a66ca2d00..fcd1199e4 100644
--- a/src/proof/sat_proof.h
+++ b/src/proof/sat_proof.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SAT__PROOF_H
-#define CVC4__SAT__PROOF_H
+#ifndef CVC5__SAT__PROOF_H
+#define CVC5__SAT__PROOF_H
#include <iosfwd>
#include <set>
@@ -371,4 +371,4 @@ void toSatClause(const typename Solver::TClause& minisat_cl,
} // namespace cvc5
-#endif /* CVC4__SAT__PROOF_H */
+#endif /* CVC5__SAT__PROOF_H */
diff --git a/src/proof/sat_proof_implementation.h b/src/proof/sat_proof_implementation.h
index c2bbf6f11..9a7263af6 100644
--- a/src/proof/sat_proof_implementation.h
+++ b/src/proof/sat_proof_implementation.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SAT__PROOF_IMPLEMENTATION_H
-#define CVC4__SAT__PROOF_IMPLEMENTATION_H
+#ifndef CVC5__SAT__PROOF_IMPLEMENTATION_H
+#define CVC5__SAT__PROOF_IMPLEMENTATION_H
#include "proof/clause_id.h"
#include "proof/sat_proof.h"
@@ -1055,4 +1055,4 @@ inline std::ostream& operator<<(std::ostream& out, cvc5::ClauseKind k)
} // namespace cvc5
-#endif /* CVC4__SAT__PROOF_IMPLEMENTATION_H */
+#endif /* CVC5__SAT__PROOF_IMPLEMENTATION_H */
diff --git a/src/proof/unsat_core.h b/src/proof/unsat_core.h
index 7d7688347..81ccb55b0 100644
--- a/src/proof/unsat_core.h
+++ b/src/proof/unsat_core.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__UNSAT_CORE_H
-#define CVC4__UNSAT_CORE_H
+#ifndef CVC5__UNSAT_CORE_H
+#define CVC5__UNSAT_CORE_H
#include <iosfwd>
#include <vector>
@@ -70,4 +70,4 @@ std::ostream& operator<<(std::ostream& out, const UnsatCore& core);
} // namespace cvc5
-#endif /* CVC4__UNSAT_CORE_H */
+#endif /* CVC5__UNSAT_CORE_H */
diff --git a/src/prop/bv_sat_solver_notify.h b/src/prop/bv_sat_solver_notify.h
index fe95e7adb..df698c722 100644
--- a/src/prop/bv_sat_solver_notify.h
+++ b/src/prop/bv_sat_solver_notify.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PROP__BVSATSOLVERNOTIFY_H
-#define CVC4__PROP__BVSATSOLVERNOTIFY_H
+#ifndef CVC5__PROP__BVSATSOLVERNOTIFY_H
+#define CVC5__PROP__BVSATSOLVERNOTIFY_H
#include "prop/sat_solver_types.h"
#include "util/resource_manager.h"
diff --git a/src/prop/cadical.h b/src/prop/cadical.h
index 910e5def5..ed4c166d4 100644
--- a/src/prop/cadical.h
+++ b/src/prop/cadical.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PROP__CADICAL_H
-#define CVC4__PROP__CADICAL_H
+#ifndef CVC5__PROP__CADICAL_H
+#define CVC5__PROP__CADICAL_H
#ifdef CVC4_USE_CADICAL
@@ -106,4 +106,4 @@ class CadicalSolver : public SatSolver
} // namespace cvc5
#endif // CVC4_USE_CADICAL
-#endif // CVC4__PROP__CADICAL_H
+#endif // CVC5__PROP__CADICAL_H
diff --git a/src/prop/cnf_stream.h b/src/prop/cnf_stream.h
index b39423d71..4b41ad691 100644
--- a/src/prop/cnf_stream.h
+++ b/src/prop/cnf_stream.h
@@ -22,8 +22,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PROP__CNF_STREAM_H
-#define CVC4__PROP__CNF_STREAM_H
+#ifndef CVC5__PROP__CNF_STREAM_H
+#define CVC5__PROP__CNF_STREAM_H
#include "context/cdhashset.h"
#include "context/cdinsert_hashmap.h"
@@ -320,4 +320,4 @@ class CnfStream {
} // namespace prop
} // namespace cvc5
-#endif /* CVC4__PROP__CNF_STREAM_H */
+#endif /* CVC5__PROP__CNF_STREAM_H */
diff --git a/src/prop/cryptominisat.h b/src/prop/cryptominisat.h
index 65e1196f3..ceed47d79 100644
--- a/src/prop/cryptominisat.h
+++ b/src/prop/cryptominisat.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PROP__CRYPTOMINISAT_H
-#define CVC4__PROP__CRYPTOMINISAT_H
+#ifndef CVC5__PROP__CRYPTOMINISAT_H
+#define CVC5__PROP__CRYPTOMINISAT_H
#ifdef CVC4_USE_CRYPTOMINISAT
@@ -109,4 +109,4 @@ class CryptoMinisatSolver : public SatSolver
} // namespace cvc5
#endif // CVC4_USE_CRYPTOMINISAT
-#endif // CVC4__PROP__CRYPTOMINISAT_H
+#endif // CVC5__PROP__CRYPTOMINISAT_H
diff --git a/src/prop/kissat.h b/src/prop/kissat.h
index 6984a7e50..2ab38dbab 100644
--- a/src/prop/kissat.h
+++ b/src/prop/kissat.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PROP__KISSAT_H
-#define CVC4__PROP__KISSAT_H
+#ifndef CVC5__PROP__KISSAT_H
+#define CVC5__PROP__KISSAT_H
#ifdef CVC4_USE_KISSAT
@@ -100,4 +100,4 @@ class KissatSolver : public SatSolver
} // namespace cvc5
#endif // CVC4_USE_KISSAT
-#endif // CVC4__PROP__KISSAT_H
+#endif // CVC5__PROP__KISSAT_H
diff --git a/src/prop/proof_cnf_stream.h b/src/prop/proof_cnf_stream.h
index fcca2cb34..5848c64f0 100644
--- a/src/prop/proof_cnf_stream.h
+++ b/src/prop/proof_cnf_stream.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PROP__PROOF_CNF_STREAM_H
-#define CVC4__PROP__PROOF_CNF_STREAM_H
+#ifndef CVC5__PROP__PROOF_CNF_STREAM_H
+#define CVC5__PROP__PROOF_CNF_STREAM_H
#include "context/cdhashmap.h"
#include "expr/lazy_proof.h"
diff --git a/src/prop/proof_post_processor.h b/src/prop/proof_post_processor.h
index 906faaafd..68b6d3a42 100644
--- a/src/prop/proof_post_processor.h
+++ b/src/prop/proof_post_processor.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PROP__PROOF_POST_PROCESSOR_H
-#define CVC4__PROP__PROOF_POST_PROCESSOR_H
+#ifndef CVC5__PROP__PROOF_POST_PROCESSOR_H
+#define CVC5__PROP__PROOF_POST_PROCESSOR_H
#include <map>
#include <unordered_set>
diff --git a/src/prop/prop_engine.h b/src/prop/prop_engine.h
index a01668913..99c615211 100644
--- a/src/prop/prop_engine.h
+++ b/src/prop/prop_engine.h
@@ -18,8 +18,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PROP_ENGINE_H
-#define CVC4__PROP_ENGINE_H
+#ifndef CVC5__PROP_ENGINE_H
+#define CVC5__PROP_ENGINE_H
#include "context/cdlist.h"
#include "expr/node.h"
@@ -383,4 +383,4 @@ class PropEngine
} // namespace prop
} // namespace cvc5
-#endif /* CVC4__PROP_ENGINE_H */
+#endif /* CVC5__PROP_ENGINE_H */
diff --git a/src/prop/prop_proof_manager.h b/src/prop/prop_proof_manager.h
index 9a080edc1..45136085d 100644
--- a/src/prop/prop_proof_manager.h
+++ b/src/prop/prop_proof_manager.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PROP_PROOF_MANAGER_H
-#define CVC4__PROP_PROOF_MANAGER_H
+#ifndef CVC5__PROP_PROOF_MANAGER_H
+#define CVC5__PROP_PROOF_MANAGER_H
#include "context/cdlist.h"
#include "expr/proof.h"
@@ -94,4 +94,4 @@ class PropPfManager
} // namespace prop
} // namespace cvc5
-#endif /* CVC4__PROP__PROOF_MANAGER_H */
+#endif /* CVC5__PROP__PROOF_MANAGER_H */
diff --git a/src/prop/registrar.h b/src/prop/registrar.h
index ae085b573..daa364bcb 100644
--- a/src/prop/registrar.h
+++ b/src/prop/registrar.h
@@ -20,8 +20,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PROP__REGISTRAR_H
-#define CVC4__PROP__REGISTRAR_H
+#ifndef CVC5__PROP__REGISTRAR_H
+#define CVC5__PROP__REGISTRAR_H
namespace cvc5 {
namespace prop {
@@ -42,4 +42,4 @@ public:
} // namespace prop
} // namespace cvc5
-#endif /* CVC4__PROP__REGISTRAR_H */
+#endif /* CVC5__PROP__REGISTRAR_H */
diff --git a/src/prop/sat_proof_manager.h b/src/prop/sat_proof_manager.h
index 6407939c7..426771a37 100644
--- a/src/prop/sat_proof_manager.h
+++ b/src/prop/sat_proof_manager.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SAT_PROOF_MANAGER_H
-#define CVC4__SAT_PROOF_MANAGER_H
+#ifndef CVC5__SAT_PROOF_MANAGER_H
+#define CVC5__SAT_PROOF_MANAGER_H
#include "context/cdhashset.h"
#include "expr/buffered_proof_generator.h"
@@ -590,4 +590,4 @@ class SatProofManager
} // namespace prop
} // namespace cvc5
-#endif /* CVC4__SAT_PROOF_MANAGER_H */
+#endif /* CVC5__SAT_PROOF_MANAGER_H */
diff --git a/src/prop/sat_solver.h b/src/prop/sat_solver.h
index 1f59a7bd6..ae87d1396 100644
--- a/src/prop/sat_solver.h
+++ b/src/prop/sat_solver.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PROP__SAT_SOLVER_H
-#define CVC4__PROP__SAT_SOLVER_H
+#ifndef CVC5__PROP__SAT_SOLVER_H
+#define CVC5__PROP__SAT_SOLVER_H
#include <string>
@@ -211,4 +211,4 @@ inline std::ostream& operator <<(std::ostream& out, prop::SatValue val) {
} // namespace prop
} // namespace cvc5
-#endif /* CVC4__PROP__SAT_MODULE_H */
+#endif /* CVC5__PROP__SAT_MODULE_H */
diff --git a/src/prop/sat_solver_factory.h b/src/prop/sat_solver_factory.h
index 71e28ac39..cebbe6e27 100644
--- a/src/prop/sat_solver_factory.h
+++ b/src/prop/sat_solver_factory.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PROP__SAT_SOLVER_FACTORY_H
-#define CVC4__PROP__SAT_SOLVER_FACTORY_H
+#ifndef CVC5__PROP__SAT_SOLVER_FACTORY_H
+#define CVC5__PROP__SAT_SOLVER_FACTORY_H
#include <string>
#include <vector>
@@ -52,4 +52,4 @@ class SatSolverFactory
} // namespace prop
} // namespace cvc5
-#endif // CVC4__PROP__SAT_SOLVER_FACTORY_H
+#endif // CVC5__PROP__SAT_SOLVER_FACTORY_H
diff --git a/src/prop/skolem_def_manager.h b/src/prop/skolem_def_manager.h
index 11b726c2a..1b7b9b4dc 100644
--- a/src/prop/skolem_def_manager.h
+++ b/src/prop/skolem_def_manager.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PROP__SKOLEM_DEF_MANAGER_H
-#define CVC4__PROP__SKOLEM_DEF_MANAGER_H
+#ifndef CVC5__PROP__SKOLEM_DEF_MANAGER_H
+#define CVC5__PROP__SKOLEM_DEF_MANAGER_H
#include <iosfwd>
#include <unordered_set>
@@ -88,4 +88,4 @@ class SkolemDefManager
} // namespace prop
} // namespace cvc5
-#endif /* CVC4__PROP__SKOLEM_DEF_MANAGER_H */
+#endif /* CVC5__PROP__SKOLEM_DEF_MANAGER_H */
diff --git a/src/prop/theory_proxy.h b/src/prop/theory_proxy.h
index 3b21bde58..503b37ed7 100644
--- a/src/prop/theory_proxy.h
+++ b/src/prop/theory_proxy.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__PROP__SAT_H
-#define CVC4__PROP__SAT_H
+#ifndef CVC5__PROP__SAT_H
+#define CVC5__PROP__SAT_H
// Just defining this for now, since there's no other SAT solver bindings.
// Optional blocks below will be unconditionally included
@@ -169,4 +169,4 @@ class TheoryProxy : public Registrar
} // namespace cvc5
-#endif /* CVC4__PROP__SAT_H */
+#endif /* CVC5__PROP__SAT_H */
diff --git a/src/smt/abduction_solver.h b/src/smt/abduction_solver.h
index 03b300a7a..eee6f52cd 100644
--- a/src/smt/abduction_solver.h
+++ b/src/smt/abduction_solver.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__ABDUCTION_SOLVER_H
-#define CVC4__SMT__ABDUCTION_SOLVER_H
+#ifndef CVC5__SMT__ABDUCTION_SOLVER_H
+#define CVC5__SMT__ABDUCTION_SOLVER_H
#include "expr/node.h"
#include "expr/type_node.h"
@@ -117,4 +117,4 @@ class AbductionSolver
} // namespace smt
} // namespace cvc5
-#endif /* CVC4__SMT__ABDUCTION_SOLVER_H */
+#endif /* CVC5__SMT__ABDUCTION_SOLVER_H */
diff --git a/src/smt/abstract_values.h b/src/smt/abstract_values.h
index 5a7ce7ba1..125be2511 100644
--- a/src/smt/abstract_values.h
+++ b/src/smt/abstract_values.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__ABSTRACT_VALUES_H
-#define CVC4__SMT__ABSTRACT_VALUES_H
+#ifndef CVC5__SMT__ABSTRACT_VALUES_H
+#define CVC5__SMT__ABSTRACT_VALUES_H
#include <unordered_map>
diff --git a/src/smt/assertions.h b/src/smt/assertions.h
index 687c9b742..157d063f4 100644
--- a/src/smt/assertions.h
+++ b/src/smt/assertions.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__ASSERTIONS_H
-#define CVC4__SMT__ASSERTIONS_H
+#ifndef CVC5__SMT__ASSERTIONS_H
+#define CVC5__SMT__ASSERTIONS_H
#include <vector>
diff --git a/src/smt/check_models.h b/src/smt/check_models.h
index 2d9f4cf1b..997857515 100644
--- a/src/smt/check_models.h
+++ b/src/smt/check_models.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__CHECK_MODELS_H
-#define CVC4__SMT__CHECK_MODELS_H
+#ifndef CVC5__SMT__CHECK_MODELS_H
+#define CVC5__SMT__CHECK_MODELS_H
#include "context/cdlist.h"
#include "expr/node.h"
diff --git a/src/smt/command.h b/src/smt/command.h
index e92594736..d28c0975d 100644
--- a/src/smt/command.h
+++ b/src/smt/command.h
@@ -19,8 +19,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__COMMAND_H
-#define CVC4__COMMAND_H
+#ifndef CVC5__COMMAND_H
+#define CVC5__COMMAND_H
#include <iosfwd>
#include <sstream>
@@ -1530,4 +1530,4 @@ class CVC4_EXPORT DeclarationSequence : public CommandSequence
} // namespace cvc5
-#endif /* CVC4__COMMAND_H */
+#endif /* CVC5__COMMAND_H */
diff --git a/src/smt/defined_function.h b/src/smt/defined_function.h
index 2a7332297..6ad0b73c7 100644
--- a/src/smt/defined_function.h
+++ b/src/smt/defined_function.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__DEFINED_FUNCTION_H
-#define CVC4__SMT__DEFINED_FUNCTION_H
+#ifndef CVC5__SMT__DEFINED_FUNCTION_H
+#define CVC5__SMT__DEFINED_FUNCTION_H
#include <vector>
@@ -57,4 +57,4 @@ class DefinedFunction
} // namespace smt
} // namespace cvc5
-#endif /* CVC4__SMT__DEFINED_FUNCTION_H */
+#endif /* CVC5__SMT__DEFINED_FUNCTION_H */
diff --git a/src/smt/dump.h b/src/smt/dump.h
index e4fe15aa7..9aeb771dc 100644
--- a/src/smt/dump.h
+++ b/src/smt/dump.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__DUMP_H
-#define CVC4__DUMP_H
+#ifndef CVC5__DUMP_H
+#define CVC5__DUMP_H
#include "base/output.h"
@@ -114,4 +114,4 @@ extern DumpC DumpChannel;
} // namespace cvc5
-#endif /* CVC4__DUMP_H */
+#endif /* CVC5__DUMP_H */
diff --git a/src/smt/dump_manager.h b/src/smt/dump_manager.h
index c1bd7e898..2b1644bef 100644
--- a/src/smt/dump_manager.h
+++ b/src/smt/dump_manager.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__DUMP_MANAGER_H
-#define CVC4__SMT__DUMP_MANAGER_H
+#ifndef CVC5__SMT__DUMP_MANAGER_H
+#define CVC5__SMT__DUMP_MANAGER_H
#include <memory>
#include <vector>
diff --git a/src/smt/env.h b/src/smt/env.h
index 4ad8c81e2..c22044338 100644
--- a/src/smt/env.h
+++ b/src/smt/env.h
@@ -15,8 +15,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__SMT__ENV_H
-#define CVC4__SMT__ENV_H
+#ifndef CVC5__SMT__ENV_H
+#define CVC5__SMT__ENV_H
#include <memory>
@@ -184,4 +184,4 @@ class Env
} // namespace cvc5
-#endif /* CVC4__SMT__ENV_H */
+#endif /* CVC5__SMT__ENV_H */
diff --git a/src/smt/expand_definitions.h b/src/smt/expand_definitions.h
index 7d99445d5..a3d70542b 100644
--- a/src/smt/expand_definitions.h
+++ b/src/smt/expand_definitions.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__EXPAND_DEFINITIONS_H
-#define CVC4__SMT__EXPAND_DEFINITIONS_H
+#ifndef CVC5__SMT__EXPAND_DEFINITIONS_H
+#define CVC5__SMT__EXPAND_DEFINITIONS_H
#include <unordered_map>
diff --git a/src/smt/interpolation_solver.h b/src/smt/interpolation_solver.h
index bae777a16..62f469970 100644
--- a/src/smt/interpolation_solver.h
+++ b/src/smt/interpolation_solver.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__INTERPOLATION_SOLVER_H
-#define CVC4__SMT__INTERPOLATION_SOLVER_H
+#ifndef CVC5__SMT__INTERPOLATION_SOLVER_H
+#define CVC5__SMT__INTERPOLATION_SOLVER_H
#include "expr/node.h"
#include "expr/type_node.h"
@@ -83,4 +83,4 @@ class InterpolationSolver
} // namespace smt
} // namespace cvc5
-#endif /* CVC4__SMT__INTERPOLATION_SOLVER_H */
+#endif /* CVC5__SMT__INTERPOLATION_SOLVER_H */
diff --git a/src/smt/listeners.h b/src/smt/listeners.h
index 6857f7e6b..2ca8b8ad8 100644
--- a/src/smt/listeners.h
+++ b/src/smt/listeners.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__LISTENERS_H
-#define CVC4__SMT__LISTENERS_H
+#ifndef CVC5__SMT__LISTENERS_H
+#define CVC5__SMT__LISTENERS_H
#include <vector>
diff --git a/src/smt/logic_exception.h b/src/smt/logic_exception.h
index 0809d83e8..e9f747313 100644
--- a/src/smt/logic_exception.h
+++ b/src/smt/logic_exception.h
@@ -19,8 +19,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__SMT__LOGIC_EXCEPTION_H
-#define CVC4__SMT__LOGIC_EXCEPTION_H
+#ifndef CVC5__SMT__LOGIC_EXCEPTION_H
+#define CVC5__SMT__LOGIC_EXCEPTION_H
#include "base/exception.h"
@@ -45,4 +45,4 @@ class LogicException : public cvc5::Exception
} // namespace cvc5
-#endif /* CVC4__SMT__LOGIC_EXCEPTION_H */
+#endif /* CVC5__SMT__LOGIC_EXCEPTION_H */
diff --git a/src/smt/managed_ostreams.h b/src/smt/managed_ostreams.h
index f79eecc23..9737979ea 100644
--- a/src/smt/managed_ostreams.h
+++ b/src/smt/managed_ostreams.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__MANAGED_OSTREAMS_H
-#define CVC4__MANAGED_OSTREAMS_H
+#ifndef CVC5__MANAGED_OSTREAMS_H
+#define CVC5__MANAGED_OSTREAMS_H
#include <ostream>
@@ -143,4 +143,4 @@ class ManagedDiagnosticOutputChannel : public ManagedOstream {
} // namespace cvc5
-#endif /* CVC4__MANAGED_OSTREAMS_H */
+#endif /* CVC5__MANAGED_OSTREAMS_H */
diff --git a/src/smt/model.h b/src/smt/model.h
index 5eb1e45a4..1dd65a6b9 100644
--- a/src/smt/model.h
+++ b/src/smt/model.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__MODEL_H
-#define CVC4__MODEL_H
+#ifndef CVC5__MODEL_H
+#define CVC5__MODEL_H
#include <iosfwd>
#include <vector>
@@ -120,4 +120,4 @@ class Model {
} // namespace smt
} // namespace cvc5
-#endif /* CVC4__MODEL_H */
+#endif /* CVC5__MODEL_H */
diff --git a/src/smt/model_blocker.h b/src/smt/model_blocker.h
index 6d03a64c6..6ef9b0662 100644
--- a/src/smt/model_blocker.h
+++ b/src/smt/model_blocker.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef __CVC4__THEORY__MODEL_BLOCKER_H
-#define __CVC4__THEORY__MODEL_BLOCKER_H
+#ifndef __CVC5__THEORY__MODEL_BLOCKER_H
+#define __CVC5__THEORY__MODEL_BLOCKER_H
#include <vector>
@@ -71,4 +71,4 @@ class ModelBlocker
} // namespace cvc5
-#endif /* __CVC4__THEORY__MODEL_BLOCKER_H */
+#endif /* __CVC5__THEORY__MODEL_BLOCKER_H */
diff --git a/src/smt/model_core_builder.h b/src/smt/model_core_builder.h
index 38a9e51ed..05e9b804e 100644
--- a/src/smt/model_core_builder.h
+++ b/src/smt/model_core_builder.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__MODEL_CORE_BUILDER_H
-#define CVC4__THEORY__MODEL_CORE_BUILDER_H
+#ifndef CVC5__THEORY__MODEL_CORE_BUILDER_H
+#define CVC5__THEORY__MODEL_CORE_BUILDER_H
#include <vector>
@@ -61,4 +61,4 @@ class ModelCoreBuilder
} // namespace cvc5
-#endif /* CVC4__THEORY__MODEL_CORE_BUILDER_H */
+#endif /* CVC5__THEORY__MODEL_CORE_BUILDER_H */
diff --git a/src/smt/node_command.h b/src/smt/node_command.h
index 9ba2b316d..87bb713c6 100644
--- a/src/smt/node_command.h
+++ b/src/smt/node_command.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__NODE_COMMAND_H
-#define CVC4__SMT__NODE_COMMAND_H
+#ifndef CVC5__SMT__NODE_COMMAND_H
+#define CVC5__SMT__NODE_COMMAND_H
#include <string>
@@ -144,4 +144,4 @@ class DefineFunctionNodeCommand : public NodeCommand
} // namespace cvc5
-#endif /* CVC4__SMT__NODE_COMMAND_H */
+#endif /* CVC5__SMT__NODE_COMMAND_H */
diff --git a/src/smt/optimization_solver.h b/src/smt/optimization_solver.h
index b7f264ef1..edbbcbde1 100644
--- a/src/smt/optimization_solver.h
+++ b/src/smt/optimization_solver.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__OPTIMIZATION_SOLVER_H
-#define CVC4__SMT__OPTIMIZATION_SOLVER_H
+#ifndef CVC5__SMT__OPTIMIZATION_SOLVER_H
+#define CVC5__SMT__OPTIMIZATION_SOLVER_H
#include "expr/node.h"
#include "expr/type_node.h"
@@ -152,4 +152,4 @@ class OptimizationSolver
} // namespace smt
} // namespace cvc5
-#endif /* CVC4__SMT__OPTIMIZATION_SOLVER_H */
+#endif /* CVC5__SMT__OPTIMIZATION_SOLVER_H */
diff --git a/src/smt/options_manager.h b/src/smt/options_manager.h
index 62ad37eb0..89f5acd6a 100644
--- a/src/smt/options_manager.h
+++ b/src/smt/options_manager.h
@@ -12,8 +12,8 @@
** \brief Module for managing options of an SmtEngine.
**/
-#ifndef CVC4__SMT__OPTIONS_MANAGER_H
-#define CVC4__SMT__OPTIONS_MANAGER_H
+#ifndef CVC5__SMT__OPTIONS_MANAGER_H
+#define CVC5__SMT__OPTIONS_MANAGER_H
#include "options/options_listener.h"
#include "smt/managed_ostreams.h"
@@ -77,4 +77,4 @@ class OptionsManager : public OptionsListener
} // namespace smt
} // namespace cvc5
-#endif /* CVC4__SMT__OPTIONS_MANAGER_H */
+#endif /* CVC5__SMT__OPTIONS_MANAGER_H */
diff --git a/src/smt/output_manager.h b/src/smt/output_manager.h
index de21dc2b5..668daae0b 100644
--- a/src/smt/output_manager.h
+++ b/src/smt/output_manager.h
@@ -15,8 +15,8 @@
** internally.
**/
-#ifndef CVC4__SMT__OUTPUT_MANAGER_H
-#define CVC4__SMT__OUTPUT_MANAGER_H
+#ifndef CVC5__SMT__OUTPUT_MANAGER_H
+#define CVC5__SMT__OUTPUT_MANAGER_H
#include <ostream>
@@ -54,4 +54,4 @@ class OutputManager
} // namespace cvc5
-#endif // CVC4__SMT__OUTPUT_MANAGER_H
+#endif // CVC5__SMT__OUTPUT_MANAGER_H
diff --git a/src/smt/preprocess_proof_generator.h b/src/smt/preprocess_proof_generator.h
index 8e3882b2a..a9d5bd2b6 100644
--- a/src/smt/preprocess_proof_generator.h
+++ b/src/smt/preprocess_proof_generator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__PREPROCESS_PROOF_GENERATOR_H
-#define CVC4__SMT__PREPROCESS_PROOF_GENERATOR_H
+#ifndef CVC5__SMT__PREPROCESS_PROOF_GENERATOR_H
+#define CVC5__SMT__PREPROCESS_PROOF_GENERATOR_H
#include "context/cdhashmap.h"
#include "expr/lazy_proof.h"
diff --git a/src/smt/preprocessor.h b/src/smt/preprocessor.h
index 0d307d734..40b1b1278 100644
--- a/src/smt/preprocessor.h
+++ b/src/smt/preprocessor.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__PREPROCESSOR_H
-#define CVC4__SMT__PREPROCESSOR_H
+#ifndef CVC5__SMT__PREPROCESSOR_H
+#define CVC5__SMT__PREPROCESSOR_H
#include <memory>
diff --git a/src/smt/process_assertions.h b/src/smt/process_assertions.h
index 0409e181b..e3f5ae3a3 100644
--- a/src/smt/process_assertions.h
+++ b/src/smt/process_assertions.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__PROCESS_ASSERTIONS_H
-#define CVC4__SMT__PROCESS_ASSERTIONS_H
+#ifndef CVC5__SMT__PROCESS_ASSERTIONS_H
+#define CVC5__SMT__PROCESS_ASSERTIONS_H
#include <unordered_map>
diff --git a/src/smt/proof_manager.h b/src/smt/proof_manager.h
index e1177ca83..32f3f73d9 100644
--- a/src/smt/proof_manager.h
+++ b/src/smt/proof_manager.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__PROOF_MANAGER_H
-#define CVC4__SMT__PROOF_MANAGER_H
+#ifndef CVC5__SMT__PROOF_MANAGER_H
+#define CVC5__SMT__PROOF_MANAGER_H
#include "context/cdhashmap.h"
#include "expr/node.h"
@@ -119,4 +119,4 @@ class PfManager
} // namespace smt
} // namespace cvc5
-#endif /* CVC4__SMT__PROOF_MANAGER_H */
+#endif /* CVC5__SMT__PROOF_MANAGER_H */
diff --git a/src/smt/proof_post_processor.h b/src/smt/proof_post_processor.h
index 4111e83de..2459270c0 100644
--- a/src/smt/proof_post_processor.h
+++ b/src/smt/proof_post_processor.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__PROOF_POST_PROCESSOR_H
-#define CVC4__SMT__PROOF_POST_PROCESSOR_H
+#ifndef CVC5__SMT__PROOF_POST_PROCESSOR_H
+#define CVC5__SMT__PROOF_POST_PROCESSOR_H
#include <map>
#include <unordered_set>
diff --git a/src/smt/quant_elim_solver.h b/src/smt/quant_elim_solver.h
index e59d6c7ff..cf3be1ec3 100644
--- a/src/smt/quant_elim_solver.h
+++ b/src/smt/quant_elim_solver.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__QUANT_ELIM_SOLVER_H
-#define CVC4__SMT__QUANT_ELIM_SOLVER_H
+#ifndef CVC5__SMT__QUANT_ELIM_SOLVER_H
+#define CVC5__SMT__QUANT_ELIM_SOLVER_H
#include "expr/node.h"
#include "smt/assertions.h"
@@ -101,4 +101,4 @@ class QuantElimSolver
} // namespace smt
} // namespace cvc5
-#endif /* CVC4__SMT__QUANT_ELIM_SOLVER_H */
+#endif /* CVC5__SMT__QUANT_ELIM_SOLVER_H */
diff --git a/src/smt/set_defaults.h b/src/smt/set_defaults.h
index eb7cc3910..d3d82774c 100644
--- a/src/smt/set_defaults.h
+++ b/src/smt/set_defaults.h
@@ -12,8 +12,8 @@
** \brief Method for setting the default options of an SMT engine.
**/
-#ifndef CVC4__SMT__SET_DEFAULTS_H
-#define CVC4__SMT__SET_DEFAULTS_H
+#ifndef CVC5__SMT__SET_DEFAULTS_H
+#define CVC5__SMT__SET_DEFAULTS_H
#include "theory/logic_info.h"
@@ -38,4 +38,4 @@ void setDefaults(LogicInfo& logic, bool isInternalSubsolver);
} // namespace smt
} // namespace cvc5
-#endif /* CVC4__SMT__SET_DEFAULTS_H */
+#endif /* CVC5__SMT__SET_DEFAULTS_H */
diff --git a/src/smt/smt_engine.h b/src/smt/smt_engine.h
index 493042bbe..df5c69613 100644
--- a/src/smt/smt_engine.h
+++ b/src/smt/smt_engine.h
@@ -16,8 +16,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__SMT_ENGINE_H
-#define CVC4__SMT_ENGINE_H
+#ifndef CVC5__SMT_ENGINE_H
+#define CVC5__SMT_ENGINE_H
#include <map>
#include <memory>
@@ -1156,4 +1156,4 @@ class CVC4_EXPORT SmtEngine
} // namespace cvc5
-#endif /* CVC4__SMT_ENGINE_H */
+#endif /* CVC5__SMT_ENGINE_H */
diff --git a/src/smt/smt_engine_scope.h b/src/smt/smt_engine_scope.h
index 8bb010cec..e00c4fcb1 100644
--- a/src/smt/smt_engine_scope.h
+++ b/src/smt/smt_engine_scope.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__SMT_ENGINE_SCOPE_H
-#define CVC4__SMT__SMT_ENGINE_SCOPE_H
+#ifndef CVC5__SMT__SMT_ENGINE_SCOPE_H
+#define CVC5__SMT__SMT_ENGINE_SCOPE_H
#include "expr/node_manager.h"
@@ -62,4 +62,4 @@ class SmtScope : public NodeManagerScope
} // namespace smt
} // namespace cvc5
-#endif /* CVC4__SMT__SMT_ENGINE_SCOPE_H */
+#endif /* CVC5__SMT__SMT_ENGINE_SCOPE_H */
diff --git a/src/smt/smt_engine_state.h b/src/smt/smt_engine_state.h
index b90778b67..0e02a5605 100644
--- a/src/smt/smt_engine_state.h
+++ b/src/smt/smt_engine_state.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__SMT_ENGINE_STATE_H
-#define CVC4__SMT__SMT_ENGINE_STATE_H
+#ifndef CVC5__SMT__SMT_ENGINE_STATE_H
+#define CVC5__SMT__SMT_ENGINE_STATE_H
#include <string>
diff --git a/src/smt/smt_engine_stats.h b/src/smt/smt_engine_stats.h
index 4ec06e99b..b3fd5a1b7 100644
--- a/src/smt/smt_engine_stats.h
+++ b/src/smt/smt_engine_stats.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__SMT_ENGINE_STATS_H
-#define CVC4__SMT__SMT_ENGINE_STATS_H
+#ifndef CVC5__SMT__SMT_ENGINE_STATS_H
+#define CVC5__SMT__SMT_ENGINE_STATS_H
#include "util/statistics_registry.h"
#include "util/stats_timer.h"
@@ -62,4 +62,4 @@ struct SmtEngineStatistics
} // namespace smt
} // namespace cvc5
-#endif /* CVC4__SMT__SMT_ENGINE_STATS_H */
+#endif /* CVC5__SMT__SMT_ENGINE_STATS_H */
diff --git a/src/smt/smt_mode.h b/src/smt/smt_mode.h
index ce8babc2b..47cb15eb6 100644
--- a/src/smt/smt_mode.h
+++ b/src/smt/smt_mode.h
@@ -14,8 +14,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__SMT__SMT_MODE_H
-#define CVC4__SMT__SMT_MODE_H
+#ifndef CVC5__SMT__SMT_MODE_H
+#define CVC5__SMT__SMT_MODE_H
#include <iosfwd>
diff --git a/src/smt/smt_solver.h b/src/smt/smt_solver.h
index 7d9d06ad9..06f576445 100644
--- a/src/smt/smt_solver.h
+++ b/src/smt/smt_solver.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__SMT_SOLVER_H
-#define CVC4__SMT__SMT_SOLVER_H
+#ifndef CVC5__SMT__SMT_SOLVER_H
+#define CVC5__SMT__SMT_SOLVER_H
#include <vector>
@@ -153,4 +153,4 @@ class SmtSolver
} // namespace smt
} // namespace cvc5
-#endif /* CVC4__SMT__SMT_SOLVER_H */
+#endif /* CVC5__SMT__SMT_SOLVER_H */
diff --git a/src/smt/sygus_solver.h b/src/smt/sygus_solver.h
index ffce2ff06..8e6f08b75 100644
--- a/src/smt/sygus_solver.h
+++ b/src/smt/sygus_solver.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__SYGUS_SOLVER_H
-#define CVC4__SMT__SYGUS_SOLVER_H
+#ifndef CVC5__SMT__SYGUS_SOLVER_H
+#define CVC5__SMT__SYGUS_SOLVER_H
#include "context/cdo.h"
#include "expr/node.h"
@@ -191,4 +191,4 @@ class SygusSolver
} // namespace smt
} // namespace cvc5
-#endif /* CVC4__SMT__SYGUS_SOLVER_H */
+#endif /* CVC5__SMT__SYGUS_SOLVER_H */
diff --git a/src/smt/unsat_core_manager.h b/src/smt/unsat_core_manager.h
index c41638222..ac87bbe6e 100644
--- a/src/smt/unsat_core_manager.h
+++ b/src/smt/unsat_core_manager.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__UNSAT_CORE_MANAGER_H
-#define CVC4__SMT__UNSAT_CORE_MANAGER_H
+#ifndef CVC5__SMT__UNSAT_CORE_MANAGER_H
+#define CVC5__SMT__UNSAT_CORE_MANAGER_H
#include "context/cdlist.h"
#include "expr/node.h"
@@ -69,4 +69,4 @@ class UnsatCoreManager
} // namespace smt
} // namespace cvc5
-#endif /* CVC4__SMT__UNSAT_CORE_MANAGER_H */
+#endif /* CVC5__SMT__UNSAT_CORE_MANAGER_H */
diff --git a/src/smt/update_ostream.h b/src/smt/update_ostream.h
index c8f5d639b..b1cb855c6 100644
--- a/src/smt/update_ostream.h
+++ b/src/smt/update_ostream.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__UPDATE_OSTREAM_H
-#define CVC4__UPDATE_OSTREAM_H
+#ifndef CVC5__UPDATE_OSTREAM_H
+#define CVC5__UPDATE_OSTREAM_H
#include <ostream>
@@ -118,4 +118,4 @@ class TraceOstreamUpdate : public OstreamUpdate {
} // namespace cvc5
-#endif /* CVC4__UPDATE_OSTREAM_H */
+#endif /* CVC5__UPDATE_OSTREAM_H */
diff --git a/src/smt/witness_form.h b/src/smt/witness_form.h
index e30f165e5..37f672e57 100644
--- a/src/smt/witness_form.h
+++ b/src/smt/witness_form.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SMT__WITNESS_FORM_H
-#define CVC4__SMT__WITNESS_FORM_H
+#ifndef CVC5__SMT__WITNESS_FORM_H
+#define CVC5__SMT__WITNESS_FORM_H
#include <unordered_set>
diff --git a/src/smt_util/boolean_simplification.h b/src/smt_util/boolean_simplification.h
index 495c2c16d..ef0c3f3de 100644
--- a/src/smt_util/boolean_simplification.h
+++ b/src/smt_util/boolean_simplification.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__BOOLEAN_SIMPLIFICATION_H
-#define CVC4__BOOLEAN_SIMPLIFICATION_H
+#ifndef CVC5__BOOLEAN_SIMPLIFICATION_H
+#define CVC5__BOOLEAN_SIMPLIFICATION_H
#include <vector>
#include <algorithm>
@@ -225,4 +225,4 @@ class BooleanSimplification {
} // namespace cvc5
-#endif /* CVC4__BOOLEAN_SIMPLIFICATION_H */
+#endif /* CVC5__BOOLEAN_SIMPLIFICATION_H */
diff --git a/src/theory/arith/arith_ite_utils.h b/src/theory/arith/arith_ite_utils.h
index 3e548f42d..d82fc9f0d 100644
--- a/src/theory/arith/arith_ite_utils.h
+++ b/src/theory/arith/arith_ite_utils.h
@@ -19,8 +19,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__ARITH_ITE_UTILS_H
-#define CVC4__THEORY__ARITH__ARITH_ITE_UTILS_H
+#ifndef CVC5__THEORY__ARITH__ARITH_ITE_UTILS_H
+#define CVC5__THEORY__ARITH__ARITH_ITE_UTILS_H
#include <unordered_map>
@@ -113,4 +113,4 @@ private:
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__ARITH_ITE_UTILS_H */
+#endif /* CVC5__THEORY__ARITH__ARITH_ITE_UTILS_H */
diff --git a/src/theory/arith/arith_msum.h b/src/theory/arith/arith_msum.h
index 7854e0d3b..c9ed61fe5 100644
--- a/src/theory/arith/arith_msum.h
+++ b/src/theory/arith/arith_msum.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__MSUM_H
-#define CVC4__THEORY__ARITH__MSUM_H
+#ifndef CVC5__THEORY__ARITH__MSUM_H
+#define CVC5__THEORY__ARITH__MSUM_H
#include <map>
@@ -185,4 +185,4 @@ class ArithMSum
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__MSUM_H */
+#endif /* CVC5__THEORY__ARITH__MSUM_H */
diff --git a/src/theory/arith/arith_preprocess.h b/src/theory/arith/arith_preprocess.h
index 663c09abe..82bf07b45 100644
--- a/src/theory/arith/arith_preprocess.h
+++ b/src/theory/arith/arith_preprocess.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__ARITH_PREPROCESS_H
-#define CVC4__THEORY__ARITH__ARITH_PREPROCESS_H
+#ifndef CVC5__THEORY__ARITH__ARITH_PREPROCESS_H
+#define CVC5__THEORY__ARITH__ARITH_PREPROCESS_H
#include "context/cdhashmap.h"
#include "theory/arith/operator_elim.h"
diff --git a/src/theory/arith/arith_rewriter.h b/src/theory/arith/arith_rewriter.h
index 803f8c8a8..27b7cf9d2 100644
--- a/src/theory/arith/arith_rewriter.h
+++ b/src/theory/arith/arith_rewriter.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__ARITH_REWRITER_H
-#define CVC4__THEORY__ARITH__ARITH_REWRITER_H
+#ifndef CVC5__THEORY__ARITH__ARITH_REWRITER_H
+#define CVC5__THEORY__ARITH__ARITH_REWRITER_H
#include "theory/arith/rewrites.h"
#include "theory/theory_rewriter.h"
@@ -75,4 +75,4 @@ class ArithRewriter : public TheoryRewriter
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__ARITH_REWRITER_H */
+#endif /* CVC5__THEORY__ARITH__ARITH_REWRITER_H */
diff --git a/src/theory/arith/arith_state.h b/src/theory/arith/arith_state.h
index 05b09a5a2..1bf907f97 100644
--- a/src/theory/arith/arith_state.h
+++ b/src/theory/arith/arith_state.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__ARITH_STATE_H
-#define CVC4__THEORY__ARITH__ARITH_STATE_H
+#ifndef CVC5__THEORY__ARITH__ARITH_STATE_H
+#define CVC5__THEORY__ARITH__ARITH_STATE_H
#include "theory/theory_state.h"
diff --git a/src/theory/arith/arith_static_learner.h b/src/theory/arith/arith_static_learner.h
index b96d7a86a..0e708f63e 100644
--- a/src/theory/arith/arith_static_learner.h
+++ b/src/theory/arith/arith_static_learner.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__ARITH_STATIC_LEARNER_H
-#define CVC4__THEORY__ARITH__ARITH_STATIC_LEARNER_H
+#ifndef CVC5__THEORY__ARITH__ARITH_STATIC_LEARNER_H
+#define CVC5__THEORY__ARITH__ARITH_STATIC_LEARNER_H
#include "context/cdhashmap.h"
#include "theory/arith/arith_utilities.h"
@@ -76,4 +76,4 @@ public:
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__ARITH_STATIC_LEARNER_H */
+#endif /* CVC5__THEORY__ARITH__ARITH_STATIC_LEARNER_H */
diff --git a/src/theory/arith/arith_utilities.h b/src/theory/arith/arith_utilities.h
index c9f572364..337b18d9b 100644
--- a/src/theory/arith/arith_utilities.h
+++ b/src/theory/arith/arith_utilities.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__ARITH_UTILITIES_H
-#define CVC4__THEORY__ARITH__ARITH_UTILITIES_H
+#ifndef CVC5__THEORY__ARITH__ARITH_UTILITIES_H
+#define CVC5__THEORY__ARITH__ARITH_UTILITIES_H
#include <unordered_map>
#include <unordered_set>
@@ -334,4 +334,4 @@ Node negateProofLiteral(TNode n);
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__ARITH_UTILITIES_H */
+#endif /* CVC5__THEORY__ARITH__ARITH_UTILITIES_H */
diff --git a/src/theory/arith/arithvar_node_map.h b/src/theory/arith/arithvar_node_map.h
index 6764e8e0b..f70c1d311 100644
--- a/src/theory/arith/arithvar_node_map.h
+++ b/src/theory/arith/arithvar_node_map.h
@@ -17,9 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__ARITHVAR_NODE_MAP_H
-#define CVC4__THEORY__ARITH__ARITHVAR_NODE_MAP_H
-
+#ifndef CVC5__THEORY__ARITH__ARITHVAR_NODE_MAP_H
+#define CVC5__THEORY__ARITH__ARITHVAR_NODE_MAP_H
#include "theory/arith/arithvar.h"
#include "context/context.h"
@@ -92,4 +91,4 @@ public:
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__ARITHVAR_NODE_MAP_H */
+#endif /* CVC5__THEORY__ARITH__ARITHVAR_NODE_MAP_H */
diff --git a/src/theory/arith/bound_inference.h b/src/theory/arith/bound_inference.h
index fc5e68cff..b022dc7fc 100644
--- a/src/theory/arith/bound_inference.h
+++ b/src/theory/arith/bound_inference.h
@@ -12,8 +12,8 @@
** \brief Extract bounds on variables from theory atoms.
**/
-#ifndef CVC4__THEORY__ARITH__BOUND_INFERENCE_H
-#define CVC4__THEORY__ARITH__BOUND_INFERENCE_H
+#ifndef CVC5__THEORY__ARITH__BOUND_INFERENCE_H
+#define CVC5__THEORY__ARITH__BOUND_INFERENCE_H
#include <map>
#include <utility>
diff --git a/src/theory/arith/constraint.h b/src/theory/arith/constraint.h
index 33e39a5f0..67b64fc13 100644
--- a/src/theory/arith/constraint.h
+++ b/src/theory/arith/constraint.h
@@ -75,8 +75,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__CONSTRAINT_H
-#define CVC4__THEORY__ARITH__CONSTRAINT_H
+#ifndef CVC5__THEORY__ARITH__CONSTRAINT_H
+#define CVC5__THEORY__ARITH__CONSTRAINT_H
#include <unordered_map>
#include <vector>
@@ -1278,4 +1278,4 @@ private:
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__CONSTRAINT_H */
+#endif /* CVC5__THEORY__ARITH__CONSTRAINT_H */
diff --git a/src/theory/arith/constraint_forward.h b/src/theory/arith/constraint_forward.h
index 146ffd607..55c07b860 100644
--- a/src/theory/arith/constraint_forward.h
+++ b/src/theory/arith/constraint_forward.h
@@ -18,8 +18,8 @@
** between header files.
**/
-#ifndef CVC4__THEORY__ARITH__CONSTRAINT_FORWARD_H
-#define CVC4__THEORY__ARITH__CONSTRAINT_FORWARD_H
+#ifndef CVC5__THEORY__ARITH__CONSTRAINT_FORWARD_H
+#define CVC5__THEORY__ARITH__CONSTRAINT_FORWARD_H
#include "cvc4_private.h"
#include <vector>
@@ -48,4 +48,4 @@ static const RationalVectorP RationalVectorPSentinel = NULL;
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__CONSTRAINT_FORWARD_H */
+#endif /* CVC5__THEORY__ARITH__CONSTRAINT_FORWARD_H */
diff --git a/src/theory/arith/dio_solver.h b/src/theory/arith/dio_solver.h
index 9b3106036..ed6c107cc 100644
--- a/src/theory/arith/dio_solver.h
+++ b/src/theory/arith/dio_solver.h
@@ -16,9 +16,8 @@
#include "cvc4_private.h"
-
-#ifndef CVC4__THEORY__ARITH__DIO_SOLVER_H
-#define CVC4__THEORY__ARITH__DIO_SOLVER_H
+#ifndef CVC5__THEORY__ARITH__DIO_SOLVER_H
+#define CVC5__THEORY__ARITH__DIO_SOLVER_H
#include <unordered_map>
#include <utility>
@@ -425,4 +424,4 @@ public:
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__DIO_SOLVER_H */
+#endif /* CVC5__THEORY__ARITH__DIO_SOLVER_H */
diff --git a/src/theory/arith/inference_manager.h b/src/theory/arith/inference_manager.h
index a5b200f8b..aaa601142 100644
--- a/src/theory/arith/inference_manager.h
+++ b/src/theory/arith/inference_manager.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__INFERENCE_MANAGER_H
-#define CVC4__THEORY__ARITH__INFERENCE_MANAGER_H
+#ifndef CVC5__THEORY__ARITH__INFERENCE_MANAGER_H
+#define CVC5__THEORY__ARITH__INFERENCE_MANAGER_H
#include <vector>
diff --git a/src/theory/arith/nl/cad/cdcac.h b/src/theory/arith/nl/cad/cdcac.h
index 338f54da2..0d5d4ce74 100644
--- a/src/theory/arith/nl/cad/cdcac.h
+++ b/src/theory/arith/nl/cad/cdcac.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__NL__CAD__CDCAC_H
-#define CVC4__THEORY__ARITH__NL__CAD__CDCAC_H
+#ifndef CVC5__THEORY__ARITH__NL__CAD__CDCAC_H
+#define CVC5__THEORY__ARITH__NL__CAD__CDCAC_H
#ifdef CVC4_POLY_IMP
diff --git a/src/theory/arith/nl/cad/cdcac_utils.h b/src/theory/arith/nl/cad/cdcac_utils.h
index 607a2226f..3cfbb138c 100644
--- a/src/theory/arith/nl/cad/cdcac_utils.h
+++ b/src/theory/arith/nl/cad/cdcac_utils.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__NL__CAD__CDCAC_UTILS_H
-#define CVC4__THEORY__ARITH__NL__CAD__CDCAC_UTILS_H
+#ifndef CVC5__THEORY__ARITH__NL__CAD__CDCAC_UTILS_H
+#define CVC5__THEORY__ARITH__NL__CAD__CDCAC_UTILS_H
#ifdef CVC4_POLY_IMP
diff --git a/src/theory/arith/nl/cad/constraints.h b/src/theory/arith/nl/cad/constraints.h
index e9e59c40b..efc69d468 100644
--- a/src/theory/arith/nl/cad/constraints.h
+++ b/src/theory/arith/nl/cad/constraints.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__NL__CAD__CONSTRAINTS_H
-#define CVC4__THEORY__ARITH__NL__CAD__CONSTRAINTS_H
+#ifndef CVC5__THEORY__ARITH__NL__CAD__CONSTRAINTS_H
+#define CVC5__THEORY__ARITH__NL__CAD__CONSTRAINTS_H
#ifdef CVC4_POLY_IMP
diff --git a/src/theory/arith/nl/cad/projections.h b/src/theory/arith/nl/cad/projections.h
index 94bdfc3ef..c1ce91303 100644
--- a/src/theory/arith/nl/cad/projections.h
+++ b/src/theory/arith/nl/cad/projections.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__NL__CAD_PROJECTIONS_H
-#define CVC4__THEORY__ARITH__NL__CAD_PROJECTIONS_H
+#ifndef CVC5__THEORY__ARITH__NL__CAD_PROJECTIONS_H
+#define CVC5__THEORY__ARITH__NL__CAD_PROJECTIONS_H
#ifdef CVC4_USE_POLY
diff --git a/src/theory/arith/nl/cad/proof_checker.h b/src/theory/arith/nl/cad/proof_checker.h
index 9100762b7..d2013e14b 100644
--- a/src/theory/arith/nl/cad/proof_checker.h
+++ b/src/theory/arith/nl/cad/proof_checker.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__NL__CAD__PROOF_CHECKER_H
-#define CVC4__THEORY__ARITH__NL__CAD__PROOF_CHECKER_H
+#ifndef CVC5__THEORY__ARITH__NL__CAD__PROOF_CHECKER_H
+#define CVC5__THEORY__ARITH__NL__CAD__PROOF_CHECKER_H
#include "expr/node.h"
#include "expr/proof_checker.h"
@@ -55,4 +55,4 @@ class CADProofRuleChecker : public ProofRuleChecker
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__PROOF_CHECKER_H */
+#endif /* CVC5__THEORY__STRINGS__PROOF_CHECKER_H */
diff --git a/src/theory/arith/nl/cad/proof_generator.h b/src/theory/arith/nl/cad/proof_generator.h
index 76a72f9c5..9365cc337 100644
--- a/src/theory/arith/nl/cad/proof_generator.h
+++ b/src/theory/arith/nl/cad/proof_generator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__NL__CAD__PROOF_GENERATOR_H
-#define CVC4__THEORY__ARITH__NL__CAD__PROOF_GENERATOR_H
+#ifndef CVC5__THEORY__ARITH__NL__CAD__PROOF_GENERATOR_H
+#define CVC5__THEORY__ARITH__NL__CAD__PROOF_GENERATOR_H
#ifdef CVC4_POLY_IMP
diff --git a/src/theory/arith/nl/cad/variable_ordering.h b/src/theory/arith/nl/cad/variable_ordering.h
index 0ab585197..b4336d395 100644
--- a/src/theory/arith/nl/cad/variable_ordering.h
+++ b/src/theory/arith/nl/cad/variable_ordering.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__NL__CAD__VARIABLE_ORDERING_H
-#define CVC4__THEORY__ARITH__NL__CAD__VARIABLE_ORDERING_H
+#ifndef CVC5__THEORY__ARITH__NL__CAD__VARIABLE_ORDERING_H
+#define CVC5__THEORY__ARITH__NL__CAD__VARIABLE_ORDERING_H
#ifdef CVC4_POLY_IMP
diff --git a/src/theory/arith/nl/cad_solver.h b/src/theory/arith/nl/cad_solver.h
index 620679735..2ea27fce7 100644
--- a/src/theory/arith/nl/cad_solver.h
+++ b/src/theory/arith/nl/cad_solver.h
@@ -12,8 +12,8 @@
** \brief CAD-based solver based on https://arxiv.org/pdf/2003.05633.pdf.
**/
-#ifndef CVC4__THEORY__ARITH__CAD_SOLVER_H
-#define CVC4__THEORY__ARITH__CAD_SOLVER_H
+#ifndef CVC5__THEORY__ARITH__CAD_SOLVER_H
+#define CVC5__THEORY__ARITH__CAD_SOLVER_H
#include <vector>
@@ -112,4 +112,4 @@ class CadSolver
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__CAD_SOLVER_H */
+#endif /* CVC5__THEORY__ARITH__CAD_SOLVER_H */
diff --git a/src/theory/arith/nl/ext/constraint.h b/src/theory/arith/nl/ext/constraint.h
index a96949a1e..ef9f8fef3 100644
--- a/src/theory/arith/nl/ext/constraint.h
+++ b/src/theory/arith/nl/ext/constraint.h
@@ -12,8 +12,8 @@
** \brief Utilities for non-linear constraints
**/
-#ifndef CVC4__THEORY__ARITH__NL__EXT__CONSTRAINT_H
-#define CVC4__THEORY__ARITH__NL__EXT__CONSTRAINT_H
+#ifndef CVC5__THEORY__ARITH__NL__EXT__CONSTRAINT_H
+#define CVC5__THEORY__ARITH__NL__EXT__CONSTRAINT_H
#include <map>
#include <vector>
@@ -86,4 +86,4 @@ class ConstraintDb
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__NL_SOLVER_H */
+#endif /* CVC5__THEORY__ARITH__NL_SOLVER_H */
diff --git a/src/theory/arith/nl/ext/ext_state.h b/src/theory/arith/nl/ext/ext_state.h
index 2d20e1557..1571f3173 100644
--- a/src/theory/arith/nl/ext/ext_state.h
+++ b/src/theory/arith/nl/ext/ext_state.h
@@ -12,8 +12,8 @@
** \brief Common data shared by multiple checks
**/
-#ifndef CVC4__THEORY__ARITH__NL__EXT__SHARED_CHECK_DATA_H
-#define CVC4__THEORY__ARITH__NL__EXT__SHARED_CHECK_DATA_H
+#ifndef CVC5__THEORY__ARITH__NL__EXT__SHARED_CHECK_DATA_H
+#define CVC5__THEORY__ARITH__NL__EXT__SHARED_CHECK_DATA_H
#include <vector>
diff --git a/src/theory/arith/nl/ext/factoring_check.h b/src/theory/arith/nl/ext/factoring_check.h
index 08154cb98..feff91112 100644
--- a/src/theory/arith/nl/ext/factoring_check.h
+++ b/src/theory/arith/nl/ext/factoring_check.h
@@ -12,8 +12,8 @@
** \brief Check for factoring lemma
**/
-#ifndef CVC4__THEORY__ARITH__NL__EXT__FACTORING_CHECK_H
-#define CVC4__THEORY__ARITH__NL__EXT__FACTORING_CHECK_H
+#ifndef CVC5__THEORY__ARITH__NL__EXT__FACTORING_CHECK_H
+#define CVC5__THEORY__ARITH__NL__EXT__FACTORING_CHECK_H
#include <vector>
diff --git a/src/theory/arith/nl/ext/monomial.h b/src/theory/arith/nl/ext/monomial.h
index 6646e4a73..bbae33eda 100644
--- a/src/theory/arith/nl/ext/monomial.h
+++ b/src/theory/arith/nl/ext/monomial.h
@@ -12,8 +12,8 @@
** \brief Utilities for monomials
**/
-#ifndef CVC4__THEORY__ARITH__NL__EXT__MONOMIAL_H
-#define CVC4__THEORY__ARITH__NL__EXT__MONOMIAL_H
+#ifndef CVC5__THEORY__ARITH__NL__EXT__MONOMIAL_H
+#define CVC5__THEORY__ARITH__NL__EXT__MONOMIAL_H
#include <map>
#include <vector>
@@ -146,4 +146,4 @@ class MonomialDb
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__NL_MONOMIAL_H */
+#endif /* CVC5__THEORY__ARITH__NL_MONOMIAL_H */
diff --git a/src/theory/arith/nl/ext/monomial_bounds_check.h b/src/theory/arith/nl/ext/monomial_bounds_check.h
index a19c61e64..e95cda778 100644
--- a/src/theory/arith/nl/ext/monomial_bounds_check.h
+++ b/src/theory/arith/nl/ext/monomial_bounds_check.h
@@ -12,8 +12,8 @@
** \brief Check for monomial bound inference lemmas
**/
-#ifndef CVC4__THEORY__ARITH__NL__EXT__MONOMIAL_BOUNDS_CHECK_H
-#define CVC4__THEORY__ARITH__NL__EXT__MONOMIAL_BOUNDS_CHECK_H
+#ifndef CVC5__THEORY__ARITH__NL__EXT__MONOMIAL_BOUNDS_CHECK_H
+#define CVC5__THEORY__ARITH__NL__EXT__MONOMIAL_BOUNDS_CHECK_H
#include "expr/node.h"
#include "theory/arith/nl/ext/constraint.h"
diff --git a/src/theory/arith/nl/ext/monomial_check.h b/src/theory/arith/nl/ext/monomial_check.h
index f242182b4..f84d69b6b 100644
--- a/src/theory/arith/nl/ext/monomial_check.h
+++ b/src/theory/arith/nl/ext/monomial_check.h
@@ -12,8 +12,8 @@
** \brief Check for some monomial lemmas
**/
-#ifndef CVC4__THEORY__ARITH__NL__EXT__MONOMIAL_CHECK_H
-#define CVC4__THEORY__ARITH__NL__EXT__MONOMIAL_CHECK_H
+#ifndef CVC5__THEORY__ARITH__NL__EXT__MONOMIAL_CHECK_H
+#define CVC5__THEORY__ARITH__NL__EXT__MONOMIAL_CHECK_H
#include "expr/node.h"
#include "theory/arith/nl/ext/monomial.h"
diff --git a/src/theory/arith/nl/ext/proof_checker.h b/src/theory/arith/nl/ext/proof_checker.h
index 90518fc08..5e901ddf5 100644
--- a/src/theory/arith/nl/ext/proof_checker.h
+++ b/src/theory/arith/nl/ext/proof_checker.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__NL__EXT__PROOF_CHECKER_H
-#define CVC4__THEORY__ARITH__NL__EXT__PROOF_CHECKER_H
+#ifndef CVC5__THEORY__ARITH__NL__EXT__PROOF_CHECKER_H
+#define CVC5__THEORY__ARITH__NL__EXT__PROOF_CHECKER_H
#include "expr/node.h"
#include "expr/proof_checker.h"
@@ -53,4 +53,4 @@ class ExtProofRuleChecker : public ProofRuleChecker
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__PROOF_CHECKER_H */
+#endif /* CVC5__THEORY__STRINGS__PROOF_CHECKER_H */
diff --git a/src/theory/arith/nl/ext/split_zero_check.h b/src/theory/arith/nl/ext/split_zero_check.h
index 04148bd19..bd07a79f6 100644
--- a/src/theory/arith/nl/ext/split_zero_check.h
+++ b/src/theory/arith/nl/ext/split_zero_check.h
@@ -12,8 +12,8 @@
** \brief Check for split zero lemma
**/
-#ifndef CVC4__THEORY__ARITH__NL__EXT__SPLIT_ZERO_CHECK_H
-#define CVC4__THEORY__ARITH__NL__EXT__SPLIT_ZERO_CHECK_H
+#ifndef CVC5__THEORY__ARITH__NL__EXT__SPLIT_ZERO_CHECK_H
+#define CVC5__THEORY__ARITH__NL__EXT__SPLIT_ZERO_CHECK_H
#include "expr/node.h"
#include "context/cdhashset.h"
diff --git a/src/theory/arith/nl/ext/tangent_plane_check.h b/src/theory/arith/nl/ext/tangent_plane_check.h
index b5159e721..b5fd797aa 100644
--- a/src/theory/arith/nl/ext/tangent_plane_check.h
+++ b/src/theory/arith/nl/ext/tangent_plane_check.h
@@ -12,8 +12,8 @@
** \brief Check for tangent_plane lemma
**/
-#ifndef CVC4__THEORY__ARITH__NL__EXT__TANGENT_PLANE_CHECK_H
-#define CVC4__THEORY__ARITH__NL__EXT__TANGENT_PLANE_CHECK_H
+#ifndef CVC5__THEORY__ARITH__NL__EXT__TANGENT_PLANE_CHECK_H
+#define CVC5__THEORY__ARITH__NL__EXT__TANGENT_PLANE_CHECK_H
#include <map>
diff --git a/src/theory/arith/nl/ext_theory_callback.h b/src/theory/arith/nl/ext_theory_callback.h
index 78ea3b2b6..56faacddd 100644
--- a/src/theory/arith/nl/ext_theory_callback.h
+++ b/src/theory/arith/nl/ext_theory_callback.h
@@ -12,8 +12,8 @@
** \brief The extended theory callback for non-linear arithmetic
**/
-#ifndef CVC4__THEORY__ARITH__NL__EXT_THEORY_CALLBACK_H
-#define CVC4__THEORY__ARITH__NL__EXT_THEORY_CALLBACK_H
+#ifndef CVC5__THEORY__ARITH__NL__EXT_THEORY_CALLBACK_H
+#define CVC5__THEORY__ARITH__NL__EXT_THEORY_CALLBACK_H
#include "expr/node.h"
#include "theory/ext_theory.h"
@@ -87,4 +87,4 @@ class NlExtTheoryCallback : public ExtTheoryCallback
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__NL__EXT_THEORY_CALLBACK_H */
+#endif /* CVC5__THEORY__ARITH__NL__EXT_THEORY_CALLBACK_H */
diff --git a/src/theory/arith/nl/iand_solver.h b/src/theory/arith/nl/iand_solver.h
index 2b7f90e9b..52f97bf0e 100644
--- a/src/theory/arith/nl/iand_solver.h
+++ b/src/theory/arith/nl/iand_solver.h
@@ -12,8 +12,8 @@
** \brief Solver for integer and (IAND) constraints
**/
-#ifndef CVC4__THEORY__ARITH__NL__IAND_SOLVER_H
-#define CVC4__THEORY__ARITH__NL__IAND_SOLVER_H
+#ifndef CVC5__THEORY__ARITH__NL__IAND_SOLVER_H
+#define CVC5__THEORY__ARITH__NL__IAND_SOLVER_H
#include <map>
#include <vector>
@@ -134,4 +134,4 @@ class IAndSolver
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__IAND_SOLVER_H */
+#endif /* CVC5__THEORY__ARITH__IAND_SOLVER_H */
diff --git a/src/theory/arith/nl/iand_utils.h b/src/theory/arith/nl/iand_utils.h
index 60c3cbe13..cad5c80d5 100644
--- a/src/theory/arith/nl/iand_utils.h
+++ b/src/theory/arith/nl/iand_utils.h
@@ -13,8 +13,8 @@
** the value of iand.
**/
-#ifndef CVC4__THEORY__ARITH__IAND_TABLE_H
-#define CVC4__THEORY__ARITH__IAND_TABLE_H
+#ifndef CVC5__THEORY__ARITH__IAND_TABLE_H
+#define CVC5__THEORY__ARITH__IAND_TABLE_H
#include <map>
@@ -171,4 +171,4 @@ class IAndUtils
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__IAND_TABLE_H */
+#endif /* CVC5__THEORY__ARITH__IAND_TABLE_H */
diff --git a/src/theory/arith/nl/icp/candidate.h b/src/theory/arith/nl/icp/candidate.h
index 4bcbf3e85..524342658 100644
--- a/src/theory/arith/nl/icp/candidate.h
+++ b/src/theory/arith/nl/icp/candidate.h
@@ -12,8 +12,8 @@
** \brief Represents a contraction candidate for ICP-style propagation.
**/
-#ifndef CVC4__THEORY__ARITH__ICP__CANDIDATE_H
-#define CVC4__THEORY__ARITH__ICP__CANDIDATE_H
+#ifndef CVC5__THEORY__ARITH__ICP__CANDIDATE_H
+#define CVC5__THEORY__ARITH__ICP__CANDIDATE_H
#include "cvc4_private.h"
diff --git a/src/theory/arith/nl/icp/contraction_origins.h b/src/theory/arith/nl/icp/contraction_origins.h
index dfddbce78..fd899cfd2 100644
--- a/src/theory/arith/nl/icp/contraction_origins.h
+++ b/src/theory/arith/nl/icp/contraction_origins.h
@@ -12,8 +12,8 @@
** \brief Implements a way to track the origins of ICP-style contractions.
**/
-#ifndef CVC4__THEORY__ARITH__ICP__CONTRACTION_ORIGINS_H
-#define CVC4__THEORY__ARITH__ICP__CONTRACTION_ORIGINS_H
+#ifndef CVC5__THEORY__ARITH__ICP__CONTRACTION_ORIGINS_H
+#define CVC5__THEORY__ARITH__ICP__CONTRACTION_ORIGINS_H
#include <memory>
#include <vector>
diff --git a/src/theory/arith/nl/icp/icp_solver.h b/src/theory/arith/nl/icp/icp_solver.h
index 11fd9ac1b..b392dc430 100644
--- a/src/theory/arith/nl/icp/icp_solver.h
+++ b/src/theory/arith/nl/icp/icp_solver.h
@@ -12,8 +12,8 @@
** \brief Implements a ICP-based solver for nonlinear arithmetic.
**/
-#ifndef CVC4__THEORY__ARITH__ICP__ICP_SOLVER_H
-#define CVC4__THEORY__ARITH__ICP__ICP_SOLVER_H
+#ifndef CVC5__THEORY__ARITH__ICP__ICP_SOLVER_H
+#define CVC5__THEORY__ARITH__ICP__ICP_SOLVER_H
#include "cvc4_private.h"
diff --git a/src/theory/arith/nl/icp/intersection.h b/src/theory/arith/nl/icp/intersection.h
index dd4afadfc..a77a605d0 100644
--- a/src/theory/arith/nl/icp/intersection.h
+++ b/src/theory/arith/nl/icp/intersection.h
@@ -12,8 +12,8 @@
** \brief Implement intersection of intervals for propagation.
**/
-#ifndef CVC4__THEORY__ARITH__ICP__INTERSECTION_H
-#define CVC4__THEORY__ARITH__ICP__INTERSECTION_H
+#ifndef CVC5__THEORY__ARITH__ICP__INTERSECTION_H
+#define CVC5__THEORY__ARITH__ICP__INTERSECTION_H
#include "cvc4_private.h"
diff --git a/src/theory/arith/nl/icp/interval.h b/src/theory/arith/nl/icp/interval.h
index 981355e4a..7716d029f 100644
--- a/src/theory/arith/nl/icp/interval.h
+++ b/src/theory/arith/nl/icp/interval.h
@@ -12,8 +12,8 @@
** \brief
**/
-#ifndef CVC4__THEORY__ARITH__ICP__INTERVAL_H
-#define CVC4__THEORY__ARITH__ICP__INTERVAL_H
+#ifndef CVC5__THEORY__ARITH__ICP__INTERVAL_H
+#define CVC5__THEORY__ARITH__ICP__INTERVAL_H
#include "cvc4_private.h"
diff --git a/src/theory/arith/nl/nl_lemma_utils.h b/src/theory/arith/nl/nl_lemma_utils.h
index 32fe763b4..474212821 100644
--- a/src/theory/arith/nl/nl_lemma_utils.h
+++ b/src/theory/arith/nl/nl_lemma_utils.h
@@ -12,8 +12,8 @@
** \brief Utilities for processing lemmas from the non-linear solver
**/
-#ifndef CVC4__THEORY__ARITH__NL__NL_LEMMA_UTILS_H
-#define CVC4__THEORY__ARITH__NL__NL_LEMMA_UTILS_H
+#ifndef CVC5__THEORY__ARITH__NL__NL_LEMMA_UTILS_H
+#define CVC5__THEORY__ARITH__NL__NL_LEMMA_UTILS_H
#include <tuple>
#include <vector>
@@ -146,4 +146,4 @@ class ArgTrie
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__NL_LEMMA_UTILS_H */
+#endif /* CVC5__THEORY__ARITH__NL_LEMMA_UTILS_H */
diff --git a/src/theory/arith/nl/nl_model.h b/src/theory/arith/nl/nl_model.h
index 9da8738b6..4a50cd54f 100644
--- a/src/theory/arith/nl/nl_model.h
+++ b/src/theory/arith/nl/nl_model.h
@@ -12,8 +12,8 @@
** \brief Model object for the non-linear extension class
**/
-#ifndef CVC4__THEORY__ARITH__NL__NL_MODEL_H
-#define CVC4__THEORY__ARITH__NL__NL_MODEL_H
+#ifndef CVC5__THEORY__ARITH__NL__NL_MODEL_H
+#define CVC5__THEORY__ARITH__NL__NL_MODEL_H
#include <map>
#include <unordered_map>
@@ -331,4 +331,4 @@ class NlModel
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__NONLINEAR_EXTENSION_H */
+#endif /* CVC5__THEORY__ARITH__NONLINEAR_EXTENSION_H */
diff --git a/src/theory/arith/nl/nonlinear_extension.h b/src/theory/arith/nl/nonlinear_extension.h
index 722741d7d..5dd1374cd 100644
--- a/src/theory/arith/nl/nonlinear_extension.h
+++ b/src/theory/arith/nl/nonlinear_extension.h
@@ -15,8 +15,8 @@
** multiplication via axiom instantiations.
**/
-#ifndef CVC4__THEORY__ARITH__NL__NONLINEAR_EXTENSION_H
-#define CVC4__THEORY__ARITH__NL__NONLINEAR_EXTENSION_H
+#ifndef CVC5__THEORY__ARITH__NL__NONLINEAR_EXTENSION_H
+#define CVC5__THEORY__ARITH__NL__NONLINEAR_EXTENSION_H
#include <map>
#include <vector>
@@ -298,4 +298,4 @@ class NonlinearExtension
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__NONLINEAR_EXTENSION_H */
+#endif /* CVC5__THEORY__ARITH__NONLINEAR_EXTENSION_H */
diff --git a/src/theory/arith/nl/poly_conversion.h b/src/theory/arith/nl/poly_conversion.h
index 9aef0db18..0a9d0f313 100644
--- a/src/theory/arith/nl/poly_conversion.h
+++ b/src/theory/arith/nl/poly_conversion.h
@@ -14,8 +14,8 @@
** Utilities for converting to and from LibPoly objects.
**/
-#ifndef CVC4__THEORY__ARITH__NL__POLY_CONVERSION_H
-#define CVC4__THEORY__ARITH__NL__POLY_CONVERSION_H
+#ifndef CVC5__THEORY__ARITH__NL__POLY_CONVERSION_H
+#define CVC5__THEORY__ARITH__NL__POLY_CONVERSION_H
#include "cvc4_private.h"
diff --git a/src/theory/arith/nl/stats.h b/src/theory/arith/nl/stats.h
index 66f41375b..3e947160e 100644
--- a/src/theory/arith/nl/stats.h
+++ b/src/theory/arith/nl/stats.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__NL__STATS_H
-#define CVC4__THEORY__ARITH__NL__STATS_H
+#ifndef CVC5__THEORY__ARITH__NL__STATS_H
+#define CVC5__THEORY__ARITH__NL__STATS_H
#include "util/statistics_registry.h"
@@ -46,4 +46,4 @@ class NlStats
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__NL__STATS_H */
+#endif /* CVC5__THEORY__ARITH__NL__STATS_H */
diff --git a/src/theory/arith/nl/strategy.h b/src/theory/arith/nl/strategy.h
index 139db7459..4fc115476 100644
--- a/src/theory/arith/nl/strategy.h
+++ b/src/theory/arith/nl/strategy.h
@@ -12,8 +12,8 @@
** \brief Strategies for the nonlinear extension
**/
-#ifndef CVC4__THEORY__ARITH__NL__STRATEGY_H
-#define CVC4__THEORY__ARITH__NL__STRATEGY_H
+#ifndef CVC5__THEORY__ARITH__NL__STRATEGY_H
+#define CVC5__THEORY__ARITH__NL__STRATEGY_H
#include <iosfwd>
#include <vector>
@@ -175,4 +175,4 @@ class Strategy
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__NL__STRATEGY_H */
+#endif /* CVC5__THEORY__ARITH__NL__STRATEGY_H */
diff --git a/src/theory/arith/nl/transcendental/exponential_solver.h b/src/theory/arith/nl/transcendental/exponential_solver.h
index c5eb45728..a7ae92498 100644
--- a/src/theory/arith/nl/transcendental/exponential_solver.h
+++ b/src/theory/arith/nl/transcendental/exponential_solver.h
@@ -12,8 +12,8 @@
** \brief Solving for handling exponential function.
**/
-#ifndef CVC4__THEORY__ARITH__NL__TRANSCENDENTAL__EXPONENTIAL_SOLVER_H
-#define CVC4__THEORY__ARITH__NL__TRANSCENDENTAL__EXPONENTIAL_SOLVER_H
+#ifndef CVC5__THEORY__ARITH__NL__TRANSCENDENTAL__EXPONENTIAL_SOLVER_H
+#define CVC5__THEORY__ARITH__NL__TRANSCENDENTAL__EXPONENTIAL_SOLVER_H
#include <map>
@@ -110,4 +110,4 @@ class ExponentialSolver
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__TRANSCENDENTAL_SOLVER_H */
+#endif /* CVC5__THEORY__ARITH__TRANSCENDENTAL_SOLVER_H */
diff --git a/src/theory/arith/nl/transcendental/proof_checker.h b/src/theory/arith/nl/transcendental/proof_checker.h
index a4c8b55cb..83788b60e 100644
--- a/src/theory/arith/nl/transcendental/proof_checker.h
+++ b/src/theory/arith/nl/transcendental/proof_checker.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__NL__TRANSCENDENTAL__PROOF_CHECKER_H
-#define CVC4__THEORY__ARITH__NL__TRANSCENDENTAL__PROOF_CHECKER_H
+#ifndef CVC5__THEORY__ARITH__NL__TRANSCENDENTAL__PROOF_CHECKER_H
+#define CVC5__THEORY__ARITH__NL__TRANSCENDENTAL__PROOF_CHECKER_H
#include "expr/node.h"
#include "expr/proof_checker.h"
@@ -55,4 +55,4 @@ class TranscendentalProofRuleChecker : public ProofRuleChecker
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__PROOF_CHECKER_H */
+#endif /* CVC5__THEORY__STRINGS__PROOF_CHECKER_H */
diff --git a/src/theory/arith/nl/transcendental/sine_solver.h b/src/theory/arith/nl/transcendental/sine_solver.h
index b85d0dc48..80b4fb10b 100644
--- a/src/theory/arith/nl/transcendental/sine_solver.h
+++ b/src/theory/arith/nl/transcendental/sine_solver.h
@@ -12,8 +12,8 @@
** \brief Solving for handling exponential function.
**/
-#ifndef CVC4__THEORY__ARITH__NL__TRANSCENDENTAL__SINE_SOLVER_H
-#define CVC4__THEORY__ARITH__NL__TRANSCENDENTAL__SINE_SOLVER_H
+#ifndef CVC5__THEORY__ARITH__NL__TRANSCENDENTAL__SINE_SOLVER_H
+#define CVC5__THEORY__ARITH__NL__TRANSCENDENTAL__SINE_SOLVER_H
#include <map>
@@ -177,4 +177,4 @@ class SineSolver
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__TRANSCENDENTAL_SOLVER_H */
+#endif /* CVC5__THEORY__ARITH__TRANSCENDENTAL_SOLVER_H */
diff --git a/src/theory/arith/nl/transcendental/taylor_generator.h b/src/theory/arith/nl/transcendental/taylor_generator.h
index 8b7f5340d..4ecf5aa9a 100644
--- a/src/theory/arith/nl/transcendental/taylor_generator.h
+++ b/src/theory/arith/nl/transcendental/taylor_generator.h
@@ -12,8 +12,8 @@
** \brief Generate taylor approximations transcendental lemmas.
**/
-#ifndef CVC4__THEORY__ARITH__NL__TRANSCENDENTAL__TAYLOR_GENERATOR_H
-#define CVC4__THEORY__ARITH__NL__TRANSCENDENTAL__TAYLOR_GENERATOR_H
+#ifndef CVC5__THEORY__ARITH__NL__TRANSCENDENTAL__TAYLOR_GENERATOR_H
+#define CVC5__THEORY__ARITH__NL__TRANSCENDENTAL__TAYLOR_GENERATOR_H
#include "expr/node.h"
@@ -120,4 +120,4 @@ class TaylorGenerator
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__TRANSCENDENTAL_SOLVER_H */
+#endif /* CVC5__THEORY__ARITH__TRANSCENDENTAL_SOLVER_H */
diff --git a/src/theory/arith/nl/transcendental/transcendental_solver.h b/src/theory/arith/nl/transcendental/transcendental_solver.h
index c3d098e03..1a2f59282 100644
--- a/src/theory/arith/nl/transcendental/transcendental_solver.h
+++ b/src/theory/arith/nl/transcendental/transcendental_solver.h
@@ -12,8 +12,8 @@
** \brief Solving for handling transcendental functions.
**/
-#ifndef CVC4__THEORY__ARITH__NL__TRANSCENDENTAL__TRANSCENDENTAL_SOLVER_H
-#define CVC4__THEORY__ARITH__NL__TRANSCENDENTAL__TRANSCENDENTAL_SOLVER_H
+#ifndef CVC5__THEORY__ARITH__NL__TRANSCENDENTAL__TRANSCENDENTAL_SOLVER_H
+#define CVC5__THEORY__ARITH__NL__TRANSCENDENTAL__TRANSCENDENTAL_SOLVER_H
#include <vector>
@@ -202,4 +202,4 @@ class TranscendentalSolver
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__TRANSCENDENTAL_SOLVER_H */
+#endif /* CVC5__THEORY__ARITH__TRANSCENDENTAL_SOLVER_H */
diff --git a/src/theory/arith/nl/transcendental/transcendental_state.h b/src/theory/arith/nl/transcendental/transcendental_state.h
index a55071ef1..3d1c4a037 100644
--- a/src/theory/arith/nl/transcendental/transcendental_state.h
+++ b/src/theory/arith/nl/transcendental/transcendental_state.h
@@ -12,8 +12,8 @@
** \brief Utilities for transcendental lemmas.
**/
-#ifndef CVC4__THEORY__ARITH__NL__TRANSCENDENTAL__TRANSCENDENTAL_STATE_H
-#define CVC4__THEORY__ARITH__NL__TRANSCENDENTAL__TRANSCENDENTAL_STATE_H
+#ifndef CVC5__THEORY__ARITH__NL__TRANSCENDENTAL__TRANSCENDENTAL_STATE_H
+#define CVC5__THEORY__ARITH__NL__TRANSCENDENTAL__TRANSCENDENTAL_STATE_H
#include "expr/node.h"
#include "expr/proof_set.h"
@@ -280,4 +280,4 @@ struct TranscendentalState
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__NL__TRANSCENDENTAL__TRANSCENDENTAL_STATE_H */
+#endif /* CVC5__THEORY__ARITH__NL__TRANSCENDENTAL__TRANSCENDENTAL_STATE_H */
diff --git a/src/theory/arith/normal_form.h b/src/theory/arith/normal_form.h
index 940812604..c4f702b43 100644
--- a/src/theory/arith/normal_form.h
+++ b/src/theory/arith/normal_form.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__NORMAL_FORM_H
-#define CVC4__THEORY__ARITH__NORMAL_FORM_H
+#ifndef CVC5__THEORY__ARITH__NORMAL_FORM_H
+#define CVC5__THEORY__ARITH__NORMAL_FORM_H
#include <algorithm>
@@ -1406,4 +1406,4 @@ public:
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__NORMAL_FORM_H */
+#endif /* CVC5__THEORY__ARITH__NORMAL_FORM_H */
diff --git a/src/theory/arith/partial_model.h b/src/theory/arith/partial_model.h
index 30a684e47..cef635395 100644
--- a/src/theory/arith/partial_model.h
+++ b/src/theory/arith/partial_model.h
@@ -18,8 +18,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__PARTIAL_MODEL_H
-#define CVC4__THEORY__ARITH__PARTIAL_MODEL_H
+#ifndef CVC5__THEORY__ARITH__PARTIAL_MODEL_H
+#define CVC5__THEORY__ARITH__PARTIAL_MODEL_H
#include <vector>
@@ -416,4 +416,4 @@ private:
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__PARTIAL_MODEL_H */
+#endif /* CVC5__THEORY__ARITH__PARTIAL_MODEL_H */
diff --git a/src/theory/arith/proof_checker.h b/src/theory/arith/proof_checker.h
index ca4fdfb6d..86251135c 100644
--- a/src/theory/arith/proof_checker.h
+++ b/src/theory/arith/proof_checker.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__PROOF_CHECKER_H
-#define CVC4__THEORY__ARITH__PROOF_CHECKER_H
+#ifndef CVC5__THEORY__ARITH__PROOF_CHECKER_H
+#define CVC5__THEORY__ARITH__PROOF_CHECKER_H
#include "expr/node.h"
#include "expr/proof_checker.h"
@@ -45,4 +45,4 @@ class ArithProofRuleChecker : public ProofRuleChecker
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__PROOF_CHECKER_H */
+#endif /* CVC5__THEORY__ARITH__PROOF_CHECKER_H */
diff --git a/src/theory/arith/proof_macros.h b/src/theory/arith/proof_macros.h
index a02738fd3..32a31b157 100644
--- a/src/theory/arith/proof_macros.h
+++ b/src/theory/arith/proof_macros.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__PROOF_MACROS_H
-#define CVC4__THEORY__ARITH__PROOF_MACROS_H
+#ifndef CVC5__THEORY__ARITH__PROOF_MACROS_H
+#define CVC5__THEORY__ARITH__PROOF_MACROS_H
#include "options/smt_options.h"
@@ -28,4 +28,4 @@
#define ARITH_NULLPROOF(x) (cvc5::options::produceProofs()) ? x : NULL
#define ARITH_PROOF_ON() cvc5::options::produceProofs()
-#endif // CVC4__THEORY__ARITH__PROOF_MACROS_H
+#endif // CVC5__THEORY__ARITH__PROOF_MACROS_H
diff --git a/src/theory/arith/rewrites.h b/src/theory/arith/rewrites.h
index e7a44f27e..2a85e6358 100644
--- a/src/theory/arith/rewrites.h
+++ b/src/theory/arith/rewrites.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__REWRITES_H
-#define CVC4__THEORY__ARITH__REWRITES_H
+#ifndef CVC5__THEORY__ARITH__REWRITES_H
+#define CVC5__THEORY__ARITH__REWRITES_H
#include <iosfwd>
@@ -79,4 +79,4 @@ std::ostream& operator<<(std::ostream& out, Rewrite r);
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__REWRITES_H */
+#endif /* CVC5__THEORY__ARITH__REWRITES_H */
diff --git a/src/theory/arith/theory_arith_type_rules.h b/src/theory/arith/theory_arith_type_rules.h
index e8769064a..6d93c74dd 100644
--- a/src/theory/arith/theory_arith_type_rules.h
+++ b/src/theory/arith/theory_arith_type_rules.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__THEORY_ARITH_TYPE_RULES_H
-#define CVC4__THEORY__ARITH__THEORY_ARITH_TYPE_RULES_H
+#ifndef CVC5__THEORY__ARITH__THEORY_ARITH_TYPE_RULES_H
+#define CVC5__THEORY__ARITH__THEORY_ARITH_TYPE_RULES_H
namespace cvc5 {
namespace theory {
@@ -166,4 +166,4 @@ class IndexedRootPredicateTypeRule
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__THEORY_ARITH_TYPE_RULES_H */
+#endif /* CVC5__THEORY__ARITH__THEORY_ARITH_TYPE_RULES_H */
diff --git a/src/theory/arith/type_enumerator.h b/src/theory/arith/type_enumerator.h
index 9b3f4535b..d0ecdeda0 100644
--- a/src/theory/arith/type_enumerator.h
+++ b/src/theory/arith/type_enumerator.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARITH__TYPE_ENUMERATOR_H
-#define CVC4__THEORY__ARITH__TYPE_ENUMERATOR_H
+#ifndef CVC5__THEORY__ARITH__TYPE_ENUMERATOR_H
+#define CVC5__THEORY__ARITH__TYPE_ENUMERATOR_H
#include "expr/kind.h"
#include "expr/type_node.h"
@@ -104,4 +104,4 @@ class IntegerEnumerator : public TypeEnumeratorBase<IntegerEnumerator> {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARITH__TYPE_ENUMERATOR_H */
+#endif /* CVC5__THEORY__ARITH__TYPE_ENUMERATOR_H */
diff --git a/src/theory/arrays/array_info.h b/src/theory/arrays/array_info.h
index 1a1cf441b..fc1754fdc 100644
--- a/src/theory/arrays/array_info.h
+++ b/src/theory/arrays/array_info.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARRAYS__ARRAY_INFO_H
-#define CVC4__THEORY__ARRAYS__ARRAY_INFO_H
+#ifndef CVC5__THEORY__ARRAYS__ARRAY_INFO_H
+#define CVC5__THEORY__ARRAYS__ARRAY_INFO_H
#include <tuple>
#include <unordered_map>
@@ -209,4 +209,4 @@ public:
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARRAYS__ARRAY_INFO_H */
+#endif /* CVC5__THEORY__ARRAYS__ARRAY_INFO_H */
diff --git a/src/theory/arrays/inference_manager.h b/src/theory/arrays/inference_manager.h
index 58b2b37bc..f70c986ed 100644
--- a/src/theory/arrays/inference_manager.h
+++ b/src/theory/arrays/inference_manager.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARRAYS__INFERENCE_MANAGER_H
-#define CVC4__THEORY__ARRAYS__INFERENCE_MANAGER_H
+#ifndef CVC5__THEORY__ARRAYS__INFERENCE_MANAGER_H
+#define CVC5__THEORY__ARRAYS__INFERENCE_MANAGER_H
#include "expr/node.h"
#include "expr/proof_rule.h"
diff --git a/src/theory/arrays/proof_checker.h b/src/theory/arrays/proof_checker.h
index b62f929a3..08c760493 100644
--- a/src/theory/arrays/proof_checker.h
+++ b/src/theory/arrays/proof_checker.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARRAYS__PROOF_CHECKER_H
-#define CVC4__THEORY__ARRAYS__PROOF_CHECKER_H
+#ifndef CVC5__THEORY__ARRAYS__PROOF_CHECKER_H
+#define CVC5__THEORY__ARRAYS__PROOF_CHECKER_H
#include "expr/node.h"
#include "expr/proof_checker.h"
@@ -45,4 +45,4 @@ class ArraysProofRuleChecker : public ProofRuleChecker
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARRAYS__PROOF_CHECKER_H */
+#endif /* CVC5__THEORY__ARRAYS__PROOF_CHECKER_H */
diff --git a/src/theory/arrays/skolem_cache.h b/src/theory/arrays/skolem_cache.h
index fbd547079..81981fe66 100644
--- a/src/theory/arrays/skolem_cache.h
+++ b/src/theory/arrays/skolem_cache.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARRAYS__SKOLEM_CACHE_H
-#define CVC4__THEORY__ARRAYS__SKOLEM_CACHE_H
+#ifndef CVC5__THEORY__ARRAYS__SKOLEM_CACHE_H
+#define CVC5__THEORY__ARRAYS__SKOLEM_CACHE_H
#include "expr/node.h"
diff --git a/src/theory/arrays/theory_arrays.h b/src/theory/arrays/theory_arrays.h
index 24772a5f0..cf1e216f2 100644
--- a/src/theory/arrays/theory_arrays.h
+++ b/src/theory/arrays/theory_arrays.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARRAYS__THEORY_ARRAYS_H
-#define CVC4__THEORY__ARRAYS__THEORY_ARRAYS_H
+#ifndef CVC5__THEORY__ARRAYS__THEORY_ARRAYS_H
+#define CVC5__THEORY__ARRAYS__THEORY_ARRAYS_H
#include <tuple>
#include <unordered_map>
@@ -494,4 +494,4 @@ class TheoryArrays : public Theory {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARRAYS__THEORY_ARRAYS_H */
+#endif /* CVC5__THEORY__ARRAYS__THEORY_ARRAYS_H */
diff --git a/src/theory/arrays/theory_arrays_rewriter.h b/src/theory/arrays/theory_arrays_rewriter.h
index 2d8da6929..a3e5c65c4 100644
--- a/src/theory/arrays/theory_arrays_rewriter.h
+++ b/src/theory/arrays/theory_arrays_rewriter.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARRAYS__THEORY_ARRAYS_REWRITER_H
-#define CVC4__THEORY__ARRAYS__THEORY_ARRAYS_REWRITER_H
+#ifndef CVC5__THEORY__ARRAYS__THEORY_ARRAYS_REWRITER_H
+#define CVC5__THEORY__ARRAYS__THEORY_ARRAYS_REWRITER_H
#include <unordered_map>
#include <unordered_set>
@@ -505,4 +505,4 @@ class TheoryArraysRewriter : public TheoryRewriter
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARRAYS__THEORY_ARRAYS_REWRITER_H */
+#endif /* CVC5__THEORY__ARRAYS__THEORY_ARRAYS_REWRITER_H */
diff --git a/src/theory/arrays/theory_arrays_type_rules.h b/src/theory/arrays/theory_arrays_type_rules.h
index 5637639de..b2146a8cf 100644
--- a/src/theory/arrays/theory_arrays_type_rules.h
+++ b/src/theory/arrays/theory_arrays_type_rules.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARRAYS__THEORY_ARRAYS_TYPE_RULES_H
-#define CVC4__THEORY__ARRAYS__THEORY_ARRAYS_TYPE_RULES_H
+#ifndef CVC5__THEORY__ARRAYS__THEORY_ARRAYS_TYPE_RULES_H
+#define CVC5__THEORY__ARRAYS__THEORY_ARRAYS_TYPE_RULES_H
#include "theory/arrays/theory_arrays_rewriter.h" // for array-constant attributes
#include "theory/type_enumerator.h"
@@ -278,4 +278,4 @@ struct ArrayEqRangeTypeRule
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARRAYS__THEORY_ARRAYS_TYPE_RULES_H */
+#endif /* CVC5__THEORY__ARRAYS__THEORY_ARRAYS_TYPE_RULES_H */
diff --git a/src/theory/arrays/type_enumerator.h b/src/theory/arrays/type_enumerator.h
index 715a3f7a5..0bb54b994 100644
--- a/src/theory/arrays/type_enumerator.h
+++ b/src/theory/arrays/type_enumerator.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARRAYS__TYPE_ENUMERATOR_H
-#define CVC4__THEORY__ARRAYS__TYPE_ENUMERATOR_H
+#ifndef CVC5__THEORY__ARRAYS__TYPE_ENUMERATOR_H
+#define CVC5__THEORY__ARRAYS__TYPE_ENUMERATOR_H
#include "theory/type_enumerator.h"
#include "expr/type_node.h"
@@ -159,4 +159,4 @@ class ArrayEnumerator : public TypeEnumeratorBase<ArrayEnumerator> {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ARRAYS__TYPE_ENUMERATOR_H */
+#endif /* CVC5__THEORY__ARRAYS__TYPE_ENUMERATOR_H */
diff --git a/src/theory/arrays/union_find.h b/src/theory/arrays/union_find.h
index 6285e0e9b..938ddbea9 100644
--- a/src/theory/arrays/union_find.h
+++ b/src/theory/arrays/union_find.h
@@ -18,8 +18,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ARRAYS__UNION_FIND_H
-#define CVC4__THEORY__ARRAYS__UNION_FIND_H
+#ifndef CVC5__THEORY__ARRAYS__UNION_FIND_H
+#define CVC5__THEORY__ARRAYS__UNION_FIND_H
#include <utility>
#include <vector>
@@ -139,4 +139,4 @@ inline void UnionFind<NodeType, NodeHash>::setCanon(TNode n, TNode newParent) {
} // namespace theory
} // namespace cvc5
-#endif /*CVC4__THEORY__ARRAYS__UNION_FIND_H */
+#endif /*CVC5__THEORY__ARRAYS__UNION_FIND_H */
diff --git a/src/theory/assertion.h b/src/theory/assertion.h
index 4971dee00..769968311 100644
--- a/src/theory/assertion.h
+++ b/src/theory/assertion.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ASSERTION_H
-#define CVC4__THEORY__ASSERTION_H
+#ifndef CVC5__THEORY__ASSERTION_H
+#define CVC5__THEORY__ASSERTION_H
#include "expr/node.h"
@@ -50,4 +50,4 @@ std::ostream& operator<<(std::ostream& out, const Assertion& a);
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ASSERTION_H */
+#endif /* CVC5__THEORY__ASSERTION_H */
diff --git a/src/theory/bags/bag_solver.h b/src/theory/bags/bag_solver.h
index 5cd7ed338..191fd481c 100644
--- a/src/theory/bags/bag_solver.h
+++ b/src/theory/bags/bag_solver.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BAG__SOLVER_H
-#define CVC4__THEORY__BAG__SOLVER_H
+#ifndef CVC5__THEORY__BAG__SOLVER_H
+#define CVC5__THEORY__BAG__SOLVER_H
#include "theory/bags/inference_generator.h"
@@ -92,4 +92,4 @@ class BagSolver
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BAG__SOLVER_H */
+#endif /* CVC5__THEORY__BAG__SOLVER_H */
diff --git a/src/theory/bags/bags_rewriter.h b/src/theory/bags/bags_rewriter.h
index bc66d7efa..26686bcc0 100644
--- a/src/theory/bags/bags_rewriter.h
+++ b/src/theory/bags/bags_rewriter.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BAGS__THEORY_BAGS_REWRITER_H
-#define CVC4__THEORY__BAGS__THEORY_BAGS_REWRITER_H
+#ifndef CVC5__THEORY__BAGS__THEORY_BAGS_REWRITER_H
+#define CVC5__THEORY__BAGS__THEORY_BAGS_REWRITER_H
#include "theory/bags/rewrites.h"
#include "theory/theory_rewriter.h"
@@ -225,4 +225,4 @@ class BagsRewriter : public TheoryRewriter
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BAGS__THEORY_BAGS_REWRITER_H */
+#endif /* CVC5__THEORY__BAGS__THEORY_BAGS_REWRITER_H */
diff --git a/src/theory/bags/bags_statistics.h b/src/theory/bags/bags_statistics.h
index ac60fbc3e..58765a996 100644
--- a/src/theory/bags/bags_statistics.h
+++ b/src/theory/bags/bags_statistics.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BAGS_STATISTICS_H
-#define CVC4__THEORY__BAGS_STATISTICS_H
+#ifndef CVC5__THEORY__BAGS_STATISTICS_H
+#define CVC5__THEORY__BAGS_STATISTICS_H
#include "theory/bags/rewrites.h"
#include "util/statistics_registry.h"
@@ -42,4 +42,4 @@ class BagsStatistics
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BAGS_STATISTICS_H */
+#endif /* CVC5__THEORY__BAGS_STATISTICS_H */
diff --git a/src/theory/bags/infer_info.h b/src/theory/bags/infer_info.h
index 508c49fe5..633c3a828 100644
--- a/src/theory/bags/infer_info.h
+++ b/src/theory/bags/infer_info.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BAGS__INFER_INFO_H
-#define CVC4__THEORY__BAGS__INFER_INFO_H
+#ifndef CVC5__THEORY__BAGS__INFER_INFO_H
+#define CVC5__THEORY__BAGS__INFER_INFO_H
#include <map>
#include <vector>
@@ -87,4 +87,4 @@ std::ostream& operator<<(std::ostream& out, const InferInfo& ii);
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BAGS__INFER_INFO_H */
+#endif /* CVC5__THEORY__BAGS__INFER_INFO_H */
diff --git a/src/theory/bags/inference_generator.h b/src/theory/bags/inference_generator.h
index baa391f38..639fd3215 100644
--- a/src/theory/bags/inference_generator.h
+++ b/src/theory/bags/inference_generator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BAGS__INFERENCE_GENERATOR_H
-#define CVC4__THEORY__BAGS__INFERENCE_GENERATOR_H
+#ifndef CVC5__THEORY__BAGS__INFERENCE_GENERATOR_H
+#define CVC5__THEORY__BAGS__INFERENCE_GENERATOR_H
#include "expr/node.h"
#include "infer_info.h"
@@ -190,4 +190,4 @@ class InferenceGenerator
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BAGS__INFERENCE_GENERATOR_H */
+#endif /* CVC5__THEORY__BAGS__INFERENCE_GENERATOR_H */
diff --git a/src/theory/bags/inference_manager.h b/src/theory/bags/inference_manager.h
index 68d923889..f17a6828b 100644
--- a/src/theory/bags/inference_manager.h
+++ b/src/theory/bags/inference_manager.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BAGS__INFERENCE_MANAGER_H
-#define CVC4__THEORY__BAGS__INFERENCE_MANAGER_H
+#ifndef CVC5__THEORY__BAGS__INFERENCE_MANAGER_H
+#define CVC5__THEORY__BAGS__INFERENCE_MANAGER_H
#include "theory/inference_manager_buffered.h"
@@ -65,4 +65,4 @@ class InferenceManager : public InferenceManagerBuffered
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BAGS__INFERENCE_MANAGER_H */
+#endif /* CVC5__THEORY__BAGS__INFERENCE_MANAGER_H */
diff --git a/src/theory/bags/make_bag_op.h b/src/theory/bags/make_bag_op.h
index 44b105225..33de51ed7 100644
--- a/src/theory/bags/make_bag_op.h
+++ b/src/theory/bags/make_bag_op.h
@@ -14,8 +14,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__MAKE_BAG_OP_H
-#define CVC4__MAKE_BAG_OP_H
+#ifndef CVC5__MAKE_BAG_OP_H
+#define CVC5__MAKE_BAG_OP_H
#include <memory>
@@ -59,4 +59,4 @@ struct MakeBagOpHashFunction
} // namespace cvc5
-#endif /* CVC4__MAKE_BAG_OP_H */
+#endif /* CVC5__MAKE_BAG_OP_H */
diff --git a/src/theory/bags/normal_form.h b/src/theory/bags/normal_form.h
index 5b5591133..9eb2d8137 100644
--- a/src/theory/bags/normal_form.h
+++ b/src/theory/bags/normal_form.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BAGS__NORMAL_FORM_H
-#define CVC4__THEORY__BAGS__NORMAL_FORM_H
+#ifndef CVC5__THEORY__BAGS__NORMAL_FORM_H
+#define CVC5__THEORY__BAGS__NORMAL_FORM_H
namespace cvc5 {
namespace theory {
@@ -194,4 +194,4 @@ class NormalForm
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BAGS__NORMAL_FORM_H */
+#endif /* CVC5__THEORY__BAGS__NORMAL_FORM_H */
diff --git a/src/theory/bags/rewrites.h b/src/theory/bags/rewrites.h
index aa49c71fb..54bf72c2f 100644
--- a/src/theory/bags/rewrites.h
+++ b/src/theory/bags/rewrites.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BAGS__REWRITES_H
-#define CVC4__THEORY__BAGS__REWRITES_H
+#ifndef CVC5__THEORY__BAGS__REWRITES_H
+#define CVC5__THEORY__BAGS__REWRITES_H
#include <iosfwd>
@@ -94,4 +94,4 @@ std::ostream& operator<<(std::ostream& out, Rewrite r);
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BAGS__REWRITES_H */
+#endif /* CVC5__THEORY__BAGS__REWRITES_H */
diff --git a/src/theory/bags/solver_state.h b/src/theory/bags/solver_state.h
index e7c09db8f..9309a704f 100644
--- a/src/theory/bags/solver_state.h
+++ b/src/theory/bags/solver_state.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BAGS__THEORY_SOLVER_STATE_H
-#define CVC4__THEORY__BAGS__THEORY_SOLVER_STATE_H
+#ifndef CVC5__THEORY__BAGS__THEORY_SOLVER_STATE_H
+#define CVC5__THEORY__BAGS__THEORY_SOLVER_STATE_H
#include <map>
@@ -92,4 +92,4 @@ class SolverState : public TheoryState
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BAGS__THEORY_SOLVER_STATE_H */
+#endif /* CVC5__THEORY__BAGS__THEORY_SOLVER_STATE_H */
diff --git a/src/theory/bags/term_registry.h b/src/theory/bags/term_registry.h
index ab519b100..a9a03abe6 100644
--- a/src/theory/bags/term_registry.h
+++ b/src/theory/bags/term_registry.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BAGS__TERM_REGISTRY_H
-#define CVC4__THEORY__BAGS__TERM_REGISTRY_H
+#ifndef CVC5__THEORY__BAGS__TERM_REGISTRY_H
+#define CVC5__THEORY__BAGS__TERM_REGISTRY_H
#include <map>
@@ -61,4 +61,4 @@ class TermRegistry
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BAGS__TERM_REGISTRY_H */
+#endif /* CVC5__THEORY__BAGS__TERM_REGISTRY_H */
diff --git a/src/theory/bags/theory_bags.h b/src/theory/bags/theory_bags.h
index 7505f43bf..f1122ed6b 100644
--- a/src/theory/bags/theory_bags.h
+++ b/src/theory/bags/theory_bags.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BAGS__THEORY_BAGS_H
-#define CVC4__THEORY__BAGS__THEORY_BAGS_H
+#ifndef CVC5__THEORY__BAGS__THEORY_BAGS_H
+#define CVC5__THEORY__BAGS__THEORY_BAGS_H
#include "theory/bags/bag_solver.h"
#include "theory/bags/bags_rewriter.h"
@@ -118,4 +118,4 @@ class TheoryBags : public Theory
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BAGS__THEORY_BAGS_H */
+#endif /* CVC5__THEORY__BAGS__THEORY_BAGS_H */
diff --git a/src/theory/bags/theory_bags_type_enumerator.h b/src/theory/bags/theory_bags_type_enumerator.h
index bdf57213d..74325e2c5 100644
--- a/src/theory/bags/theory_bags_type_enumerator.h
+++ b/src/theory/bags/theory_bags_type_enumerator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BAGS__TYPE_ENUMERATOR_H
-#define CVC4__THEORY__BAGS__TYPE_ENUMERATOR_H
+#ifndef CVC5__THEORY__BAGS__TYPE_ENUMERATOR_H
+#define CVC5__THEORY__BAGS__TYPE_ENUMERATOR_H
#include "expr/type_node.h"
#include "theory/type_enumerator.h"
@@ -88,4 +88,4 @@ class BagEnumerator : public TypeEnumeratorBase<BagEnumerator>
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BAGS__TYPE_ENUMERATOR_H */ \ No newline at end of file
+#endif /* CVC5__THEORY__BAGS__TYPE_ENUMERATOR_H */ \ No newline at end of file
diff --git a/src/theory/bags/theory_bags_type_rules.h b/src/theory/bags/theory_bags_type_rules.h
index 909f607a9..599b3879a 100644
--- a/src/theory/bags/theory_bags_type_rules.h
+++ b/src/theory/bags/theory_bags_type_rules.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BAGS__THEORY_BAGS_TYPE_RULES_H
-#define CVC4__THEORY__BAGS__THEORY_BAGS_TYPE_RULES_H
+#ifndef CVC5__THEORY__BAGS__THEORY_BAGS_TYPE_RULES_H
+#define CVC5__THEORY__BAGS__THEORY_BAGS_TYPE_RULES_H
#include "expr/node.h"
#include "expr/type_node.h"
@@ -142,4 +142,4 @@ struct BagsProperties
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BAGS__THEORY_BAGS_TYPE_RULES_H */
+#endif /* CVC5__THEORY__BAGS__THEORY_BAGS_TYPE_RULES_H */
diff --git a/src/theory/booleans/circuit_propagator.h b/src/theory/booleans/circuit_propagator.h
index 72c5da1b3..ea56209ce 100644
--- a/src/theory/booleans/circuit_propagator.h
+++ b/src/theory/booleans/circuit_propagator.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BOOLEANS__CIRCUIT_PROPAGATOR_H
-#define CVC4__THEORY__BOOLEANS__CIRCUIT_PROPAGATOR_H
+#ifndef CVC5__THEORY__BOOLEANS__CIRCUIT_PROPAGATOR_H
+#define CVC5__THEORY__BOOLEANS__CIRCUIT_PROPAGATOR_H
#include <memory>
#include <unordered_map>
@@ -276,4 +276,4 @@ class CircuitPropagator
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BOOLEANS__CIRCUIT_PROPAGATOR_H */
+#endif /* CVC5__THEORY__BOOLEANS__CIRCUIT_PROPAGATOR_H */
diff --git a/src/theory/booleans/proof_checker.h b/src/theory/booleans/proof_checker.h
index da7ad0039..6b67e151d 100644
--- a/src/theory/booleans/proof_checker.h
+++ b/src/theory/booleans/proof_checker.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BOOLEANS__PROOF_CHECKER_H
-#define CVC4__THEORY__BOOLEANS__PROOF_CHECKER_H
+#ifndef CVC5__THEORY__BOOLEANS__PROOF_CHECKER_H
+#define CVC5__THEORY__BOOLEANS__PROOF_CHECKER_H
#include "expr/node.h"
#include "expr/proof_checker.h"
@@ -45,4 +45,4 @@ class BoolProofRuleChecker : public ProofRuleChecker
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BOOLEANS__PROOF_CHECKER_H */
+#endif /* CVC5__THEORY__BOOLEANS__PROOF_CHECKER_H */
diff --git a/src/theory/booleans/proof_circuit_propagator.h b/src/theory/booleans/proof_circuit_propagator.h
index 5a643f7aa..6bac0874d 100644
--- a/src/theory/booleans/proof_circuit_propagator.h
+++ b/src/theory/booleans/proof_circuit_propagator.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BOOLEANS__PROOF_CIRCUIT_PROPAGATOR_H
-#define CVC4__THEORY__BOOLEANS__PROOF_CIRCUIT_PROPAGATOR_H
+#ifndef CVC5__THEORY__BOOLEANS__PROOF_CIRCUIT_PROPAGATOR_H
+#define CVC5__THEORY__BOOLEANS__PROOF_CIRCUIT_PROPAGATOR_H
#include <memory>
diff --git a/src/theory/booleans/theory_bool.h b/src/theory/booleans/theory_bool.h
index 042e487d6..89090b307 100644
--- a/src/theory/booleans/theory_bool.h
+++ b/src/theory/booleans/theory_bool.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BOOLEANS__THEORY_BOOL_H
-#define CVC4__THEORY__BOOLEANS__THEORY_BOOL_H
+#ifndef CVC5__THEORY__BOOLEANS__THEORY_BOOL_H
+#define CVC5__THEORY__BOOLEANS__THEORY_BOOL_H
#include "context/context.h"
#include "theory/booleans/proof_checker.h"
@@ -58,4 +58,4 @@ class TheoryBool : public Theory {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BOOLEANS__THEORY_BOOL_H */
+#endif /* CVC5__THEORY__BOOLEANS__THEORY_BOOL_H */
diff --git a/src/theory/booleans/theory_bool_rewriter.h b/src/theory/booleans/theory_bool_rewriter.h
index 5c1625f6d..c88a87b7c 100644
--- a/src/theory/booleans/theory_bool_rewriter.h
+++ b/src/theory/booleans/theory_bool_rewriter.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BOOLEANS__THEORY_BOOL_REWRITER_H
-#define CVC4__THEORY__BOOLEANS__THEORY_BOOL_REWRITER_H
+#ifndef CVC5__THEORY__BOOLEANS__THEORY_BOOL_REWRITER_H
+#define CVC5__THEORY__BOOLEANS__THEORY_BOOL_REWRITER_H
#include "theory/theory_rewriter.h"
@@ -38,4 +38,4 @@ class TheoryBoolRewriter : public TheoryRewriter
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BOOLEANS__THEORY_BOOL_REWRITER_H */
+#endif /* CVC5__THEORY__BOOLEANS__THEORY_BOOL_REWRITER_H */
diff --git a/src/theory/booleans/theory_bool_type_rules.h b/src/theory/booleans/theory_bool_type_rules.h
index af6618fa2..38bd13ab7 100644
--- a/src/theory/booleans/theory_bool_type_rules.h
+++ b/src/theory/booleans/theory_bool_type_rules.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY_BOOL_TYPE_RULES_H
-#define CVC4__THEORY_BOOL_TYPE_RULES_H
+#ifndef CVC5__THEORY_BOOL_TYPE_RULES_H
+#define CVC5__THEORY_BOOL_TYPE_RULES_H
namespace cvc5 {
namespace theory {
@@ -74,4 +74,4 @@ public:
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY_BOOL_TYPE_RULES_H */
+#endif /* CVC5__THEORY_BOOL_TYPE_RULES_H */
diff --git a/src/theory/booleans/type_enumerator.h b/src/theory/booleans/type_enumerator.h
index c07290d31..a101fa040 100644
--- a/src/theory/booleans/type_enumerator.h
+++ b/src/theory/booleans/type_enumerator.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BOOLEANS__TYPE_ENUMERATOR_H
-#define CVC4__THEORY__BOOLEANS__TYPE_ENUMERATOR_H
+#ifndef CVC5__THEORY__BOOLEANS__TYPE_ENUMERATOR_H
+#define CVC5__THEORY__BOOLEANS__TYPE_ENUMERATOR_H
#include "theory/type_enumerator.h"
#include "expr/type_node.h"
@@ -67,4 +67,4 @@ class BooleanEnumerator : public TypeEnumeratorBase<BooleanEnumerator> {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BOOLEANS__TYPE_ENUMERATOR_H */
+#endif /* CVC5__THEORY__BOOLEANS__TYPE_ENUMERATOR_H */
diff --git a/src/theory/builtin/proof_checker.h b/src/theory/builtin/proof_checker.h
index f80434068..13d4dd552 100644
--- a/src/theory/builtin/proof_checker.h
+++ b/src/theory/builtin/proof_checker.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BUILTIN__PROOF_CHECKER_H
-#define CVC4__THEORY__BUILTIN__PROOF_CHECKER_H
+#ifndef CVC5__THEORY__BUILTIN__PROOF_CHECKER_H
+#define CVC5__THEORY__BUILTIN__PROOF_CHECKER_H
#include "expr/node.h"
#include "expr/proof_checker.h"
@@ -181,4 +181,4 @@ class BuiltinProofRuleChecker : public ProofRuleChecker
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BUILTIN__PROOF_CHECKER_H */
+#endif /* CVC5__THEORY__BUILTIN__PROOF_CHECKER_H */
diff --git a/src/theory/builtin/theory_builtin.h b/src/theory/builtin/theory_builtin.h
index fca05d7ff..08f903527 100644
--- a/src/theory/builtin/theory_builtin.h
+++ b/src/theory/builtin/theory_builtin.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BUILTIN__THEORY_BUILTIN_H
-#define CVC4__THEORY__BUILTIN__THEORY_BUILTIN_H
+#ifndef CVC5__THEORY__BUILTIN__THEORY_BUILTIN_H
+#define CVC5__THEORY__BUILTIN__THEORY_BUILTIN_H
#include "theory/builtin/proof_checker.h"
#include "theory/builtin/theory_builtin_rewriter.h"
@@ -58,4 +58,4 @@ class TheoryBuiltin : public Theory
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BUILTIN__THEORY_BUILTIN_H */
+#endif /* CVC5__THEORY__BUILTIN__THEORY_BUILTIN_H */
diff --git a/src/theory/builtin/theory_builtin_rewriter.h b/src/theory/builtin/theory_builtin_rewriter.h
index 7625aa846..ef3835f58 100644
--- a/src/theory/builtin/theory_builtin_rewriter.h
+++ b/src/theory/builtin/theory_builtin_rewriter.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BUILTIN__THEORY_BUILTIN_REWRITER_H
-#define CVC4__THEORY__BUILTIN__THEORY_BUILTIN_REWRITER_H
+#ifndef CVC5__THEORY__BUILTIN__THEORY_BUILTIN_REWRITER_H
+#define CVC5__THEORY__BUILTIN__THEORY_BUILTIN_REWRITER_H
#include "theory/theory_rewriter.h"
@@ -121,4 +121,4 @@ class TheoryBuiltinRewriter : public TheoryRewriter
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BUILTIN__THEORY_BUILTIN_REWRITER_H */
+#endif /* CVC5__THEORY__BUILTIN__THEORY_BUILTIN_REWRITER_H */
diff --git a/src/theory/builtin/theory_builtin_type_rules.h b/src/theory/builtin/theory_builtin_type_rules.h
index 2c474aaee..f660a8477 100644
--- a/src/theory/builtin/theory_builtin_type_rules.h
+++ b/src/theory/builtin/theory_builtin_type_rules.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BUILTIN__THEORY_BUILTIN_TYPE_RULES_H
-#define CVC4__THEORY__BUILTIN__THEORY_BUILTIN_TYPE_RULES_H
+#ifndef CVC5__THEORY__BUILTIN__THEORY_BUILTIN_TYPE_RULES_H
+#define CVC5__THEORY__BUILTIN__THEORY_BUILTIN_TYPE_RULES_H
#include "expr/node.h"
#include "expr/type_node.h"
@@ -250,4 +250,4 @@ class FunctionProperties {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BUILTIN__THEORY_BUILTIN_TYPE_RULES_H */
+#endif /* CVC5__THEORY__BUILTIN__THEORY_BUILTIN_TYPE_RULES_H */
diff --git a/src/theory/builtin/type_enumerator.h b/src/theory/builtin/type_enumerator.h
index 7c14bb14c..0b51c3f51 100644
--- a/src/theory/builtin/type_enumerator.h
+++ b/src/theory/builtin/type_enumerator.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BUILTIN__TYPE_ENUMERATOR_H
-#define CVC4__THEORY__BUILTIN__TYPE_ENUMERATOR_H
+#ifndef CVC5__THEORY__BUILTIN__TYPE_ENUMERATOR_H
+#define CVC5__THEORY__BUILTIN__TYPE_ENUMERATOR_H
#include "expr/kind.h"
#include "expr/type_node.h"
@@ -108,4 +108,4 @@ class FunctionEnumerator : public TypeEnumeratorBase<FunctionEnumerator>
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BUILTIN_TYPE_ENUMERATOR_H */
+#endif /* CVC5__THEORY__BUILTIN_TYPE_ENUMERATOR_H */
diff --git a/src/theory/bv/abstraction.h b/src/theory/bv/abstraction.h
index 182b29c19..be3b74d67 100644
--- a/src/theory/bv/abstraction.h
+++ b/src/theory/bv/abstraction.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BV__ABSTRACTION_H
-#define CVC4__THEORY__BV__ABSTRACTION_H
+#ifndef CVC5__THEORY__BV__ABSTRACTION_H
+#define CVC5__THEORY__BV__ABSTRACTION_H
#include <unordered_map>
#include <unordered_set>
diff --git a/src/theory/bv/bitblast/aig_bitblaster.h b/src/theory/bv/bitblast/aig_bitblaster.h
index 002ca71ec..2f4666a9b 100644
--- a/src/theory/bv/bitblast/aig_bitblaster.h
+++ b/src/theory/bv/bitblast/aig_bitblaster.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BV__BITBLAST__AIG_BITBLASTER_H
-#define CVC4__THEORY__BV__BITBLAST__AIG_BITBLASTER_H
+#ifndef CVC5__THEORY__BV__BITBLAST__AIG_BITBLASTER_H
+#define CVC5__THEORY__BV__BITBLAST__AIG_BITBLASTER_H
#include "theory/bv/bitblast/bitblaster.h"
@@ -123,4 +123,4 @@ class AigBitblaster : public TBitblaster<Abc_Obj_t*>
} // namespace theory
} // namespace cvc5
-#endif // CVC4__THEORY__BV__BITBLAST__AIG_BITBLASTER_H
+#endif // CVC5__THEORY__BV__BITBLAST__AIG_BITBLASTER_H
diff --git a/src/theory/bv/bitblast/bitblast_strategies_template.h b/src/theory/bv/bitblast/bitblast_strategies_template.h
index 72b079321..84d8faeb2 100644
--- a/src/theory/bv/bitblast/bitblast_strategies_template.h
+++ b/src/theory/bv/bitblast/bitblast_strategies_template.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BV__BITBLAST__BITBLAST_STRATEGIES_TEMPLATE_H
-#define CVC4__THEORY__BV__BITBLAST__BITBLAST_STRATEGIES_TEMPLATE_H
+#ifndef CVC5__THEORY__BV__BITBLAST__BITBLAST_STRATEGIES_TEMPLATE_H
+#define CVC5__THEORY__BV__BITBLAST__BITBLAST_STRATEGIES_TEMPLATE_H
#include <cmath>
#include <ostream>
diff --git a/src/theory/bv/bitblast/bitblast_utils.h b/src/theory/bv/bitblast/bitblast_utils.h
index 461d7fcaf..998e80c89 100644
--- a/src/theory/bv/bitblast/bitblast_utils.h
+++ b/src/theory/bv/bitblast/bitblast_utils.h
@@ -16,9 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BV__BITBLAST__BITBLAST_UTILS_H
-#define CVC4__THEORY__BV__BITBLAST__BITBLAST_UTILS_H
-
+#ifndef CVC5__THEORY__BV__BITBLAST__BITBLAST_UTILS_H
+#define CVC5__THEORY__BV__BITBLAST__BITBLAST_UTILS_H
#include <ostream>
#include "expr/node.h"
@@ -269,4 +268,4 @@ T inline sLessThanBB(const std::vector<T>&a, const std::vector<T>& b, bool orEqu
} // namespace theory
} // namespace cvc5
-#endif // CVC4__THEORY__BV__BITBLAST__BITBLAST_UTILS_H
+#endif // CVC5__THEORY__BV__BITBLAST__BITBLAST_UTILS_H
diff --git a/src/theory/bv/bitblast/bitblaster.h b/src/theory/bv/bitblast/bitblaster.h
index dd0be5cc0..b881537a8 100644
--- a/src/theory/bv/bitblast/bitblaster.h
+++ b/src/theory/bv/bitblast/bitblaster.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BV__BITBLAST__BITBLASTER_H
-#define CVC4__THEORY__BV__BITBLAST__BITBLASTER_H
+#ifndef CVC5__THEORY__BV__BITBLAST__BITBLASTER_H
+#define CVC5__THEORY__BV__BITBLAST__BITBLASTER_H
#include <unordered_map>
#include <unordered_set>
@@ -270,4 +270,4 @@ Node TBitblaster<T>::getTermModel(TNode node, bool fullModel)
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BV__BITBLAST__BITBLASTER_H */
+#endif /* CVC5__THEORY__BV__BITBLAST__BITBLASTER_H */
diff --git a/src/theory/bv/bitblast/eager_bitblaster.h b/src/theory/bv/bitblast/eager_bitblaster.h
index 87699df40..8ad13187c 100644
--- a/src/theory/bv/bitblast/eager_bitblaster.h
+++ b/src/theory/bv/bitblast/eager_bitblaster.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BV__BITBLAST__EAGER_BITBLASTER_H
-#define CVC4__THEORY__BV__BITBLAST__EAGER_BITBLASTER_H
+#ifndef CVC5__THEORY__BV__BITBLAST__EAGER_BITBLASTER_H
+#define CVC5__THEORY__BV__BITBLAST__EAGER_BITBLASTER_H
#include <memory>
#include <unordered_set>
@@ -86,4 +86,4 @@ class BitblastingRegistrar : public prop::Registrar
} // namespace bv
} // namespace theory
} // namespace cvc5
-#endif // CVC4__THEORY__BV__BITBLAST__EAGER_BITBLASTER_H
+#endif // CVC5__THEORY__BV__BITBLAST__EAGER_BITBLASTER_H
diff --git a/src/theory/bv/bitblast/lazy_bitblaster.h b/src/theory/bv/bitblast/lazy_bitblaster.h
index 91995b56b..2a5f3425b 100644
--- a/src/theory/bv/bitblast/lazy_bitblaster.h
+++ b/src/theory/bv/bitblast/lazy_bitblaster.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BV__BITBLAST__LAZY_BITBLASTER_H
-#define CVC4__THEORY__BV__BITBLAST__LAZY_BITBLASTER_H
+#ifndef CVC5__THEORY__BV__BITBLAST__LAZY_BITBLASTER_H
+#define CVC5__THEORY__BV__BITBLAST__LAZY_BITBLASTER_H
#include "theory/bv/bitblast/bitblaster.h"
@@ -177,4 +177,4 @@ class TLazyBitblaster : public TBitblaster<Node>
} // namespace bv
} // namespace theory
} // namespace cvc5
-#endif // CVC4__THEORY__BV__BITBLAST__LAZY_BITBLASTER_H
+#endif // CVC5__THEORY__BV__BITBLAST__LAZY_BITBLASTER_H
diff --git a/src/theory/bv/bitblast/proof_bitblaster.h b/src/theory/bv/bitblast/proof_bitblaster.h
index 4983b485e..dcd8e2737 100644
--- a/src/theory/bv/bitblast/proof_bitblaster.h
+++ b/src/theory/bv/bitblast/proof_bitblaster.h
@@ -13,8 +13,8 @@
**/
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BV__BITBLAST__PROOF_BITBLASTER_H
-#define CVC4__THEORY__BV__BITBLAST__PROOF_BITBLASTER_H
+#ifndef CVC5__THEORY__BV__BITBLAST__PROOF_BITBLASTER_H
+#define CVC5__THEORY__BV__BITBLAST__PROOF_BITBLASTER_H
#include "theory/bv/bitblast/simple_bitblaster.h"
diff --git a/src/theory/bv/bitblast/simple_bitblaster.h b/src/theory/bv/bitblast/simple_bitblaster.h
index 300b93b53..7d78ed915 100644
--- a/src/theory/bv/bitblast/simple_bitblaster.h
+++ b/src/theory/bv/bitblast/simple_bitblaster.h
@@ -14,8 +14,8 @@
**/
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BV__BITBLAST_SIMPLE_BITBLASTER_H
-#define CVC4__THEORY__BV__BITBLAST_SIMPLE_BITBLASTER_H
+#ifndef CVC5__THEORY__BV__BITBLAST_SIMPLE_BITBLASTER_H
+#define CVC5__THEORY__BV__BITBLAST_SIMPLE_BITBLASTER_H
#include "theory/bv/bitblast/bitblaster.h"
diff --git a/src/theory/bv/bv_eager_solver.h b/src/theory/bv/bv_eager_solver.h
index 17e6c50e7..052023afb 100644
--- a/src/theory/bv/bv_eager_solver.h
+++ b/src/theory/bv/bv_eager_solver.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BV__BV_EAGER_SOLVER_H
-#define CVC4__THEORY__BV__BV_EAGER_SOLVER_H
+#ifndef CVC5__THEORY__BV__BV_EAGER_SOLVER_H
+#define CVC5__THEORY__BV__BV_EAGER_SOLVER_H
#include "expr/node.h"
#include "theory/bv/bv_solver_lazy.h"
@@ -62,4 +62,4 @@ class EagerBitblastSolver {
} // namespace theory
} // namespace cvc5
-#endif // CVC4__THEORY__BV__BV_EAGER_SOLVER_H
+#endif // CVC5__THEORY__BV__BV_EAGER_SOLVER_H
diff --git a/src/theory/bv/bv_inequality_graph.h b/src/theory/bv/bv_inequality_graph.h
index 3e856b789..e730c7c5a 100644
--- a/src/theory/bv/bv_inequality_graph.h
+++ b/src/theory/bv/bv_inequality_graph.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BV__BV_INEQUALITY__GRAPH_H
-#define CVC4__THEORY__BV__BV_INEQUALITY__GRAPH_H
+#ifndef CVC5__THEORY__BV__BV_INEQUALITY__GRAPH_H
+#define CVC5__THEORY__BV__BV_INEQUALITY__GRAPH_H
#include <queue>
#include <unordered_map>
@@ -293,4 +293,4 @@ public:
}
} // namespace cvc5
-#endif /* CVC4__THEORY__BV__BV_INEQUALITY__GRAPH_H */
+#endif /* CVC5__THEORY__BV__BV_INEQUALITY__GRAPH_H */
diff --git a/src/theory/bv/bv_quick_check.h b/src/theory/bv/bv_quick_check.h
index 7dbd01dcd..685321bb1 100644
--- a/src/theory/bv/bv_quick_check.h
+++ b/src/theory/bv/bv_quick_check.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__BV_QUICK_CHECK_H
-#define CVC4__BV_QUICK_CHECK_H
+#ifndef CVC5__BV_QUICK_CHECK_H
+#define CVC5__BV_QUICK_CHECK_H
#include <unordered_set>
#include <vector>
@@ -183,4 +183,4 @@ class QuickXPlain
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__BV_QUICK_CHECK_H */
+#endif /* CVC5__BV_QUICK_CHECK_H */
diff --git a/src/theory/bv/bv_solver.h b/src/theory/bv/bv_solver.h
index 8fa8fd850..1733f334b 100644
--- a/src/theory/bv/bv_solver.h
+++ b/src/theory/bv/bv_solver.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BV__BV_SOLVER_H
-#define CVC4__THEORY__BV__BV_SOLVER_H
+#ifndef CVC5__THEORY__BV__BV_SOLVER_H
+#define CVC5__THEORY__BV__BV_SOLVER_H
#include "theory/theory.h"
@@ -119,4 +119,4 @@ class BVSolver
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BV__BV_SOLVER_H */
+#endif /* CVC5__THEORY__BV__BV_SOLVER_H */
diff --git a/src/theory/bv/bv_solver_bitblast.h b/src/theory/bv/bv_solver_bitblast.h
index 86a75e0aa..65c172964 100644
--- a/src/theory/bv/bv_solver_bitblast.h
+++ b/src/theory/bv/bv_solver_bitblast.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BV__BV_SOLVER_BITBLAST_H
-#define CVC4__THEORY__BV__BV_SOLVER_BITBLAST_H
+#ifndef CVC5__THEORY__BV__BV_SOLVER_BITBLAST_H
+#define CVC5__THEORY__BV__BV_SOLVER_BITBLAST_H
#include <unordered_map>
diff --git a/src/theory/bv/bv_solver_lazy.h b/src/theory/bv/bv_solver_lazy.h
index 35b9964e0..2689305e9 100644
--- a/src/theory/bv/bv_solver_lazy.h
+++ b/src/theory/bv/bv_solver_lazy.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BV__BV_SOLVER_LAZY_H
-#define CVC4__THEORY__BV__BV_SOLVER_LAZY_H
+#ifndef CVC5__THEORY__BV__BV_SOLVER_LAZY_H
+#define CVC5__THEORY__BV__BV_SOLVER_LAZY_H
#include <unordered_map>
#include <unordered_set>
@@ -231,4 +231,4 @@ class BVSolverLazy : public BVSolver
} // namespace cvc5
-#endif /* CVC4__THEORY__BV__BV_SOLVER_LAZY_H */
+#endif /* CVC5__THEORY__BV__BV_SOLVER_LAZY_H */
diff --git a/src/theory/bv/bv_solver_simple.h b/src/theory/bv/bv_solver_simple.h
index 843032bef..1f805ee22 100644
--- a/src/theory/bv/bv_solver_simple.h
+++ b/src/theory/bv/bv_solver_simple.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BV__BV_SOLVER_SIMPLE_H
-#define CVC4__THEORY__BV__BV_SOLVER_SIMPLE_H
+#ifndef CVC5__THEORY__BV__BV_SOLVER_SIMPLE_H
+#define CVC5__THEORY__BV__BV_SOLVER_SIMPLE_H
#include "theory/bv/bitblast/proof_bitblaster.h"
#include "theory/bv/bv_solver.h"
diff --git a/src/theory/bv/bv_subtheory.h b/src/theory/bv/bv_subtheory.h
index dec4614d3..323d1fbc6 100644
--- a/src/theory/bv/bv_subtheory.h
+++ b/src/theory/bv/bv_subtheory.h
@@ -14,8 +14,8 @@
** Interface for bit-vectors sub-solvers.
**/
-#ifndef CVC4__THEORY__BV__BV_SUBTHEORY_H
-#define CVC4__THEORY__BV__BV_SUBTHEORY_H
+#ifndef CVC5__THEORY__BV__BV_SUBTHEORY_H
+#define CVC5__THEORY__BV__BV_SUBTHEORY_H
#include "cvc4_private.h"
#include "context/context.h"
@@ -109,4 +109,4 @@ class SubtheorySolver {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BV__BV_SUBTHEORY_H */
+#endif /* CVC5__THEORY__BV__BV_SUBTHEORY_H */
diff --git a/src/theory/bv/bv_subtheory_inequality.h b/src/theory/bv/bv_subtheory_inequality.h
index dc585b49b..4fe7d6bfe 100644
--- a/src/theory/bv/bv_subtheory_inequality.h
+++ b/src/theory/bv/bv_subtheory_inequality.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BV__BV_SUBTHEORY__INEQUALITY_H
-#define CVC4__THEORY__BV__BV_SUBTHEORY__INEQUALITY_H
+#ifndef CVC5__THEORY__BV__BV_SUBTHEORY__INEQUALITY_H
+#define CVC5__THEORY__BV__BV_SUBTHEORY__INEQUALITY_H
#include <unordered_set>
@@ -91,4 +91,4 @@ class InequalitySolver : public SubtheorySolver
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BV__BV_SUBTHEORY__INEQUALITY_H */
+#endif /* CVC5__THEORY__BV__BV_SUBTHEORY__INEQUALITY_H */
diff --git a/src/theory/bv/int_blaster.h b/src/theory/bv/int_blaster.h
index b76fc1cb7..22273a7f2 100644
--- a/src/theory/bv/int_blaster.h
+++ b/src/theory/bv/int_blaster.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef __CVC4__THEORY__BV__INT_BLASTER__H
-#define __CVC4__THEORY__BV__INT_BLASTER__H
+#ifndef __CVC5__THEORY__BV__INT_BLASTER__H
+#define __CVC5__THEORY__BV__INT_BLASTER__H
#include "context/cdhashmap.h"
#include "context/cdhashset.h"
@@ -351,4 +351,4 @@ class IntBlaster
} // namespace cvc5
-#endif /* __CVC4__THEORY__BV__INT_BLASTER_H */
+#endif /* __CVC5__THEORY__BV__INT_BLASTER_H */
diff --git a/src/theory/bv/proof_checker.h b/src/theory/bv/proof_checker.h
index b328600df..da696579f 100644
--- a/src/theory/bv/proof_checker.h
+++ b/src/theory/bv/proof_checker.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BV__PROOF_CHECKER_H
-#define CVC4__THEORY__BV__PROOF_CHECKER_H
+#ifndef CVC5__THEORY__BV__PROOF_CHECKER_H
+#define CVC5__THEORY__BV__PROOF_CHECKER_H
#include "expr/node.h"
#include "expr/proof_checker.h"
@@ -47,4 +47,4 @@ class BVProofRuleChecker : public ProofRuleChecker
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BV__PROOF_CHECKER_H */
+#endif /* CVC5__THEORY__BV__PROOF_CHECKER_H */
diff --git a/src/theory/bv/slicer.h b/src/theory/bv/slicer.h
index 55a64d92b..b38df275c 100644
--- a/src/theory/bv/slicer.h
+++ b/src/theory/bv/slicer.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BV__SLICER_BV_H
-#define CVC4__THEORY__BV__SLICER_BV_H
+#ifndef CVC5__THEORY__BV__SLICER_BV_H
+#define CVC5__THEORY__BV__SLICER_BV_H
#include <string>
#include <vector>
@@ -53,4 +53,4 @@ public:
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BV__SLICER_BV_H */
+#endif /* CVC5__THEORY__BV__SLICER_BV_H */
diff --git a/src/theory/bv/theory_bv.h b/src/theory/bv/theory_bv.h
index 9176ef6ae..4a0c9dd53 100644
--- a/src/theory/bv/theory_bv.h
+++ b/src/theory/bv/theory_bv.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BV__THEORY_BV_H
-#define CVC4__THEORY__BV__THEORY_BV_H
+#ifndef CVC5__THEORY__BV__THEORY_BV_H
+#define CVC5__THEORY__BV__THEORY_BV_H
#include "theory/bv/theory_bv_rewriter.h"
#include "theory/theory.h"
@@ -131,4 +131,4 @@ class TheoryBV : public Theory
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BV__THEORY_BV_H */
+#endif /* CVC5__THEORY__BV__THEORY_BV_H */
diff --git a/src/theory/bv/theory_bv_rewriter.h b/src/theory/bv/theory_bv_rewriter.h
index 0be333ef0..784168155 100644
--- a/src/theory/bv/theory_bv_rewriter.h
+++ b/src/theory/bv/theory_bv_rewriter.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BV__THEORY_BV_REWRITER_H
-#define CVC4__THEORY__BV__THEORY_BV_REWRITER_H
+#ifndef CVC5__THEORY__BV__THEORY_BV_REWRITER_H
+#define CVC5__THEORY__BV__THEORY_BV_REWRITER_H
#include "theory/theory_rewriter.h"
@@ -107,4 +107,4 @@ class TheoryBVRewriter : public TheoryRewriter
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BV__THEORY_BV_REWRITER_H */
+#endif /* CVC5__THEORY__BV__THEORY_BV_REWRITER_H */
diff --git a/src/theory/bv/theory_bv_type_rules.h b/src/theory/bv/theory_bv_type_rules.h
index 4de7eed6d..fc85924ff 100644
--- a/src/theory/bv/theory_bv_type_rules.h
+++ b/src/theory/bv/theory_bv_type_rules.h
@@ -18,8 +18,8 @@
#include <algorithm>
-#ifndef CVC4__THEORY__BV__THEORY_BV_TYPE_RULES_H
-#define CVC4__THEORY__BV__THEORY_BV_TYPE_RULES_H
+#ifndef CVC5__THEORY__BV__THEORY_BV_TYPE_RULES_H
+#define CVC5__THEORY__BV__THEORY_BV_TYPE_RULES_H
namespace cvc5 {
namespace theory {
@@ -452,4 +452,4 @@ class BitVectorAckermanizationUremTypeRule
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BV__THEORY_BV_TYPE_RULES_H */
+#endif /* CVC5__THEORY__BV__THEORY_BV_TYPE_RULES_H */
diff --git a/src/theory/bv/type_enumerator.h b/src/theory/bv/type_enumerator.h
index 826b61d6b..3451d0f61 100644
--- a/src/theory/bv/type_enumerator.h
+++ b/src/theory/bv/type_enumerator.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__BV__TYPE_ENUMERATOR_H
-#define CVC4__THEORY__BV__TYPE_ENUMERATOR_H
+#ifndef CVC5__THEORY__BV__TYPE_ENUMERATOR_H
+#define CVC5__THEORY__BV__TYPE_ENUMERATOR_H
#include "expr/kind.h"
#include "expr/type_node.h"
@@ -63,4 +63,4 @@ public:
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__BV__TYPE_ENUMERATOR_H */
+#endif /* CVC5__THEORY__BV__TYPE_ENUMERATOR_H */
diff --git a/src/theory/care_graph.h b/src/theory/care_graph.h
index c87cafcbd..2942958e0 100644
--- a/src/theory/care_graph.h
+++ b/src/theory/care_graph.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__CARE_GRAPH_H
-#define CVC4__THEORY__CARE_GRAPH_H
+#ifndef CVC5__THEORY__CARE_GRAPH_H
+#define CVC5__THEORY__CARE_GRAPH_H
#include <set>
@@ -62,4 +62,4 @@ typedef std::set<CarePair> CareGraph;
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__CARE_GRAPH_H */
+#endif /* CVC5__THEORY__CARE_GRAPH_H */
diff --git a/src/theory/combination_care_graph.h b/src/theory/combination_care_graph.h
index 9d40ed05f..d66e69456 100644
--- a/src/theory/combination_care_graph.h
+++ b/src/theory/combination_care_graph.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__COMBINATION_CARE_GRAPH__H
-#define CVC4__THEORY__COMBINATION_CARE_GRAPH__H
+#ifndef CVC5__THEORY__COMBINATION_CARE_GRAPH__H
+#define CVC5__THEORY__COMBINATION_CARE_GRAPH__H
#include <vector>
@@ -49,4 +49,4 @@ class CombinationCareGraph : public CombinationEngine
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__COMBINATION_DISTRIBUTED__H */
+#endif /* CVC5__THEORY__COMBINATION_DISTRIBUTED__H */
diff --git a/src/theory/combination_engine.h b/src/theory/combination_engine.h
index 3fd74f630..8ac90bfba 100644
--- a/src/theory/combination_engine.h
+++ b/src/theory/combination_engine.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__COMBINATION_ENGINE__H
-#define CVC4__THEORY__COMBINATION_ENGINE__H
+#ifndef CVC5__THEORY__COMBINATION_ENGINE__H
+#define CVC5__THEORY__COMBINATION_ENGINE__H
#include <vector>
#include <memory>
@@ -139,4 +139,4 @@ class CombinationEngine
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__COMBINATION_DISTRIBUTED__H */
+#endif /* CVC5__THEORY__COMBINATION_DISTRIBUTED__H */
diff --git a/src/theory/datatypes/datatypes_rewriter.h b/src/theory/datatypes/datatypes_rewriter.h
index 705fabdca..19abbc362 100644
--- a/src/theory/datatypes/datatypes_rewriter.h
+++ b/src/theory/datatypes/datatypes_rewriter.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__DATATYPES__DATATYPES_REWRITER_H
-#define CVC4__THEORY__DATATYPES__DATATYPES_REWRITER_H
+#ifndef CVC5__THEORY__DATATYPES__DATATYPES_REWRITER_H
+#define CVC5__THEORY__DATATYPES__DATATYPES_REWRITER_H
#include "theory/theory_rewriter.h"
@@ -146,4 +146,4 @@ class DatatypesRewriter : public TheoryRewriter
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__DATATYPES__DATATYPES_REWRITER_H */
+#endif /* CVC5__THEORY__DATATYPES__DATATYPES_REWRITER_H */
diff --git a/src/theory/datatypes/infer_proof_cons.h b/src/theory/datatypes/infer_proof_cons.h
index 362996f76..964396df2 100644
--- a/src/theory/datatypes/infer_proof_cons.h
+++ b/src/theory/datatypes/infer_proof_cons.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__DATATYPES__INFER_PROOF_CONS_H
-#define CVC4__THEORY__DATATYPES__INFER_PROOF_CONS_H
+#ifndef CVC5__THEORY__DATATYPES__INFER_PROOF_CONS_H
+#define CVC5__THEORY__DATATYPES__INFER_PROOF_CONS_H
#include "context/cdhashmap.h"
#include "expr/node.h"
@@ -97,4 +97,4 @@ class InferProofCons : public ProofGenerator
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__DATATYPES__INFER_PROOF_CONS_H */
+#endif /* CVC5__THEORY__DATATYPES__INFER_PROOF_CONS_H */
diff --git a/src/theory/datatypes/inference.h b/src/theory/datatypes/inference.h
index d60fb26f0..b77eaf51c 100644
--- a/src/theory/datatypes/inference.h
+++ b/src/theory/datatypes/inference.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__DATATYPES__INFERENCE_H
-#define CVC4__THEORY__DATATYPES__INFERENCE_H
+#ifndef CVC5__THEORY__DATATYPES__INFERENCE_H
+#define CVC5__THEORY__DATATYPES__INFERENCE_H
#include "expr/node.h"
#include "theory/inference_id.h"
diff --git a/src/theory/datatypes/inference_manager.h b/src/theory/datatypes/inference_manager.h
index 912b44477..0850de1d1 100644
--- a/src/theory/datatypes/inference_manager.h
+++ b/src/theory/datatypes/inference_manager.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__DATATYPES__INFERENCE_MANAGER_H
-#define CVC4__THEORY__DATATYPES__INFERENCE_MANAGER_H
+#ifndef CVC5__THEORY__DATATYPES__INFERENCE_MANAGER_H
+#define CVC5__THEORY__DATATYPES__INFERENCE_MANAGER_H
#include "expr/node.h"
#include "theory/datatypes/infer_proof_cons.h"
diff --git a/src/theory/datatypes/proof_checker.h b/src/theory/datatypes/proof_checker.h
index a52bbafb0..a08d73d1d 100644
--- a/src/theory/datatypes/proof_checker.h
+++ b/src/theory/datatypes/proof_checker.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__DATATYPES__PROOF_CHECKER_H
-#define CVC4__THEORY__DATATYPES__PROOF_CHECKER_H
+#ifndef CVC5__THEORY__DATATYPES__PROOF_CHECKER_H
+#define CVC5__THEORY__DATATYPES__PROOF_CHECKER_H
#include "expr/node.h"
#include "expr/proof_checker.h"
@@ -46,4 +46,4 @@ class DatatypesProofRuleChecker : public ProofRuleChecker
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__DATATYPES__PROOF_CHECKER_H */
+#endif /* CVC5__THEORY__DATATYPES__PROOF_CHECKER_H */
diff --git a/src/theory/datatypes/sygus_datatype_utils.h b/src/theory/datatypes/sygus_datatype_utils.h
index 7aa308aea..445b32fb6 100644
--- a/src/theory/datatypes/sygus_datatype_utils.h
+++ b/src/theory/datatypes/sygus_datatype_utils.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__SYGUS_DATATYPE_UTILS_H
-#define CVC4__THEORY__STRINGS__SYGUS_DATATYPE_UTILS_H
+#ifndef CVC5__THEORY__STRINGS__SYGUS_DATATYPE_UTILS_H
+#define CVC5__THEORY__STRINGS__SYGUS_DATATYPE_UTILS_H
#include <vector>
diff --git a/src/theory/datatypes/sygus_extension.h b/src/theory/datatypes/sygus_extension.h
index 157929ee6..91fa0bde5 100644
--- a/src/theory/datatypes/sygus_extension.h
+++ b/src/theory/datatypes/sygus_extension.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__DATATYPES__SYGUS_EXTENSION_H
-#define CVC4__THEORY__DATATYPES__SYGUS_EXTENSION_H
+#ifndef CVC5__THEORY__DATATYPES__SYGUS_EXTENSION_H
+#define CVC5__THEORY__DATATYPES__SYGUS_EXTENSION_H
#include <iostream>
#include <map>
diff --git a/src/theory/datatypes/sygus_simple_sym.h b/src/theory/datatypes/sygus_simple_sym.h
index be90aa9ff..16b072dfb 100644
--- a/src/theory/datatypes/sygus_simple_sym.h
+++ b/src/theory/datatypes/sygus_simple_sym.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__DATATYPES__SIMPLE_SYM_BREAK_H
-#define CVC4__THEORY__DATATYPES__SIMPLE_SYM_BREAK_H
+#ifndef CVC5__THEORY__DATATYPES__SIMPLE_SYM_BREAK_H
+#define CVC5__THEORY__DATATYPES__SIMPLE_SYM_BREAK_H
#include "expr/dtype.h"
#include "theory/quantifiers/sygus/term_database_sygus.h"
@@ -100,4 +100,4 @@ class SygusSimpleSymBreak
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__DATATYPES__SIMPLE_SYM_BREAK_H */
+#endif /* CVC5__THEORY__DATATYPES__SIMPLE_SYM_BREAK_H */
diff --git a/src/theory/datatypes/theory_datatypes.h b/src/theory/datatypes/theory_datatypes.h
index e6df13348..4bc8f05f2 100644
--- a/src/theory/datatypes/theory_datatypes.h
+++ b/src/theory/datatypes/theory_datatypes.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__DATATYPES__THEORY_DATATYPES_H
-#define CVC4__THEORY__DATATYPES__THEORY_DATATYPES_H
+#ifndef CVC5__THEORY__DATATYPES__THEORY_DATATYPES_H
+#define CVC5__THEORY__DATATYPES__THEORY_DATATYPES_H
#include <iostream>
#include <map>
@@ -318,4 +318,4 @@ private:
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__DATATYPES__THEORY_DATATYPES_H */
+#endif /* CVC5__THEORY__DATATYPES__THEORY_DATATYPES_H */
diff --git a/src/theory/datatypes/theory_datatypes_type_rules.h b/src/theory/datatypes/theory_datatypes_type_rules.h
index 68269b61c..6aaf92957 100644
--- a/src/theory/datatypes/theory_datatypes_type_rules.h
+++ b/src/theory/datatypes/theory_datatypes_type_rules.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__DATATYPES__THEORY_DATATYPES_TYPE_RULES_H
-#define CVC4__THEORY__DATATYPES__THEORY_DATATYPES_TYPE_RULES_H
+#ifndef CVC5__THEORY__DATATYPES__THEORY_DATATYPES_TYPE_RULES_H
+#define CVC5__THEORY__DATATYPES__THEORY_DATATYPES_TYPE_RULES_H
#include "expr/dtype.h"
#include "expr/dtype_cons.h"
@@ -630,4 +630,4 @@ class TupleProjectTypeRule
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__DATATYPES__THEORY_DATATYPES_TYPE_RULES_H */
+#endif /* CVC5__THEORY__DATATYPES__THEORY_DATATYPES_TYPE_RULES_H */
diff --git a/src/theory/datatypes/theory_datatypes_utils.h b/src/theory/datatypes/theory_datatypes_utils.h
index c79364dab..ebfd5710c 100644
--- a/src/theory/datatypes/theory_datatypes_utils.h
+++ b/src/theory/datatypes/theory_datatypes_utils.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__THEORY_DATATYPES_UTILS_H
-#define CVC4__THEORY__STRINGS__THEORY_DATATYPES_UTILS_H
+#ifndef CVC5__THEORY__STRINGS__THEORY_DATATYPES_UTILS_H
+#define CVC5__THEORY__STRINGS__THEORY_DATATYPES_UTILS_H
#include <vector>
diff --git a/src/theory/datatypes/tuple_project_op.h b/src/theory/datatypes/tuple_project_op.h
index 9e9e2dad4..a804aeac3 100644
--- a/src/theory/datatypes/tuple_project_op.h
+++ b/src/theory/datatypes/tuple_project_op.h
@@ -14,8 +14,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__PROJECT_OP_H
-#define CVC4__PROJECT_OP_H
+#ifndef CVC5__PROJECT_OP_H
+#define CVC5__PROJECT_OP_H
#include <ostream>
#include <vector>
@@ -55,4 +55,4 @@ struct TupleProjectOpHashFunction
} // namespace cvc5
-#endif /* CVC4__PROJECT_OP_H */
+#endif /* CVC5__PROJECT_OP_H */
diff --git a/src/theory/datatypes/type_enumerator.h b/src/theory/datatypes/type_enumerator.h
index 5d9a3a9b1..33f80e3ae 100644
--- a/src/theory/datatypes/type_enumerator.h
+++ b/src/theory/datatypes/type_enumerator.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__DATATYPES__TYPE_ENUMERATOR_H
-#define CVC4__THEORY__DATATYPES__TYPE_ENUMERATOR_H
+#ifndef CVC5__THEORY__DATATYPES__TYPE_ENUMERATOR_H
+#define CVC5__THEORY__DATATYPES__TYPE_ENUMERATOR_H
#include "expr/dtype.h"
#include "expr/kind.h"
@@ -166,4 +166,4 @@ class DatatypesEnumerator : public TypeEnumeratorBase<DatatypesEnumerator> {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__DATATYPES__TYPE_ENUMERATOR_H */
+#endif /* CVC5__THEORY__DATATYPES__TYPE_ENUMERATOR_H */
diff --git a/src/theory/decision_manager.h b/src/theory/decision_manager.h
index 910375370..fd649aa40 100644
--- a/src/theory/decision_manager.h
+++ b/src/theory/decision_manager.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__DECISION_MANAGER__H
-#define CVC4__THEORY__DECISION_MANAGER__H
+#ifndef CVC5__THEORY__DECISION_MANAGER__H
+#define CVC5__THEORY__DECISION_MANAGER__H
#include <map>
#include "context/cdlist.h"
@@ -143,4 +143,4 @@ class DecisionManager
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__DECISION_MANAGER__H */
+#endif /* CVC5__THEORY__DECISION_MANAGER__H */
diff --git a/src/theory/decision_strategy.h b/src/theory/decision_strategy.h
index 9046dd6ce..ef5ed5139 100644
--- a/src/theory/decision_strategy.h
+++ b/src/theory/decision_strategy.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__DECISION_STRATEGY__H
-#define CVC4__THEORY__DECISION_STRATEGY__H
+#ifndef CVC5__THEORY__DECISION_STRATEGY__H
+#define CVC5__THEORY__DECISION_STRATEGY__H
#include "context/cdo.h"
#include "expr/node.h"
@@ -142,4 +142,4 @@ class DecisionStrategySingleton : public DecisionStrategyFmf
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__DECISION_STRATEGY__H */
+#endif /* CVC5__THEORY__DECISION_STRATEGY__H */
diff --git a/src/theory/eager_proof_generator.h b/src/theory/eager_proof_generator.h
index 5cc0fde35..bbdc8af7f 100644
--- a/src/theory/eager_proof_generator.h
+++ b/src/theory/eager_proof_generator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__EAGER_PROOF_GENERATOR_H
-#define CVC4__THEORY__EAGER_PROOF_GENERATOR_H
+#ifndef CVC5__THEORY__EAGER_PROOF_GENERATOR_H
+#define CVC5__THEORY__EAGER_PROOF_GENERATOR_H
#include "context/cdhashmap.h"
#include "expr/node.h"
@@ -195,4 +195,4 @@ class EagerProofGenerator : public ProofGenerator
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__PROOF_GENERATOR_H */
+#endif /* CVC5__THEORY__PROOF_GENERATOR_H */
diff --git a/src/theory/ee_manager.h b/src/theory/ee_manager.h
index ad922bf80..70ba90e69 100644
--- a/src/theory/ee_manager.h
+++ b/src/theory/ee_manager.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__EE_MANAGER__H
-#define CVC4__THEORY__EE_MANAGER__H
+#ifndef CVC5__THEORY__EE_MANAGER__H
+#define CVC5__THEORY__EE_MANAGER__H
#include <map>
#include <memory>
@@ -97,4 +97,4 @@ class EqEngineManager
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__EE_MANAGER__H */
+#endif /* CVC5__THEORY__EE_MANAGER__H */
diff --git a/src/theory/ee_manager_distributed.h b/src/theory/ee_manager_distributed.h
index 48bbfd073..5b16fb2cf 100644
--- a/src/theory/ee_manager_distributed.h
+++ b/src/theory/ee_manager_distributed.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__EE_MANAGER_DISTRIBUTED__H
-#define CVC4__THEORY__EE_MANAGER_DISTRIBUTED__H
+#ifndef CVC5__THEORY__EE_MANAGER_DISTRIBUTED__H
+#define CVC5__THEORY__EE_MANAGER_DISTRIBUTED__H
#include <memory>
@@ -99,4 +99,4 @@ class EqEngineManagerDistributed : public EqEngineManager
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__EE_MANAGER_DISTRIBUTED__H */
+#endif /* CVC5__THEORY__EE_MANAGER_DISTRIBUTED__H */
diff --git a/src/theory/ee_setup_info.h b/src/theory/ee_setup_info.h
index b2167115a..0214f573e 100644
--- a/src/theory/ee_setup_info.h
+++ b/src/theory/ee_setup_info.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__EE_SETUP_INFO__H
-#define CVC4__THEORY__EE_SETUP_INFO__H
+#ifndef CVC5__THEORY__EE_SETUP_INFO__H
+#define CVC5__THEORY__EE_SETUP_INFO__H
#include <string>
@@ -57,4 +57,4 @@ struct EeSetupInfo
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__EE_SETUP_INFO__H */
+#endif /* CVC5__THEORY__EE_SETUP_INFO__H */
diff --git a/src/theory/engine_output_channel.h b/src/theory/engine_output_channel.h
index a9bae38a3..9a58e3021 100644
--- a/src/theory/engine_output_channel.h
+++ b/src/theory/engine_output_channel.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__ENGINE_OUTPUT_CHANNEL_H
-#define CVC4__THEORY__ENGINE_OUTPUT_CHANNEL_H
+#ifndef CVC5__THEORY__ENGINE_OUTPUT_CHANNEL_H
+#define CVC5__THEORY__ENGINE_OUTPUT_CHANNEL_H
#include "expr/node.h"
#include "theory/output_channel.h"
@@ -110,4 +110,4 @@ class EngineOutputChannel : public theory::OutputChannel
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__ENGINE_OUTPUT_CHANNEL_H */
+#endif /* CVC5__THEORY__ENGINE_OUTPUT_CHANNEL_H */
diff --git a/src/theory/evaluator.h b/src/theory/evaluator.h
index ad6eedb0f..50735a386 100644
--- a/src/theory/evaluator.h
+++ b/src/theory/evaluator.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__EVALUATOR_H
-#define CVC4__THEORY__EVALUATOR_H
+#ifndef CVC5__THEORY__EVALUATOR_H
+#define CVC5__THEORY__EVALUATOR_H
#include <utility>
#include <vector>
@@ -161,4 +161,4 @@ class Evaluator
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__EVALUATOR_H */
+#endif /* CVC5__THEORY__EVALUATOR_H */
diff --git a/src/theory/ext_theory.h b/src/theory/ext_theory.h
index 0beca705d..c4e86f730 100644
--- a/src/theory/ext_theory.h
+++ b/src/theory/ext_theory.h
@@ -30,8 +30,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__EXT_THEORY_H
-#define CVC4__THEORY__EXT_THEORY_H
+#ifndef CVC5__THEORY__EXT_THEORY_H
+#define CVC5__THEORY__EXT_THEORY_H
#include <map>
@@ -332,4 +332,4 @@ class ExtTheory
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__EXT_THEORY_H */
+#endif /* CVC5__THEORY__EXT_THEORY_H */
diff --git a/src/theory/fp/fp_converter.h b/src/theory/fp/fp_converter.h
index f25ce0822..f3341f442 100644
--- a/src/theory/fp/fp_converter.h
+++ b/src/theory/fp/fp_converter.h
@@ -20,8 +20,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__FP__FP_CONVERTER_H
-#define CVC4__THEORY__FP__FP_CONVERTER_H
+#ifndef CVC5__THEORY__FP__FP_CONVERTER_H
+#define CVC5__THEORY__FP__FP_CONVERTER_H
#include "context/cdhashmap.h"
#include "context/cdlist.h"
@@ -354,4 +354,4 @@ class FpConverter
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__FP__THEORY_FP_H */
+#endif /* CVC5__THEORY__FP__THEORY_FP_H */
diff --git a/src/theory/fp/theory_fp.h b/src/theory/fp/theory_fp.h
index 6ed026567..875614928 100644
--- a/src/theory/fp/theory_fp.h
+++ b/src/theory/fp/theory_fp.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__FP__THEORY_FP_H
-#define CVC4__THEORY__FP__THEORY_FP_H
+#ifndef CVC5__THEORY__FP__THEORY_FP_H
+#define CVC5__THEORY__FP__THEORY_FP_H
#include <string>
#include <utility>
@@ -193,4 +193,4 @@ class TheoryFp : public Theory
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__FP__THEORY_FP_H */
+#endif /* CVC5__THEORY__FP__THEORY_FP_H */
diff --git a/src/theory/fp/theory_fp_rewriter.h b/src/theory/fp/theory_fp_rewriter.h
index 52d22f3d3..29d16e119 100644
--- a/src/theory/fp/theory_fp_rewriter.h
+++ b/src/theory/fp/theory_fp_rewriter.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__FP__THEORY_FP_REWRITER_H
-#define CVC4__THEORY__FP__THEORY_FP_REWRITER_H
+#ifndef CVC5__THEORY__FP__THEORY_FP_REWRITER_H
+#define CVC5__THEORY__FP__THEORY_FP_REWRITER_H
#include "theory/theory_rewriter.h"
@@ -55,4 +55,4 @@ class TheoryFpRewriter : public TheoryRewriter
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__FP__THEORY_FP_REWRITER_H */
+#endif /* CVC5__THEORY__FP__THEORY_FP_REWRITER_H */
diff --git a/src/theory/fp/theory_fp_type_rules.h b/src/theory/fp/theory_fp_type_rules.h
index 0002b2abf..c00c5f910 100644
--- a/src/theory/fp/theory_fp_type_rules.h
+++ b/src/theory/fp/theory_fp_type_rules.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__FP__THEORY_FP_TYPE_RULES_H
-#define CVC4__THEORY__FP__THEORY_FP_TYPE_RULES_H
+#ifndef CVC5__THEORY__FP__THEORY_FP_TYPE_RULES_H
+#define CVC5__THEORY__FP__THEORY_FP_TYPE_RULES_H
#include "expr/node.h"
#include "expr/type_node.h"
diff --git a/src/theory/fp/type_enumerator.h b/src/theory/fp/type_enumerator.h
index 73946ce5a..c97dd94cb 100644
--- a/src/theory/fp/type_enumerator.h
+++ b/src/theory/fp/type_enumerator.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__FP__TYPE_ENUMERATOR_H
-#define CVC4__THEORY__FP__TYPE_ENUMERATOR_H
+#ifndef CVC5__THEORY__FP__TYPE_ENUMERATOR_H
+#define CVC5__THEORY__FP__TYPE_ENUMERATOR_H
#include "expr/kind.h"
#include "expr/type_node.h"
@@ -122,4 +122,4 @@ class RoundingModeEnumerator
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__FP__TYPE_ENUMERATOR_H */
+#endif /* CVC5__THEORY__FP__TYPE_ENUMERATOR_H */
diff --git a/src/theory/incomplete_id.h b/src/theory/incomplete_id.h
index 67754b67d..b587272cf 100644
--- a/src/theory/incomplete_id.h
+++ b/src/theory/incomplete_id.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__INCOMPLETE_ID_H
-#define CVC4__THEORY__INCOMPLETE_ID_H
+#ifndef CVC5__THEORY__INCOMPLETE_ID_H
+#define CVC5__THEORY__INCOMPLETE_ID_H
#include <iosfwd>
@@ -80,4 +80,4 @@ std::ostream& operator<<(std::ostream& out, IncompleteId i);
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__INCOMPLETE_ID_H */
+#endif /* CVC5__THEORY__INCOMPLETE_ID_H */
diff --git a/src/theory/inference_id.h b/src/theory/inference_id.h
index 3e91bff44..a6f662cf0 100644
--- a/src/theory/inference_id.h
+++ b/src/theory/inference_id.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__INFERENCE_ID_H
-#define CVC4__THEORY__INFERENCE_ID_H
+#ifndef CVC5__THEORY__INFERENCE_ID_H
+#define CVC5__THEORY__INFERENCE_ID_H
#include <iosfwd>
@@ -754,4 +754,4 @@ std::ostream& operator<<(std::ostream& out, InferenceId i);
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__INFERENCE_H */
+#endif /* CVC5__THEORY__INFERENCE_H */
diff --git a/src/theory/inference_manager_buffered.h b/src/theory/inference_manager_buffered.h
index b5888efd6..de2fca24c 100644
--- a/src/theory/inference_manager_buffered.h
+++ b/src/theory/inference_manager_buffered.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__INFERENCE_MANAGER_BUFFERED_H
-#define CVC4__THEORY__INFERENCE_MANAGER_BUFFERED_H
+#ifndef CVC5__THEORY__INFERENCE_MANAGER_BUFFERED_H
+#define CVC5__THEORY__INFERENCE_MANAGER_BUFFERED_H
#include "expr/node.h"
#include "theory/theory_inference.h"
diff --git a/src/theory/interrupted.h b/src/theory/interrupted.h
index c928f2faf..9b885ee46 100644
--- a/src/theory/interrupted.h
+++ b/src/theory/interrupted.h
@@ -26,8 +26,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__INTERRUPTED_H
-#define CVC4__THEORY__INTERRUPTED_H
+#ifndef CVC5__THEORY__INTERRUPTED_H
+#define CVC5__THEORY__INTERRUPTED_H
#include "base/exception.h"
@@ -41,4 +41,4 @@ class Interrupted : public cvc5::Exception
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__INTERRUPTED_H */
+#endif /* CVC5__THEORY__INTERRUPTED_H */
diff --git a/src/theory/lazy_tree_proof_generator.h b/src/theory/lazy_tree_proof_generator.h
index ef235ff1a..c07757930 100644
--- a/src/theory/lazy_tree_proof_generator.h
+++ b/src/theory/lazy_tree_proof_generator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__LAZY_TREE_PROOF_GENERATOR_H
-#define CVC4__THEORY__LAZY_TREE_PROOF_GENERATOR_H
+#ifndef CVC5__THEORY__LAZY_TREE_PROOF_GENERATOR_H
+#define CVC5__THEORY__LAZY_TREE_PROOF_GENERATOR_H
#include <iostream>
diff --git a/src/theory/logic_info.h b/src/theory/logic_info.h
index c4221040b..eb7bade7e 100644
--- a/src/theory/logic_info.h
+++ b/src/theory/logic_info.h
@@ -18,8 +18,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__LOGIC_INFO_H
-#define CVC4__LOGIC_INFO_H
+#ifndef CVC5__LOGIC_INFO_H
+#define CVC5__LOGIC_INFO_H
#include <string>
#include <vector>
@@ -293,4 +293,4 @@ std::ostream& operator<<(std::ostream& out, const LogicInfo& logic);
} // namespace cvc5
-#endif /* CVC4__LOGIC_INFO_H */
+#endif /* CVC5__LOGIC_INFO_H */
diff --git a/src/theory/model_manager.h b/src/theory/model_manager.h
index db3ea4ecf..2d052e85a 100644
--- a/src/theory/model_manager.h
+++ b/src/theory/model_manager.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__MODEL_MANAGER__H
-#define CVC4__THEORY__MODEL_MANAGER__H
+#ifndef CVC5__THEORY__MODEL_MANAGER__H
+#define CVC5__THEORY__MODEL_MANAGER__H
#include <memory>
@@ -154,4 +154,4 @@ class ModelManager
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__MODEL_MANAGER__H */
+#endif /* CVC5__THEORY__MODEL_MANAGER__H */
diff --git a/src/theory/model_manager_distributed.h b/src/theory/model_manager_distributed.h
index 04c146278..cb11cef0a 100644
--- a/src/theory/model_manager_distributed.h
+++ b/src/theory/model_manager_distributed.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__MODEL_MANAGER_DISTRIBUTED__H
-#define CVC4__THEORY__MODEL_MANAGER_DISTRIBUTED__H
+#ifndef CVC5__THEORY__MODEL_MANAGER_DISTRIBUTED__H
+#define CVC5__THEORY__MODEL_MANAGER_DISTRIBUTED__H
#include "theory/ee_manager.h"
#include "theory/model_manager.h"
@@ -58,4 +58,4 @@ class ModelManagerDistributed : public ModelManager
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__MODEL_MANAGER_DISTRIBUTED__H */
+#endif /* CVC5__THEORY__MODEL_MANAGER_DISTRIBUTED__H */
diff --git a/src/theory/output_channel.h b/src/theory/output_channel.h
index 0a3fa3904..14a8600e6 100644
--- a/src/theory/output_channel.h
+++ b/src/theory/output_channel.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__OUTPUT_CHANNEL_H
-#define CVC4__THEORY__OUTPUT_CHANNEL_H
+#ifndef CVC5__THEORY__OUTPUT_CHANNEL_H
+#define CVC5__THEORY__OUTPUT_CHANNEL_H
#include "theory/incomplete_id.h"
#include "theory/trust_node.h"
@@ -202,4 +202,4 @@ class OutputChannel {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__OUTPUT_CHANNEL_H */
+#endif /* CVC5__THEORY__OUTPUT_CHANNEL_H */
diff --git a/src/theory/quantifiers/alpha_equivalence.h b/src/theory/quantifiers/alpha_equivalence.h
index 03047c93b..058d01672 100644
--- a/src/theory/quantifiers/alpha_equivalence.h
+++ b/src/theory/quantifiers/alpha_equivalence.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__ALPHA_EQUIVALENCE_H
-#define CVC4__ALPHA_EQUIVALENCE_H
+#ifndef CVC5__ALPHA_EQUIVALENCE_H
+#define CVC5__ALPHA_EQUIVALENCE_H
#include "theory/quantifiers/quant_util.h"
diff --git a/src/theory/quantifiers/bv_inverter.h b/src/theory/quantifiers/bv_inverter.h
index a187cd36a..1ae1b6fbc 100644
--- a/src/theory/quantifiers/bv_inverter.h
+++ b/src/theory/quantifiers/bv_inverter.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__BV_INVERTER_H
-#define CVC4__BV_INVERTER_H
+#ifndef CVC5__BV_INVERTER_H
+#define CVC5__BV_INVERTER_H
#include <map>
#include <unordered_map>
@@ -130,4 +130,4 @@ class BvInverter
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__BV_INVERTER_H */
+#endif /* CVC5__BV_INVERTER_H */
diff --git a/src/theory/quantifiers/bv_inverter_utils.h b/src/theory/quantifiers/bv_inverter_utils.h
index 823855d1b..2fbdf5b67 100644
--- a/src/theory/quantifiers/bv_inverter_utils.h
+++ b/src/theory/quantifiers/bv_inverter_utils.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__BV_INVERTER_UTILS_H
-#define CVC4__BV_INVERTER_UTILS_H
+#ifndef CVC5__BV_INVERTER_UTILS_H
+#define CVC5__BV_INVERTER_UTILS_H
#include "expr/node.h"
diff --git a/src/theory/quantifiers/candidate_rewrite_database.h b/src/theory/quantifiers/candidate_rewrite_database.h
index 45333bc76..459a0b6c0 100644
--- a/src/theory/quantifiers/candidate_rewrite_database.h
+++ b/src/theory/quantifiers/candidate_rewrite_database.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_DATABASE_H
-#define CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_DATABASE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_DATABASE_H
+#define CVC5__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_DATABASE_H
#include <vector>
@@ -130,4 +130,4 @@ class CandidateRewriteDatabase : public ExprMiner
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_DATABASE_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_DATABASE_H */
diff --git a/src/theory/quantifiers/candidate_rewrite_filter.h b/src/theory/quantifiers/candidate_rewrite_filter.h
index aa31c7845..d73160add 100644
--- a/src/theory/quantifiers/candidate_rewrite_filter.h
+++ b/src/theory/quantifiers/candidate_rewrite_filter.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_FILTER_H
-#define CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_FILTER_H
+#ifndef CVC5__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_FILTER_H
+#define CVC5__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_FILTER_H
#include <map>
#include "expr/match_trie.h"
@@ -173,4 +173,4 @@ class CandidateRewriteFilter
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_FILTER_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_FILTER_H */
diff --git a/src/theory/quantifiers/cegqi/ceg_arith_instantiator.h b/src/theory/quantifiers/cegqi/ceg_arith_instantiator.h
index a81f5f180..f6533c5cc 100644
--- a/src/theory/quantifiers/cegqi/ceg_arith_instantiator.h
+++ b/src/theory/quantifiers/cegqi/ceg_arith_instantiator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__CEG_ARITH_INSTANTIATOR_H
-#define CVC4__THEORY__QUANTIFIERS__CEG_ARITH_INSTANTIATOR_H
+#ifndef CVC5__THEORY__QUANTIFIERS__CEG_ARITH_INSTANTIATOR_H
+#define CVC5__THEORY__QUANTIFIERS__CEG_ARITH_INSTANTIATOR_H
#include <vector>
#include "expr/node.h"
@@ -211,4 +211,4 @@ class ArithInstantiator : public Instantiator
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__CEG_ARITH_INSTANTIATOR_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__CEG_ARITH_INSTANTIATOR_H */
diff --git a/src/theory/quantifiers/cegqi/ceg_bv_instantiator.h b/src/theory/quantifiers/cegqi/ceg_bv_instantiator.h
index 9914428ef..5ce3c1fa4 100644
--- a/src/theory/quantifiers/cegqi/ceg_bv_instantiator.h
+++ b/src/theory/quantifiers/cegqi/ceg_bv_instantiator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__CEG_BV_INSTANTIATOR_H
-#define CVC4__THEORY__QUANTIFIERS__CEG_BV_INSTANTIATOR_H
+#ifndef CVC5__THEORY__QUANTIFIERS__CEG_BV_INSTANTIATOR_H
+#define CVC5__THEORY__QUANTIFIERS__CEG_BV_INSTANTIATOR_H
#include <unordered_map>
#include "theory/quantifiers/bv_inverter.h"
@@ -211,4 +211,4 @@ class BvInstantiatorPreprocess : public InstantiatorPreprocess
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__CEG_BV_INSTANTIATOR_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__CEG_BV_INSTANTIATOR_H */
diff --git a/src/theory/quantifiers/cegqi/ceg_bv_instantiator_utils.h b/src/theory/quantifiers/cegqi/ceg_bv_instantiator_utils.h
index ac68dc4d5..364c6c0fc 100644
--- a/src/theory/quantifiers/cegqi/ceg_bv_instantiator_utils.h
+++ b/src/theory/quantifiers/cegqi/ceg_bv_instantiator_utils.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__BV_INSTANTIATOR_UTILS_H
-#define CVC4__BV_INSTANTIATOR_UTILS_H
+#ifndef CVC5__BV_INSTANTIATOR_UTILS_H
+#define CVC5__BV_INSTANTIATOR_UTILS_H
#include "expr/attribute.h"
#include "expr/node.h"
diff --git a/src/theory/quantifiers/cegqi/ceg_dt_instantiator.h b/src/theory/quantifiers/cegqi/ceg_dt_instantiator.h
index 27bf560cb..a7507a8ec 100644
--- a/src/theory/quantifiers/cegqi/ceg_dt_instantiator.h
+++ b/src/theory/quantifiers/cegqi/ceg_dt_instantiator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__CEG_DT_INSTANTIATOR_H
-#define CVC4__THEORY__QUANTIFIERS__CEG_DT_INSTANTIATOR_H
+#ifndef CVC5__THEORY__QUANTIFIERS__CEG_DT_INSTANTIATOR_H
+#define CVC5__THEORY__QUANTIFIERS__CEG_DT_INSTANTIATOR_H
#include "expr/node.h"
#include "theory/quantifiers/cegqi/ceg_instantiator.h"
@@ -93,4 +93,4 @@ class DtInstantiator : public Instantiator
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__CEG_DT_INSTANTIATOR_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__CEG_DT_INSTANTIATOR_H */
diff --git a/src/theory/quantifiers/cegqi/ceg_instantiator.h b/src/theory/quantifiers/cegqi/ceg_instantiator.h
index 986874266..a1ca2f92c 100644
--- a/src/theory/quantifiers/cegqi/ceg_instantiator.h
+++ b/src/theory/quantifiers/cegqi/ceg_instantiator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__CEG_INSTANTIATOR_H
-#define CVC4__THEORY__QUANTIFIERS__CEG_INSTANTIATOR_H
+#ifndef CVC5__THEORY__QUANTIFIERS__CEG_INSTANTIATOR_H
+#define CVC5__THEORY__QUANTIFIERS__CEG_INSTANTIATOR_H
#include <vector>
diff --git a/src/theory/quantifiers/cegqi/inst_strategy_cegqi.h b/src/theory/quantifiers/cegqi/inst_strategy_cegqi.h
index 85724a915..538eac2e1 100644
--- a/src/theory/quantifiers/cegqi/inst_strategy_cegqi.h
+++ b/src/theory/quantifiers/cegqi/inst_strategy_cegqi.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__INST_STRATEGY_CEGQI_H
-#define CVC4__THEORY__QUANTIFIERS__INST_STRATEGY_CEGQI_H
+#ifndef CVC5__THEORY__QUANTIFIERS__INST_STRATEGY_CEGQI_H
+#define CVC5__THEORY__QUANTIFIERS__INST_STRATEGY_CEGQI_H
#include "theory/decision_manager.h"
#include "theory/quantifiers/bv_inverter.h"
diff --git a/src/theory/quantifiers/cegqi/nested_qe.h b/src/theory/quantifiers/cegqi/nested_qe.h
index e0cccb9c9..31d7fe1fe 100644
--- a/src/theory/quantifiers/cegqi/nested_qe.h
+++ b/src/theory/quantifiers/cegqi/nested_qe.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__CEQGI__NESTED_QE_H
-#define CVC4__THEORY__QUANTIFIERS__CEQGI__NESTED_QE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__CEQGI__NESTED_QE_H
+#define CVC5__THEORY__QUANTIFIERS__CEQGI__NESTED_QE_H
#include <unordered_set>
diff --git a/src/theory/quantifiers/cegqi/vts_term_cache.h b/src/theory/quantifiers/cegqi/vts_term_cache.h
index d56684d43..99b2952df 100644
--- a/src/theory/quantifiers/cegqi/vts_term_cache.h
+++ b/src/theory/quantifiers/cegqi/vts_term_cache.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__CEGQI__VTS_TERM_CACHE_H
-#define CVC4__THEORY__QUANTIFIERS__CEGQI__VTS_TERM_CACHE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__CEGQI__VTS_TERM_CACHE_H
+#define CVC5__THEORY__QUANTIFIERS__CEGQI__VTS_TERM_CACHE_H
#include <map>
#include "expr/attribute.h"
@@ -142,4 +142,4 @@ class VtsTermCache
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__CEGQI__VTS_TERM_CACHE_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__CEGQI__VTS_TERM_CACHE_H */
diff --git a/src/theory/quantifiers/dynamic_rewrite.h b/src/theory/quantifiers/dynamic_rewrite.h
index 9fce59796..b45013a2c 100644
--- a/src/theory/quantifiers/dynamic_rewrite.h
+++ b/src/theory/quantifiers/dynamic_rewrite.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__DYNAMIC_REWRITER_H
-#define CVC4__THEORY__QUANTIFIERS__DYNAMIC_REWRITER_H
+#ifndef CVC5__THEORY__QUANTIFIERS__DYNAMIC_REWRITER_H
+#define CVC5__THEORY__QUANTIFIERS__DYNAMIC_REWRITER_H
#include <map>
@@ -121,4 +121,4 @@ class DynamicRewriter
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__DYNAMIC_REWRITER_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__DYNAMIC_REWRITER_H */
diff --git a/src/theory/quantifiers/ematching/candidate_generator.h b/src/theory/quantifiers/ematching/candidate_generator.h
index 0de57f02f..ade813716 100644
--- a/src/theory/quantifiers/ematching/candidate_generator.h
+++ b/src/theory/quantifiers/ematching/candidate_generator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__CANDIDATE_GENERATOR_H
-#define CVC4__THEORY__QUANTIFIERS__CANDIDATE_GENERATOR_H
+#ifndef CVC5__THEORY__QUANTIFIERS__CANDIDATE_GENERATOR_H
+#define CVC5__THEORY__QUANTIFIERS__CANDIDATE_GENERATOR_H
#include "theory/theory.h"
#include "theory/uf/equality_engine.h"
@@ -245,4 +245,4 @@ class CandidateGeneratorSelector : public CandidateGeneratorQE
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__CANDIDATE_GENERATOR_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__CANDIDATE_GENERATOR_H */
diff --git a/src/theory/quantifiers/ematching/ho_trigger.h b/src/theory/quantifiers/ematching/ho_trigger.h
index 12c91be63..01271063a 100644
--- a/src/theory/quantifiers/ematching/ho_trigger.h
+++ b/src/theory/quantifiers/ematching/ho_trigger.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__HO_TRIGGER_H
-#define CVC4__THEORY__QUANTIFIERS__HO_TRIGGER_H
+#ifndef CVC5__THEORY__QUANTIFIERS__HO_TRIGGER_H
+#define CVC5__THEORY__QUANTIFIERS__HO_TRIGGER_H
#include <map>
#include <unordered_set>
@@ -277,4 +277,4 @@ class HigherOrderTrigger : public Trigger
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__HO_TRIGGER_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__HO_TRIGGER_H */
diff --git a/src/theory/quantifiers/ematching/im_generator.h b/src/theory/quantifiers/ematching/im_generator.h
index 222e3c078..305990bf8 100644
--- a/src/theory/quantifiers/ematching/im_generator.h
+++ b/src/theory/quantifiers/ematching/im_generator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__IM_GENERATOR_H
-#define CVC4__THEORY__QUANTIFIERS__IM_GENERATOR_H
+#ifndef CVC5__THEORY__QUANTIFIERS__IM_GENERATOR_H
+#define CVC5__THEORY__QUANTIFIERS__IM_GENERATOR_H
#include <map>
#include "expr/node.h"
diff --git a/src/theory/quantifiers/ematching/inst_match_generator.h b/src/theory/quantifiers/ematching/inst_match_generator.h
index 7b440035f..ae389e0ce 100644
--- a/src/theory/quantifiers/ematching/inst_match_generator.h
+++ b/src/theory/quantifiers/ematching/inst_match_generator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_H
-#define CVC4__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_H
+#ifndef CVC5__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_H
+#define CVC5__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_H
#include <map>
#include "expr/node.h"
diff --git a/src/theory/quantifiers/ematching/inst_match_generator_multi.h b/src/theory/quantifiers/ematching/inst_match_generator_multi.h
index 309aa2640..7d870e566 100644
--- a/src/theory/quantifiers/ematching/inst_match_generator_multi.h
+++ b/src/theory/quantifiers/ematching/inst_match_generator_multi.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_MULTI_H
-#define CVC4__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_MULTI_H
+#ifndef CVC5__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_MULTI_H
+#define CVC5__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_MULTI_H
#include <map>
#include <vector>
diff --git a/src/theory/quantifiers/ematching/inst_match_generator_multi_linear.h b/src/theory/quantifiers/ematching/inst_match_generator_multi_linear.h
index 4d4339bac..ac15b1752 100644
--- a/src/theory/quantifiers/ematching/inst_match_generator_multi_linear.h
+++ b/src/theory/quantifiers/ematching/inst_match_generator_multi_linear.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_MULTI_LINEAR_H
-#define CVC4__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_MULTI_LINEAR_H
+#ifndef CVC5__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_MULTI_LINEAR_H
+#define CVC5__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_MULTI_LINEAR_H
#include <vector>
diff --git a/src/theory/quantifiers/ematching/inst_match_generator_simple.h b/src/theory/quantifiers/ematching/inst_match_generator_simple.h
index ccc650044..6c2bec0f0 100644
--- a/src/theory/quantifiers/ematching/inst_match_generator_simple.h
+++ b/src/theory/quantifiers/ematching/inst_match_generator_simple.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_SIMPLE_H
-#define CVC4__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_SIMPLE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_SIMPLE_H
+#define CVC5__THEORY__QUANTIFIERS__INST_MATCH_GENERATOR_SIMPLE_H
#include <map>
#include <vector>
diff --git a/src/theory/quantifiers/ematching/inst_strategy.h b/src/theory/quantifiers/ematching/inst_strategy.h
index 1ce62f170..405bf0a4d 100644
--- a/src/theory/quantifiers/ematching/inst_strategy.h
+++ b/src/theory/quantifiers/ematching/inst_strategy.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__INST_STRATEGY_H
-#define CVC4__THEORY__QUANTIFIERS__INST_STRATEGY_H
+#ifndef CVC5__THEORY__QUANTIFIERS__INST_STRATEGY_H
+#define CVC5__THEORY__QUANTIFIERS__INST_STRATEGY_H
#include <vector>
#include "expr/node.h"
@@ -87,4 +87,4 @@ class InstStrategy
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H */
diff --git a/src/theory/quantifiers/ematching/inst_strategy_e_matching.h b/src/theory/quantifiers/ematching/inst_strategy_e_matching.h
index 2c765e194..62b4b2623 100644
--- a/src/theory/quantifiers/ematching/inst_strategy_e_matching.h
+++ b/src/theory/quantifiers/ematching/inst_strategy_e_matching.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__INST_STRATEGY_E_MATCHING_H
-#define CVC4__INST_STRATEGY_E_MATCHING_H
+#ifndef CVC5__INST_STRATEGY_E_MATCHING_H
+#define CVC5__INST_STRATEGY_E_MATCHING_H
#include "theory/quantifiers/ematching/inst_strategy.h"
#include "theory/quantifiers/ematching/trigger.h"
diff --git a/src/theory/quantifiers/ematching/inst_strategy_e_matching_user.h b/src/theory/quantifiers/ematching/inst_strategy_e_matching_user.h
index ed247b89a..cd037415c 100644
--- a/src/theory/quantifiers/ematching/inst_strategy_e_matching_user.h
+++ b/src/theory/quantifiers/ematching/inst_strategy_e_matching_user.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__INST_STRATEGY_E_MATCHING_USER_H
-#define CVC4__INST_STRATEGY_E_MATCHING_USER_H
+#ifndef CVC5__INST_STRATEGY_E_MATCHING_USER_H
+#define CVC5__INST_STRATEGY_E_MATCHING_USER_H
#include <map>
#include "expr/node.h"
diff --git a/src/theory/quantifiers/ematching/instantiation_engine.h b/src/theory/quantifiers/ematching/instantiation_engine.h
index bd7388afb..fc5a33164 100644
--- a/src/theory/quantifiers/ematching/instantiation_engine.h
+++ b/src/theory/quantifiers/ematching/instantiation_engine.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H
-#define CVC4__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H
+#define CVC5__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H
#include <vector>
@@ -77,4 +77,4 @@ class InstantiationEngine : public QuantifiersModule {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H */
diff --git a/src/theory/quantifiers/ematching/pattern_term_selector.h b/src/theory/quantifiers/ematching/pattern_term_selector.h
index 5ac6c1da3..e5209eeb1 100644
--- a/src/theory/quantifiers/ematching/pattern_term_selector.h
+++ b/src/theory/quantifiers/ematching/pattern_term_selector.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__PATTERN_TERM_SELECTOR_H
-#define CVC4__THEORY__QUANTIFIERS__PATTERN_TERM_SELECTOR_H
+#ifndef CVC5__THEORY__QUANTIFIERS__PATTERN_TERM_SELECTOR_H
+#define CVC5__THEORY__QUANTIFIERS__PATTERN_TERM_SELECTOR_H
#include <map>
diff --git a/src/theory/quantifiers/ematching/trigger.h b/src/theory/quantifiers/ematching/trigger.h
index e2ad00561..9ce4be544 100644
--- a/src/theory/quantifiers/ematching/trigger.h
+++ b/src/theory/quantifiers/ematching/trigger.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__TRIGGER_H
-#define CVC4__THEORY__QUANTIFIERS__TRIGGER_H
+#ifndef CVC5__THEORY__QUANTIFIERS__TRIGGER_H
+#define CVC5__THEORY__QUANTIFIERS__TRIGGER_H
#include "expr/node.h"
#include "theory/inference_id.h"
@@ -221,4 +221,4 @@ class Trigger {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__TRIGGER_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__TRIGGER_H */
diff --git a/src/theory/quantifiers/ematching/trigger_database.h b/src/theory/quantifiers/ematching/trigger_database.h
index 9cebb6173..8db50ae50 100644
--- a/src/theory/quantifiers/ematching/trigger_database.h
+++ b/src/theory/quantifiers/ematching/trigger_database.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__TRIGGER_DATABASE_H
-#define CVC4__THEORY__QUANTIFIERS__TRIGGER_DATABASE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__TRIGGER_DATABASE_H
+#define CVC5__THEORY__QUANTIFIERS__TRIGGER_DATABASE_H
#include <vector>
@@ -107,4 +107,4 @@ class TriggerDatabase
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__TRIGGER_DATABASE_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__TRIGGER_DATABASE_H */
diff --git a/src/theory/quantifiers/ematching/trigger_term_info.h b/src/theory/quantifiers/ematching/trigger_term_info.h
index c70257e08..ad1dd967a 100644
--- a/src/theory/quantifiers/ematching/trigger_term_info.h
+++ b/src/theory/quantifiers/ematching/trigger_term_info.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__TRIGGER_TERM_INFO_H
-#define CVC4__THEORY__QUANTIFIERS__TRIGGER_TERM_INFO_H
+#ifndef CVC5__THEORY__QUANTIFIERS__TRIGGER_TERM_INFO_H
+#define CVC5__THEORY__QUANTIFIERS__TRIGGER_TERM_INFO_H
#include <map>
diff --git a/src/theory/quantifiers/ematching/trigger_trie.h b/src/theory/quantifiers/ematching/trigger_trie.h
index fe16e3c0f..2fd39e9ef 100644
--- a/src/theory/quantifiers/ematching/trigger_trie.h
+++ b/src/theory/quantifiers/ematching/trigger_trie.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__TRIGGER_TRIE_H
-#define CVC4__THEORY__QUANTIFIERS__TRIGGER_TRIE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__TRIGGER_TRIE_H
+#define CVC5__THEORY__QUANTIFIERS__TRIGGER_TRIE_H
#include <vector>
@@ -60,4 +60,4 @@ class TriggerTrie
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__TRIGGER_TRIE_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__TRIGGER_TRIE_H */
diff --git a/src/theory/quantifiers/ematching/var_match_generator.h b/src/theory/quantifiers/ematching/var_match_generator.h
index 87c4d1e32..66f166cd1 100644
--- a/src/theory/quantifiers/ematching/var_match_generator.h
+++ b/src/theory/quantifiers/ematching/var_match_generator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__VAR_MATCH_GENERATOR_H
-#define CVC4__THEORY__QUANTIFIERS__VAR_MATCH_GENERATOR_H
+#ifndef CVC5__THEORY__QUANTIFIERS__VAR_MATCH_GENERATOR_H
+#define CVC5__THEORY__QUANTIFIERS__VAR_MATCH_GENERATOR_H
#include "expr/node.h"
#include "theory/quantifiers/ematching/inst_match_generator.h"
diff --git a/src/theory/quantifiers/equality_query.h b/src/theory/quantifiers/equality_query.h
index 988291ed5..f908c2a97 100644
--- a/src/theory/quantifiers/equality_query.h
+++ b/src/theory/quantifiers/equality_query.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS_EQUALITY_QUERY_H
-#define CVC4__THEORY__QUANTIFIERS_EQUALITY_QUERY_H
+#ifndef CVC5__THEORY__QUANTIFIERS_EQUALITY_QUERY_H
+#define CVC5__THEORY__QUANTIFIERS_EQUALITY_QUERY_H
#include "context/cdo.h"
#include "context/context.h"
@@ -92,4 +92,4 @@ class EqualityQuery : public QuantifiersUtil
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS_EQUALITY_QUERY_H */
+#endif /* CVC5__THEORY__QUANTIFIERS_EQUALITY_QUERY_H */
diff --git a/src/theory/quantifiers/expr_miner.h b/src/theory/quantifiers/expr_miner.h
index 37d0de6f8..aa1c9a1bf 100644
--- a/src/theory/quantifiers/expr_miner.h
+++ b/src/theory/quantifiers/expr_miner.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__EXPRESSION_MINER_H
-#define CVC4__THEORY__QUANTIFIERS__EXPRESSION_MINER_H
+#ifndef CVC5__THEORY__QUANTIFIERS__EXPRESSION_MINER_H
+#define CVC5__THEORY__QUANTIFIERS__EXPRESSION_MINER_H
#include <map>
#include <memory>
@@ -92,4 +92,4 @@ class ExprMiner
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__EXPRESSION_MINER_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__EXPRESSION_MINER_H */
diff --git a/src/theory/quantifiers/expr_miner_manager.h b/src/theory/quantifiers/expr_miner_manager.h
index d33c9902c..b762f7625 100644
--- a/src/theory/quantifiers/expr_miner_manager.h
+++ b/src/theory/quantifiers/expr_miner_manager.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__EXPR_MINER_MANAGER_H
-#define CVC4__THEORY__QUANTIFIERS__EXPR_MINER_MANAGER_H
+#ifndef CVC5__THEORY__QUANTIFIERS__EXPR_MINER_MANAGER_H
+#define CVC5__THEORY__QUANTIFIERS__EXPR_MINER_MANAGER_H
#include "expr/node.h"
#include "theory/quantifiers/candidate_rewrite_database.h"
@@ -120,4 +120,4 @@ class ExpressionMinerManager
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__EXPR_MINER_MANAGER_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__EXPR_MINER_MANAGER_H */
diff --git a/src/theory/quantifiers/extended_rewrite.h b/src/theory/quantifiers/extended_rewrite.h
index 0d6ece71e..a9d9e8b50 100644
--- a/src/theory/quantifiers/extended_rewrite.h
+++ b/src/theory/quantifiers/extended_rewrite.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__EXTENDED_REWRITE_H
-#define CVC4__THEORY__QUANTIFIERS__EXTENDED_REWRITE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__EXTENDED_REWRITE_H
+#define CVC5__THEORY__QUANTIFIERS__EXTENDED_REWRITE_H
#include <unordered_map>
@@ -252,4 +252,4 @@ class ExtendedRewriter
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__EXTENDED_REWRITE_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__EXTENDED_REWRITE_H */
diff --git a/src/theory/quantifiers/first_order_model.h b/src/theory/quantifiers/first_order_model.h
index ec3b6dd7a..627b960a3 100644
--- a/src/theory/quantifiers/first_order_model.h
+++ b/src/theory/quantifiers/first_order_model.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__FIRST_ORDER_MODEL_H
-#define CVC4__FIRST_ORDER_MODEL_H
+#ifndef CVC5__FIRST_ORDER_MODEL_H
+#define CVC5__FIRST_ORDER_MODEL_H
#include "context/cdlist.h"
#include "theory/quantifiers/equality_query.h"
@@ -198,4 +198,4 @@ class FirstOrderModel : public TheoryModel
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__FIRST_ORDER_MODEL_H */
+#endif /* CVC5__FIRST_ORDER_MODEL_H */
diff --git a/src/theory/quantifiers/fmf/bounded_integers.h b/src/theory/quantifiers/fmf/bounded_integers.h
index fc6fac92a..e4b5a6083 100644
--- a/src/theory/quantifiers/fmf/bounded_integers.h
+++ b/src/theory/quantifiers/fmf/bounded_integers.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__BOUNDED_INTEGERS_H
-#define CVC4__BOUNDED_INTEGERS_H
+#ifndef CVC5__BOUNDED_INTEGERS_H
+#define CVC5__BOUNDED_INTEGERS_H
#include "theory/quantifiers/quant_module.h"
diff --git a/src/theory/quantifiers/fmf/first_order_model_fmc.h b/src/theory/quantifiers/fmf/first_order_model_fmc.h
index d858e24f6..b32e4dffa 100644
--- a/src/theory/quantifiers/fmf/first_order_model_fmc.h
+++ b/src/theory/quantifiers/fmf/first_order_model_fmc.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__FMF__FIRST_ORDER_MODEL_FMC_H
-#define CVC4__THEORY__QUANTIFIERS__FMF__FIRST_ORDER_MODEL_FMC_H
+#ifndef CVC5__THEORY__QUANTIFIERS__FMF__FIRST_ORDER_MODEL_FMC_H
+#define CVC5__THEORY__QUANTIFIERS__FMF__FIRST_ORDER_MODEL_FMC_H
#include "theory/quantifiers/first_order_model.h"
@@ -56,4 +56,4 @@ class FirstOrderModelFmc : public FirstOrderModel
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__FIRST_ORDER_MODEL_H */
+#endif /* CVC5__FIRST_ORDER_MODEL_H */
diff --git a/src/theory/quantifiers/fmf/full_model_check.h b/src/theory/quantifiers/fmf/full_model_check.h
index 586bde226..73ce86add 100644
--- a/src/theory/quantifiers/fmf/full_model_check.h
+++ b/src/theory/quantifiers/fmf/full_model_check.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__FULL_MODEL_CHECK_H
-#define CVC4__THEORY__QUANTIFIERS__FULL_MODEL_CHECK_H
+#ifndef CVC5__THEORY__QUANTIFIERS__FULL_MODEL_CHECK_H
+#define CVC5__THEORY__QUANTIFIERS__FULL_MODEL_CHECK_H
#include "theory/quantifiers/fmf/first_order_model_fmc.h"
#include "theory/quantifiers/fmf/model_builder.h"
@@ -189,4 +189,4 @@ protected:
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__FULL_MODEL_CHECK_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__FULL_MODEL_CHECK_H */
diff --git a/src/theory/quantifiers/fmf/model_builder.h b/src/theory/quantifiers/fmf/model_builder.h
index 4a95a8a73..94eab1fd6 100644
--- a/src/theory/quantifiers/fmf/model_builder.h
+++ b/src/theory/quantifiers/fmf/model_builder.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__MODEL_BUILDER_H
-#define CVC4__THEORY__QUANTIFIERS__MODEL_BUILDER_H
+#ifndef CVC5__THEORY__QUANTIFIERS__MODEL_BUILDER_H
+#define CVC5__THEORY__QUANTIFIERS__MODEL_BUILDER_H
#include "expr/node.h"
#include "theory/quantifiers/inst_match.h"
@@ -75,4 +75,4 @@ class QModelBuilder : public TheoryEngineModelBuilder
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__MODEL_BUILDER_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__MODEL_BUILDER_H */
diff --git a/src/theory/quantifiers/fmf/model_engine.h b/src/theory/quantifiers/fmf/model_engine.h
index 5a983d726..112d21925 100644
--- a/src/theory/quantifiers/fmf/model_engine.h
+++ b/src/theory/quantifiers/fmf/model_engine.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__MODEL_ENGINE_H
-#define CVC4__THEORY__QUANTIFIERS__MODEL_ENGINE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__MODEL_ENGINE_H
+#define CVC5__THEORY__QUANTIFIERS__MODEL_ENGINE_H
#include "theory/quantifiers/fmf/model_builder.h"
#include "theory/quantifiers/quant_module.h"
@@ -73,4 +73,4 @@ private:
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__MODEL_ENGINE_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__MODEL_ENGINE_H */
diff --git a/src/theory/quantifiers/fun_def_evaluator.h b/src/theory/quantifiers/fun_def_evaluator.h
index fcc30948d..a7aa22efd 100644
--- a/src/theory/quantifiers/fun_def_evaluator.h
+++ b/src/theory/quantifiers/fun_def_evaluator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__QUANTIFIERS_FUN_DEF_EVALUATOR_H
-#define CVC4__QUANTIFIERS_FUN_DEF_EVALUATOR_H
+#ifndef CVC5__QUANTIFIERS_FUN_DEF_EVALUATOR_H
+#define CVC5__QUANTIFIERS_FUN_DEF_EVALUATOR_H
#include <map>
#include <vector>
diff --git a/src/theory/quantifiers/index_trie.h b/src/theory/quantifiers/index_trie.h
index 2c968e107..a10a31fe8 100644
--- a/src/theory/quantifiers/index_trie.h
+++ b/src/theory/quantifiers/index_trie.h
@@ -13,8 +13,8 @@
** that are not yielding useful instantiations. of quantifier instantiation.
** This is used in the term_tuple_enumerator.
**/
-#ifndef CVC4__THEORY__QUANTIFIERS__INDEX_TRIE_H
-#define CVC4__THEORY__QUANTIFIERS__INDEX_TRIE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__INDEX_TRIE_H
+#define CVC5__THEORY__QUANTIFIERS__INDEX_TRIE_H
#include <algorithm>
#include <utility>
#include <vector>
diff --git a/src/theory/quantifiers/inst_match.h b/src/theory/quantifiers/inst_match.h
index e5e8f97cd..7002e2858 100644
--- a/src/theory/quantifiers/inst_match.h
+++ b/src/theory/quantifiers/inst_match.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__INST_MATCH_H
-#define CVC4__THEORY__QUANTIFIERS__INST_MATCH_H
+#ifndef CVC5__THEORY__QUANTIFIERS__INST_MATCH_H
+#define CVC5__THEORY__QUANTIFIERS__INST_MATCH_H
#include <vector>
@@ -91,4 +91,4 @@ inline std::ostream& operator<<(std::ostream& out, const InstMatch& m) {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__INST_MATCH_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__INST_MATCH_H */
diff --git a/src/theory/quantifiers/inst_match_trie.h b/src/theory/quantifiers/inst_match_trie.h
index ca878c888..2f1dbb6d9 100644
--- a/src/theory/quantifiers/inst_match_trie.h
+++ b/src/theory/quantifiers/inst_match_trie.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__INST_MATCH_TRIE_H
-#define CVC4__THEORY__QUANTIFIERS__INST_MATCH_TRIE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__INST_MATCH_TRIE_H
+#define CVC5__THEORY__QUANTIFIERS__INST_MATCH_TRIE_H
#include <map>
@@ -226,4 +226,4 @@ class InstMatchTrieOrdered
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__INST_MATCH_TRIE_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__INST_MATCH_TRIE_H */
diff --git a/src/theory/quantifiers/inst_strategy_enumerative.h b/src/theory/quantifiers/inst_strategy_enumerative.h
index 7b5cb8e0e..39f719ced 100644
--- a/src/theory/quantifiers/inst_strategy_enumerative.h
+++ b/src/theory/quantifiers/inst_strategy_enumerative.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__INST_STRATEGY_ENUMERATIVE_H
-#define CVC4__INST_STRATEGY_ENUMERATIVE_H
+#ifndef CVC5__INST_STRATEGY_ENUMERATIVE_H
+#define CVC5__INST_STRATEGY_ENUMERATIVE_H
#include "theory/quantifiers/quant_module.h"
diff --git a/src/theory/quantifiers/instantiate.h b/src/theory/quantifiers/instantiate.h
index b56938fd1..7ec4d837a 100644
--- a/src/theory/quantifiers/instantiate.h
+++ b/src/theory/quantifiers/instantiate.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__INSTANTIATE_H
-#define CVC4__THEORY__QUANTIFIERS__INSTANTIATE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__INSTANTIATE_H
+#define CVC5__THEORY__QUANTIFIERS__INSTANTIATE_H
#include <map>
@@ -363,4 +363,4 @@ class Instantiate : public QuantifiersUtil
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__INSTANTIATE_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__INSTANTIATE_H */
diff --git a/src/theory/quantifiers/instantiation_list.h b/src/theory/quantifiers/instantiation_list.h
index 86dfa0081..e6915418b 100644
--- a/src/theory/quantifiers/instantiation_list.h
+++ b/src/theory/quantifiers/instantiation_list.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__INSTANTIATION_LIST_H
-#define CVC4__THEORY__QUANTIFIERS__INSTANTIATION_LIST_H
+#ifndef CVC5__THEORY__QUANTIFIERS__INSTANTIATION_LIST_H
+#define CVC5__THEORY__QUANTIFIERS__INSTANTIATION_LIST_H
#include <iosfwd>
#include <vector>
@@ -55,4 +55,4 @@ std::ostream& operator<<(std::ostream& out, const SkolemList& skl);
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__INSTANTIATION_LIST_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__INSTANTIATION_LIST_H */
diff --git a/src/theory/quantifiers/lazy_trie.h b/src/theory/quantifiers/lazy_trie.h
index d4437ae75..f319ccf3b 100644
--- a/src/theory/quantifiers/lazy_trie.h
+++ b/src/theory/quantifiers/lazy_trie.h
@@ -12,8 +12,8 @@
** \brief lazy trie
**/
-#ifndef CVC4__THEORY__QUANTIFIERS__LAZY_TRIE_H
-#define CVC4__THEORY__QUANTIFIERS__LAZY_TRIE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__LAZY_TRIE_H
+#define CVC5__THEORY__QUANTIFIERS__LAZY_TRIE_H
#include "expr/node.h"
@@ -170,4 +170,4 @@ class LazyTrieMulti
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__LAZY_TRIE_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__LAZY_TRIE_H */
diff --git a/src/theory/quantifiers/proof_checker.h b/src/theory/quantifiers/proof_checker.h
index 39e933149..66a4b30ae 100644
--- a/src/theory/quantifiers/proof_checker.h
+++ b/src/theory/quantifiers/proof_checker.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__PROOF_CHECKER_H
-#define CVC4__THEORY__QUANTIFIERS__PROOF_CHECKER_H
+#ifndef CVC5__THEORY__QUANTIFIERS__PROOF_CHECKER_H
+#define CVC5__THEORY__QUANTIFIERS__PROOF_CHECKER_H
#include "expr/node.h"
#include "expr/proof_checker.h"
@@ -46,4 +46,4 @@ class QuantifiersProofRuleChecker : public ProofRuleChecker
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__PROOF_CHECKER_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__PROOF_CHECKER_H */
diff --git a/src/theory/quantifiers/quant_bound_inference.h b/src/theory/quantifiers/quant_bound_inference.h
index 7c15d5146..6533bb8e9 100644
--- a/src/theory/quantifiers/quant_bound_inference.h
+++ b/src/theory/quantifiers/quant_bound_inference.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__QUANT_BOUND_INFERENCE_H
-#define CVC4__THEORY__QUANTIFIERS__QUANT_BOUND_INFERENCE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__QUANT_BOUND_INFERENCE_H
+#define CVC5__THEORY__QUANTIFIERS__QUANT_BOUND_INFERENCE_H
#include <vector>
#include "expr/node.h"
@@ -124,4 +124,4 @@ class QuantifiersBoundInference
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__QUANT_BOUND_INFERENCE_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__QUANT_BOUND_INFERENCE_H */
diff --git a/src/theory/quantifiers/quant_module.h b/src/theory/quantifiers/quant_module.h
index 01a51ccff..1f238a016 100644
--- a/src/theory/quantifiers/quant_module.h
+++ b/src/theory/quantifiers/quant_module.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANT_MODULE_H
-#define CVC4__THEORY__QUANT_MODULE_H
+#ifndef CVC5__THEORY__QUANT_MODULE_H
+#define CVC5__THEORY__QUANT_MODULE_H
#include <iostream>
#include <map>
@@ -179,4 +179,4 @@ class QuantifiersModule
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANT_UTIL_H */
+#endif /* CVC5__THEORY__QUANT_UTIL_H */
diff --git a/src/theory/quantifiers/quant_relevance.h b/src/theory/quantifiers/quant_relevance.h
index e6a178c73..4638a061e 100644
--- a/src/theory/quantifiers/quant_relevance.h
+++ b/src/theory/quantifiers/quant_relevance.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANT_RELEVANCE_H
-#define CVC4__THEORY__QUANT_RELEVANCE_H
+#ifndef CVC5__THEORY__QUANT_RELEVANCE_H
+#define CVC5__THEORY__QUANT_RELEVANCE_H
#include <map>
@@ -65,4 +65,4 @@ class QuantRelevance : public QuantifiersUtil
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANT_RELEVANCE_H */
+#endif /* CVC5__THEORY__QUANT_RELEVANCE_H */
diff --git a/src/theory/quantifiers/quant_rep_bound_ext.h b/src/theory/quantifiers/quant_rep_bound_ext.h
index 6fe0faefa..df0cd2fd7 100644
--- a/src/theory/quantifiers/quant_rep_bound_ext.h
+++ b/src/theory/quantifiers/quant_rep_bound_ext.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__QUANT_REP_BOUND_EXT_H
-#define CVC4__THEORY__QUANTIFIERS__QUANT_REP_BOUND_EXT_H
+#ifndef CVC5__THEORY__QUANTIFIERS__QUANT_REP_BOUND_EXT_H
+#define CVC5__THEORY__QUANTIFIERS__QUANT_REP_BOUND_EXT_H
#include <map>
@@ -69,4 +69,4 @@ class QRepBoundExt : public RepBoundExt
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__FIRST_ORDER_MODEL_H */
+#endif /* CVC5__FIRST_ORDER_MODEL_H */
diff --git a/src/theory/quantifiers/quant_split.h b/src/theory/quantifiers/quant_split.h
index ee961cbbc..de3086cca 100644
--- a/src/theory/quantifiers/quant_split.h
+++ b/src/theory/quantifiers/quant_split.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANT_SPLIT_H
-#define CVC4__THEORY__QUANT_SPLIT_H
+#ifndef CVC5__THEORY__QUANT_SPLIT_H
+#define CVC5__THEORY__QUANT_SPLIT_H
#include "context/cdo.h"
#include "theory/quantifiers/quant_module.h"
diff --git a/src/theory/quantifiers/quant_util.h b/src/theory/quantifiers/quant_util.h
index 90955226c..3fb152a51 100644
--- a/src/theory/quantifiers/quant_util.h
+++ b/src/theory/quantifiers/quant_util.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANT_UTIL_H
-#define CVC4__THEORY__QUANT_UTIL_H
+#ifndef CVC5__THEORY__QUANT_UTIL_H
+#define CVC5__THEORY__QUANT_UTIL_H
#include <iostream>
#include <map>
@@ -82,4 +82,4 @@ public:
}
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANT_UTIL_H */
+#endif /* CVC5__THEORY__QUANT_UTIL_H */
diff --git a/src/theory/quantifiers/quantifiers_attributes.h b/src/theory/quantifiers/quantifiers_attributes.h
index 2fb294abe..9bbe0e271 100644
--- a/src/theory/quantifiers/quantifiers_attributes.h
+++ b/src/theory/quantifiers/quantifiers_attributes.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_ATTRIBUTES_H
-#define CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_ATTRIBUTES_H
+#ifndef CVC5__THEORY__QUANTIFIERS__QUANTIFIERS_ATTRIBUTES_H
+#define CVC5__THEORY__QUANTIFIERS__QUANTIFIERS_ATTRIBUTES_H
#include "expr/attribute.h"
#include "expr/node.h"
diff --git a/src/theory/quantifiers/quantifiers_inference_manager.h b/src/theory/quantifiers/quantifiers_inference_manager.h
index b468e0478..3072cc90d 100644
--- a/src/theory/quantifiers/quantifiers_inference_manager.h
+++ b/src/theory/quantifiers/quantifiers_inference_manager.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_INFERENCE_MANAGER_H
-#define CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_INFERENCE_MANAGER_H
+#ifndef CVC5__THEORY__QUANTIFIERS__QUANTIFIERS_INFERENCE_MANAGER_H
+#define CVC5__THEORY__QUANTIFIERS__QUANTIFIERS_INFERENCE_MANAGER_H
#include "theory/inference_manager_buffered.h"
#include "theory/quantifiers/quantifiers_state.h"
@@ -61,4 +61,4 @@ class QuantifiersInferenceManager : public InferenceManagerBuffered
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_INFERENCE_MANAGER_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__QUANTIFIERS_INFERENCE_MANAGER_H */
diff --git a/src/theory/quantifiers/quantifiers_modules.h b/src/theory/quantifiers/quantifiers_modules.h
index c52da79a7..745ff7bbd 100644
--- a/src/theory/quantifiers/quantifiers_modules.h
+++ b/src/theory/quantifiers/quantifiers_modules.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_MODULES_H
-#define CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_MODULES_H
+#ifndef CVC5__THEORY__QUANTIFIERS__QUANTIFIERS_MODULES_H
+#define CVC5__THEORY__QUANTIFIERS__QUANTIFIERS_MODULES_H
#include "theory/quantifiers/alpha_equivalence.h"
#include "theory/quantifiers/conjecture_generator.h"
@@ -96,4 +96,4 @@ class QuantifiersModules
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_MODULES_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__QUANTIFIERS_MODULES_H */
diff --git a/src/theory/quantifiers/quantifiers_registry.h b/src/theory/quantifiers/quantifiers_registry.h
index 383934c15..b8479596d 100644
--- a/src/theory/quantifiers/quantifiers_registry.h
+++ b/src/theory/quantifiers/quantifiers_registry.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_REGISTRY_H
-#define CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_REGISTRY_H
+#ifndef CVC5__THEORY__QUANTIFIERS__QUANTIFIERS_REGISTRY_H
+#define CVC5__THEORY__QUANTIFIERS__QUANTIFIERS_REGISTRY_H
#include "expr/node.h"
#include "theory/quantifiers/quant_bound_inference.h"
@@ -131,4 +131,4 @@ class QuantifiersRegistry : public QuantifiersUtil
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_REGISTRY_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__QUANTIFIERS_REGISTRY_H */
diff --git a/src/theory/quantifiers/quantifiers_rewriter.h b/src/theory/quantifiers/quantifiers_rewriter.h
index c45bc9e88..4b55d3e17 100644
--- a/src/theory/quantifiers/quantifiers_rewriter.h
+++ b/src/theory/quantifiers/quantifiers_rewriter.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_REWRITER_H
-#define CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_REWRITER_H
+#ifndef CVC5__THEORY__QUANTIFIERS__QUANTIFIERS_REWRITER_H
+#define CVC5__THEORY__QUANTIFIERS__QUANTIFIERS_REWRITER_H
#include "theory/theory_rewriter.h"
#include "theory/trust_node.h"
@@ -305,4 +305,4 @@ public:
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_REWRITER_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__QUANTIFIERS_REWRITER_H */
diff --git a/src/theory/quantifiers/quantifiers_state.h b/src/theory/quantifiers/quantifiers_state.h
index 623d52289..d540923ac 100644
--- a/src/theory/quantifiers/quantifiers_state.h
+++ b/src/theory/quantifiers/quantifiers_state.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_STATE_H
-#define CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_STATE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__QUANTIFIERS_STATE_H
+#define CVC5__THEORY__QUANTIFIERS__QUANTIFIERS_STATE_H
#include "theory/quantifiers/quantifiers_statistics.h"
#include "theory/theory.h"
@@ -88,4 +88,4 @@ class QuantifiersState : public TheoryState
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_STATE_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__QUANTIFIERS_STATE_H */
diff --git a/src/theory/quantifiers/quantifiers_statistics.h b/src/theory/quantifiers/quantifiers_statistics.h
index 9eccf3ce6..8ff97d83e 100644
--- a/src/theory/quantifiers/quantifiers_statistics.h
+++ b/src/theory/quantifiers/quantifiers_statistics.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_STATISTICS_H
-#define CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_STATISTICS_H
+#ifndef CVC5__THEORY__QUANTIFIERS__QUANTIFIERS_STATISTICS_H
+#define CVC5__THEORY__QUANTIFIERS__QUANTIFIERS_STATISTICS_H
#include "util/statistics_registry.h"
#include "util/stats_timer.h"
@@ -49,4 +49,4 @@ class QuantifiersStatistics
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_STATISTICS_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__QUANTIFIERS_STATISTICS_H */
diff --git a/src/theory/quantifiers/query_generator.h b/src/theory/quantifiers/query_generator.h
index cf10b42da..b3f1fae54 100644
--- a/src/theory/quantifiers/query_generator.h
+++ b/src/theory/quantifiers/query_generator.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__QUERY_GENERATOR_H
-#define CVC4__THEORY__QUANTIFIERS__QUERY_GENERATOR_H
+#ifndef CVC5__THEORY__QUANTIFIERS__QUERY_GENERATOR_H
+#define CVC5__THEORY__QUANTIFIERS__QUERY_GENERATOR_H
#include <map>
#include <unordered_set>
@@ -118,4 +118,4 @@ class QueryGenerator : public ExprMiner
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS___H */
+#endif /* CVC5__THEORY__QUANTIFIERS___H */
diff --git a/src/theory/quantifiers/relevant_domain.h b/src/theory/quantifiers/relevant_domain.h
index 807e4c4a2..f9958763c 100644
--- a/src/theory/quantifiers/relevant_domain.h
+++ b/src/theory/quantifiers/relevant_domain.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__RELEVANT_DOMAIN_H
-#define CVC4__THEORY__QUANTIFIERS__RELEVANT_DOMAIN_H
+#ifndef CVC5__THEORY__QUANTIFIERS__RELEVANT_DOMAIN_H
+#define CVC5__THEORY__QUANTIFIERS__RELEVANT_DOMAIN_H
#include "theory/quantifiers/first_order_model.h"
#include "theory/quantifiers/quant_util.h"
@@ -172,4 +172,4 @@ class RelevantDomain : public QuantifiersUtil
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__RELEVANT_DOMAIN_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__RELEVANT_DOMAIN_H */
diff --git a/src/theory/quantifiers/single_inv_partition.h b/src/theory/quantifiers/single_inv_partition.h
index 604c711ad..caf24acfe 100644
--- a/src/theory/quantifiers/single_inv_partition.h
+++ b/src/theory/quantifiers/single_inv_partition.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SINGLE_INV_PARTITION_H
-#define CVC4__THEORY__QUANTIFIERS__SINGLE_INV_PARTITION_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SINGLE_INV_PARTITION_H
+#define CVC5__THEORY__QUANTIFIERS__SINGLE_INV_PARTITION_H
#include <map>
#include <vector>
@@ -294,4 +294,4 @@ class SingleInvocationPartition
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SINGLE_INV_PARTITION_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SINGLE_INV_PARTITION_H */
diff --git a/src/theory/quantifiers/skolemize.h b/src/theory/quantifiers/skolemize.h
index 4c4d770f3..f92627138 100644
--- a/src/theory/quantifiers/skolemize.h
+++ b/src/theory/quantifiers/skolemize.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SKOLEMIZE_H
-#define CVC4__THEORY__QUANTIFIERS__SKOLEMIZE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SKOLEMIZE_H
+#define CVC5__THEORY__QUANTIFIERS__SKOLEMIZE_H
#include <unordered_map>
#include <unordered_set>
@@ -159,4 +159,4 @@ class Skolemize
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SKOLEMIZE_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SKOLEMIZE_H */
diff --git a/src/theory/quantifiers/solution_filter.h b/src/theory/quantifiers/solution_filter.h
index bf3d9bddc..5b191b2be 100644
--- a/src/theory/quantifiers/solution_filter.h
+++ b/src/theory/quantifiers/solution_filter.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SOLUTION_FILTER_H
-#define CVC4__THEORY__QUANTIFIERS__SOLUTION_FILTER_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SOLUTION_FILTER_H
+#define CVC5__THEORY__QUANTIFIERS__SOLUTION_FILTER_H
#include <map>
#include <unordered_set>
@@ -72,4 +72,4 @@ class SolutionFilterStrength : public ExprMiner
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SOLUTION_FILTER_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SOLUTION_FILTER_H */
diff --git a/src/theory/quantifiers/sygus/ce_guided_single_inv.h b/src/theory/quantifiers/sygus/ce_guided_single_inv.h
index ca83bf973..d9a3a3b02 100644
--- a/src/theory/quantifiers/sygus/ce_guided_single_inv.h
+++ b/src/theory/quantifiers/sygus/ce_guided_single_inv.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__CE_GUIDED_SINGLE_INV_H
-#define CVC4__THEORY__QUANTIFIERS__CE_GUIDED_SINGLE_INV_H
+#ifndef CVC5__THEORY__QUANTIFIERS__CE_GUIDED_SINGLE_INV_H
+#define CVC5__THEORY__QUANTIFIERS__CE_GUIDED_SINGLE_INV_H
#include "context/cdlist.h"
#include "expr/subs.h"
diff --git a/src/theory/quantifiers/sygus/cegis.h b/src/theory/quantifiers/sygus/cegis.h
index f728d3d7e..883151fe6 100644
--- a/src/theory/quantifiers/sygus/cegis.h
+++ b/src/theory/quantifiers/sygus/cegis.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__CEGIS_H
-#define CVC4__THEORY__QUANTIFIERS__CEGIS_H
+#ifndef CVC5__THEORY__QUANTIFIERS__CEGIS_H
+#define CVC5__THEORY__QUANTIFIERS__CEGIS_H
#include <map>
#include "theory/quantifiers/sygus/sygus_module.h"
@@ -229,4 +229,4 @@ class Cegis : public SygusModule
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__CEGIS_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__CEGIS_H */
diff --git a/src/theory/quantifiers/sygus/cegis_core_connective.h b/src/theory/quantifiers/sygus/cegis_core_connective.h
index 2abce835a..0f42ee13a 100644
--- a/src/theory/quantifiers/sygus/cegis_core_connective.h
+++ b/src/theory/quantifiers/sygus/cegis_core_connective.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__CEGIS_CORE_CONNECTIVE_H
-#define CVC4__THEORY__QUANTIFIERS__CEGIS_CORE_CONNECTIVE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__CEGIS_CORE_CONNECTIVE_H
+#define CVC5__THEORY__QUANTIFIERS__CEGIS_CORE_CONNECTIVE_H
#include <unordered_set>
@@ -401,4 +401,4 @@ class CegisCoreConnective : public Cegis
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_REPAIR_CONST_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SYGUS_REPAIR_CONST_H */
diff --git a/src/theory/quantifiers/sygus/cegis_unif.h b/src/theory/quantifiers/sygus/cegis_unif.h
index a543bfda0..16a255cc9 100644
--- a/src/theory/quantifiers/sygus/cegis_unif.h
+++ b/src/theory/quantifiers/sygus/cegis_unif.h
@@ -13,8 +13,8 @@
**/
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS__CEGIS_UNIF_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS__CEGIS_UNIF_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS__CEGIS_UNIF_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS__CEGIS_UNIF_H
#include <map>
#include <vector>
diff --git a/src/theory/quantifiers/sygus/enum_stream_substitution.h b/src/theory/quantifiers/sygus/enum_stream_substitution.h
index a72481a38..15aeb1cef 100644
--- a/src/theory/quantifiers/sygus/enum_stream_substitution.h
+++ b/src/theory/quantifiers/sygus/enum_stream_substitution.h
@@ -14,8 +14,8 @@
**/
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS__ENUM_STREAM_SUBSTITUTION_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS__ENUM_STREAM_SUBSTITUTION_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS__ENUM_STREAM_SUBSTITUTION_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS__ENUM_STREAM_SUBSTITUTION_H
#include "expr/node.h"
#include "theory/quantifiers/sygus/synth_conjecture.h"
diff --git a/src/theory/quantifiers/sygus/example_eval_cache.h b/src/theory/quantifiers/sygus/example_eval_cache.h
index 1a70369a5..4f9fb0810 100644
--- a/src/theory/quantifiers/sygus/example_eval_cache.h
+++ b/src/theory/quantifiers/sygus/example_eval_cache.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__EXAMPLE_EVAL_CACHE_H
-#define CVC4__THEORY__QUANTIFIERS__EXAMPLE_EVAL_CACHE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__EXAMPLE_EVAL_CACHE_H
+#define CVC5__THEORY__QUANTIFIERS__EXAMPLE_EVAL_CACHE_H
#include "expr/node_trie.h"
#include "theory/quantifiers/sygus/example_infer.h"
diff --git a/src/theory/quantifiers/sygus/example_infer.h b/src/theory/quantifiers/sygus/example_infer.h
index dd2bf8a0a..06425df5a 100644
--- a/src/theory/quantifiers/sygus/example_infer.h
+++ b/src/theory/quantifiers/sygus/example_infer.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__EXAMPLE_INFER_H
-#define CVC4__THEORY__QUANTIFIERS__EXAMPLE_INFER_H
+#ifndef CVC5__THEORY__QUANTIFIERS__EXAMPLE_INFER_H
+#define CVC5__THEORY__QUANTIFIERS__EXAMPLE_INFER_H
#include "theory/quantifiers/sygus/sygus_unif_io.h"
#include "theory/quantifiers/sygus/term_database_sygus.h"
diff --git a/src/theory/quantifiers/sygus/example_min_eval.h b/src/theory/quantifiers/sygus/example_min_eval.h
index 2105faf2b..00db03b73 100644
--- a/src/theory/quantifiers/sygus/example_min_eval.h
+++ b/src/theory/quantifiers/sygus/example_min_eval.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__EXAMPLE_MIN_EVAL_H
-#define CVC4__THEORY__QUANTIFIERS__EXAMPLE_MIN_EVAL_H
+#ifndef CVC5__THEORY__QUANTIFIERS__EXAMPLE_MIN_EVAL_H
+#define CVC5__THEORY__QUANTIFIERS__EXAMPLE_MIN_EVAL_H
#include <vector>
diff --git a/src/theory/quantifiers/sygus/rcons_obligation_info.h b/src/theory/quantifiers/sygus/rcons_obligation_info.h
index 3bded2a90..1de76cae8 100644
--- a/src/theory/quantifiers/sygus/rcons_obligation_info.h
+++ b/src/theory/quantifiers/sygus/rcons_obligation_info.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__RCONS_OBLIGATION_INFO_H
-#define CVC4__THEORY__QUANTIFIERS__RCONS_OBLIGATION_INFO_H
+#ifndef CVC5__THEORY__QUANTIFIERS__RCONS_OBLIGATION_INFO_H
+#define CVC5__THEORY__QUANTIFIERS__RCONS_OBLIGATION_INFO_H
#include "expr/node.h"
@@ -147,4 +147,4 @@ class RConsObligationInfo
} // namespace theory
} // namespace cvc5
-#endif // CVC4__THEORY__QUANTIFIERS__RCONS_OBLIGATION_INFO_H
+#endif // CVC5__THEORY__QUANTIFIERS__RCONS_OBLIGATION_INFO_H
diff --git a/src/theory/quantifiers/sygus/rcons_type_info.h b/src/theory/quantifiers/sygus/rcons_type_info.h
index 974897023..353165405 100644
--- a/src/theory/quantifiers/sygus/rcons_type_info.h
+++ b/src/theory/quantifiers/sygus/rcons_type_info.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__RCONS_TYPE_INFO_H
-#define CVC4__THEORY__QUANTIFIERS__RCONS_TYPE_INFO_H
+#ifndef CVC5__THEORY__QUANTIFIERS__RCONS_TYPE_INFO_H
+#define CVC5__THEORY__QUANTIFIERS__RCONS_TYPE_INFO_H
#include "theory/quantifiers/sygus/sygus_enumerator.h"
@@ -99,4 +99,4 @@ class RConsTypeInfo
} // namespace theory
} // namespace cvc5
-#endif // CVC4__THEORY__QUANTIFIERS__RCONS_TYPE_INFO_H
+#endif // CVC5__THEORY__QUANTIFIERS__RCONS_TYPE_INFO_H
diff --git a/src/theory/quantifiers/sygus/sygus_abduct.h b/src/theory/quantifiers/sygus/sygus_abduct.h
index 634a9a4bd..c1239acfa 100644
--- a/src/theory/quantifiers/sygus/sygus_abduct.h
+++ b/src/theory/quantifiers/sygus/sygus_abduct.h
@@ -13,8 +13,8 @@
** abduction problem.
**/
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_ABDUCT_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS_ABDUCT_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS_ABDUCT_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS_ABDUCT_H
#include <string>
#include <vector>
@@ -87,4 +87,4 @@ class SygusAbduct
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_ABDUCT_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SYGUS_ABDUCT_H */
diff --git a/src/theory/quantifiers/sygus/sygus_enumerator.h b/src/theory/quantifiers/sygus/sygus_enumerator.h
index f1ef115f8..788378467 100644
--- a/src/theory/quantifiers/sygus/sygus_enumerator.h
+++ b/src/theory/quantifiers/sygus/sygus_enumerator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_H
#include <map>
#include <unordered_set>
@@ -508,4 +508,4 @@ class SygusEnumerator : public EnumValGenerator
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_H */
diff --git a/src/theory/quantifiers/sygus/sygus_enumerator_basic.h b/src/theory/quantifiers/sygus/sygus_enumerator_basic.h
index 1f489eafc..d4d5e8354 100644
--- a/src/theory/quantifiers/sygus/sygus_enumerator_basic.h
+++ b/src/theory/quantifiers/sygus/sygus_enumerator_basic.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_BASIC_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_BASIC_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_BASIC_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_BASIC_H
#include <map>
#include <unordered_set>
@@ -67,4 +67,4 @@ class EnumValGeneratorBasic : public EnumValGenerator
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_BASIC_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_BASIC_H */
diff --git a/src/theory/quantifiers/sygus/sygus_eval_unfold.h b/src/theory/quantifiers/sygus/sygus_eval_unfold.h
index 628f01c40..edbd53d48 100644
--- a/src/theory/quantifiers/sygus/sygus_eval_unfold.h
+++ b/src/theory/quantifiers/sygus/sygus_eval_unfold.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_EVAL_UNFOLD_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS_EVAL_UNFOLD_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS_EVAL_UNFOLD_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS_EVAL_UNFOLD_H
#include <map>
#include "expr/node.h"
@@ -156,4 +156,4 @@ class SygusEvalUnfold
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_EVAL_UNFOLD_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SYGUS_EVAL_UNFOLD_H */
diff --git a/src/theory/quantifiers/sygus/sygus_explain.h b/src/theory/quantifiers/sygus/sygus_explain.h
index 477857794..3da36f603 100644
--- a/src/theory/quantifiers/sygus/sygus_explain.h
+++ b/src/theory/quantifiers/sygus/sygus_explain.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_EXPLAIN_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS_EXPLAIN_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS_EXPLAIN_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS_EXPLAIN_H
#include <vector>
@@ -243,4 +243,4 @@ class SygusExplain
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_EXPLAIN_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SYGUS_EXPLAIN_H */
diff --git a/src/theory/quantifiers/sygus/sygus_grammar_cons.h b/src/theory/quantifiers/sygus/sygus_grammar_cons.h
index 56f469fef..d028a2a76 100644
--- a/src/theory/quantifiers/sygus/sygus_grammar_cons.h
+++ b/src/theory/quantifiers/sygus/sygus_grammar_cons.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_CONS_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_CONS_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_CONS_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_CONS_H
#include <map>
#include <vector>
diff --git a/src/theory/quantifiers/sygus/sygus_grammar_norm.h b/src/theory/quantifiers/sygus/sygus_grammar_norm.h
index eda34a251..eba97bbc6 100644
--- a/src/theory/quantifiers/sygus/sygus_grammar_norm.h
+++ b/src/theory/quantifiers/sygus/sygus_grammar_norm.h
@@ -14,8 +14,8 @@
**/
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_NORM_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_NORM_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_NORM_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_NORM_H
#include <map>
#include <memory>
diff --git a/src/theory/quantifiers/sygus/sygus_grammar_red.h b/src/theory/quantifiers/sygus/sygus_grammar_red.h
index 2144102e0..e90455274 100644
--- a/src/theory/quantifiers/sygus/sygus_grammar_red.h
+++ b/src/theory/quantifiers/sygus/sygus_grammar_red.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_RED_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_RED_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_RED_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_RED_H
#include <map>
#include <vector>
@@ -120,4 +120,4 @@ class SygusRedundantCons
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_RED_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_RED_H */
diff --git a/src/theory/quantifiers/sygus/sygus_interpol.h b/src/theory/quantifiers/sygus/sygus_interpol.h
index c63d096b8..46ebc316d 100644
--- a/src/theory/quantifiers/sygus/sygus_interpol.h
+++ b/src/theory/quantifiers/sygus/sygus_interpol.h
@@ -13,8 +13,8 @@
** conjecture into an interpolation problem, and solve it.
**/
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_INTERPOL_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS_INTERPOL_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS_INTERPOL_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS_INTERPOL_H
#include <string>
#include <vector>
@@ -215,4 +215,4 @@ class SygusInterpol
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_INTERPOL_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SYGUS_INTERPOL_H */
diff --git a/src/theory/quantifiers/sygus/sygus_invariance.h b/src/theory/quantifiers/sygus/sygus_invariance.h
index df2e189e3..4395c01c1 100644
--- a/src/theory/quantifiers/sygus/sygus_invariance.h
+++ b/src/theory/quantifiers/sygus/sygus_invariance.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_INVARIANCE_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS_INVARIANCE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS_INVARIANCE_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS_INVARIANCE_H
#include <unordered_map>
#include <vector>
@@ -300,4 +300,4 @@ class NegContainsSygusInvarianceTest : public SygusInvarianceTest
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_INVARIANCE_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SYGUS_INVARIANCE_H */
diff --git a/src/theory/quantifiers/sygus/sygus_module.h b/src/theory/quantifiers/sygus/sygus_module.h
index 90460eeed..87ce27ac4 100644
--- a/src/theory/quantifiers/sygus/sygus_module.h
+++ b/src/theory/quantifiers/sygus/sygus_module.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_MODULE_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS_MODULE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS_MODULE_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS_MODULE_H
#include <vector>
@@ -159,4 +159,4 @@ class SygusModule
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_MODULE_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SYGUS_MODULE_H */
diff --git a/src/theory/quantifiers/sygus/sygus_pbe.h b/src/theory/quantifiers/sygus/sygus_pbe.h
index a56a22838..263db20fc 100644
--- a/src/theory/quantifiers/sygus/sygus_pbe.h
+++ b/src/theory/quantifiers/sygus/sygus_pbe.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_PBE_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS_PBE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS_PBE_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS_PBE_H
#include "theory/quantifiers/sygus/sygus_module.h"
diff --git a/src/theory/quantifiers/sygus/sygus_process_conj.h b/src/theory/quantifiers/sygus/sygus_process_conj.h
index 6f6e25d0c..ca00a0ec3 100644
--- a/src/theory/quantifiers/sygus/sygus_process_conj.h
+++ b/src/theory/quantifiers/sygus/sygus_process_conj.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_PROCESS_CONJ_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS_PROCESS_CONJ_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS_PROCESS_CONJ_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS_PROCESS_CONJ_H
#include <map>
#include <unordered_map>
diff --git a/src/theory/quantifiers/sygus/sygus_qe_preproc.h b/src/theory/quantifiers/sygus/sygus_qe_preproc.h
index 26bbf2f92..c1d9bf85c 100644
--- a/src/theory/quantifiers/sygus/sygus_qe_preproc.h
+++ b/src/theory/quantifiers/sygus/sygus_qe_preproc.h
@@ -12,8 +12,8 @@
** \brief Sygus quantifier elimination preprocessor
**/
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS__SYGUS_QE_PREPROC_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS__SYGUS_QE_PREPROC_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS__SYGUS_QE_PREPROC_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS__SYGUS_QE_PREPROC_H
#include "expr/node.h"
@@ -47,4 +47,4 @@ class SygusQePreproc
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS__SYGUS_QE_PREPROC_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SYGUS__SYGUS_QE_PREPROC_H */
diff --git a/src/theory/quantifiers/sygus/sygus_reconstruct.h b/src/theory/quantifiers/sygus/sygus_reconstruct.h
index 1f9037a26..433f20d23 100644
--- a/src/theory/quantifiers/sygus/sygus_reconstruct.h
+++ b/src/theory/quantifiers/sygus/sygus_reconstruct.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_RECONSTRUCT_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS_RECONSTRUCT_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS_RECONSTRUCT_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS_RECONSTRUCT_H
#include <map>
#include <vector>
@@ -309,4 +309,4 @@ class SygusReconstruct : public expr::NotifyMatch
} // namespace theory
} // namespace cvc5
-#endif // CVC4__THEORY__QUANTIFIERS__SYGUS_RECONSTRUCT_H
+#endif // CVC5__THEORY__QUANTIFIERS__SYGUS_RECONSTRUCT_H
diff --git a/src/theory/quantifiers/sygus/sygus_repair_const.h b/src/theory/quantifiers/sygus/sygus_repair_const.h
index b79fa4177..1df5ab821 100644
--- a/src/theory/quantifiers/sygus/sygus_repair_const.h
+++ b/src/theory/quantifiers/sygus/sygus_repair_const.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_REPAIR_CONST_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS_REPAIR_CONST_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS_REPAIR_CONST_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS_REPAIR_CONST_H
#include <unordered_set>
#include "expr/node.h"
@@ -211,4 +211,4 @@ class SygusRepairConst
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_REPAIR_CONST_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SYGUS_REPAIR_CONST_H */
diff --git a/src/theory/quantifiers/sygus/sygus_stats.h b/src/theory/quantifiers/sygus/sygus_stats.h
index 7a8ae8ce9..d8a487d2f 100644
--- a/src/theory/quantifiers/sygus/sygus_stats.h
+++ b/src/theory/quantifiers/sygus/sygus_stats.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_STATS_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS_STATS_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS_STATS_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS_STATS_H
#include "util/statistics_registry.h"
diff --git a/src/theory/quantifiers/sygus/sygus_unif.h b/src/theory/quantifiers/sygus/sygus_unif.h
index 1ed81194a..ccd803731 100644
--- a/src/theory/quantifiers/sygus/sygus_unif.h
+++ b/src/theory/quantifiers/sygus/sygus_unif.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS_UNIF_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS_UNIF_H
#include <map>
#include "expr/node.h"
@@ -195,4 +195,4 @@ class SygusUnif
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SYGUS_UNIF_H */
diff --git a/src/theory/quantifiers/sygus/sygus_unif_io.h b/src/theory/quantifiers/sygus/sygus_unif_io.h
index 825e5741d..5fdcdcf35 100644
--- a/src/theory/quantifiers/sygus/sygus_unif_io.h
+++ b/src/theory/quantifiers/sygus/sygus_unif_io.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_IO_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_IO_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS_UNIF_IO_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS_UNIF_IO_H
#include <map>
#include "theory/quantifiers/sygus/sygus_unif.h"
@@ -470,4 +470,4 @@ class SygusUnifIo : public SygusUnif
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_IO_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SYGUS_UNIF_IO_H */
diff --git a/src/theory/quantifiers/sygus/sygus_unif_rl.h b/src/theory/quantifiers/sygus/sygus_unif_rl.h
index 51c49cbef..e61ac5b73 100644
--- a/src/theory/quantifiers/sygus/sygus_unif_rl.h
+++ b/src/theory/quantifiers/sygus/sygus_unif_rl.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_RL_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_RL_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS_UNIF_RL_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS_UNIF_RL_H
#include <map>
#include "options/main_options.h"
@@ -445,4 +445,4 @@ class SygusUnifRl : public SygusUnif
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_RL_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SYGUS_UNIF_RL_H */
diff --git a/src/theory/quantifiers/sygus/sygus_unif_strat.h b/src/theory/quantifiers/sygus/sygus_unif_strat.h
index 2508fdc9b..39b2fc80c 100644
--- a/src/theory/quantifiers/sygus/sygus_unif_strat.h
+++ b/src/theory/quantifiers/sygus/sygus_unif_strat.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_STRAT_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_STRAT_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS_UNIF_STRAT_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS_UNIF_STRAT_H
#include <map>
#include "expr/node.h"
@@ -430,4 +430,4 @@ class SygusUnifStrategy
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SYGUS_UNIF_H */
diff --git a/src/theory/quantifiers/sygus/sygus_utils.h b/src/theory/quantifiers/sygus/sygus_utils.h
index 0ec497789..28ef682e1 100644
--- a/src/theory/quantifiers/sygus/sygus_utils.h
+++ b/src/theory/quantifiers/sygus/sygus_utils.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS__SYGUS_UTILS_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS__SYGUS_UTILS_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS__SYGUS_UTILS_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS__SYGUS_UTILS_H
#include <vector>
@@ -112,4 +112,4 @@ class SygusUtils
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS__SYGUS_UTILS_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SYGUS__SYGUS_UTILS_H */
diff --git a/src/theory/quantifiers/sygus/synth_conjecture.h b/src/theory/quantifiers/sygus/synth_conjecture.h
index 7fd1ae4b3..2d462426b 100644
--- a/src/theory/quantifiers/sygus/synth_conjecture.h
+++ b/src/theory/quantifiers/sygus/synth_conjecture.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYNTH_CONJECTURE_H
-#define CVC4__THEORY__QUANTIFIERS__SYNTH_CONJECTURE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYNTH_CONJECTURE_H
+#define CVC5__THEORY__QUANTIFIERS__SYNTH_CONJECTURE_H
#include <memory>
diff --git a/src/theory/quantifiers/sygus/synth_engine.h b/src/theory/quantifiers/sygus/synth_engine.h
index a5fde8476..a590e930c 100644
--- a/src/theory/quantifiers/sygus/synth_engine.h
+++ b/src/theory/quantifiers/sygus/synth_engine.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYNTH_ENGINE_H
-#define CVC4__THEORY__QUANTIFIERS__SYNTH_ENGINE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYNTH_ENGINE_H
+#define CVC5__THEORY__QUANTIFIERS__SYNTH_ENGINE_H
#include "context/cdhashmap.h"
#include "theory/quantifiers/quant_module.h"
diff --git a/src/theory/quantifiers/sygus/template_infer.h b/src/theory/quantifiers/sygus/template_infer.h
index 1ab97b651..f8c8e3c17 100644
--- a/src/theory/quantifiers/sygus/template_infer.h
+++ b/src/theory/quantifiers/sygus/template_infer.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS__TEMPLATE_INFER_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS__TEMPLATE_INFER_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS__TEMPLATE_INFER_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS__TEMPLATE_INFER_H
#include <map>
diff --git a/src/theory/quantifiers/sygus/term_database_sygus.h b/src/theory/quantifiers/sygus/term_database_sygus.h
index fb7e38ff8..fc937c73e 100644
--- a/src/theory/quantifiers/sygus/term_database_sygus.h
+++ b/src/theory/quantifiers/sygus/term_database_sygus.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_SYGUS_H
-#define CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_SYGUS_H
+#ifndef CVC5__THEORY__QUANTIFIERS__TERM_DATABASE_SYGUS_H
+#define CVC5__THEORY__QUANTIFIERS__TERM_DATABASE_SYGUS_H
#include <unordered_set>
@@ -469,4 +469,4 @@ class TermDbSygus {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__TERM_DATABASE_H */
diff --git a/src/theory/quantifiers/sygus/transition_inference.h b/src/theory/quantifiers/sygus/transition_inference.h
index 8ddc1a320..b38752cb9 100644
--- a/src/theory/quantifiers/sygus/transition_inference.h
+++ b/src/theory/quantifiers/sygus/transition_inference.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__TRANSITION_INFERENCE_H
-#define CVC4__THEORY__QUANTIFIERS__TRANSITION_INFERENCE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__TRANSITION_INFERENCE_H
+#define CVC5__THEORY__QUANTIFIERS__TRANSITION_INFERENCE_H
#include <map>
#include <vector>
diff --git a/src/theory/quantifiers/sygus/type_info.h b/src/theory/quantifiers/sygus/type_info.h
index 79413a03c..444b61927 100644
--- a/src/theory/quantifiers/sygus/type_info.h
+++ b/src/theory/quantifiers/sygus/type_info.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS__TYPE_INFO_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS__TYPE_INFO_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS__TYPE_INFO_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS__TYPE_INFO_H
#include <map>
@@ -255,4 +255,4 @@ class SygusTypeInfo
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS__TYPE_INFO_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SYGUS__TYPE_INFO_H */
diff --git a/src/theory/quantifiers/sygus/type_node_id_trie.h b/src/theory/quantifiers/sygus/type_node_id_trie.h
index 6311cbabe..7b3ca4a70 100644
--- a/src/theory/quantifiers/sygus/type_node_id_trie.h
+++ b/src/theory/quantifiers/sygus/type_node_id_trie.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS__TYPE_NODE_ID_TRIE_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS__TYPE_NODE_ID_TRIE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS__TYPE_NODE_ID_TRIE_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS__TYPE_NODE_ID_TRIE_H
#include <map>
#include <vector>
@@ -50,4 +50,4 @@ class TypeNodeIdTrie
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS__TYPE_NODE_ID_TRIE_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SYGUS__TYPE_NODE_ID_TRIE_H */
diff --git a/src/theory/quantifiers/sygus_inst.h b/src/theory/quantifiers/sygus_inst.h
index 35b66437b..70dae5a74 100644
--- a/src/theory/quantifiers/sygus_inst.h
+++ b/src/theory/quantifiers/sygus_inst.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_INST_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS_INST_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS_INST_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS_INST_H
#include <unordered_map>
#include <unordered_set>
diff --git a/src/theory/quantifiers/sygus_sampler.h b/src/theory/quantifiers/sygus_sampler.h
index 7350f4845..932eae041 100644
--- a/src/theory/quantifiers/sygus_sampler.h
+++ b/src/theory/quantifiers/sygus_sampler.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__SYGUS_SAMPLER_H
-#define CVC4__THEORY__QUANTIFIERS__SYGUS_SAMPLER_H
+#ifndef CVC5__THEORY__QUANTIFIERS__SYGUS_SAMPLER_H
+#define CVC5__THEORY__QUANTIFIERS__SYGUS_SAMPLER_H
#include <map>
#include "theory/evaluator.h"
@@ -322,4 +322,4 @@ class SygusSampler : public LazyTrieEvaluator
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_SAMPLER_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__SYGUS_SAMPLER_H */
diff --git a/src/theory/quantifiers/term_database.h b/src/theory/quantifiers/term_database.h
index 2077b3d2d..818e10c71 100644
--- a/src/theory/quantifiers/term_database.h
+++ b/src/theory/quantifiers/term_database.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_H
-#define CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_H
+#ifndef CVC5__THEORY__QUANTIFIERS__TERM_DATABASE_H
+#define CVC5__THEORY__QUANTIFIERS__TERM_DATABASE_H
#include <map>
#include <unordered_map>
@@ -424,4 +424,4 @@ class TermDb : public QuantifiersUtil {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__TERM_DATABASE_H */
diff --git a/src/theory/quantifiers/term_enumeration.h b/src/theory/quantifiers/term_enumeration.h
index bd545ff50..2257d3b60 100644
--- a/src/theory/quantifiers/term_enumeration.h
+++ b/src/theory/quantifiers/term_enumeration.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__TERM_ENUMERATION_H
-#define CVC4__THEORY__QUANTIFIERS__TERM_ENUMERATION_H
+#ifndef CVC5__THEORY__QUANTIFIERS__TERM_ENUMERATION_H
+#define CVC5__THEORY__QUANTIFIERS__TERM_ENUMERATION_H
#include <unordered_map>
#include <vector>
@@ -73,4 +73,4 @@ class TermEnumeration
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__TERM_ENUMERATION_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__TERM_ENUMERATION_H */
diff --git a/src/theory/quantifiers/term_pools.h b/src/theory/quantifiers/term_pools.h
index 117cffc42..f97b84756 100644
--- a/src/theory/quantifiers/term_pools.h
+++ b/src/theory/quantifiers/term_pools.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__TERM_POOLS_H
-#define CVC4__THEORY__QUANTIFIERS__TERM_POOLS_H
+#ifndef CVC5__THEORY__QUANTIFIERS__TERM_POOLS_H
+#define CVC5__THEORY__QUANTIFIERS__TERM_POOLS_H
#include <unordered_set>
#include <vector>
@@ -104,4 +104,4 @@ class TermPools : public QuantifiersUtil
} // namespace theory
} // namespace CVC5
-#endif /* CVC4__THEORY__QUANTIFIERS__TERM_POOLS_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__TERM_POOLS_H */
diff --git a/src/theory/quantifiers/term_registry.h b/src/theory/quantifiers/term_registry.h
index e6b577f4e..82f8e7698 100644
--- a/src/theory/quantifiers/term_registry.h
+++ b/src/theory/quantifiers/term_registry.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__TERM_REGISTRY_H
-#define CVC4__THEORY__QUANTIFIERS__TERM_REGISTRY_H
+#ifndef CVC5__THEORY__QUANTIFIERS__TERM_REGISTRY_H
+#define CVC5__THEORY__QUANTIFIERS__TERM_REGISTRY_H
#include <map>
#include <unordered_set>
@@ -115,4 +115,4 @@ class TermRegistry
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__TERM_REGISTRY_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__TERM_REGISTRY_H */
diff --git a/src/theory/quantifiers/term_tuple_enumerator.h b/src/theory/quantifiers/term_tuple_enumerator.h
index 4d6eb52f8..30ddde9c9 100644
--- a/src/theory/quantifiers/term_tuple_enumerator.h
+++ b/src/theory/quantifiers/term_tuple_enumerator.h
@@ -12,8 +12,8 @@
** \brief Implementation of an enumeration of tuples of terms for the purpose
*of quantifier instantiation.
**/
-#ifndef CVC4__THEORY__QUANTIFIERS__TERM_TUPLE_ENUMERATOR_H
-#define CVC4__THEORY__QUANTIFIERS__TERM_TUPLE_ENUMERATOR_H
+#ifndef CVC5__THEORY__QUANTIFIERS__TERM_TUPLE_ENUMERATOR_H
+#define CVC5__THEORY__QUANTIFIERS__TERM_TUPLE_ENUMERATOR_H
#include <vector>
#include "expr/node.h"
diff --git a/src/theory/quantifiers/term_util.h b/src/theory/quantifiers/term_util.h
index d8a881e2e..96c3949f7 100644
--- a/src/theory/quantifiers/term_util.h
+++ b/src/theory/quantifiers/term_util.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__TERM_UTIL_H
-#define CVC4__THEORY__QUANTIFIERS__TERM_UTIL_H
+#ifndef CVC5__THEORY__QUANTIFIERS__TERM_UTIL_H
+#define CVC5__THEORY__QUANTIFIERS__TERM_UTIL_H
#include <map>
@@ -208,4 +208,4 @@ public:
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__TERM_UTIL_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__TERM_UTIL_H */
diff --git a/src/theory/quantifiers/theory_quantifiers.h b/src/theory/quantifiers/theory_quantifiers.h
index 716e8cdbd..2db7c393a 100644
--- a/src/theory/quantifiers/theory_quantifiers.h
+++ b/src/theory/quantifiers/theory_quantifiers.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_H
-#define CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_H
+#ifndef CVC5__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_H
+#define CVC5__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_H
#include "expr/node.h"
#include "theory/quantifiers/proof_checker.h"
@@ -102,4 +102,4 @@ class TheoryQuantifiers : public Theory {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_H */
diff --git a/src/theory/quantifiers/theory_quantifiers_type_rules.h b/src/theory/quantifiers/theory_quantifiers_type_rules.h
index 53c077930..bafda3f88 100644
--- a/src/theory/quantifiers/theory_quantifiers_type_rules.h
+++ b/src/theory/quantifiers/theory_quantifiers_type_rules.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_TYPE_RULES_H
-#define CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_TYPE_RULES_H
+#ifndef CVC5__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_TYPE_RULES_H
+#define CVC5__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_TYPE_RULES_H
#include "expr/node.h"
#include "expr/type_node.h"
@@ -133,4 +133,4 @@ struct QuantifierInstPatternListTypeRule {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_TYPE_RULES_H */
+#endif /* CVC5__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_TYPE_RULES_H */
diff --git a/src/theory/quantifiers_engine.h b/src/theory/quantifiers_engine.h
index 101dd03e7..277a46472 100644
--- a/src/theory/quantifiers_engine.h
+++ b/src/theory/quantifiers_engine.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__QUANTIFIERS_ENGINE_H
-#define CVC4__THEORY__QUANTIFIERS_ENGINE_H
+#ifndef CVC5__THEORY__QUANTIFIERS_ENGINE_H
+#define CVC5__THEORY__QUANTIFIERS_ENGINE_H
#include <map>
#include <unordered_map>
@@ -211,4 +211,4 @@ public:
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__QUANTIFIERS_ENGINE_H */
+#endif /* CVC5__THEORY__QUANTIFIERS_ENGINE_H */
diff --git a/src/theory/relevance_manager.h b/src/theory/relevance_manager.h
index 0a00e8c6b..5de210dcf 100644
--- a/src/theory/relevance_manager.h
+++ b/src/theory/relevance_manager.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__RELEVANCE_MANAGER__H
-#define CVC4__THEORY__RELEVANCE_MANAGER__H
+#ifndef CVC5__THEORY__RELEVANCE_MANAGER__H
+#define CVC5__THEORY__RELEVANCE_MANAGER__H
#include <unordered_map>
#include <unordered_set>
@@ -151,4 +151,4 @@ class RelevanceManager
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__RELEVANCE_MANAGER__H */
+#endif /* CVC5__THEORY__RELEVANCE_MANAGER__H */
diff --git a/src/theory/rep_set.h b/src/theory/rep_set.h
index 89128f0fd..483ad9d15 100644
--- a/src/theory/rep_set.h
+++ b/src/theory/rep_set.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__REP_SET_H
-#define CVC4__THEORY__REP_SET_H
+#ifndef CVC5__THEORY__REP_SET_H
+#define CVC5__THEORY__REP_SET_H
#include <map>
#include <vector>
@@ -327,4 +327,4 @@ class RepBoundExt
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__REP_SET_H */
+#endif /* CVC5__THEORY__REP_SET_H */
diff --git a/src/theory/sep/theory_sep.h b/src/theory/sep/theory_sep.h
index 7d658352d..67a91ebd8 100644
--- a/src/theory/sep/theory_sep.h
+++ b/src/theory/sep/theory_sep.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__SEP__THEORY_SEP_H
-#define CVC4__THEORY__SEP__THEORY_SEP_H
+#ifndef CVC5__THEORY__SEP__THEORY_SEP_H
+#define CVC5__THEORY__SEP__THEORY_SEP_H
#include "context/cdhashmap.h"
#include "context/cdhashset.h"
@@ -367,4 +367,4 @@ class TheorySep : public Theory {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__SEP__THEORY_SEP_H */
+#endif /* CVC5__THEORY__SEP__THEORY_SEP_H */
diff --git a/src/theory/sep/theory_sep_rewriter.h b/src/theory/sep/theory_sep_rewriter.h
index 2ee969fc2..8cc06fec0 100644
--- a/src/theory/sep/theory_sep_rewriter.h
+++ b/src/theory/sep/theory_sep_rewriter.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__SEP__THEORY_SEP_REWRITER_H
-#define CVC4__THEORY__SEP__THEORY_SEP_REWRITER_H
+#ifndef CVC5__THEORY__SEP__THEORY_SEP_REWRITER_H
+#define CVC5__THEORY__SEP__THEORY_SEP_REWRITER_H
#include "theory/theory_rewriter.h"
#include "theory/type_enumerator.h"
@@ -51,4 +51,4 @@ class TheorySepRewriter : public TheoryRewriter
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__SEP__THEORY_SEP_REWRITER_H */
+#endif /* CVC5__THEORY__SEP__THEORY_SEP_REWRITER_H */
diff --git a/src/theory/sep/theory_sep_type_rules.h b/src/theory/sep/theory_sep_type_rules.h
index a83f036c1..6aec3636d 100644
--- a/src/theory/sep/theory_sep_type_rules.h
+++ b/src/theory/sep/theory_sep_type_rules.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__SEP__THEORY_SEP_TYPE_RULES_H
-#define CVC4__THEORY__SEP__THEORY_SEP_TYPE_RULES_H
+#ifndef CVC5__THEORY__SEP__THEORY_SEP_TYPE_RULES_H
+#define CVC5__THEORY__SEP__THEORY_SEP_TYPE_RULES_H
namespace cvc5 {
namespace theory {
@@ -111,4 +111,4 @@ struct SepNilTypeRule {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__SEP__THEORY_SEP_TYPE_RULES_H */
+#endif /* CVC5__THEORY__SEP__THEORY_SEP_TYPE_RULES_H */
diff --git a/src/theory/sets/cardinality_extension.h b/src/theory/sets/cardinality_extension.h
index c354f3f3a..7f426d003 100644
--- a/src/theory/sets/cardinality_extension.h
+++ b/src/theory/sets/cardinality_extension.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__SETS__CARDINALITY_EXTENSION_H
-#define CVC4__THEORY__SETS__CARDINALITY_EXTENSION_H
+#ifndef CVC5__THEORY__SETS__CARDINALITY_EXTENSION_H
+#define CVC5__THEORY__SETS__CARDINALITY_EXTENSION_H
#include "context/cdhashset.h"
#include "context/context.h"
diff --git a/src/theory/sets/inference_manager.h b/src/theory/sets/inference_manager.h
index 90d2ce12a..0d7d437be 100644
--- a/src/theory/sets/inference_manager.h
+++ b/src/theory/sets/inference_manager.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__SETS__INFERENCE_MANAGER_H
-#define CVC4__THEORY__SETS__INFERENCE_MANAGER_H
+#ifndef CVC5__THEORY__SETS__INFERENCE_MANAGER_H
+#define CVC5__THEORY__SETS__INFERENCE_MANAGER_H
#include "theory/inference_manager_buffered.h"
#include "theory/sets/solver_state.h"
@@ -102,4 +102,4 @@ class InferenceManager : public InferenceManagerBuffered
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__SETS__INFERENCE_MANAGER_H */
+#endif /* CVC5__THEORY__SETS__INFERENCE_MANAGER_H */
diff --git a/src/theory/sets/normal_form.h b/src/theory/sets/normal_form.h
index c0f02da7d..ae967cc39 100644
--- a/src/theory/sets/normal_form.h
+++ b/src/theory/sets/normal_form.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__SETS__NORMAL_FORM_H
-#define CVC4__THEORY__SETS__NORMAL_FORM_H
+#ifndef CVC5__THEORY__SETS__NORMAL_FORM_H
+#define CVC5__THEORY__SETS__NORMAL_FORM_H
namespace cvc5 {
namespace theory {
diff --git a/src/theory/sets/singleton_op.h b/src/theory/sets/singleton_op.h
index 7e338e518..591b9f0ee 100644
--- a/src/theory/sets/singleton_op.h
+++ b/src/theory/sets/singleton_op.h
@@ -14,8 +14,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__SINGLETON_OP_H
-#define CVC4__SINGLETON_OP_H
+#ifndef CVC5__SINGLETON_OP_H
+#define CVC5__SINGLETON_OP_H
#include <memory>
@@ -60,4 +60,4 @@ struct SingletonOpHashFunction
} // namespace cvc5
-#endif /* CVC4__SINGLETON_OP_H */
+#endif /* CVC5__SINGLETON_OP_H */
diff --git a/src/theory/sets/skolem_cache.h b/src/theory/sets/skolem_cache.h
index 17e4bda71..f3e86cc96 100644
--- a/src/theory/sets/skolem_cache.h
+++ b/src/theory/sets/skolem_cache.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__SETS__SKOLEM_CACHE_H
-#define CVC4__THEORY__SETS__SKOLEM_CACHE_H
+#ifndef CVC5__THEORY__SETS__SKOLEM_CACHE_H
+#define CVC5__THEORY__SETS__SKOLEM_CACHE_H
#include <map>
#include <unordered_set>
@@ -80,4 +80,4 @@ class SkolemCache
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__SKOLEM_CACHE_H */
+#endif /* CVC5__THEORY__STRINGS__SKOLEM_CACHE_H */
diff --git a/src/theory/sets/solver_state.h b/src/theory/sets/solver_state.h
index cbbb53d88..e6c742c86 100644
--- a/src/theory/sets/solver_state.h
+++ b/src/theory/sets/solver_state.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__SETS__THEORY_SOLVER_STATE_H
-#define CVC4__THEORY__SETS__THEORY_SOLVER_STATE_H
+#ifndef CVC5__THEORY__SETS__THEORY_SOLVER_STATE_H
+#define CVC5__THEORY__SETS__THEORY_SOLVER_STATE_H
#include <map>
#include <vector>
@@ -270,4 +270,4 @@ class SolverState : public TheoryState
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__SETS__THEORY_SOLVER_STATE_H */
+#endif /* CVC5__THEORY__SETS__THEORY_SOLVER_STATE_H */
diff --git a/src/theory/sets/term_registry.h b/src/theory/sets/term_registry.h
index 3d1035c75..2cff01b86 100644
--- a/src/theory/sets/term_registry.h
+++ b/src/theory/sets/term_registry.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__SETS__TERM_REGISTRY_H
-#define CVC4__THEORY__SETS__TERM_REGISTRY_H
+#ifndef CVC5__THEORY__SETS__TERM_REGISTRY_H
+#define CVC5__THEORY__SETS__TERM_REGISTRY_H
#include <map>
#include <vector>
@@ -91,4 +91,4 @@ class TermRegistry
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__SETS__TERM_REGISTRY_H */
+#endif /* CVC5__THEORY__SETS__TERM_REGISTRY_H */
diff --git a/src/theory/sets/theory_sets.h b/src/theory/sets/theory_sets.h
index 14f4b5699..5aa145a15 100644
--- a/src/theory/sets/theory_sets.h
+++ b/src/theory/sets/theory_sets.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__SETS__THEORY_SETS_H
-#define CVC4__THEORY__SETS__THEORY_SETS_H
+#ifndef CVC5__THEORY__SETS__THEORY_SETS_H
+#define CVC5__THEORY__SETS__THEORY_SETS_H
#include <memory>
@@ -124,4 +124,4 @@ class TheorySets : public Theory
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__SETS__THEORY_SETS_H */
+#endif /* CVC5__THEORY__SETS__THEORY_SETS_H */
diff --git a/src/theory/sets/theory_sets_private.h b/src/theory/sets/theory_sets_private.h
index 3c3469b07..94baa3c0e 100644
--- a/src/theory/sets/theory_sets_private.h
+++ b/src/theory/sets/theory_sets_private.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__SETS__THEORY_SETS_PRIVATE_H
-#define CVC4__THEORY__SETS__THEORY_SETS_PRIVATE_H
+#ifndef CVC5__THEORY__SETS__THEORY_SETS_PRIVATE_H
+#define CVC5__THEORY__SETS__THEORY_SETS_PRIVATE_H
#include "context/cdhashset.h"
#include "context/cdqueue.h"
@@ -240,4 +240,4 @@ class TheorySetsPrivate {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__SETS__THEORY_SETS_PRIVATE_H */
+#endif /* CVC5__THEORY__SETS__THEORY_SETS_PRIVATE_H */
diff --git a/src/theory/sets/theory_sets_rewriter.h b/src/theory/sets/theory_sets_rewriter.h
index 501a58430..9c81c1e67 100644
--- a/src/theory/sets/theory_sets_rewriter.h
+++ b/src/theory/sets/theory_sets_rewriter.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__SETS__THEORY_SETS_REWRITER_H
-#define CVC4__THEORY__SETS__THEORY_SETS_REWRITER_H
+#ifndef CVC5__THEORY__SETS__THEORY_SETS_REWRITER_H
+#define CVC5__THEORY__SETS__THEORY_SETS_REWRITER_H
#include "theory/rewriter.h"
@@ -81,4 +81,4 @@ private:
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__SETS__THEORY_SETS_REWRITER_H */
+#endif /* CVC5__THEORY__SETS__THEORY_SETS_REWRITER_H */
diff --git a/src/theory/sets/theory_sets_type_enumerator.h b/src/theory/sets/theory_sets_type_enumerator.h
index 006afc964..457aede12 100644
--- a/src/theory/sets/theory_sets_type_enumerator.h
+++ b/src/theory/sets/theory_sets_type_enumerator.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__SETS__TYPE_ENUMERATOR_H
-#define CVC4__THEORY__SETS__TYPE_ENUMERATOR_H
+#ifndef CVC5__THEORY__SETS__TYPE_ENUMERATOR_H
+#define CVC5__THEORY__SETS__TYPE_ENUMERATOR_H
#include "expr/kind.h"
#include "expr/type_node.h"
@@ -70,4 +70,4 @@ class SetEnumerator : public TypeEnumeratorBase<SetEnumerator>
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__SETS__TYPE_ENUMERATOR_H */
+#endif /* CVC5__THEORY__SETS__TYPE_ENUMERATOR_H */
diff --git a/src/theory/sets/theory_sets_type_rules.h b/src/theory/sets/theory_sets_type_rules.h
index ab82ba710..7b8aa9778 100644
--- a/src/theory/sets/theory_sets_type_rules.h
+++ b/src/theory/sets/theory_sets_type_rules.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__SETS__THEORY_SETS_TYPE_RULES_H
-#define CVC4__THEORY__SETS__THEORY_SETS_TYPE_RULES_H
+#ifndef CVC5__THEORY__SETS__THEORY_SETS_TYPE_RULES_H
+#define CVC5__THEORY__SETS__THEORY_SETS_TYPE_RULES_H
#include <climits>
@@ -446,4 +446,4 @@ struct SetsProperties {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__SETS__THEORY_SETS_TYPE_RULES_H */
+#endif /* CVC5__THEORY__SETS__THEORY_SETS_TYPE_RULES_H */
diff --git a/src/theory/shared_solver.h b/src/theory/shared_solver.h
index 7c6fb23a3..3caf5756d 100644
--- a/src/theory/shared_solver.h
+++ b/src/theory/shared_solver.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__SHARED_SOLVER__H
-#define CVC4__THEORY__SHARED_SOLVER__H
+#ifndef CVC5__THEORY__SHARED_SOLVER__H
+#define CVC5__THEORY__SHARED_SOLVER__H
#include "expr/node.h"
#include "theory/shared_terms_database.h"
@@ -136,4 +136,4 @@ class SharedSolver
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__SHARED_SOLVER__H */
+#endif /* CVC5__THEORY__SHARED_SOLVER__H */
diff --git a/src/theory/shared_solver_distributed.h b/src/theory/shared_solver_distributed.h
index 49e4974ca..8589f7c43 100644
--- a/src/theory/shared_solver_distributed.h
+++ b/src/theory/shared_solver_distributed.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__SHARED_SOLVER_DISTRIBUTED__H
-#define CVC4__THEORY__SHARED_SOLVER_DISTRIBUTED__H
+#ifndef CVC5__THEORY__SHARED_SOLVER_DISTRIBUTED__H
+#define CVC5__THEORY__SHARED_SOLVER_DISTRIBUTED__H
#include "expr/node.h"
#include "theory/shared_solver.h"
@@ -61,4 +61,4 @@ class SharedSolverDistributed : public SharedSolver
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__SHARED_SOLVER_DISTRIBUTED__H */
+#endif /* CVC5__THEORY__SHARED_SOLVER_DISTRIBUTED__H */
diff --git a/src/theory/skolem_lemma.h b/src/theory/skolem_lemma.h
index d67f71cf6..69bb46eae 100644
--- a/src/theory/skolem_lemma.h
+++ b/src/theory/skolem_lemma.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__SKOLEM_LEMMA_H
-#define CVC4__THEORY__SKOLEM_LEMMA_H
+#ifndef CVC5__THEORY__SKOLEM_LEMMA_H
+#define CVC5__THEORY__SKOLEM_LEMMA_H
#include "expr/node.h"
#include "theory/trust_node.h"
@@ -61,4 +61,4 @@ class SkolemLemma
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__SKOLEM_LEMMA_H */
+#endif /* CVC5__THEORY__SKOLEM_LEMMA_H */
diff --git a/src/theory/smt_engine_subsolver.h b/src/theory/smt_engine_subsolver.h
index 100ea2de9..6c01a0fb5 100644
--- a/src/theory/smt_engine_subsolver.h
+++ b/src/theory/smt_engine_subsolver.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__SMT_ENGINE_SUBSOLVER_H
-#define CVC4__THEORY__SMT_ENGINE_SUBSOLVER_H
+#ifndef CVC5__THEORY__SMT_ENGINE_SUBSOLVER_H
+#define CVC5__THEORY__SMT_ENGINE_SUBSOLVER_H
#include <memory>
#include <vector>
@@ -93,4 +93,4 @@ Result checkWithSubsolver(Node query,
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__SMT_ENGINE_SUBSOLVER_H */
+#endif /* CVC5__THEORY__SMT_ENGINE_SUBSOLVER_H */
diff --git a/src/theory/sort_inference.h b/src/theory/sort_inference.h
index cb80df221..3b1c4a802 100644
--- a/src/theory/sort_inference.h
+++ b/src/theory/sort_inference.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__SORT_INFERENCE_H
-#define CVC4__SORT_INFERENCE_H
+#ifndef CVC5__SORT_INFERENCE_H
+#define CVC5__SORT_INFERENCE_H
#include <map>
#include <vector>
diff --git a/src/theory/strings/arith_entail.h b/src/theory/strings/arith_entail.h
index 1726dac0b..a04d30876 100644
--- a/src/theory/strings/arith_entail.h
+++ b/src/theory/strings/arith_entail.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__ARITH_ENTAIL_H
-#define CVC4__THEORY__STRINGS__ARITH_ENTAIL_H
+#ifndef CVC5__THEORY__STRINGS__ARITH_ENTAIL_H
+#define CVC5__THEORY__STRINGS__ARITH_ENTAIL_H
#include <vector>
diff --git a/src/theory/strings/base_solver.h b/src/theory/strings/base_solver.h
index 4ad5c3dec..3b8183340 100644
--- a/src/theory/strings/base_solver.h
+++ b/src/theory/strings/base_solver.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__BASE_SOLVER_H
-#define CVC4__THEORY__STRINGS__BASE_SOLVER_H
+#ifndef CVC5__THEORY__STRINGS__BASE_SOLVER_H
+#define CVC5__THEORY__STRINGS__BASE_SOLVER_H
#include "context/cdhashset.h"
#include "context/cdlist.h"
@@ -245,4 +245,4 @@ class BaseSolver
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__BASE_SOLVER_H */
+#endif /* CVC5__THEORY__STRINGS__BASE_SOLVER_H */
diff --git a/src/theory/strings/core_solver.h b/src/theory/strings/core_solver.h
index 7392659c5..06797c966 100644
--- a/src/theory/strings/core_solver.h
+++ b/src/theory/strings/core_solver.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__CORE_SOLVER_H
-#define CVC4__THEORY__STRINGS__CORE_SOLVER_H
+#ifndef CVC5__THEORY__STRINGS__CORE_SOLVER_H
+#define CVC5__THEORY__STRINGS__CORE_SOLVER_H
#include "context/cdhashset.h"
#include "context/cdlist.h"
@@ -525,4 +525,4 @@ class CoreSolver
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__CORE_SOLVER_H */
+#endif /* CVC5__THEORY__STRINGS__CORE_SOLVER_H */
diff --git a/src/theory/strings/eager_solver.h b/src/theory/strings/eager_solver.h
index 1d4682c49..1b9d3cd1b 100644
--- a/src/theory/strings/eager_solver.h
+++ b/src/theory/strings/eager_solver.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__EAGER_SOLVER_H
-#define CVC4__THEORY__STRINGS__EAGER_SOLVER_H
+#ifndef CVC5__THEORY__STRINGS__EAGER_SOLVER_H
+#define CVC5__THEORY__STRINGS__EAGER_SOLVER_H
#include <map>
@@ -65,4 +65,4 @@ class EagerSolver
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__EAGER_SOLVER_H */
+#endif /* CVC5__THEORY__STRINGS__EAGER_SOLVER_H */
diff --git a/src/theory/strings/eqc_info.h b/src/theory/strings/eqc_info.h
index 23d566ef1..95c315e73 100644
--- a/src/theory/strings/eqc_info.h
+++ b/src/theory/strings/eqc_info.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__EQC_INFO_H
-#define CVC4__THEORY__STRINGS__EQC_INFO_H
+#ifndef CVC5__THEORY__STRINGS__EQC_INFO_H
+#define CVC5__THEORY__STRINGS__EQC_INFO_H
#include <map>
@@ -78,4 +78,4 @@ class EqcInfo
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__EQC_INFO_H */
+#endif /* CVC5__THEORY__STRINGS__EQC_INFO_H */
diff --git a/src/theory/strings/extf_solver.h b/src/theory/strings/extf_solver.h
index bbc32e7a2..37d9824c3 100644
--- a/src/theory/strings/extf_solver.h
+++ b/src/theory/strings/extf_solver.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__EXTF_SOLVER_H
-#define CVC4__THEORY__STRINGS__EXTF_SOLVER_H
+#ifndef CVC5__THEORY__STRINGS__EXTF_SOLVER_H
+#define CVC5__THEORY__STRINGS__EXTF_SOLVER_H
#include <map>
#include <vector>
@@ -235,4 +235,4 @@ class StringsExtfCallback : public ExtTheoryCallback
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__EXTF_SOLVER_H */
+#endif /* CVC5__THEORY__STRINGS__EXTF_SOLVER_H */
diff --git a/src/theory/strings/infer_info.h b/src/theory/strings/infer_info.h
index 45a5da2d6..33f1decc6 100644
--- a/src/theory/strings/infer_info.h
+++ b/src/theory/strings/infer_info.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__INFER_INFO_H
-#define CVC4__THEORY__STRINGS__INFER_INFO_H
+#ifndef CVC5__THEORY__STRINGS__INFER_INFO_H
+#define CVC5__THEORY__STRINGS__INFER_INFO_H
#include <map>
#include <vector>
@@ -133,4 +133,4 @@ std::ostream& operator<<(std::ostream& out, const InferInfo& ii);
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__INFER_INFO_H */
+#endif /* CVC5__THEORY__STRINGS__INFER_INFO_H */
diff --git a/src/theory/strings/infer_proof_cons.h b/src/theory/strings/infer_proof_cons.h
index 677ba2e22..3d0f92ad0 100644
--- a/src/theory/strings/infer_proof_cons.h
+++ b/src/theory/strings/infer_proof_cons.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__INFER_PROOF_CONS_H
-#define CVC4__THEORY__STRINGS__INFER_PROOF_CONS_H
+#ifndef CVC5__THEORY__STRINGS__INFER_PROOF_CONS_H
+#define CVC5__THEORY__STRINGS__INFER_PROOF_CONS_H
#include <vector>
@@ -132,4 +132,4 @@ class InferProofCons : public ProofGenerator
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__INFER_PROOF_CONS_H */
+#endif /* CVC5__THEORY__STRINGS__INFER_PROOF_CONS_H */
diff --git a/src/theory/strings/inference_manager.h b/src/theory/strings/inference_manager.h
index abc5c5709..5cdbb1f4e 100644
--- a/src/theory/strings/inference_manager.h
+++ b/src/theory/strings/inference_manager.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__INFERENCE_MANAGER_H
-#define CVC4__THEORY__STRINGS__INFERENCE_MANAGER_H
+#ifndef CVC5__THEORY__STRINGS__INFERENCE_MANAGER_H
+#define CVC5__THEORY__STRINGS__INFERENCE_MANAGER_H
#include <map>
#include <vector>
diff --git a/src/theory/strings/normal_form.h b/src/theory/strings/normal_form.h
index fda691844..3217efc12 100644
--- a/src/theory/strings/normal_form.h
+++ b/src/theory/strings/normal_form.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__NORMAL_FORM_H
-#define CVC4__THEORY__STRINGS__NORMAL_FORM_H
+#ifndef CVC5__THEORY__STRINGS__NORMAL_FORM_H
+#define CVC5__THEORY__STRINGS__NORMAL_FORM_H
#include <map>
#include <vector>
@@ -170,4 +170,4 @@ class NormalForm
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__NORMAL_FORM_H */
+#endif /* CVC5__THEORY__STRINGS__NORMAL_FORM_H */
diff --git a/src/theory/strings/proof_checker.h b/src/theory/strings/proof_checker.h
index ab971f62f..bd54eadd1 100644
--- a/src/theory/strings/proof_checker.h
+++ b/src/theory/strings/proof_checker.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__PROOF_CHECKER_H
-#define CVC4__THEORY__STRINGS__PROOF_CHECKER_H
+#ifndef CVC5__THEORY__STRINGS__PROOF_CHECKER_H
+#define CVC5__THEORY__STRINGS__PROOF_CHECKER_H
#include "expr/node.h"
#include "expr/proof_checker.h"
@@ -46,4 +46,4 @@ class StringProofRuleChecker : public ProofRuleChecker
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__PROOF_CHECKER_H */
+#endif /* CVC5__THEORY__STRINGS__PROOF_CHECKER_H */
diff --git a/src/theory/strings/regexp_elim.h b/src/theory/strings/regexp_elim.h
index f43aacdcd..1a901b64d 100644
--- a/src/theory/strings/regexp_elim.h
+++ b/src/theory/strings/regexp_elim.h
@@ -14,8 +14,8 @@
**/
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__REGEXP_ELIM_H
-#define CVC4__THEORY__STRINGS__REGEXP_ELIM_H
+#ifndef CVC5__THEORY__STRINGS__REGEXP_ELIM_H
+#define CVC5__THEORY__STRINGS__REGEXP_ELIM_H
#include "expr/node.h"
#include "theory/eager_proof_generator.h"
@@ -87,4 +87,4 @@ class RegExpElimination
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__REGEXP_ELIM_H */
+#endif /* CVC5__THEORY__STRINGS__REGEXP_ELIM_H */
diff --git a/src/theory/strings/regexp_entail.h b/src/theory/strings/regexp_entail.h
index fcad7e2ab..ac50f0373 100644
--- a/src/theory/strings/regexp_entail.h
+++ b/src/theory/strings/regexp_entail.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__REGEXP_ENTAIL_H
-#define CVC4__THEORY__STRINGS__REGEXP_ENTAIL_H
+#ifndef CVC5__THEORY__STRINGS__REGEXP_ENTAIL_H
+#define CVC5__THEORY__STRINGS__REGEXP_ENTAIL_H
#include <climits>
#include <utility>
@@ -129,4 +129,4 @@ class RegExpEntail
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__REGEXP_ENTAIL_H */
+#endif /* CVC5__THEORY__STRINGS__REGEXP_ENTAIL_H */
diff --git a/src/theory/strings/regexp_operation.h b/src/theory/strings/regexp_operation.h
index b660e5c49..ab48f9b52 100644
--- a/src/theory/strings/regexp_operation.h
+++ b/src/theory/strings/regexp_operation.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__REGEXP__OPERATION_H
-#define CVC4__THEORY__STRINGS__REGEXP__OPERATION_H
+#ifndef CVC5__THEORY__STRINGS__REGEXP__OPERATION_H
+#define CVC5__THEORY__STRINGS__REGEXP__OPERATION_H
#include <map>
#include <set>
@@ -211,4 +211,4 @@ class RegExpOpr {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__REGEXP__OPERATION_H */
+#endif /* CVC5__THEORY__STRINGS__REGEXP__OPERATION_H */
diff --git a/src/theory/strings/regexp_solver.h b/src/theory/strings/regexp_solver.h
index 440d0fcb7..62af91845 100644
--- a/src/theory/strings/regexp_solver.h
+++ b/src/theory/strings/regexp_solver.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__REGEXP_SOLVER_H
-#define CVC4__THEORY__STRINGS__REGEXP_SOLVER_H
+#ifndef CVC5__THEORY__STRINGS__REGEXP_SOLVER_H
+#define CVC5__THEORY__STRINGS__REGEXP_SOLVER_H
#include <map>
#include "context/cdhashset.h"
@@ -156,4 +156,4 @@ class RegExpSolver
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__THEORY_STRINGS_H */
+#endif /* CVC5__THEORY__STRINGS__THEORY_STRINGS_H */
diff --git a/src/theory/strings/rewrites.h b/src/theory/strings/rewrites.h
index 37ef61bee..31d5be4bc 100644
--- a/src/theory/strings/rewrites.h
+++ b/src/theory/strings/rewrites.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__REWRITES_H
-#define CVC4__THEORY__STRINGS__REWRITES_H
+#ifndef CVC5__THEORY__STRINGS__REWRITES_H
+#define CVC5__THEORY__STRINGS__REWRITES_H
#include <iosfwd>
@@ -241,4 +241,4 @@ std::ostream& operator<<(std::ostream& out, Rewrite r);
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__REWRITES_H */
+#endif /* CVC5__THEORY__STRINGS__REWRITES_H */
diff --git a/src/theory/strings/sequences_rewriter.h b/src/theory/strings/sequences_rewriter.h
index eda8bc1df..83ad02ce6 100644
--- a/src/theory/strings/sequences_rewriter.h
+++ b/src/theory/strings/sequences_rewriter.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__SEQUENCES_REWRITER_H
-#define CVC4__THEORY__STRINGS__SEQUENCES_REWRITER_H
+#ifndef CVC5__THEORY__STRINGS__SEQUENCES_REWRITER_H
+#define CVC5__THEORY__STRINGS__SEQUENCES_REWRITER_H
#include <vector>
@@ -298,4 +298,4 @@ class SequencesRewriter : public TheoryRewriter
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__SEQUENCES_REWRITER_H */
+#endif /* CVC5__THEORY__STRINGS__SEQUENCES_REWRITER_H */
diff --git a/src/theory/strings/sequences_stats.h b/src/theory/strings/sequences_stats.h
index 5bd48e877..43e770425 100644
--- a/src/theory/strings/sequences_stats.h
+++ b/src/theory/strings/sequences_stats.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__SEQUENCES_STATS_H
-#define CVC4__THEORY__STRINGS__SEQUENCES_STATS_H
+#ifndef CVC5__THEORY__STRINGS__SEQUENCES_STATS_H
+#define CVC5__THEORY__STRINGS__SEQUENCES_STATS_H
#include "expr/kind.h"
#include "theory/strings/infer_info.h"
@@ -101,4 +101,4 @@ class SequencesStatistics
}
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__SEQUENCES_STATS_H */
+#endif /* CVC5__THEORY__STRINGS__SEQUENCES_STATS_H */
diff --git a/src/theory/strings/skolem_cache.h b/src/theory/strings/skolem_cache.h
index 5c5fc8d57..0ab8a13f4 100644
--- a/src/theory/strings/skolem_cache.h
+++ b/src/theory/strings/skolem_cache.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__SKOLEM_CACHE_H
-#define CVC4__THEORY__STRINGS__SKOLEM_CACHE_H
+#ifndef CVC5__THEORY__STRINGS__SKOLEM_CACHE_H
+#define CVC5__THEORY__STRINGS__SKOLEM_CACHE_H
#include <map>
#include <tuple>
@@ -213,4 +213,4 @@ class SkolemCache
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__SKOLEM_CACHE_H */
+#endif /* CVC5__THEORY__STRINGS__SKOLEM_CACHE_H */
diff --git a/src/theory/strings/solver_state.h b/src/theory/strings/solver_state.h
index e54a5e7b1..01c779a22 100644
--- a/src/theory/strings/solver_state.h
+++ b/src/theory/strings/solver_state.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__SOLVER_STATE_H
-#define CVC4__THEORY__STRINGS__SOLVER_STATE_H
+#ifndef CVC5__THEORY__STRINGS__SOLVER_STATE_H
+#define CVC5__THEORY__STRINGS__SOLVER_STATE_H
#include <map>
@@ -163,4 +163,4 @@ class SolverState : public TheoryState
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__SOLVER_STATE_H */
+#endif /* CVC5__THEORY__STRINGS__SOLVER_STATE_H */
diff --git a/src/theory/strings/strategy.h b/src/theory/strings/strategy.h
index 1eb2fe902..673652dd3 100644
--- a/src/theory/strings/strategy.h
+++ b/src/theory/strings/strategy.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__STRATEGY_H
-#define CVC4__THEORY__STRINGS__STRATEGY_H
+#ifndef CVC5__THEORY__STRINGS__STRATEGY_H
+#define CVC5__THEORY__STRINGS__STRATEGY_H
#include <map>
#include <vector>
@@ -113,4 +113,4 @@ class Strategy
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__STRATEGY_H */
+#endif /* CVC5__THEORY__STRINGS__STRATEGY_H */
diff --git a/src/theory/strings/strings_entail.h b/src/theory/strings/strings_entail.h
index cce0bf05b..935ca3a86 100644
--- a/src/theory/strings/strings_entail.h
+++ b/src/theory/strings/strings_entail.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__STRING_ENTAIL_H
-#define CVC4__THEORY__STRINGS__STRING_ENTAIL_H
+#ifndef CVC5__THEORY__STRINGS__STRING_ENTAIL_H
+#define CVC5__THEORY__STRINGS__STRING_ENTAIL_H
#include <vector>
@@ -381,4 +381,4 @@ class StringsEntail
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__STRING_ENTAIL_H */
+#endif /* CVC5__THEORY__STRINGS__STRING_ENTAIL_H */
diff --git a/src/theory/strings/strings_fmf.h b/src/theory/strings/strings_fmf.h
index a2496dec3..d43589ef7 100644
--- a/src/theory/strings/strings_fmf.h
+++ b/src/theory/strings/strings_fmf.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__STRINGS_FMF_H
-#define CVC4__THEORY__STRINGS__STRINGS_FMF_H
+#ifndef CVC5__THEORY__STRINGS__STRINGS_FMF_H
+#define CVC5__THEORY__STRINGS__STRINGS_FMF_H
#include "context/cdhashset.h"
#include "context/cdo.h"
@@ -108,4 +108,4 @@ class StringsFmf
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__STRINGS_FMF_H */
+#endif /* CVC5__THEORY__STRINGS__STRINGS_FMF_H */
diff --git a/src/theory/strings/strings_rewriter.h b/src/theory/strings/strings_rewriter.h
index e7ad40d51..2802b490f 100644
--- a/src/theory/strings/strings_rewriter.h
+++ b/src/theory/strings/strings_rewriter.h
@@ -15,8 +15,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__STRINGS_REWRITER_H
-#define CVC4__THEORY__STRINGS__STRINGS_REWRITER_H
+#ifndef CVC5__THEORY__STRINGS__STRINGS_REWRITER_H
+#define CVC5__THEORY__STRINGS__STRINGS_REWRITER_H
#include "expr/node.h"
#include "theory/strings/sequences_rewriter.h"
@@ -105,4 +105,4 @@ class StringsRewriter : public SequencesRewriter
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__STRINGS_REWRITER_H */
+#endif /* CVC5__THEORY__STRINGS__STRINGS_REWRITER_H */
diff --git a/src/theory/strings/term_registry.h b/src/theory/strings/term_registry.h
index 1eb000e09..639a8536c 100644
--- a/src/theory/strings/term_registry.h
+++ b/src/theory/strings/term_registry.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__TERM_REGISTRY_H
-#define CVC4__THEORY__STRINGS__TERM_REGISTRY_H
+#ifndef CVC5__THEORY__STRINGS__TERM_REGISTRY_H
+#define CVC5__THEORY__STRINGS__TERM_REGISTRY_H
#include "context/cdhashset.h"
#include "context/cdlist.h"
@@ -281,4 +281,4 @@ class TermRegistry
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__TERM_REGISTRY_H */
+#endif /* CVC5__THEORY__STRINGS__TERM_REGISTRY_H */
diff --git a/src/theory/strings/theory_strings.h b/src/theory/strings/theory_strings.h
index 99a3f2c04..41ea71d15 100644
--- a/src/theory/strings/theory_strings.h
+++ b/src/theory/strings/theory_strings.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__THEORY_STRINGS_H
-#define CVC4__THEORY__STRINGS__THEORY_STRINGS_H
+#ifndef CVC5__THEORY__STRINGS__THEORY_STRINGS_H
+#define CVC5__THEORY__STRINGS__THEORY_STRINGS_H
#include <climits>
#include <deque>
@@ -305,4 +305,4 @@ class TheoryStrings : public Theory {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__THEORY_STRINGS_H */
+#endif /* CVC5__THEORY__STRINGS__THEORY_STRINGS_H */
diff --git a/src/theory/strings/theory_strings_preprocess.h b/src/theory/strings/theory_strings_preprocess.h
index 7c8c4308c..1fb10843b 100644
--- a/src/theory/strings/theory_strings_preprocess.h
+++ b/src/theory/strings/theory_strings_preprocess.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__PREPROCESS_H
-#define CVC4__THEORY__STRINGS__PREPROCESS_H
+#ifndef CVC5__THEORY__STRINGS__PREPROCESS_H
+#define CVC5__THEORY__STRINGS__PREPROCESS_H
#include <vector>
#include "context/cdhashmap.h"
@@ -106,4 +106,4 @@ class StringsPreprocess {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__PREPROCESS_H */
+#endif /* CVC5__THEORY__STRINGS__PREPROCESS_H */
diff --git a/src/theory/strings/theory_strings_type_rules.h b/src/theory/strings/theory_strings_type_rules.h
index 4baabec69..e36836211 100644
--- a/src/theory/strings/theory_strings_type_rules.h
+++ b/src/theory/strings/theory_strings_type_rules.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
#include "options/strings_options.h"
-#ifndef CVC4__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H
-#define CVC4__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H
+#ifndef CVC5__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H
+#define CVC5__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H
#include "expr/sequence.h"
@@ -420,4 +420,4 @@ struct SequenceProperties
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H */
+#endif /* CVC5__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H */
diff --git a/src/theory/strings/theory_strings_utils.h b/src/theory/strings/theory_strings_utils.h
index e3c85d562..49cd34fbe 100644
--- a/src/theory/strings/theory_strings_utils.h
+++ b/src/theory/strings/theory_strings_utils.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__THEORY_STRINGS_UTILS_H
-#define CVC4__THEORY__STRINGS__THEORY_STRINGS_UTILS_H
+#ifndef CVC5__THEORY__STRINGS__THEORY_STRINGS_UTILS_H
+#define CVC5__THEORY__STRINGS__THEORY_STRINGS_UTILS_H
#include <vector>
diff --git a/src/theory/strings/type_enumerator.h b/src/theory/strings/type_enumerator.h
index 644fe1092..d6879b8bd 100644
--- a/src/theory/strings/type_enumerator.h
+++ b/src/theory/strings/type_enumerator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H
-#define CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H
+#ifndef CVC5__THEORY__STRINGS__TYPE_ENUMERATOR_H
+#define CVC5__THEORY__STRINGS__TYPE_ENUMERATOR_H
#include <vector>
@@ -201,4 +201,4 @@ class SequenceEnumerator : public TypeEnumeratorBase<SequenceEnumerator>
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H */
+#endif /* CVC5__THEORY__STRINGS__TYPE_ENUMERATOR_H */
diff --git a/src/theory/strings/word.h b/src/theory/strings/word.h
index 6cf073cc1..914770ecf 100644
--- a/src/theory/strings/word.h
+++ b/src/theory/strings/word.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__STRINGS__WORD_H
-#define CVC4__THEORY__STRINGS__WORD_H
+#ifndef CVC5__THEORY__STRINGS__WORD_H
+#define CVC5__THEORY__STRINGS__WORD_H
#include <vector>
diff --git a/src/theory/subs_minimize.h b/src/theory/subs_minimize.h
index 026cd441f..f93740faf 100644
--- a/src/theory/subs_minimize.h
+++ b/src/theory/subs_minimize.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__SUBS_MINIMIZE_H
-#define CVC4__THEORY__SUBS_MINIMIZE_H
+#ifndef CVC5__THEORY__SUBS_MINIMIZE_H
+#define CVC5__THEORY__SUBS_MINIMIZE_H
#include <vector>
@@ -97,4 +97,4 @@ class SubstitutionMinimize
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__SUBS_MINIMIZE_H */
+#endif /* CVC5__THEORY__SUBS_MINIMIZE_H */
diff --git a/src/theory/substitutions.h b/src/theory/substitutions.h
index 96cc37b29..98daac91c 100644
--- a/src/theory/substitutions.h
+++ b/src/theory/substitutions.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__SUBSTITUTIONS_H
-#define CVC4__THEORY__SUBSTITUTIONS_H
+#ifndef CVC5__THEORY__SUBSTITUTIONS_H
+#define CVC5__THEORY__SUBSTITUTIONS_H
//#include <algorithm>
#include <utility>
@@ -181,4 +181,4 @@ std::ostream& operator<<(std::ostream& out, const theory::SubstitutionMap::itera
} // namespace cvc5
-#endif /* CVC4__THEORY__SUBSTITUTIONS_H */
+#endif /* CVC5__THEORY__SUBSTITUTIONS_H */
diff --git a/src/theory/theory.h b/src/theory/theory.h
index 870c06cd6..8a3b4f293 100644
--- a/src/theory/theory.h
+++ b/src/theory/theory.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__THEORY_H
-#define CVC4__THEORY__THEORY_H
+#ifndef CVC5__THEORY__THEORY_H
+#define CVC5__THEORY__THEORY_H
#include <iosfwd>
#include <set>
@@ -943,4 +943,4 @@ inline std::ostream& operator << (std::ostream& out, theory::Theory::PPAssertSta
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__THEORY_H */
+#endif /* CVC5__THEORY__THEORY_H */
diff --git a/src/theory/theory_engine.h b/src/theory/theory_engine.h
index cc3de2e50..c2f6e8c83 100644
--- a/src/theory/theory_engine.h
+++ b/src/theory/theory_engine.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY_ENGINE_H
-#define CVC4__THEORY_ENGINE_H
+#ifndef CVC5__THEORY_ENGINE_H
+#define CVC5__THEORY_ENGINE_H
#include <memory>
#include <vector>
@@ -675,4 +675,4 @@ private:
} // namespace cvc5
-#endif /* CVC4__THEORY_ENGINE_H */
+#endif /* CVC5__THEORY_ENGINE_H */
diff --git a/src/theory/theory_engine_proof_generator.h b/src/theory/theory_engine_proof_generator.h
index f42f8d868..6a1d33914 100644
--- a/src/theory/theory_engine_proof_generator.h
+++ b/src/theory/theory_engine_proof_generator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY_ENGINE_PROOF_GENERATOR_H
-#define CVC4__THEORY_ENGINE_PROOF_GENERATOR_H
+#ifndef CVC5__THEORY_ENGINE_PROOF_GENERATOR_H
+#define CVC5__THEORY_ENGINE_PROOF_GENERATOR_H
#include <memory>
@@ -77,4 +77,4 @@ class TheoryEngineProofGenerator : public ProofGenerator
} // namespace cvc5
-#endif /* CVC4__THEORY_ENGINE_PROOF_GENERATOR_H */
+#endif /* CVC5__THEORY_ENGINE_PROOF_GENERATOR_H */
diff --git a/src/theory/theory_eq_notify.h b/src/theory/theory_eq_notify.h
index 40aa07f3b..22ddc4576 100644
--- a/src/theory/theory_eq_notify.h
+++ b/src/theory/theory_eq_notify.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__THEORY_EQ_NOTIFY_H
-#define CVC4__THEORY__THEORY_EQ_NOTIFY_H
+#ifndef CVC5__THEORY__THEORY_EQ_NOTIFY_H
+#define CVC5__THEORY__THEORY_EQ_NOTIFY_H
#include "expr/node.h"
#include "theory/theory_inference_manager.h"
diff --git a/src/theory/theory_id.h b/src/theory/theory_id.h
index d923413d5..166fbb89a 100644
--- a/src/theory/theory_id.h
+++ b/src/theory/theory_id.h
@@ -17,8 +17,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__THEORY__THEORY_ID_H
-#define CVC4__THEORY__THEORY_ID_H
+#ifndef CVC5__THEORY__THEORY_ID_H
+#define CVC5__THEORY__THEORY_ID_H
#include <iosfwd>
diff --git a/src/theory/theory_inference.h b/src/theory/theory_inference.h
index 0be1c3d83..7bbdb08e2 100644
--- a/src/theory/theory_inference.h
+++ b/src/theory/theory_inference.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__THEORY_INFERENCE_H
-#define CVC4__THEORY__THEORY_INFERENCE_H
+#ifndef CVC5__THEORY__THEORY_INFERENCE_H
+#define CVC5__THEORY__THEORY_INFERENCE_H
#include "expr/node.h"
#include "theory/inference_id.h"
diff --git a/src/theory/theory_inference_manager.h b/src/theory/theory_inference_manager.h
index 380ba6e48..509e92fa1 100644
--- a/src/theory/theory_inference_manager.h
+++ b/src/theory/theory_inference_manager.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__THEORY_INFERENCE_MANAGER_H
-#define CVC4__THEORY__THEORY_INFERENCE_MANAGER_H
+#ifndef CVC5__THEORY__THEORY_INFERENCE_MANAGER_H
+#define CVC5__THEORY__THEORY_INFERENCE_MANAGER_H
#include <memory>
@@ -463,4 +463,4 @@ class TheoryInferenceManager
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__THEORY_INFERENCE_MANAGER_H */
+#endif /* CVC5__THEORY__THEORY_INFERENCE_MANAGER_H */
diff --git a/src/theory/theory_model.h b/src/theory/theory_model.h
index 7e7439867..cd51325e0 100644
--- a/src/theory/theory_model.h
+++ b/src/theory/theory_model.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__THEORY_MODEL_H
-#define CVC4__THEORY__THEORY_MODEL_H
+#ifndef CVC5__THEORY__THEORY_MODEL_H
+#define CVC5__THEORY__THEORY_MODEL_H
#include <unordered_map>
#include <unordered_set>
@@ -435,4 +435,4 @@ public:
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__THEORY_MODEL_H */
+#endif /* CVC5__THEORY__THEORY_MODEL_H */
diff --git a/src/theory/theory_model_builder.h b/src/theory/theory_model_builder.h
index b73693681..894aa4047 100644
--- a/src/theory/theory_model_builder.h
+++ b/src/theory/theory_model_builder.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__THEORY_MODEL_BUILDER_H
-#define CVC4__THEORY__THEORY_MODEL_BUILDER_H
+#ifndef CVC5__THEORY__THEORY_MODEL_BUILDER_H
+#define CVC5__THEORY__THEORY_MODEL_BUILDER_H
#include <unordered_map>
#include <unordered_set>
@@ -316,4 +316,4 @@ class TheoryEngineModelBuilder
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__THEORY_MODEL_BUILDER_H */
+#endif /* CVC5__THEORY__THEORY_MODEL_BUILDER_H */
diff --git a/src/theory/theory_preprocessor.h b/src/theory/theory_preprocessor.h
index 5d8ef253c..024283afb 100644
--- a/src/theory/theory_preprocessor.h
+++ b/src/theory/theory_preprocessor.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__THEORY_PREPROCESSOR_H
-#define CVC4__THEORY__THEORY_PREPROCESSOR_H
+#ifndef CVC5__THEORY__THEORY_PREPROCESSOR_H
+#define CVC5__THEORY__THEORY_PREPROCESSOR_H
#include <unordered_map>
@@ -225,4 +225,4 @@ class TheoryPreprocessor
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__THEORY_PREPROCESSOR_H */
+#endif /* CVC5__THEORY__THEORY_PREPROCESSOR_H */
diff --git a/src/theory/theory_proof_step_buffer.h b/src/theory/theory_proof_step_buffer.h
index 0015af105..736564232 100644
--- a/src/theory/theory_proof_step_buffer.h
+++ b/src/theory/theory_proof_step_buffer.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__THEORY_PROOF_STEP_BUFFER_H
-#define CVC4__THEORY__THEORY_PROOF_STEP_BUFFER_H
+#ifndef CVC5__THEORY__THEORY_PROOF_STEP_BUFFER_H
+#define CVC5__THEORY__THEORY_PROOF_STEP_BUFFER_H
#include <vector>
@@ -112,4 +112,4 @@ class TheoryProofStepBuffer : public ProofStepBuffer
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__THEORY_PROOF_STEP_BUFFER_H */
+#endif /* CVC5__THEORY__THEORY_PROOF_STEP_BUFFER_H */
diff --git a/src/theory/theory_rewriter.h b/src/theory/theory_rewriter.h
index 1617997a4..06252af7e 100644
--- a/src/theory/theory_rewriter.h
+++ b/src/theory/theory_rewriter.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__THEORY_REWRITER_H
-#define CVC4__THEORY__THEORY_REWRITER_H
+#ifndef CVC5__THEORY__THEORY_REWRITER_H
+#define CVC5__THEORY__THEORY_REWRITER_H
#include "expr/node.h"
#include "theory/trust_node.h"
@@ -142,4 +142,4 @@ class TheoryRewriter
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__THEORY_REWRITER_H */
+#endif /* CVC5__THEORY__THEORY_REWRITER_H */
diff --git a/src/theory/theory_state.h b/src/theory/theory_state.h
index 14776761e..1874d48c8 100644
--- a/src/theory/theory_state.h
+++ b/src/theory/theory_state.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__THEORY_STATE_H
-#define CVC4__THEORY__THEORY_STATE_H
+#ifndef CVC5__THEORY__THEORY_STATE_H
+#define CVC5__THEORY__THEORY_STATE_H
#include "context/cdo.h"
#include "expr/node.h"
@@ -123,4 +123,4 @@ class TheoryState
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__SOLVER_STATE_H */
+#endif /* CVC5__THEORY__SOLVER_STATE_H */
diff --git a/src/theory/trust_node.h b/src/theory/trust_node.h
index c53496730..9492d7137 100644
--- a/src/theory/trust_node.h
+++ b/src/theory/trust_node.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__TRUST_NODE_H
-#define CVC4__THEORY__TRUST_NODE_H
+#ifndef CVC5__THEORY__TRUST_NODE_H
+#define CVC5__THEORY__TRUST_NODE_H
#include "expr/node.h"
@@ -174,4 +174,4 @@ std::ostream& operator<<(std::ostream& out, TrustNode n);
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__TRUST_NODE_H */
+#endif /* CVC5__THEORY__TRUST_NODE_H */
diff --git a/src/theory/trust_substitutions.h b/src/theory/trust_substitutions.h
index f90e5623f..879b4e8ff 100644
--- a/src/theory/trust_substitutions.h
+++ b/src/theory/trust_substitutions.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__TRUST_SUBSTITUTIONS_H
-#define CVC4__THEORY__TRUST_SUBSTITUTIONS_H
+#ifndef CVC5__THEORY__TRUST_SUBSTITUTIONS_H
+#define CVC5__THEORY__TRUST_SUBSTITUTIONS_H
#include "context/cdlist.h"
#include "context/context.h"
@@ -135,4 +135,4 @@ class TrustSubstitutionMap
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__TRUST_SUBSTITUTIONS_H */
+#endif /* CVC5__THEORY__TRUST_SUBSTITUTIONS_H */
diff --git a/src/theory/type_enumerator.h b/src/theory/type_enumerator.h
index a80702c36..84d9ad03d 100644
--- a/src/theory/type_enumerator.h
+++ b/src/theory/type_enumerator.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__TYPE_ENUMERATOR_H
-#define CVC4__THEORY__TYPE_ENUMERATOR_H
+#ifndef CVC5__THEORY__TYPE_ENUMERATOR_H
+#define CVC5__THEORY__TYPE_ENUMERATOR_H
#include "base/check.h"
#include "base/exception.h"
@@ -186,4 +186,4 @@ class TypeEnumerator {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__TYPE_ENUMERATOR_H */
+#endif /* CVC5__THEORY__TYPE_ENUMERATOR_H */
diff --git a/src/theory/type_set.h b/src/theory/type_set.h
index 0949a026b..bf7b54243 100644
--- a/src/theory/type_set.h
+++ b/src/theory/type_set.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__TYPE_SET_H
-#define CVC4__THEORY__TYPE_SET_H
+#ifndef CVC5__THEORY__TYPE_SET_H
+#define CVC5__THEORY__TYPE_SET_H
#include <unordered_map>
#include <unordered_set>
@@ -87,4 +87,4 @@ class TypeSet
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__TYPE_SET_H */
+#endif /* CVC5__THEORY__TYPE_SET_H */
diff --git a/src/theory/uf/cardinality_extension.h b/src/theory/uf/cardinality_extension.h
index 66f0d8d1d..c7a6e596f 100644
--- a/src/theory/uf/cardinality_extension.h
+++ b/src/theory/uf/cardinality_extension.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY_UF_STRONG_SOLVER_H
-#define CVC4__THEORY_UF_STRONG_SOLVER_H
+#ifndef CVC5__THEORY_UF_STRONG_SOLVER_H
+#define CVC5__THEORY_UF_STRONG_SOLVER_H
#include "context/cdhashmap.h"
#include "context/context.h"
@@ -465,4 +465,4 @@ class CardinalityExtension
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY_UF_STRONG_SOLVER_H */
+#endif /* CVC5__THEORY_UF_STRONG_SOLVER_H */
diff --git a/src/theory/uf/equality_engine.h b/src/theory/uf/equality_engine.h
index 464e1d07a..a0375a77d 100644
--- a/src/theory/uf/equality_engine.h
+++ b/src/theory/uf/equality_engine.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__UF__EQUALITY_ENGINE_H
-#define CVC4__THEORY__UF__EQUALITY_ENGINE_H
+#ifndef CVC5__THEORY__UF__EQUALITY_ENGINE_H
+#define CVC5__THEORY__UF__EQUALITY_ENGINE_H
#include <deque>
#include <queue>
diff --git a/src/theory/uf/equality_engine_iterator.h b/src/theory/uf/equality_engine_iterator.h
index 12dfea34a..8cd8bb686 100644
--- a/src/theory/uf/equality_engine_iterator.h
+++ b/src/theory/uf/equality_engine_iterator.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__UF__EQUALITY_ENGINE_ITERATOR_H
-#define CVC4__THEORY__UF__EQUALITY_ENGINE_ITERATOR_H
+#ifndef CVC5__THEORY__UF__EQUALITY_ENGINE_ITERATOR_H
+#define CVC5__THEORY__UF__EQUALITY_ENGINE_ITERATOR_H
#include "expr/node.h"
#include "theory/uf/equality_engine_types.h"
diff --git a/src/theory/uf/equality_engine_notify.h b/src/theory/uf/equality_engine_notify.h
index 4187c067f..fff01402f 100644
--- a/src/theory/uf/equality_engine_notify.h
+++ b/src/theory/uf/equality_engine_notify.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__UF__EQUALITY_ENGINE_NOTIFY_H
-#define CVC4__THEORY__UF__EQUALITY_ENGINE_NOTIFY_H
+#ifndef CVC5__THEORY__UF__EQUALITY_ENGINE_NOTIFY_H
+#define CVC5__THEORY__UF__EQUALITY_ENGINE_NOTIFY_H
#include "expr/node.h"
diff --git a/src/theory/uf/equality_engine_types.h b/src/theory/uf/equality_engine_types.h
index 030c3b998..e2a271ceb 100644
--- a/src/theory/uf/equality_engine_types.h
+++ b/src/theory/uf/equality_engine_types.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__UF__EQUALITY_ENGINE_TYPES_H
-#define CVC4__THEORY__UF__EQUALITY_ENGINE_TYPES_H
+#ifndef CVC5__THEORY__UF__EQUALITY_ENGINE_TYPES_H
+#define CVC5__THEORY__UF__EQUALITY_ENGINE_TYPES_H
#include <string>
#include <iostream>
@@ -361,4 +361,4 @@ struct TriggerInfo {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__UF__EQUALITY_ENGINE_TYPES_H */
+#endif /* CVC5__THEORY__UF__EQUALITY_ENGINE_TYPES_H */
diff --git a/src/theory/uf/ho_extension.h b/src/theory/uf/ho_extension.h
index d703feb88..184be6522 100644
--- a/src/theory/uf/ho_extension.h
+++ b/src/theory/uf/ho_extension.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef __CVC4__THEORY__UF__HO_EXTENSION_H
-#define __CVC4__THEORY__UF__HO_EXTENSION_H
+#ifndef __CVC5__THEORY__UF__HO_EXTENSION_H
+#define __CVC5__THEORY__UF__HO_EXTENSION_H
#include "context/cdhashmap.h"
#include "context/cdhashset.h"
@@ -200,4 +200,4 @@ class HoExtension
} // namespace theory
} // namespace cvc5
-#endif /* __CVC4__THEORY__UF__HO_EXTENSION_H */
+#endif /* __CVC5__THEORY__UF__HO_EXTENSION_H */
diff --git a/src/theory/uf/proof_checker.h b/src/theory/uf/proof_checker.h
index 011b2868d..f3e20aea5 100644
--- a/src/theory/uf/proof_checker.h
+++ b/src/theory/uf/proof_checker.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__UF__PROOF_CHECKER_H
-#define CVC4__THEORY__UF__PROOF_CHECKER_H
+#ifndef CVC5__THEORY__UF__PROOF_CHECKER_H
+#define CVC5__THEORY__UF__PROOF_CHECKER_H
#include "expr/node.h"
#include "expr/proof_checker.h"
@@ -46,4 +46,4 @@ class UfProofRuleChecker : public ProofRuleChecker
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__UF__PROOF_CHECKER_H */
+#endif /* CVC5__THEORY__UF__PROOF_CHECKER_H */
diff --git a/src/theory/uf/proof_equality_engine.h b/src/theory/uf/proof_equality_engine.h
index ca0b58b5d..a1545be8f 100644
--- a/src/theory/uf/proof_equality_engine.h
+++ b/src/theory/uf/proof_equality_engine.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__UF__PROOF_EQUALITY_ENGINE_H
-#define CVC4__THEORY__UF__PROOF_EQUALITY_ENGINE_H
+#ifndef CVC5__THEORY__UF__PROOF_EQUALITY_ENGINE_H
+#define CVC5__THEORY__UF__PROOF_EQUALITY_ENGINE_H
#include <vector>
@@ -298,4 +298,4 @@ class ProofEqEngine : public EagerProofGenerator
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__STRINGS__PROOF_MANAGER_H */
+#endif /* CVC5__THEORY__STRINGS__PROOF_MANAGER_H */
diff --git a/src/theory/uf/symmetry_breaker.h b/src/theory/uf/symmetry_breaker.h
index e38a1f67b..169794f3d 100644
--- a/src/theory/uf/symmetry_breaker.h
+++ b/src/theory/uf/symmetry_breaker.h
@@ -41,8 +41,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__UF__SYMMETRY_BREAKER_H
-#define CVC4__THEORY__UF__SYMMETRY_BREAKER_H
+#ifndef CVC5__THEORY__UF__SYMMETRY_BREAKER_H
+#define CVC5__THEORY__UF__SYMMETRY_BREAKER_H
#include <iostream>
#include <list>
@@ -179,4 +179,4 @@ std::ostream& operator<<(
} // namespace cvc5
-#endif /* CVC4__THEORY__UF__SYMMETRY_BREAKER_H */
+#endif /* CVC5__THEORY__UF__SYMMETRY_BREAKER_H */
diff --git a/src/theory/uf/theory_uf.h b/src/theory/uf/theory_uf.h
index cc53094b7..314ffa63c 100644
--- a/src/theory/uf/theory_uf.h
+++ b/src/theory/uf/theory_uf.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__UF__THEORY_UF_H
-#define CVC4__THEORY__UF__THEORY_UF_H
+#ifndef CVC5__THEORY__UF__THEORY_UF_H
+#define CVC5__THEORY__UF__THEORY_UF_H
#include "expr/node.h"
#include "expr/node_trie.h"
@@ -186,4 +186,4 @@ private:
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__UF__THEORY_UF_H */
+#endif /* CVC5__THEORY__UF__THEORY_UF_H */
diff --git a/src/theory/uf/theory_uf_model.h b/src/theory/uf/theory_uf_model.h
index 949586976..74ce90650 100644
--- a/src/theory/uf/theory_uf_model.h
+++ b/src/theory/uf/theory_uf_model.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY_UF_MODEL_H
-#define CVC4__THEORY_UF_MODEL_H
+#ifndef CVC5__THEORY_UF_MODEL_H
+#define CVC5__THEORY_UF_MODEL_H
#include <vector>
diff --git a/src/theory/uf/theory_uf_rewriter.h b/src/theory/uf/theory_uf_rewriter.h
index 60a394126..0681c3ece 100644
--- a/src/theory/uf/theory_uf_rewriter.h
+++ b/src/theory/uf/theory_uf_rewriter.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__UF__THEORY_UF_REWRITER_H
-#define CVC4__THEORY__UF__THEORY_UF_REWRITER_H
+#ifndef CVC5__THEORY__UF__THEORY_UF_REWRITER_H
+#define CVC5__THEORY__UF__THEORY_UF_REWRITER_H
#include "expr/node_algorithm.h"
#include "options/uf_options.h"
@@ -212,4 +212,4 @@ public: //conversion between HO_APPLY AND APPLY_UF
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__UF__THEORY_UF_REWRITER_H */
+#endif /* CVC5__THEORY__UF__THEORY_UF_REWRITER_H */
diff --git a/src/theory/uf/theory_uf_type_rules.h b/src/theory/uf/theory_uf_type_rules.h
index 8493c8a38..dc8f3b462 100644
--- a/src/theory/uf/theory_uf_type_rules.h
+++ b/src/theory/uf/theory_uf_type_rules.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__UF__THEORY_UF_TYPE_RULES_H
-#define CVC4__THEORY__UF__THEORY_UF_TYPE_RULES_H
+#ifndef CVC5__THEORY__UF__THEORY_UF_TYPE_RULES_H
+#define CVC5__THEORY__UF__THEORY_UF_TYPE_RULES_H
#include <climits>
@@ -180,4 +180,4 @@ class HoApplyTypeRule {
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__UF__THEORY_UF_TYPE_RULES_H */
+#endif /* CVC5__THEORY__UF__THEORY_UF_TYPE_RULES_H */
diff --git a/src/theory/valuation.h b/src/theory/valuation.h
index ce4e95247..806b0dd8e 100644
--- a/src/theory/valuation.h
+++ b/src/theory/valuation.h
@@ -18,8 +18,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__THEORY__VALUATION_H
-#define CVC4__THEORY__VALUATION_H
+#ifndef CVC5__THEORY__VALUATION_H
+#define CVC5__THEORY__VALUATION_H
#include "context/cdlist.h"
#include "expr/node.h"
@@ -219,4 +219,4 @@ public:
} // namespace theory
} // namespace cvc5
-#endif /* CVC4__THEORY__VALUATION_H */
+#endif /* CVC5__THEORY__VALUATION_H */
diff --git a/src/util/bin_heap.h b/src/util/bin_heap.h
index 4306cd731..7df5aa36d 100644
--- a/src/util/bin_heap.h
+++ b/src/util/bin_heap.h
@@ -20,8 +20,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__BIN_HEAP_H
-#define CVC4__BIN_HEAP_H
+#ifndef CVC5__BIN_HEAP_H
+#define CVC5__BIN_HEAP_H
#include <limits>
#include <functional>
@@ -365,4 +365,4 @@ const size_t BinaryHeap<Elem,CmpFcn>::MAX_SIZE = (std::numeric_limits<size_t>::m
} // namespace cvc5
-#endif /* CVC4__BIN_HEAP_H */
+#endif /* CVC5__BIN_HEAP_H */
diff --git a/src/util/bitvector.h b/src/util/bitvector.h
index 12908166d..c069949ef 100644
--- a/src/util/bitvector.h
+++ b/src/util/bitvector.h
@@ -16,8 +16,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__BITVECTOR_H
-#define CVC4__BITVECTOR_H
+#ifndef CVC5__BITVECTOR_H
+#define CVC5__BITVECTOR_H
#include <iosfwd>
#include <iostream>
@@ -444,4 +444,4 @@ inline std::ostream& operator<<(std::ostream& os, const IntToBitVector& bv)
} // namespace cvc5
-#endif /* CVC4__BITVECTOR_H */
+#endif /* CVC5__BITVECTOR_H */
diff --git a/src/util/bool.h b/src/util/bool.h
index 01d97a43a..46e5eda1a 100644
--- a/src/util/bool.h
+++ b/src/util/bool.h
@@ -16,8 +16,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__BOOL_H
-#define CVC4__BOOL_H
+#ifndef CVC5__BOOL_H
+#define CVC5__BOOL_H
namespace cvc5 {
@@ -29,4 +29,4 @@ struct BoolHashFunction {
} // namespace cvc5
-#endif /* CVC4__BOOL_H */
+#endif /* CVC5__BOOL_H */
diff --git a/src/util/cardinality.h b/src/util/cardinality.h
index f188a8c8c..36b07c29d 100644
--- a/src/util/cardinality.h
+++ b/src/util/cardinality.h
@@ -17,8 +17,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__CARDINALITY_H
-#define CVC4__CARDINALITY_H
+#ifndef CVC5__CARDINALITY_H
+#define CVC5__CARDINALITY_H
#include <iosfwd>
@@ -227,4 +227,4 @@ std::ostream& operator<<(std::ostream& out, const Cardinality& c);
} // namespace cvc5
-#endif /* CVC4__CARDINALITY_H */
+#endif /* CVC5__CARDINALITY_H */
diff --git a/src/util/cardinality_class.h b/src/util/cardinality_class.h
index c46897550..49f2b74c0 100644
--- a/src/util/cardinality_class.h
+++ b/src/util/cardinality_class.h
@@ -14,8 +14,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__UTIL__CARDINALITY_CLASS_H
-#define CVC4__UTIL__CARDINALITY_CLASS_H
+#ifndef CVC5__UTIL__CARDINALITY_CLASS_H
+#define CVC5__UTIL__CARDINALITY_CLASS_H
#include <iosfwd>
diff --git a/src/util/divisible.h b/src/util/divisible.h
index 95934a52a..2cfe95ec7 100644
--- a/src/util/divisible.h
+++ b/src/util/divisible.h
@@ -17,8 +17,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__DIVISIBLE_H
-#define CVC4__DIVISIBLE_H
+#ifndef CVC5__DIVISIBLE_H
+#define CVC5__DIVISIBLE_H
#include <iosfwd>
#include <ostream>
@@ -63,4 +63,4 @@ inline std::ostream& operator <<(std::ostream& os, const Divisible& d) {
} // namespace cvc5
-#endif /* CVC4__DIVISIBLE_H */
+#endif /* CVC5__DIVISIBLE_H */
diff --git a/src/util/floatingpoint.h b/src/util/floatingpoint.h
index e038959a0..e65c89b8a 100644
--- a/src/util/floatingpoint.h
+++ b/src/util/floatingpoint.h
@@ -17,8 +17,8 @@
**/
#include "cvc4_public.h"
-#ifndef CVC4__FLOATINGPOINT_H
-#define CVC4__FLOATINGPOINT_H
+#ifndef CVC5__FLOATINGPOINT_H
+#define CVC5__FLOATINGPOINT_H
#include <memory>
@@ -535,4 +535,4 @@ std::ostream& operator<<(std::ostream& os,
} // namespace cvc5
-#endif /* CVC4__FLOATINGPOINT_H */
+#endif /* CVC5__FLOATINGPOINT_H */
diff --git a/src/util/floatingpoint_literal_symfpu.h.in b/src/util/floatingpoint_literal_symfpu.h.in
index dd58f1beb..8ef62c63b 100644
--- a/src/util/floatingpoint_literal_symfpu.h.in
+++ b/src/util/floatingpoint_literal_symfpu.h.in
@@ -15,8 +15,8 @@
**/
#include "cvc4_public.h"
-#ifndef CVC4__UTIL__FLOATINGPOINT_LITERAL_SYMFPU_H
-#define CVC4__UTIL__FLOATINGPOINT_LITERAL_SYMFPU_H
+#ifndef CVC5__UTIL__FLOATINGPOINT_LITERAL_SYMFPU_H
+#define CVC5__UTIL__FLOATINGPOINT_LITERAL_SYMFPU_H
#include "util/bitvector.h"
#include "util/floatingpoint_size.h"
diff --git a/src/util/floatingpoint_literal_symfpu_traits.h.in b/src/util/floatingpoint_literal_symfpu_traits.h.in
index 8bda58cfe..19abc009e 100644
--- a/src/util/floatingpoint_literal_symfpu_traits.h.in
+++ b/src/util/floatingpoint_literal_symfpu_traits.h.in
@@ -23,8 +23,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__UTIL__FLOATINGPOINT_LITERAL_SYMFPU_TRAITS_H
-#define CVC4__UTIL__FLOATINGPOINT_LITERAL_SYMFPU_TRAITS_H
+#ifndef CVC5__UTIL__FLOATINGPOINT_LITERAL_SYMFPU_TRAITS_H
+#define CVC5__UTIL__FLOATINGPOINT_LITERAL_SYMFPU_TRAITS_H
// clang-format off
#if @CVC4_USE_SYMFPU@
diff --git a/src/util/floatingpoint_size.h b/src/util/floatingpoint_size.h
index 8350ffaec..9322b9f72 100644
--- a/src/util/floatingpoint_size.h
+++ b/src/util/floatingpoint_size.h
@@ -13,8 +13,8 @@
**/
#include "cvc4_public.h"
-#ifndef CVC4__FLOATINGPOINT_SIZE_H
-#define CVC4__FLOATINGPOINT_SIZE_H
+#ifndef CVC5__FLOATINGPOINT_SIZE_H
+#define CVC5__FLOATINGPOINT_SIZE_H
namespace cvc5 {
diff --git a/src/util/gmp_util.h b/src/util/gmp_util.h
index 0b08f4f38..31c2eea84 100644
--- a/src/util/gmp_util.h
+++ b/src/util/gmp_util.h
@@ -17,8 +17,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__GMP_UTIL_H
-#define CVC4__GMP_UTIL_H
+#ifndef CVC5__GMP_UTIL_H
+#define CVC5__GMP_UTIL_H
#include <gmpxx.h>
@@ -37,4 +37,4 @@ inline size_t gmpz_hash(const mpz_t toHash) {
} // namespace cvc5
-#endif /* CVC4__GMP_UTIL_H */
+#endif /* CVC5__GMP_UTIL_H */
diff --git a/src/util/hash.h b/src/util/hash.h
index 6ba4534d1..d21188f2c 100644
--- a/src/util/hash.h
+++ b/src/util/hash.h
@@ -17,8 +17,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__HASH_H
-#define CVC4__HASH_H
+#ifndef CVC5__HASH_H
+#define CVC5__HASH_H
#include <functional>
#include <string>
@@ -66,4 +66,4 @@ struct PairHashFunction {
} // namespace cvc5
-#endif /* CVC4__HASH_H */
+#endif /* CVC5__HASH_H */
diff --git a/src/util/iand.h b/src/util/iand.h
index e1a42b11b..b05d23547 100644
--- a/src/util/iand.h
+++ b/src/util/iand.h
@@ -14,8 +14,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__IAND_H
-#define CVC4__IAND_H
+#ifndef CVC5__IAND_H
+#define CVC5__IAND_H
#include <iosfwd>
@@ -43,4 +43,4 @@ inline std::ostream& operator<<(std::ostream& os, const IntAnd& ia)
} // namespace cvc5
-#endif /* CVC4__IAND_H */
+#endif /* CVC5__IAND_H */
diff --git a/src/util/index.h b/src/util/index.h
index 6da0d8602..9ba608ef6 100644
--- a/src/util/index.h
+++ b/src/util/index.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__INDEX_H
-#define CVC4__INDEX_H
+#ifndef CVC5__INDEX_H
+#define CVC5__INDEX_H
namespace cvc5 {
@@ -26,4 +26,4 @@ using Index = uint32_t;
} // namespace cvc5
-#endif /* CVC4__INDEX_H */
+#endif /* CVC5__INDEX_H */
diff --git a/src/util/indexed_root_predicate.h b/src/util/indexed_root_predicate.h
index a35ecaa12..9d03bc677 100644
--- a/src/util/indexed_root_predicate.h
+++ b/src/util/indexed_root_predicate.h
@@ -16,8 +16,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__UTIL__INDEXED_ROOT_PREDICATE_H
-#define CVC4__UTIL__INDEXED_ROOT_PREDICATE_H
+#ifndef CVC5__UTIL__INDEXED_ROOT_PREDICATE_H
+#define CVC5__UTIL__INDEXED_ROOT_PREDICATE_H
namespace cvc5 {
diff --git a/src/util/integer_cln_imp.h b/src/util/integer_cln_imp.h
index d3d9faf56..c3a9434b9 100644
--- a/src/util/integer_cln_imp.h
+++ b/src/util/integer_cln_imp.h
@@ -17,8 +17,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__INTEGER_H
-#define CVC4__INTEGER_H
+#ifndef CVC5__INTEGER_H
+#define CVC5__INTEGER_H
#include <cln/input.h>
#include <cln/integer.h>
@@ -387,4 +387,4 @@ std::ostream& operator<<(std::ostream& os, const Integer& n);
} // namespace cvc5
-#endif /* CVC4__INTEGER_H */
+#endif /* CVC5__INTEGER_H */
diff --git a/src/util/integer_gmp_imp.h b/src/util/integer_gmp_imp.h
index 0d129ef45..077babe17 100644
--- a/src/util/integer_gmp_imp.h
+++ b/src/util/integer_gmp_imp.h
@@ -17,8 +17,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__INTEGER_H
-#define CVC4__INTEGER_H
+#ifndef CVC5__INTEGER_H
+#define CVC5__INTEGER_H
#include <gmpxx.h>
@@ -340,4 +340,4 @@ inline std::ostream& operator<<(std::ostream& os, const Integer& n)
} // namespace cvc5
-#endif /* CVC4__INTEGER_H */
+#endif /* CVC5__INTEGER_H */
diff --git a/src/util/maybe.h b/src/util/maybe.h
index 688073b8c..0d6489ad8 100644
--- a/src/util/maybe.h
+++ b/src/util/maybe.h
@@ -24,8 +24,8 @@
**/
#include "cvc4_public.h"
-#ifndef CVC4__UTIL__MAYBE_H
-#define CVC4__UTIL__MAYBE_H
+#ifndef CVC5__UTIL__MAYBE_H
+#define CVC5__UTIL__MAYBE_H
#include <ostream>
@@ -86,4 +86,4 @@ inline std::ostream& operator<<(std::ostream& out, const Maybe<T>& m){
} // namespace cvc5
-#endif /* CVC4__UTIL__MAYBE_H */
+#endif /* CVC5__UTIL__MAYBE_H */
diff --git a/src/util/ostream_util.h b/src/util/ostream_util.h
index ab61faaca..f1b343b21 100644
--- a/src/util/ostream_util.h
+++ b/src/util/ostream_util.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__UTIL__OSTREAM_UTIL_H
-#define CVC4__UTIL__OSTREAM_UTIL_H
+#ifndef CVC5__UTIL__OSTREAM_UTIL_H
+#define CVC5__UTIL__OSTREAM_UTIL_H
#include <ios>
#include <iosfwd>
@@ -46,4 +46,4 @@ class StreamFormatScope
} // namespace cvc5
-#endif /* CVC4__UTIL__OSTREAM_UTIL_H */
+#endif /* CVC5__UTIL__OSTREAM_UTIL_H */
diff --git a/src/util/poly_util.h b/src/util/poly_util.h
index 217f7c774..2ab44e120 100644
--- a/src/util/poly_util.h
+++ b/src/util/poly_util.h
@@ -22,8 +22,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__POLY_UTIL_H
-#define CVC4__POLY_UTIL_H
+#ifndef CVC5__POLY_UTIL_H
+#define CVC5__POLY_UTIL_H
#include <vector>
@@ -142,4 +142,4 @@ void getVariableInformation(VariableInformation& vi,
#endif
-#endif /* CVC4__POLY_UTIL_H */
+#endif /* CVC5__POLY_UTIL_H */
diff --git a/src/util/random.h b/src/util/random.h
index 738f5c510..32ec33a68 100644
--- a/src/util/random.h
+++ b/src/util/random.h
@@ -18,8 +18,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__UTIL__RANDOM_H
-#define CVC4__UTIL__RANDOM_H
+#ifndef CVC5__UTIL__RANDOM_H
+#define CVC5__UTIL__RANDOM_H
namespace cvc5 {
diff --git a/src/util/rational_cln_imp.h b/src/util/rational_cln_imp.h
index d62694868..992218ed0 100644
--- a/src/util/rational_cln_imp.h
+++ b/src/util/rational_cln_imp.h
@@ -17,8 +17,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__RATIONAL_H
-#define CVC4__RATIONAL_H
+#ifndef CVC5__RATIONAL_H
+#define CVC5__RATIONAL_H
#include <cln/dfloat.h>
#include <cln/input.h>
@@ -343,4 +343,4 @@ std::ostream& operator<<(std::ostream& os, const Rational& n) CVC4_EXPORT;
} // namespace cvc5
-#endif /* CVC4__RATIONAL_H */
+#endif /* CVC5__RATIONAL_H */
diff --git a/src/util/rational_gmp_imp.h b/src/util/rational_gmp_imp.h
index 2bfc2a5b9..caaa26d1e 100644
--- a/src/util/rational_gmp_imp.h
+++ b/src/util/rational_gmp_imp.h
@@ -17,8 +17,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__RATIONAL_H
-#define CVC4__RATIONAL_H
+#ifndef CVC5__RATIONAL_H
+#define CVC5__RATIONAL_H
#include <gmp.h>
@@ -333,4 +333,4 @@ std::ostream& operator<<(std::ostream& os, const Rational& n) CVC4_EXPORT;
} // namespace cvc5
-#endif /* CVC4__RATIONAL_H */
+#endif /* CVC5__RATIONAL_H */
diff --git a/src/util/real_algebraic_number_poly_imp.h b/src/util/real_algebraic_number_poly_imp.h
index b376a236a..6b014830c 100644
--- a/src/util/real_algebraic_number_poly_imp.h
+++ b/src/util/real_algebraic_number_poly_imp.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__REAL_ALGEBRAIC_NUMBER_H
-#define CVC4__REAL_ALGEBRAIC_NUMBER_H
+#ifndef CVC5__REAL_ALGEBRAIC_NUMBER_H
+#define CVC5__REAL_ALGEBRAIC_NUMBER_H
#include <vector>
@@ -150,4 +150,4 @@ bool isOne(const RealAlgebraicNumber& ran);
} // namespace cvc5
-#endif /* CVC4__REAL_ALGEBRAIC_NUMBER_H */
+#endif /* CVC5__REAL_ALGEBRAIC_NUMBER_H */
diff --git a/src/util/regexp.h b/src/util/regexp.h
index 0f929ff9e..b0862e15a 100644
--- a/src/util/regexp.h
+++ b/src/util/regexp.h
@@ -14,8 +14,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__UTIL__REGEXP_H
-#define CVC4__UTIL__REGEXP_H
+#ifndef CVC5__UTIL__REGEXP_H
+#define CVC5__UTIL__REGEXP_H
#include <iosfwd>
@@ -71,4 +71,4 @@ std::ostream& operator<<(std::ostream& os, const RegExpLoop& bv);
} // namespace cvc5
-#endif /* CVC4__UTIL__REGEXP_H */
+#endif /* CVC5__UTIL__REGEXP_H */
diff --git a/src/util/resource_manager.h b/src/util/resource_manager.h
index 64a94cdc9..787dd9a0a 100644
--- a/src/util/resource_manager.h
+++ b/src/util/resource_manager.h
@@ -18,8 +18,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__RESOURCE_MANAGER_H
-#define CVC4__RESOURCE_MANAGER_H
+#ifndef CVC5__RESOURCE_MANAGER_H
+#define CVC5__RESOURCE_MANAGER_H
#include <stdint.h>
#include <chrono>
@@ -208,4 +208,4 @@ class ResourceManager
} // namespace cvc5
-#endif /* CVC4__RESOURCE_MANAGER_H */
+#endif /* CVC5__RESOURCE_MANAGER_H */
diff --git a/src/util/result.h b/src/util/result.h
index 9fdd61792..b7cd1a6b6 100644
--- a/src/util/result.h
+++ b/src/util/result.h
@@ -16,8 +16,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__RESULT_H
-#define CVC4__RESULT_H
+#ifndef CVC5__RESULT_H
+#define CVC5__RESULT_H
#include <iosfwd>
#include <string>
@@ -162,4 +162,4 @@ bool operator!=(enum Result::Entailment e, const Result& r);
} // namespace cvc5
-#endif /* CVC4__RESULT_H */
+#endif /* CVC5__RESULT_H */
diff --git a/src/util/roundingmode.h b/src/util/roundingmode.h
index 2acc5a457..482e28781 100644
--- a/src/util/roundingmode.h
+++ b/src/util/roundingmode.h
@@ -13,8 +13,8 @@
**/
#include "cvc4_public.h"
-#ifndef CVC4__ROUNDINGMODE_H
-#define CVC4__ROUNDINGMODE_H
+#ifndef CVC5__ROUNDINGMODE_H
+#define CVC5__ROUNDINGMODE_H
#include <fenv.h>
diff --git a/src/util/safe_print.h b/src/util/safe_print.h
index ca844ef73..92eaaaeff 100644
--- a/src/util/safe_print.h
+++ b/src/util/safe_print.h
@@ -34,8 +34,8 @@
#include "cvc4_private_library.h"
-#ifndef CVC4__SAFE_PRINT_H
-#define CVC4__SAFE_PRINT_H
+#ifndef CVC5__SAFE_PRINT_H
+#define CVC5__SAFE_PRINT_H
#include <unistd.h>
@@ -138,4 +138,4 @@ void safe_print_right_aligned(int fd, uint64_t i, ssize_t width);
} // namespace cvc5
-#endif /* CVC4__SAFE_PRINT_H */
+#endif /* CVC5__SAFE_PRINT_H */
diff --git a/src/util/sampler.h b/src/util/sampler.h
index 19ed68c0f..96dbf27e2 100644
--- a/src/util/sampler.h
+++ b/src/util/sampler.h
@@ -17,8 +17,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__UTIL_FLOATINGPOINT_SAMPLER_H
-#define CVC4__UTIL_FLOATINGPOINT_SAMPLER_H
+#ifndef CVC5__UTIL_FLOATINGPOINT_SAMPLER_H
+#define CVC5__UTIL_FLOATINGPOINT_SAMPLER_H
#include "util/floatingpoint.h"
@@ -54,4 +54,4 @@ class Sampler
} // namespace cvc5
-#endif /* CVC4__UTIL_FLOATINGPOINT_SAMPLER_H */
+#endif /* CVC5__UTIL_FLOATINGPOINT_SAMPLER_H */
diff --git a/src/util/sexpr.h b/src/util/sexpr.h
index 3fcd398f7..7d76188bc 100644
--- a/src/util/sexpr.h
+++ b/src/util/sexpr.h
@@ -23,8 +23,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__SEXPR_H
-#define CVC4__SEXPR_H
+#ifndef CVC5__SEXPR_H
+#define CVC5__SEXPR_H
#include <iosfwd>
#include <string>
@@ -303,4 +303,4 @@ std::ostream& operator<<(std::ostream& out, PrettySExprs ps);
} // namespace cvc5
-#endif /* CVC4__SEXPR_H */
+#endif /* CVC5__SEXPR_H */
diff --git a/src/util/smt2_quote_string.h b/src/util/smt2_quote_string.h
index be2546053..487b10537 100644
--- a/src/util/smt2_quote_string.h
+++ b/src/util/smt2_quote_string.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__UTIL__SMT2_QUOTE_STRING_H
-#define CVC4__UTIL__SMT2_QUOTE_STRING_H
+#ifndef CVC5__UTIL__SMT2_QUOTE_STRING_H
+#define CVC5__UTIL__SMT2_QUOTE_STRING_H
#include <string>
@@ -30,4 +30,4 @@ std::string quoteSymbol(const std::string& s);
} // namespace cvc5
-#endif /* CVC4__UTIL__SMT2_QUOTE_STRING_H */
+#endif /* CVC5__UTIL__SMT2_QUOTE_STRING_H */
diff --git a/src/util/statistics.h b/src/util/statistics.h
index 8989cb60d..0f6c7c7b9 100644
--- a/src/util/statistics.h
+++ b/src/util/statistics.h
@@ -17,8 +17,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__STATISTICS_H
-#define CVC4__STATISTICS_H
+#ifndef CVC5__STATISTICS_H
+#define CVC5__STATISTICS_H
#include <iterator>
#include <ostream>
@@ -129,4 +129,4 @@ public:
} // namespace cvc5
-#endif /* CVC4__STATISTICS_H */
+#endif /* CVC5__STATISTICS_H */
diff --git a/src/util/statistics_public.h b/src/util/statistics_public.h
index c2d054f00..bc0882716 100644
--- a/src/util/statistics_public.h
+++ b/src/util/statistics_public.h
@@ -16,8 +16,8 @@
#include "cvc4_private_library.h"
-#ifndef CVC4__UTIL__STATISTICS_PUBLIC_H
-#define CVC4__UTIL__STATISTICS_PUBLIC_H
+#ifndef CVC5__UTIL__STATISTICS_PUBLIC_H
+#define CVC5__UTIL__STATISTICS_PUBLIC_H
namespace cvc5 {
diff --git a/src/util/statistics_reg.h b/src/util/statistics_reg.h
index e020a05b4..655d63a8c 100644
--- a/src/util/statistics_reg.h
+++ b/src/util/statistics_reg.h
@@ -16,8 +16,8 @@
#include "cvc4_private_library.h"
-#ifndef CVC4__UTIL__STATISTICS_REG_H
-#define CVC4__UTIL__STATISTICS_REG_H
+#ifndef CVC5__UTIL__STATISTICS_REG_H
+#define CVC5__UTIL__STATISTICS_REG_H
#include <iostream>
#include <map>
diff --git a/src/util/statistics_registry.h b/src/util/statistics_registry.h
index 44f40d5d3..cf47bdf2e 100644
--- a/src/util/statistics_registry.h
+++ b/src/util/statistics_registry.h
@@ -81,8 +81,8 @@
#include "cvc4_private_library.h"
-#ifndef CVC4__STATISTICS_REGISTRY_H
-#define CVC4__STATISTICS_REGISTRY_H
+#ifndef CVC5__STATISTICS_REGISTRY_H
+#define CVC5__STATISTICS_REGISTRY_H
#include <ctime>
#include <iomanip>
@@ -198,4 +198,4 @@ private:
} // namespace cvc5
-#endif /* CVC4__STATISTICS_REGISTRY_H */
+#endif /* CVC5__STATISTICS_REGISTRY_H */
diff --git a/src/util/statistics_stats.h b/src/util/statistics_stats.h
index 9757c31cc..97778bb5f 100644
--- a/src/util/statistics_stats.h
+++ b/src/util/statistics_stats.h
@@ -20,8 +20,8 @@
#include "cvc4_private_library.h"
-#ifndef CVC4__UTIL__STATISTICS_STATS_H
-#define CVC4__UTIL__STATISTICS_STATS_H
+#ifndef CVC5__UTIL__STATISTICS_STATS_H
+#define CVC5__UTIL__STATISTICS_STATS_H
#include <optional>
diff --git a/src/util/statistics_value.h b/src/util/statistics_value.h
index a272c7a05..67fd37118 100644
--- a/src/util/statistics_value.h
+++ b/src/util/statistics_value.h
@@ -24,8 +24,8 @@
#include "cvc4_private_library.h"
-#ifndef CVC4__UTIL__STATISTICS_VALUE_H
-#define CVC4__UTIL__STATISTICS_VALUE_H
+#ifndef CVC5__UTIL__STATISTICS_VALUE_H
+#define CVC5__UTIL__STATISTICS_VALUE_H
#include <chrono>
#include <iomanip>
diff --git a/src/util/stats_base.h b/src/util/stats_base.h
index e59e6e57c..86a9321c0 100644
--- a/src/util/stats_base.h
+++ b/src/util/stats_base.h
@@ -16,8 +16,8 @@
#include "cvc4_private_library.h"
-#ifndef CVC4__UTIL__STATS_BASE_H
-#define CVC4__UTIL__STATS_BASE_H
+#ifndef CVC5__UTIL__STATS_BASE_H
+#define CVC5__UTIL__STATS_BASE_H
#include <iomanip>
#include <sstream>
diff --git a/src/util/stats_histogram.h b/src/util/stats_histogram.h
index 5a8f21fe8..ba2135b58 100644
--- a/src/util/stats_histogram.h
+++ b/src/util/stats_histogram.h
@@ -16,8 +16,8 @@
#include "cvc4_private_library.h"
-#ifndef CVC4__UTIL__STATS_HISTOGRAM_H
-#define CVC4__UTIL__STATS_HISTOGRAM_H
+#ifndef CVC5__UTIL__STATS_HISTOGRAM_H
+#define CVC5__UTIL__STATS_HISTOGRAM_H
#include <map>
#include <vector>
diff --git a/src/util/stats_timer.h b/src/util/stats_timer.h
index 92ea87b59..981c705f9 100644
--- a/src/util/stats_timer.h
+++ b/src/util/stats_timer.h
@@ -16,8 +16,8 @@
#include "cvc4_private_library.h"
-#ifndef CVC4__UTIL__STATS_TIMER_H
-#define CVC4__UTIL__STATS_TIMER_H
+#ifndef CVC5__UTIL__STATS_TIMER_H
+#define CVC5__UTIL__STATS_TIMER_H
#include <chrono>
diff --git a/src/util/stats_utils.h b/src/util/stats_utils.h
index 001a4cf82..8488f66cf 100644
--- a/src/util/stats_utils.h
+++ b/src/util/stats_utils.h
@@ -16,8 +16,8 @@
#include "cvc4_private_library.h"
-#ifndef CVC4__UTIL__STATS_UTILS_H
-#define CVC4__UTIL__STATS_UTILS_H
+#ifndef CVC5__UTIL__STATS_UTILS_H
+#define CVC5__UTIL__STATS_UTILS_H
#include <iosfwd>
diff --git a/src/util/string.h b/src/util/string.h
index 6fc23f124..1df23b61a 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -14,8 +14,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__UTIL__STRING_H
-#define CVC4__UTIL__STRING_H
+#ifndef CVC5__UTIL__STRING_H
+#define CVC5__UTIL__STRING_H
#include <iosfwd>
#include <string>
@@ -277,4 +277,4 @@ std::ostream& operator<<(std::ostream& os, const String& s);
} // namespace cvc5
-#endif /* CVC4__UTIL__STRING_H */
+#endif /* CVC5__UTIL__STRING_H */
diff --git a/src/util/tuple.h b/src/util/tuple.h
index 5a3693691..3e6c0d677 100644
--- a/src/util/tuple.h
+++ b/src/util/tuple.h
@@ -16,8 +16,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__TUPLE_H
-#define CVC4__TUPLE_H
+#ifndef CVC5__TUPLE_H
+#define CVC5__TUPLE_H
#include <iostream>
#include <vector>
@@ -51,4 +51,4 @@ inline std::ostream& operator<<(std::ostream& out, const TupleUpdate& t) {
} // namespace cvc5
-#endif /* CVC4__TUPLE_H */
+#endif /* CVC5__TUPLE_H */
diff --git a/src/util/unsafe_interrupt_exception.h b/src/util/unsafe_interrupt_exception.h
index 39817620d..876bec2c8 100644
--- a/src/util/unsafe_interrupt_exception.h
+++ b/src/util/unsafe_interrupt_exception.h
@@ -15,8 +15,8 @@
#include "cvc4_public.h"
-#ifndef CVC4__UNSAFE_INTERRUPT_EXCEPTION_H
-#define CVC4__UNSAFE_INTERRUPT_EXCEPTION_H
+#ifndef CVC5__UNSAFE_INTERRUPT_EXCEPTION_H
+#define CVC5__UNSAFE_INTERRUPT_EXCEPTION_H
#include "base/exception.h"
#include "cvc4_export.h"
@@ -42,4 +42,4 @@ class CVC4_EXPORT UnsafeInterruptException : public cvc5::Exception
} // namespace cvc5
-#endif /* CVC4__UNSAFE_INTERRUPT_EXCEPTION_H */
+#endif /* CVC5__UNSAFE_INTERRUPT_EXCEPTION_H */
diff --git a/src/util/utility.h b/src/util/utility.h
index 133e51025..a11abe4e7 100644
--- a/src/util/utility.h
+++ b/src/util/utility.h
@@ -16,8 +16,8 @@
#include "cvc4_private.h"
-#ifndef CVC4__UTILITY_H
-#define CVC4__UTILITY_H
+#ifndef CVC5__UTILITY_H
+#define CVC5__UTILITY_H
#include <algorithm>
#include <fstream>
@@ -79,4 +79,4 @@ std::unique_ptr<std::fstream> openTmpFile(std::string* pattern);
} // namespace cvc5
-#endif /* CVC4__UTILITY_H */
+#endif /* CVC5__UTILITY_H */
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback