diff --git a/scripts/update_header_guards.py b/scripts/update_header_guards.py
new file mode 100644
index 000000000..1cb2ae186
--- /dev/null
+++ b/scripts/update_header_guards.py
@@ -0,0 +1,60 @@
+# Copyright (c) 2015 Microsoft Corporation
+
+import os
+import re
+
+ifndef = re.compile("#ifndef \_(.*)\_H\_")
+defn   = re.compile("#define \_(.*)\_H\_")
+endif  = re.compile("#endif /\* \_(.*)\_H\_")
+
+
+def fix_hdr(file):
+    print file
+    tmp = "%s.tmp" % file
+    ins = open(file)
+    ous = open(tmp,'w')
+    line = ins.readline()
+    found = False
+    while line:
+	m = ifndef.search(line)
+	if m:
+	    print m.group(1)
+	    ous.write("#ifndef ")
+	    ous.write(m.group(1))
+	    ous.write("_H_\n")
+	    line = ins.readline()
+	    found = True
+	    continue
+	m = defn.search(line)
+	if m:
+	    ous.write("#define ")
+	    ous.write(m.group(1))
+	    ous.write("_H_\n")
+	    line = ins.readline()
+	    found = True
+	    continue
+	m = endif.search(line)
+	if m:
+	    ous.write("#endif /* ")
+	    ous.write(m.group(1))
+	    ous.write("_H_ */\n")
+	    line = ins.readline()
+	    found = True
+	    continue
+	ous.write(line)
+	line = ins.readline()
+    ins.close()
+    ous.close()
+    if found:
+	os.system("move %s %s" % (tmp, file))
+    else:
+	os.system("del %s" % tmp)
+    
+def fixup(dir):
+    for root, dirs, files in os.walk(dir):
+	for f in files:
+	    if f.endswith('.h'):
+		path = "%s\\%s" % (root, f)
+		fix_hdr(path)
+
+fixup('src')
diff --git a/src/api/api_ast_map.h b/src/api/api_ast_map.h
index 54bf3432c..8e4f24623 100644
--- a/src/api/api_ast_map.h
+++ b/src/api/api_ast_map.h
@@ -15,8 +15,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _API_AST_MAP_H_
-#define _API_AST_MAP_H_
+#ifndef API_AST_MAP_H_
+#define API_AST_MAP_H_
 
 #include"api_util.h"
 #include"obj_hashtable.h"
diff --git a/src/api/api_ast_vector.h b/src/api/api_ast_vector.h
index 5071390a3..20efa21c5 100644
--- a/src/api/api_ast_vector.h
+++ b/src/api/api_ast_vector.h
@@ -15,8 +15,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _API_AST_VECTOR_H_
-#define _API_AST_VECTOR_H_
+#ifndef API_AST_VECTOR_H_
+#define API_AST_VECTOR_H_
 
 #include"api_util.h"
 
diff --git a/src/api/api_context.h b/src/api/api_context.h
index 719902f89..882974005 100644
--- a/src/api/api_context.h
+++ b/src/api/api_context.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _API_CONTEXT_H_
-#define _API_CONTEXT_H_
+#ifndef API_CONTEXT_H_
+#define API_CONTEXT_H_
 
 #include"z3.h"
 #include"ast.h"
diff --git a/src/api/api_datalog.h b/src/api/api_datalog.h
index f5bfada33..8317426c1 100644
--- a/src/api/api_datalog.h
+++ b/src/api/api_datalog.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _API_DATALOG_H_
-#define _API_DATALOG_H_
+#ifndef API_DATALOG_H_
+#define API_DATALOG_H_
 
 #include"z3.h"
 #include"ast.h"
diff --git a/src/api/api_goal.h b/src/api/api_goal.h
index 50baf451e..c3d4d44f2 100644
--- a/src/api/api_goal.h
+++ b/src/api/api_goal.h
@@ -15,8 +15,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _API_GOAL_H_
-#define _API_GOAL_H_
+#ifndef API_GOAL_H_
+#define API_GOAL_H_
 
 #include"api_util.h"
 #include"goal.h"
diff --git a/src/api/api_model.h b/src/api/api_model.h
index 454bd48cb..719326aaf 100644
--- a/src/api/api_model.h
+++ b/src/api/api_model.h
@@ -15,8 +15,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _API_MODEL_H_
-#define _API_MODEL_H_
+#ifndef API_MODEL_H_
+#define API_MODEL_H_
 
 #include"api_util.h"
 #include"model.h"
diff --git a/src/api/api_polynomial.h b/src/api/api_polynomial.h
index 27317a7dd..a5a0bd7c3 100644
--- a/src/api/api_polynomial.h
+++ b/src/api/api_polynomial.h
@@ -16,8 +16,8 @@ Author:
 Notes:
     
 --*/
-#ifndef _API_POLYNOMIAL_H_
-#define _API_POLYNOMIAL_H_
+#ifndef API_POLYNOMIAL_H_
+#define API_POLYNOMIAL_H_
 
 #include"polynomial.h"
 
diff --git a/src/api/api_solver.h b/src/api/api_solver.h
index f11c9bfd8..5ed7a15f7 100644
--- a/src/api/api_solver.h
+++ b/src/api/api_solver.h
@@ -15,8 +15,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _API_SOLVER_H_
-#define _API_SOLVER_H_
+#ifndef API_SOLVER_H_
+#define API_SOLVER_H_
 
 #include"api_util.h"
 #include"solver.h"
diff --git a/src/api/api_stats.h b/src/api/api_stats.h
index 393161309..e0e370336 100644
--- a/src/api/api_stats.h
+++ b/src/api/api_stats.h
@@ -15,8 +15,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _API_STATS_H_
-#define _API_STATS_H_
+#ifndef API_STATS_H_
+#define API_STATS_H_
 
 #include"api_util.h"
 #include"statistics.h"
diff --git a/src/api/api_tactic.h b/src/api/api_tactic.h
index 80b24ff1a..6f8d83fd9 100644
--- a/src/api/api_tactic.h
+++ b/src/api/api_tactic.h
@@ -15,8 +15,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _API_TACTIC_H_
-#define _API_TACTIC_H_
+#ifndef API_TACTIC_H_
+#define API_TACTIC_H_
 
 #include"api_goal.h"
 #include"tactical.h"
diff --git a/src/api/api_util.h b/src/api/api_util.h
index b49ef8315..9befd8849 100644
--- a/src/api/api_util.h
+++ b/src/api/api_util.h
@@ -15,8 +15,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _API_UTIL_H_
-#define _API_UTIL_H_
+#ifndef API_UTIL_H_
+#define API_UTIL_H_
 
 #include"params.h"
 #include"lbool.h"
diff --git a/src/api/c++/z3++.h b/src/api/c++/z3++.h
index cd47d6900..a5d943e95 100644
--- a/src/api/c++/z3++.h
+++ b/src/api/c++/z3++.h
@@ -18,8 +18,8 @@ Author:
 Notes:
 
 --*/
-#ifndef __Z3PP_H_
-#define __Z3PP_H_
+#ifndef Z3PP_H_
+#define Z3PP_H_
 
 #include<cassert>
 #include<iostream>
diff --git a/src/api/z3.h b/src/api/z3.h
index bb7611030..84037ab67 100644
--- a/src/api/z3.h
+++ b/src/api/z3.h
@@ -18,8 +18,8 @@ Notes:
     
 --*/
 
-#ifndef _Z3__H_
-#define _Z3__H_
+#ifndef Z3__H_
+#define Z3__H_
 
 #include<stdio.h>
 #include"z3_macros.h"
diff --git a/src/api/z3_algebraic.h b/src/api/z3_algebraic.h
index 8b6d97aa8..79548ecb5 100644
--- a/src/api/z3_algebraic.h
+++ b/src/api/z3_algebraic.h
@@ -18,8 +18,8 @@ Notes:
     
 --*/
 
-#ifndef _Z3_ALGEBRAIC_H_
-#define _Z3_ALGEBRAIC_H_
+#ifndef Z3_ALGEBRAIC_H_
+#define Z3_ALGEBRAIC_H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/api/z3_api.h b/src/api/z3_api.h
index e299fa31a..fdaa9e0cf 100644
--- a/src/api/z3_api.h
+++ b/src/api/z3_api.h
@@ -4,8 +4,8 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#ifndef _Z3_API_H_
-#define _Z3_API_H_
+#ifndef Z3_API_H_
+#define Z3_API_H_
 
 #ifdef CAMLIDL
   #ifdef MLAPIV3
diff --git a/src/api/z3_fpa.h b/src/api/z3_fpa.h
index 7813142a3..f2a85b583 100644
--- a/src/api/z3_fpa.h
+++ b/src/api/z3_fpa.h
@@ -16,8 +16,8 @@ Author:
 Notes:
     
 --*/
-#ifndef _Z3_FPA_H_
-#define _Z3_FPA_H_
+#ifndef Z3_FPA_H_
+#define Z3_FPA_H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/api/z3_interp.h b/src/api/z3_interp.h
index 6ae26c0ed..c74aa3f95 100644
--- a/src/api/z3_interp.h
+++ b/src/api/z3_interp.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _Z3_INTERPOLATION_H_
-#define _Z3_INTERPOLATION_H_
+#ifndef Z3_INTERPOLATION_H_
+#define Z3_INTERPOLATION_H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/api/z3_polynomial.h b/src/api/z3_polynomial.h
index f55a63dd4..697873be9 100644
--- a/src/api/z3_polynomial.h
+++ b/src/api/z3_polynomial.h
@@ -17,8 +17,8 @@ Notes:
     
 --*/
 
-#ifndef _Z3_POLYNOMIAL_H_
-#define _Z3_POLYNOMIAL_H_
+#ifndef Z3_POLYNOMIAL_H_
+#define Z3_POLYNOMIAL_H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/api/z3_private.h b/src/api/z3_private.h
index 91becd158..3cfda6c72 100644
--- a/src/api/z3_private.h
+++ b/src/api/z3_private.h
@@ -22,8 +22,8 @@ Notes:
 #include"rational.h"
 #include"z3_macros.h"
 
-#ifndef _Z3_PRIVATE__H_
-#define _Z3_PRIVATE__H_
+#ifndef Z3_PRIVATE__H_
+#define Z3_PRIVATE__H_
 
 
 #ifndef CAMLIDL
diff --git a/src/api/z3_rcf.h b/src/api/z3_rcf.h
index 04fe40253..bcdf6a86c 100644
--- a/src/api/z3_rcf.h
+++ b/src/api/z3_rcf.h
@@ -19,8 +19,8 @@ Author:
 Notes:
     
 --*/
-#ifndef _Z3_RCF_H_
-#define _Z3_RCF_H_
+#ifndef Z3_RCF_H_
+#define Z3_RCF_H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/api/z3_replayer.h b/src/api/z3_replayer.h
index 1a5dc8237..6c566d553 100644
--- a/src/api/z3_replayer.h
+++ b/src/api/z3_replayer.h
@@ -16,8 +16,8 @@ Author:
 Notes:
     
 --*/
-#ifndef _Z3_REPLAYER_H_
-#define _Z3_REPLAYER_H_
+#ifndef Z3_REPLAYER_H_
+#define Z3_REPLAYER_H_
 
 #include<iostream>
 #include"z3.h"
diff --git a/src/api/z3_v1.h b/src/api/z3_v1.h
index 2c12fa610..11f492d88 100644
--- a/src/api/z3_v1.h
+++ b/src/api/z3_v1.h
@@ -18,8 +18,8 @@ Author:
 Notes:
     
 --*/
-#ifndef _Z3_V1_H_
-#define _Z3_V1_H_
+#ifndef Z3_V1_H_
+#define Z3_V1_H_
 
 #include"z3.h"
 
diff --git a/src/ast/act_cache.h b/src/ast/act_cache.h
index 0a95f0f40..b3567dec2 100644
--- a/src/ast/act_cache.h
+++ b/src/ast/act_cache.h
@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _ACT_CACHE_H_
-#define _ACT_CACHE_H_
+#ifndef ACT_CACHE_H_
+#define ACT_CACHE_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
diff --git a/src/ast/arith_decl_plugin.h b/src/ast/arith_decl_plugin.h
index cd33c7782..cfb6f5469 100644
--- a/src/ast/arith_decl_plugin.h
+++ b/src/ast/arith_decl_plugin.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _ARITH_DECL_PLUGIN_H_
-#define _ARITH_DECL_PLUGIN_H_
+#ifndef ARITH_DECL_PLUGIN_H_
+#define ARITH_DECL_PLUGIN_H_
 
 #include"ast.h"
 class sexpr;
@@ -399,5 +399,5 @@ public:
     }
 };
 
-#endif /* _ARITH_DECL_PLUGIN_H_ */
+#endif /* ARITH_DECL_PLUGIN_H_ */
 
diff --git a/src/ast/array_decl_plugin.h b/src/ast/array_decl_plugin.h
index 2184b0088..98fd563f0 100644
--- a/src/ast/array_decl_plugin.h
+++ b/src/ast/array_decl_plugin.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _ARRAY_DECL_PLUGIN_H_
-#define _ARRAY_DECL_PLUGIN_H_
+#ifndef ARRAY_DECL_PLUGIN_H_
+#define ARRAY_DECL_PLUGIN_H_
 
 #include"ast.h"
 
@@ -187,5 +187,5 @@ public:
 };
 
 
-#endif /* _ARRAY_DECL_PLUGIN_H_ */
+#endif /* ARRAY_DECL_PLUGIN_H_ */
 
diff --git a/src/ast/ast.h b/src/ast/ast.h
index 19b652033..216073125 100644
--- a/src/ast/ast.h
+++ b/src/ast/ast.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _AST_H_
-#define _AST_H_
+#ifndef AST_H_
+#define AST_H_
 
 #include"vector.h"
 #include"hashtable.h"
@@ -2450,6 +2450,6 @@ public:
     void operator()(AST * n) { m_manager.inc_ref(n); }
 };
 
-#endif /* _AST_H_ */
+#endif /* AST_H_ */
 
         
diff --git a/src/ast/ast_ll_pp.h b/src/ast/ast_ll_pp.h
index 2cfe83179..7fc527833 100644
--- a/src/ast/ast_ll_pp.h
+++ b/src/ast/ast_ll_pp.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _AST_LL_PP_H_
-#define _AST_LL_PP_H_
+#ifndef AST_LL_PP_H_
+#define AST_LL_PP_H_
 
 #include"ast.h"
 #include<iostream>
@@ -53,5 +53,5 @@ inline std::ostream & operator<<(std::ostream & out, mk_bounded_pp const & p) {
 }
 
 
-#endif /* _AST_LL_PP_H_ */
+#endif /* AST_LL_PP_H_ */
 
diff --git a/src/ast/ast_lt.h b/src/ast/ast_lt.h
index b405ab229..a5899ba9a 100644
--- a/src/ast/ast_lt.h
+++ b/src/ast/ast_lt.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _AST_LT_H_
-#define _AST_LT_H_
+#ifndef AST_LT_H_
+#define AST_LT_H_
 
 class ast;
 
diff --git a/src/ast/ast_pp.h b/src/ast/ast_pp.h
index 7e7bdfc4e..ecd7e3b13 100644
--- a/src/ast/ast_pp.h
+++ b/src/ast/ast_pp.h
@@ -18,8 +18,8 @@ Revision History:
     2012-11-17 - ast_smt2_pp is the official pretty printer in Z3
 
 --*/
-#ifndef _AST_PP_H_
-#define _AST_PP_H_
+#ifndef AST_PP_H_
+#define AST_PP_H_
 
 #include"ast_smt2_pp.h"
 
diff --git a/src/ast/ast_printer.h b/src/ast/ast_printer.h
index 3566c62bb..78fe822f6 100644
--- a/src/ast/ast_printer.h
+++ b/src/ast/ast_printer.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _AST_PRINTER_H_
-#define _AST_PRINTER_H_
+#ifndef AST_PRINTER_H_
+#define AST_PRINTER_H_
 
 #include"ast.h"
 #include"ast_smt2_pp.h"
diff --git a/src/ast/ast_smt2_pp.h b/src/ast/ast_smt2_pp.h
index e93b0cc58..04c3b35d4 100644
--- a/src/ast/ast_smt2_pp.h
+++ b/src/ast/ast_smt2_pp.h
@@ -19,8 +19,8 @@ Revision History:
 
 
 --*/
-#ifndef _AST_SMT2_PP_H_
-#define _AST_SMT2_PP_H_
+#ifndef AST_SMT2_PP_H_
+#define AST_SMT2_PP_H_
 
 #include"format.h"
 #include"params.h"
diff --git a/src/ast/ast_smt_pp.h b/src/ast/ast_smt_pp.h
index 97527759a..59b1596fa 100644
--- a/src/ast/ast_smt_pp.h
+++ b/src/ast/ast_smt_pp.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _AST_SMT_PP_H_
-#define _AST_SMT_PP_H_
+#ifndef AST_SMT_PP_H_
+#define AST_SMT_PP_H_
 
 #include"ast.h"
 #include<string>
diff --git a/src/ast/ast_trail.h b/src/ast/ast_trail.h
index 94039875e..4e2c542fd 100644
--- a/src/ast/ast_trail.h
+++ b/src/ast/ast_trail.h
@@ -19,8 +19,8 @@ Revision History:
     nbjorner 2014-9-28
 
 --*/
-#ifndef _AST_TRAIL_H_
-#define _AST_TRAIL_H_
+#ifndef AST_TRAIL_H_
+#define AST_TRAIL_H_
 
 #include"ast.h"
 #include"trail.h"
@@ -72,5 +72,5 @@ public:
 };
 
 
-#endif /* _AST_TRAIL_H_ */
+#endif /* AST_TRAIL_H_ */
 
diff --git a/src/ast/ast_translation.h b/src/ast/ast_translation.h
index 85c6af7ac..b1b12c1c6 100644
--- a/src/ast/ast_translation.h
+++ b/src/ast/ast_translation.h
@@ -18,8 +18,8 @@ Revision History:
     2011-05-26: New local translation class.
 
 --*/
-#ifndef _AST_TRANSLATION_H_
-#define _AST_TRANSLATION_H_
+#ifndef AST_TRANSLATION_H_
+#define AST_TRANSLATION_H_
 
 #include"ast.h"
 
diff --git a/src/ast/ast_util.h b/src/ast/ast_util.h
index f09cc2789..87a3a90d9 100644
--- a/src/ast/ast_util.h
+++ b/src/ast/ast_util.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _AST_UTIL_H_
-#define _AST_UTIL_H_
+#ifndef AST_UTIL_H_
+#define AST_UTIL_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
@@ -139,5 +139,5 @@ void flatten_or(expr_ref_vector& result);
 void flatten_or(expr* fml, expr_ref_vector& result);
 
 
-#endif /* _AST_UTIL_H_ */
+#endif /* AST_UTIL_H_ */
 
diff --git a/src/ast/bv_decl_plugin.h b/src/ast/bv_decl_plugin.h
index c5ebfb2d9..9343e54a2 100644
--- a/src/ast/bv_decl_plugin.h
+++ b/src/ast/bv_decl_plugin.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _BV_DECL_PLUGIN_H_
-#define _BV_DECL_PLUGIN_H_
+#ifndef BV_DECL_PLUGIN_H_
+#define BV_DECL_PLUGIN_H_
 
 #include"ast.h"
 
@@ -389,5 +389,5 @@ public:
     app * mk_bv(unsigned n, expr* const* es) { return m_manager.mk_app(get_fid(), OP_MKBV, n, es); }
 };
     
-#endif /* _BV_DECL_PLUGIN_H_ */
+#endif /* BV_DECL_PLUGIN_H_ */
 
diff --git a/src/ast/datatype_decl_plugin.h b/src/ast/datatype_decl_plugin.h
index d5f238650..99be75493 100644
--- a/src/ast/datatype_decl_plugin.h
+++ b/src/ast/datatype_decl_plugin.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DATATYPE_DECL_PLUGIN_H_
-#define _DATATYPE_DECL_PLUGIN_H_
+#ifndef DATATYPE_DECL_PLUGIN_H_
+#define DATATYPE_DECL_PLUGIN_H_
 
 #include"ast.h"
 #include"tptr.h"
@@ -214,5 +214,5 @@ public:
 
 };
 
-#endif /* _DATATYPE_DECL_PLUGIN_H_ */
+#endif /* DATATYPE_DECL_PLUGIN_H_ */
 
diff --git a/src/ast/decl_collector.h b/src/ast/decl_collector.h
index 4bcec94aa..52d28ab5f 100644
--- a/src/ast/decl_collector.h
+++ b/src/ast/decl_collector.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_DECL_COLLECTOR_H_
-#define _SMT_DECL_COLLECTOR_H_
+#ifndef SMT_DECL_COLLECTOR_H_
+#define SMT_DECL_COLLECTOR_H_
 
 #include"ast.h"
 
diff --git a/src/ast/dl_decl_plugin.h b/src/ast/dl_decl_plugin.h
index e3bc4dd63..4491fe180 100644
--- a/src/ast/dl_decl_plugin.h
+++ b/src/ast/dl_decl_plugin.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_DECL_PLUGIN_H_
-#define _DL_DECL_PLUGIN_H_
+#ifndef DL_DECL_PLUGIN_H_
+#define DL_DECL_PLUGIN_H_
 
 #include"ast.h"
 #include "arith_decl_plugin.h"
@@ -273,5 +273,5 @@ namespace datalog {
     };
     
 };
-#endif /* _DL_DECL_PLUGIN_H_ */
+#endif /* DL_DECL_PLUGIN_H_ */
 
diff --git a/src/ast/expr2polynomial.h b/src/ast/expr2polynomial.h
index 8934f3f24..6b2fd6116 100644
--- a/src/ast/expr2polynomial.h
+++ b/src/ast/expr2polynomial.h
@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _EXPR2POLYNOMIAL_H_
-#define _EXPR2POLYNOMIAL_H_
+#ifndef EXPR2POLYNOMIAL_H_
+#define EXPR2POLYNOMIAL_H_
 
 #include"ast.h"
 #include"polynomial.h"
diff --git a/src/ast/expr2var.h b/src/ast/expr2var.h
index 35b5da632..cbb02b66d 100644
--- a/src/ast/expr2var.h
+++ b/src/ast/expr2var.h
@@ -20,8 +20,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _EXPR2VAR_H_
-#define _EXPR2VAR_H_
+#ifndef EXPR2VAR_H_
+#define EXPR2VAR_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
diff --git a/src/ast/expr_abstract.h b/src/ast/expr_abstract.h
index 3d9f3960f..7f43ecf83 100644
--- a/src/ast/expr_abstract.h
+++ b/src/ast/expr_abstract.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _EXPR_ABSTRACT_H_
-#define _EXPR_ABSTRACT_H_
+#ifndef EXPR_ABSTRACT_H_
+#define EXPR_ABSTRACT_H_
 
 #include"ast.h"
 
diff --git a/src/ast/expr_delta_pair.h b/src/ast/expr_delta_pair.h
index f1994db6a..f4cc40ae4 100644
--- a/src/ast/expr_delta_pair.h
+++ b/src/ast/expr_delta_pair.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _EXPR_DELTA_PAIR_H_
-#define _EXPR_DELTA_PAIR_H_
+#ifndef EXPR_DELTA_PAIR_H_
+#define EXPR_DELTA_PAIR_H_
 
 /**
    \brief Auxiliary structure used to cache the intermediate results of the variable substitution procedure.
@@ -32,5 +32,5 @@ struct expr_delta_pair {
     bool operator==(const expr_delta_pair & e) const { return m_node == e.m_node && m_delta == e.m_delta; }
 };
 
-#endif /* _EXPR_DELTA_PAIR_H_ */
+#endif /* EXPR_DELTA_PAIR_H_ */
 
diff --git a/src/ast/expr_functors.h b/src/ast/expr_functors.h
index f2016c8ed..32560e139 100644
--- a/src/ast/expr_functors.h
+++ b/src/ast/expr_functors.h
@@ -19,8 +19,8 @@ Revision History:
 
 --*/
 
-#ifndef __EXPR_FUNCTORS_H__
-#define __EXPR_FUNCTORS_H__
+#ifndef EXPR_FUNCTORS_H_
+#define EXPR_FUNCTORS_H_
 
 #include "ast.h"
 #include "expr_map.h"
diff --git a/src/ast/expr_map.h b/src/ast/expr_map.h
index 3e6f71e86..ddd94ea13 100644
--- a/src/ast/expr_map.h
+++ b/src/ast/expr_map.h
@@ -18,8 +18,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _EXPR_MAP_H_
-#define _EXPR_MAP_H_
+#ifndef EXPR_MAP_H_
+#define EXPR_MAP_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
diff --git a/src/ast/expr_stat.h b/src/ast/expr_stat.h
index 7e94e5212..259751d18 100644
--- a/src/ast/expr_stat.h
+++ b/src/ast/expr_stat.h
@@ -19,8 +19,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _EXPR_STAT_H_
-#define _EXPR_STAT_H_
+#ifndef EXPR_STAT_H_
+#define EXPR_STAT_H_
 
 class expr;
 
@@ -47,4 +47,4 @@ void get_expr_stat(expr * n, expr_stat & r);
 */
 unsigned get_symbol_count(expr * n);
 
-#endif /* _EXPR_STAT_H_ */
+#endif /* EXPR_STAT_H_ */
diff --git a/src/ast/expr_substitution.h b/src/ast/expr_substitution.h
index 507228f98..073b56110 100644
--- a/src/ast/expr_substitution.h
+++ b/src/ast/expr_substitution.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _EXPR_SUBSTITUTION_H_
-#define _EXPR_SUBSTITUTION_H_
+#ifndef EXPR_SUBSTITUTION_H_
+#define EXPR_SUBSTITUTION_H_
 
 #include"ast.h"
 
diff --git a/src/ast/for_each_ast.h b/src/ast/for_each_ast.h
index 0fca62ca9..a254ed058 100644
--- a/src/ast/for_each_ast.h
+++ b/src/ast/for_each_ast.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _FOR_EACH_AST_H_
-#define _FOR_EACH_AST_H_
+#ifndef FOR_EACH_AST_H_
+#define FOR_EACH_AST_H_
 
 #include"ast.h"
 #include"trace.h"
@@ -270,5 +270,5 @@ private:
     }        
 };
 
-#endif /* _FOR_EACH_AST_H_ */
+#endif /* FOR_EACH_AST_H_ */
 
diff --git a/src/ast/for_each_expr.h b/src/ast/for_each_expr.h
index d0e110ec8..3f5dbaac7 100644
--- a/src/ast/for_each_expr.h
+++ b/src/ast/for_each_expr.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _FOR_EACH_EXPR_H_
-#define _FOR_EACH_EXPR_H_
+#ifndef FOR_EACH_EXPR_H_
+#define FOR_EACH_EXPR_H_
 
 #include"ast.h"
 #include"trace.h"
@@ -153,5 +153,5 @@ unsigned get_num_exprs(expr * n, expr_fast_mark1 & visited);
 
 bool has_skolem_functions(expr * n);
 
-#endif /* _FOR_EACH_EXPR_H_ */
+#endif /* FOR_EACH_EXPR_H_ */
 
diff --git a/src/ast/format.h b/src/ast/format.h
index 780e76251..a41ed9bd9 100644
--- a/src/ast/format.h
+++ b/src/ast/format.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _FORMAT_H_
-#define _FORMAT_H_
+#ifndef FORMAT_H_
+#define FORMAT_H_
 
 #include"ast.h"
 
@@ -193,5 +193,5 @@ namespace format_ns {
   
 };
 
-#endif /* _FORMAT_H_ */
+#endif /* FORMAT_H_ */
 
diff --git a/src/ast/fpa/fpa2bv_converter.h b/src/ast/fpa/fpa2bv_converter.h
index b0881a364..3a9672811 100644
--- a/src/ast/fpa/fpa2bv_converter.h
+++ b/src/ast/fpa/fpa2bv_converter.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _FPA2BV_CONVERTER_
-#define _FPA2BV_CONVERTER_
+#ifndef FPA2BV_CONVERTER_H_
+#define FPA2BV_CONVERTER_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
diff --git a/src/ast/fpa/fpa2bv_rewriter.h b/src/ast/fpa/fpa2bv_rewriter.h
index fa88c227c..4ecd53879 100644
--- a/src/ast/fpa/fpa2bv_rewriter.h
+++ b/src/ast/fpa/fpa2bv_rewriter.h
@@ -17,8 +17,8 @@ Notes:
 
 --*/
 
-#ifndef _FPA2BV_REWRITER_H_
-#define _FPA2BV_REWRITER_H_
+#ifndef FPA2BV_REWRITER_H_
+#define FPA2BV_REWRITER_H_
 
 #include"cooperate.h"
 #include"rewriter_def.h"
diff --git a/src/ast/fpa_decl_plugin.h b/src/ast/fpa_decl_plugin.h
index 0e7901aca..2857a4fac 100644
--- a/src/ast/fpa_decl_plugin.h
+++ b/src/ast/fpa_decl_plugin.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _fpa_decl_plugin_H_
-#define _fpa_decl_plugin_H_
+#ifndef fpa_decl_plugin_H_
+#define fpa_decl_plugin_H_
 
 #include"ast.h"
 #include"id_gen.h"
diff --git a/src/ast/func_decl_dependencies.h b/src/ast/func_decl_dependencies.h
index f88062063..e354540c2 100644
--- a/src/ast/func_decl_dependencies.h
+++ b/src/ast/func_decl_dependencies.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _FUNC_DECL_DEPENDENCIES_H_
-#define _FUNC_DECL_DEPENDENCIES_H_
+#ifndef FUNC_DECL_DEPENDENCIES_H_
+#define FUNC_DECL_DEPENDENCIES_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
diff --git a/src/ast/has_free_vars.h b/src/ast/has_free_vars.h
index d3d856ca1..cb7a6273a 100644
--- a/src/ast/has_free_vars.h
+++ b/src/ast/has_free_vars.h
@@ -16,12 +16,12 @@ Author:
 Revision History:
 
 --*/
-#ifndef _HAS_FREE_VARS_H_
-#define _HAS_FREE_VARS_H_
+#ifndef HAS_FREE_VARS_H_
+#define HAS_FREE_VARS_H_
 
 class expr;
 
 bool has_free_vars(expr * n);
 
-#endif /* _HAS_FREE_VARS_H_ */
+#endif /* HAS_FREE_VARS_H_ */
 
diff --git a/src/ast/macro_substitution.h b/src/ast/macro_substitution.h
index d3c9b3c9e..356449590 100644
--- a/src/ast/macro_substitution.h
+++ b/src/ast/macro_substitution.h
@@ -18,8 +18,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _MACRO_SUBSTITUTION_H_
-#define _MACRO_SUBSTITUTION_H_
+#ifndef MACRO_SUBSTITUTION_H_
+#define MACRO_SUBSTITUTION_H_
 
 #include"ast.h"
 
diff --git a/src/ast/macros/macro_finder.h b/src/ast/macros/macro_finder.h
index bfe1d4ecb..541ec80b7 100644
--- a/src/ast/macros/macro_finder.h
+++ b/src/ast/macros/macro_finder.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MACRO_FINDER_H_
-#define _MACRO_FINDER_H_
+#ifndef MACRO_FINDER_H_
+#define MACRO_FINDER_H_
 
 #include"macro_manager.h"
 #include"arith_simplifier_plugin.h"
@@ -51,5 +51,5 @@ public:
     void operator()(unsigned n, expr * const * exprs, proof * const * prs, expr_ref_vector & new_exprs, proof_ref_vector & new_prs);
 };
 
-#endif /* _MACRO_FINDER_H_ */
+#endif /* MACRO_FINDER_H_ */
 
diff --git a/src/ast/macros/macro_manager.h b/src/ast/macros/macro_manager.h
index 480f37d9c..bc015de41 100644
--- a/src/ast/macros/macro_manager.h
+++ b/src/ast/macros/macro_manager.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MACRO_MANAGER_H_
-#define _MACRO_MANAGER_H_
+#ifndef MACRO_MANAGER_H_
+#define MACRO_MANAGER_H_
 
 #include"ast_util.h"
 #include"obj_hashtable.h"
@@ -95,5 +95,5 @@ public:
     
 };
 
-#endif /* _MACRO_MANAGER_H_ */
+#endif /* MACRO_MANAGER_H_ */
 
diff --git a/src/ast/macros/macro_util.h b/src/ast/macros/macro_util.h
index 9bc32af69..2a1581162 100644
--- a/src/ast/macros/macro_util.h
+++ b/src/ast/macros/macro_util.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MACRO_UTIL_H_
-#define _MACRO_UTIL_H_
+#ifndef MACRO_UTIL_H_
+#define MACRO_UTIL_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
diff --git a/src/ast/macros/quasi_macros.h b/src/ast/macros/quasi_macros.h
index 64e72e348..5640fad30 100644
--- a/src/ast/macros/quasi_macros.h
+++ b/src/ast/macros/quasi_macros.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _QUASI_MACROS_H_
-#define _QUASI_MACROS_H_
+#ifndef QUASI_MACROS_H_
+#define QUASI_MACROS_H_
 
 #include<sstream>
 #include"macro_manager.h"
diff --git a/src/ast/normal_forms/defined_names.h b/src/ast/normal_forms/defined_names.h
index 0b9f04569..69e365f3d 100644
--- a/src/ast/normal_forms/defined_names.h
+++ b/src/ast/normal_forms/defined_names.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DEFINED_NAMES_H_
-#define _DEFINED_NAMES_H_
+#ifndef DEFINED_NAMES_H_
+#define DEFINED_NAMES_H_
 
 #include"ast.h"
 
@@ -85,5 +85,5 @@ public:
     func_decl * get_name_decl(unsigned i) const;
 };
 
-#endif /* _DEFINED_NAMES_H_ */
+#endif /* DEFINED_NAMES_H_ */
 
diff --git a/src/ast/normal_forms/name_exprs.h b/src/ast/normal_forms/name_exprs.h
index a725297ec..9d351375a 100644
--- a/src/ast/normal_forms/name_exprs.h
+++ b/src/ast/normal_forms/name_exprs.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _NAME_EXPRS_H_
-#define _NAME_EXPRS_H_
+#ifndef NAME_EXPRS_H_
+#define NAME_EXPRS_H_
 
 #include"ast.h"
 #include"defined_names.h"
diff --git a/src/ast/normal_forms/nnf.h b/src/ast/normal_forms/nnf.h
index e8296e933..122b85974 100644
--- a/src/ast/normal_forms/nnf.h
+++ b/src/ast/normal_forms/nnf.h
@@ -17,8 +17,8 @@ Notes:
     Major revision on 2011-10-06
 
 --*/
-#ifndef _NNF_H_
-#define _NNF_H_
+#ifndef NNF_H_
+#define NNF_H_
 
 #include"ast.h"
 #include"params.h"
@@ -52,4 +52,4 @@ public:
     void reset_cache();
 };
 
-#endif /* _NNF_H_ */
+#endif /* NNF_H_ */
diff --git a/src/ast/normal_forms/pull_quant.h b/src/ast/normal_forms/pull_quant.h
index 071fb0dbe..dcdae056b 100644
--- a/src/ast/normal_forms/pull_quant.h
+++ b/src/ast/normal_forms/pull_quant.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _PULL_QUANT_H_
-#define _PULL_QUANT_H_
+#ifndef PULL_QUANT_H_
+#define PULL_QUANT_H_
 
 #include"ast.h"
 
@@ -56,4 +56,4 @@ public:
     void reset();
 };
 
-#endif /* _PULL_QUANT_H_ */
+#endif /* PULL_QUANT_H_ */
diff --git a/src/ast/num_occurs.h b/src/ast/num_occurs.h
index ecd77e356..3c51dbe5c 100644
--- a/src/ast/num_occurs.h
+++ b/src/ast/num_occurs.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _NUM_OCCURS_H_
-#define _NUM_OCCURS_H_
+#ifndef NUM_OCCURS_H_
+#define NUM_OCCURS_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
@@ -51,5 +51,5 @@ public:
     }
 };
 
-#endif /* _NUM_OCCURS_H_ */
+#endif /* NUM_OCCURS_H_ */
 
diff --git a/src/ast/occurs.h b/src/ast/occurs.h
index 1aa6b47a4..ffaeac766 100644
--- a/src/ast/occurs.h
+++ b/src/ast/occurs.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _OCCURS_H_
-#define _OCCURS_H_
+#ifndef OCCURS_H_
+#define OCCURS_H_
 
 class expr; 
 class func_decl;
@@ -32,5 +32,5 @@ bool occurs(expr * n1, expr * n2);
 */
 bool occurs(func_decl * d, expr * n);
 
-#endif /* _OCCURS_H_ */
+#endif /* OCCURS_H_ */
 
diff --git a/src/ast/pattern/expr_pattern_match.h b/src/ast/pattern/expr_pattern_match.h
index 555d6a67e..c3c0256fd 100644
--- a/src/ast/pattern/expr_pattern_match.h
+++ b/src/ast/pattern/expr_pattern_match.h
@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _EXPR_PATTERN_MATCH_H_
-#define _EXPR_PATTERN_MATCH_H_
+#ifndef EXPR_PATTERN_MATCH_H_
+#define EXPR_PATTERN_MATCH_H_
 
 #include"ast.h"
 #include"map.h"
diff --git a/src/ast/pattern/pattern_inference.h b/src/ast/pattern/pattern_inference.h
index 152f7f459..d4ab708e9 100644
--- a/src/ast/pattern/pattern_inference.h
+++ b/src/ast/pattern/pattern_inference.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PATTERN_INFERENCE_H_
-#define _PATTERN_INFERENCE_H_
+#ifndef PATTERN_INFERENCE_H_
+#define PATTERN_INFERENCE_H_
 
 #include"ast.h"
 #include"simplifier.h"
@@ -244,5 +244,5 @@ public:
     bool is_forbidden(app * n) const;
 };
 
-#endif /* _PATTERN_INFERENCE_H_ */
+#endif /* PATTERN_INFERENCE_H_ */
 
diff --git a/src/ast/pattern/pattern_inference_params.h b/src/ast/pattern/pattern_inference_params.h
index dc9f0cb9b..a941b7dd6 100644
--- a/src/ast/pattern/pattern_inference_params.h
+++ b/src/ast/pattern/pattern_inference_params.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PATTERN_INFERENCE_PARAMS_H_
-#define _PATTERN_INFERENCE_PARAMS_H_
+#ifndef PATTERN_INFERENCE_PARAMS_H_
+#define PATTERN_INFERENCE_PARAMS_H_
 
 #include"params.h"
 
@@ -48,5 +48,5 @@ struct pattern_inference_params {
     void updt_params(params_ref const & _p);
 };
 
-#endif /* _PATTERN_INFERENCE_PARAMS_H_ */
+#endif /* PATTERN_INFERENCE_PARAMS_H_ */
 
diff --git a/src/ast/pb_decl_plugin.h b/src/ast/pb_decl_plugin.h
index 0bc8eab17..f38f577b3 100644
--- a/src/ast/pb_decl_plugin.h
+++ b/src/ast/pb_decl_plugin.h
@@ -24,8 +24,8 @@ hence:
 
 
 --*/
-#ifndef _PB_DECL_PLUGIN_H_
-#define _PB_DECL_PLUGIN_H_
+#ifndef PB_DECL_PLUGIN_H_
+#define PB_DECL_PLUGIN_H_
 
 #include"ast.h"
  
@@ -119,5 +119,5 @@ private:
 
 
 
-#endif /* _PB_DECL_PLUGIN_H_ */
+#endif /* PB_DECL_PLUGIN_H_ */
 
diff --git a/src/ast/pp.h b/src/ast/pp.h
index f567afa4a..bfb907552 100644
--- a/src/ast/pp.h
+++ b/src/ast/pp.h
@@ -16,13 +16,13 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PP_H_
-#define _PP_H_
+#ifndef PP_H_
+#define PP_H_
 
 #include"format.h"
 #include"params.h"
 
 void pp(std::ostream & out, format_ns::format * f, ast_manager & m, params_ref const & p = params_ref());
 
-#endif /* _PP_H_ */
+#endif /* PP_H_ */
 
diff --git a/src/ast/proof_checker/proof_checker.h b/src/ast/proof_checker/proof_checker.h
index 9c5f8a749..5e1a170ee 100644
--- a/src/ast/proof_checker/proof_checker.h
+++ b/src/ast/proof_checker/proof_checker.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PROOF_CHECKER_H_
-#define _PROOF_CHECKER_H_
+#ifndef PROOF_CHECKER_H_
+#define PROOF_CHECKER_H_
 
 #include "ast.h"
 #include "map.h"
diff --git a/src/ast/recurse_expr.h b/src/ast/recurse_expr.h
index 6b3220d40..46375d955 100644
--- a/src/ast/recurse_expr.h
+++ b/src/ast/recurse_expr.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _RECURSE_EXPR_H_
-#define _RECURSE_EXPR_H_
+#ifndef RECURSE_EXPR_H_
+#define RECURSE_EXPR_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
@@ -44,4 +44,4 @@ public:
     void finalize() { m_cache.finalize(); m_todo.finalize(); }
 };
 
-#endif /* _RECURSE_EXPR_H_ */
+#endif /* RECURSE_EXPR_H_ */
diff --git a/src/ast/recurse_expr_def.h b/src/ast/recurse_expr_def.h
index 7638668a2..5149baa93 100644
--- a/src/ast/recurse_expr_def.h
+++ b/src/ast/recurse_expr_def.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _RECURSE_EXPR_DEF_H_
-#define _RECURSE_EXPR_DEF_H_
+#ifndef RECURSE_EXPR_DEF_H_
+#define RECURSE_EXPR_DEF_H_
 
 #include"recurse_expr.h"
 
@@ -106,4 +106,4 @@ T recurse_expr<T, Visitor, IgnorePatterns, CallDestructors>::operator()(expr * r
     return get_cached(r);
 }
 
-#endif /* _RECURSE_EXPR_DEF_H_ */
+#endif /* RECURSE_EXPR_DEF_H_ */
diff --git a/src/ast/reg_decl_plugins.h b/src/ast/reg_decl_plugins.h
index 57185181e..5684780be 100644
--- a/src/ast/reg_decl_plugins.h
+++ b/src/ast/reg_decl_plugins.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _REG_DECL_PLUGINS_H_
-#define _REG_DECL_PLUGINS_H_
+#ifndef REG_DECL_PLUGINS_H_
+#define REG_DECL_PLUGINS_H_
 
 class ast_manager;
 
diff --git a/src/ast/rewriter/arith_rewriter.h b/src/ast/rewriter/arith_rewriter.h
index d08e6f13a..6c8501ccb 100644
--- a/src/ast/rewriter/arith_rewriter.h
+++ b/src/ast/rewriter/arith_rewriter.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _ARITH_REWRITER_H_
-#define _ARITH_REWRITER_H_
+#ifndef ARITH_REWRITER_H_
+#define ARITH_REWRITER_H_
 
 #include"poly_rewriter.h"
 #include"arith_decl_plugin.h"
diff --git a/src/ast/rewriter/array_rewriter.h b/src/ast/rewriter/array_rewriter.h
index 5f20f61ba..10b7bcfda 100644
--- a/src/ast/rewriter/array_rewriter.h
+++ b/src/ast/rewriter/array_rewriter.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _ARRAY_REWRITER_H_
-#define _ARRAY_REWRITER_H_
+#ifndef ARRAY_REWRITER_H_
+#define ARRAY_REWRITER_H_
 
 #include"array_decl_plugin.h"
 #include"rewriter_types.h"
diff --git a/src/ast/rewriter/ast_counter.h b/src/ast/rewriter/ast_counter.h
index a362c235b..4509d2549 100644
--- a/src/ast/rewriter/ast_counter.h
+++ b/src/ast/rewriter/ast_counter.h
@@ -21,8 +21,8 @@ Revision History:
 --*/
 
 
-#ifndef _AST_COUNTER_H_
-#define _AST_COUNTER_H_
+#ifndef AST_COUNTER_H_
+#define AST_COUNTER_H_
 
 #include "ast.h"
 #include "map.h"
diff --git a/src/ast/rewriter/bit_blaster/bit_blaster.h b/src/ast/rewriter/bit_blaster/bit_blaster.h
index 7b317c6cb..958c79b4d 100644
--- a/src/ast/rewriter/bit_blaster/bit_blaster.h
+++ b/src/ast/rewriter/bit_blaster/bit_blaster.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _BIT_BLASTER_H_
-#define _BIT_BLASTER_H_
+#ifndef BIT_BLASTER_H_
+#define BIT_BLASTER_H_
 
 #include"basic_simplifier_plugin.h"
 #include"bit_blaster_params.h"
@@ -61,5 +61,5 @@ public:
     bit_blaster_params const & get_params() const { return this->m_params; }
 };
 
-#endif /* _BIT_BLASTER_H_ */
+#endif /* BIT_BLASTER_H_ */
 
diff --git a/src/ast/rewriter/bit_blaster/bit_blaster_params.h b/src/ast/rewriter/bit_blaster/bit_blaster_params.h
index 653c8fc74..ee32d005a 100644
--- a/src/ast/rewriter/bit_blaster/bit_blaster_params.h
+++ b/src/ast/rewriter/bit_blaster/bit_blaster_params.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _BIT_BLASTER_PARAMS_H_
-#define _BIT_BLASTER_PARAMS_H_
+#ifndef BIT_BLASTER_PARAMS_H_
+#define BIT_BLASTER_PARAMS_H_
 
 struct bit_blaster_params {
     bool  m_bb_ext_gates;
@@ -34,5 +34,5 @@ struct bit_blaster_params {
 #endif
 };
 
-#endif /* _BIT_BLASTER_PARAMS_H_ */
+#endif /* BIT_BLASTER_PARAMS_H_ */
 
diff --git a/src/ast/rewriter/bit_blaster/bit_blaster_rewriter.h b/src/ast/rewriter/bit_blaster/bit_blaster_rewriter.h
index 4a0f3e2fe..8265d30e5 100644
--- a/src/ast/rewriter/bit_blaster/bit_blaster_rewriter.h
+++ b/src/ast/rewriter/bit_blaster/bit_blaster_rewriter.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _BIT_BLASTER_REWRITER_H_
-#define _BIT_BLASTER_REWRITER_H_
+#ifndef BIT_BLASTER_REWRITER_H_
+#define BIT_BLASTER_REWRITER_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
diff --git a/src/ast/rewriter/bit_blaster/bit_blaster_tpl.h b/src/ast/rewriter/bit_blaster/bit_blaster_tpl.h
index ca60d0f5c..b66cb7026 100644
--- a/src/ast/rewriter/bit_blaster/bit_blaster_tpl.h
+++ b/src/ast/rewriter/bit_blaster/bit_blaster_tpl.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _BIT_BLASTER_TPL_H_
-#define _BIT_BLASTER_TPL_H_
+#ifndef BIT_BLASTER_TPL_H_
+#define BIT_BLASTER_TPL_H_
 
 #include"rational.h"
 
diff --git a/src/ast/rewriter/bool_rewriter.h b/src/ast/rewriter/bool_rewriter.h
index ef6dc2d38..b309f8032 100644
--- a/src/ast/rewriter/bool_rewriter.h
+++ b/src/ast/rewriter/bool_rewriter.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _BOOL_REWRITER_H_
-#define _BOOL_REWRITER_H_
+#ifndef BOOL_REWRITER_H_
+#define BOOL_REWRITER_H_
 
 #include"ast.h"
 #include"rewriter.h"
diff --git a/src/ast/rewriter/bv_rewriter.h b/src/ast/rewriter/bv_rewriter.h
index 6d8c21666..26c5a33d5 100644
--- a/src/ast/rewriter/bv_rewriter.h
+++ b/src/ast/rewriter/bv_rewriter.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _BV_REWRITER_H_
-#define _BV_REWRITER_H_
+#ifndef BV_REWRITER_H_
+#define BV_REWRITER_H_
 
 #include"poly_rewriter.h"
 #include"bv_decl_plugin.h"
diff --git a/src/ast/rewriter/datatype_rewriter.h b/src/ast/rewriter/datatype_rewriter.h
index 46663a6d8..43fbc46d9 100644
--- a/src/ast/rewriter/datatype_rewriter.h
+++ b/src/ast/rewriter/datatype_rewriter.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _DATATYPE_REWRITER_H_
-#define _DATATYPE_REWRITER_H_
+#ifndef DATATYPE_REWRITER_H_
+#define DATATYPE_REWRITER_H_
 
 #include"datatype_decl_plugin.h"
 #include"rewriter_types.h"
diff --git a/src/ast/rewriter/der.h b/src/ast/rewriter/der.h
index a0be33c5c..07ff581dd 100644
--- a/src/ast/rewriter/der.h
+++ b/src/ast/rewriter/der.h
@@ -18,8 +18,8 @@ Revision History:
     Christoph Wintersteiger, 2010-03-30: Added Destr. Multi-Equality Resolution
 
 --*/
-#ifndef _DER_H_
-#define _DER_H_
+#ifndef DER_H_
+#define DER_H_
 
 #include"ast.h"
 #include"var_subst.h"
@@ -183,5 +183,5 @@ public:
 
 typedef der_rewriter der_star; 
 
-#endif /* _DER_H_ */
+#endif /* DER_H_ */
 
diff --git a/src/ast/rewriter/dl_rewriter.h b/src/ast/rewriter/dl_rewriter.h
index 1ef5c577a..ecb3f0944 100644
--- a/src/ast/rewriter/dl_rewriter.h
+++ b/src/ast/rewriter/dl_rewriter.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _DL_REWRITER_H_
-#define _DL_REWRITER_H_
+#ifndef DL_REWRITER_H_
+#define DL_REWRITER_H_
 
 #include"dl_decl_plugin.h"
 #include"rewriter_types.h"
diff --git a/src/ast/rewriter/expr_replacer.h b/src/ast/rewriter/expr_replacer.h
index 5bd72dc76..a770abe55 100644
--- a/src/ast/rewriter/expr_replacer.h
+++ b/src/ast/rewriter/expr_replacer.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _EXPR_REPLACER_H_
-#define _EXPR_REPLACER_H_
+#ifndef EXPR_REPLACER_H_
+#define EXPR_REPLACER_H_
 
 #include"ast.h"
 #include"expr_substitution.h"
diff --git a/src/ast/rewriter/expr_safe_replace.h b/src/ast/rewriter/expr_safe_replace.h
index 1f21d35e9..fe7033439 100644
--- a/src/ast/rewriter/expr_safe_replace.h
+++ b/src/ast/rewriter/expr_safe_replace.h
@@ -19,8 +19,8 @@ Revision History:
 
 --*/
 
-#ifndef __EXPR_SAFE_REPLACE_H__
-#define __EXPR_SAFE_REPLACE_H__
+#ifndef EXPR_SAFE_REPLACE_H_
+#define EXPR_SAFE_REPLACE_H_
 
 #include "ast.h"
 
@@ -49,4 +49,4 @@ public:
     bool empty() const { return m_subst.empty(); }
 };
 
-#endif /* __EXPR_SAFE_REPLACE_H__ */
+#endif /* EXPR_SAFE_REPLACE_H_ */
diff --git a/src/ast/rewriter/factor_rewriter.h b/src/ast/rewriter/factor_rewriter.h
index ee6a1d03a..389eacd87 100644
--- a/src/ast/rewriter/factor_rewriter.h
+++ b/src/ast/rewriter/factor_rewriter.h
@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _FACTOR_REWRITER_H_
-#define _FACTOR_REWRITER_H_
+#ifndef FACTOR_REWRITER_H_
+#define FACTOR_REWRITER_H_
 
 #include"ast.h"
 #include"rewriter.h"
diff --git a/src/ast/rewriter/fpa_rewriter.h b/src/ast/rewriter/fpa_rewriter.h
index 2da839718..cfebbc67b 100644
--- a/src/ast/rewriter/fpa_rewriter.h
+++ b/src/ast/rewriter/fpa_rewriter.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _FLOAT_REWRITER_H_
-#define _FLOAT_REWRITER_H_
+#ifndef FLOAT_REWRITER_H_
+#define FLOAT_REWRITER_H_
 
 #include"ast.h"
 #include"rewriter.h"
diff --git a/src/ast/rewriter/mk_simplified_app.h b/src/ast/rewriter/mk_simplified_app.h
index ca458cc16..40e6f993d 100644
--- a/src/ast/rewriter/mk_simplified_app.h
+++ b/src/ast/rewriter/mk_simplified_app.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _MK_SIMPLIFIED_APP_H_
-#define _MK_SIMPLIFIED_APP_H_
+#ifndef MK_SIMPLIFIED_APP_H_
+#define MK_SIMPLIFIED_APP_H_
 
 #include"ast.h"
 #include"params.h"
diff --git a/src/ast/rewriter/pb_rewriter.h b/src/ast/rewriter/pb_rewriter.h
index 4c9aaaaf1..ba98d774e 100644
--- a/src/ast/rewriter/pb_rewriter.h
+++ b/src/ast/rewriter/pb_rewriter.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _PB_REWRITER_H_
-#define _PB_REWRITER_H_
+#ifndef PB_REWRITER_H_
+#define PB_REWRITER_H_
 
 #include"pb_decl_plugin.h"
 #include"rewriter_types.h"
diff --git a/src/ast/rewriter/pb_rewriter_def.h b/src/ast/rewriter/pb_rewriter_def.h
index 38efd2097..a713a05a7 100644
--- a/src/ast/rewriter/pb_rewriter_def.h
+++ b/src/ast/rewriter/pb_rewriter_def.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _PB_REWRITER_DEF_H_
-#define _PB_REWRITER_DEF_H_
+#ifndef PB_REWRITER_DEF_H_
+#define PB_REWRITER_DEF_H_
 
 #include"pb_rewriter.h"
 
diff --git a/src/ast/rewriter/poly_rewriter.h b/src/ast/rewriter/poly_rewriter.h
index 6268c761d..90a807874 100644
--- a/src/ast/rewriter/poly_rewriter.h
+++ b/src/ast/rewriter/poly_rewriter.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _POLY_REWRITER_H_
-#define _POLY_REWRITER_H_
+#ifndef POLY_REWRITER_H_
+#define POLY_REWRITER_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
diff --git a/src/ast/rewriter/quant_hoist.h b/src/ast/rewriter/quant_hoist.h
index 50cbd1ba4..90e6ec7ad 100644
--- a/src/ast/rewriter/quant_hoist.h
+++ b/src/ast/rewriter/quant_hoist.h
@@ -19,8 +19,8 @@ Revision History:
 
 --*/
 
-#ifndef __QUANTIFIER_HOISTER_H_
-#define __QUANTIFIER_HOISTER_H_
+#ifndef QUANTIFIER_HOISTER_H_
+#define QUANTIFIER_HOISTER_H_
 
 #include "ast.h"
 
diff --git a/src/ast/rewriter/rewriter.h b/src/ast/rewriter/rewriter.h
index f83277bdf..812b07f96 100644
--- a/src/ast/rewriter/rewriter.h
+++ b/src/ast/rewriter/rewriter.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _REWRITER_H_
-#define _REWRITER_H_
+#ifndef REWRITER_H_
+#define REWRITER_H_
 
 #include"ast.h"
 #include"rewriter_types.h"
diff --git a/src/ast/rewriter/rewriter_types.h b/src/ast/rewriter/rewriter_types.h
index d42d6e2bc..f5947eb92 100644
--- a/src/ast/rewriter/rewriter_types.h
+++ b/src/ast/rewriter/rewriter_types.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _REWRITER_TYPES_H_
-#define _REWRITER_TYPES_H_
+#ifndef REWRITER_TYPES_H_
+#define REWRITER_TYPES_H_
 
 #include"z3_exception.h"
 #include"common_msgs.h"
diff --git a/src/ast/rewriter/th_rewriter.h b/src/ast/rewriter/th_rewriter.h
index b25558dd9..627ce0694 100644
--- a/src/ast/rewriter/th_rewriter.h
+++ b/src/ast/rewriter/th_rewriter.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _TH_REWRITER_H_
-#define _TH_REWRITER_H_
+#ifndef TH_REWRITER_H_
+#define TH_REWRITER_H_
 
 #include"ast.h"
 #include"rewriter_types.h"
diff --git a/src/ast/rewriter/var_subst.h b/src/ast/rewriter/var_subst.h
index 7db756d30..9d04cebe3 100644
--- a/src/ast/rewriter/var_subst.h
+++ b/src/ast/rewriter/var_subst.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _VAR_SUBST_H_
-#define _VAR_SUBST_H_
+#ifndef VAR_SUBST_H_
+#define VAR_SUBST_H_
 
 #include"rewriter.h"
 #include"used_vars.h"
diff --git a/src/ast/scoped_proof.h b/src/ast/scoped_proof.h
index e23a6d92a..5f0f86b44 100644
--- a/src/ast/scoped_proof.h
+++ b/src/ast/scoped_proof.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SCOPED_PROOF__H_
-#define _SCOPED_PROOF__H_
+#ifndef SCOPED_PROOF__H_
+#define SCOPED_PROOF__H_
 
 #include "ast.h"
 
diff --git a/src/ast/seq_decl_plugin.h b/src/ast/seq_decl_plugin.h
index 1bb3f3581..c71c7317e 100644
--- a/src/ast/seq_decl_plugin.h
+++ b/src/ast/seq_decl_plugin.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SEQ_DECL_PLUGIN_H_
-#define _SEQ_DECL_PLUGIN_H_
+#ifndef SEQ_DECL_PLUGIN_H_
+#define SEQ_DECL_PLUGIN_H_
 
 #include "ast.h"
 
@@ -119,5 +119,5 @@ public:
     
 };
 
-#endif /* _SEQ_DECL_PLUGIN_H_ */
+#endif /* SEQ_DECL_PLUGIN_H_ */
 
diff --git a/src/ast/shared_occs.h b/src/ast/shared_occs.h
index b522f4a4d..1566098aa 100644
--- a/src/ast/shared_occs.h
+++ b/src/ast/shared_occs.h
@@ -16,8 +16,8 @@ Author:
 
 Revision History:
 --*/
-#ifndef _SHARED_OCCS_H_
-#define _SHARED_OCCS_H_
+#ifndef SHARED_OCCS_H_
+#define SHARED_OCCS_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
diff --git a/src/ast/simplifier/arith_simplifier_params.h b/src/ast/simplifier/arith_simplifier_params.h
index 109f73307..2ff8fe2c0 100644
--- a/src/ast/simplifier/arith_simplifier_params.h
+++ b/src/ast/simplifier/arith_simplifier_params.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _ARITH_SIMPLIFIER_PARAMS_H_
-#define _ARITH_SIMPLIFIER_PARAMS_H_
+#ifndef ARITH_SIMPLIFIER_PARAMS_H_
+#define ARITH_SIMPLIFIER_PARAMS_H_
 
 #include"params.h"
 
@@ -32,5 +32,5 @@ struct arith_simplifier_params {
     void updt_params(params_ref const & _p);
 };
     
-#endif /* _ARITH_SIMPLIFIER_PARAMS_H_ */
+#endif /* ARITH_SIMPLIFIER_PARAMS_H_ */
 
diff --git a/src/ast/simplifier/arith_simplifier_plugin.h b/src/ast/simplifier/arith_simplifier_plugin.h
index 4b8f579c0..e6181e211 100644
--- a/src/ast/simplifier/arith_simplifier_plugin.h
+++ b/src/ast/simplifier/arith_simplifier_plugin.h
@@ -14,8 +14,8 @@ Author:
     Leonardo (leonardo) 2008-01-08
     
 --*/
-#ifndef _ARITH_SIMPLIFIER_PLUGIN_H_
-#define _ARITH_SIMPLIFIER_PLUGIN_H_
+#ifndef ARITH_SIMPLIFIER_PLUGIN_H_
+#define ARITH_SIMPLIFIER_PLUGIN_H_
 
 #include"basic_simplifier_plugin.h"
 #include"poly_simplifier_plugin.h"
@@ -93,4 +93,4 @@ public:
 
 };
 
-#endif /* _ARITH_SIMPLIFIER_PLUGIN_H_ */
+#endif /* ARITH_SIMPLIFIER_PLUGIN_H_ */
diff --git a/src/ast/simplifier/array_simplifier_params.h b/src/ast/simplifier/array_simplifier_params.h
index 2f6fa720b..c62b990b9 100644
--- a/src/ast/simplifier/array_simplifier_params.h
+++ b/src/ast/simplifier/array_simplifier_params.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _ARRAY_SIMPLIFIER_PARAMS_H_
-#define _ARRAY_SIMPLIFIER_PARAMS_H_
+#ifndef ARRAY_SIMPLIFIER_PARAMS_H_
+#define ARRAY_SIMPLIFIER_PARAMS_H_
 
 #include"params.h"
 
@@ -32,5 +32,5 @@ struct array_simplifier_params {
     void updt_params(params_ref const & _p);
 };
     
-#endif /* _ARITH_SIMPLIFIER_PARAMS_H_ */
+#endif /* ARITH_SIMPLIFIER_PARAMS_H_ */
 
diff --git a/src/ast/simplifier/array_simplifier_plugin.h b/src/ast/simplifier/array_simplifier_plugin.h
index 572da9a17..34db04b67 100644
--- a/src/ast/simplifier/array_simplifier_plugin.h
+++ b/src/ast/simplifier/array_simplifier_plugin.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _ARRAY_SIMPLIFIER_PLUGIN_H_
-#define _ARRAY_SIMPLIFIER_PLUGIN_H_
+#ifndef ARRAY_SIMPLIFIER_PLUGIN_H_
+#define ARRAY_SIMPLIFIER_PLUGIN_H_
 
 #include"ast.h"
 #include"map.h"
@@ -150,5 +150,5 @@ private:
 };
 
 
-#endif /* _ARRAY_SIMPLIFIER_PLUGIN_H_ */
+#endif /* ARRAY_SIMPLIFIER_PLUGIN_H_ */
 
diff --git a/src/ast/simplifier/base_simplifier.h b/src/ast/simplifier/base_simplifier.h
index 26bb43838..cb630cb7f 100644
--- a/src/ast/simplifier/base_simplifier.h
+++ b/src/ast/simplifier/base_simplifier.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _BASE_SIMPLIFIER_H_
-#define _BASE_SIMPLIFIER_H_
+#ifndef BASE_SIMPLIFIER_H_
+#define BASE_SIMPLIFIER_H_
 
 #include"expr_map.h"
 #include"ast_pp.h"
@@ -73,4 +73,4 @@ public:
     }
 };
 
-#endif /* _BASE_SIMPLIFIER_H_ */
+#endif /* BASE_SIMPLIFIER_H_ */
diff --git a/src/ast/simplifier/basic_simplifier_plugin.h b/src/ast/simplifier/basic_simplifier_plugin.h
index d92e09d1d..d39d6badb 100644
--- a/src/ast/simplifier/basic_simplifier_plugin.h
+++ b/src/ast/simplifier/basic_simplifier_plugin.h
@@ -14,8 +14,8 @@ Author:
     Leonardo (leonardo) 2008-01-07
     
 --*/
-#ifndef _BASIC_SIMPLIFIER_PLUGIN_H_
-#define _BASIC_SIMPLIFIER_PLUGIN_H_
+#ifndef BASIC_SIMPLIFIER_PLUGIN_H_
+#define BASIC_SIMPLIFIER_PLUGIN_H_
 
 #include"simplifier_plugin.h"
 
@@ -75,4 +75,4 @@ struct expr_lt_proc {
     }
 };
 
-#endif /* _BASIC_SIMPLIFIER_PLUGIN_H_ */
+#endif /* BASIC_SIMPLIFIER_PLUGIN_H_ */
diff --git a/src/ast/simplifier/bit2int.h b/src/ast/simplifier/bit2int.h
index 36351337b..6277a83ae 100644
--- a/src/ast/simplifier/bit2int.h
+++ b/src/ast/simplifier/bit2int.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _BIT2INT_H_
-#define _BIT2INT_H_
+#ifndef BIT2INT_H_
+#define BIT2INT_H_
 
 #include"bv_decl_plugin.h"
 #include"arith_decl_plugin.h"
@@ -92,5 +92,5 @@ public:
     void operator()(expr * m, expr_ref & result, proof_ref& p);
 };
 
-#endif /* _BIT2INT_H_ */
+#endif /* BIT2INT_H_ */
 
diff --git a/src/ast/simplifier/bv_elim.h b/src/ast/simplifier/bv_elim.h
index bca017db7..3bebcfef1 100644
--- a/src/ast/simplifier/bv_elim.h
+++ b/src/ast/simplifier/bv_elim.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _BV_ELIM_H_
-#define _BV_ELIM_H_
+#ifndef BV_ELIM_H_
+#define BV_ELIM_H_
 
 #include "ast.h"
 #include "simplifier.h"
@@ -41,5 +41,5 @@ public:
     virtual ~bv_elim_star() {}
 };
 
-#endif /* _BV_ELIM_H_ */
+#endif /* BV_ELIM_H_ */
 
diff --git a/src/ast/simplifier/bv_simplifier_params.h b/src/ast/simplifier/bv_simplifier_params.h
index 5f5832235..50015b7ca 100644
--- a/src/ast/simplifier/bv_simplifier_params.h
+++ b/src/ast/simplifier/bv_simplifier_params.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _BV_SIMPLIFIER_PARAMS_H_
-#define _BV_SIMPLIFIER_PARAMS_H_
+#ifndef BV_SIMPLIFIER_PARAMS_H_
+#define BV_SIMPLIFIER_PARAMS_H_
 
 #include"params.h"
 
@@ -32,5 +32,5 @@ struct bv_simplifier_params {
     void updt_params(params_ref const & _p);
 };
 
-#endif /* _BV_SIMPLIFIER_PARAMS_H_ */
+#endif /* BV_SIMPLIFIER_PARAMS_H_ */
 
diff --git a/src/ast/simplifier/bv_simplifier_plugin.h b/src/ast/simplifier/bv_simplifier_plugin.h
index 36e773de0..484edca95 100644
--- a/src/ast/simplifier/bv_simplifier_plugin.h
+++ b/src/ast/simplifier/bv_simplifier_plugin.h
@@ -14,8 +14,8 @@ Author:
     Leonardo (leonardo) 2008-01-08
     
 --*/
-#ifndef _BV_SIMPLIFIER_PLUGIN_H_
-#define _BV_SIMPLIFIER_PLUGIN_H_
+#ifndef BV_SIMPLIFIER_PLUGIN_H_
+#define BV_SIMPLIFIER_PLUGIN_H_
 
 #include"basic_simplifier_plugin.h"
 #include"poly_simplifier_plugin.h"
@@ -184,4 +184,4 @@ public:
 
 };
 
-#endif /* _BV_SIMPLIFIER_PLUGIN_H_ */
+#endif /* BV_SIMPLIFIER_PLUGIN_H_ */
diff --git a/src/ast/simplifier/datatype_simplifier_plugin.h b/src/ast/simplifier/datatype_simplifier_plugin.h
index 2a0de8aae..b675bf92e 100644
--- a/src/ast/simplifier/datatype_simplifier_plugin.h
+++ b/src/ast/simplifier/datatype_simplifier_plugin.h
@@ -14,8 +14,8 @@ Author:
     nbjorner 2008-11-6
     
 --*/
-#ifndef _DATATYPE_SIMPLIFIER_PLUGIN_H_
-#define _DATATYPE_SIMPLIFIER_PLUGIN_H_
+#ifndef DATATYPE_SIMPLIFIER_PLUGIN_H_
+#define DATATYPE_SIMPLIFIER_PLUGIN_H_
 
 #include"basic_simplifier_plugin.h"
 #include"datatype_decl_plugin.h"
@@ -39,4 +39,4 @@ public:
 
 };
 
-#endif /* _DATATYPE_SIMPLIFIER_PLUGIN_H_ */
+#endif /* DATATYPE_SIMPLIFIER_PLUGIN_H_ */
diff --git a/src/ast/simplifier/distribute_forall.h b/src/ast/simplifier/distribute_forall.h
index 8816bf22e..4c2eefb56 100644
--- a/src/ast/simplifier/distribute_forall.h
+++ b/src/ast/simplifier/distribute_forall.h
@@ -18,8 +18,8 @@ Revision History:
     Christoph Wintersteiger 2010-04-06: Added implementation
 
 --*/
-#ifndef _DISTRIBUTE_FORALL_H_
-#define _DISTRIBUTE_FORALL_H_
+#ifndef DISTRIBUTE_FORALL_H_
+#define DISTRIBUTE_FORALL_H_
 
 #include"ast.h"
 #include"basic_simplifier_plugin.h"
@@ -79,4 +79,4 @@ protected:
     void flush_cache() { m_cache.cleanup(); }
 };
 
-#endif /* _DISTRIBUTE_FORALL_H_ */
+#endif /* DISTRIBUTE_FORALL_H_ */
diff --git a/src/ast/simplifier/elim_bounds.h b/src/ast/simplifier/elim_bounds.h
index 66b6ed524..f8276c150 100644
--- a/src/ast/simplifier/elim_bounds.h
+++ b/src/ast/simplifier/elim_bounds.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _ELIM_BOUNDS_H_
-#define _ELIM_BOUNDS_H_
+#ifndef ELIM_BOUNDS_H_
+#define ELIM_BOUNDS_H_
 
 #include"ast.h"
 #include"arith_decl_plugin.h"
@@ -65,5 +65,5 @@ public:
     virtual ~elim_bounds_star() {}
 };
 
-#endif /* _ELIM_BOUNDS_H_ */
+#endif /* ELIM_BOUNDS_H_ */
 
diff --git a/src/ast/simplifier/fpa_simplifier_plugin.h b/src/ast/simplifier/fpa_simplifier_plugin.h
index 08fa6c49b..0ee8debf2 100644
--- a/src/ast/simplifier/fpa_simplifier_plugin.h
+++ b/src/ast/simplifier/fpa_simplifier_plugin.h
@@ -14,8 +14,8 @@ Author:
     Christoph (cwinter) 2015-01-14
 
 --*/
-#ifndef _FPA_SIMPLIFIER_PLUGIN_H_
-#define _FPA_SIMPLIFIER_PLUGIN_H_
+#ifndef FPA_SIMPLIFIER_PLUGIN_H_
+#define FPA_SIMPLIFIER_PLUGIN_H_
 
 #include"basic_simplifier_plugin.h"
 #include"fpa_decl_plugin.h"
@@ -36,4 +36,4 @@ public:
 
 };
 
-#endif /* _FPA_SIMPLIFIER_PLUGIN_H_ */
+#endif /* FPA_SIMPLIFIER_PLUGIN_H_ */
diff --git a/src/ast/simplifier/inj_axiom.h b/src/ast/simplifier/inj_axiom.h
index f473d5eae..da441c15b 100644
--- a/src/ast/simplifier/inj_axiom.h
+++ b/src/ast/simplifier/inj_axiom.h
@@ -16,12 +16,12 @@ Author:
 Revision History:
 
 --*/
-#ifndef _INJ_AXIOM_H_
-#define _INJ_AXIOM_H_
+#ifndef INJ_AXIOM_H_
+#define INJ_AXIOM_H_
 
 #include"ast.h"
 
 bool simplify_inj_axiom(ast_manager & m, quantifier * q, expr_ref & result);
 
-#endif /* _INJ_AXIOM_H_ */
+#endif /* INJ_AXIOM_H_ */
 
diff --git a/src/ast/simplifier/maximise_ac_sharing.h b/src/ast/simplifier/maximise_ac_sharing.h
index bc3b3e67a..bd369387c 100644
--- a/src/ast/simplifier/maximise_ac_sharing.h
+++ b/src/ast/simplifier/maximise_ac_sharing.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MAXIMISE_AC_SHARING_H_
-#define _MAXIMISE_AC_SHARING_H_
+#ifndef MAXIMISE_AC_SHARING_H_
+#define MAXIMISE_AC_SHARING_H_
 
 #include"simplifier.h"
 #include"hashtable.h"
@@ -120,5 +120,5 @@ public:
     maximise_bv_sharing(ast_manager & m);
 };
 
-#endif /* _MAXIMISE_AC_SHARING_H_ */
+#endif /* MAXIMISE_AC_SHARING_H_ */
 
diff --git a/src/ast/simplifier/poly_simplifier_plugin.h b/src/ast/simplifier/poly_simplifier_plugin.h
index ec4aa336e..4e6ae9c15 100644
--- a/src/ast/simplifier/poly_simplifier_plugin.h
+++ b/src/ast/simplifier/poly_simplifier_plugin.h
@@ -14,8 +14,8 @@ Author:
     Leonardo (leonardo) 2008-01-08
     
 --*/
-#ifndef _POLY_SIMPLIFIER_PLUGIN_H_
-#define _POLY_SIMPLIFIER_PLUGIN_H_
+#ifndef POLY_SIMPLIFIER_PLUGIN_H_
+#define POLY_SIMPLIFIER_PLUGIN_H_
 
 #include "simplifier_plugin.h"
 
@@ -152,4 +152,4 @@ public:
 #endif
 };
 
-#endif /* _POLY_SIMPLIFIER_PLUGIN_H_ */
+#endif /* POLY_SIMPLIFIER_PLUGIN_H_ */
diff --git a/src/ast/simplifier/pull_ite_tree.h b/src/ast/simplifier/pull_ite_tree.h
index 9350b7339..14c447697 100644
--- a/src/ast/simplifier/pull_ite_tree.h
+++ b/src/ast/simplifier/pull_ite_tree.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PULL_ITE_TREE_H_
-#define _PULL_ITE_TREE_H_
+#ifndef PULL_ITE_TREE_H_
+#define PULL_ITE_TREE_H_
 
 #include"ast.h"
 #include"simplifier.h"
@@ -97,5 +97,5 @@ public:
     virtual bool is_target(app * n) const;
 };
 
-#endif /* _PULL_ITE_TREE_H_ */
+#endif /* PULL_ITE_TREE_H_ */
 
diff --git a/src/ast/simplifier/push_app_ite.h b/src/ast/simplifier/push_app_ite.h
index 2d5c6bc28..104a7ea74 100644
--- a/src/ast/simplifier/push_app_ite.h
+++ b/src/ast/simplifier/push_app_ite.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PUSH_APP_ITE_H_
-#define _PUSH_APP_ITE_H_
+#ifndef PUSH_APP_ITE_H_
+#define PUSH_APP_ITE_H_
 
 #include"ast.h"
 #include"simplifier.h"
@@ -59,5 +59,5 @@ public:
     virtual ~ng_push_app_ite() {}
 };
 
-#endif /* _PUSH_APP_ITE_H_ */
+#endif /* PUSH_APP_ITE_H_ */
 
diff --git a/src/ast/simplifier/simplifier.h b/src/ast/simplifier/simplifier.h
index 78e28bea9..899b25810 100644
--- a/src/ast/simplifier/simplifier.h
+++ b/src/ast/simplifier/simplifier.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _SIMPLIFIER_H_
-#define _SIMPLIFIER_H_
+#ifndef SIMPLIFIER_H_
+#define SIMPLIFIER_H_
 
 #include"base_simplifier.h"
 #include"simplifier_plugin.h"
diff --git a/src/ast/simplifier/simplifier_plugin.h b/src/ast/simplifier/simplifier_plugin.h
index 8e176ea6e..b018dc731 100644
--- a/src/ast/simplifier/simplifier_plugin.h
+++ b/src/ast/simplifier/simplifier_plugin.h
@@ -15,8 +15,8 @@ Author:
 
 --*/
 
-#ifndef __SIMPLIFIER_PLUGIN_H__
-#define __SIMPLIFIER_PLUGIN_H__
+#ifndef SIMPLIFIER_PLUGIN_H_
+#define SIMPLIFIER_PLUGIN_H_
 
 #include"ast.h"
 
diff --git a/src/ast/static_features.h b/src/ast/static_features.h
index c07667325..8b20c5463 100644
--- a/src/ast/static_features.h
+++ b/src/ast/static_features.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _STATIC_FEATURES_H_
-#define _STATIC_FEATURES_H_
+#ifndef STATIC_FEATURES_H_
+#define STATIC_FEATURES_H_
 
 #include"ast.h"
 #include"arith_decl_plugin.h"
@@ -178,5 +178,5 @@ struct static_features {
 
 };
 
-#endif /* _STATIC_FEATURES_H_ */
+#endif /* STATIC_FEATURES_H_ */
 
diff --git a/src/ast/substitution/expr_offset.h b/src/ast/substitution/expr_offset.h
index 854720c9e..ea4f36206 100644
--- a/src/ast/substitution/expr_offset.h
+++ b/src/ast/substitution/expr_offset.h
@@ -21,8 +21,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _EXPR_OFFSET_H_
-#define _EXPR_OFFSET_H_
+#ifndef EXPR_OFFSET_H_
+#define EXPR_OFFSET_H_
 
 #include"ast.h"
 
@@ -50,4 +50,4 @@ public:
 typedef std::pair<expr_offset, expr_offset> expr_offset_pair;
 typedef pair_hash<obj_hash<expr_offset>, obj_hash<expr_offset> > expr_offset_pair_hash;
 
-#endif /* _EXPR_OFFSET_H_ */
+#endif /* EXPR_OFFSET_H_ */
diff --git a/src/ast/substitution/expr_offset_map.h b/src/ast/substitution/expr_offset_map.h
index dac5ceac6..83e22493b 100644
--- a/src/ast/substitution/expr_offset_map.h
+++ b/src/ast/substitution/expr_offset_map.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _EXPR_OFFSET_MAP_H_
-#define _EXPR_OFFSET_MAP_H_
+#ifndef EXPR_OFFSET_MAP_H_
+#define EXPR_OFFSET_MAP_H_
 
 #include"expr_offset.h"
 #include"vector.h"
@@ -91,4 +91,4 @@ public:
     }
 };
 
-#endif /* _EXPR_OFFSET_MAP_H_ */
+#endif /* EXPR_OFFSET_MAP_H_ */
diff --git a/src/ast/substitution/matcher.h b/src/ast/substitution/matcher.h
index 84a62e874..c4936579e 100644
--- a/src/ast/substitution/matcher.h
+++ b/src/ast/substitution/matcher.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MATCHER_H_
-#define _MATCHER_H_
+#ifndef MATCHER_H_
+#define MATCHER_H_
 
 #include"substitution.h"
 #include"hashtable.h"
@@ -59,5 +59,5 @@ public:
     bool operator()(expr * e1, expr * e2, substitution & s);
 };
 
-#endif /* _MATCHER_H_ */
+#endif /* MATCHER_H_ */
 
diff --git a/src/ast/substitution/substitution.h b/src/ast/substitution/substitution.h
index 3227a6fec..ebd12ef3a 100644
--- a/src/ast/substitution/substitution.h
+++ b/src/ast/substitution/substitution.h
@@ -30,8 +30,8 @@ Revision History:
         of the current substitution by the number of quantified variables.
 
 --*/
-#ifndef _SUBSTITUTION_H_
-#define _SUBSTITUTION_H_
+#ifndef SUBSTITUTION_H_
+#define SUBSTITUTION_H_
 
 #include"expr_offset_map.h"
 #include"var_offset_map.h"
diff --git a/src/ast/substitution/substitution_tree.h b/src/ast/substitution/substitution_tree.h
index 07723a8e4..167d08183 100644
--- a/src/ast/substitution/substitution_tree.h
+++ b/src/ast/substitution/substitution_tree.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SUBSTITUTION_TREE_H_
-#define _SUBSTITUTION_TREE_H_
+#ifndef SUBSTITUTION_TREE_H_
+#define SUBSTITUTION_TREE_H_
 
 #include"ast.h"
 #include"substitution.h"
@@ -146,5 +146,5 @@ public:
     void display(std::ostream & out) const;
 };
 
-#endif /* _SUBSTITUTION_TREE_H_ */
+#endif /* SUBSTITUTION_TREE_H_ */
 
diff --git a/src/ast/substitution/unifier.h b/src/ast/substitution/unifier.h
index 315cea092..24735117c 100644
--- a/src/ast/substitution/unifier.h
+++ b/src/ast/substitution/unifier.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _UNIFIER_H_
-#define _UNIFIER_H_
+#ifndef UNIFIER_H_
+#define UNIFIER_H_
 
 #include"ast.h"
 #include"substitution.h"
@@ -66,5 +66,5 @@ public:
     bool operator()(expr * e1, expr * e2, substitution & s, bool use_offsets = true);
 };
 
-#endif /* _UNIFIER_H_ */
+#endif /* UNIFIER_H_ */
 
diff --git a/src/ast/substitution/var_offset_map.h b/src/ast/substitution/var_offset_map.h
index 85120e614..f03b80aed 100644
--- a/src/ast/substitution/var_offset_map.h
+++ b/src/ast/substitution/var_offset_map.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _VAR_OFFSET_MAP_H_
-#define _VAR_OFFSET_MAP_H_
+#ifndef VAR_OFFSET_MAP_H_
+#define VAR_OFFSET_MAP_H_
 
 #include"ast.h"
 #include"vector.h"
@@ -111,4 +111,4 @@ public:
 
 };
 
-#endif /* _VAR_OFFSET_MAP_H_ */
+#endif /* VAR_OFFSET_MAP_H_ */
diff --git a/src/ast/used_symbols.h b/src/ast/used_symbols.h
index 81086d753..994e3321a 100644
--- a/src/ast/used_symbols.h
+++ b/src/ast/used_symbols.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _USED_SYMBOLS_H_
-#define _USED_SYMBOLS_H_
+#ifndef USED_SYMBOLS_H_
+#define USED_SYMBOLS_H_
 
 #include"ast.h"
 #include"hashtable.h"
@@ -102,4 +102,4 @@ public:
     void erase_core(symbol const & s) { m_used.erase(s); }
 };
 
-#endif /* _USED_SYMBOLS_H_ */
+#endif /* USED_SYMBOLS_H_ */
diff --git a/src/ast/used_vars.h b/src/ast/used_vars.h
index 142ce9bcd..b14798e7d 100644
--- a/src/ast/used_vars.h
+++ b/src/ast/used_vars.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _USED_VARS_H_
-#define _USED_VARS_H_
+#ifndef USED_VARS_H_
+#define USED_VARS_H_
 
 #include"ast.h"
 #include"expr_delta_pair.h"
@@ -55,5 +55,5 @@ public:
     unsigned get_num_vars() const;
 };
 
-#endif /* _USED_VARS_H_ */
+#endif /* USED_VARS_H_ */
 
diff --git a/src/ast/well_sorted.h b/src/ast/well_sorted.h
index 488e6b02a..b2eb4dfd4 100644
--- a/src/ast/well_sorted.h
+++ b/src/ast/well_sorted.h
@@ -16,13 +16,13 @@ Author:
 Revision History:
 
 --*/
-#ifndef _WELL_SORTED_H_
-#define _WELL_SORTED_H_
+#ifndef WELL_SORTED_H_
+#define WELL_SORTED_H_
 
 class ast_manager;
 class expr;
 
 bool is_well_sorted(ast_manager const & m, expr * n);
 
-#endif /* _WELL_SORTED_H_ */
+#endif /* WELL_SORTED_H_ */
 
diff --git a/src/cmd_context/basic_cmds.h b/src/cmd_context/basic_cmds.h
index 554c1ab31..3e896a024 100644
--- a/src/cmd_context/basic_cmds.h
+++ b/src/cmd_context/basic_cmds.h
@@ -15,8 +15,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _BASIC_CMDS_H_
-#define _BASIC_CMDS_H_
+#ifndef BASIC_CMDS_H_
+#define BASIC_CMDS_H_
 
 class cmd_context;
 
diff --git a/src/cmd_context/check_logic.h b/src/cmd_context/check_logic.h
index 6fdfc5654..888c6ed9f 100644
--- a/src/cmd_context/check_logic.h
+++ b/src/cmd_context/check_logic.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _CHECK_LOGIC_H_
-#define _CHECK_LOGIC_H_
+#ifndef CHECK_LOGIC_H_
+#define CHECK_LOGIC_H_
 
 #include"ast.h"
 
diff --git a/src/cmd_context/cmd_context.h b/src/cmd_context/cmd_context.h
index 795b3a65a..81f819e3a 100644
--- a/src/cmd_context/cmd_context.h
+++ b/src/cmd_context/cmd_context.h
@@ -18,8 +18,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _CMD_CONTEXT_H_
-#define _CMD_CONTEXT_H_
+#ifndef CMD_CONTEXT_H_
+#define CMD_CONTEXT_H_
 
 #include<sstream>
 #include"ast.h"
diff --git a/src/cmd_context/cmd_context_to_goal.h b/src/cmd_context/cmd_context_to_goal.h
index 2bc27baa7..35e11e6c1 100644
--- a/src/cmd_context/cmd_context_to_goal.h
+++ b/src/cmd_context/cmd_context_to_goal.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _CMD_CONTEXT_TO_GOAL_H_
-#define _CMD_CONTEXT_TO_GOAL_H_
+#ifndef CMD_CONTEXT_TO_GOAL_H_
+#define CMD_CONTEXT_TO_GOAL_H_
 
 void assert_exprs_from(cmd_context const & ctx, goal & t);
 
diff --git a/src/cmd_context/cmd_util.h b/src/cmd_context/cmd_util.h
index 538964ad9..f0660af37 100644
--- a/src/cmd_context/cmd_util.h
+++ b/src/cmd_context/cmd_util.h
@@ -15,8 +15,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _CMD_UTIL_H_
-#define _CMD_UTIL_H_
+#ifndef CMD_UTIL_H_
+#define CMD_UTIL_H_
 
 #define ATOMIC_CMD(CLS_NAME, NAME, DESCR, ACTION)                               \
 class CLS_NAME : public cmd {                                                   \
diff --git a/src/cmd_context/context_params.h b/src/cmd_context/context_params.h
index 506e559db..eb250f486 100644
--- a/src/cmd_context/context_params.h
+++ b/src/cmd_context/context_params.h
@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _CONTEXT_PARAMS_H_
-#define _CONTEXT_PARAMS_H_
+#ifndef CONTEXT_PARAMS_H_
+#define CONTEXT_PARAMS_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/cmd_context/echo_tactic.h b/src/cmd_context/echo_tactic.h
index 8760820bd..2ba97ee47 100644
--- a/src/cmd_context/echo_tactic.h
+++ b/src/cmd_context/echo_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _ECHO_TACTICS_H_
-#define _ECHO_TACTICS_H_
+#ifndef ECHO_TACTICS_H_
+#define ECHO_TACTICS_H_
 
 class cmd_context;
 class tactic;
diff --git a/src/cmd_context/eval_cmd.h b/src/cmd_context/eval_cmd.h
index e6e220b1d..c71e57f69 100644
--- a/src/cmd_context/eval_cmd.h
+++ b/src/cmd_context/eval_cmd.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _EVAL_CMD_H_
-#define _EVAL_CMD_H_
+#ifndef EVAL_CMD_H_
+#define EVAL_CMD_H_
 
 class cmd_context;
 
diff --git a/src/cmd_context/extra_cmds/dbg_cmds.h b/src/cmd_context/extra_cmds/dbg_cmds.h
index 8a992a4b8..2ff73a11f 100644
--- a/src/cmd_context/extra_cmds/dbg_cmds.h
+++ b/src/cmd_context/extra_cmds/dbg_cmds.h
@@ -15,8 +15,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _DBG_CMDS_H_
-#define _DBG_CMDS_H_
+#ifndef DBG_CMDS_H_
+#define DBG_CMDS_H_
 
 class cmd_context;
 
diff --git a/src/cmd_context/extra_cmds/polynomial_cmds.h b/src/cmd_context/extra_cmds/polynomial_cmds.h
index b2b368833..f1f80ae5c 100644
--- a/src/cmd_context/extra_cmds/polynomial_cmds.h
+++ b/src/cmd_context/extra_cmds/polynomial_cmds.h
@@ -15,8 +15,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _POLYNOMIAL_CMDS_H_
-#define _POLYNOMIAL_CMDS_H_
+#ifndef POLYNOMIAL_CMDS_H_
+#define POLYNOMIAL_CMDS_H_
 
 class cmd_context;
 void install_polynomial_cmds(cmd_context & ctx);
diff --git a/src/cmd_context/interpolant_cmds.h b/src/cmd_context/interpolant_cmds.h
index a7c127a75..daef70926 100644
--- a/src/cmd_context/interpolant_cmds.h
+++ b/src/cmd_context/interpolant_cmds.h
@@ -15,8 +15,8 @@
   Notes:
 
   --*/
-#ifndef _INTERPOLANT_CMDS_H_
-#define _INTERPOLANT_CMDS_H_
+#ifndef INTERPOLANT_CMDS_H_
+#define INTERPOLANT_CMDS_H_
 
 class cmd_context;
 void install_interpolant_cmds(cmd_context & ctx);
diff --git a/src/cmd_context/parametric_cmd.h b/src/cmd_context/parametric_cmd.h
index 762d6bd72..3e95832c4 100644
--- a/src/cmd_context/parametric_cmd.h
+++ b/src/cmd_context/parametric_cmd.h
@@ -15,8 +15,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _PARAMETRIC_CMD_H_
-#define _PARAMETRIC_CMD_H_
+#ifndef PARAMETRIC_CMD_H_
+#define PARAMETRIC_CMD_H_
 
 #include"params.h"
 #include"symbol.h"
diff --git a/src/cmd_context/pdecl.h b/src/cmd_context/pdecl.h
index 83d881f57..f03d1b901 100644
--- a/src/cmd_context/pdecl.h
+++ b/src/cmd_context/pdecl.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PDECL_H_
-#define _PDECL_H_
+#ifndef PDECL_H_
+#define PDECL_H_
 
 #include"ast.h"
 #include"obj_hashtable.h" 
diff --git a/src/cmd_context/simplify_cmd.h b/src/cmd_context/simplify_cmd.h
index 1d77e5e89..a0a06e89c 100644
--- a/src/cmd_context/simplify_cmd.h
+++ b/src/cmd_context/simplify_cmd.h
@@ -15,8 +15,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _SIMPLIFY_CMD_H_
-#define _SIMPLIFY_CMD_H_
+#ifndef SIMPLIFY_CMD_H_
+#define SIMPLIFY_CMD_H_
 
 class cmd_context;
 
diff --git a/src/cmd_context/tactic_cmds.h b/src/cmd_context/tactic_cmds.h
index c44078a90..e21d818bb 100644
--- a/src/cmd_context/tactic_cmds.h
+++ b/src/cmd_context/tactic_cmds.h
@@ -15,8 +15,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _TACTIC_CMDS_H_
-#define _TACTIC_CMDS_H_
+#ifndef TACTIC_CMDS_H_
+#define TACTIC_CMDS_H_
 
 #include"ast.h"
 #include"cmd_context_types.h"
diff --git a/src/cmd_context/tactic_manager.h b/src/cmd_context/tactic_manager.h
index bcc24e090..44a25f01e 100644
--- a/src/cmd_context/tactic_manager.h
+++ b/src/cmd_context/tactic_manager.h
@@ -15,8 +15,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _TACTIC_MANAGER_H_
-#define _TACTIC_MANAGER_H_
+#ifndef TACTIC_MANAGER_H_
+#define TACTIC_MANAGER_H_
 
 #include"tactic_cmds.h"
 #include"dictionary.h"
diff --git a/src/duality/duality_wrapper.h b/src/duality/duality_wrapper.h
index 34340cdce..a84d8899c 100644
--- a/src/duality/duality_wrapper.h
+++ b/src/duality/duality_wrapper.h
@@ -17,8 +17,8 @@
 
 
   --*/
-#ifndef __DUALITY_WRAPPER_H_
-#define __DUALITY_WRAPPER_H_
+#ifndef DUALITY_WRAPPER_H_
+#define DUALITY_WRAPPER_H_
 
 #include<cassert>
 #include<iostream>
diff --git a/src/math/euclid/euclidean_solver.h b/src/math/euclid/euclidean_solver.h
index f2345b9ed..839abc9f7 100644
--- a/src/math/euclid/euclidean_solver.h
+++ b/src/math/euclid/euclidean_solver.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _EUCLIDEAN_SOLVER_H_
-#define _EUCLIDEAN_SOLVER_H_
+#ifndef EUCLIDEAN_SOLVER_H_
+#define EUCLIDEAN_SOLVER_H_
 
 #include"mpq.h"
 #include"vector.h"
diff --git a/src/math/grobner/grobner.h b/src/math/grobner/grobner.h
index d69a3ac0a..7d58115e3 100644
--- a/src/math/grobner/grobner.h
+++ b/src/math/grobner/grobner.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _GROBNER_H_
-#define _GROBNER_H_
+#ifndef GROBNER_H_
+#define GROBNER_H_
 
 #include"ast.h"
 #include"arith_decl_plugin.h"
@@ -277,5 +277,5 @@ public:
     void display(std::ostream & out) const;
 };
 
-#endif /* _GROBNER_H_ */
+#endif /* GROBNER_H_ */
 
diff --git a/src/math/hilbert/heap_trie.h b/src/math/hilbert/heap_trie.h
index c2a1c52d1..ab55a44c3 100644
--- a/src/math/hilbert/heap_trie.h
+++ b/src/math/hilbert/heap_trie.h
@@ -34,8 +34,8 @@ Notes:
 
 --*/
 
-#ifndef _HEAP_TRIE_H_
-#define _HEAP_TRIE_H_
+#ifndef HEAP_TRIE_H_
+#define HEAP_TRIE_H_
 
 #include "map.h"
 #include "vector.h"
diff --git a/src/math/hilbert/hilbert_basis.h b/src/math/hilbert/hilbert_basis.h
index 733b3a2f0..4969b2c61 100644
--- a/src/math/hilbert/hilbert_basis.h
+++ b/src/math/hilbert/hilbert_basis.h
@@ -25,8 +25,8 @@ Revision History:
 
 --*/
 
-#ifndef _HILBERT_BASIS_H_
-#define _HILBERT_BASIS_H_
+#ifndef HILBERT_BASIS_H_
+#define HILBERT_BASIS_H_
 
 #include "rational.h"
 #include "lbool.h"
diff --git a/src/math/interval/interval.h b/src/math/interval/interval.h
index ed7654f01..805cb3fda 100644
--- a/src/math/interval/interval.h
+++ b/src/math/interval/interval.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _INTERVAL_H_
-#define _INTERVAL_H_
+#ifndef INTERVAL_H_
+#define INTERVAL_H_
 
 #include"mpq.h"
 #include"ext_numeral.h"
diff --git a/src/math/interval/interval_def.h b/src/math/interval/interval_def.h
index 89d699f1f..e529ceceb 100644
--- a/src/math/interval/interval_def.h
+++ b/src/math/interval/interval_def.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _INTERVAL_DEF_H_
-#define _INTERVAL_DEF_H_
+#ifndef INTERVAL_DEF_H_
+#define INTERVAL_DEF_H_
 
 #include"interval.h"
 #include"debug.h"
diff --git a/src/math/polynomial/algebraic_numbers.h b/src/math/polynomial/algebraic_numbers.h
index d11237b86..2c63c9718 100644
--- a/src/math/polynomial/algebraic_numbers.h
+++ b/src/math/polynomial/algebraic_numbers.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _ALGEBRAIC_NUMBERS_H_
-#define _ALGEBRAIC_NUMBERS_H_
+#ifndef ALGEBRAIC_NUMBERS_H_
+#define ALGEBRAIC_NUMBERS_H_
 
 #include"rational.h"
 #include"mpq.h"
diff --git a/src/math/polynomial/linear_eq_solver.h b/src/math/polynomial/linear_eq_solver.h
index e7dd6700b..99f418fce 100644
--- a/src/math/polynomial/linear_eq_solver.h
+++ b/src/math/polynomial/linear_eq_solver.h
@@ -19,8 +19,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _LINEAR_EQ_SOLVER_H_
-#define _LINEAR_EQ_SOLVER_H_
+#ifndef LINEAR_EQ_SOLVER_H_
+#define LINEAR_EQ_SOLVER_H_
 
 template<typename numeral_manager> 
 class linear_eq_solver {
diff --git a/src/math/polynomial/polynomial.h b/src/math/polynomial/polynomial.h
index e52dd4fee..3a4442e63 100644
--- a/src/math/polynomial/polynomial.h
+++ b/src/math/polynomial/polynomial.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _POLYNOMIAL_H_
-#define _POLYNOMIAL_H_
+#ifndef POLYNOMIAL_H_
+#define POLYNOMIAL_H_
 
 #include"mpz.h"
 #include"rational.h"
diff --git a/src/math/polynomial/polynomial_cache.h b/src/math/polynomial/polynomial_cache.h
index d3b695f5a..538a08b5c 100644
--- a/src/math/polynomial/polynomial_cache.h
+++ b/src/math/polynomial/polynomial_cache.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _POLYNOMIAL_CACHE_H_
-#define _POLYNOMIAL_CACHE_H_
+#ifndef POLYNOMIAL_CACHE_H_
+#define POLYNOMIAL_CACHE_H_
 
 #include"polynomial.h"
 
diff --git a/src/math/polynomial/polynomial_primes.h b/src/math/polynomial/polynomial_primes.h
index 9b74c879c..c5afcb727 100644
--- a/src/math/polynomial/polynomial_primes.h
+++ b/src/math/polynomial/polynomial_primes.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _POLYNOMIAL_PRIMES_H_
-#define _POLYNOMIAL_PRIMES_H_
+#ifndef POLYNOMIAL_PRIMES_H_
+#define POLYNOMIAL_PRIMES_H_
 
 namespace polynomial {
 #define NUM_SMALL_PRIMES 11
diff --git a/src/math/polynomial/polynomial_var2value.h b/src/math/polynomial/polynomial_var2value.h
index 708b03725..7da2e5980 100644
--- a/src/math/polynomial/polynomial_var2value.h
+++ b/src/math/polynomial/polynomial_var2value.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _POLYNOMIAL_VAR2VALUE_H_
-#define _POLYNOMIAL_VAR2VALUE_H_
+#ifndef POLYNOMIAL_VAR2VALUE_H_
+#define POLYNOMIAL_VAR2VALUE_H_
 
 #include"polynomial.h"
 #include"scoped_numeral_vector.h"
diff --git a/src/math/polynomial/rpolynomial.h b/src/math/polynomial/rpolynomial.h
index 146505887..de2140c5e 100644
--- a/src/math/polynomial/rpolynomial.h
+++ b/src/math/polynomial/rpolynomial.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _RPOLYNOMIAL_H_
-#define _RPOLYNOMIAL_H_
+#ifndef RPOLYNOMIAL_H_
+#define RPOLYNOMIAL_H_
 
 #include"mpz.h"
 #include"rational.h"
diff --git a/src/math/polynomial/sexpr2upolynomial.h b/src/math/polynomial/sexpr2upolynomial.h
index 133c2dc6c..64488b0f4 100644
--- a/src/math/polynomial/sexpr2upolynomial.h
+++ b/src/math/polynomial/sexpr2upolynomial.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _SEXPR2UPOLYNOMIAL_H_
-#define _SEXPR2UPOLYNOMIAL_H_
+#ifndef SEXPR2UPOLYNOMIAL_H_
+#define SEXPR2UPOLYNOMIAL_H_
 
 #include"upolynomial.h"
 #include"cmd_context_types.h"
diff --git a/src/math/polynomial/upolynomial.h b/src/math/polynomial/upolynomial.h
index 697385a10..32214c5db 100644
--- a/src/math/polynomial/upolynomial.h
+++ b/src/math/polynomial/upolynomial.h
@@ -21,8 +21,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _UPOLYNOMIAL_H_
-#define _UPOLYNOMIAL_H_
+#ifndef UPOLYNOMIAL_H_
+#define UPOLYNOMIAL_H_
 
 #include"mpzzp.h"
 #include"rational.h"
diff --git a/src/math/polynomial/upolynomial_factorization.h b/src/math/polynomial/upolynomial_factorization.h
index 327fffc9c..ba184d613 100644
--- a/src/math/polynomial/upolynomial_factorization.h
+++ b/src/math/polynomial/upolynomial_factorization.h
@@ -22,8 +22,8 @@ Notes:
    [3] Henri Cohen. A Course in Computational Algebraic Number Theory. Springer Verlag, 1993.
 
 --*/
-#ifndef _UPOLYNOMIAL_FACTORIZATION_H_
-#define _UPOLYNOMIAL_FACTORIZATION_H_
+#ifndef UPOLYNOMIAL_FACTORIZATION_H_
+#define UPOLYNOMIAL_FACTORIZATION_H_
 
 #include"upolynomial.h"
 #include"polynomial.h"
diff --git a/src/math/polynomial/upolynomial_factorization_int.h b/src/math/polynomial/upolynomial_factorization_int.h
index 92d62301d..86fe52b03 100644
--- a/src/math/polynomial/upolynomial_factorization_int.h
+++ b/src/math/polynomial/upolynomial_factorization_int.h
@@ -23,8 +23,8 @@ Notes:
    [3] Henri Cohen. A Course in Computational Algebraic Number Theory. Springer Verlag, 1993.
 
 --*/
-#ifndef _UPOLYNOMIAL_FACTORIZATION_INT_H_
-#define _UPOLYNOMIAL_FACTORIZATION_INT_H_
+#ifndef UPOLYNOMIAL_FACTORIZATION_INT_H_
+#define UPOLYNOMIAL_FACTORIZATION_INT_H_
 
 #include"upolynomial_factorization.h"
 
diff --git a/src/math/realclosure/mpz_matrix.h b/src/math/realclosure/mpz_matrix.h
index b48585c60..bd9c1bd45 100644
--- a/src/math/realclosure/mpz_matrix.h
+++ b/src/math/realclosure/mpz_matrix.h
@@ -28,8 +28,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _MPZ_MATRIX_H_
-#define _MPZ_MATRIX_H_
+#ifndef MPZ_MATRIX_H_
+#define MPZ_MATRIX_H_
 
 #include"mpz.h"
 
diff --git a/src/math/realclosure/realclosure.h b/src/math/realclosure/realclosure.h
index 2a1b0dc20..4fef4dc25 100644
--- a/src/math/realclosure/realclosure.h
+++ b/src/math/realclosure/realclosure.h
@@ -19,8 +19,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _REALCLOSURE_H_
-#define _REALCLOSURE_H_
+#ifndef REALCLOSURE_H_
+#define REALCLOSURE_H_
 
 #include"mpq.h"
 #include"params.h"
diff --git a/src/math/simplex/network_flow.h b/src/math/simplex/network_flow.h
index e0b415c03..13aff5089 100644
--- a/src/math/simplex/network_flow.h
+++ b/src/math/simplex/network_flow.h
@@ -25,8 +25,8 @@ Notes:
     A naive approach is to run an algorithm on max flow in order to get a spanning tree.
    
 --*/
-#ifndef _NETWORK_FLOW_H_
-#define _NETWORK_FLOW_H_
+#ifndef NETWORK_FLOW_H_
+#define NETWORK_FLOW_H_
 
 #include"inf_rational.h"
 #include"diff_logic.h"
diff --git a/src/math/simplex/network_flow_def.h b/src/math/simplex/network_flow_def.h
index 93e1ded9a..a4a6246ce 100644
--- a/src/math/simplex/network_flow_def.h
+++ b/src/math/simplex/network_flow_def.h
@@ -17,8 +17,8 @@ Notes:
    
 --*/
 
-#ifndef _NETWORK_FLOW_DEF_H_
-#define _NETWORK_FLOW_DEF_H_
+#ifndef NETWORK_FLOW_DEF_H_
+#define NETWORK_FLOW_DEF_H_
 
 #include"network_flow.h"
 #include"uint_set.h"
diff --git a/src/math/simplex/simplex.h b/src/math/simplex/simplex.h
index d1d6320fc..2d0fc4443 100644
--- a/src/math/simplex/simplex.h
+++ b/src/math/simplex/simplex.h
@@ -29,8 +29,8 @@ Notes:
 
 --*/
 
-#ifndef _SIMPLEX_H_
-#define _SIMPLEX_H_
+#ifndef SIMPLEX_H_
+#define SIMPLEX_H_
 
 #include "sparse_matrix.h"
 #include "mpq_inf.h"
diff --git a/src/math/simplex/simplex_def.h b/src/math/simplex/simplex_def.h
index 3c1a90a7a..7a3ca01be 100644
--- a/src/math/simplex/simplex_def.h
+++ b/src/math/simplex/simplex_def.h
@@ -19,8 +19,8 @@ Notes:
 
 --*/
 
-#ifndef _SIMPLEX_DEF_H_
-#define _SIMPLEX_DEF_H_
+#ifndef SIMPLEX_DEF_H_
+#define SIMPLEX_DEF_H_
 
 
 namespace simplex {
diff --git a/src/math/simplex/sparse_matrix.h b/src/math/simplex/sparse_matrix.h
index 8c0357691..803d27fde 100644
--- a/src/math/simplex/sparse_matrix.h
+++ b/src/math/simplex/sparse_matrix.h
@@ -16,8 +16,8 @@ Notes:
 
 --*/
 
-#ifndef _SPARSE_MATRIX_H_
-#define _SPARSE_MATRIX_H_
+#ifndef SPARSE_MATRIX_H_
+#define SPARSE_MATRIX_H_
 
 #include "mpq_inf.h"
 #include "statistics.h"
diff --git a/src/math/simplex/sparse_matrix_def.h b/src/math/simplex/sparse_matrix_def.h
index 64dcd8d84..09a8a9225 100644
--- a/src/math/simplex/sparse_matrix_def.h
+++ b/src/math/simplex/sparse_matrix_def.h
@@ -18,8 +18,8 @@ Notes:
 
 --*/
 
-#ifndef _SPARSE_MATRIX_DEF_H_
-#define _SPARSE_MATRIX_DEF_H_
+#ifndef SPARSE_MATRIX_DEF_H_
+#define SPARSE_MATRIX_DEF_H_
 
 #include "sparse_matrix.h"
 #include "uint_set.h"
diff --git a/src/math/subpaving/subpaving.h b/src/math/subpaving/subpaving.h
index ee6946fc5..d3db92741 100644
--- a/src/math/subpaving/subpaving.h
+++ b/src/math/subpaving/subpaving.h
@@ -22,8 +22,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef __SUBPAVING_H_
-#define __SUBPAVING_H_
+#ifndef SUBPAVING_H_
+#define SUBPAVING_H_
 
 #include"mpq.h"
 #include"subpaving_types.h"
diff --git a/src/math/subpaving/subpaving_hwf.h b/src/math/subpaving/subpaving_hwf.h
index a6b317a79..71cb03be4 100644
--- a/src/math/subpaving/subpaving_hwf.h
+++ b/src/math/subpaving/subpaving_hwf.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef __SUBPAVING_HWF_H_
-#define __SUBPAVING_HWF_H_
+#ifndef SUBPAVING_HWF_H_
+#define SUBPAVING_HWF_H_
 
 #include"subpaving_t.h"
 #include"f2n.h"
diff --git a/src/math/subpaving/subpaving_mpf.h b/src/math/subpaving/subpaving_mpf.h
index 014a99f10..5cc11e6ab 100644
--- a/src/math/subpaving/subpaving_mpf.h
+++ b/src/math/subpaving/subpaving_mpf.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef __SUBPAVING_MPF_H_
-#define __SUBPAVING_MPF_H_
+#ifndef SUBPAVING_MPF_H_
+#define SUBPAVING_MPF_H_
 
 #include"subpaving_t.h"
 #include"mpf.h"
diff --git a/src/math/subpaving/subpaving_mpff.h b/src/math/subpaving/subpaving_mpff.h
index f3353690a..c0ddb019d 100644
--- a/src/math/subpaving/subpaving_mpff.h
+++ b/src/math/subpaving/subpaving_mpff.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef __SUBPAVING_MPFF_H_
-#define __SUBPAVING_MPFF_H_
+#ifndef SUBPAVING_MPFF_H_
+#define SUBPAVING_MPFF_H_
 
 #include"subpaving_t.h"
 #include"mpff.h"
diff --git a/src/math/subpaving/subpaving_mpfx.h b/src/math/subpaving/subpaving_mpfx.h
index 78e1d31f3..6213df1e5 100644
--- a/src/math/subpaving/subpaving_mpfx.h
+++ b/src/math/subpaving/subpaving_mpfx.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef __SUBPAVING_MPFX_H_
-#define __SUBPAVING_MPFX_H_
+#ifndef SUBPAVING_MPFX_H_
+#define SUBPAVING_MPFX_H_
 
 #include"subpaving_t.h"
 #include"mpfx.h"
diff --git a/src/math/subpaving/subpaving_mpq.h b/src/math/subpaving/subpaving_mpq.h
index e3bd5b562..04bcd6059 100644
--- a/src/math/subpaving/subpaving_mpq.h
+++ b/src/math/subpaving/subpaving_mpq.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef __SUBPAVING_MPQ_H_
-#define __SUBPAVING_MPQ_H_
+#ifndef SUBPAVING_MPQ_H_
+#define SUBPAVING_MPQ_H_
 
 #include"subpaving_t.h"
 #include"mpq.h"
diff --git a/src/math/subpaving/subpaving_t.h b/src/math/subpaving/subpaving_t.h
index 26a9802ad..a24199451 100644
--- a/src/math/subpaving/subpaving_t.h
+++ b/src/math/subpaving/subpaving_t.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef __SUBPAVING_T_H_
-#define __SUBPAVING_T_H_
+#ifndef SUBPAVING_T_H_
+#define SUBPAVING_T_H_
 
 #include<iostream>
 #include"tptr.h"
diff --git a/src/math/subpaving/subpaving_types.h b/src/math/subpaving/subpaving_types.h
index 8372b5b1f..e81b86e09 100644
--- a/src/math/subpaving/subpaving_types.h
+++ b/src/math/subpaving/subpaving_types.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef __SUBPAVING_TYPES_H_
-#define __SUBPAVING_TYPES_H_
+#ifndef SUBPAVING_TYPES_H_
+#define SUBPAVING_TYPES_H_
 
 namespace subpaving {
 
diff --git a/src/math/subpaving/tactic/expr2subpaving.h b/src/math/subpaving/tactic/expr2subpaving.h
index 1deb023f7..7373ecf1e 100644
--- a/src/math/subpaving/tactic/expr2subpaving.h
+++ b/src/math/subpaving/tactic/expr2subpaving.h
@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _EXPR2SUBPAVING_H_
-#define _EXPR2SUBPAVING_H_
+#ifndef EXPR2SUBPAVING_H_
+#define EXPR2SUBPAVING_H_
 
 #include"ast.h"
 #include"subpaving.h"
diff --git a/src/math/subpaving/tactic/subpaving_tactic.h b/src/math/subpaving/tactic/subpaving_tactic.h
index 087c72847..30a72b888 100644
--- a/src/math/subpaving/tactic/subpaving_tactic.h
+++ b/src/math/subpaving/tactic/subpaving_tactic.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef __SUBPAVING_TACTIC_H_
-#define __SUBPAVING_TACTIC_H_
+#ifndef SUBPAVING_TACTIC_H_
+#define SUBPAVING_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/model/func_interp.h b/src/model/func_interp.h
index fd21a6a7c..b264f4f1d 100644
--- a/src/model/func_interp.h
+++ b/src/model/func_interp.h
@@ -27,8 +27,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _FUNC_INTERP_H
-#define _FUNC_INTERP_H
+#ifndef FUNC_INTERP_H_
+#define FUNC_INTERP_H_
 
 #include"ast.h"
 #include"ast_translation.h"
diff --git a/src/model/model.h b/src/model/model.h
index 70c8723fa..68ddc4015 100644
--- a/src/model/model.h
+++ b/src/model/model.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MODEL_H_
-#define _MODEL_H_
+#ifndef MODEL_H_
+#define MODEL_H_
 
 #include"model_core.h"
 #include"ref.h"
@@ -65,5 +65,5 @@ public:
 
 typedef ref<model> model_ref;
 
-#endif /* _MODEL_H_ */
+#endif /* MODEL_H_ */
 
diff --git a/src/model/model2expr.h b/src/model/model2expr.h
index 3fd2e4524..272ba20b6 100644
--- a/src/model/model2expr.h
+++ b/src/model/model2expr.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MODEL2EXPR_H_
-#define _MODEL2EXPR_H_
+#ifndef MODEL2EXPR_H_
+#define MODEL2EXPR_H_
 
 #include"model.h"
 
@@ -41,5 +41,5 @@ public:
 };
 
 
-#endif /* _MODEL2EXPR_H_ */
+#endif /* MODEL2EXPR_H_ */
 
diff --git a/src/model/model_core.h b/src/model/model_core.h
index 72d7a321b..9925582f3 100644
--- a/src/model/model_core.h
+++ b/src/model/model_core.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MODEL_CORE_H
-#define _MODEL_CORE_H
+#ifndef MODEL_CORE_H_
+#define MODEL_CORE_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
diff --git a/src/model/model_evaluator.h b/src/model/model_evaluator.h
index 1a7469c6c..0884c1850 100644
--- a/src/model/model_evaluator.h
+++ b/src/model/model_evaluator.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MODEL_EVALUATOR_H_
-#define _MODEL_EVALUATOR_H_
+#ifndef MODEL_EVALUATOR_H_
+#define MODEL_EVALUATOR_H_
 
 #include"ast.h"
 #include"rewriter_types.h"
diff --git a/src/model/model_implicant.h b/src/model/model_implicant.h
index 21c91b3cb..91bfe9894 100644
--- a/src/model/model_implicant.h
+++ b/src/model/model_implicant.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef _MODEL_IMPLICANT_H_
-#define _MODEL_IMPLICANT_H_
+#ifndef MODEL_IMPLICANT_H_
+#define MODEL_IMPLICANT_H_
 
 #include "ast.h"
 #include "ast_pp.h"
diff --git a/src/model/model_pp.h b/src/model/model_pp.h
index 31a6083a7..1b18d9a88 100644
--- a/src/model/model_pp.h
+++ b/src/model/model_pp.h
@@ -17,8 +17,8 @@ Revision History:
 
 
 --*/
-#ifndef _MODEL_PP_H_
-#define _MODEL_PP_H_
+#ifndef MODEL_PP_H_
+#define MODEL_PP_H_
 
 #include<iostream>
 class model_core;
diff --git a/src/model/model_smt2_pp.h b/src/model/model_smt2_pp.h
index 0b76a8bed..c123bfb24 100644
--- a/src/model/model_smt2_pp.h
+++ b/src/model/model_smt2_pp.h
@@ -17,8 +17,8 @@ Revision History:
 
 
 --*/
-#ifndef _MODEL_SMT2_PP_H_
-#define _MODEL_SMT2_PP_H_
+#ifndef MODEL_SMT2_PP_H_
+#define MODEL_SMT2_PP_H_
 
 #include"ast_printer.h"
 #include"model_core.h"
diff --git a/src/model/model_v2_pp.h b/src/model/model_v2_pp.h
index 9121f023a..6715d055a 100644
--- a/src/model/model_v2_pp.h
+++ b/src/model/model_v2_pp.h
@@ -15,8 +15,8 @@ Author:
 
 Revision History:
 --*/
-#ifndef _MODEL_V2_PP_H_
-#define _MODEL_V2_PP_H_
+#ifndef MODEL_V2_PP_H_
+#define MODEL_V2_PP_H_
 
 #include<iostream>
 class model_core;
diff --git a/src/muz/base/bind_variables.h b/src/muz/base/bind_variables.h
index 87b2f186b..f2aa29224 100644
--- a/src/muz/base/bind_variables.h
+++ b/src/muz/base/bind_variables.h
@@ -18,8 +18,8 @@ Notes:
 
 --*/
 
-#ifndef _BIND_VARIABLES_H_
-#define _BIND_VARIABLES_H_
+#ifndef BIND_VARIABLES_H_
+#define BIND_VARIABLES_H_
 
 #include"ast.h"
 
@@ -48,4 +48,4 @@ public:
     void add_var(app* v);
 };
 
-#endif /* _BIND_VARIABLES_H_ */
+#endif /* BIND_VARIABLES_H_ */
diff --git a/src/muz/base/dl_context.h b/src/muz/base/dl_context.h
index d8d961a6a..705758aca 100644
--- a/src/muz/base/dl_context.h
+++ b/src/muz/base/dl_context.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_CONTEXT_H_
-#define _DL_CONTEXT_H_
+#ifndef DL_CONTEXT_H_
+#define DL_CONTEXT_H_
 
 #ifdef _CYGWIN
 #undef min
@@ -586,5 +586,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_CONTEXT_H_ */
+#endif /* DL_CONTEXT_H_ */
 
diff --git a/src/muz/base/dl_costs.h b/src/muz/base/dl_costs.h
index 16cfc16b1..f3f97f6fd 100644
--- a/src/muz/base/dl_costs.h
+++ b/src/muz/base/dl_costs.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef _DL_COSTS_H_
-#define _DL_COSTS_H_
+#ifndef DL_COSTS_H_
+#define DL_COSTS_H_
 
 #include<iosfwd>
 
@@ -111,5 +111,5 @@ namespace datalog {
     };
 };
 
-#endif /* _DL_COSTS_H_ */
+#endif /* DL_COSTS_H_ */
 
diff --git a/src/muz/base/dl_engine_base.h b/src/muz/base/dl_engine_base.h
index 21a07fcb0..e0d8680b2 100644
--- a/src/muz/base/dl_engine_base.h
+++ b/src/muz/base/dl_engine_base.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_ENGINE_BASE_H_
-#define _DL_ENGINE_BASE_H_
+#ifndef DL_ENGINE_BASE_H_
+#define DL_ENGINE_BASE_H_
 
 #include "model.h"
 
diff --git a/src/muz/base/dl_rule.h b/src/muz/base/dl_rule.h
index 468b9f88c..34cbffcb7 100644
--- a/src/muz/base/dl_rule.h
+++ b/src/muz/base/dl_rule.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef _DL_RULE_H_
-#define _DL_RULE_H_
+#ifndef DL_RULE_H_
+#define DL_RULE_H_
 
 #include"ast.h"
 #include"dl_costs.h"
@@ -387,5 +387,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_RULE_H_ */
+#endif /* DL_RULE_H_ */
 
diff --git a/src/muz/base/dl_rule_set.h b/src/muz/base/dl_rule_set.h
index a7d09b099..b6735aba9 100644
--- a/src/muz/base/dl_rule_set.h
+++ b/src/muz/base/dl_rule_set.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_RULE_SET_H_
-#define _DL_RULE_SET_H_
+#ifndef DL_RULE_SET_H_
+#define DL_RULE_SET_H_
 
 #include"obj_hashtable.h"
 #include"dl_rule.h"
@@ -279,5 +279,5 @@ namespace datalog {
     
 };
 
-#endif /* _DL_RULE_SET_H_ */
+#endif /* DL_RULE_SET_H_ */
 
diff --git a/src/muz/base/dl_rule_subsumption_index.h b/src/muz/base/dl_rule_subsumption_index.h
index 44befc9bb..89f7d44b7 100644
--- a/src/muz/base/dl_rule_subsumption_index.h
+++ b/src/muz/base/dl_rule_subsumption_index.h
@@ -18,8 +18,8 @@ Revision History:
 
 --*/
 
-#ifndef _DL_RULE_SUBSUMPTION_INDEX_H_
-#define _DL_RULE_SUBSUMPTION_INDEX_H_
+#ifndef DL_RULE_SUBSUMPTION_INDEX_H_
+#define DL_RULE_SUBSUMPTION_INDEX_H_
 
 #include "dl_context.h"
 
@@ -61,5 +61,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_RULE_SUBSUMPTION_INDEX_H_ */
+#endif /* DL_RULE_SUBSUMPTION_INDEX_H_ */
 
diff --git a/src/muz/base/dl_rule_transformer.h b/src/muz/base/dl_rule_transformer.h
index 3f60e9aea..d166acdd0 100644
--- a/src/muz/base/dl_rule_transformer.h
+++ b/src/muz/base/dl_rule_transformer.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_RULE_TRANSFORMER_H_
-#define _DL_RULE_TRANSFORMER_H_
+#ifndef DL_RULE_TRANSFORMER_H_
+#define DL_RULE_TRANSFORMER_H_
 
 #include"map.h"
 #include"vector.h"
@@ -113,5 +113,5 @@ namespace datalog {
     };
 };
 
-#endif /* _DL_RULE_TRANSFORMER_H_ */
+#endif /* DL_RULE_TRANSFORMER_H_ */
 
diff --git a/src/muz/base/dl_util.h b/src/muz/base/dl_util.h
index 513add584..8b4344ce6 100644
--- a/src/muz/base/dl_util.h
+++ b/src/muz/base/dl_util.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_UTIL_H_
-#define _DL_UTIL_H_
+#ifndef DL_UTIL_H_
+#define DL_UTIL_H_
 
 #include"ast.h"
 #include"hashtable.h"
@@ -733,5 +733,5 @@ namespace datalog {
     bool read_uint64(const char * & s, uint64 & res);
 };
 
-#endif /* _DL_UTIL_H_ */
+#endif /* DL_UTIL_H_ */
 
diff --git a/src/muz/base/hnf.h b/src/muz/base/hnf.h
index 4d3edcb68..35fc5fafc 100644
--- a/src/muz/base/hnf.h
+++ b/src/muz/base/hnf.h
@@ -22,8 +22,8 @@ Copyright (c) 2015 Microsoft Corporation
  
 --*/
  
-#ifndef _HNF_H_
-#define _HNF_H_
+#ifndef HNF_H_
+#define HNF_H_
  
 #include"ast.h"
 #include"params.h"
@@ -51,4 +51,4 @@ class hnf {
     func_decl_ref_vector const& get_fresh_predicates();
 };
  
-#endif /* _HNF_H_ */
+#endif /* HNF_H_ */
diff --git a/src/muz/base/proof_utils.h b/src/muz/base/proof_utils.h
index 383b5c379..0db831c4f 100644
--- a/src/muz/base/proof_utils.h
+++ b/src/muz/base/proof_utils.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PROOF_UTILS_H_
-#define _PROOF_UTILS_H_
+#ifndef PROOF_UTILS_H_
+#define PROOF_UTILS_H_
 
 class proof_utils {
 public:
diff --git a/src/muz/base/rule_properties.h b/src/muz/base/rule_properties.h
index 18ecd2ee8..f53ad3841 100644
--- a/src/muz/base/rule_properties.h
+++ b/src/muz/base/rule_properties.h
@@ -18,8 +18,8 @@ Notes:
 
 --*/
 
-#ifndef _RULE_PROPERTIES_H_
-#define _RULE_PROPERTIES_H_
+#ifndef RULE_PROPERTIES_H_
+#define RULE_PROPERTIES_H_
 
 #include"ast.h"
 #include"datatype_decl_plugin.h"
@@ -62,4 +62,4 @@ namespace datalog {
     };
 }
 
-#endif /* _RULE_PROPERTIES_H_ */
+#endif /* RULE_PROPERTIES_H_ */
diff --git a/src/muz/bmc/dl_bmc_engine.h b/src/muz/bmc/dl_bmc_engine.h
index e20987002..b9b161753 100644
--- a/src/muz/bmc/dl_bmc_engine.h
+++ b/src/muz/bmc/dl_bmc_engine.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef _DL_BMC_ENGINE_H_
-#define _DL_BMC_ENGINE_H_
+#ifndef DL_BMC_ENGINE_H_
+#define DL_BMC_ENGINE_H_
 
 #include "params.h"
 #include "statistics.h"
diff --git a/src/muz/clp/clp_context.h b/src/muz/clp/clp_context.h
index 6464ae634..de0b25b7f 100644
--- a/src/muz/clp/clp_context.h
+++ b/src/muz/clp/clp_context.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _CLP_CONTEXT_H_
-#define _CLP_CONTEXT_H_
+#ifndef CLP_CONTEXT_H_
+#define CLP_CONTEXT_H_
 
 #include "ast.h"
 #include "lbool.h"
diff --git a/src/muz/ddnf/ddnf.h b/src/muz/ddnf/ddnf.h
index 79c79ed9d..63c275194 100644
--- a/src/muz/ddnf/ddnf.h
+++ b/src/muz/ddnf/ddnf.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DDNF__H_
-#define _DDNF__H_
+#ifndef DDNF__H_
+#define DDNF__H_
 
 #include "ast.h"
 #include "lbool.h"
diff --git a/src/muz/duality/duality_dl_interface.h b/src/muz/duality/duality_dl_interface.h
index 0d739f5cc..a7c186074 100644
--- a/src/muz/duality/duality_dl_interface.h
+++ b/src/muz/duality/duality_dl_interface.h
@@ -18,8 +18,8 @@
 
   --*/
 
-#ifndef _DUALITY_DL_INTERFACE_H_
-#define _DUALITY_DL_INTERFACE_H_
+#ifndef DUALITY_DL_INTERFACE_H_
+#define DUALITY_DL_INTERFACE_H_
 
 #include "lbool.h"
 #include "dl_rule.h"
diff --git a/src/muz/fp/datalog_parser.h b/src/muz/fp/datalog_parser.h
index 88ba3ab72..70b251585 100644
--- a/src/muz/fp/datalog_parser.h
+++ b/src/muz/fp/datalog_parser.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DATALOG_PARSER_H_
-#define _DATALOG_PARSER_H_
+#ifndef DATALOG_PARSER_H_
+#define DATALOG_PARSER_H_
 
 #include "ast.h"
 #include "dl_context.h"
diff --git a/src/muz/fp/dl_cmds.h b/src/muz/fp/dl_cmds.h
index d71b319c4..a06e6140e 100644
--- a/src/muz/fp/dl_cmds.h
+++ b/src/muz/fp/dl_cmds.h
@@ -15,8 +15,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _DL_CMDS_H_
-#define _DL_CMDS_H_
+#ifndef DL_CMDS_H_
+#define DL_CMDS_H_
 
 #include "ast.h"
 
diff --git a/src/muz/fp/dl_register_engine.h b/src/muz/fp/dl_register_engine.h
index 44f5090e6..4d5076b75 100644
--- a/src/muz/fp/dl_register_engine.h
+++ b/src/muz/fp/dl_register_engine.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_REGISTER_ENGINE_H_
-#define _DL_REGISTER_ENGINE_H_
+#ifndef DL_REGISTER_ENGINE_H_
+#define DL_REGISTER_ENGINE_H_
 
 #include "dl_context.h"
 
diff --git a/src/muz/fp/horn_tactic.h b/src/muz/fp/horn_tactic.h
index f041321ea..72432b4e2 100644
--- a/src/muz/fp/horn_tactic.h
+++ b/src/muz/fp/horn_tactic.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _HORN_TACTIC_H_
-#define _HORN_TACTIC_H_
+#ifndef HORN_TACTIC_H_
+#define HORN_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/muz/pdr/pdr_closure.h b/src/muz/pdr/pdr_closure.h
index 885dbce8d..ab417e90e 100644
--- a/src/muz/pdr/pdr_closure.h
+++ b/src/muz/pdr/pdr_closure.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef _PDR_CLOSURE_H_
-#define _PDR_CLOSURE_H_
+#ifndef PDR_CLOSURE_H_
+#define PDR_CLOSURE_H_
 
 #include "arith_decl_plugin.h"
 
diff --git a/src/muz/pdr/pdr_context.h b/src/muz/pdr/pdr_context.h
index 070a80ca4..7cba1e0c5 100644
--- a/src/muz/pdr/pdr_context.h
+++ b/src/muz/pdr/pdr_context.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef _PDR_CONTEXT_H_
-#define _PDR_CONTEXT_H_
+#ifndef PDR_CONTEXT_H_
+#define PDR_CONTEXT_H_
 
 #ifdef _CYGWIN
 #undef min
diff --git a/src/muz/pdr/pdr_dl_interface.h b/src/muz/pdr/pdr_dl_interface.h
index 610e7fe06..f9e54d85b 100644
--- a/src/muz/pdr/pdr_dl_interface.h
+++ b/src/muz/pdr/pdr_dl_interface.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef _PDR_DL_INTERFACE_H_
-#define _PDR_DL_INTERFACE_H_
+#ifndef PDR_DL_INTERFACE_H_
+#define PDR_DL_INTERFACE_H_
 
 #include "lbool.h"
 #include "dl_rule.h"
diff --git a/src/muz/pdr/pdr_farkas_learner.h b/src/muz/pdr/pdr_farkas_learner.h
index 546759a33..3a4d81f96 100644
--- a/src/muz/pdr/pdr_farkas_learner.h
+++ b/src/muz/pdr/pdr_farkas_learner.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef _PDR_FARKAS_LEARNER_H_
-#define _PDR_FARKAS_LEARNER_H_
+#ifndef PDR_FARKAS_LEARNER_H_
+#define PDR_FARKAS_LEARNER_H_
 
 #include "arith_decl_plugin.h"
 #include "ast_translation.h"
diff --git a/src/muz/pdr/pdr_generalizers.h b/src/muz/pdr/pdr_generalizers.h
index be04ec646..3e4576fa1 100644
--- a/src/muz/pdr/pdr_generalizers.h
+++ b/src/muz/pdr/pdr_generalizers.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef _PDR_GENERALIZERS_H_
-#define _PDR_GENERALIZERS_H_
+#ifndef PDR_GENERALIZERS_H_
+#define PDR_GENERALIZERS_H_
 
 #include "pdr_context.h"
 #include "pdr_closure.h"
diff --git a/src/muz/pdr/pdr_manager.h b/src/muz/pdr/pdr_manager.h
index f892e4d97..9049e4ca9 100644
--- a/src/muz/pdr/pdr_manager.h
+++ b/src/muz/pdr/pdr_manager.h
@@ -18,8 +18,8 @@ Revision History:
 
 --*/
 
-#ifndef _PDR_MANAGER_H_
-#define _PDR_MANAGER_H_
+#ifndef PDR_MANAGER_H_
+#define PDR_MANAGER_H_
 
 #include <utility>
 #include <map>
diff --git a/src/muz/pdr/pdr_prop_solver.h b/src/muz/pdr/pdr_prop_solver.h
index a44ac7e5a..ad7e1fd9a 100644
--- a/src/muz/pdr/pdr_prop_solver.h
+++ b/src/muz/pdr/pdr_prop_solver.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef _PROP_SOLVER_H_
-#define _PROP_SOLVER_H_
+#ifndef PROP_SOLVER_H_
+#define PROP_SOLVER_H_
 
 #include <map>
 #include <string>
diff --git a/src/muz/pdr/pdr_reachable_cache.h b/src/muz/pdr/pdr_reachable_cache.h
index aef6f7a4f..66832ba42 100644
--- a/src/muz/pdr/pdr_reachable_cache.h
+++ b/src/muz/pdr/pdr_reachable_cache.h
@@ -18,8 +18,8 @@ Revision History:
 --*/
 
 
-#ifndef _REACHABLE_CACHE_H_
-#define _REACHABLE_CACHE_H_
+#ifndef REACHABLE_CACHE_H_
+#define REACHABLE_CACHE_H_
 #include "ast.h"
 #include "ref_vector.h"
 #include "pdr_manager.h"
diff --git a/src/muz/pdr/pdr_smt_context_manager.h b/src/muz/pdr/pdr_smt_context_manager.h
index 625428042..173367a41 100644
--- a/src/muz/pdr/pdr_smt_context_manager.h
+++ b/src/muz/pdr/pdr_smt_context_manager.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef _PDR_SMT_CONTEXT_MANAGER_H_
-#define _PDR_SMT_CONTEXT_MANAGER_H_
+#ifndef PDR_SMT_CONTEXT_MANAGER_H_
+#define PDR_SMT_CONTEXT_MANAGER_H_
 
 #include "smt_kernel.h"
 #include "func_decl_dependencies.h"
diff --git a/src/muz/pdr/pdr_sym_mux.h b/src/muz/pdr/pdr_sym_mux.h
index c8ca56c7a..986d961c7 100644
--- a/src/muz/pdr/pdr_sym_mux.h
+++ b/src/muz/pdr/pdr_sym_mux.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef _SYM_MUX_H_
-#define _SYM_MUX_H_
+#ifndef SYM_MUX_H_
+#define SYM_MUX_H_
 
 #include "ast.h"
 #include "map.h"
diff --git a/src/muz/pdr/pdr_util.h b/src/muz/pdr/pdr_util.h
index 29b640d74..09fad8a30 100644
--- a/src/muz/pdr/pdr_util.h
+++ b/src/muz/pdr/pdr_util.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef _PDR_UTIL_H_
-#define _PDR_UTIL_H_
+#ifndef PDR_UTIL_H_
+#define PDR_UTIL_H_
 
 #include "ast.h"
 #include "ast_pp.h"
diff --git a/src/muz/rel/aig_exporter.h b/src/muz/rel/aig_exporter.h
index 78ab9fe17..71af6fb35 100644
--- a/src/muz/rel/aig_exporter.h
+++ b/src/muz/rel/aig_exporter.h
@@ -11,8 +11,8 @@ Abstract:
 
 --*/
 
-#ifndef _AIG_EXPORTER_H_
-#define _AIG_EXPORTER_H_
+#ifndef AIG_EXPORTER_H_
+#define AIG_EXPORTER_H_
 
 #include "aig.h"
 #include "dl_rule_set.h"
diff --git a/src/muz/rel/check_relation.h b/src/muz/rel/check_relation.h
index 8000a2c72..c91567553 100644
--- a/src/muz/rel/check_relation.h
+++ b/src/muz/rel/check_relation.h
@@ -19,8 +19,8 @@ Revision History:
 
 --*/
 
-#ifndef _CHECK_RELATION_H_
-#define _CHECK_RELATION_H_
+#ifndef CHECK_RELATION_H_
+#define CHECK_RELATION_H_
 
 #include "doc.h"
 #include "dl_base.h"
@@ -168,5 +168,5 @@ namespace datalog {
     };
 };
        
-#endif /* _CHECK_RELATION_H_ */
+#endif /* CHECK_RELATION_H_ */
 
diff --git a/src/muz/rel/dl_base.h b/src/muz/rel/dl_base.h
index 6ab1b2a96..c26623737 100644
--- a/src/muz/rel/dl_base.h
+++ b/src/muz/rel/dl_base.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_BASE_H_
-#define _DL_BASE_H_
+#ifndef DL_BASE_H_
+#define DL_BASE_H_
 
 #define DL_LEAK_HUNTING 0
 
@@ -1309,5 +1309,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_BASE_H_ */
+#endif /* DL_BASE_H_ */
 
diff --git a/src/muz/rel/dl_bound_relation.h b/src/muz/rel/dl_bound_relation.h
index 906ba571a..485dfbafa 100644
--- a/src/muz/rel/dl_bound_relation.h
+++ b/src/muz/rel/dl_bound_relation.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_BOUND_RELATION_H_
-#define _DL_BOUND_RELATION_H_
+#ifndef DL_BOUND_RELATION_H_
+#define DL_BOUND_RELATION_H_
 
 #include "dl_context.h"
 #include "dl_relation_manager.h"
diff --git a/src/muz/rel/dl_check_table.h b/src/muz/rel/dl_check_table.h
index e4f439590..35f399452 100644
--- a/src/muz/rel/dl_check_table.h
+++ b/src/muz/rel/dl_check_table.h
@@ -18,8 +18,8 @@ Revision History:
 
 --*/
 
-#ifndef _DL_CHECK_TABLE_H_
-#define _DL_CHECK_TABLE_H_
+#ifndef DL_CHECK_TABLE_H_
+#define DL_CHECK_TABLE_H_
 
 #include "dl_base.h"
 #include "dl_decl_plugin.h"
@@ -132,4 +132,4 @@ namespace datalog {
 
  };
 
- #endif /* _DL_CHECK_TABLE_H_ */
+#endif /* DL_CHECK_TABLE_H_ */
diff --git a/src/muz/rel/dl_compiler.h b/src/muz/rel/dl_compiler.h
index a9e37a8a3..51be65d01 100644
--- a/src/muz/rel/dl_compiler.h
+++ b/src/muz/rel/dl_compiler.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_COMPILER_H_
-#define _DL_COMPILER_H_
+#ifndef DL_COMPILER_H_
+#define DL_COMPILER_H_
 
 #include<iostream>
 #include<list>
@@ -299,5 +299,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_COMPILER_H_ */
+#endif /* DL_COMPILER_H_ */
 
diff --git a/src/muz/rel/dl_external_relation.h b/src/muz/rel/dl_external_relation.h
index 03838ecc4..0bd78b776 100644
--- a/src/muz/rel/dl_external_relation.h
+++ b/src/muz/rel/dl_external_relation.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_EXTERNAL_RELATION_H_
-#define _DL_EXTERNAL_RELATION_H_
+#ifndef DL_EXTERNAL_RELATION_H_
+#define DL_EXTERNAL_RELATION_H_
 
 #include "dl_base.h"
 
diff --git a/src/muz/rel/dl_finite_product_relation.h b/src/muz/rel/dl_finite_product_relation.h
index d5181d122..e91ab4a17 100644
--- a/src/muz/rel/dl_finite_product_relation.h
+++ b/src/muz/rel/dl_finite_product_relation.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_FINITE_PRODUCT_RELATION_H_
-#define _DL_FINITE_PRODUCT_RELATION_H_
+#ifndef DL_FINITE_PRODUCT_RELATION_H_
+#define DL_FINITE_PRODUCT_RELATION_H_
 
 
 #include "dl_base.h"
@@ -362,5 +362,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_FINITE_PRODUCT_RELATION_H_ */
+#endif /* DL_FINITE_PRODUCT_RELATION_H_ */
 
diff --git a/src/muz/rel/dl_instruction.h b/src/muz/rel/dl_instruction.h
index a02346b99..160eb7b94 100644
--- a/src/muz/rel/dl_instruction.h
+++ b/src/muz/rel/dl_instruction.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_INSTRUCTION_H_
-#define _DL_INSTRUCTION_H_
+#ifndef DL_INSTRUCTION_H_
+#define DL_INSTRUCTION_H_
 
 #include<iostream>
 #include<string>
@@ -368,5 +368,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_INSTRUCTION_H_ */
+#endif /* DL_INSTRUCTION_H_ */
 
diff --git a/src/muz/rel/dl_interval_relation.h b/src/muz/rel/dl_interval_relation.h
index 703cb43c5..a8239ef24 100644
--- a/src/muz/rel/dl_interval_relation.h
+++ b/src/muz/rel/dl_interval_relation.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_INTERVAL_RELATION_H_
-#define _DL_INTERVAL_RELATION_H_
+#ifndef DL_INTERVAL_RELATION_H_
+#define DL_INTERVAL_RELATION_H_
 
 
 #include "dl_context.h"
diff --git a/src/muz/rel/dl_lazy_table.h b/src/muz/rel/dl_lazy_table.h
index 3c0b47367..25870ac1e 100644
--- a/src/muz/rel/dl_lazy_table.h
+++ b/src/muz/rel/dl_lazy_table.h
@@ -18,8 +18,8 @@ Revision History:
 
 --*/
 
-#ifndef _DL_LAZY_TABLE_H_
-#define _DL_LAZY_TABLE_H_
+#ifndef DL_LAZY_TABLE_H_
+#define DL_LAZY_TABLE_H_
 
 #include "dl_base.h"
 #include "ref.h"
diff --git a/src/muz/rel/dl_mk_explanations.h b/src/muz/rel/dl_mk_explanations.h
index 9e4d705c3..54e56bbe8 100644
--- a/src/muz/rel/dl_mk_explanations.h
+++ b/src/muz/rel/dl_mk_explanations.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef _DL_MK_EXPLANATIONS_H_
-#define _DL_MK_EXPLANATIONS_H_
+#ifndef DL_MK_EXPLANATIONS_H_
+#define DL_MK_EXPLANATIONS_H_
 
 #include "dl_context.h"
 #include "dl_rule_transformer.h"
@@ -82,5 +82,5 @@ namespace datalog {
     };
 };
 
-#endif /* _DL_MK_EXPLANATIONS_H_ */
+#endif /* DL_MK_EXPLANATIONS_H_ */
 
diff --git a/src/muz/rel/dl_mk_partial_equiv.h b/src/muz/rel/dl_mk_partial_equiv.h
index 54a70b3c0..f982952f1 100644
--- a/src/muz/rel/dl_mk_partial_equiv.h
+++ b/src/muz/rel/dl_mk_partial_equiv.h
@@ -18,8 +18,8 @@ Revision History:
 --*/
 
 
-#ifndef _DL_MK_PARTIAL_EQUIVALENCE_TRANSFORMER_H_
-#define _DL_MK_PARTIAL_EQUIVALENCE_TRANSFORMER_H_
+#ifndef DL_MK_PARTIAL_EQUIVALENCE_TRANSFORMER_H_
+#define DL_MK_PARTIAL_EQUIVALENCE_TRANSFORMER_H_
 
 #include "dl_context.h"
 #include "dl_rule_transformer.h"
@@ -45,6 +45,6 @@ namespace datalog {
 
 };
 
-#endif /* _DL_MK_PARTIAL_EQUIV_TRANSFORMER_H_ */
+#endif /* DL_MK_PARTIAL_EQUIV_TRANSFORMER_H_ */
 
 
diff --git a/src/muz/rel/dl_mk_similarity_compressor.h b/src/muz/rel/dl_mk_similarity_compressor.h
index 34b76e7e1..9ecbf7bfb 100644
--- a/src/muz/rel/dl_mk_similarity_compressor.h
+++ b/src/muz/rel/dl_mk_similarity_compressor.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_MK_SIMILARITY_COMPRESSOR_H_
-#define _DL_MK_SIMILARITY_COMPRESSOR_H_
+#ifndef DL_MK_SIMILARITY_COMPRESSOR_H_
+#define DL_MK_SIMILARITY_COMPRESSOR_H_
 
 #include<utility>
 
@@ -74,5 +74,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_MK_SIMILARITY_COMPRESSOR_H_ */
+#endif /* DL_MK_SIMILARITY_COMPRESSOR_H_ */
 
diff --git a/src/muz/rel/dl_mk_simple_joins.h b/src/muz/rel/dl_mk_simple_joins.h
index 36eb08dd5..1289e7831 100644
--- a/src/muz/rel/dl_mk_simple_joins.h
+++ b/src/muz/rel/dl_mk_simple_joins.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_MK_SIMPLE_JOINS_H_
-#define _DL_MK_SIMPLE_JOINS_H_
+#ifndef DL_MK_SIMPLE_JOINS_H_
+#define DL_MK_SIMPLE_JOINS_H_
 
 #include"map.h"
 #include"obj_pair_hashtable.h"
@@ -59,5 +59,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_MK_SIMPLE_JOINS_H_ */
+#endif /* DL_MK_SIMPLE_JOINS_H_ */
 
diff --git a/src/muz/rel/dl_product_relation.h b/src/muz/rel/dl_product_relation.h
index f2efd9678..6381fcf37 100644
--- a/src/muz/rel/dl_product_relation.h
+++ b/src/muz/rel/dl_product_relation.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_PRODUCT_RELATION_H_
-#define _DL_PRODUCT_RELATION_H_
+#ifndef DL_PRODUCT_RELATION_H_
+#define DL_PRODUCT_RELATION_H_
 
 
 #include "dl_context.h"
diff --git a/src/muz/rel/dl_relation_manager.h b/src/muz/rel/dl_relation_manager.h
index f91b7496a..cda6373d3 100644
--- a/src/muz/rel/dl_relation_manager.h
+++ b/src/muz/rel/dl_relation_manager.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_RELATION_MANAGER_H_
-#define _DL_RELATION_MANAGER_H_
+#ifndef DL_RELATION_MANAGER_H_
+#define DL_RELATION_MANAGER_H_
 
 
 #include"map.h"
@@ -706,5 +706,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_RELATION_MANAGER_H_ */
+#endif /* DL_RELATION_MANAGER_H_ */
 
diff --git a/src/muz/rel/dl_sieve_relation.h b/src/muz/rel/dl_sieve_relation.h
index 48402cd6d..da6c9bbff 100644
--- a/src/muz/rel/dl_sieve_relation.h
+++ b/src/muz/rel/dl_sieve_relation.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef _DL_SIEVE_RELATION_H_
-#define _DL_SIEVE_RELATION_H_
+#ifndef DL_SIEVE_RELATION_H_
+#define DL_SIEVE_RELATION_H_
 
 #include "dl_context.h"
 #include "dl_relation_manager.h"
@@ -194,5 +194,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_SIEVE_RELATION_H_ */
+#endif /* DL_SIEVE_RELATION_H_ */
 
diff --git a/src/muz/rel/dl_sparse_table.h b/src/muz/rel/dl_sparse_table.h
index 0222aa6e2..95dccdf89 100644
--- a/src/muz/rel/dl_sparse_table.h
+++ b/src/muz/rel/dl_sparse_table.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef _DL_SPARSE_TABLE_H_
-#define _DL_SPARSE_TABLE_H_
+#ifndef DL_SPARSE_TABLE_H_
+#define DL_SPARSE_TABLE_H_
 
 #include<iostream>
 #include<list>
@@ -495,4 +495,4 @@ namespace datalog {
 
  };
 
- #endif /* _DL_SPARSE_TABLE_H_ */
+#endif /* DL_SPARSE_TABLE_H_ */
diff --git a/src/muz/rel/dl_table.h b/src/muz/rel/dl_table.h
index 3a240c337..b77e860d6 100644
--- a/src/muz/rel/dl_table.h
+++ b/src/muz/rel/dl_table.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_TABLE_H_
-#define _DL_TABLE_H_
+#ifndef DL_TABLE_H_
+#define DL_TABLE_H_
 
 #include<iostream>
 #include<list>
@@ -261,5 +261,5 @@ namespace datalog {
     
 };
 
-#endif /* _DL_TABLE_H_ */
+#endif /* DL_TABLE_H_ */
 
diff --git a/src/muz/rel/dl_table_plugin.h b/src/muz/rel/dl_table_plugin.h
index 134389b61..7765f54d3 100644
--- a/src/muz/rel/dl_table_plugin.h
+++ b/src/muz/rel/dl_table_plugin.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_TABLE_PLUGIN_H_
-#define _DL_TABLE_PLUGIN_H_
+#ifndef DL_TABLE_PLUGIN_H_
+#define DL_TABLE_PLUGIN_H_
 
 #include"ast.h"
 #include"map.h"
@@ -189,5 +189,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_TABLE_PLUGIN_H_ */
+#endif /* DL_TABLE_PLUGIN_H_ */
 
diff --git a/src/muz/rel/dl_table_relation.h b/src/muz/rel/dl_table_relation.h
index f86143c0f..8266995da 100644
--- a/src/muz/rel/dl_table_relation.h
+++ b/src/muz/rel/dl_table_relation.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_TABLE_RELATION_H_
-#define _DL_TABLE_RELATION_H_
+#ifndef DL_TABLE_RELATION_H_
+#define DL_TABLE_RELATION_H_
 
 
 #include "dl_base.h"
@@ -129,5 +129,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_TABLE_RELATION_H_ */
+#endif /* DL_TABLE_RELATION_H_ */
 
diff --git a/src/muz/rel/dl_vector_relation.h b/src/muz/rel/dl_vector_relation.h
index c349c6e19..040d23300 100644
--- a/src/muz/rel/dl_vector_relation.h
+++ b/src/muz/rel/dl_vector_relation.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_VECTOR_RELATION_H_
-#define _DL_VECTOR_RELATION_H_
+#ifndef DL_VECTOR_RELATION_H_
+#define DL_VECTOR_RELATION_H_
 
 #include "ast_pp.h"
 #include "dl_context.h"
diff --git a/src/muz/rel/doc.h b/src/muz/rel/doc.h
index 6ffefaf88..23b636cf9 100644
--- a/src/muz/rel/doc.h
+++ b/src/muz/rel/doc.h
@@ -20,8 +20,8 @@ Revision History:
 
 --*/
 
-#ifndef _DOC_H_
-#define _DOC_H_
+#ifndef DOC_H_
+#define DOC_H_
 
 #include "tbv.h"
 #include "union_find.h"
@@ -389,5 +389,5 @@ public:
     operator bool() const { return d != 0; }
 };
 
-#endif /* _DOC_H_ */
+#endif /* DOC_H_ */
 
diff --git a/src/muz/rel/karr_relation.h b/src/muz/rel/karr_relation.h
index 72448f026..90c9abbd4 100644
--- a/src/muz/rel/karr_relation.h
+++ b/src/muz/rel/karr_relation.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _KARR_RELATION_H_
-#define _KARR_RELATION_H_
+#ifndef KARR_RELATION_H_
+#define KARR_RELATION_H_
 
 #include"dl_mk_karr_invariants.h"
 #include"dl_relation_manager.h"
@@ -84,5 +84,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_MK_KARR_INVARIANTS_H_ */
+#endif /* DL_MK_KARR_INVARIANTS_H_ */
 
diff --git a/src/muz/rel/rel_context.h b/src/muz/rel/rel_context.h
index e445c926f..5d85a1e7c 100644
--- a/src/muz/rel/rel_context.h
+++ b/src/muz/rel/rel_context.h
@@ -18,8 +18,8 @@ Revision History:
     Extracted from dl_context
 
 --*/
-#ifndef _REL_CONTEXT_H_
-#define _REL_CONTEXT_H_
+#ifndef REL_CONTEXT_H_
+#define REL_CONTEXT_H_
 #include "ast.h"
 #include "dl_relation_manager.h"
 #include "dl_instruction.h"
@@ -130,4 +130,4 @@ namespace datalog {
     };
 };
 
-#endif /* _REL_CONTEXT_H_ */
+#endif /* REL_CONTEXT_H_ */
diff --git a/src/muz/rel/tbv.h b/src/muz/rel/tbv.h
index 7d20d035c..e2e09d691 100644
--- a/src/muz/rel/tbv.h
+++ b/src/muz/rel/tbv.h
@@ -18,8 +18,8 @@ Revision History:
 
 --*/
 
-#ifndef _TBV_H_
-#define _TBV_H_
+#ifndef TBV_H_
+#define TBV_H_
 
 #include "fixed_bit_vector.h"
 #include "rational.h"
@@ -147,4 +147,4 @@ public:
 };
 
 
-#endif /* _TBV_H_ */
+#endif /* TBV_H_ */
diff --git a/src/muz/rel/udoc_relation.h b/src/muz/rel/udoc_relation.h
index d988252da..026abfab0 100644
--- a/src/muz/rel/udoc_relation.h
+++ b/src/muz/rel/udoc_relation.h
@@ -19,8 +19,8 @@ Revision History:
 
 --*/
 
-#ifndef _UDOC_RELATION_H_
-#define _UDOC_RELATION_H_
+#ifndef UDOC_RELATION_H_
+#define UDOC_RELATION_H_
 
 #include "doc.h"
 #include "dl_base.h"
@@ -149,5 +149,5 @@ namespace datalog {
     };
 };
        
-#endif /* _UDOC_RELATION_H_ */
+#endif /* UDOC_RELATION_H_ */
 
diff --git a/src/muz/tab/tab_context.h b/src/muz/tab/tab_context.h
index 4689598c0..f9b22a418 100644
--- a/src/muz/tab/tab_context.h
+++ b/src/muz/tab/tab_context.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _TAB_CONTEXT_H_
-#define _TAB_CONTEXT_H_
+#ifndef TAB_CONTEXT_H_
+#define TAB_CONTEXT_H_
 
 #include "ast.h"
 #include "lbool.h"
diff --git a/src/muz/transforms/dl_mk_array_blast.h b/src/muz/transforms/dl_mk_array_blast.h
index c96573848..0bec9ae14 100644
--- a/src/muz/transforms/dl_mk_array_blast.h
+++ b/src/muz/transforms/dl_mk_array_blast.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_MK_ARRAY_BLAST_H_
-#define _DL_MK_ARRAY_BLAST_H_
+#ifndef DL_MK_ARRAY_BLAST_H_
+#define DL_MK_ARRAY_BLAST_H_
 
 #include"dl_context.h"
 #include"dl_rule_set.h"
@@ -74,5 +74,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_MK_ARRAY_BLAST_H_ */
+#endif /* DL_MK_ARRAY_BLAST_H_ */
 
diff --git a/src/muz/transforms/dl_mk_backwards.h b/src/muz/transforms/dl_mk_backwards.h
index 4e546c848..135f89a18 100644
--- a/src/muz/transforms/dl_mk_backwards.h
+++ b/src/muz/transforms/dl_mk_backwards.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_MK_BACKWARDS_H_
-#define _DL_MK_BACKWARDS_H_
+#ifndef DL_MK_BACKWARDS_H_
+#define DL_MK_BACKWARDS_H_
 
 #include"dl_rule_transformer.h"
 
@@ -34,5 +34,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_MK_BACKWARDS_H_ */
+#endif /* DL_MK_BACKWARDS_H_ */
 
diff --git a/src/muz/transforms/dl_mk_bit_blast.h b/src/muz/transforms/dl_mk_bit_blast.h
index da91c5804..8111e8849 100644
--- a/src/muz/transforms/dl_mk_bit_blast.h
+++ b/src/muz/transforms/dl_mk_bit_blast.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_MK_BIT_BLAST_H_
-#define _DL_MK_BIT_BLAST_H_
+#ifndef DL_MK_BIT_BLAST_H_
+#define DL_MK_BIT_BLAST_H_
 
 #include"dl_rule_transformer.h"
 
@@ -34,5 +34,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_MK_BIT_BLAST_H_ */
+#endif /* DL_MK_BIT_BLAST_H_ */
 
diff --git a/src/muz/transforms/dl_mk_coalesce.h b/src/muz/transforms/dl_mk_coalesce.h
index 4a4065174..9b4d009ae 100644
--- a/src/muz/transforms/dl_mk_coalesce.h
+++ b/src/muz/transforms/dl_mk_coalesce.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_MK_COALESCE_H_
-#define _DL_MK_COALESCE_H_
+#ifndef DL_MK_COALESCE_H_
+#define DL_MK_COALESCE_H_
 
 #include"dl_context.h"
 #include"dl_rule_set.h"
@@ -57,5 +57,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_MK_COALESCE_H_ */
+#endif /* DL_MK_COALESCE_H_ */
 
diff --git a/src/muz/transforms/dl_mk_different.h b/src/muz/transforms/dl_mk_different.h
index 2def011f9..47a00edc0 100644
--- a/src/muz/transforms/dl_mk_different.h
+++ b/src/muz/transforms/dl_mk_different.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_MK_DIFFERENT_SYMBOLIC_H_
-#define _DL_MK_DIFFERENT_SYMBOLIC_H_
+#ifndef DL_MK_DIFFERENT_SYMBOLIC_H_
+#define DL_MK_DIFFERENT_SYMBOLIC_H_
 
 #include"dl_rule_transformer.h"
 
@@ -34,5 +34,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_MK_DIFFERENT_SYMBOLIC_H_ */
+#endif /* DL_MK_DIFFERENT_SYMBOLIC_H_ */
 
diff --git a/src/muz/transforms/dl_mk_filter_rules.h b/src/muz/transforms/dl_mk_filter_rules.h
index b51cb8e24..60ee80e90 100644
--- a/src/muz/transforms/dl_mk_filter_rules.h
+++ b/src/muz/transforms/dl_mk_filter_rules.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_MK_FILTER_RULES_H_
-#define _DL_MK_FILTER_RULES_H_
+#ifndef DL_MK_FILTER_RULES_H_
+#define DL_MK_FILTER_RULES_H_
 
 #include"map.h"
 
@@ -83,5 +83,5 @@ namespace datalog {
 };
 
 
-#endif /* _DL_MK_FILTER_RULES_H_ */
+#endif /* DL_MK_FILTER_RULES_H_ */
 
diff --git a/src/muz/transforms/dl_mk_interp_tail_simplifier.h b/src/muz/transforms/dl_mk_interp_tail_simplifier.h
index 5047e1c6e..568fcff3f 100644
--- a/src/muz/transforms/dl_mk_interp_tail_simplifier.h
+++ b/src/muz/transforms/dl_mk_interp_tail_simplifier.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef _DL_MK_INTERP_TAIL_SIMPLIFIER_H_
-#define _DL_MK_INTERP_TAIL_SIMPLIFIER_H_
+#ifndef DL_MK_INTERP_TAIL_SIMPLIFIER_H_
+#define DL_MK_INTERP_TAIL_SIMPLIFIER_H_
 
 #include "dl_context.h"
 #include "dl_rule_transformer.h"
@@ -105,5 +105,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_MK_INTERP_TAIL_SIMPLIFIER_H_ */
+#endif /* DL_MK_INTERP_TAIL_SIMPLIFIER_H_ */
 
diff --git a/src/muz/transforms/dl_mk_karr_invariants.h b/src/muz/transforms/dl_mk_karr_invariants.h
index 378a7e587..ed43e550b 100644
--- a/src/muz/transforms/dl_mk_karr_invariants.h
+++ b/src/muz/transforms/dl_mk_karr_invariants.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_MK_KARR_INVARIANTS_H_
-#define _DL_MK_KARR_INVARIANTS_H_
+#ifndef DL_MK_KARR_INVARIANTS_H_
+#define DL_MK_KARR_INVARIANTS_H_
 
 #include"dl_context.h"
 #include"dl_rule_set.h"
@@ -77,5 +77,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_MK_KARR_INVARIANTS_H_ */
+#endif /* DL_MK_KARR_INVARIANTS_H_ */
 
diff --git a/src/muz/transforms/dl_mk_loop_counter.h b/src/muz/transforms/dl_mk_loop_counter.h
index d67c88e0e..6694ffb52 100644
--- a/src/muz/transforms/dl_mk_loop_counter.h
+++ b/src/muz/transforms/dl_mk_loop_counter.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_MK_LOOP_COUNTER_H_
-#define _DL_MK_LOOP_COUNTER_H_
+#ifndef DL_MK_LOOP_COUNTER_H_
+#define DL_MK_LOOP_COUNTER_H_
 
 #include"dl_rule_transformer.h"
 #include"arith_decl_plugin.h"
@@ -47,5 +47,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_MK_LOOP_COUNTER_H_ */
+#endif /* DL_MK_LOOP_COUNTER_H_ */
 
diff --git a/src/muz/transforms/dl_mk_magic_sets.h b/src/muz/transforms/dl_mk_magic_sets.h
index 3496a5967..f71af3649 100644
--- a/src/muz/transforms/dl_mk_magic_sets.h
+++ b/src/muz/transforms/dl_mk_magic_sets.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_MK_MAGIC_SETS_H_
-#define _DL_MK_MAGIC_SETS_H_
+#ifndef DL_MK_MAGIC_SETS_H_
+#define DL_MK_MAGIC_SETS_H_
 
 #include<utility>
 
@@ -131,5 +131,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_MK_MAGIC_SETS_H_ */
+#endif /* DL_MK_MAGIC_SETS_H_ */
 
diff --git a/src/muz/transforms/dl_mk_magic_symbolic.h b/src/muz/transforms/dl_mk_magic_symbolic.h
index ce9ca1145..db3137c90 100644
--- a/src/muz/transforms/dl_mk_magic_symbolic.h
+++ b/src/muz/transforms/dl_mk_magic_symbolic.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_MK_MAGIC_SYMBOLIC_H_
-#define _DL_MK_MAGIC_SYMBOLIC_H_
+#ifndef DL_MK_MAGIC_SYMBOLIC_H_
+#define DL_MK_MAGIC_SYMBOLIC_H_
 
 #include"dl_rule_transformer.h"
 
@@ -36,5 +36,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_MK_MAGIC_SYMBOLIC_H_ */
+#endif /* DL_MK_MAGIC_SYMBOLIC_H_ */
 
diff --git a/src/muz/transforms/dl_mk_quantifier_abstraction.h b/src/muz/transforms/dl_mk_quantifier_abstraction.h
index 0e65c54f7..d4a588127 100644
--- a/src/muz/transforms/dl_mk_quantifier_abstraction.h
+++ b/src/muz/transforms/dl_mk_quantifier_abstraction.h
@@ -22,8 +22,8 @@ Revision History:
     "On Solving Universally Quantified Horn Clauses"    
 
 --*/
-#ifndef _DL_MK_QUANTIFIER_ABSTRACTION_H_
-#define _DL_MK_QUANTIFIER_ABSTRACTION_H_
+#ifndef DL_MK_QUANTIFIER_ABSTRACTION_H_
+#define DL_MK_QUANTIFIER_ABSTRACTION_H_
 
 
 #include"dl_rule_transformer.h"
@@ -60,5 +60,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_MK_QUANTIFIER_ABSTRACTION_H_ */
+#endif /* DL_MK_QUANTIFIER_ABSTRACTION_H_ */
 
diff --git a/src/muz/transforms/dl_mk_quantifier_instantiation.h b/src/muz/transforms/dl_mk_quantifier_instantiation.h
index 37a5b8a6c..b9ef5189e 100644
--- a/src/muz/transforms/dl_mk_quantifier_instantiation.h
+++ b/src/muz/transforms/dl_mk_quantifier_instantiation.h
@@ -22,8 +22,8 @@ Revision History:
     "On Solving Universally Quantified Horn Clauses"    
 
 --*/
-#ifndef _DL_MK_QUANTIFIER_INSTANTIATION_H_
-#define _DL_MK_QUANTIFIER_INSTANTIATION_H_
+#ifndef DL_MK_QUANTIFIER_INSTANTIATION_H_
+#define DL_MK_QUANTIFIER_INSTANTIATION_H_
 
 
 #include "dl_rule_transformer.h"
@@ -70,5 +70,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_MK_QUANTIFIER_INSTANTIATION_H_ */
+#endif /* DL_MK_QUANTIFIER_INSTANTIATION_H_ */
 
diff --git a/src/muz/transforms/dl_mk_rule_inliner.h b/src/muz/transforms/dl_mk_rule_inliner.h
index ed555492a..98f65a734 100644
--- a/src/muz/transforms/dl_mk_rule_inliner.h
+++ b/src/muz/transforms/dl_mk_rule_inliner.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef _DL_MK_RULE_INLINER_H_
-#define _DL_MK_RULE_INLINER_H_
+#ifndef DL_MK_RULE_INLINER_H_
+#define DL_MK_RULE_INLINER_H_
 
 #include "dl_context.h"
 #include "dl_rule_transformer.h"
@@ -201,5 +201,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_MK_INTERP_TAIL_SIMPLIFIER_H_ */
+#endif /* DL_MK_INTERP_TAIL_SIMPLIFIER_H_ */
 
diff --git a/src/muz/transforms/dl_mk_scale.h b/src/muz/transforms/dl_mk_scale.h
index 8498c891f..0e4ccf7ea 100644
--- a/src/muz/transforms/dl_mk_scale.h
+++ b/src/muz/transforms/dl_mk_scale.h
@@ -18,8 +18,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_MK_SCALE_H_
-#define _DL_MK_SCALE_H_
+#ifndef DL_MK_SCALE_H_
+#define DL_MK_SCALE_H_
 
 #include"dl_rule_transformer.h"
 #include"arith_decl_plugin.h"
@@ -49,5 +49,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_MK_SCALE_H_ */
+#endif /* DL_MK_SCALE_H_ */
 
diff --git a/src/muz/transforms/dl_mk_separate_negated_tails.h b/src/muz/transforms/dl_mk_separate_negated_tails.h
index 03a52c997..1d2e57e2c 100644
--- a/src/muz/transforms/dl_mk_separate_negated_tails.h
+++ b/src/muz/transforms/dl_mk_separate_negated_tails.h
@@ -29,8 +29,8 @@ Revision History:
 
 --*/
 
-#ifndef _DL_MK_SEPARAT_NEGATED_TAILS_H_
-#define _DL_MK_SEPARAT_NEGATED_TAILS_H_
+#ifndef DL_MK_SEPARAT_NEGATED_TAILS_H_
+#define DL_MK_SEPARAT_NEGATED_TAILS_H_
 
 #include "dl_rule_transformer.h"
 #include "dl_context.h"
diff --git a/src/muz/transforms/dl_mk_slice.h b/src/muz/transforms/dl_mk_slice.h
index aedc1feb0..b1b9cb46e 100644
--- a/src/muz/transforms/dl_mk_slice.h
+++ b/src/muz/transforms/dl_mk_slice.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_MK_SLICE_H_
-#define _DL_MK_SLICE_H_
+#ifndef DL_MK_SLICE_H_
+#define DL_MK_SLICE_H_
 
 #include"dl_context.h"
 #include"dl_rule_set.h"
@@ -111,5 +111,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_MK_SLICE_H_ */
+#endif /* DL_MK_SLICE_H_ */
 
diff --git a/src/muz/transforms/dl_mk_subsumption_checker.h b/src/muz/transforms/dl_mk_subsumption_checker.h
index 8d797a9e2..270418508 100644
--- a/src/muz/transforms/dl_mk_subsumption_checker.h
+++ b/src/muz/transforms/dl_mk_subsumption_checker.h
@@ -18,8 +18,8 @@ Revision History:
 
 --*/
 
-#ifndef _DL_MK_SUBSUMPTION_CHECKER_H_
-#define _DL_MK_SUBSUMPTION_CHECKER_H_
+#ifndef DL_MK_SUBSUMPTION_CHECKER_H_
+#define DL_MK_SUBSUMPTION_CHECKER_H_
 
 #include "dl_context.h"
 #include "dl_rule_transformer.h"
@@ -89,5 +89,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_MK_SUBSUMPTION_CHECKER_H_ */
+#endif /* DL_MK_SUBSUMPTION_CHECKER_H_ */
 
diff --git a/src/muz/transforms/dl_mk_unbound_compressor.h b/src/muz/transforms/dl_mk_unbound_compressor.h
index 44877e646..889ded058 100644
--- a/src/muz/transforms/dl_mk_unbound_compressor.h
+++ b/src/muz/transforms/dl_mk_unbound_compressor.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_MK_UNBOUND_COMPRESSOR_H_
-#define _DL_MK_UNBOUND_COMPRESSOR_H_
+#ifndef DL_MK_UNBOUND_COMPRESSOR_H_
+#define DL_MK_UNBOUND_COMPRESSOR_H_
 
 #include<utility>
 
@@ -88,5 +88,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_MK_UNBOUND_COMPRESSOR_H_ */
+#endif /* DL_MK_UNBOUND_COMPRESSOR_H_ */
 
diff --git a/src/muz/transforms/dl_mk_unfold.h b/src/muz/transforms/dl_mk_unfold.h
index 26f64926d..554ed69e0 100644
--- a/src/muz/transforms/dl_mk_unfold.h
+++ b/src/muz/transforms/dl_mk_unfold.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DL_MK_UNFOLD_H_
-#define _DL_MK_UNFOLD_H_
+#ifndef DL_MK_UNFOLD_H_
+#define DL_MK_UNFOLD_H_
 
 #include"dl_context.h"
 #include"dl_rule_set.h"
@@ -49,5 +49,5 @@ namespace datalog {
 
 };
 
-#endif /* _DL_MK_UNFOLD_H_ */
+#endif /* DL_MK_UNFOLD_H_ */
 
diff --git a/src/muz/transforms/dl_transforms.h b/src/muz/transforms/dl_transforms.h
index 4f9a92dd8..71131c99f 100644
--- a/src/muz/transforms/dl_transforms.h
+++ b/src/muz/transforms/dl_transforms.h
@@ -18,8 +18,8 @@ Revision History:
     Extracted from dl_context
 
 --*/
-#ifndef _DL_TRANSFORMS_H_
-#define _DL_TRANSFORMS_H_
+#ifndef DL_TRANSFORMS_H_
+#define DL_TRANSFORMS_H_
 
 #include "dl_context.h"
 
diff --git a/src/nlsat/nlsat_assignment.h b/src/nlsat/nlsat_assignment.h
index 5169d5fb6..178a7f738 100644
--- a/src/nlsat/nlsat_assignment.h
+++ b/src/nlsat/nlsat_assignment.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _NLSAT_ASSIGNMENT_H_
-#define _NLSAT_ASSIGNMENT_H_
+#ifndef NLSAT_ASSIGNMENT_H_
+#define NLSAT_ASSIGNMENT_H_
 
 #include"nlsat_types.h"
 #include"algebraic_numbers.h"
diff --git a/src/nlsat/nlsat_clause.h b/src/nlsat/nlsat_clause.h
index 549cb69fa..95928eb1a 100644
--- a/src/nlsat/nlsat_clause.h
+++ b/src/nlsat/nlsat_clause.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _NLSAT_CLAUSE_H_
-#define _NLSAT_CLAUSE_H_
+#ifndef NLSAT_CLAUSE_H_
+#define NLSAT_CLAUSE_H_
 
 #include"nlsat_types.h"
 #include"vector.h"
diff --git a/src/nlsat/nlsat_evaluator.h b/src/nlsat/nlsat_evaluator.h
index 166416902..0762c5360 100644
--- a/src/nlsat/nlsat_evaluator.h
+++ b/src/nlsat/nlsat_evaluator.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _NLSAT_EVALUATOR_H_
-#define _NLSAT_EVALUATOR_H_
+#ifndef NLSAT_EVALUATOR_H_
+#define NLSAT_EVALUATOR_H_
 
 #include"nlsat_types.h"
 #include"nlsat_assignment.h"
diff --git a/src/nlsat/nlsat_explain.h b/src/nlsat/nlsat_explain.h
index 85c598f73..ac99b434c 100644
--- a/src/nlsat/nlsat_explain.h
+++ b/src/nlsat/nlsat_explain.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _NLSAT_EXPLAIN_H_
-#define _NLSAT_EXPLAIN_H_
+#ifndef NLSAT_EXPLAIN_H_
+#define NLSAT_EXPLAIN_H_
 
 #include"nlsat_solver.h"
 #include"nlsat_scoped_literal_vector.h"
diff --git a/src/nlsat/nlsat_interval_set.h b/src/nlsat/nlsat_interval_set.h
index 70822f405..a308c8637 100644
--- a/src/nlsat/nlsat_interval_set.h
+++ b/src/nlsat/nlsat_interval_set.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _NLSAT_INTERVAL_SET_H_
-#define _NLSAT_INTERVAL_SET_H_
+#ifndef NLSAT_INTERVAL_SET_H_
+#define NLSAT_INTERVAL_SET_H_
 
 #include"nlsat_types.h"
 
diff --git a/src/nlsat/nlsat_justification.h b/src/nlsat/nlsat_justification.h
index 4422f48d2..b226dc522 100644
--- a/src/nlsat/nlsat_justification.h
+++ b/src/nlsat/nlsat_justification.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _NLSAT_JUSTIFICATION_H_
-#define _NLSAT_JUSTIFICATION_H_
+#ifndef NLSAT_JUSTIFICATION_H_
+#define NLSAT_JUSTIFICATION_H_
 
 #include"nlsat_types.h"
 #include"tptr.h"
diff --git a/src/nlsat/nlsat_scoped_literal_vector.h b/src/nlsat/nlsat_scoped_literal_vector.h
index e76110d5d..6ec7a3461 100644
--- a/src/nlsat/nlsat_scoped_literal_vector.h
+++ b/src/nlsat/nlsat_scoped_literal_vector.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _NLSAT_SCOPED_LITERAL_VECTOR_H_
-#define _NLSAT_SCOPED_LITERAL_VECTOR_H_
+#ifndef NLSAT_SCOPED_LITERAL_VECTOR_H_
+#define NLSAT_SCOPED_LITERAL_VECTOR_H_
 
 #include"nlsat_solver.h"
 
diff --git a/src/nlsat/nlsat_solver.h b/src/nlsat/nlsat_solver.h
index dcee46f05..65e36de05 100644
--- a/src/nlsat/nlsat_solver.h
+++ b/src/nlsat/nlsat_solver.h
@@ -18,8 +18,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _NLSAT_SOLVER_H_
-#define _NLSAT_SOLVER_H_
+#ifndef NLSAT_SOLVER_H_
+#define NLSAT_SOLVER_H_
 
 #include"nlsat_types.h"
 #include"params.h"
diff --git a/src/nlsat/nlsat_types.h b/src/nlsat/nlsat_types.h
index cd3a61a10..e6ab30c19 100644
--- a/src/nlsat/nlsat_types.h
+++ b/src/nlsat/nlsat_types.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _NLSAT_TYPES_H_
-#define _NLSAT_TYPES_H_
+#ifndef NLSAT_TYPES_H_
+#define NLSAT_TYPES_H_
 
 #include"polynomial.h"
 #include"buffer.h"
diff --git a/src/nlsat/tactic/goal2nlsat.h b/src/nlsat/tactic/goal2nlsat.h
index ad84ef9b3..0d65b72d5 100644
--- a/src/nlsat/tactic/goal2nlsat.h
+++ b/src/nlsat/tactic/goal2nlsat.h
@@ -21,8 +21,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _GOAL2NLSAT_H_
-#define _GOAL2NLSAT_H_
+#ifndef GOAL2NLSAT_H_
+#define GOAL2NLSAT_H_
 
 #include"nlsat_types.h"
 #include"model_converter.h"
diff --git a/src/nlsat/tactic/nlsat_tactic.h b/src/nlsat/tactic/nlsat_tactic.h
index afd63e01a..5f0022026 100644
--- a/src/nlsat/tactic/nlsat_tactic.h
+++ b/src/nlsat/tactic/nlsat_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _NLSAT_TACTIC_H_
-#define _NLSAT_TACTIC_H_
+#ifndef NLSAT_TACTIC_H_
+#define NLSAT_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/nlsat/tactic/qfnra_nlsat_tactic.h b/src/nlsat/tactic/qfnra_nlsat_tactic.h
index e0633fed9..fa106ca93 100644
--- a/src/nlsat/tactic/qfnra_nlsat_tactic.h
+++ b/src/nlsat/tactic/qfnra_nlsat_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _QFNRA_NLSAT_TACTIC_H_
-#define _QFNRA_NLSAT_TACTIC_H_
+#ifndef QFNRA_NLSAT_TACTIC_H_
+#define QFNRA_NLSAT_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/opt/bcd2.h b/src/opt/bcd2.h
index bd9c3d344..50b7215e3 100644
--- a/src/opt/bcd2.h
+++ b/src/opt/bcd2.h
@@ -17,8 +17,8 @@ Notes:
 
 --*/
 
-#ifndef _BCD2_H_
-#define _BCD2_H_
+#ifndef BCD2_H_
+#define BCD2_H_
 
 #include "maxsmt.h"
 
diff --git a/src/opt/fu_malik.h b/src/opt/fu_malik.h
index 7c6369f6a..52e960b5e 100644
--- a/src/opt/fu_malik.h
+++ b/src/opt/fu_malik.h
@@ -21,8 +21,8 @@ Notes:
     that are still consistent with the solver state.
 
 --*/
-#ifndef _OPT_FU_MALIK_H_
-#define _OPT_FU_MALIK_H_
+#ifndef OPT_FU_MALIK_H_
+#define OPT_FU_MALIK_H_
 
 #include "opt_solver.h"
 #include "maxsmt.h"
diff --git a/src/opt/hitting_sets.h b/src/opt/hitting_sets.h
index 58de8c518..718616a9e 100644
--- a/src/opt/hitting_sets.h
+++ b/src/opt/hitting_sets.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _HITTING_SETS_H_
-#define _HITTING_SETS_H_
+#ifndef HITTING_SETS_H_
+#define HITTING_SETS_H_
 
 #include "rational.h"
 #include "statistics.h"
diff --git a/src/opt/maxhs.h b/src/opt/maxhs.h
index ed59bf625..903354c0e 100644
--- a/src/opt/maxhs.h
+++ b/src/opt/maxhs.h
@@ -17,8 +17,8 @@ Notes:
 
 --*/
 
-#ifndef _HS_MAX_H_
-#define _HS_MAX_H_
+#ifndef HS_MAX_H_
+#define HS_MAX_H_
 
 #include "maxsmt.h"
 
diff --git a/src/opt/maxres.h b/src/opt/maxres.h
index bb280cb29..d8682d4d9 100644
--- a/src/opt/maxres.h
+++ b/src/opt/maxres.h
@@ -17,8 +17,8 @@ Notes:
 
 --*/
 
-#ifndef _MAXRES_H_
-#define _MAXRES_H_
+#ifndef MAXRES_H_
+#define MAXRES_H_
 
 namespace opt {
 
diff --git a/src/opt/maxsls.h b/src/opt/maxsls.h
index f344c1564..b23512df4 100644
--- a/src/opt/maxsls.h
+++ b/src/opt/maxsls.h
@@ -19,8 +19,8 @@ Notes:
     local maximum given a resource bound and returns.
 
 --*/
-#ifndef _OPT_SLS_MAX_SAT_H_
-#define _OPT_SLS_MAX_SAT_H_
+#ifndef OPT_SLS_MAX_SAT_H_
+#define OPT_SLS_MAX_SAT_H_
 
 #include "maxsmt.h"
 
diff --git a/src/opt/maxsmt.h b/src/opt/maxsmt.h
index a2881ad21..a15d191e4 100644
--- a/src/opt/maxsmt.h
+++ b/src/opt/maxsmt.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _OPT_MAXSMT_H_
-#define _OPT_MAXSMT_H_
+#ifndef OPT_MAXSMT_H_
+#define OPT_MAXSMT_H_
 
 #include"ast.h"
 #include"params.h"
diff --git a/src/opt/mss.h b/src/opt/mss.h
index 02d218e4d..ba9cda95d 100644
--- a/src/opt/mss.h
+++ b/src/opt/mss.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _MSS_H_
-#define _MSS_H_
+#ifndef MSS_H_
+#define MSS_H_
 
 namespace opt {
     class mss {
diff --git a/src/opt/mus.h b/src/opt/mus.h
index 12cd8b0b2..b58a303e8 100644
--- a/src/opt/mus.h
+++ b/src/opt/mus.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _MUS_H_
-#define _MUS_H_
+#ifndef MUS_H_
+#define MUS_H_
 
 namespace opt {
     class mus {
diff --git a/src/opt/opt_cmds.h b/src/opt/opt_cmds.h
index 048871987..d8dd0dbfa 100644
--- a/src/opt/opt_cmds.h
+++ b/src/opt/opt_cmds.h
@@ -15,8 +15,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _OPT_CMDS_H_
-#define _OPT_CMDS_H_
+#ifndef OPT_CMDS_H_
+#define OPT_CMDS_H_
 
 #include "ast.h"
 
diff --git a/src/opt/opt_context.h b/src/opt/opt_context.h
index eabc2550f..315e2473a 100644
--- a/src/opt/opt_context.h
+++ b/src/opt/opt_context.h
@@ -15,8 +15,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _OPT_CONTEXT_H_
-#define _OPT_CONTEXT_H_
+#ifndef OPT_CONTEXT_H_
+#define OPT_CONTEXT_H_
 
 #include "ast.h"
 #include "opt_solver.h"
diff --git a/src/opt/opt_pareto.h b/src/opt/opt_pareto.h
index ce78e68f3..88a3ce9c1 100644
--- a/src/opt/opt_pareto.h
+++ b/src/opt/opt_pareto.h
@@ -17,8 +17,8 @@ Notes:
 
    
 --*/
-#ifndef _OPT_PARETO_H_
-#define _OPT_PARETO_H_
+#ifndef OPT_PARETO_H_
+#define OPT_PARETO_H_
 
 #include "solver.h"
 #include "model.h"
diff --git a/src/opt/opt_sls_solver.h b/src/opt/opt_sls_solver.h
index 007ade793..5071563f7 100644
--- a/src/opt/opt_sls_solver.h
+++ b/src/opt/opt_sls_solver.h
@@ -17,8 +17,8 @@ Notes:
 
    
 --*/
-#ifndef _OPT_SLS_SOLVER_H_
-#define _OPT_SLS_SOLVER_H_
+#ifndef OPT_SLS_SOLVER_H_
+#define OPT_SLS_SOLVER_H_
 
 #include "solver_na2as.h"
 #include "card2bv_tactic.h"
diff --git a/src/opt/opt_solver.h b/src/opt/opt_solver.h
index a18ad9540..9e74e9127 100644
--- a/src/opt/opt_solver.h
+++ b/src/opt/opt_solver.h
@@ -18,8 +18,8 @@ Notes:
     Based directly on smt_solver.
    
 --*/
-#ifndef _OPT_SOLVER_H_
-#define _OPT_SOLVER_H_
+#ifndef OPT_SOLVER_H_
+#define OPT_SOLVER_H_
 
 #include"inf_rational.h"
 #include"inf_eps_rational.h"
diff --git a/src/opt/optsmt.h b/src/opt/optsmt.h
index ff970556a..10ea9f11c 100644
--- a/src/opt/optsmt.h
+++ b/src/opt/optsmt.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _OPTSMT_H_
-#define _OPTSMT_H_
+#ifndef OPTSMT_H_
+#define OPTSMT_H_
 
 #include "opt_solver.h"
 
diff --git a/src/opt/pb_sls.h b/src/opt/pb_sls.h
index d3993dc49..655d04b45 100644
--- a/src/opt/pb_sls.h
+++ b/src/opt/pb_sls.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _PB_SLS_H_
-#define _PB_SLS_H_
+#ifndef PB_SLS_H_
+#define PB_SLS_H_
 
 #include "pb_decl_plugin.h"
 #include "model.h"
diff --git a/src/opt/wmax.h b/src/opt/wmax.h
index 9d44c88cf..094bb8644 100644
--- a/src/opt/wmax.h
+++ b/src/opt/wmax.h
@@ -17,8 +17,8 @@ Notes:
 
 --*/
 
-#ifndef _WMAX_H_
-#define _WMAX_H_
+#ifndef WMAX_H_
+#define WMAX_H_
 
 #include "maxsmt.h"
 
diff --git a/src/parsers/smt/smtlib.h b/src/parsers/smt/smtlib.h
index e7d4d3a5f..62799ea25 100644
--- a/src/parsers/smt/smtlib.h
+++ b/src/parsers/smt/smtlib.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMTLIB_H_
-#define _SMTLIB_H_
+#ifndef SMTLIB_H_
+#define SMTLIB_H_
 
 #include "ast.h"
 #include "symbol_table.h"
diff --git a/src/parsers/smt/smtlib_solver.h b/src/parsers/smt/smtlib_solver.h
index 4e9815d38..fce5ff67f 100644
--- a/src/parsers/smt/smtlib_solver.h
+++ b/src/parsers/smt/smtlib_solver.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMTLIB_SOLVER_H_
-#define _SMTLIB_SOLVER_H_
+#ifndef SMTLIB_SOLVER_H_
+#define SMTLIB_SOLVER_H_
 
 #include"smtparser.h"
 #include"context_params.h"
diff --git a/src/parsers/smt/smtparser.h b/src/parsers/smt/smtparser.h
index c63f92664..9a09d1f4f 100644
--- a/src/parsers/smt/smtparser.h
+++ b/src/parsers/smt/smtparser.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_PARSER_H_
-#define _SMT_PARSER_H_
+#ifndef SMT_PARSER_H_
+#define SMT_PARSER_H_
 
 #include<iostream>
 #include"ast.h"
diff --git a/src/parsers/smt2/smt2parser.h b/src/parsers/smt2/smt2parser.h
index d230e5ae0..5b4384917 100644
--- a/src/parsers/smt2/smt2parser.h
+++ b/src/parsers/smt2/smt2parser.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT2_PARSER_H_
-#define _SMT2_PARSER_H_
+#ifndef SMT2_PARSER_H_
+#define SMT2_PARSER_H_
 
 #include"cmd_context.h"
 
diff --git a/src/parsers/smt2/smt2scanner.h b/src/parsers/smt2/smt2scanner.h
index 631c71f17..60726ca63 100644
--- a/src/parsers/smt2/smt2scanner.h
+++ b/src/parsers/smt2/smt2scanner.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT2SCANNER_H_
-#define _SMT2SCANNER_H_
+#ifndef SMT2SCANNER_H_
+#define SMT2SCANNER_H_
 
 #include<iostream>
 #include"symbol.h"
@@ -105,5 +105,5 @@ namespace smt2 {
 
 };
 
-#endif /* _SCANNER_H_ */
+#endif /* SCANNER_H_ */
 
diff --git a/src/parsers/util/cost_parser.h b/src/parsers/util/cost_parser.h
index bd0b0b86a..37e9ea3a1 100644
--- a/src/parsers/util/cost_parser.h
+++ b/src/parsers/util/cost_parser.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _COST_PARSER_H_
-#define _COST_PARSER_H_
+#ifndef COST_PARSER_H_
+#define COST_PARSER_H_
 
 #include"simple_parser.h"
 #include"arith_decl_plugin.h"
@@ -35,5 +35,5 @@ public:
     void reset_vars();
 };
 
-#endif /* _COST_PARSER_H_ */
+#endif /* COST_PARSER_H_ */
 
diff --git a/src/parsers/util/pattern_validation.h b/src/parsers/util/pattern_validation.h
index 99024097e..6c2ad73b7 100644
--- a/src/parsers/util/pattern_validation.h
+++ b/src/parsers/util/pattern_validation.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PATTERN_VALIDATION_H_
-#define _PATTERN_VALIDATION_H_
+#ifndef PATTERN_VALIDATION_H_
+#define PATTERN_VALIDATION_H_
 
 #include"ast.h"
 #include"uint_set.h"
@@ -39,5 +39,5 @@ public:
     bool operator()(unsigned num_new_bindings, expr * n) { return operator()(UINT_MAX, num_new_bindings, n); }
 };
 
-#endif /* _PATTERN_VALIDATION_H_ */
+#endif /* PATTERN_VALIDATION_H_ */
 
diff --git a/src/parsers/util/scanner.h b/src/parsers/util/scanner.h
index c93c7a82d..f434da164 100644
--- a/src/parsers/util/scanner.h
+++ b/src/parsers/util/scanner.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SCANNER_H_
-#define _SCANNER_H_
+#ifndef SCANNER_H_
+#define SCANNER_H_
 
 #include"ast.h"
 
@@ -88,5 +88,5 @@ private:
     bool state_ok();
 };
 
-#endif /* _SCANNER_H_ */
+#endif /* SCANNER_H_ */
 
diff --git a/src/parsers/util/simple_parser.h b/src/parsers/util/simple_parser.h
index ef68b0b27..8589f140b 100644
--- a/src/parsers/util/simple_parser.h
+++ b/src/parsers/util/simple_parser.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SIMPLE_PARSER_H_
-#define _SIMPLE_PARSER_H_
+#ifndef SIMPLE_PARSER_H_
+#define SIMPLE_PARSER_H_
 
 #include"ast.h"
 #include"map.h"
@@ -60,5 +60,5 @@ public:
     virtual expr * parse_float(rational const & r) { throw parser_error(); }
 };
 
-#endif /* _SIMPLE_PARSER_H_ */
+#endif /* SIMPLE_PARSER_H_ */
 
diff --git a/src/qe/nlarith_util.h b/src/qe/nlarith_util.h
index a43ad2e18..5854088ab 100644
--- a/src/qe/nlarith_util.h
+++ b/src/qe/nlarith_util.h
@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _NLARITH_UTIL_H_
-#define _NLARITH_UTIL_H_
+#ifndef NLARITH_UTIL_H_
+#define NLARITH_UTIL_H_
 
 #include "ast.h"
 #include "lbool.h"
diff --git a/src/qe/qe.h b/src/qe/qe.h
index 0fd2ff60c..7a3337887 100644
--- a/src/qe/qe.h
+++ b/src/qe/qe.h
@@ -18,8 +18,8 @@ Revision History:
 
 --*/
 
-#ifndef __QE_H__
-#define __QE_H__
+#ifndef QE_H_
+#define QE_H_
 
 #include "ast.h"
 #include "smt_params.h"
diff --git a/src/qe/qe_arith.h b/src/qe/qe_arith.h
index 725245fad..16a89794f 100644
--- a/src/qe/qe_arith.h
+++ b/src/qe/qe_arith.h
@@ -5,8 +5,8 @@ Copyright (c) 2015 Microsoft Corporation
 --*/
 
 
-#ifndef __QE_ARITH_H_
-#define __QE_ARITH_H_
+#ifndef QE_ARITH_H_
+#define QE_ARITH_H_
 
 #include "model.h"
 
diff --git a/src/qe/qe_cmd.h b/src/qe/qe_cmd.h
index 3012e8eba..97cd34753 100644
--- a/src/qe/qe_cmd.h
+++ b/src/qe/qe_cmd.h
@@ -15,8 +15,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _QE_CMD_H_
-#define _QE_CMD_H_
+#ifndef QE_CMD_H_
+#define QE_CMD_H_
 
 class cmd_context;
 
diff --git a/src/qe/qe_lite.h b/src/qe/qe_lite.h
index 7d9239fa7..aa81780ba 100644
--- a/src/qe/qe_lite.h
+++ b/src/qe/qe_lite.h
@@ -18,8 +18,8 @@ Revision History:
 
 --*/
 
-#ifndef __QE_LITE_H__
-#define __QE_LITE_H__
+#ifndef QE_LITE_H_
+#define QE_LITE_H_
 
 #include "ast.h"
 #include "uint_set.h"
diff --git a/src/qe/qe_sat_tactic.h b/src/qe/qe_sat_tactic.h
index 15228c534..0b276fe8d 100644
--- a/src/qe/qe_sat_tactic.h
+++ b/src/qe/qe_sat_tactic.h
@@ -19,8 +19,8 @@ Revision History:
 --*/
 
 
-#ifndef __QE_SAT_H__
-#define __QE_SAT_H__
+#ifndef QE_SAT_H_
+#define QE_SAT_H_
 
 #include"tactic.h"
 
diff --git a/src/qe/qe_tactic.h b/src/qe/qe_tactic.h
index c49f47795..68860f488 100644
--- a/src/qe/qe_tactic.h
+++ b/src/qe/qe_tactic.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _QE_TACTIC_H_
-#define _QE_TACTIC_H_
+#ifndef QE_TACTIC_H_
+#define QE_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/qe/qe_util.h b/src/qe/qe_util.h
index 8e546a801..ea082d78c 100644
--- a/src/qe/qe_util.h
+++ b/src/qe/qe_util.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _QE_UTIL_H_
-#define _QE_UTIL_H_
+#ifndef QE_UTIL_H_
+#define QE_UTIL_H_
 
 #include "ast.h"
 
diff --git a/src/qe/vsubst_tactic.h b/src/qe/vsubst_tactic.h
index b64232d60..8c0cb682f 100644
--- a/src/qe/vsubst_tactic.h
+++ b/src/qe/vsubst_tactic.h
@@ -17,8 +17,8 @@ Notes:
 
 
 --*/
-#ifndef _VSUBST_TACTIC_H_
-#define _VSUBST_TACTIC_H_
+#ifndef VSUBST_TACTIC_H_
+#define VSUBST_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/sat/dimacs.h b/src/sat/dimacs.h
index 63f0a1ee1..9d7bb0679 100644
--- a/src/sat/dimacs.h
+++ b/src/sat/dimacs.h
@@ -16,12 +16,12 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DIMACS_H_
-#define _DIMACS_H_
+#ifndef DIMACS_H_
+#define DIMACS_H_
 
 #include"sat_types.h"
 
 void parse_dimacs(std::istream & s, sat::solver & solver);
 
-#endif /* _DIMACS_PARSER_H_ */
+#endif /* DIMACS_PARSER_H_ */
 
diff --git a/src/sat/sat_asymm_branch.h b/src/sat/sat_asymm_branch.h
index f10522fab..4ad702c5c 100644
--- a/src/sat/sat_asymm_branch.h
+++ b/src/sat/sat_asymm_branch.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SAT_ASYMM_BRANCH_H_
-#define _SAT_ASYMM_BRANCH_H_
+#ifndef SAT_ASYMM_BRANCH_H_
+#define SAT_ASYMM_BRANCH_H_
 
 #include"sat_types.h"
 #include"statistics.h"
diff --git a/src/sat/sat_bceq.h b/src/sat/sat_bceq.h
index 0b05c45cd..4718b6ef1 100644
--- a/src/sat/sat_bceq.h
+++ b/src/sat/sat_bceq.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SAT_BCEQ_H_
-#define _SAT_BCEQ_H_
+#ifndef SAT_BCEQ_H_
+#define SAT_BCEQ_H_
 
 #include"sat_types.h"
 #include "union_find.h"
diff --git a/src/sat/sat_clause.h b/src/sat/sat_clause.h
index 87fc5e763..6a183c3df 100644
--- a/src/sat/sat_clause.h
+++ b/src/sat/sat_clause.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SAT_CLAUSE_H_
-#define _SAT_CLAUSE_H_
+#ifndef SAT_CLAUSE_H_
+#define SAT_CLAUSE_H_
 
 #include"sat_types.h"
 #include"small_object_allocator.h"
diff --git a/src/sat/sat_clause_set.h b/src/sat/sat_clause_set.h
index ac95e06d5..e63c92d08 100644
--- a/src/sat/sat_clause_set.h
+++ b/src/sat/sat_clause_set.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SAT_CLAUSE_SET_H_
-#define _SAT_CLAUSE_SET_H_
+#ifndef SAT_CLAUSE_SET_H_
+#define SAT_CLAUSE_SET_H_
 
 #include"sat_clause.h"
 
diff --git a/src/sat/sat_clause_use_list.h b/src/sat/sat_clause_use_list.h
index 0859439d5..ec283f4c4 100644
--- a/src/sat/sat_clause_use_list.h
+++ b/src/sat/sat_clause_use_list.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SAT_CLAUSE_USE_LIST_H_
-#define _SAT_CLAUSE_USE_LIST_H_
+#ifndef SAT_CLAUSE_USE_LIST_H_
+#define SAT_CLAUSE_USE_LIST_H_
 
 #include"sat_types.h"
 #include"trace.h"
diff --git a/src/sat/sat_cleaner.h b/src/sat/sat_cleaner.h
index d22408926..d886453df 100644
--- a/src/sat/sat_cleaner.h
+++ b/src/sat/sat_cleaner.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SAT_CLEANER_H_
-#define _SAT_CLEANER_H_
+#ifndef SAT_CLEANER_H_
+#define SAT_CLEANER_H_
 
 #include"sat_types.h"
 #include"statistics.h"
diff --git a/src/sat/sat_config.h b/src/sat/sat_config.h
index 29ef25f03..1b336ccb6 100644
--- a/src/sat/sat_config.h
+++ b/src/sat/sat_config.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SAT_CONFIG_H_
-#define _SAT_CONFIG_H_
+#ifndef SAT_CONFIG_H_
+#define SAT_CONFIG_H_
 
 #include"params.h"
 
diff --git a/src/sat/sat_elim_eqs.h b/src/sat/sat_elim_eqs.h
index 21a653383..6f81d6ecb 100644
--- a/src/sat/sat_elim_eqs.h
+++ b/src/sat/sat_elim_eqs.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SAT_ELIM_EQS_H_
-#define _SAT_ELIM_EQS_H_
+#ifndef SAT_ELIM_EQS_H_
+#define SAT_ELIM_EQS_H_
 
 #include"sat_types.h"
 
diff --git a/src/sat/sat_extension.h b/src/sat/sat_extension.h
index a2b43675b..b0b1c5d96 100644
--- a/src/sat/sat_extension.h
+++ b/src/sat/sat_extension.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SAT_EXTENSION_H_
-#define _SAT_EXTENSION_H_
+#ifndef SAT_EXTENSION_H_
+#define SAT_EXTENSION_H_
 
 #include"sat_types.h"
 #include"params.h"
diff --git a/src/sat/sat_iff3_finder.h b/src/sat/sat_iff3_finder.h
index 6522375bb..a74ad1eb1 100644
--- a/src/sat/sat_iff3_finder.h
+++ b/src/sat/sat_iff3_finder.h
@@ -26,8 +26,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SAT_IFF3_FINDER_H_
-#define _SAT_IFF3_FINDER_H_
+#ifndef SAT_IFF3_FINDER_H_
+#define SAT_IFF3_FINDER_H_
 
 #include"sat_types.h"
 
diff --git a/src/sat/sat_integrity_checker.h b/src/sat/sat_integrity_checker.h
index 8aa9340c0..5eef1748e 100644
--- a/src/sat/sat_integrity_checker.h
+++ b/src/sat/sat_integrity_checker.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SAT_INTEGRITY_CHECKER_H_
-#define _SAT_INTEGRITY_CHECKER_H_
+#ifndef SAT_INTEGRITY_CHECKER_H_
+#define SAT_INTEGRITY_CHECKER_H_
 
 #include"sat_types.h"
 
diff --git a/src/sat/sat_justification.h b/src/sat/sat_justification.h
index b162662e8..9b23ae6b8 100644
--- a/src/sat/sat_justification.h
+++ b/src/sat/sat_justification.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SAT_JUSTIFICATIONS_H_
-#define _SAT_JUSTIFICATIONS_H_
+#ifndef SAT_JUSTIFICATIONS_H_
+#define SAT_JUSTIFICATIONS_H_
 
 namespace sat {
     
diff --git a/src/sat/sat_model_converter.h b/src/sat/sat_model_converter.h
index f2c35e364..b89e6e784 100644
--- a/src/sat/sat_model_converter.h
+++ b/src/sat/sat_model_converter.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SAT_MODEL_CONVERTER_H_
-#define _SAT_MODEL_CONVERTER_H_
+#ifndef SAT_MODEL_CONVERTER_H_
+#define SAT_MODEL_CONVERTER_H_
 
 #include"sat_types.h"
 
diff --git a/src/sat/sat_mus.h b/src/sat/sat_mus.h
index 12cff4cec..617bbc757 100644
--- a/src/sat/sat_mus.h
+++ b/src/sat/sat_mus.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _SAT_MUS_H_
-#define _SAT_MUS_H_
+#ifndef SAT_MUS_H_
+#define SAT_MUS_H_
 
 namespace sat {
     class mus {
diff --git a/src/sat/sat_probing.h b/src/sat/sat_probing.h
index 2061b74bd..daf6817e3 100644
--- a/src/sat/sat_probing.h
+++ b/src/sat/sat_probing.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SAT_PROBING_H_
-#define _SAT_PROBING_H_
+#ifndef SAT_PROBING_H_
+#define SAT_PROBING_H_
 
 #include"sat_types.h"
 #include"params.h"
diff --git a/src/sat/sat_scc.h b/src/sat/sat_scc.h
index 5f69e11c6..f44c39742 100644
--- a/src/sat/sat_scc.h
+++ b/src/sat/sat_scc.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SAT_SCC_H_
-#define _SAT_SCC_H_
+#ifndef SAT_SCC_H_
+#define SAT_SCC_H_
 
 #include"sat_types.h"
 #include"statistics.h"
diff --git a/src/sat/sat_simplifier.h b/src/sat/sat_simplifier.h
index 521990ea0..9a69ab779 100644
--- a/src/sat/sat_simplifier.h
+++ b/src/sat/sat_simplifier.h
@@ -18,8 +18,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SAT_SIMPLIFIER_H_
-#define _SAT_SIMPLIFIER_H_
+#ifndef SAT_SIMPLIFIER_H_
+#define SAT_SIMPLIFIER_H_
 
 #include"sat_types.h"
 #include"sat_clause.h"
diff --git a/src/sat/sat_sls.h b/src/sat/sat_sls.h
index 530d4be0c..6f9d89e41 100644
--- a/src/sat/sat_sls.h
+++ b/src/sat/sat_sls.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _SAT_SLS_H_
-#define _SAT_SLS_H_
+#ifndef SAT_SLS_H_
+#define SAT_SLS_H_
 
 #include "util.h"
 #include "sat_simplifier.h"
diff --git a/src/sat/sat_solver.h b/src/sat/sat_solver.h
index 357b79f49..d4c9ecf79 100644
--- a/src/sat/sat_solver.h
+++ b/src/sat/sat_solver.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SAT_SOLVER_H_
-#define _SAT_SOLVER_H_
+#ifndef SAT_SOLVER_H_
+#define SAT_SOLVER_H_
 
 #include"sat_types.h"
 #include"sat_clause.h"
diff --git a/src/sat/sat_solver/inc_sat_solver.h b/src/sat/sat_solver/inc_sat_solver.h
index 53d4f950e..58b582617 100644
--- a/src/sat/sat_solver/inc_sat_solver.h
+++ b/src/sat/sat_solver/inc_sat_solver.h
@@ -17,8 +17,8 @@ Notes:
 
 --*/
 
-#ifndef _HS_INC_SAT_SOLVER_H_
-#define _HS_INC_SAT_SOLVER_H_
+#ifndef HS_INC_SAT_SOLVER_H_
+#define HS_INC_SAT_SOLVER_H_
 
 #include "solver.h"
 
diff --git a/src/sat/sat_types.h b/src/sat/sat_types.h
index 075c88fa1..2def82b80 100644
--- a/src/sat/sat_types.h
+++ b/src/sat/sat_types.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SAT_TYPES_H_
-#define _SAT_TYPES_H_
+#ifndef SAT_TYPES_H_
+#define SAT_TYPES_H_
 
 #include"debug.h"
 #include"approx_set.h"
diff --git a/src/sat/sat_var_queue.h b/src/sat/sat_var_queue.h
index 24d5f57a0..f008fbb88 100644
--- a/src/sat/sat_var_queue.h
+++ b/src/sat/sat_var_queue.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SAT_VAR_QUEUE_H_
-#define _SAT_VAR_QUEUE_H_
+#ifndef SAT_VAR_QUEUE_H_
+#define SAT_VAR_QUEUE_H_
 
 #include"heap.h"
 #include"sat_types.h"
diff --git a/src/sat/sat_watched.h b/src/sat/sat_watched.h
index 83c04e918..2c48b6c9b 100644
--- a/src/sat/sat_watched.h
+++ b/src/sat/sat_watched.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SAT_WATCHED_H_
-#define _SAT_WATCHED_H_
+#ifndef SAT_WATCHED_H_
+#define SAT_WATCHED_H_
 
 #include"sat_types.h"
 #include"vector.h"
diff --git a/src/sat/tactic/atom2bool_var.h b/src/sat/tactic/atom2bool_var.h
index 4d6ce79e0..3435a1e2c 100644
--- a/src/sat/tactic/atom2bool_var.h
+++ b/src/sat/tactic/atom2bool_var.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _ATOM2BOOL_VAR_H_
-#define _ATOM2BOOL_VAR_H_
+#ifndef ATOM2BOOL_VAR_H_
+#define ATOM2BOOL_VAR_H_
 
 #include"expr2var.h"
 #include"sat_types.h"
diff --git a/src/sat/tactic/goal2sat.h b/src/sat/tactic/goal2sat.h
index b4e9615a0..a6b89564f 100644
--- a/src/sat/tactic/goal2sat.h
+++ b/src/sat/tactic/goal2sat.h
@@ -26,8 +26,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _GOAL2SAT_H_
-#define _GOAL2SAT_H_
+#ifndef GOAL2SAT_H_
+#define GOAL2SAT_H_
 
 #include"goal.h"
 #include"sat_solver.h"
diff --git a/src/sat/tactic/sat_tactic.h b/src/sat/tactic/sat_tactic.h
index fcffaa494..115b01a71 100644
--- a/src/sat/tactic/sat_tactic.h
+++ b/src/sat/tactic/sat_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _SAT_TACTIC_H_
-#define _SAT_TACTIC_H_
+#ifndef SAT_TACTIC_H_
+#define SAT_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/shell/datalog_frontend.h b/src/shell/datalog_frontend.h
index 8022d5046..48ccb6c3d 100644
--- a/src/shell/datalog_frontend.h
+++ b/src/shell/datalog_frontend.h
@@ -16,12 +16,12 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DATALOG_FRONTEND_H_
-#define _DATALOG_FRONTEND_H_
+#ifndef DATALOG_FRONTEND_H_
+#define DATALOG_FRONTEND_H_
 
 
 unsigned read_datalog(char const * file);
 
 
-#endif /* _DATALOG_FRONTEND_H_ */
+#endif /* DATALOG_FRONTEND_H_ */
 
diff --git a/src/shell/dimacs_frontend.h b/src/shell/dimacs_frontend.h
index 5448d1af0..263643c32 100644
--- a/src/shell/dimacs_frontend.h
+++ b/src/shell/dimacs_frontend.h
@@ -16,10 +16,10 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DIMACS_FRONTEND_H_
-#define _DIMACS_FRONTEND_H_
+#ifndef DIMACS_FRONTEND_H_
+#define DIMACS_FRONTEND_H_
 
 unsigned read_dimacs(char const * benchmark_file);
 
-#endif /* _DIMACS_FRONTEND_H_ */
+#endif /* DIMACS_FRONTEND_H_ */
 
diff --git a/src/shell/opt_frontend.h b/src/shell/opt_frontend.h
index df6070378..65ec606a5 100644
--- a/src/shell/opt_frontend.h
+++ b/src/shell/opt_frontend.h
@@ -10,11 +10,11 @@ Author:
     Nikolaj Bjorner (nbjorner) 2014-10-10.
 
 --*/
-#ifndef _OPT_FRONTEND_H_
-#define _OPT_FRONTEND_H_
+#ifndef OPT_FRONTEND_H_
+#define OPT_FRONTEND_H_
 
 unsigned parse_opt(char const* file_name, bool is_wcnf);
 
-#endif /* _OPT_FRONTEND_H_ */
+#endif /* OPT_FRONTEND_H_ */
 
 
diff --git a/src/shell/smtlib_frontend.h b/src/shell/smtlib_frontend.h
index 2c5eed70c..1d9bb55de 100644
--- a/src/shell/smtlib_frontend.h
+++ b/src/shell/smtlib_frontend.h
@@ -16,12 +16,12 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMTLIB_FRONTEND_H_
-#define _SMTLIB_FRONTEND_H_
+#ifndef SMTLIB_FRONTEND_H_
+#define SMTLIB_FRONTEND_H_
 
 unsigned read_smtlib_file(char const * benchmark_file);
 unsigned read_smtlib2_commands(char const * command_file);
 
-#endif /* _SMTLIB_FRONTEND_H_ */
+#endif /* SMTLIB_FRONTEND_H_ */
 
 
diff --git a/src/shell/z3_log_frontend.h b/src/shell/z3_log_frontend.h
index bd2c5258a..8eba9b774 100644
--- a/src/shell/z3_log_frontend.h
+++ b/src/shell/z3_log_frontend.h
@@ -17,11 +17,11 @@ Author:
 Revision History:
 
 --*/
-#ifndef _Z3_LOG_FRONTEND_H_
-#define _Z3_LOG_FRONTEND_H_
+#ifndef Z3_LOG_FRONTEND_H_
+#define Z3_LOG_FRONTEND_H_
 
 void replay_z3_log(char const * benchmark_file);
 
-#endif /* _Z3_FRONTEND_H_ */
+#endif /* Z3_FRONTEND_H_ */
 
 
diff --git a/src/smt/arith_eq_adapter.h b/src/smt/arith_eq_adapter.h
index 71fb79136..ffbd15c26 100644
--- a/src/smt/arith_eq_adapter.h
+++ b/src/smt/arith_eq_adapter.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _ARITH_EQ_ADAPTER_H_
-#define _ARITH_EQ_ADAPTER_H_
+#ifndef ARITH_EQ_ADAPTER_H_
+#define ARITH_EQ_ADAPTER_H_
 
 #include"smt_theory.h"
 #include"obj_pair_hashtable.h"
@@ -93,5 +93,5 @@ namespace smt {
     };
 };
 
-#endif /* _ARITH_EQ_ADAPTER_H_ */
+#endif /* ARITH_EQ_ADAPTER_H_ */
 
diff --git a/src/smt/arith_eq_solver.h b/src/smt/arith_eq_solver.h
index e17ae2d30..8b7e99fcc 100644
--- a/src/smt/arith_eq_solver.h
+++ b/src/smt/arith_eq_solver.h
@@ -14,8 +14,8 @@ Author:
     Nikolaj Bjorner (nbjorner) 2012-02-25
     
 --*/
-#ifndef _ARITH_EQ_SOLVER_H_
-#define _ARITH_EQ_SOLVER_H_
+#ifndef ARITH_EQ_SOLVER_H_
+#define ARITH_EQ_SOLVER_H_
 
 #include"arith_decl_plugin.h"
 #include"arith_rewriter.h"
@@ -105,4 +105,4 @@ public:
 
 };
 
-#endif /* _ARITH_EQ_SOLVER_H_ */
+#endif /* ARITH_EQ_SOLVER_H_ */
diff --git a/src/smt/asserted_formulas.h b/src/smt/asserted_formulas.h
index e888a974e..33781abf6 100644
--- a/src/smt/asserted_formulas.h
+++ b/src/smt/asserted_formulas.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _ASSERTED_FORMULAS_H_
-#define _ASSERTED_FORMULAS_H_
+#ifndef ASSERTED_FORMULAS_H_
+#define ASSERTED_FORMULAS_H_
 
 #include"smt_params.h"
 #include"simplifier.h"
@@ -148,5 +148,5 @@ public:
 
 };
 
-#endif /* _ASSERTED_FORMULAS_H_ */
+#endif /* ASSERTED_FORMULAS_H_ */
 
diff --git a/src/smt/cached_var_subst.h b/src/smt/cached_var_subst.h
index 65dbf22d2..f9a08a810 100644
--- a/src/smt/cached_var_subst.h
+++ b/src/smt/cached_var_subst.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _CACHED_VAR_SUBST_H_
-#define _CACHED_VAR_SUBST_H_
+#ifndef CACHED_VAR_SUBST_H_
+#define CACHED_VAR_SUBST_H_
 
 #include"var_subst.h"
 #include"map.h"
@@ -49,5 +49,5 @@ public:
     void reset();
 };
 
-#endif /* _CACHED_VAR_SUBST_H_ */
+#endif /* CACHED_VAR_SUBST_H_ */
 
diff --git a/src/smt/cost_evaluator.h b/src/smt/cost_evaluator.h
index c32d7a924..e6f7fa6e0 100644
--- a/src/smt/cost_evaluator.h
+++ b/src/smt/cost_evaluator.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _COST_EVALUATOR_H_
-#define _COST_EVALUATOR_H_
+#ifndef COST_EVALUATOR_H_
+#define COST_EVALUATOR_H_
 
 #include"ast.h"
 #include"arith_decl_plugin.h"
@@ -39,5 +39,5 @@ public:
     float operator()(expr * f, unsigned num_args, float const * args);
 };
 
-#endif /* _COST_EVALUATOR_H_ */
+#endif /* COST_EVALUATOR_H_ */
 
diff --git a/src/smt/diff_logic.h b/src/smt/diff_logic.h
index 0685bb90c..daaed13ac 100644
--- a/src/smt/diff_logic.h
+++ b/src/smt/diff_logic.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DIFF_LOGIC_H_
-#define _DIFF_LOGIC_H_
+#ifndef DIFF_LOGIC_H_
+#define DIFF_LOGIC_H_
 
 #include"vector.h"
 #include"heap.h"
@@ -1832,5 +1832,5 @@ public:
     }
 };
 
-#endif /* _DIFF_LOGIC_H_ */
+#endif /* DIFF_LOGIC_H_ */
 
diff --git a/src/smt/dyn_ack.h b/src/smt/dyn_ack.h
index b0fe7a6b3..0c390f0ba 100644
--- a/src/smt/dyn_ack.h
+++ b/src/smt/dyn_ack.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DYN_ACK_H_
-#define _DYN_ACK_H_
+#ifndef DYN_ACK_H_
+#define DYN_ACK_H_
 
 #include"ast.h"
 #include"dyn_ack_params.h"
@@ -133,5 +133,5 @@ namespace smt {
 
 };
 
-#endif /* _DYN_ACK_H_ */
+#endif /* DYN_ACK_H_ */
 
diff --git a/src/smt/elim_term_ite.h b/src/smt/elim_term_ite.h
index 5c15af9e5..fc682b39a 100644
--- a/src/smt/elim_term_ite.h
+++ b/src/smt/elim_term_ite.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _ELIM_TERM_ITE_H_
-#define _ELIM_TERM_ITE_H_
+#ifndef ELIM_TERM_ITE_H_
+#define ELIM_TERM_ITE_H_
 
 #include"simplifier.h"
 #include"defined_names.h"
@@ -46,5 +46,5 @@ public:
                     );
 };
 
-#endif /* _ELIM_TERM_ITE_H_ */
+#endif /* ELIM_TERM_ITE_H_ */
 
diff --git a/src/smt/expr_context_simplifier.h b/src/smt/expr_context_simplifier.h
index a1d01b78c..07183ad12 100644
--- a/src/smt/expr_context_simplifier.h
+++ b/src/smt/expr_context_simplifier.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _EXPR_CONTEXT_SIMPLIFIER_H_
-#define _EXPR_CONTEXT_SIMPLIFIER_H_
+#ifndef EXPR_CONTEXT_SIMPLIFIER_H_
+#define EXPR_CONTEXT_SIMPLIFIER_H_
 
 #include "ast.h"
 #include "obj_hashtable.h"
@@ -80,5 +80,5 @@ public:
     void set_cancel(bool f) { m_solver.set_cancel(f); }
 };
 
-#endif /* _EXPR_CONTEXT_SIMPLIFIER_H__ */
+#endif /* EXPR_CONTEXT_SIMPLIFIER_H_ */
 
diff --git a/src/smt/fingerprints.h b/src/smt/fingerprints.h
index e9045990d..80905f8be 100644
--- a/src/smt/fingerprints.h
+++ b/src/smt/fingerprints.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _FINGERPRINTS_H_
-#define _FINGERPRINTS_H_
+#ifndef FINGERPRINTS_H_
+#define FINGERPRINTS_H_
 
 #include"smt_enode.h"
 
@@ -81,5 +81,5 @@ namespace smt {
     };
 };
 
-#endif /* _FINGERPRINTS_H_ */
+#endif /* FINGERPRINTS_H_ */
 
diff --git a/src/smt/mam.h b/src/smt/mam.h
index c9f813150..dd56d7984 100644
--- a/src/smt/mam.h
+++ b/src/smt/mam.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MAM_H_
-#define _MAM_H_
+#ifndef MAM_H_
+#define MAM_H_
 
 #include"ast.h"
 #include"smt_types.h"
@@ -69,4 +69,4 @@ namespace smt {
     mam * mk_mam(context & ctx);
 };
 
-#endif /* _MAM_H_ */
+#endif /* MAM_H_ */
diff --git a/src/smt/old_interval.h b/src/smt/old_interval.h
index ff2ae4b21..b2f1d8fbd 100644
--- a/src/smt/old_interval.h
+++ b/src/smt/old_interval.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _OLD_INTERVAL_H_
-#define _OLD_INTERVAL_H_
+#ifndef OLD_INTERVAL_H_
+#define OLD_INTERVAL_H_
 
 #include"rational.h"
 #include"dependency.h"
@@ -134,5 +134,5 @@ inline std::ostream & operator<<(std::ostream & out, std::pair<old_interval, int
 // allow "customers" of this file to keep using interval
 #define interval old_interval
 
-#endif /* _OLD_INTERVAL_H_ */
+#endif /* OLD_INTERVAL_H_ */
 
diff --git a/src/smt/params/dyn_ack_params.h b/src/smt/params/dyn_ack_params.h
index 95b5aff8a..f87e3b6df 100644
--- a/src/smt/params/dyn_ack_params.h
+++ b/src/smt/params/dyn_ack_params.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DYN_ACK_PARAMS_H_
-#define _DYN_ACK_PARAMS_H_
+#ifndef DYN_ACK_PARAMS_H_
+#define DYN_ACK_PARAMS_H_
 
 #include"params.h"
 
@@ -50,5 +50,5 @@ public:
 };
 
 
-#endif /* _DYN_ACK_PARAMS_H_ */
+#endif /* DYN_ACK_PARAMS_H_ */
 
diff --git a/src/smt/params/preprocessor_params.h b/src/smt/params/preprocessor_params.h
index d53f26318..3806b26cf 100644
--- a/src/smt/params/preprocessor_params.h
+++ b/src/smt/params/preprocessor_params.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PREPROCESSOR_PARAMS_H_
-#define _PREPROCESSOR_PARAMS_H_
+#ifndef PREPROCESSOR_PARAMS_H_
+#define PREPROCESSOR_PARAMS_H_
 
 #include"pattern_inference_params.h"
 #include"bit_blaster_params.h"
@@ -85,4 +85,4 @@ public:
     void updt_params(params_ref const & p);
 };
 
-#endif /* _PREPROCESSOR_PARAMS_H_ */
+#endif /* PREPROCESSOR_PARAMS_H_ */
diff --git a/src/smt/params/qi_params.h b/src/smt/params/qi_params.h
index bca3ad3fc..00baea170 100644
--- a/src/smt/params/qi_params.h
+++ b/src/smt/params/qi_params.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _QI_PARAMS_H_
-#define _QI_PARAMS_H_
+#ifndef QI_PARAMS_H_
+#define QI_PARAMS_H_
 
 #include"util.h"
 #include"params.h"
@@ -107,5 +107,5 @@ struct qi_params {
     void updt_params(params_ref const & p);
 };
 
-#endif /* _QI_PARAMS_H_ */
+#endif /* QI_PARAMS_H_ */
 
diff --git a/src/smt/params/smt_params.h b/src/smt/params/smt_params.h
index 579d509c7..7b54bcfb7 100644
--- a/src/smt/params/smt_params.h
+++ b/src/smt/params/smt_params.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_PARAMS_H_
-#define _SMT_PARAMS_H_
+#ifndef SMT_PARAMS_H_
+#define SMT_PARAMS_H_
 
 #include"ast.h"
 #include"dyn_ack_params.h"
@@ -287,5 +287,5 @@ struct smt_params : public preprocessor_params,
     void updt_params(context_params const & p);
 };
 
-#endif /* _SMT_PARAMS_H_ */
+#endif /* SMT_PARAMS_H_ */
 
diff --git a/src/smt/params/theory_arith_params.h b/src/smt/params/theory_arith_params.h
index 4394f46d3..18418d1ef 100644
--- a/src/smt/params/theory_arith_params.h
+++ b/src/smt/params/theory_arith_params.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_ARITH_PARAMS_H_
-#define _THEORY_ARITH_PARAMS_H_
+#ifndef THEORY_ARITH_PARAMS_H_
+#define THEORY_ARITH_PARAMS_H_
 
 #include<limits.h>
 #include"params.h"
@@ -158,5 +158,5 @@ struct theory_arith_params {
     void updt_params(params_ref const & p);
 };
 
-#endif /* _THEORY_ARITH_PARAMS_H_ */
+#endif /* THEORY_ARITH_PARAMS_H_ */
 
diff --git a/src/smt/params/theory_array_params.h b/src/smt/params/theory_array_params.h
index a022bcadf..85996078f 100644
--- a/src/smt/params/theory_array_params.h
+++ b/src/smt/params/theory_array_params.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_ARRAY_PARAMS_H_
-#define _THEORY_ARRAY_PARAMS_H_
+#ifndef THEORY_ARRAY_PARAMS_H_
+#define THEORY_ARRAY_PARAMS_H_
 
 #include"array_simplifier_params.h"
 
@@ -74,5 +74,5 @@ struct theory_array_params : public array_simplifier_params {
 };
 
 
-#endif /* _THEORY_ARRAY_PARAMS_H_ */
+#endif /* THEORY_ARRAY_PARAMS_H_ */
 
diff --git a/src/smt/params/theory_bv_params.h b/src/smt/params/theory_bv_params.h
index a3052b4e9..d7c9f903b 100644
--- a/src/smt/params/theory_bv_params.h
+++ b/src/smt/params/theory_bv_params.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_BV_PARAMS_H_
-#define _THEORY_BV_PARAMS_H_
+#ifndef THEORY_BV_PARAMS_H_
+#define THEORY_BV_PARAMS_H_
 
 #include"params.h"
 
@@ -46,5 +46,5 @@ struct theory_bv_params {
     void updt_params(params_ref const & p);
 };
 
-#endif /* _THEORY_BV_PARAMS_H_ */
+#endif /* THEORY_BV_PARAMS_H_ */
 
diff --git a/src/smt/params/theory_datatype_params.h b/src/smt/params/theory_datatype_params.h
index 8f914ac7b..4dd09a596 100644
--- a/src/smt/params/theory_datatype_params.h
+++ b/src/smt/params/theory_datatype_params.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_DATATYPE_PARAMS_H_
-#define _THEORY_DATATYPE_PARAMS_H_
+#ifndef THEORY_DATATYPE_PARAMS_H_
+#define THEORY_DATATYPE_PARAMS_H_
 
 struct theory_datatype_params {
     unsigned   m_dt_lazy_splits;
@@ -34,5 +34,5 @@ struct theory_datatype_params {
 };
 
 
-#endif /* _THEORY_DATATYPE_PARAMS_H_ */
+#endif /* THEORY_DATATYPE_PARAMS_H_ */
 
diff --git a/src/smt/params/theory_pb_params.h b/src/smt/params/theory_pb_params.h
index 0432ac633..2af4f04b7 100644
--- a/src/smt/params/theory_pb_params.h
+++ b/src/smt/params/theory_pb_params.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_PB_PARAMS_H_
-#define _THEORY_PB_PARAMS_H_
+#ifndef THEORY_PB_PARAMS_H_
+#define THEORY_PB_PARAMS_H_
 
 #include"params.h"
 
@@ -37,5 +37,5 @@ struct theory_pb_params {
     void updt_params(params_ref const & p);
 };
 
-#endif /* _THEORY_PB_PARAMS_H_ */
+#endif /* THEORY_PB_PARAMS_H_ */
 
diff --git a/src/smt/proto_model/array_factory.h b/src/smt/proto_model/array_factory.h
index d42e77d15..6801ae081 100644
--- a/src/smt/proto_model/array_factory.h
+++ b/src/smt/proto_model/array_factory.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _ARRAY_FACTORY_H_
-#define _ARRAY_FACTORY_H_
+#ifndef ARRAY_FACTORY_H_
+#define ARRAY_FACTORY_H_
 
 #include"struct_factory.h"
 
@@ -41,5 +41,5 @@ public:
     virtual expr * get_fresh_value(sort * s);
 };
 
-#endif /* _ARRAY_FACTORY_H_ */
+#endif /* ARRAY_FACTORY_H_ */
 
diff --git a/src/smt/proto_model/datatype_factory.h b/src/smt/proto_model/datatype_factory.h
index f70604ca8..3dddb843d 100644
--- a/src/smt/proto_model/datatype_factory.h
+++ b/src/smt/proto_model/datatype_factory.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DATATYPE_FACTORY_H_
-#define _DATATYPE_FACTORY_H_
+#ifndef DATATYPE_FACTORY_H_
+#define DATATYPE_FACTORY_H_
 
 #include"struct_factory.h"
 #include"datatype_decl_plugin.h"
@@ -38,5 +38,5 @@ public:
     virtual expr * get_fresh_value(sort * s);
 };
 
-#endif /* _DATATYPE_FACTORY_H_ */
+#endif /* DATATYPE_FACTORY_H_ */
 
diff --git a/src/smt/proto_model/numeral_factory.h b/src/smt/proto_model/numeral_factory.h
index 1c3621db6..3c5d41040 100644
--- a/src/smt/proto_model/numeral_factory.h
+++ b/src/smt/proto_model/numeral_factory.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _NUMERAL_FACTORY_H_
-#define _NUMERAL_FACTORY_H_
+#ifndef NUMERAL_FACTORY_H_
+#define NUMERAL_FACTORY_H_
 
 #include"value_factory.h"
 #include"arith_decl_plugin.h"
@@ -53,5 +53,5 @@ public:
     app * mk_value(rational const & val, unsigned bv_size);
 };
 
-#endif /* _NUMERAL_FACTORY_H_ */
+#endif /* NUMERAL_FACTORY_H_ */
 
diff --git a/src/smt/proto_model/proto_model.h b/src/smt/proto_model/proto_model.h
index d16586698..578880459 100644
--- a/src/smt/proto_model/proto_model.h
+++ b/src/smt/proto_model/proto_model.h
@@ -25,8 +25,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PROTO_MODEL_H_
-#define _PROTO_MODEL_H_
+#ifndef PROTO_MODEL_H_
+#define PROTO_MODEL_H_
 
 #include"model_core.h"
 #include"value_factory.h"
@@ -114,5 +114,5 @@ public:
 
 typedef ref<proto_model> proto_model_ref;
 
-#endif /* _PROTO_MODEL_H_ */
+#endif /* PROTO_MODEL_H_ */
 
diff --git a/src/smt/proto_model/struct_factory.h b/src/smt/proto_model/struct_factory.h
index c9ba4e886..f18121af8 100644
--- a/src/smt/proto_model/struct_factory.h
+++ b/src/smt/proto_model/struct_factory.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _STRUCT_FACTORY_H_
-#define _STRUCT_FACTORY_H_
+#ifndef STRUCT_FACTORY_H_
+#define STRUCT_FACTORY_H_
 
 #include"value_factory.h"
 #include"obj_hashtable.h"
@@ -50,5 +50,5 @@ public:
     virtual void register_value(expr * array_value);
 };
 
-#endif /* _STRUCT_FACTORY_H_ */
+#endif /* STRUCT_FACTORY_H_ */
 
diff --git a/src/smt/proto_model/value_factory.h b/src/smt/proto_model/value_factory.h
index 92ad2373b..0bf0c7c98 100644
--- a/src/smt/proto_model/value_factory.h
+++ b/src/smt/proto_model/value_factory.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _VALUE_FACTORY_H_
-#define _VALUE_FACTORY_H_
+#ifndef VALUE_FACTORY_H_
+#define VALUE_FACTORY_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
@@ -266,5 +266,5 @@ public:
     virtual void register_value(expr * n);
 };
 
-#endif /* _VALUE_FACTORY_H_ */
+#endif /* VALUE_FACTORY_H_ */
 
diff --git a/src/smt/qi_queue.h b/src/smt/qi_queue.h
index 1060f083b..0db12d537 100644
--- a/src/smt/qi_queue.h
+++ b/src/smt/qi_queue.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _QI_QUEUE_H_
-#define _QI_QUEUE_H_
+#ifndef QI_QUEUE_H_
+#define QI_QUEUE_H_
 
 #include"ast.h"
 #include"smt_quantifier_stat.h"
@@ -100,5 +100,5 @@ namespace smt {
     };
 };
 
-#endif /* _QI_QUEUE_H_ */
+#endif /* QI_QUEUE_H_ */
 
diff --git a/src/smt/smt_almost_cg_table.h b/src/smt/smt_almost_cg_table.h
index 1930d675a..aee36c2a0 100644
--- a/src/smt/smt_almost_cg_table.h
+++ b/src/smt/smt_almost_cg_table.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_ALMOST_CG_TABLE_H_
-#define _SMT_ALMOST_CG_TABLE_H_
+#ifndef SMT_ALMOST_CG_TABLE_H_
+#define SMT_ALMOST_CG_TABLE_H_
 
 #include"smt_enode.h"
 #include"map.h"
@@ -68,5 +68,5 @@ namespace smt {
 
 };
 
-#endif /* _SMT_ALMOST_CG_TABLE_H_ */
+#endif /* SMT_ALMOST_CG_TABLE_H_ */
 
diff --git a/src/smt/smt_b_justification.h b/src/smt/smt_b_justification.h
index 5a82e36e8..7e77d301b 100644
--- a/src/smt/smt_b_justification.h
+++ b/src/smt/smt_b_justification.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_B_JUSTIFICATION_H_
-#define _SMT_B_JUSTIFICATION_H_
+#ifndef SMT_B_JUSTIFICATION_H_
+#define SMT_B_JUSTIFICATION_H_
 
 #include"smt_literal.h"
 #include"smt_clause.h"
@@ -96,5 +96,5 @@ namespace smt {
     typedef std::pair<literal, b_justification> justified_literal;
 };
 
-#endif /* _SMT_B_JUSTIFICATION_H_ */
+#endif /* SMT_B_JUSTIFICATION_H_ */
 
diff --git a/src/smt/smt_bool_var_data.h b/src/smt/smt_bool_var_data.h
index 8828b16e2..e65036d9c 100644
--- a/src/smt/smt_bool_var_data.h
+++ b/src/smt/smt_bool_var_data.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_BOOL_VAR_DATA_H_
-#define _SMT_BOOL_VAR_DATA_H_
+#ifndef SMT_BOOL_VAR_DATA_H_
+#define SMT_BOOL_VAR_DATA_H_
 
 #include"smt_b_justification.h"
 
@@ -124,5 +124,5 @@ namespace smt {
     };
 };
 
-#endif /* _SMT_BOOL_VAR_DATA_H_ */
+#endif /* SMT_BOOL_VAR_DATA_H_ */
 
diff --git a/src/smt/smt_case_split_queue.h b/src/smt/smt_case_split_queue.h
index d78739df1..e6b217a22 100644
--- a/src/smt/smt_case_split_queue.h
+++ b/src/smt/smt_case_split_queue.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_CASE_SPLIT_QUEUE_H_
-#define _SMT_CASE_SPLIT_QUEUE_H_
+#ifndef SMT_CASE_SPLIT_QUEUE_H_
+#define SMT_CASE_SPLIT_QUEUE_H_
 
 #include"smt_types.h"
 #include"heap.h"
@@ -51,5 +51,5 @@ namespace smt {
     case_split_queue * mk_case_split_queue(context & ctx, smt_params & p);
 };
 
-#endif /* _SMT_CASE_SPLIT_QUEUE_H_ */
+#endif /* SMT_CASE_SPLIT_QUEUE_H_ */
 
diff --git a/src/smt/smt_cg_table.h b/src/smt/smt_cg_table.h
index 12f6fca4f..c4674034a 100644
--- a/src/smt/smt_cg_table.h
+++ b/src/smt/smt_cg_table.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_CG_TABLE_H_
-#define _SMT_CG_TABLE_H_
+#ifndef SMT_CG_TABLE_H_
+#define SMT_CG_TABLE_H_
 
 #include"smt_enode.h"
 #include"hashtable.h"
@@ -350,5 +350,5 @@ namespace smt {
 #endif 
 };
 
-#endif /* _SMT_CG_TABLE_H_ */
+#endif /* SMT_CG_TABLE_H_ */
 
diff --git a/src/smt/smt_checker.h b/src/smt/smt_checker.h
index 57ea2bdfe..f6df63c59 100644
--- a/src/smt/smt_checker.h
+++ b/src/smt/smt_checker.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_CHECKER_H_
-#define _SMT_CHECKER_H_
+#ifndef SMT_CHECKER_H_
+#define SMT_CHECKER_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
@@ -53,5 +53,5 @@ namespace smt {
 
 };
 
-#endif /* _SMT_CHECKER_H_ */
+#endif /* SMT_CHECKER_H_ */
 
diff --git a/src/smt/smt_clause.h b/src/smt/smt_clause.h
index c7378dc39..17d13a1dc 100644
--- a/src/smt/smt_clause.h
+++ b/src/smt/smt_clause.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_CLAUSE_H_
-#define _SMT_CLAUSE_H_
+#ifndef SMT_CLAUSE_H_
+#define SMT_CLAUSE_H_
 
 #include"ast.h"
 #include"smt_literal.h"
@@ -267,5 +267,5 @@ namespace smt {
     typedef obj_hashtable<clause> clause_set;
 };
 
-#endif /* _SMT_CLAUSE_H_ */
+#endif /* SMT_CLAUSE_H_ */
 
diff --git a/src/smt/smt_conflict_resolution.h b/src/smt/smt_conflict_resolution.h
index a55b331dc..6d8abbf23 100644
--- a/src/smt/smt_conflict_resolution.h
+++ b/src/smt/smt_conflict_resolution.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_CONFLICT_RESOLUTION_H_
-#define _SMT_CONFLICT_RESOLUTION_H_
+#ifndef SMT_CONFLICT_RESOLUTION_H_
+#define SMT_CONFLICT_RESOLUTION_H_
 
 #include"smt_literal.h"
 #include"smt_bool_var_data.h"
@@ -274,5 +274,5 @@ namespace smt {
 
 };
 
-#endif /* _SMT_CONFLICT_RESOLUTION_H_ */
+#endif /* SMT_CONFLICT_RESOLUTION_H_ */
 
diff --git a/src/smt/smt_context.h b/src/smt/smt_context.h
index 62bfacb38..d8c0eb838 100644
--- a/src/smt/smt_context.h
+++ b/src/smt/smt_context.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_CONTEXT_H_
-#define _SMT_CONTEXT_H_
+#ifndef SMT_CONTEXT_H_
+#define SMT_CONTEXT_H_
 
 #include"smt_clause.h"
 #include"smt_setup.h"
@@ -1440,5 +1440,5 @@ namespace smt {
 
 };
 
-#endif /* _SMT_CONTEXT_H_ */
+#endif /* SMT_CONTEXT_H_ */
 
diff --git a/src/smt/smt_enode.h b/src/smt/smt_enode.h
index ca75028c3..3e174a7a7 100644
--- a/src/smt/smt_enode.h
+++ b/src/smt/smt_enode.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_ENODE_H_
-#define _SMT_ENODE_H_
+#ifndef SMT_ENODE_H_
+#define SMT_ENODE_H_
 
 #include"ast.h"
 #include"smt_types.h"
@@ -401,5 +401,5 @@ namespace smt {
 
 };
 
-#endif /* _SMT_ENODE_H_ */
+#endif /* SMT_ENODE_H_ */
 
diff --git a/src/smt/smt_eq_justification.h b/src/smt/smt_eq_justification.h
index 46ed5681f..b12eda192 100644
--- a/src/smt/smt_eq_justification.h
+++ b/src/smt/smt_eq_justification.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_EQ_JUSTIFICATION_H_
-#define _SMT_EQ_JUSTIFICATION_H_
+#ifndef SMT_EQ_JUSTIFICATION_H_
+#define SMT_EQ_JUSTIFICATION_H_
 
 #include"smt_literal.h"
 #include"tptr.h"
@@ -81,5 +81,5 @@ namespace smt {
     const eq_justification null_eq_justification(static_cast<justification*>(0));
 };
 
-#endif /* _SMT_EQ_JUSTIFICATION_H_ */
+#endif /* SMT_EQ_JUSTIFICATION_H_ */
 
diff --git a/src/smt/smt_failure.h b/src/smt/smt_failure.h
index 9a6db406c..171c0bf6d 100644
--- a/src/smt/smt_failure.h
+++ b/src/smt/smt_failure.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_FAILURE_H_
-#define _SMT_FAILURE_H_
+#ifndef SMT_FAILURE_H_
+#define SMT_FAILURE_H_
 
 namespace smt {
 
diff --git a/src/smt/smt_farkas_util.h b/src/smt/smt_farkas_util.h
index 0152ee289..575df45ee 100644
--- a/src/smt/smt_farkas_util.h
+++ b/src/smt/smt_farkas_util.h
@@ -19,8 +19,8 @@ Revision History:
 
 --*/
 
-#ifndef __FARKAS_UTIL_H_
-#define __FARKAS_UTIL_H_
+#ifndef FARKAS_UTIL_H_
+#define FARKAS_UTIL_H_
 
 #include "arith_decl_plugin.h"
 
diff --git a/src/smt/smt_for_each_relevant_expr.h b/src/smt/smt_for_each_relevant_expr.h
index e142b2e0c..abbc1894d 100644
--- a/src/smt/smt_for_each_relevant_expr.h
+++ b/src/smt/smt_for_each_relevant_expr.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_FOR_EACH_RELEVANT_EXPR_H_
-#define _SMT_FOR_EACH_RELEVANT_EXPR_H_
+#ifndef SMT_FOR_EACH_RELEVANT_EXPR_H_
+#define SMT_FOR_EACH_RELEVANT_EXPR_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
@@ -110,5 +110,5 @@ namespace smt {
 
 };
 
-#endif /* _SMT_FOR_EACH_RELEVANT_EXPR_H_ */
+#endif /* SMT_FOR_EACH_RELEVANT_EXPR_H_ */
 
diff --git a/src/smt/smt_implied_equalities.h b/src/smt/smt_implied_equalities.h
index ec9b4bd21..0dd76e439 100644
--- a/src/smt/smt_implied_equalities.h
+++ b/src/smt/smt_implied_equalities.h
@@ -20,8 +20,8 @@ Revision History:
 --*/
 
 
-#ifndef __SMT_IMPLIED_EQUALITIES_H__
-#define __SMT_IMPLIED_EQUALITIES_H__
+#ifndef SMT_IMPLIED_EQUALITIES_H_
+#define SMT_IMPLIED_EQUALITIES_H_
 
 #include"smt_solver.h"
 #include"lbool.h"
diff --git a/src/smt/smt_justification.h b/src/smt/smt_justification.h
index ba306ba73..ea969d1db 100644
--- a/src/smt/smt_justification.h
+++ b/src/smt/smt_justification.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_JUSTIFICATION_H_
-#define _SMT_JUSTIFICATION_H_
+#ifndef SMT_JUSTIFICATION_H_
+#define SMT_JUSTIFICATION_H_
 
 #include"ast.h"
 #include"smt_types.h"
@@ -410,5 +410,5 @@ namespace smt {
       
 };
 
-#endif /* _SMT_JUSTIFICATION_H_ */
+#endif /* SMT_JUSTIFICATION_H_ */
 
diff --git a/src/smt/smt_kernel.h b/src/smt/smt_kernel.h
index 215f11cbf..5c02cf96f 100644
--- a/src/smt/smt_kernel.h
+++ b/src/smt/smt_kernel.h
@@ -24,8 +24,8 @@ Revision History:
         smt::solver     ---> smt::kernel
         default_solver  ---> smt::solver
 --*/
-#ifndef _SMT_KERNEL_H_
-#define _SMT_KERNEL_H_
+#ifndef SMT_KERNEL_H_
+#define SMT_KERNEL_H_
 
 #include"ast.h"
 #include"params.h"
diff --git a/src/smt/smt_literal.h b/src/smt/smt_literal.h
index 496952227..0d8a62f20 100644
--- a/src/smt/smt_literal.h
+++ b/src/smt/smt_literal.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_LITERAL_H_
-#define _SMT_LITERAL_H_
+#ifndef SMT_LITERAL_H_
+#define SMT_LITERAL_H_
 
 #include"ast.h"
 #include"smt_types.h"
@@ -118,5 +118,5 @@ namespace smt {
     bool backward_subsumption(unsigned num_lits1, literal const * lits1, unsigned num_lits2, literal const * lits2);
 };
 
-#endif /* _SMT_LITERAL_H_ */
+#endif /* SMT_LITERAL_H_ */
 
diff --git a/src/smt/smt_model_checker.h b/src/smt/smt_model_checker.h
index 5af7859ce..053621f1a 100644
--- a/src/smt/smt_model_checker.h
+++ b/src/smt/smt_model_checker.h
@@ -18,8 +18,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_MODEL_CHECKER_H_
-#define _SMT_MODEL_CHECKER_H_
+#ifndef SMT_MODEL_CHECKER_H_
+#define SMT_MODEL_CHECKER_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
diff --git a/src/smt/smt_model_finder.h b/src/smt/smt_model_finder.h
index b89603912..a509ab1a5 100644
--- a/src/smt/smt_model_finder.h
+++ b/src/smt/smt_model_finder.h
@@ -43,8 +43,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_MODEL_FINDER_H_
-#define _SMT_MODEL_FINDER_H_
+#ifndef SMT_MODEL_FINDER_H_
+#define SMT_MODEL_FINDER_H_
 
 #include"ast.h"
 #include"func_decl_dependencies.h"
diff --git a/src/smt/smt_model_generator.h b/src/smt/smt_model_generator.h
index fcccc7fbe..6017176e5 100644
--- a/src/smt/smt_model_generator.h
+++ b/src/smt/smt_model_generator.h
@@ -25,8 +25,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_MODEL_GENERATOR_H_
-#define _SMT_MODEL_GENERATOR_H_
+#ifndef SMT_MODEL_GENERATOR_H_
+#define SMT_MODEL_GENERATOR_H_
 
 #include"ast.h"
 #include"smt_types.h"
@@ -223,6 +223,6 @@ namespace smt {
     };
 };
 
-#endif /* _SMT_MODEL_GENERATOR_H_ */
+#endif /* SMT_MODEL_GENERATOR_H_ */
 
 
diff --git a/src/smt/smt_quantifier.h b/src/smt/smt_quantifier.h
index e3d626157..a8becae36 100644
--- a/src/smt/smt_quantifier.h
+++ b/src/smt/smt_quantifier.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_QUANTIFIER_H_
-#define _SMT_QUANTIFIER_H_
+#ifndef SMT_QUANTIFIER_H_
+#define SMT_QUANTIFIER_H_
 
 #include"ast.h"
 #include"statistics.h"
diff --git a/src/smt/smt_quantifier_instances.h b/src/smt/smt_quantifier_instances.h
index b61b1c581..8f911da6c 100644
--- a/src/smt/smt_quantifier_instances.h
+++ b/src/smt/smt_quantifier_instances.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_QUANTIFIER_INSTANCES_H_
-#define _SMT_QUANTIFIER_INSTANCES_H_
+#ifndef SMT_QUANTIFIER_INSTANCES_H_
+#define SMT_QUANTIFIER_INSTANCES_H_
 
 namespace smt {
 
@@ -62,5 +62,5 @@ namespace smt {
 
 };
 
-#endif /* _SMT_QUANTIFIER_INSTANCES_H_ */
+#endif /* SMT_QUANTIFIER_INSTANCES_H_ */
 
diff --git a/src/smt/smt_quantifier_stat.h b/src/smt/smt_quantifier_stat.h
index a8dcc86d4..1d5919433 100644
--- a/src/smt/smt_quantifier_stat.h
+++ b/src/smt/smt_quantifier_stat.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_QUANTIFIER_STAT_H_
-#define _SMT_QUANTIFIER_STAT_H_
+#ifndef SMT_QUANTIFIER_STAT_H_
+#define SMT_QUANTIFIER_STAT_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
@@ -136,5 +136,5 @@ namespace smt {
 
 };
 
-#endif /* _SMT_QUANTIFIER_STAT_H_ */
+#endif /* SMT_QUANTIFIER_STAT_H_ */
 
diff --git a/src/smt/smt_quick_checker.h b/src/smt/smt_quick_checker.h
index ac568f18b..0963874a0 100644
--- a/src/smt/smt_quick_checker.h
+++ b/src/smt/smt_quick_checker.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_QUICK_CHECKER_H_
-#define _SMT_QUICK_CHECKER_H_
+#ifndef SMT_QUICK_CHECKER_H_
+#define SMT_QUICK_CHECKER_H_
 
 #include"ast.h"
 #include"simplifier.h"
@@ -102,5 +102,5 @@ namespace smt {
     };
 };
 
-#endif /* _SMT_QUICK_CHECKER_H_ */
+#endif /* SMT_QUICK_CHECKER_H_ */
 
diff --git a/src/smt/smt_relevancy.h b/src/smt/smt_relevancy.h
index 9da997fc6..e81989044 100644
--- a/src/smt/smt_relevancy.h
+++ b/src/smt/smt_relevancy.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_RELEVANCY_H_
-#define _SMT_RELEVANCY_H_
+#ifndef SMT_RELEVANCY_H_
+#define SMT_RELEVANCY_H_
 
 #include"ast.h"
 
@@ -200,5 +200,5 @@ namespace smt {
 
 };
 
-#endif /* _SMT_RELEVANCY_H_ */
+#endif /* SMT_RELEVANCY_H_ */
 
diff --git a/src/smt/smt_setup.h b/src/smt/smt_setup.h
index 27c0f03f2..679fd473f 100644
--- a/src/smt/smt_setup.h
+++ b/src/smt/smt_setup.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_SETUP_H_
-#define _SMT_SETUP_H_
+#ifndef SMT_SETUP_H_
+#define SMT_SETUP_H_
 
 #include"ast.h"
 #include"smt_params.h"
@@ -114,5 +114,5 @@ namespace smt {
     };
 };
 
-#endif /* _SMT_SETUP_H_ */
+#endif /* SMT_SETUP_H_ */
 
diff --git a/src/smt/smt_solver.h b/src/smt/smt_solver.h
index 81c9a1319..6ec83810e 100644
--- a/src/smt/smt_solver.h
+++ b/src/smt/smt_solver.h
@@ -18,8 +18,8 @@ Notes:
     This file was called default_solver.h. It was a bad name.
 
 --*/
-#ifndef _SMT_SOLVER_H_
-#define _SMT_SOLVER_H_
+#ifndef SMT_SOLVER_H_
+#define SMT_SOLVER_H_
 
 #include"ast.h"
 #include"params.h"
diff --git a/src/smt/smt_statistics.h b/src/smt/smt_statistics.h
index a4fccf8d1..4dfd0e5f1 100644
--- a/src/smt/smt_statistics.h
+++ b/src/smt/smt_statistics.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_STATISTICS_H_
-#define _SMT_STATISTICS_H_
+#ifndef SMT_STATISTICS_H_
+#define SMT_STATISTICS_H_
 
 #include<iostream>
 
@@ -56,5 +56,5 @@ namespace smt {
 
 
 
-#endif /* _SMT_STATISTICS_H_ */
+#endif /* SMT_STATISTICS_H_ */
 
diff --git a/src/smt/smt_theory.h b/src/smt/smt_theory.h
index 97a803506..242ad7c17 100644
--- a/src/smt/smt_theory.h
+++ b/src/smt/smt_theory.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_THEORY_H_
-#define _SMT_THEORY_H_
+#ifndef SMT_THEORY_H_
+#define SMT_THEORY_H_
 
 #include"smt_enode.h"
 #include"obj_hashtable.h"
@@ -450,5 +450,5 @@ namespace smt {
     
 };
 
-#endif /* _SMT_THEORY_H_ */
+#endif /* SMT_THEORY_H_ */
 
diff --git a/src/smt/smt_theory_var_list.h b/src/smt/smt_theory_var_list.h
index 59854791c..5f963102b 100644
--- a/src/smt/smt_theory_var_list.h
+++ b/src/smt/smt_theory_var_list.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_THEORY_VAR_LIST_H_
-#define _SMT_THEORY_VAR_LIST_H_
+#ifndef SMT_THEORY_VAR_LIST_H_
+#define SMT_THEORY_VAR_LIST_H_
 
 #include"smt_types.h"
 
@@ -72,5 +72,5 @@ namespace smt {
     COMPILE_TIME_ASSERT(sizeof(expr*) != 8 || sizeof(theory_var_list) == sizeof(theory_var_list *) + sizeof(int) + /* a structure must be aligned */ sizeof(int)); 
 };
 
-#endif /* _SMT_THEORY_VAR_LIST_H_ */
+#endif /* SMT_THEORY_VAR_LIST_H_ */
 
diff --git a/src/smt/smt_types.h b/src/smt/smt_types.h
index edc7d11c3..6c5ba6313 100644
--- a/src/smt/smt_types.h
+++ b/src/smt/smt_types.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SMT_TYPES_H_
-#define _SMT_TYPES_H_
+#ifndef SMT_TYPES_H_
+#define SMT_TYPES_H_
 
 #include"list.h"
 #include"vector.h"
@@ -74,5 +74,5 @@ namespace smt {
 
 };
 
-#endif /* _SMT_TYPES_H_ */
+#endif /* SMT_TYPES_H_ */
 
diff --git a/src/smt/smt_value_sort.h b/src/smt/smt_value_sort.h
index ae32be62a..e9327fca6 100644
--- a/src/smt/smt_value_sort.h
+++ b/src/smt/smt_value_sort.h
@@ -19,8 +19,8 @@ Revision History:
 --*/
 
 
-#ifndef __SMT_VALUE_SORT_H__
-#define __SMT_VALUE_SORT_H__
+#ifndef SMT_VALUE_SORT_H_
+#define SMT_VALUE_SORT_H_
 
 #include "ast.h"
 
diff --git a/src/smt/spanning_tree.h b/src/smt/spanning_tree.h
index 5bd5b9fb0..fd5e68d54 100644
--- a/src/smt/spanning_tree.h
+++ b/src/smt/spanning_tree.h
@@ -16,8 +16,8 @@ Author:
 Notes:
    
 --*/
-#ifndef _SPANNING_TREE_H_
-#define _SPANNING_TREE_H_
+#ifndef SPANNING_TREE_H_
+#define SPANNING_TREE_H_
 
 #include "diff_logic.h"
 #include "spanning_tree_base.h"
diff --git a/src/smt/spanning_tree_base.h b/src/smt/spanning_tree_base.h
index 3d3ee7b3a..b86e5caa2 100644
--- a/src/smt/spanning_tree_base.h
+++ b/src/smt/spanning_tree_base.h
@@ -17,8 +17,8 @@ Notes:
    
 --*/
 
-#ifndef _SPANNING_TREE_BASE_H_
-#define _SPANNING_TREE_BASE_H_
+#ifndef SPANNING_TREE_BASE_H_
+#define SPANNING_TREE_BASE_H_
 
 #include "util.h"
 #include "vector.h"
diff --git a/src/smt/spanning_tree_def.h b/src/smt/spanning_tree_def.h
index 5dbcd2b8b..ca7607119 100644
--- a/src/smt/spanning_tree_def.h
+++ b/src/smt/spanning_tree_def.h
@@ -16,8 +16,8 @@ Notes:
    
 --*/
 
-#ifndef _SPANNING_TREE_DEF_H_
-#define _SPANNING_TREE_DEF_H_
+#ifndef SPANNING_TREE_DEF_H_
+#define SPANNING_TREE_DEF_H_
 
 #include "spanning_tree.h"
 
diff --git a/src/smt/tactic/ctx_solver_simplify_tactic.h b/src/smt/tactic/ctx_solver_simplify_tactic.h
index 378103b03..51b81603d 100644
--- a/src/smt/tactic/ctx_solver_simplify_tactic.h
+++ b/src/smt/tactic/ctx_solver_simplify_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _CTX_SOLVER_SIMPLIFY_TACTIC_H_
-#define _CTX_SOLVER_SIMPLIFY_TACTIC_H_
+#ifndef CTX_SOLVER_SIMPLIFY_TACTIC_H_
+#define CTX_SOLVER_SIMPLIFY_TACTIC_H_
 
 #include"tactical.h"
 
diff --git a/src/smt/tactic/smt_tactic.h b/src/smt/tactic/smt_tactic.h
index 6a501968d..dd113634b 100644
--- a/src/smt/tactic/smt_tactic.h
+++ b/src/smt/tactic/smt_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _SMT_TACTIC_H_
-#define _SMT_TACTIC_H_
+#ifndef SMT_TACTIC_H_
+#define SMT_TACTIC_H_
 
 #include"params.h"
 #include"ast.h"
diff --git a/src/smt/tactic/unit_subsumption_tactic.h b/src/smt/tactic/unit_subsumption_tactic.h
index 5a7aac99b..499bb44c6 100644
--- a/src/smt/tactic/unit_subsumption_tactic.h
+++ b/src/smt/tactic/unit_subsumption_tactic.h
@@ -21,8 +21,8 @@ Notes:
     It uses the smt_context for the solver.
 
 --*/
-#ifndef _UNIT_SUBSUMPTION_TACTIC_H_
-#define _UNIT_SUBSUMPTION_TACTIC_H_
+#ifndef UNIT_SUBSUMPTION_TACTIC_H_
+#define UNIT_SUBSUMPTION_TACTIC_H_
 #include "tactic.h"
 
 tactic * mk_unit_subsumption_tactic(ast_manager & m, params_ref const & p = params_ref());
diff --git a/src/smt/theory_arith.h b/src/smt/theory_arith.h
index 07b899624..9c391ca1a 100644
--- a/src/smt/theory_arith.h
+++ b/src/smt/theory_arith.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_ARITH_H_
-#define _THEORY_ARITH_H_
+#ifndef THEORY_ARITH_H_
+#define THEORY_ARITH_H_
 
 #include"smt_theory.h"
 #include"map.h"
@@ -1215,5 +1215,5 @@ namespace smt {
     
 };
 
-#endif /* _THEORY_ARITH_H_ */
+#endif /* THEORY_ARITH_H_ */
 
diff --git a/src/smt/theory_arith_aux.h b/src/smt/theory_arith_aux.h
index 33830d1a5..397f6683b 100644
--- a/src/smt/theory_arith_aux.h
+++ b/src/smt/theory_arith_aux.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_ARITH_AUX_H_
-#define _THEORY_ARITH_AUX_H_
+#ifndef THEORY_ARITH_AUX_H_
+#define THEORY_ARITH_AUX_H_
 
 #include"inf_eps_rational.h"
 #include"theory_arith.h"
@@ -2249,5 +2249,5 @@ namespace smt {
 
 };
 
-#endif /* _THEORY_ARITH_AUX_H_ */
+#endif /* THEORY_ARITH_AUX_H_ */
 
diff --git a/src/smt/theory_arith_core.h b/src/smt/theory_arith_core.h
index 7a1625ffc..2b91452a9 100644
--- a/src/smt/theory_arith_core.h
+++ b/src/smt/theory_arith_core.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_ARITH_CORE_H_
-#define _THEORY_ARITH_CORE_H_
+#ifndef THEORY_ARITH_CORE_H_
+#define THEORY_ARITH_CORE_H_
 
 #include"smt_context.h"
 #include"theory_arith.h"
@@ -3318,5 +3318,5 @@ namespace smt {
 
 };
 
-#endif /* _THEORY_ARITH_CORE_H_ */
+#endif /* THEORY_ARITH_CORE_H_ */
 
diff --git a/src/smt/theory_arith_def.h b/src/smt/theory_arith_def.h
index b4d099f2c..531a03bd3 100644
--- a/src/smt/theory_arith_def.h
+++ b/src/smt/theory_arith_def.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_ARITH_DEF_H_
-#define _THEORY_ARITH_DEF_H_
+#ifndef THEORY_ARITH_DEF_H_
+#define THEORY_ARITH_DEF_H_
 
 #include"theory_arith.h"
 #include"theory_arith_core.h"
@@ -28,5 +28,5 @@ Revision History:
 #include"theory_arith_eq.h"
 #include"theory_arith_nl.h"
 
-#endif /* _THEORY_ARITH_DEF_H_ */
+#endif /* THEORY_ARITH_DEF_H_ */
 
diff --git a/src/smt/theory_arith_eq.h b/src/smt/theory_arith_eq.h
index 368ccb87d..80b13050d 100644
--- a/src/smt/theory_arith_eq.h
+++ b/src/smt/theory_arith_eq.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_ARITH_EQ_H_
-#define _THEORY_ARITH_EQ_H_
+#ifndef THEORY_ARITH_EQ_H_
+#define THEORY_ARITH_EQ_H_
 
 // #define PROFILE_OFFSET_ROW
 
@@ -347,5 +347,5 @@ namespace smt {
     }
 };
 
-#endif /* _THEORY_ARITH_EQ_H_ */
+#endif /* THEORY_ARITH_EQ_H_ */
 
diff --git a/src/smt/theory_arith_int.h b/src/smt/theory_arith_int.h
index cc69bb533..d0493b274 100644
--- a/src/smt/theory_arith_int.h
+++ b/src/smt/theory_arith_int.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_ARITH_INT_H_
-#define _THEORY_ARITH_INT_H_
+#ifndef THEORY_ARITH_INT_H_
+#define THEORY_ARITH_INT_H_
 
 #include"ast_ll_pp.h"
 #include"arith_simplifier_plugin.h"
@@ -1424,5 +1424,5 @@ namespace smt {
 
 };
 
-#endif /* _THEORY_ARITH_INT_H_ */
+#endif /* THEORY_ARITH_INT_H_ */
 
diff --git a/src/smt/theory_arith_inv.h b/src/smt/theory_arith_inv.h
index a23eb932d..b547168e0 100644
--- a/src/smt/theory_arith_inv.h
+++ b/src/smt/theory_arith_inv.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_ARITH_INV_H_
-#define _THEORY_ARITH_INV_H_
+#ifndef THEORY_ARITH_INV_H_
+#define THEORY_ARITH_INV_H_
 
 #include"theory_arith.h"
 #include"ast_pp.h"
@@ -228,5 +228,5 @@ namespace smt {
 
 };
 
-#endif /* _THEORY_ARITH_INV_H_ */
+#endif /* THEORY_ARITH_INV_H_ */
 
diff --git a/src/smt/theory_arith_nl.h b/src/smt/theory_arith_nl.h
index 56d2da1bf..89398d243 100644
--- a/src/smt/theory_arith_nl.h
+++ b/src/smt/theory_arith_nl.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_ARITH_NL_H_
-#define _THEORY_ARITH_NL_H_
+#ifndef THEORY_ARITH_NL_H_
+#define THEORY_ARITH_NL_H_
 
 #include"ast_smt2_pp.h"
 
@@ -2443,5 +2443,5 @@ namespace smt {
 };
 
 
-#endif /* _THEORY_ARITH_NL_H_ */
+#endif /* THEORY_ARITH_NL_H_ */
 
diff --git a/src/smt/theory_arith_pp.h b/src/smt/theory_arith_pp.h
index f954f082c..db0a9dd39 100644
--- a/src/smt/theory_arith_pp.h
+++ b/src/smt/theory_arith_pp.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_ARITH_PP_H_
-#define _THEORY_ARITH_PP_H_
+#ifndef THEORY_ARITH_PP_H_
+#define THEORY_ARITH_PP_H_
 
 #include"theory_arith.h"
 #include"ast_smt_pp.h"
@@ -533,5 +533,5 @@ namespace smt {
 
 };
 
-#endif /* _THEORY_ARITH_PP_H_ */
+#endif /* THEORY_ARITH_PP_H_ */
 
diff --git a/src/smt/theory_array.h b/src/smt/theory_array.h
index 8778ffb2c..ac9e0befa 100644
--- a/src/smt/theory_array.h
+++ b/src/smt/theory_array.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_ARRAY_H_
-#define _THEORY_ARRAY_H_
+#ifndef THEORY_ARRAY_H_
+#define THEORY_ARRAY_H_
 
 #include"theory_array_base.h"
 #include"theory_array_params.h"
@@ -113,5 +113,5 @@ namespace smt {
 
 };
 
-#endif /* _THEORY_ARRAY_H_ */
+#endif /* THEORY_ARRAY_H_ */
 
diff --git a/src/smt/theory_array_base.h b/src/smt/theory_array_base.h
index 5e8f6c11a..03d180f8c 100644
--- a/src/smt/theory_array_base.h
+++ b/src/smt/theory_array_base.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_ARRAY_BASE_H_
-#define _THEORY_ARRAY_BASE_H_
+#ifndef THEORY_ARRAY_BASE_H_
+#define THEORY_ARRAY_BASE_H_
 
 #include"smt_theory.h"
 #include"array_decl_plugin.h"
@@ -195,5 +195,5 @@ namespace smt {
 
 };
 
-#endif /* _THEORY_ARRAY_BASE_H_ */
+#endif /* THEORY_ARRAY_BASE_H_ */
 
diff --git a/src/smt/theory_array_full.h b/src/smt/theory_array_full.h
index bbbf35408..870f56739 100644
--- a/src/smt/theory_array_full.h
+++ b/src/smt/theory_array_full.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_ARRAY_FULL_H_
-#define _THEORY_ARRAY_FULL_H_
+#ifndef THEORY_ARRAY_FULL_H_
+#define THEORY_ARRAY_FULL_H_
 
 #include "theory_array.h"
 #include "simplifier.h"
@@ -107,5 +107,5 @@ namespace smt {
 
 };
 
-#endif /* _THEORY_ARRAY_H_ */
+#endif /* THEORY_ARRAY_H_ */
 
diff --git a/src/smt/theory_bv.h b/src/smt/theory_bv.h
index a6726702c..0f74b3603 100644
--- a/src/smt/theory_bv.h
+++ b/src/smt/theory_bv.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_BV_H_
-#define _THEORY_BV_H_
+#ifndef THEORY_BV_H_
+#define THEORY_BV_H_
 
 #include"smt_theory.h"
 #include"theory_bv_params.h"
@@ -278,5 +278,5 @@ namespace smt {
     };
 };
 
-#endif /* _THEORY_BV_H_ */
+#endif /* THEORY_BV_H_ */
 
diff --git a/src/smt/theory_datatype.h b/src/smt/theory_datatype.h
index 5ebfc220f..0426613a4 100644
--- a/src/smt/theory_datatype.h
+++ b/src/smt/theory_datatype.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_DATATYPE_H_
-#define _THEORY_DATATYPE_H_
+#ifndef THEORY_DATATYPE_H_
+#define THEORY_DATATYPE_H_
 
 #include"smt_theory.h"
 #include"union_find.h"
@@ -115,5 +115,5 @@ namespace smt {
 
 };
 
-#endif /* _THEORY_DATATYPE_H_ */
+#endif /* THEORY_DATATYPE_H_ */
 
diff --git a/src/smt/theory_dense_diff_logic.h b/src/smt/theory_dense_diff_logic.h
index 04e257889..b1d1cb632 100644
--- a/src/smt/theory_dense_diff_logic.h
+++ b/src/smt/theory_dense_diff_logic.h
@@ -18,8 +18,8 @@ Revision History:
 TODO: eager equality propagation
 
 --*/
-#ifndef _THEORY_DENSE_DIFF_LOGIC_H_
-#define _THEORY_DENSE_DIFF_LOGIC_H_
+#ifndef THEORY_DENSE_DIFF_LOGIC_H_
+#define THEORY_DENSE_DIFF_LOGIC_H_
 
 #include"theory_arith.h"
 #include"theory_arith_params.h"
@@ -298,5 +298,5 @@ namespace smt {
     typedef theory_dense_diff_logic<si_ext>  theory_dense_si;
 };
 
-#endif /* _THEORY_DENSE_DIFF_LOGIC_H_ */
+#endif /* THEORY_DENSE_DIFF_LOGIC_H_ */
 
diff --git a/src/smt/theory_dense_diff_logic_def.h b/src/smt/theory_dense_diff_logic_def.h
index 89e23cd3f..4c35647e8 100644
--- a/src/smt/theory_dense_diff_logic_def.h
+++ b/src/smt/theory_dense_diff_logic_def.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_DENSE_DIFF_LOGIC_DEF_H_
-#define _THEORY_DENSE_DIFF_LOGIC_DEF_H_
+#ifndef THEORY_DENSE_DIFF_LOGIC_DEF_H_
+#define THEORY_DENSE_DIFF_LOGIC_DEF_H_
 
 #include"smt_context.h"
 #include"theory_dense_diff_logic.h"
@@ -1095,5 +1095,5 @@ namespace smt {
 
 };
 
-#endif /* _THEORY_DENSE_DIFF_LOGIC_DEF_H_ */
+#endif /* THEORY_DENSE_DIFF_LOGIC_DEF_H_ */
 
diff --git a/src/smt/theory_diff_logic.h b/src/smt/theory_diff_logic.h
index 8b5bb2b86..cb86e6679 100644
--- a/src/smt/theory_diff_logic.h
+++ b/src/smt/theory_diff_logic.h
@@ -19,8 +19,8 @@ Revision History:
 
 --*/
 
-#ifndef _THEORY_DIFF_LOGIC_H_
-#define _THEORY_DIFF_LOGIC_H_
+#ifndef THEORY_DIFF_LOGIC_H_
+#define THEORY_DIFF_LOGIC_H_
 
 #include"rational.h"
 #include"inf_rational.h"
@@ -432,4 +432,4 @@ namespace smt {
 
 
 
-#endif /* _THEORY_DIFF_LOGIC_H_ */
+#endif /* THEORY_DIFF_LOGIC_H_ */
diff --git a/src/smt/theory_diff_logic_def.h b/src/smt/theory_diff_logic_def.h
index 6c43c8d11..c791668c3 100644
--- a/src/smt/theory_diff_logic_def.h
+++ b/src/smt/theory_diff_logic_def.h
@@ -19,8 +19,8 @@ Revision History:
     2008-05-11 ported from v1.2. Add theory propagation.
 
 --*/
-#ifndef _THEORY_DIFF_LOGIC_DEF_H_
-#define _THEORY_DIFF_LOGIC_DEF_H_
+#ifndef THEORY_DIFF_LOGIC_DEF_H_
+#define THEORY_DIFF_LOGIC_DEF_H_
 
 #include"theory_diff_logic.h"
 #include"smt_context.h"
@@ -1384,5 +1384,5 @@ bool theory_diff_logic<Ext>::internalize_objective(expr * n, rational const& m,
     return true;
 }
 
-#endif /* _THEORY_DIFF_LOGIC_DEF_H_ */
+#endif /* THEORY_DIFF_LOGIC_DEF_H_ */
 
diff --git a/src/smt/theory_dl.h b/src/smt/theory_dl.h
index e4256dab5..be9539af5 100644
--- a/src/smt/theory_dl.h
+++ b/src/smt/theory_dl.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_DL_H_
-#define _THEORY_DL_H_
+#ifndef THEORY_DL_H_
+#define THEORY_DL_H_
 
 
 namespace smt {
@@ -26,5 +26,5 @@ namespace smt {
 
 };
 
-#endif /* _THEORY_DL_H_ */
+#endif /* THEORY_DL_H_ */
 
diff --git a/src/smt/theory_dummy.h b/src/smt/theory_dummy.h
index 232cfba66..c9b0cd6c6 100644
--- a/src/smt/theory_dummy.h
+++ b/src/smt/theory_dummy.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_DUMMY_H_
-#define _THEORY_DUMMY_H_
+#ifndef THEORY_DUMMY_H_
+#define THEORY_DUMMY_H_
 
 #include"smt_theory.h"
 
@@ -54,5 +54,5 @@ namespace smt {
     };
 };
 
-#endif /* _THEORY_DUMMY_H_ */
+#endif /* THEORY_DUMMY_H_ */
 
diff --git a/src/smt/theory_fpa.h b/src/smt/theory_fpa.h
index c3d574179..b5859dabc 100644
--- a/src/smt/theory_fpa.h
+++ b/src/smt/theory_fpa.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_FPA_H_
-#define _THEORY_FPA_H_
+#ifndef THEORY_FPA_H_
+#define THEORY_FPA_H_
 
 #include"smt_theory.h"
 #include"trail.h"
@@ -189,4 +189,4 @@ namespace smt {
 
 };
 
-#endif /* _THEORY_FPA_H_ */
+#endif /* THEORY_FPA_H_ */
diff --git a/src/smt/theory_opt.h b/src/smt/theory_opt.h
index 61acfc381..58e039140 100644
--- a/src/smt/theory_opt.h
+++ b/src/smt/theory_opt.h
@@ -22,8 +22,8 @@ Notes:
 #include "inf_eps_rational.h"
 #include "arith_decl_plugin.h"
 
-#ifndef _THEORY_OPT_H_
-#define _THEORY_OPT_H_
+#ifndef THEORY_OPT_H_
+#define THEORY_OPT_H_
 
 class filter_model_converter;
 namespace smt {
diff --git a/src/smt/theory_seq_empty.h b/src/smt/theory_seq_empty.h
index d5468df28..c176d2fd1 100644
--- a/src/smt/theory_seq_empty.h
+++ b/src/smt/theory_seq_empty.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _THEORY_SEQ_EMPTY_H_
-#define _THEORY_SEQ_EMPTY_H_
+#ifndef THEORY_SEQ_EMPTY_H_
+#define THEORY_SEQ_EMPTY_H_
 
 #include "smt_theory.h"
 
@@ -37,5 +37,5 @@ namespace smt {
 
 };
 
-#endif /* _THEORY_SEQ_EMPTY_H_ */
+#endif /* THEORY_SEQ_EMPTY_H_ */
 
diff --git a/src/smt/theory_utvpi.h b/src/smt/theory_utvpi.h
index 5358fb758..8568238fa 100644
--- a/src/smt/theory_utvpi.h
+++ b/src/smt/theory_utvpi.h
@@ -19,8 +19,8 @@ Revision History:
 
 --*/
 
-#ifndef _THEORY_UTVPI_H_
-#define _THEORY_UTVPI_H_
+#ifndef THEORY_UTVPI_H_
+#define THEORY_UTVPI_H_
 
 #include"theory_diff_logic.h"
 
@@ -339,4 +339,4 @@ namespace smt {
 
 
 
-#endif /* _THEORY_UTVPI_H_ */
+#endif /* THEORY_UTVPI_H_ */
diff --git a/src/smt/theory_utvpi_def.h b/src/smt/theory_utvpi_def.h
index e6ec7e387..bca24406f 100644
--- a/src/smt/theory_utvpi_def.h
+++ b/src/smt/theory_utvpi_def.h
@@ -47,8 +47,8 @@ Revision History:
 
 --*/
 
-#ifndef _THEORY_UTVPI_DEF_H_
-#define _THEORY_UTVPI_DEF_H_
+#ifndef THEORY_UTVPI_DEF_H_
+#define THEORY_UTVPI_DEF_H_
 #include "theory_utvpi.h"
 #include "heap.h"
 #include "ast_pp.h"
diff --git a/src/smt/theory_wmaxsat.h b/src/smt/theory_wmaxsat.h
index 1ddb388ca..1fe4dbcee 100644
--- a/src/smt/theory_wmaxsat.h
+++ b/src/smt/theory_wmaxsat.h
@@ -17,8 +17,8 @@ Notes:
 
 --*/
 
-#ifndef _THEORY_WMAXSAT_H_
-#define _THEORY_WMAXSAT_H_
+#ifndef THEORY_WMAXSAT_H_
+#define THEORY_WMAXSAT_H_
 
 #include "smt_theory.h"
 #include "smt_clause.h"
diff --git a/src/smt/user_plugin/user_decl_plugin.h b/src/smt/user_plugin/user_decl_plugin.h
index 9e6bd70c4..e2c5d7b9f 100644
--- a/src/smt/user_plugin/user_decl_plugin.h
+++ b/src/smt/user_plugin/user_decl_plugin.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _USER_DECL_PLUGIN_H_
-#define _USER_DECL_PLUGIN_H_
+#ifndef USER_DECL_PLUGIN_H_
+#define USER_DECL_PLUGIN_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
@@ -58,5 +58,5 @@ public:
     virtual void get_sort_names(svector<builtin_name> & sort_names, symbol const & logic);
 };
 
-#endif /* _USER_DECL_PLUGIN_H_ */
+#endif /* USER_DECL_PLUGIN_H_ */
 
diff --git a/src/smt/user_plugin/user_simplifier_plugin.h b/src/smt/user_plugin/user_simplifier_plugin.h
index 67e64037d..87ff23032 100644
--- a/src/smt/user_plugin/user_simplifier_plugin.h
+++ b/src/smt/user_plugin/user_simplifier_plugin.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _USER_SIMPLIFIER_PLUGIN_H_
-#define _USER_SIMPLIFIER_PLUGIN_H_
+#ifndef USER_SIMPLIFIER_PLUGIN_H_
+#define USER_SIMPLIFIER_PLUGIN_H_
 
 #include"simplifier_plugin.h"
 
@@ -62,5 +62,5 @@ public:
     virtual void flush_caches();
 };
 
-#endif /* _USER_SIMPLIFIER_PLUGIN_H_ */
+#endif /* USER_SIMPLIFIER_PLUGIN_H_ */
 
diff --git a/src/smt/user_plugin/user_smt_theory.h b/src/smt/user_plugin/user_smt_theory.h
index 56851b768..128780317 100644
--- a/src/smt/user_plugin/user_smt_theory.h
+++ b/src/smt/user_plugin/user_smt_theory.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _USER_SMT_THEORY_H_
-#define _USER_SMT_THEORY_H_
+#ifndef USER_SMT_THEORY_H_
+#define USER_SMT_THEORY_H_
 
 #include"user_decl_plugin.h"
 #include"user_simplifier_plugin.h"
@@ -320,5 +320,5 @@ namespace smt {
 };
 
 
-#endif /* _USER_SMT_THEORY_H_ */
+#endif /* USER_SMT_THEORY_H_ */
 
diff --git a/src/smt/uses_theory.h b/src/smt/uses_theory.h
index a0640a5bb..8f3760e3e 100644
--- a/src/smt/uses_theory.h
+++ b/src/smt/uses_theory.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _USES_THEORY_H_
-#define _USES_THEORY_H_
+#ifndef USES_THEORY_H_
+#define USES_THEORY_H_
 
 #include"ast.h"
 
@@ -33,5 +33,5 @@ bool uses_theory(expr * n, family_id fid);
 */
 bool uses_theory(expr * n, family_id fid, expr_mark & visited);
 
-#endif /* _USES_THEORY_H_ */
+#endif /* USES_THEORY_H_ */
 
diff --git a/src/smt/watch_list.h b/src/smt/watch_list.h
index 47b76cace..2af26695f 100644
--- a/src/smt/watch_list.h
+++ b/src/smt/watch_list.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _WATCH_LIST_H_
-#define _WATCH_LIST_H_
+#ifndef WATCH_LIST_H_
+#define WATCH_LIST_H_
 
 #include"smt_clause.h"
 #include"memory_manager.h"
@@ -182,5 +182,5 @@ namespace smt {
 
 };
 
-#endif /* _WATCH_LIST_H_ */
+#endif /* WATCH_LIST_H_ */
 
diff --git a/src/solver/check_sat_result.h b/src/solver/check_sat_result.h
index ce0525fc9..5d63d1a7c 100644
--- a/src/solver/check_sat_result.h
+++ b/src/solver/check_sat_result.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _CHECK_SAT_RESULT_H_
-#define _CHECK_SAT_RESULT_H_
+#ifndef CHECK_SAT_RESULT_H_
+#define CHECK_SAT_RESULT_H_
 
 #include"model.h"
 #include"lbool.h"
diff --git a/src/solver/combined_solver.h b/src/solver/combined_solver.h
index f3c3841d3..a10bf343f 100644
--- a/src/solver/combined_solver.h
+++ b/src/solver/combined_solver.h
@@ -18,8 +18,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _COMBINED_SOLVER_H_
-#define _COMBINED_SOLVER_H_
+#ifndef COMBINED_SOLVER_H_
+#define COMBINED_SOLVER_H_
 
 #include"params.h"
 
diff --git a/src/solver/progress_callback.h b/src/solver/progress_callback.h
index fab054671..0ddaae4a9 100644
--- a/src/solver/progress_callback.h
+++ b/src/solver/progress_callback.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PROGRESS_CALLBACK_H_
-#define _PROGRESS_CALLBACK_H_
+#ifndef PROGRESS_CALLBACK_H_
+#define PROGRESS_CALLBACK_H_
 
 class progress_callback {
 public:
diff --git a/src/solver/solver.h b/src/solver/solver.h
index a1f199e61..c4e1be13e 100644
--- a/src/solver/solver.h
+++ b/src/solver/solver.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _SOLVER_H_
-#define _SOLVER_H_
+#ifndef SOLVER_H_
+#define SOLVER_H_
 
 #include"check_sat_result.h"
 #include"progress_callback.h"
diff --git a/src/solver/solver_na2as.h b/src/solver/solver_na2as.h
index 4c6af0dca..644d217ee 100644
--- a/src/solver/solver_na2as.h
+++ b/src/solver/solver_na2as.h
@@ -19,8 +19,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _SOLVER_NA2AS_H_
-#define _SOLVER_NA2AS_H_
+#ifndef SOLVER_NA2AS_H_
+#define SOLVER_NA2AS_H_
 
 #include"solver.h"
 
diff --git a/src/solver/tactic2solver.h b/src/solver/tactic2solver.h
index f20b1c4dd..22038bcc5 100644
--- a/src/solver/tactic2solver.h
+++ b/src/solver/tactic2solver.h
@@ -19,8 +19,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _TACTIC2SOLVER_H_
-#define _TACTIC2SOLVER_H_
+#ifndef TACTIC2SOLVER_H_
+#define TACTIC2SOLVER_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/aig/aig.h b/src/tactic/aig/aig.h
index 291bfbcf3..69babe677 100644
--- a/src/tactic/aig/aig.h
+++ b/src/tactic/aig/aig.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _AIG_H_
-#define _AIG_H_
+#ifndef AIG_H_
+#define AIG_H_
 
 #include"ast.h"
 #include"tactic_exception.h"
diff --git a/src/tactic/aig/aig_tactic.h b/src/tactic/aig/aig_tactic.h
index a54da6226..d9584ad02 100644
--- a/src/tactic/aig/aig_tactic.h
+++ b/src/tactic/aig/aig_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _AIG_TACTIC_H_
-#define _AIG_TACTIC_H_
+#ifndef AIG_TACTIC_H_
+#define AIG_TACTIC_H_
 
 #include"params.h"
 class tactic;
diff --git a/src/tactic/arith/add_bounds_tactic.h b/src/tactic/arith/add_bounds_tactic.h
index 4bd94f373..7cb146fc7 100644
--- a/src/tactic/arith/add_bounds_tactic.h
+++ b/src/tactic/arith/add_bounds_tactic.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _ADD_BOUNDS_H_
-#define _ADD_BOUNDS_H_
+#ifndef ADD_BOUNDS_H_
+#define ADD_BOUNDS_H_
 
 #include"params.h"
 
diff --git a/src/tactic/arith/arith_bounds_tactic.h b/src/tactic/arith/arith_bounds_tactic.h
index c77bf7b48..78da93867 100644
--- a/src/tactic/arith/arith_bounds_tactic.h
+++ b/src/tactic/arith/arith_bounds_tactic.h
@@ -28,8 +28,8 @@ Notes:
     subsumption of atoms. 
 
 --*/
-#ifndef _ARITH_BOUNDS_TACTIC_H_
-#define _ARITH_BOUNDS_TACTIC_H_
+#ifndef ARITH_BOUNDS_TACTIC_H_
+#define ARITH_BOUNDS_TACTIC_H_
 #include "tactic.h"
 
 tactic * mk_arith_bounds_tactic(ast_manager & m, params_ref const & p = params_ref());
diff --git a/src/tactic/arith/bound_manager.h b/src/tactic/arith/bound_manager.h
index fbf02e59d..cc0d693e9 100644
--- a/src/tactic/arith/bound_manager.h
+++ b/src/tactic/arith/bound_manager.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _BOUND_MANAGER_H_
-#define _BOUND_MANAGER_H_
+#ifndef BOUND_MANAGER_H_
+#define BOUND_MANAGER_H_
 
 #include"ast.h"
 #include"arith_decl_plugin.h"
diff --git a/src/tactic/arith/bound_propagator.h b/src/tactic/arith/bound_propagator.h
index 04f2e0e17..2781bed55 100644
--- a/src/tactic/arith/bound_propagator.h
+++ b/src/tactic/arith/bound_propagator.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _BOUND_PROPAGATOR_H_
-#define _BOUND_PROPAGATOR_H_
+#ifndef BOUND_PROPAGATOR_H_
+#define BOUND_PROPAGATOR_H_
 
 #include"mpq.h"
 #include"vector.h"
diff --git a/src/tactic/arith/bv2int_rewriter.h b/src/tactic/arith/bv2int_rewriter.h
index 5783ed856..0f68257f1 100644
--- a/src/tactic/arith/bv2int_rewriter.h
+++ b/src/tactic/arith/bv2int_rewriter.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _BV2INT_REWRITER_H_
-#define _BV2INT_REWRITER_H_
+#ifndef BV2INT_REWRITER_H_
+#define BV2INT_REWRITER_H_
 
 #include"ast.h"
 #include"rewriter.h"
diff --git a/src/tactic/arith/bv2real_rewriter.h b/src/tactic/arith/bv2real_rewriter.h
index 8438d71b9..5f80db4a3 100644
--- a/src/tactic/arith/bv2real_rewriter.h
+++ b/src/tactic/arith/bv2real_rewriter.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _BV2REAL_REWRITER_H_
-#define _BV2REAL_REWRITER_H_
+#ifndef BV2REAL_REWRITER_H_
+#define BV2REAL_REWRITER_H_
 
 #include"ast.h"
 #include"rewriter.h"
diff --git a/src/tactic/arith/card2bv_tactic.h b/src/tactic/arith/card2bv_tactic.h
index ed96376b5..30a91416d 100644
--- a/src/tactic/arith/card2bv_tactic.h
+++ b/src/tactic/arith/card2bv_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _CARD2BV_TACTIC_
-#define _CARD2BV_TACTIC_
+#ifndef CARD2BV_TACTIC_H_
+#define CARD2BV_TACTIC_H_
 
 #include"params.h"
 #include"pb_decl_plugin.h"
diff --git a/src/tactic/arith/degree_shift_tactic.h b/src/tactic/arith/degree_shift_tactic.h
index ab8185869..efc0d442e 100644
--- a/src/tactic/arith/degree_shift_tactic.h
+++ b/src/tactic/arith/degree_shift_tactic.h
@@ -19,8 +19,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DEGREE_SHIFT_TACTIC_H_
-#define _DEGREE_SHIFT_TACTIC_H_
+#ifndef DEGREE_SHIFT_TACTIC_H_
+#define DEGREE_SHIFT_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/arith/diff_neq_tactic.h b/src/tactic/arith/diff_neq_tactic.h
index 8e19d3ceb..5a5c24000 100644
--- a/src/tactic/arith/diff_neq_tactic.h
+++ b/src/tactic/arith/diff_neq_tactic.h
@@ -20,8 +20,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DIFF_NEQ_TACTIC_H_
-#define _DIFF_NEQ_TACTIC_H_
+#ifndef DIFF_NEQ_TACTIC_H_
+#define DIFF_NEQ_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/arith/elim01_tactic.h b/src/tactic/arith/elim01_tactic.h
index 867013ed0..210f2b9fc 100644
--- a/src/tactic/arith/elim01_tactic.h
+++ b/src/tactic/arith/elim01_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _ELIM01_TACTIC_H_
-#define _ELIM01_TACTIC_H_
+#ifndef ELIM01_TACTIC_H_
+#define ELIM01_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/arith/factor_tactic.h b/src/tactic/arith/factor_tactic.h
index a668ce26d..0948606e0 100644
--- a/src/tactic/arith/factor_tactic.h
+++ b/src/tactic/arith/factor_tactic.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _FACTOR_TACTIC_H_
-#define _FACTOR_TACTIC_H_
+#ifndef FACTOR_TACTIC_H_
+#define FACTOR_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/arith/fix_dl_var_tactic.h b/src/tactic/arith/fix_dl_var_tactic.h
index 9b0bddf3f..3cee418cb 100644
--- a/src/tactic/arith/fix_dl_var_tactic.h
+++ b/src/tactic/arith/fix_dl_var_tactic.h
@@ -21,8 +21,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _FIX_DL_VAR_TACTIC_H_
-#define _FIX_DL_VAR_TACTIC_H_
+#ifndef FIX_DL_VAR_TACTIC_H_
+#define FIX_DL_VAR_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/arith/fm_tactic.h b/src/tactic/arith/fm_tactic.h
index f9b237d24..f45ab2475 100644
--- a/src/tactic/arith/fm_tactic.h
+++ b/src/tactic/arith/fm_tactic.h
@@ -21,8 +21,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _FM_TACTIC_H_
-#define _FM_TACTIC_H_
+#ifndef FM_TACTIC_H_
+#define FM_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/arith/lia2card_tactic.h b/src/tactic/arith/lia2card_tactic.h
index de25ce409..93adb6f46 100644
--- a/src/tactic/arith/lia2card_tactic.h
+++ b/src/tactic/arith/lia2card_tactic.h
@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _LIA2CARD_TACTIC_H_
-#define _LIA2CARD_TACTIC_H_
+#ifndef LIA2CARD_TACTIC_H_
+#define LIA2CARD_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/arith/lia2pb_tactic.h b/src/tactic/arith/lia2pb_tactic.h
index 195e07a66..273949825 100644
--- a/src/tactic/arith/lia2pb_tactic.h
+++ b/src/tactic/arith/lia2pb_tactic.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _LIA2PB_TACTIC_H_
-#define _LIA2PB_TACTIC_H_
+#ifndef LIA2PB_TACTIC_H_
+#define LIA2PB_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/arith/linear_equation.h b/src/tactic/arith/linear_equation.h
index 8b38a30e4..1de3969ca 100644
--- a/src/tactic/arith/linear_equation.h
+++ b/src/tactic/arith/linear_equation.h
@@ -18,8 +18,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _LINEAR_EQUATION_H_
-#define _LINEAR_EQUATION_H_
+#ifndef LINEAR_EQUATION_H_
+#define LINEAR_EQUATION_H_
 
 #include"mpq.h"
 #include"small_object_allocator.h"
diff --git a/src/tactic/arith/nla2bv_tactic.h b/src/tactic/arith/nla2bv_tactic.h
index 6fa42fbe4..e2d207520 100644
--- a/src/tactic/arith/nla2bv_tactic.h
+++ b/src/tactic/arith/nla2bv_tactic.h
@@ -17,8 +17,8 @@ Notes:
     Ported to tactic framework on 2012-02-28
 
 --*/
-#ifndef _NLA2BV_TACTIC_H_
-#define _NLA2BV_TACTIC_H_
+#ifndef NLA2BV_TACTIC_H_
+#define NLA2BV_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/arith/normalize_bounds_tactic.h b/src/tactic/arith/normalize_bounds_tactic.h
index a4bcc2a91..1ecbf88d8 100644
--- a/src/tactic/arith/normalize_bounds_tactic.h
+++ b/src/tactic/arith/normalize_bounds_tactic.h
@@ -18,8 +18,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _NORMALIZE_BOUNDS_TACTIC_H_
-#define _NORMALIZE_BOUNDS_TACTIC_H_
+#ifndef NORMALIZE_BOUNDS_TACTIC_H_
+#define NORMALIZE_BOUNDS_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/arith/pb2bv_model_converter.h b/src/tactic/arith/pb2bv_model_converter.h
index ada012d1d..98cb0b235 100644
--- a/src/tactic/arith/pb2bv_model_converter.h
+++ b/src/tactic/arith/pb2bv_model_converter.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _PB2BV_MODEL_CONVERTER_
-#define _PB2BV_MODEL_CONVERTER_
+#ifndef PB2BV_MODEL_CONVERTER_H_
+#define PB2BV_MODEL_CONVERTER_H_
 
 #include"model_converter.h"
 #include"bound_manager.h"
diff --git a/src/tactic/arith/pb2bv_tactic.h b/src/tactic/arith/pb2bv_tactic.h
index 329bd8f99..7d7e8919c 100644
--- a/src/tactic/arith/pb2bv_tactic.h
+++ b/src/tactic/arith/pb2bv_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _PB2BV_TACTIC_
-#define _PB2BV_TACTIC_
+#ifndef PB2BV_TACTIC_H_
+#define PB2BV_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/arith/probe_arith.h b/src/tactic/arith/probe_arith.h
index 0ff64a0ba..0ff2efb90 100644
--- a/src/tactic/arith/probe_arith.h
+++ b/src/tactic/arith/probe_arith.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PROBE_ARITH_H_
-#define _PROBE_ARITH_H_
+#ifndef PROBE_ARITH_H_
+#define PROBE_ARITH_H_
 
 class probe;
 probe * mk_arith_avg_bw_probe();
diff --git a/src/tactic/arith/propagate_ineqs_tactic.h b/src/tactic/arith/propagate_ineqs_tactic.h
index 048043f2d..1027bd09f 100644
--- a/src/tactic/arith/propagate_ineqs_tactic.h
+++ b/src/tactic/arith/propagate_ineqs_tactic.h
@@ -30,8 +30,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _PROPAGATE_INEQS_TACTIC_H_
-#define _PROPAGATE_INEQS_TACTIC_H_
+#ifndef PROPAGATE_INEQS_TACTIC_H_
+#define PROPAGATE_INEQS_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/arith/purify_arith_tactic.h b/src/tactic/arith/purify_arith_tactic.h
index 1e42549a3..9d4c927ff 100644
--- a/src/tactic/arith/purify_arith_tactic.h
+++ b/src/tactic/arith/purify_arith_tactic.h
@@ -45,8 +45,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PURIFY_ARITH_TACTIC_H_
-#define _PURIFY_ARITH_TACTIC_H_
+#ifndef PURIFY_ARITH_TACTIC_H_
+#define PURIFY_ARITH_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/arith/recover_01_tactic.h b/src/tactic/arith/recover_01_tactic.h
index a48addc2d..baa8ae06f 100644
--- a/src/tactic/arith/recover_01_tactic.h
+++ b/src/tactic/arith/recover_01_tactic.h
@@ -30,8 +30,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _RECOVER_01_TACTIC_H_
-#define _RECOVER_01_TACTIC_H_
+#ifndef RECOVER_01_TACTIC_H_
+#define RECOVER_01_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/bv/bit_blaster_model_converter.h b/src/tactic/bv/bit_blaster_model_converter.h
index 3df50fbae..87a12a89e 100644
--- a/src/tactic/bv/bit_blaster_model_converter.h
+++ b/src/tactic/bv/bit_blaster_model_converter.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _BIT_BLASTER_MODEL_CONVERTER_H_
-#define _BIT_BLASTER_MODEL_CONVERTER_H_
+#ifndef BIT_BLASTER_MODEL_CONVERTER_H_
+#define BIT_BLASTER_MODEL_CONVERTER_H_
 
 #include"model_converter.h"
 
diff --git a/src/tactic/bv/bit_blaster_tactic.h b/src/tactic/bv/bit_blaster_tactic.h
index 4ffab2fcb..2c359ada4 100644
--- a/src/tactic/bv/bit_blaster_tactic.h
+++ b/src/tactic/bv/bit_blaster_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _BIT_BLASTER_TACTIC_H_
-#define _BIT_BLASTER_TACTIC_H_
+#ifndef BIT_BLASTER_TACTIC_H_
+#define BIT_BLASTER_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/bv/bv1_blaster_tactic.h b/src/tactic/bv/bv1_blaster_tactic.h
index 9429ac983..cad1d59b6 100644
--- a/src/tactic/bv/bv1_blaster_tactic.h
+++ b/src/tactic/bv/bv1_blaster_tactic.h
@@ -22,8 +22,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _BV1_BLASTER_TACTIC_H_
-#define _BV1_BLASTER_TACTIC_H_
+#ifndef BV1_BLASTER_TACTIC_H_
+#define BV1_BLASTER_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/bv/bv_size_reduction_tactic.h b/src/tactic/bv/bv_size_reduction_tactic.h
index 2d0e0d4f4..619794fc0 100644
--- a/src/tactic/bv/bv_size_reduction_tactic.h
+++ b/src/tactic/bv/bv_size_reduction_tactic.h
@@ -21,8 +21,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _BV_SIZE_REDUCTION_TACTIC_H_
-#define _BV_SIZE_REDUCTION_TACTIC_H_
+#ifndef BV_SIZE_REDUCTION_TACTIC_H_
+#define BV_SIZE_REDUCTION_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/bv/max_bv_sharing_tactic.h b/src/tactic/bv/max_bv_sharing_tactic.h
index b1abc3787..ffe5b025c 100644
--- a/src/tactic/bv/max_bv_sharing_tactic.h
+++ b/src/tactic/bv/max_bv_sharing_tactic.h
@@ -19,8 +19,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MAX_BV_SHARING_TACTIC_H_
-#define _MAX_BV_SHARING_TACTIC_H_
+#ifndef MAX_BV_SHARING_TACTIC_H_
+#define MAX_BV_SHARING_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/converter.h b/src/tactic/converter.h
index e9c0847a4..bed191bc2 100644
--- a/src/tactic/converter.h
+++ b/src/tactic/converter.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _CONVERTER_H_
-#define _CONVERTER_H_
+#ifndef CONVERTER_H_
+#define CONVERTER_H_
 
 #include"vector.h"
 #include"ref.h"
diff --git a/src/tactic/core/blast_term_ite_tactic.h b/src/tactic/core/blast_term_ite_tactic.h
index 6756b29d3..ac94723d8 100644
--- a/src/tactic/core/blast_term_ite_tactic.h
+++ b/src/tactic/core/blast_term_ite_tactic.h
@@ -20,8 +20,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _BLAST_TERM_ITE_TACTIC_H_
-#define _BLAST_TERM_ITE_TACTIC_H_
+#ifndef BLAST_TERM_ITE_TACTIC_H_
+#define BLAST_TERM_ITE_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/core/cofactor_elim_term_ite.h b/src/tactic/core/cofactor_elim_term_ite.h
index e734fcad6..9579729d3 100644
--- a/src/tactic/core/cofactor_elim_term_ite.h
+++ b/src/tactic/core/cofactor_elim_term_ite.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _COFACTOR_ELIM_TERM_ITE_H_
-#define _COFACTOR_ELIM_TERM_ITE_H_
+#ifndef COFACTOR_ELIM_TERM_ITE_H_
+#define COFACTOR_ELIM_TERM_ITE_H_
 
 #include"ast.h"
 #include"params.h"
diff --git a/src/tactic/core/cofactor_term_ite_tactic.h b/src/tactic/core/cofactor_term_ite_tactic.h
index 0dcfc212a..4e0342853 100644
--- a/src/tactic/core/cofactor_term_ite_tactic.h
+++ b/src/tactic/core/cofactor_term_ite_tactic.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _COFACTOR_TERM_ITE_TACTIC_H_
-#define _COFACTOR_TERM_ITE_TACTIC_H_
+#ifndef COFACTOR_TERM_ITE_TACTIC_H_
+#define COFACTOR_TERM_ITE_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/core/ctx_simplify_tactic.h b/src/tactic/core/ctx_simplify_tactic.h
index 8ab920bef..3cf2544aa 100644
--- a/src/tactic/core/ctx_simplify_tactic.h
+++ b/src/tactic/core/ctx_simplify_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _CTX_SIMPLIFY_TACTIC_H_
-#define _CTX_SIMPLIFY_TACTIC_H_
+#ifndef CTX_SIMPLIFY_TACTIC_H_
+#define CTX_SIMPLIFY_TACTIC_H_
 
 #include"tactical.h"
 
diff --git a/src/tactic/core/der_tactic.h b/src/tactic/core/der_tactic.h
index 8ba76d48e..f9dbabe9b 100644
--- a/src/tactic/core/der_tactic.h
+++ b/src/tactic/core/der_tactic.h
@@ -14,8 +14,8 @@ Author:
     Leonardo de Moura (leonardo) 2012-10-20
 
 --*/
-#ifndef _DER_TACTIC_H_
-#define _DER_TACTIC_H_
+#ifndef DER_TACTIC_H_
+#define DER_TACTIC_H_
 
 class ast_manager;
 class tactic;
@@ -26,4 +26,4 @@ tactic * mk_der_tactic(ast_manager & m);
   ADD_TACTIC("der", "destructive equality resolution.", "mk_der_tactic(m)")
 */
 
-#endif /* _DER_TACTIC_H_ */
+#endif /* DER_TACTIC_H_ */
diff --git a/src/tactic/core/distribute_forall_tactic.h b/src/tactic/core/distribute_forall_tactic.h
index 0c3b4c91d..6c781c7df 100644
--- a/src/tactic/core/distribute_forall_tactic.h
+++ b/src/tactic/core/distribute_forall_tactic.h
@@ -14,8 +14,8 @@ Author:
     Leonardo de Moura (leonardo) 2012-02-18.
 
 --*/
-#ifndef _DISTRIBUTE_FORALL_TACTIC_H_
-#define _DISTRIBUTE_FORALL_TACTIC_H_
+#ifndef DISTRIBUTE_FORALL_TACTIC_H_
+#define DISTRIBUTE_FORALL_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/core/elim_term_ite_tactic.h b/src/tactic/core/elim_term_ite_tactic.h
index 81ca86a11..3a89edaa9 100644
--- a/src/tactic/core/elim_term_ite_tactic.h
+++ b/src/tactic/core/elim_term_ite_tactic.h
@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _ELIM_TERM_ITE_TACTIC_H_
-#define _ELIM_TERM_ITE_TACTIC_H_
+#ifndef ELIM_TERM_ITE_TACTIC_H_
+#define ELIM_TERM_ITE_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/core/elim_uncnstr_tactic.h b/src/tactic/core/elim_uncnstr_tactic.h
index 8c5605c3c..46bcdca16 100644
--- a/src/tactic/core/elim_uncnstr_tactic.h
+++ b/src/tactic/core/elim_uncnstr_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _ELIM_UNCNSTR_TACTIC_H_
-#define _ELIM_UNCNSTR_TACTIC_H_
+#ifndef ELIM_UNCNSTR_TACTIC_H_
+#define ELIM_UNCNSTR_TACTIC_H_
 
 #include"params.h"
 
diff --git a/src/tactic/core/nnf_tactic.h b/src/tactic/core/nnf_tactic.h
index b007bf6f9..b5363f830 100644
--- a/src/tactic/core/nnf_tactic.h
+++ b/src/tactic/core/nnf_tactic.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _NNF_TACTIC_H_
-#define _NNF_TACTIC_H_
+#ifndef NNF_TACTIC_H_
+#define NNF_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/core/occf_tactic.h b/src/tactic/core/occf_tactic.h
index 7bd3c5b23..f876f638f 100644
--- a/src/tactic/core/occf_tactic.h
+++ b/src/tactic/core/occf_tactic.h
@@ -21,8 +21,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _OCCF_TACTIC_H_
-#define _OCCF_TACTIC_H_
+#ifndef OCCF_TACTIC_H_
+#define OCCF_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/core/pb_preprocess_tactic.h b/src/tactic/core/pb_preprocess_tactic.h
index 5746779b7..8b70437a4 100644
--- a/src/tactic/core/pb_preprocess_tactic.h
+++ b/src/tactic/core/pb_preprocess_tactic.h
@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _PB_PREPROCESS_TACTIC_H_
-#define _PB_PREPROCESS_TACTIC_H_
+#ifndef PB_PREPROCESS_TACTIC_H_
+#define PB_PREPROCESS_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/core/propagate_values_tactic.h b/src/tactic/core/propagate_values_tactic.h
index ed8cb313f..2d1d311b2 100644
--- a/src/tactic/core/propagate_values_tactic.h
+++ b/src/tactic/core/propagate_values_tactic.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PROPAGATE_VALUES_TACTIC_H_
-#define _PROPAGATE_VALUES_TACTIC_H_
+#ifndef PROPAGATE_VALUES_TACTIC_H_
+#define PROPAGATE_VALUES_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/core/reduce_args_tactic.h b/src/tactic/core/reduce_args_tactic.h
index 34377c815..c22e0c675 100644
--- a/src/tactic/core/reduce_args_tactic.h
+++ b/src/tactic/core/reduce_args_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _REDUCE_ARGS_TACTIC_H_
-#define _REDUCE_ARGS_TACTIC_H_
+#ifndef REDUCE_ARGS_TACTIC_H_
+#define REDUCE_ARGS_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/core/simplify_tactic.h b/src/tactic/core/simplify_tactic.h
index 1ba5a6da8..d9a8be752 100644
--- a/src/tactic/core/simplify_tactic.h
+++ b/src/tactic/core/simplify_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _SIMPLIFY_TACTIC_H_
-#define _SIMPLIFY_TACTIC_H_
+#ifndef SIMPLIFY_TACTIC_H_
+#define SIMPLIFY_TACTIC_H_
 
 #include"tactic.h"
 #include"tactical.h"
diff --git a/src/tactic/core/solve_eqs_tactic.h b/src/tactic/core/solve_eqs_tactic.h
index 4c0f5cc3b..8d543da42 100644
--- a/src/tactic/core/solve_eqs_tactic.h
+++ b/src/tactic/core/solve_eqs_tactic.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SOLVE_EQS_TACTIC_H_
-#define _SOLVE_EQS_TACTIC_H_
+#ifndef SOLVE_EQS_TACTIC_H_
+#define SOLVE_EQS_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/core/split_clause_tactic.h b/src/tactic/core/split_clause_tactic.h
index 7c716938b..34d1eb497 100644
--- a/src/tactic/core/split_clause_tactic.h
+++ b/src/tactic/core/split_clause_tactic.h
@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _SPLIT_CLAUSE_TACTIC_H_
-#define _SPLIT_CLAUSE_TACTIC_H_
+#ifndef SPLIT_CLAUSE_TACTIC_H_
+#define SPLIT_CLAUSE_TACTIC_H_
 
 #include"params.h"
 class tactic;
diff --git a/src/tactic/core/symmetry_reduce_tactic.h b/src/tactic/core/symmetry_reduce_tactic.h
index f663e8525..552baa7f1 100644
--- a/src/tactic/core/symmetry_reduce_tactic.h
+++ b/src/tactic/core/symmetry_reduce_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _SYMMETRY_REDUCE_TACTIC_H_
-#define _SYMMETRY_REDUCE_TACTIC_H_
+#ifndef SYMMETRY_REDUCE_TACTIC_H_
+#define SYMMETRY_REDUCE_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/core/tseitin_cnf_tactic.h b/src/tactic/core/tseitin_cnf_tactic.h
index a5c96e335..76eeae283 100644
--- a/src/tactic/core/tseitin_cnf_tactic.h
+++ b/src/tactic/core/tseitin_cnf_tactic.h
@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _TSEITIN_CNF_TACTIC_H_
-#define _TSEITIN_CNF_TACTIC_H_
+#ifndef TSEITIN_CNF_TACTIC_H_
+#define TSEITIN_CNF_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/equiv_proof_converter.h b/src/tactic/equiv_proof_converter.h
index 01dd0a238..7571ae9d4 100644
--- a/src/tactic/equiv_proof_converter.h
+++ b/src/tactic/equiv_proof_converter.h
@@ -21,8 +21,8 @@ Revision History:
 
 --*/
 
-#ifndef _EQUIV_PROOF_CONVERTER_H_
-#define _EQUIV_PROOF_CONVERTER_H_
+#ifndef EQUIV_PROOF_CONVERTER_H_
+#define EQUIV_PROOF_CONVERTER_H_
 
 #include "replace_proof_converter.h"
 
diff --git a/src/tactic/extension_model_converter.h b/src/tactic/extension_model_converter.h
index 84d29edd0..da1f8ea56 100644
--- a/src/tactic/extension_model_converter.h
+++ b/src/tactic/extension_model_converter.h
@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _EXTENSION_MODEL_CONVERTER_H_
-#define _EXTENSION_MODEL_CONVERTER_H_
+#ifndef EXTENSION_MODEL_CONVERTER_H_
+#define EXTENSION_MODEL_CONVERTER_H_
 
 #include"ast.h"
 #include"model_converter.h"
diff --git a/src/tactic/filter_model_converter.h b/src/tactic/filter_model_converter.h
index afc77d345..0113e9fd9 100644
--- a/src/tactic/filter_model_converter.h
+++ b/src/tactic/filter_model_converter.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _FILTER_MODEL_CONVERTER_H_
-#define _FILTER_MODEL_CONVERTER_H_
+#ifndef FILTER_MODEL_CONVERTER_H_
+#define FILTER_MODEL_CONVERTER_H_
 
 #include"model_converter.h"
 
diff --git a/src/tactic/fpa/fpa2bv_model_converter.h b/src/tactic/fpa/fpa2bv_model_converter.h
index 7b9598740..ef8ea91f5 100644
--- a/src/tactic/fpa/fpa2bv_model_converter.h
+++ b/src/tactic/fpa/fpa2bv_model_converter.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _FPA2BV_MODEL_CONVERTER_H_
-#define _FPA2BV_MODEL_CONVERTER_H_
+#ifndef FPA2BV_MODEL_CONVERTER_H_
+#define FPA2BV_MODEL_CONVERTER_H_
 
 #include"fpa2bv_converter.h"
 #include"model_converter.h"
diff --git a/src/tactic/fpa/fpa2bv_tactic.h b/src/tactic/fpa/fpa2bv_tactic.h
index 129ae5fd5..633009d59 100644
--- a/src/tactic/fpa/fpa2bv_tactic.h
+++ b/src/tactic/fpa/fpa2bv_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _FPA2BV_TACTIC_
-#define _FPA2BV_TACTIC_
+#ifndef FPA2BV_TACTIC_H_
+#define FPA2BV_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/fpa/qffp_tactic.h b/src/tactic/fpa/qffp_tactic.h
index 5c8caba2b..42e4f94e7 100644
--- a/src/tactic/fpa/qffp_tactic.h
+++ b/src/tactic/fpa/qffp_tactic.h
@@ -17,8 +17,8 @@ Notes:
 
 
 --*/
-#ifndef _QFFP_TACTIC_H_
-#define _QFFP_TACTIC_H_
+#ifndef QFFP_TACTIC_H_
+#define QFFP_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/goal.h b/src/tactic/goal.h
index 294987699..147c5b2e9 100644
--- a/src/tactic/goal.h
+++ b/src/tactic/goal.h
@@ -25,8 +25,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _GOAL_H_
-#define _GOAL_H_
+#ifndef GOAL_H_
+#define GOAL_H_
 
 #include"ast.h"
 #include"ast_translation.h"
diff --git a/src/tactic/goal_num_occurs.h b/src/tactic/goal_num_occurs.h
index 33a25e03f..e5f97f8cd 100644
--- a/src/tactic/goal_num_occurs.h
+++ b/src/tactic/goal_num_occurs.h
@@ -15,8 +15,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _GOAL_NUM_OCCURS_H_
-#define _GOAL_NUM_OCCURS_H_
+#ifndef GOAL_NUM_OCCURS_H_
+#define GOAL_NUM_OCCURS_H_
 
 #include"num_occurs.h"
 
diff --git a/src/tactic/goal_shared_occs.h b/src/tactic/goal_shared_occs.h
index 0d914cd8c..902d1d027 100644
--- a/src/tactic/goal_shared_occs.h
+++ b/src/tactic/goal_shared_occs.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _GOAL_SHARED_OCCS_H_
-#define _GOAL_SHARED_OCCS_H_
+#ifndef GOAL_SHARED_OCCS_H_
+#define GOAL_SHARED_OCCS_H_
 
 #include"goal.h"
 #include"shared_occs.h"
diff --git a/src/tactic/goal_util.h b/src/tactic/goal_util.h
index cda7e44e0..30c7f685f 100644
--- a/src/tactic/goal_util.h
+++ b/src/tactic/goal_util.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _GOAL_UTIL_H_
-#define _GOAL_UTIL_H_
+#ifndef GOAL_UTIL_H_
+#define GOAL_UTIL_H_
 
 class goal;
 bool has_term_ite(goal const & g);
diff --git a/src/tactic/horn_subsume_model_converter.h b/src/tactic/horn_subsume_model_converter.h
index 8bad28e3d..d56802349 100644
--- a/src/tactic/horn_subsume_model_converter.h
+++ b/src/tactic/horn_subsume_model_converter.h
@@ -32,8 +32,8 @@ Subsumption transformation (remove Horn clause):
 
 --*/
 
-#ifndef _HORN_SUBSUME_MODEL_CONVERTER_H_
-#define _HORN_SUBSUME_MODEL_CONVERTER_H_
+#ifndef HORN_SUBSUME_MODEL_CONVERTER_H_
+#define HORN_SUBSUME_MODEL_CONVERTER_H_
 
 #include "model_converter.h"
 #include "th_rewriter.h"
diff --git a/src/tactic/model_converter.h b/src/tactic/model_converter.h
index 14961daf1..00c50a15f 100644
--- a/src/tactic/model_converter.h
+++ b/src/tactic/model_converter.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _MODEL_CONVERTER_H_
-#define _MODEL_CONVERTER_H_
+#ifndef MODEL_CONVERTER_H_
+#define MODEL_CONVERTER_H_
 
 #include"model.h"
 #include"converter.h"
diff --git a/src/tactic/nlsat_smt/nl_purify_tactic.h b/src/tactic/nlsat_smt/nl_purify_tactic.h
index 9ffc99676..87e37b4ad 100644
--- a/src/tactic/nlsat_smt/nl_purify_tactic.h
+++ b/src/tactic/nlsat_smt/nl_purify_tactic.h
@@ -18,8 +18,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _NL_PURIFY_TACTIC_H_
-#define _NL_PURIFY_TACTIC_H_
+#ifndef NL_PURIFY_TACTIC_H_
+#define NL_PURIFY_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/portfolio/default_tactic.h b/src/tactic/portfolio/default_tactic.h
index 4f95ef128..f684fba85 100644
--- a/src/tactic/portfolio/default_tactic.h
+++ b/src/tactic/portfolio/default_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _DEFAULT_TACTIC_
-#define _DEFAULT_TACTIC_
+#ifndef DEFAULT_TACTIC_H_
+#define DEFAULT_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/portfolio/smt_strategic_solver.h b/src/tactic/portfolio/smt_strategic_solver.h
index 1d132532a..77e9299e6 100644
--- a/src/tactic/portfolio/smt_strategic_solver.h
+++ b/src/tactic/portfolio/smt_strategic_solver.h
@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _SMT_STRATEGIC_SOLVER_H_
-#define _SMT_STRATEGIC_SOLVER_H_
+#ifndef SMT_STRATEGIC_SOLVER_H_
+#define SMT_STRATEGIC_SOLVER_H_
 
 class solver_factory;
 
diff --git a/src/tactic/probe.h b/src/tactic/probe.h
index 0cf8122e4..56269094e 100644
--- a/src/tactic/probe.h
+++ b/src/tactic/probe.h
@@ -21,8 +21,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PROBE_H_
-#define _PROBE_H_
+#ifndef PROBE_H_
+#define PROBE_H_
 
 #include"goal.h"
 
diff --git a/src/tactic/proof_converter.h b/src/tactic/proof_converter.h
index fd2f5b877..44928e046 100644
--- a/src/tactic/proof_converter.h
+++ b/src/tactic/proof_converter.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _PROOF_CONVERTER_H_
-#define _PROOF_CONVERTER_H_
+#ifndef PROOF_CONVERTER_H_
+#define PROOF_CONVERTER_H_
 
 #include"ast.h"
 #include"converter.h"
diff --git a/src/tactic/replace_proof_converter.h b/src/tactic/replace_proof_converter.h
index 7fee27612..96f25aab4 100644
--- a/src/tactic/replace_proof_converter.h
+++ b/src/tactic/replace_proof_converter.h
@@ -20,8 +20,8 @@ Revision History:
 
 --*/
 
-#ifndef _REPLACE_PROOF_CONVERTER_H_
-#define _REPLACE_PROOF_CONVERTER_H_
+#ifndef REPLACE_PROOF_CONVERTER_H_
+#define REPLACE_PROOF_CONVERTER_H_
 
 #include "proof_converter.h"
 
diff --git a/src/tactic/sls/bvsls_opt_engine.h b/src/tactic/sls/bvsls_opt_engine.h
index 64a366d73..8ea666ed0 100644
--- a/src/tactic/sls/bvsls_opt_engine.h
+++ b/src/tactic/sls/bvsls_opt_engine.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _BVSLS_OPT_ENGINE_H_
-#define _BVSLS_OPT_ENGINE_H_
+#ifndef BVSLS_OPT_ENGINE_H_
+#define BVSLS_OPT_ENGINE_H_
 
 #include "sls_engine.h"
 
diff --git a/src/tactic/sls/sls_engine.h b/src/tactic/sls/sls_engine.h
index e0a28a796..a771eaefc 100644
--- a/src/tactic/sls/sls_engine.h
+++ b/src/tactic/sls/sls_engine.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _SLS_ENGINE_H_
-#define _SLS_ENGINE_H_
+#ifndef SLS_ENGINE_H_
+#define SLS_ENGINE_H_
 
 #include"stopwatch.h"
 #include"lbool.h"
diff --git a/src/tactic/sls/sls_evaluator.h b/src/tactic/sls/sls_evaluator.h
index ed4717641..33b6c15b9 100644
--- a/src/tactic/sls/sls_evaluator.h
+++ b/src/tactic/sls/sls_evaluator.h
@@ -17,8 +17,8 @@ Notes:
 
 --*/
 
-#ifndef _SLS_EVALUATOR_H_
-#define _SLS_EVALUATOR_H_
+#ifndef SLS_EVALUATOR_H_
+#define SLS_EVALUATOR_H_
 
 #include"model_evaluator.h"
 
diff --git a/src/tactic/sls/sls_powers.h b/src/tactic/sls/sls_powers.h
index d0cc0815e..c514fec00 100644
--- a/src/tactic/sls/sls_powers.h
+++ b/src/tactic/sls/sls_powers.h
@@ -17,8 +17,8 @@ Notes:
 
 --*/
 
-#ifndef _SLS_POWERS_H_
-#define _SLS_POWERS_H_
+#ifndef SLS_POWERS_H_
+#define SLS_POWERS_H_
 
 #include"mpz.h"
 
diff --git a/src/tactic/sls/sls_tactic.h b/src/tactic/sls/sls_tactic.h
index 82ac1ce88..ba415d547 100644
--- a/src/tactic/sls/sls_tactic.h
+++ b/src/tactic/sls/sls_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _SLS_TACTIC_H_
-#define _SLS_TACTIC_H_
+#ifndef SLS_TACTIC_H_
+#define SLS_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/sls/sls_tracker.h b/src/tactic/sls/sls_tracker.h
index 2e041ae97..39d76bee6 100644
--- a/src/tactic/sls/sls_tracker.h
+++ b/src/tactic/sls/sls_tracker.h
@@ -17,8 +17,8 @@ Notes:
 
 --*/
 
-#ifndef _SLS_TRACKER_H_
-#define _SLS_TRACKER_H_
+#ifndef SLS_TRACKER_H_
+#define SLS_TRACKER_H_
 
 #include<math.h>
 #include"for_each_expr.h"
diff --git a/src/tactic/smtlogics/nra_tactic.h b/src/tactic/smtlogics/nra_tactic.h
index 3fc22393b..0cf23c226 100644
--- a/src/tactic/smtlogics/nra_tactic.h
+++ b/src/tactic/smtlogics/nra_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _NRA_TACTIC_H_
-#define _NRA_TACTIC_H_
+#ifndef NRA_TACTIC_H_
+#define NRA_TACTIC_H_
 
 tactic * mk_nra_tactic(ast_manager & m, params_ref const & p = params_ref());
 
diff --git a/src/tactic/smtlogics/qfaufbv_tactic.h b/src/tactic/smtlogics/qfaufbv_tactic.h
index b9c72cd1e..d4503a5de 100644
--- a/src/tactic/smtlogics/qfaufbv_tactic.h
+++ b/src/tactic/smtlogics/qfaufbv_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _QFAUFBV_TACTIC_H_
-#define _QFAUFBV_TACTIC_H_
+#ifndef QFAUFBV_TACTIC_H_
+#define QFAUFBV_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/smtlogics/qfauflia_tactic.h b/src/tactic/smtlogics/qfauflia_tactic.h
index a063fcd75..10b790e70 100644
--- a/src/tactic/smtlogics/qfauflia_tactic.h
+++ b/src/tactic/smtlogics/qfauflia_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _QFAUFLIA_TACTIC_H_
-#define _QFAUFLIA_TACTIC_H_
+#ifndef QFAUFLIA_TACTIC_H_
+#define QFAUFLIA_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/smtlogics/qfbv_tactic.h b/src/tactic/smtlogics/qfbv_tactic.h
index 98b3e2289..4de623e0f 100644
--- a/src/tactic/smtlogics/qfbv_tactic.h
+++ b/src/tactic/smtlogics/qfbv_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _QFBV_TACTIC_
-#define _QFBV_TACTIC_
+#ifndef QFBV_TACTIC_H_
+#define QFBV_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/smtlogics/qfidl_tactic.h b/src/tactic/smtlogics/qfidl_tactic.h
index 64f560581..f502dbd89 100644
--- a/src/tactic/smtlogics/qfidl_tactic.h
+++ b/src/tactic/smtlogics/qfidl_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _QFIDL_TACTIC_H_
-#define _QFIDL_TACTIC_H_
+#ifndef QFIDL_TACTIC_H_
+#define QFIDL_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/smtlogics/qflia_tactic.h b/src/tactic/smtlogics/qflia_tactic.h
index 47a2108ae..36e7cf9f9 100644
--- a/src/tactic/smtlogics/qflia_tactic.h
+++ b/src/tactic/smtlogics/qflia_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _QFLIA_TACTIC_
-#define _QFLIA_TACTIC_
+#ifndef QFLIA_TACTIC_H_
+#define QFLIA_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/smtlogics/qflra_tactic.h b/src/tactic/smtlogics/qflra_tactic.h
index 54ff228d4..f8b311aba 100644
--- a/src/tactic/smtlogics/qflra_tactic.h
+++ b/src/tactic/smtlogics/qflra_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _QFLRA_TACTIC_
-#define _QFLRA_TACTIC_
+#ifndef QFLRA_TACTIC_H_
+#define QFLRA_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/smtlogics/qfnia_tactic.h b/src/tactic/smtlogics/qfnia_tactic.h
index 40bb95652..0770b4eee 100644
--- a/src/tactic/smtlogics/qfnia_tactic.h
+++ b/src/tactic/smtlogics/qfnia_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _QFNIA_TACTIC_
-#define _QFNIA_TACTIC_
+#ifndef QFNIA_TACTIC_H_
+#define QFNIA_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/smtlogics/qfnra_tactic.h b/src/tactic/smtlogics/qfnra_tactic.h
index a0497f6f3..cae314553 100644
--- a/src/tactic/smtlogics/qfnra_tactic.h
+++ b/src/tactic/smtlogics/qfnra_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _QFNRA_TACTIC_
-#define _QFNRA_TACTIC_
+#ifndef QFNRA_TACTIC_H_
+#define QFNRA_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/smtlogics/qfuf_tactic.h b/src/tactic/smtlogics/qfuf_tactic.h
index 14d7f010f..732e1289f 100644
--- a/src/tactic/smtlogics/qfuf_tactic.h
+++ b/src/tactic/smtlogics/qfuf_tactic.h
@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _QFUF_TACTIC_
-#define _QFUF_TACTIC_
+#ifndef QFUF_TACTIC_H_
+#define QFUF_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/smtlogics/qfufbv_tactic.h b/src/tactic/smtlogics/qfufbv_tactic.h
index 41446042f..e9ffe4dc3 100644
--- a/src/tactic/smtlogics/qfufbv_tactic.h
+++ b/src/tactic/smtlogics/qfufbv_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _QFUFBV_TACTIC_
-#define _QFUFBV_TACTIC_
+#ifndef QFUFBV_TACTIC_H_
+#define QFUFBV_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/smtlogics/qfufnra_tactic.h b/src/tactic/smtlogics/qfufnra_tactic.h
index a2ac9b1ea..4cc2b372d 100644
--- a/src/tactic/smtlogics/qfufnra_tactic.h
+++ b/src/tactic/smtlogics/qfufnra_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _QFUFNRA_TACTIC_
-#define _QFUFNRA_TACTIC_
+#ifndef QFUFNRA_TACTIC_H_
+#define QFUFNRA_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/smtlogics/quant_tactics.h b/src/tactic/smtlogics/quant_tactics.h
index 5cf27cde4..3da05a0f2 100644
--- a/src/tactic/smtlogics/quant_tactics.h
+++ b/src/tactic/smtlogics/quant_tactics.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _QUANT_TACTICS_H_
-#define _QUANT_TACTICS_H_
+#ifndef QUANT_TACTICS_H_
+#define QUANT_TACTICS_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/tactic.h b/src/tactic/tactic.h
index cab93f1ea..9ccb98042 100644
--- a/src/tactic/tactic.h
+++ b/src/tactic/tactic.h
@@ -18,8 +18,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _TACTIC_H_
-#define _TACTIC_H_
+#ifndef TACTIC_H_
+#define TACTIC_H_
 
 #include"goal.h"
 #include"params.h"
diff --git a/src/tactic/tactic_exception.h b/src/tactic/tactic_exception.h
index 4949a2d5b..6dbd39ff9 100644
--- a/src/tactic/tactic_exception.h
+++ b/src/tactic/tactic_exception.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _TACTIC_EXCEPTION_H_
-#define _TACTIC_EXCEPTION_H_
+#ifndef TACTIC_EXCEPTION_H_
+#define TACTIC_EXCEPTION_H_
 
 #include"z3_exception.h"
 #include"common_msgs.h"
diff --git a/src/tactic/tactical.h b/src/tactic/tactical.h
index e291e6864..5022ac4a7 100644
--- a/src/tactic/tactical.h
+++ b/src/tactic/tactical.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _TACTICAL_H_
-#define _TACTICAL_H_
+#ifndef TACTICAL_H_
+#define TACTICAL_H_
 
 #include"tactic.h"
 #include"probe.h"
diff --git a/src/tactic/ufbv/macro_finder_tactic.h b/src/tactic/ufbv/macro_finder_tactic.h
index 2c8048b10..d763d4567 100644
--- a/src/tactic/ufbv/macro_finder_tactic.h
+++ b/src/tactic/ufbv/macro_finder_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _MACRO_FINDER_TACTIC_H_
-#define _MACRO_FINDER_TACTIC_H_
+#ifndef MACRO_FINDER_TACTIC_H_
+#define MACRO_FINDER_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/ufbv/quasi_macros_tactic.h b/src/tactic/ufbv/quasi_macros_tactic.h
index b654c3e4e..2dff246a1 100644
--- a/src/tactic/ufbv/quasi_macros_tactic.h
+++ b/src/tactic/ufbv/quasi_macros_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _QUASI_MACROS_TACTIC_H_
-#define _QUASI_MACROS_TACTIC_H_
+#ifndef QUASI_MACROS_TACTIC_H_
+#define QUASI_MACROS_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/ufbv/ufbv_rewriter.h b/src/tactic/ufbv/ufbv_rewriter.h
index 036af1793..13234799e 100644
--- a/src/tactic/ufbv/ufbv_rewriter.h
+++ b/src/tactic/ufbv/ufbv_rewriter.h
@@ -18,8 +18,8 @@ Revision History:
     Christoph M. Wintersteiger (cwinter) 2012-10-24: Moved from demodulator.h to ufbv_rewriter.h
 
 --*/
-#ifndef _UFBV_REWRITER_H_
-#define _UFBV_REWRITER_H_
+#ifndef UFBV_REWRITER_H_
+#define UFBV_REWRITER_H_
 
 #include"ast.h"
 #include"substitution.h"
@@ -263,5 +263,5 @@ public:
     */    
 };
 
-#endif /* _UFBV_REWRITER_H_ */
+#endif /* UFBV_REWRITER_H_ */
 
diff --git a/src/tactic/ufbv/ufbv_rewriter_tactic.h b/src/tactic/ufbv/ufbv_rewriter_tactic.h
index 0afe42bf7..85cffee54 100644
--- a/src/tactic/ufbv/ufbv_rewriter_tactic.h
+++ b/src/tactic/ufbv/ufbv_rewriter_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _UFBV_REWRITER_TACTIC_H_
-#define _UFBV_REWRITER_TACTIC_H_
+#ifndef UFBV_REWRITER_TACTIC_H_
+#define UFBV_REWRITER_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/tactic/ufbv/ufbv_tactic.h b/src/tactic/ufbv/ufbv_tactic.h
index e642ecda7..2d5454de5 100644
--- a/src/tactic/ufbv/ufbv_tactic.h
+++ b/src/tactic/ufbv/ufbv_tactic.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _UFBV_TACTIC_H_
-#define _UFBV_TACTIC_H_
+#ifndef UFBV_TACTIC_H_
+#define UFBV_TACTIC_H_
 
 #include"params.h"
 class ast_manager;
diff --git a/src/test/for_each_file.h b/src/test/for_each_file.h
index 29fad7c3c..17d7ab85d 100644
--- a/src/test/for_each_file.h
+++ b/src/test/for_each_file.h
@@ -19,8 +19,8 @@ Revision History:
 --*/
 #pragma once
 
-#ifndef _FOR_EACH_FILE_H_
-#define _FOR_EACH_FILE_H_
+#ifndef FOR_EACH_FILE_H_
+#define FOR_EACH_FILE_H_
 
 struct for_each_file_proc {
     virtual bool operator()(const char* file_path) = 0;
@@ -29,5 +29,5 @@ struct for_each_file_proc {
 bool for_each_file(for_each_file_proc& proc, const char* base, const char* suffix);
     
 
-#endif /* _FOR_EACH_FILE_H_ */
+#endif /* FOR_EACH_FILE_H_ */
 
diff --git a/src/test/fuzzing/expr_delta.h b/src/test/fuzzing/expr_delta.h
index 1ac03d579..2c68efb40 100644
--- a/src/test/fuzzing/expr_delta.h
+++ b/src/test/fuzzing/expr_delta.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _EXPR_DELTA_H_
-#define _EXPR_DELTA_H_
+#ifndef EXPR_DELTA_H_
+#define EXPR_DELTA_H_
 
 #include "ast.h"
 
diff --git a/src/test/fuzzing/expr_rand.h b/src/test/fuzzing/expr_rand.h
index f85cd92c0..971a3ec60 100644
--- a/src/test/fuzzing/expr_rand.h
+++ b/src/test/fuzzing/expr_rand.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _EXPR_RAND_H_
-#define _EXPR_RAND_H_
+#ifndef EXPR_RAND_H_
+#define EXPR_RAND_H_
 
 #include"ast.h"
 #include"obj_hashtable.h"
diff --git a/src/test/im_float_config.h b/src/test/im_float_config.h
index 45452dc42..2f33172a1 100644
--- a/src/test/im_float_config.h
+++ b/src/test/im_float_config.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _IM_FLOAT_CONFIG_H_
-#define _IM_FLOAT_CONFIG_H_
+#ifndef IM_FLOAT_CONFIG_H_
+#define IM_FLOAT_CONFIG_H_
 
 #include"f2n.h"
 #include"mpf.h"
diff --git a/src/util/approx_nat.h b/src/util/approx_nat.h
index 6ccc20ce2..b5e1edb8f 100644
--- a/src/util/approx_nat.h
+++ b/src/util/approx_nat.h
@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _APPROX_NAT_H_
-#define _APPROX_NAT_H_
+#ifndef APPROX_NAT_H_
+#define APPROX_NAT_H_
 
 #include<iostream>
 #include<limits.h>
@@ -42,4 +42,4 @@ public:
 
 std::ostream & operator<<(std::ostream & target, approx_nat const & w);
 
-#endif /* _APPROX_NAT_H_ */
+#endif /* APPROX_NAT_H_ */
diff --git a/src/util/approx_set.h b/src/util/approx_set.h
index 9c769f299..c0f3d39dd 100644
--- a/src/util/approx_set.h
+++ b/src/util/approx_set.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _APPROX_SET_H_
-#define _APPROX_SET_H_
+#ifndef APPROX_SET_H_
+#define APPROX_SET_H_
 #include<iostream>
 #include"debug.h"
 
@@ -232,5 +232,5 @@ inline std::ostream & operator<<(std::ostream & out, approx_set const & s) {
     return out;
 }
 
-#endif /* _APPROX_SET_H_ */
+#endif /* APPROX_SET_H_ */
 
diff --git a/src/util/array.h b/src/util/array.h
index f983f7dec..f0c084b30 100644
--- a/src/util/array.h
+++ b/src/util/array.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef __ARRAY_H_
-#define __ARRAY_H_
+#ifndef ARRAY_H_
+#define ARRAY_H_
 
 template<typename T, bool CallDestructors=true>
 class array {
diff --git a/src/util/array_map.h b/src/util/array_map.h
index e4fbf3aa5..14d404e9d 100644
--- a/src/util/array_map.h
+++ b/src/util/array_map.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _ARRAY_MAP_H_
-#define _ARRAY_MAP_H_
+#ifndef ARRAY_MAP_H_
+#define ARRAY_MAP_H_
 
 #include"vector.h"
 #include"optional.h"
@@ -159,4 +159,4 @@ public:
 
 };
 
-#endif /* _ARRAY_MAP_H_ */
+#endif /* ARRAY_MAP_H_ */
diff --git a/src/util/backtrackable_set.h b/src/util/backtrackable_set.h
index 617c57769..ea82a5c81 100644
--- a/src/util/backtrackable_set.h
+++ b/src/util/backtrackable_set.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _BACKTRACKABLE_SET_H_
-#define _BACKTRACKABLE_SET_H_
+#ifndef BACKTRACKABLE_SET_H_
+#define BACKTRACKABLE_SET_H_
 
 #include"vector.h"
 
diff --git a/src/util/basic_interval.h b/src/util/basic_interval.h
index ef414149c..a7bbff3e7 100644
--- a/src/util/basic_interval.h
+++ b/src/util/basic_interval.h
@@ -21,8 +21,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _BASIC_INTERVAL_H_
-#define _BASIC_INTERVAL_H_
+#ifndef BASIC_INTERVAL_H_
+#define BASIC_INTERVAL_H_
 
 template<typename numeral_manager, bool closed>
 class basic_interval_manager {
diff --git a/src/util/bit_util.h b/src/util/bit_util.h
index a730534d2..5729e8eed 100644
--- a/src/util/bit_util.h
+++ b/src/util/bit_util.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _BIT_UTIL_H_
-#define _BIT_UTIL_H_
+#ifndef BIT_UTIL_H_
+#define BIT_UTIL_H_
 
 /**
    \brief Return the position of the most significant (set) bit of a
diff --git a/src/util/bit_vector.h b/src/util/bit_vector.h
index f3fd7c27b..a8c348aeb 100644
--- a/src/util/bit_vector.h
+++ b/src/util/bit_vector.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _BIT_VECTOR_H_
-#define _BIT_VECTOR_H_
+#ifndef BIT_VECTOR_H_
+#define BIT_VECTOR_H_
 
 #include<string.h>
 #include"debug.h"
@@ -251,5 +251,5 @@ public:
     }
 };
 
-#endif /* _BIT_VECTOR_H_ */
+#endif /* BIT_VECTOR_H_ */
 
diff --git a/src/util/buffer.h b/src/util/buffer.h
index ee2fbbc65..3495ca1d3 100644
--- a/src/util/buffer.h
+++ b/src/util/buffer.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _BUFFER_H_
-#define _BUFFER_H_
+#ifndef BUFFER_H_
+#define BUFFER_H_
 
 #include<string.h>
 #include"memory_manager.h"
@@ -257,5 +257,5 @@ public:
     sbuffer(unsigned sz, const T& elem) : buffer<T, false, INITIAL_SIZE>(sz,elem) {}
 };
 
-#endif /* _BUFFER_H_ */
+#endif /* BUFFER_H_ */
 
diff --git a/src/util/cancel_eh.h b/src/util/cancel_eh.h
index 0401e6f03..6b8fc8351 100644
--- a/src/util/cancel_eh.h
+++ b/src/util/cancel_eh.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _CANCEL_EH_H_
-#define _CANCEL_EH_H_
+#ifndef CANCEL_EH_H_
+#define CANCEL_EH_H_
 
 #include"event_handler.h"
 
diff --git a/src/util/chashtable.h b/src/util/chashtable.h
index 80484a9f6..cdc6e6295 100644
--- a/src/util/chashtable.h
+++ b/src/util/chashtable.h
@@ -25,8 +25,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _CHASHTABLE_H_
-#define _CHASHTABLE_H_
+#ifndef CHASHTABLE_H_
+#define CHASHTABLE_H_
 
 #include"memory_manager.h"
 #include"debug.h"
diff --git a/src/util/checked_int64.h b/src/util/checked_int64.h
index 3772e5ab0..db1dd2521 100644
--- a/src/util/checked_int64.h
+++ b/src/util/checked_int64.h
@@ -21,8 +21,8 @@ Revision History:
 
 --*/
 
-#ifndef __CHECKED_INT64_H_
-#define __CHECKED_INT64_H_
+#ifndef CHECKED_INT64_H_
+#define CHECKED_INT64_H_
 
 #include"z3_exception.h"
 #include"rational.h"
diff --git a/src/util/cmd_context_types.h b/src/util/cmd_context_types.h
index e334dc0d2..bdd7857f8 100644
--- a/src/util/cmd_context_types.h
+++ b/src/util/cmd_context_types.h
@@ -14,8 +14,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _CMD_CONTEXT_TYPES_H_
-#define _CMD_CONTEXT_TYPES_H_
+#ifndef CMD_CONTEXT_TYPES_H_
+#define CMD_CONTEXT_TYPES_H_
 
 #include"symbol.h"
 #include"z3_exception.h"
diff --git a/src/util/common_msgs.h b/src/util/common_msgs.h
index 1ffdbf06c..ae651e1d9 100644
--- a/src/util/common_msgs.h
+++ b/src/util/common_msgs.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef __COMMON_MSGS_H_
-#define __COMMON_MSGS_H_
+#ifndef COMMON_MSGS_H_
+#define COMMON_MSGS_H_
 
 class common_msgs {
 public:
diff --git a/src/util/cooperate.h b/src/util/cooperate.h
index ea7a00c8f..af2cff55c 100644
--- a/src/util/cooperate.h
+++ b/src/util/cooperate.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _COOPERATE_H_
-#define _COOPERATE_H_
+#ifndef COOPERATE_H_
+#define COOPERATE_H_
 
 class cooperation_section;
 
diff --git a/src/util/critical_flet.h b/src/util/critical_flet.h
index 347adf47b..3af2fac24 100644
--- a/src/util/critical_flet.h
+++ b/src/util/critical_flet.h
@@ -18,8 +18,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _CRITICAL_FLET_H_
-#define _CRITICAL_FLET_H_
+#ifndef CRITICAL_FLET_H_
+#define CRITICAL_FLET_H_
 
 template<typename T>
 class critical_flet {
diff --git a/src/util/debug.h b/src/util/debug.h
index f7383511b..28bdb44ad 100644
--- a/src/util/debug.h
+++ b/src/util/debug.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DEBUG_H_
-#define _DEBUG_H_
+#ifndef DEBUG_H_
+#define DEBUG_H_
 
 void enable_assertions(bool f);
 bool assertions_enabled();
@@ -96,5 +96,5 @@ void finalize_debug();
   ADD_FINALIZER('finalize_debug();')
 */
 
-#endif /* _DEBUG_H_ */
+#endif /* DEBUG_H_ */
 
diff --git a/src/util/dec_ref_util.h b/src/util/dec_ref_util.h
index a91d9f06d..15cfedd49 100644
--- a/src/util/dec_ref_util.h
+++ b/src/util/dec_ref_util.h
@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _MAP_UTIL_H_
-#define _MAP_UTIL_H_
+#ifndef MAP_UTIL_H_
+#define MAP_UTIL_H_
 
 /**
    \brief Decrement the reference counter of the keys and values stored in the map,
diff --git a/src/util/dependency.h b/src/util/dependency.h
index 33a0e4d22..4c438e520 100644
--- a/src/util/dependency.h
+++ b/src/util/dependency.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DEPENDENCY_H_
-#define _DEPENDENCY_H_
+#ifndef DEPENDENCY_H_
+#define DEPENDENCY_H_
 
 #include"vector.h"
 #include"region.h"
@@ -322,5 +322,5 @@ public:
 typedef scoped_dependency_manager<void*>             v_dependency_manager;
 typedef scoped_dependency_manager<void*>::dependency v_dependency;
 
-#endif /* _DEPENDENCY_H_ */
+#endif /* DEPENDENCY_H_ */
 
diff --git a/src/util/dictionary.h b/src/util/dictionary.h
index 938d6091a..e319e6a27 100644
--- a/src/util/dictionary.h
+++ b/src/util/dictionary.h
@@ -14,8 +14,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _DICTIONARY_H_
-#define _DICTIONARY_H_
+#ifndef DICTIONARY_H_
+#define DICTIONARY_H_
 
 #include"map.h"
 #include"symbol.h"
diff --git a/src/util/dlist.h b/src/util/dlist.h
index d07b9264d..abb41225c 100644
--- a/src/util/dlist.h
+++ b/src/util/dlist.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef __DLIST_H_
-#define __DLIST_H_
+#ifndef DLIST_H_
+#define DLIST_H_
 
 /**
    Add element \c elem to the list headed by \c head.
diff --git a/src/util/double_manager.h b/src/util/double_manager.h
index 5334e60df..a426e9b1b 100644
--- a/src/util/double_manager.h
+++ b/src/util/double_manager.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _DOUBLE_MANAGER_H_
-#define _DOUBLE_MANAGER_H_
+#ifndef DOUBLE_MANAGER_H_
+#define DOUBLE_MANAGER_H_
 
 #include<cmath>
 #include<string>
@@ -99,5 +99,5 @@ public:
 
 COMPILE_TIME_ASSERT(sizeof(uint64) == sizeof(double));
 
-#endif /* _DOUBLE_MANAGER_H_ */
+#endif /* DOUBLE_MANAGER_H_ */
 
diff --git a/src/util/env_params.h b/src/util/env_params.h
index 8b5fa7005..7bfc8df5c 100644
--- a/src/util/env_params.h
+++ b/src/util/env_params.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _ENV_PARAMS_H_
-#define _ENV_PARAMS_H_
+#ifndef ENV_PARAMS_H_
+#define ENV_PARAMS_H_
 
 class param_descrs;
 
diff --git a/src/util/error_codes.h b/src/util/error_codes.h
index 32d760470..ded05361c 100644
--- a/src/util/error_codes.h
+++ b/src/util/error_codes.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _ERROR_CODES_H_
-#define _ERROR_CODES_H_
+#ifndef ERROR_CODES_H_
+#define ERROR_CODES_H_
 
 #define ERR_OK                  0
 #define ERR_MEMOUT              101
@@ -34,5 +34,5 @@ Revision History:
 #define ERR_UNKNOWN_RESULT      112
 #define ERR_ALLOC_EXCEEDED      113
 
-#endif /* _ERROR_CODES_H_ */
+#endif /* ERROR_CODES_H_ */
 
diff --git a/src/util/event_handler.h b/src/util/event_handler.h
index 4249a7e4b..4b13f9c48 100644
--- a/src/util/event_handler.h
+++ b/src/util/event_handler.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _EVENT_HANDLER_H_
-#define _EVENT_HANDLER_H_
+#ifndef EVENT_HANDLER_H_
+#define EVENT_HANDLER_H_
 
 class event_handler {
 public:
diff --git a/src/util/ext_gcd.h b/src/util/ext_gcd.h
index 5be90c5ea..9534bd386 100644
--- a/src/util/ext_gcd.h
+++ b/src/util/ext_gcd.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _EXT_GCD_H_
-#define _EXT_GCD_H_
+#ifndef EXT_GCD_H_
+#define EXT_GCD_H_
 
 template<typename numeral>
 void extended_gcd(const numeral & in_a, const numeral & in_b, numeral & gcd, numeral & x, numeral & y) {
@@ -48,5 +48,5 @@ void extended_gcd(const numeral & in_a, const numeral & in_b, numeral & gcd, num
     y   = lasty;
 }
 
-#endif /* _EXT_GCD_H_ */
+#endif /* EXT_GCD_H_ */
 
diff --git a/src/util/ext_numeral.h b/src/util/ext_numeral.h
index 03a364bdb..a37ec6aee 100644
--- a/src/util/ext_numeral.h
+++ b/src/util/ext_numeral.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _EXT_NUMERAL_H_
-#define _EXT_NUMERAL_H_
+#ifndef EXT_NUMERAL_H_
+#define EXT_NUMERAL_H_
 
 #include<iostream>
 #include"debug.h"
diff --git a/src/util/f2n.h b/src/util/f2n.h
index 6576b136a..0f453911d 100644
--- a/src/util/f2n.h
+++ b/src/util/f2n.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef __F2N_H_
-#define __F2N_H_
+#ifndef F2N_H_
+#define F2N_H_
 
 #include"mpf.h"
 
diff --git a/src/util/fixed_bit_vector.h b/src/util/fixed_bit_vector.h
index 933299925..be840204c 100644
--- a/src/util/fixed_bit_vector.h
+++ b/src/util/fixed_bit_vector.h
@@ -18,8 +18,8 @@ Revision History:
     Related to bit_vector, but is based on a manager.
 
 --*/
-#ifndef _FIXED_BIT_VECTOR_H_
-#define _FIXED_BIT_VECTOR_H_
+#ifndef FIXED_BIT_VECTOR_H_
+#define FIXED_BIT_VECTOR_H_
 
 #include<string.h>
 #include"debug.h"
@@ -142,5 +142,5 @@ public:
 
 
 
-#endif /* _FIXED_BIT_VECTOR_H_ */
+#endif /* FIXED_BIT_VECTOR_H_ */
 
diff --git a/src/util/gparams.h b/src/util/gparams.h
index a55761830..139640c78 100644
--- a/src/util/gparams.h
+++ b/src/util/gparams.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _GPARAMS_H_
-#define _GPARAMS_H_
+#ifndef GPARAMS_H_
+#define GPARAMS_H_
 
 #include"params.h"
 
diff --git a/src/util/hash.h b/src/util/hash.h
index 4232dd2af..59bc2cc3b 100644
--- a/src/util/hash.h
+++ b/src/util/hash.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _HASH_H_
-#define _HASH_H_
+#ifndef HASH_H_
+#define HASH_H_
 
 #include<algorithm>
 #include"util.h"
@@ -249,5 +249,5 @@ inline unsigned mk_mix(unsigned a, unsigned b, unsigned c) {
     return c;
 }
 
-#endif /* _HASH_H_ */
+#endif /* HASH_H_ */
 
diff --git a/src/util/hashtable.h b/src/util/hashtable.h
index 874636e91..488157c00 100644
--- a/src/util/hashtable.h
+++ b/src/util/hashtable.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _HASHTABLE_H_
-#define _HASHTABLE_H_
+#ifndef HASHTABLE_H_
+#define HASHTABLE_H_
 #include"debug.h"
 #include<ostream>
 #include"util.h"
@@ -640,4 +640,4 @@ public:
         core_hashtable<int_hash_entry<INT_MIN, INT_MIN + 1>, HashProc, EqProc>(initial_capacity, h, e) {}
 };
 
-#endif /* _HASHTABLE_H_ */
+#endif /* HASHTABLE_H_ */
diff --git a/src/util/heap.h b/src/util/heap.h
index 73029f6a7..e8964a4f0 100644
--- a/src/util/heap.h
+++ b/src/util/heap.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _HEAP_H_
-#define _HEAP_H_
+#ifndef HEAP_H_
+#define HEAP_H_
 
 #include"vector.h"
 #include"debug.h"
@@ -275,5 +275,5 @@ public:
   
 };
 
-#endif /* _HEAP_H_ */
+#endif /* HEAP_H_ */
 
diff --git a/src/util/hwf.h b/src/util/hwf.h
index 97b4133f7..7b17553d2 100644
--- a/src/util/hwf.h
+++ b/src/util/hwf.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _HWF_H_
-#define _HWF_H_
+#ifndef HWF_H_
+#define HWF_H_
 
 #include<string>
 #include"mpz.h"
diff --git a/src/util/id_gen.h b/src/util/id_gen.h
index c6d22246d..b119a88ac 100644
--- a/src/util/id_gen.h
+++ b/src/util/id_gen.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _ID_GEN_H_
-#define _ID_GEN_H_
+#ifndef ID_GEN_H_
+#define ID_GEN_H_
 
 #include"vector.h"
 #include"util.h"
@@ -85,4 +85,4 @@ public:
 
 };
 
-#endif /* _ID_GEN_H_ */
+#endif /* ID_GEN_H_ */
diff --git a/src/util/inf_eps_rational.h b/src/util/inf_eps_rational.h
index 698075e01..4327b47c0 100644
--- a/src/util/inf_eps_rational.h
+++ b/src/util/inf_eps_rational.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _INF_EPS_RATIONAL_H_
-#define _INF_EPS_RATIONAL_H_
+#ifndef INF_EPS_RATIONAL_H_
+#define INF_EPS_RATIONAL_H_
 #include<stdlib.h>
 #include<string>
 #include"debug.h"
@@ -441,4 +441,4 @@ inline inf_eps_rational<N> abs(const inf_eps_rational<N> & r) {
     return result;
 }
 
-#endif /* _INF_EPS_RATIONAL_H_ */
+#endif /* INF_EPS_RATIONAL_H_ */
diff --git a/src/util/inf_int_rational.h b/src/util/inf_int_rational.h
index 06cbc1267..a7c920295 100644
--- a/src/util/inf_int_rational.h
+++ b/src/util/inf_int_rational.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _INF_INT_RATIONAL_H_
-#define _INF_INT_RATIONAL_H_
+#ifndef INF_INT_RATIONAL_H_
+#define INF_INT_RATIONAL_H_
 #include<stdlib.h>
 #include<string>
 #include"debug.h"
@@ -386,4 +386,4 @@ inline inf_int_rational abs(const inf_int_rational & r) {
     return result;
 }
 
-#endif /* _INF_INT_RATIONAL_H_ */
+#endif /* INF_INT_RATIONAL_H_ */
diff --git a/src/util/inf_rational.h b/src/util/inf_rational.h
index b832b8793..0488d5fd3 100644
--- a/src/util/inf_rational.h
+++ b/src/util/inf_rational.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _INF_RATIONAL_H_
-#define _INF_RATIONAL_H_
+#ifndef INF_RATIONAL_H_
+#define INF_RATIONAL_H_
 #include<stdlib.h>
 #include<string>
 #include"debug.h"
@@ -471,4 +471,4 @@ inline inf_rational abs(const inf_rational & r) {
     return result;
 }
 
-#endif /* _INF_RATIONAL_H_ */
+#endif /* INF_RATIONAL_H_ */
diff --git a/src/util/inf_s_integer.h b/src/util/inf_s_integer.h
index b039333af..80c81350f 100644
--- a/src/util/inf_s_integer.h
+++ b/src/util/inf_s_integer.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _INF_S_INTEGER_H_
-#define _INF_S_INTEGER_H_
+#ifndef INF_S_INTEGER_H_
+#define INF_S_INTEGER_H_
 
 #include"s_integer.h"
 #include"rational.h"
@@ -347,5 +347,5 @@ inline inf_s_integer abs(const inf_s_integer & r) {
 }
 
 
-#endif /* _INF_S_INTEGER_H_ */
+#endif /* INF_S_INTEGER_H_ */
 
diff --git a/src/util/lbool.h b/src/util/lbool.h
index efcc5b0f0..ff2466eca 100644
--- a/src/util/lbool.h
+++ b/src/util/lbool.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _LBOOL_H_
-#define _LBOOL_H_
+#ifndef LBOOL_H_
+#define LBOOL_H_
 
 #include"util.h"
 
@@ -38,5 +38,5 @@ std::ostream & operator<<(std::ostream & out, lbool b);
 */
 char const * to_sat_str(lbool l);
 
-#endif /* _LBOOL_H_ */
+#endif /* LBOOL_H_ */
 
diff --git a/src/util/list.h b/src/util/list.h
index 931962dfd..8d5ff40f2 100644
--- a/src/util/list.h
+++ b/src/util/list.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _LIST_H_
-#define _LIST_H_
+#ifndef LIST_H_
+#define LIST_H_
 
 #include"buffer.h"
 #include"region.h"
@@ -92,5 +92,5 @@ list<T> * append(region & r, list<T> * l1, list<T> * l2) {
     return result;
 }
 
-#endif /* _LIST_H_ */
+#endif /* LIST_H_ */
 
diff --git a/src/util/luby.h b/src/util/luby.h
index 2931cde10..1b0716f33 100644
--- a/src/util/luby.h
+++ b/src/util/luby.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _LUBY_H_
-#define _LUBY_H_
+#ifndef LUBY_H_
+#define LUBY_H_
 
 /**
    \brief Return the i-th element of the Luby sequence: 1,1,2,1,1,2,4,1,1,2,1,1,2,4,8,...
@@ -27,5 +27,5 @@ Revision History:
 */
 unsigned get_luby(unsigned i);
 
-#endif /* _LUBY_H_ */
+#endif /* LUBY_H_ */
 
diff --git a/src/util/machine.h b/src/util/machine.h
index 75dfde7a4..70baee41e 100644
--- a/src/util/machine.h
+++ b/src/util/machine.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef _MACHINE_H_
-#define _MACHINE_H_
+#ifndef MACHINE_H_
+#define MACHINE_H_
 
 #ifdef _AMD64_
 #define PTR_ALIGNMENT 3
@@ -26,5 +26,5 @@ Revision History:
 #define PTR_ALIGNMENT 2
 #endif
 
-#endif /* _MACHINE_H_ */
+#endif /* MACHINE_H_ */
 
diff --git a/src/util/map.h b/src/util/map.h
index 4640eb111..d9dc4463c 100644
--- a/src/util/map.h
+++ b/src/util/map.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MAP_H_
-#define _MAP_H_
+#ifndef MAP_H_
+#define MAP_H_
 
 #include"hashtable.h"
 
diff --git a/src/util/memory_manager.h b/src/util/memory_manager.h
index 94865fa90..34aee9d6e 100644
--- a/src/util/memory_manager.h
+++ b/src/util/memory_manager.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MEMORY_H_
-#define _MEMORY_H_
+#ifndef MEMORY_H_
+#define MEMORY_H_
 
 #include<cstdlib>
 #include<ostream>
@@ -132,5 +132,5 @@ void dealloc_svect(T * ptr) {
 }
 
 
-#endif /* _MEMORY_H_ */
+#endif /* MEMORY_H_ */
 
diff --git a/src/util/mpbq.h b/src/util/mpbq.h
index 85332d02f..a6c7ddbfa 100644
--- a/src/util/mpbq.h
+++ b/src/util/mpbq.h
@@ -24,8 +24,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MPBQ_H_
-#define _MPBQ_H_
+#ifndef MPBQ_H_
+#define MPBQ_H_
 
 #include"mpq.h"
 #include"rational.h"
diff --git a/src/util/mpbqi.h b/src/util/mpbqi.h
index 8a9171072..0dc569525 100644
--- a/src/util/mpbqi.h
+++ b/src/util/mpbqi.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MPBQI_H_
-#define _MPBQI_H_
+#ifndef MPBQI_H_
+#define MPBQI_H_
 
 #include"mpbq.h"
 #include"basic_interval.h"
diff --git a/src/util/mpf.h b/src/util/mpf.h
index 63e0ed000..b99f8ab08 100644
--- a/src/util/mpf.h
+++ b/src/util/mpf.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MPF_H_
-#define _MPF_H_
+#ifndef MPF_H_
+#define MPF_H_
 
 #include<string>
 #include"mpz.h"
diff --git a/src/util/mpff.h b/src/util/mpff.h
index ef488c934..a4cab898c 100644
--- a/src/util/mpff.h
+++ b/src/util/mpff.h
@@ -20,8 +20,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MPFF_H_
-#define _MPFF_H_
+#ifndef MPFF_H_
+#define MPFF_H_
 
 #include"id_gen.h"
 #include"util.h"
diff --git a/src/util/mpfx.h b/src/util/mpfx.h
index f152128d8..55242bdf8 100644
--- a/src/util/mpfx.h
+++ b/src/util/mpfx.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MPFX_H_
-#define _MPFX_H_
+#ifndef MPFX_H_
+#define MPFX_H_
 
 #include"id_gen.h"
 #include"util.h"
diff --git a/src/util/mpn.h b/src/util/mpn.h
index c5566bf7e..1f0e2acab 100644
--- a/src/util/mpn.h
+++ b/src/util/mpn.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MPN_H_
-#define _MPN_H_
+#ifndef MPN_H_
+#define MPN_H_
 
 #include<ostream>
 #include"util.h"
diff --git a/src/util/mpq.h b/src/util/mpq.h
index 0c94936ba..0a643c650 100644
--- a/src/util/mpq.h
+++ b/src/util/mpq.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MPQ_H_
-#define _MPQ_H_
+#ifndef MPQ_H_
+#define MPQ_H_
 
 #include"mpz.h"
 #include"trace.h"
@@ -845,5 +845,5 @@ typedef _scoped_numeral<unsynch_mpq_manager> scoped_mpq;
 typedef _scoped_numeral<synch_mpq_manager> scoped_synch_mpq;
 typedef _scoped_numeral_vector<unsynch_mpq_manager> scoped_mpq_vector;
 
-#endif /* _MPQ_H_ */
+#endif /* MPQ_H_ */
 
diff --git a/src/util/mpq_inf.h b/src/util/mpq_inf.h
index 640c827ae..b041b6d4f 100644
--- a/src/util/mpq_inf.h
+++ b/src/util/mpq_inf.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MPQ_INF_H_
-#define _MPQ_INF_H_
+#ifndef MPQ_INF_H_
+#define MPQ_INF_H_
 
 #include"mpq.h"
 #include"hash.h"
diff --git a/src/util/mpz.h b/src/util/mpz.h
index 05e87886d..9cb27ebff 100644
--- a/src/util/mpz.h
+++ b/src/util/mpz.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _MPZ_H_
-#define _MPZ_H_
+#ifndef MPZ_H_
+#define MPZ_H_
 
 #include<limits.h>
 #include<string>
@@ -831,5 +831,5 @@ typedef _scoped_numeral<unsynch_mpz_manager> scoped_mpz;
 typedef _scoped_numeral<synch_mpz_manager> scoped_synch_mpz;
 typedef _scoped_numeral_vector<unsynch_mpz_manager> scoped_mpz_vector;
 
-#endif /* _MPZ_H_ */
+#endif /* MPZ_H_ */
 
diff --git a/src/util/mpzzp.h b/src/util/mpzzp.h
index a81c5d204..812b6e1bc 100644
--- a/src/util/mpzzp.h
+++ b/src/util/mpzzp.h
@@ -23,8 +23,8 @@ Revision History:
     In the future, it will replace it.
 
 --*/
-#ifndef _MPZZP_H_
-#define _MPZZP_H_
+#ifndef MPZZP_H_
+#define MPZZP_H_
 
 #include "mpz.h"
 
diff --git a/src/util/nat_set.h b/src/util/nat_set.h
index eb091fc61..dcde26034 100644
--- a/src/util/nat_set.h
+++ b/src/util/nat_set.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _NAT_SET_H_
-#define _NAT_SET_H_
+#ifndef NAT_SET_H_
+#define NAT_SET_H_
 
 #include<limits.h>
 #include"vector.h"
@@ -84,5 +84,5 @@ public:
     }
 };
 
-#endif /* _NAT_SET_H_ */
+#endif /* NAT_SET_H_ */
 
diff --git a/src/util/numeral_buffer.h b/src/util/numeral_buffer.h
index 236e2f623..3c2ea0f05 100644
--- a/src/util/numeral_buffer.h
+++ b/src/util/numeral_buffer.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _NUMERAL_BUFFER_H_
-#define _NUMERAL_BUFFER_H_
+#ifndef NUMERAL_BUFFER_H_
+#define NUMERAL_BUFFER_H_
 
 #include"vector.h"
 
diff --git a/src/util/obj_hashtable.h b/src/util/obj_hashtable.h
index 8ff5f8e8f..4e948d96d 100644
--- a/src/util/obj_hashtable.h
+++ b/src/util/obj_hashtable.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _OBJ_HASHTABLE_H_
-#define _OBJ_HASHTABLE_H_
+#ifndef OBJ_HASHTABLE_H_
+#define OBJ_HASHTABLE_H_
 
 #include"hash.h"
 #include"hashtable.h"
@@ -223,5 +223,5 @@ void erase_dealloc_value(obj_map<Key, Value*> & m, Key * k) {
     }
 }
 
-#endif /* _OBJ_HASHTABLE_H_ */
+#endif /* OBJ_HASHTABLE_H_ */
 
diff --git a/src/util/obj_mark.h b/src/util/obj_mark.h
index 739989d9e..749122b8f 100644
--- a/src/util/obj_mark.h
+++ b/src/util/obj_mark.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _OBJ_MARK_H_
-#define _OBJ_MARK_H_
+#ifndef OBJ_MARK_H_
+#define OBJ_MARK_H_
 
 #include"bit_vector.h"
 
@@ -50,4 +50,4 @@ public:
     void reset() { m_marks.reset(); }
 };
 
-#endif /* _OBJ_MARK_H_ */
+#endif /* OBJ_MARK_H_ */
diff --git a/src/util/obj_pair_hashtable.h b/src/util/obj_pair_hashtable.h
index 47132b14f..8e7365909 100644
--- a/src/util/obj_pair_hashtable.h
+++ b/src/util/obj_pair_hashtable.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _OBJ_PAIR_HASHTABLE_H_
-#define _OBJ_PAIR_HASHTABLE_H_
+#ifndef OBJ_PAIR_HASHTABLE_H_
+#define OBJ_PAIR_HASHTABLE_H_
 
 #include"hash.h"
 #include"hashtable.h"
@@ -170,5 +170,5 @@ public:
     }
 };
 
-#endif /* _OBJ_PAIR_HASHTABLE_H_ */
+#endif /* OBJ_PAIR_HASHTABLE_H_ */
 
diff --git a/src/util/obj_pair_set.h b/src/util/obj_pair_set.h
index 2ec6a402f..4c8ed698a 100644
--- a/src/util/obj_pair_set.h
+++ b/src/util/obj_pair_set.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _OBJ_PAIR_SET_H_
-#define _OBJ_PAIR_SET_H_
+#ifndef OBJ_PAIR_SET_H_
+#define OBJ_PAIR_SET_H_
 
 #include"chashtable.h"
 
diff --git a/src/util/obj_ref.h b/src/util/obj_ref.h
index 194f1b46f..1aa562a8f 100644
--- a/src/util/obj_ref.h
+++ b/src/util/obj_ref.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _OBJ_REF_H_
-#define _OBJ_REF_H_
+#ifndef OBJ_REF_H_
+#define OBJ_REF_H_
 
 /**
    Smart pointer for T objects.
@@ -136,4 +136,4 @@ inline void dec_range_ref(IT const & begin, IT const & end, TManager & m) {
     }
 }
 
-#endif /* _OBJ_REF_H_ */
+#endif /* OBJ_REF_H_ */
diff --git a/src/util/obj_triple_hashtable.h b/src/util/obj_triple_hashtable.h
index 6a5361afe..4fda9e655 100644
--- a/src/util/obj_triple_hashtable.h
+++ b/src/util/obj_triple_hashtable.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _OBJ_TRIPLE_HASHTABLE_H_
-#define _OBJ_TRIPLE_HASHTABLE_H_
+#ifndef OBJ_TRIPLE_HASHTABLE_H_
+#define OBJ_TRIPLE_HASHTABLE_H_
 
 #include"hashtable.h"
 
@@ -176,5 +176,5 @@ public:
     }
 };
 
-#endif /* _OBJ_TRIPLE_HASHTABLE_H_ */
+#endif /* OBJ_TRIPLE_HASHTABLE_H_ */
 
diff --git a/src/util/object_allocator.h b/src/util/object_allocator.h
index db8a149c1..901ec46ec 100644
--- a/src/util/object_allocator.h
+++ b/src/util/object_allocator.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _OBJECT_ALLOCATOR_H_
-#define _OBJECT_ALLOCATOR_H_
+#ifndef OBJECT_ALLOCATOR_H_
+#define OBJECT_ALLOCATOR_H_
 
 #include"util.h"
 #include"vector.h"
@@ -285,5 +285,5 @@ public:
 
 };
 
-#endif /* _OBJECT_ALLOCATOR_H_ */
+#endif /* OBJECT_ALLOCATOR_H_ */
 
diff --git a/src/util/optional.h b/src/util/optional.h
index 3a020c034..22757f3bd 100644
--- a/src/util/optional.h
+++ b/src/util/optional.h
@@ -18,8 +18,8 @@ Revision History:
 
 --*/
 
-#ifndef _OPTIONAL_H_
-#define _OPTIONAL_H_
+#ifndef OPTIONAL_H_
+#define OPTIONAL_H_
 
 template<typename T>
 class optional {
@@ -161,5 +161,5 @@ public:
 };
 
 
-#endif /* _OPTIONAL_H_ */
+#endif /* OPTIONAL_H_ */
 
diff --git a/src/util/page.h b/src/util/page.h
index 2c8527497..4ccfb6cab 100644
--- a/src/util/page.h
+++ b/src/util/page.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PAGE_H_
-#define _PAGE_H_
+#ifndef PAGE_H_
+#define PAGE_H_
 
 #include"memory_manager.h"
 
diff --git a/src/util/params.h b/src/util/params.h
index e4a2b3693..8d95c200c 100644
--- a/src/util/params.h
+++ b/src/util/params.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _PARAMS_H_
-#define _PARAMS_H_
+#ifndef PARAMS_H_
+#define PARAMS_H_
 
 #include"cmd_context_types.h"
 #include"vector.h"
diff --git a/src/util/parray.h b/src/util/parray.h
index ace2d9913..1802f6ade 100644
--- a/src/util/parray.h
+++ b/src/util/parray.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PARRAY_H_
-#define _PARRAY_H_
+#ifndef PARRAY_H_
+#define PARRAY_H_
 
 #include"vector.h"
 #include"trace.h"
diff --git a/src/util/permutation.h b/src/util/permutation.h
index 29e17cf68..45759fc01 100644
--- a/src/util/permutation.h
+++ b/src/util/permutation.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PERMUTATION_H_
-#define _PERMUTATION_H_
+#ifndef PERMUTATION_H_
+#define PERMUTATION_H_
 
 #include<iostream>
 #include"vector.h"
diff --git a/src/util/plugin_manager.h b/src/util/plugin_manager.h
index b9abd0315..5e82c190c 100644
--- a/src/util/plugin_manager.h
+++ b/src/util/plugin_manager.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PLUGIN_MANAGER_H_
-#define _PLUGIN_MANAGER_H_
+#ifndef PLUGIN_MANAGER_H_
+#define PLUGIN_MANAGER_H_
 
 #include"util.h"
 
@@ -62,5 +62,5 @@ public:
     }
 };
 
-#endif /* _PLUGIN_MANAGER_H_ */
+#endif /* PLUGIN_MANAGER_H_ */
 
diff --git a/src/util/pool.h b/src/util/pool.h
index bc79a0828..3ea9dca9d 100644
--- a/src/util/pool.h
+++ b/src/util/pool.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _POOL_H_
-#define _POOL_H_
+#ifndef POOL_H_
+#define POOL_H_
 
 #include"util.h"
 #include"vector.h"
@@ -46,5 +46,5 @@ public:
     }
 };
 
-#endif /* _POOL_H_ */
+#endif /* POOL_H_ */
 
diff --git a/src/util/pop_scopes.h b/src/util/pop_scopes.h
index 1871d4682..0fa612be7 100644
--- a/src/util/pop_scopes.h
+++ b/src/util/pop_scopes.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _POP_SCOPES_H_
-#define _POP_SCOPES_H_
+#ifndef POP_SCOPES_H_
+#define POP_SCOPES_H_
 
 #define POP_SCOPES(_num_scopes, _lim, _trail, _action)          \
     if (_num_scopes > 0)                                        \
@@ -33,5 +33,5 @@ Revision History:
         _lim.shrink(new_lvl);                                   \
     }
 
-#endif /* _POP_SCOPES_H_ */
+#endif /* POP_SCOPES_H_ */
 
diff --git a/src/util/prime_generator.h b/src/util/prime_generator.h
index d63fdb224..44306cec5 100644
--- a/src/util/prime_generator.h
+++ b/src/util/prime_generator.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _PRIME_GENERATOR_H_
-#define _PRIME_GENERATOR_H_
+#ifndef PRIME_GENERATOR_H_
+#define PRIME_GENERATOR_H_
 
 #include"vector.h"
 #include"z3_exception.h"
diff --git a/src/util/ptr_scoped_buffer.h b/src/util/ptr_scoped_buffer.h
index 43a9eb19c..aa66a0398 100644
--- a/src/util/ptr_scoped_buffer.h
+++ b/src/util/ptr_scoped_buffer.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _PTR_SCOPED_BUFFER_H_
-#define _PTR_SCOPED_BUFFER_H_
+#ifndef PTR_SCOPED_BUFFER_H_
+#define PTR_SCOPED_BUFFER_H_
 
 #include"util.h"
 #include"debug.h"
diff --git a/src/util/rational.h b/src/util/rational.h
index 379f4868c..fc25837c6 100644
--- a/src/util/rational.h
+++ b/src/util/rational.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _RATIONAL_H_
-#define _RATIONAL_H_
+#ifndef RATIONAL_H_
+#define RATIONAL_H_
 
 #include"mpq.h"
 
@@ -457,5 +457,5 @@ inline rational gcd(rational const & r1, rational const & r2, rational & a, rati
 }
 
 
-#endif /* _RATIONAL_H_ */
+#endif /* RATIONAL_H_ */
 
diff --git a/src/util/ref.h b/src/util/ref.h
index 5b56b4d24..d9663f9a4 100644
--- a/src/util/ref.h
+++ b/src/util/ref.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _REF_H_
-#define _REF_H_
+#ifndef REF_H_
+#define REF_H_
 
 template<typename T>
 class ref {
@@ -120,5 +120,5 @@ class unmanged_ref_manager {
     static void dec_ref(T * o) { o->dec_ref(); }
 };
 
-#endif /* _REF_H_ */
+#endif /* REF_H_ */
 
diff --git a/src/util/ref_buffer.h b/src/util/ref_buffer.h
index a539db689..cd4e0c5ba 100644
--- a/src/util/ref_buffer.h
+++ b/src/util/ref_buffer.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _REF_BUFFER_H_
-#define _REF_BUFFER_H_
+#ifndef REF_BUFFER_H_
+#define REF_BUFFER_H_
 
 #include"buffer.h"
 #include"obj_ref.h"
@@ -171,4 +171,4 @@ class sref_buffer : public ref_buffer_core<T, ref_unmanaged_wrapper<T>, INITIAL_
 public:
 };
 
-#endif /* _REF_BUFFER_H_ */
+#endif /* REF_BUFFER_H_ */
diff --git a/src/util/ref_util.h b/src/util/ref_util.h
index fff315b50..ade7accad 100644
--- a/src/util/ref_util.h
+++ b/src/util/ref_util.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _REF_UTIL_H_
-#define _REF_UTIL_H_
+#ifndef REF_UTIL_H_
+#define REF_UTIL_H_
 
 /**
    \brief Decrement the reference counter of the keys and values stored in the map,
diff --git a/src/util/ref_vector.h b/src/util/ref_vector.h
index 3a4f7dd7f..b651a555d 100644
--- a/src/util/ref_vector.h
+++ b/src/util/ref_vector.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _REF_VECTOR_H_
-#define _REF_VECTOR_H_
+#ifndef REF_VECTOR_H_
+#define REF_VECTOR_H_
 
 #include"vector.h"
 #include"obj_ref.h"
@@ -351,4 +351,4 @@ struct ref_vector_ptr_eq {
 };
 
 
-#endif /* _REF_VECTOR_H_ */
+#endif /* REF_VECTOR_H_ */
diff --git a/src/util/region.h b/src/util/region.h
index 5be2ae4d3..2c43e26d4 100644
--- a/src/util/region.h
+++ b/src/util/region.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _REGION_H_
-#define _REGION_H_
+#ifndef REGION_H_
+#define REGION_H_
 #include<cstdlib>
 #include<iostream>
 
@@ -118,5 +118,5 @@ inline void operator delete(void *, region & ) { /* do nothing */ }
 
 inline void operator delete[](void *, region & ) { /* do nothing */ }
 
-#endif /* _REGION_H_ */
+#endif /* REGION_H_ */
 
diff --git a/src/util/resource_limit.h b/src/util/resource_limit.h
index 06d059bcf..3f5c4d520 100644
--- a/src/util/resource_limit.h
+++ b/src/util/resource_limit.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _RESOURCE_LIMIT_H_
-#define _RESOURCE_LIMIT_H_
+#ifndef RESOURCE_LIMIT_H_
+#define RESOURCE_LIMIT_H_
 
 //
 // This object is used to limit the availability of "resources" during a search.
@@ -164,5 +164,5 @@ public:
 };
     
 
-#endif /* _RESOURCE_LIMIT_H_ */
+#endif /* RESOURCE_LIMIT_H_ */
 
diff --git a/src/util/s_integer.h b/src/util/s_integer.h
index 92321a7c3..c215505ea 100644
--- a/src/util/s_integer.h
+++ b/src/util/s_integer.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _S_INTEGER_H_
-#define _S_INTEGER_H_
+#ifndef S_INTEGER_H_
+#define S_INTEGER_H_
 
 #include"rational.h"
 
@@ -145,5 +145,5 @@ inline s_integer abs(const s_integer & r) {
     return result;
 }
 
-#endif /* _S_INTEGER_H_ */
+#endif /* S_INTEGER_H_ */
 
diff --git a/src/util/scoped_ctrl_c.h b/src/util/scoped_ctrl_c.h
index b3102dda0..4459362ac 100644
--- a/src/util/scoped_ctrl_c.h
+++ b/src/util/scoped_ctrl_c.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SCOPED_CTRL_C_H_
-#define _SCOPED_CTRL_C_H_
+#ifndef SCOPED_CTRL_C_H_
+#define SCOPED_CTRL_C_H_
 
 #include"event_handler.h"
 
diff --git a/src/util/scoped_numeral.h b/src/util/scoped_numeral.h
index 0023be7e2..2c80c4703 100644
--- a/src/util/scoped_numeral.h
+++ b/src/util/scoped_numeral.h
@@ -17,8 +17,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SCOPED_NUMERAL_H_
-#define _SCOPED_NUMERAL_H_
+#ifndef SCOPED_NUMERAL_H_
+#define SCOPED_NUMERAL_H_
 
 template<typename Manager>
 class _scoped_numeral {
diff --git a/src/util/scoped_numeral_buffer.h b/src/util/scoped_numeral_buffer.h
index 7a9d8ef96..6da287dd2 100644
--- a/src/util/scoped_numeral_buffer.h
+++ b/src/util/scoped_numeral_buffer.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SCOPED_NUMERAL_BUFFER_H_
-#define _SCOPED_NUMERAL_BUFFER_H_
+#ifndef SCOPED_NUMERAL_BUFFER_H_
+#define SCOPED_NUMERAL_BUFFER_H_
 
 #include"buffer.h"
 
diff --git a/src/util/scoped_numeral_vector.h b/src/util/scoped_numeral_vector.h
index f982a7cae..bbd06f898 100644
--- a/src/util/scoped_numeral_vector.h
+++ b/src/util/scoped_numeral_vector.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SCOPED_NUMERAL_VECTOR_H_
-#define _SCOPED_NUMERAL_VECTOR_H_
+#ifndef SCOPED_NUMERAL_VECTOR_H_
+#define SCOPED_NUMERAL_VECTOR_H_
 
 #include"vector.h"
 
diff --git a/src/util/scoped_ptr_vector.h b/src/util/scoped_ptr_vector.h
index 24b501693..6e1c26f7d 100644
--- a/src/util/scoped_ptr_vector.h
+++ b/src/util/scoped_ptr_vector.h
@@ -17,8 +17,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _SCOPED_PTR_VECTOR_H_
-#define _SCOPED_PTR_VECTOR_H_
+#ifndef SCOPED_PTR_VECTOR_H_
+#define SCOPED_PTR_VECTOR_H_
 
 #include"vector.h"
 #include"util.h"
diff --git a/src/util/scoped_timer.h b/src/util/scoped_timer.h
index 68df09f9f..a3e2568f9 100644
--- a/src/util/scoped_timer.h
+++ b/src/util/scoped_timer.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SCOPED_TIMER_H_
-#define _SCOPED_TIMER_H_
+#ifndef SCOPED_TIMER_H_
+#define SCOPED_TIMER_H_
 
 #include"event_handler.h"
 
diff --git a/src/util/sexpr.h b/src/util/sexpr.h
index 2268d97be..350c1ffec 100644
--- a/src/util/sexpr.h
+++ b/src/util/sexpr.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _SEXPR_H_
-#define _SEXPR_H_
+#ifndef SEXPR_H_
+#define SEXPR_H_
 
 #include"rational.h"
 #include"symbol.h"
diff --git a/src/util/small_object_allocator.h b/src/util/small_object_allocator.h
index 957c4f475..9433b093e 100644
--- a/src/util/small_object_allocator.h
+++ b/src/util/small_object_allocator.h
@@ -17,8 +17,8 @@ Revision History:
     Leonardo de Moura (leonardo) 2011-04-27
     Rewrote/Simplified the allocator
 --*/
-#ifndef _SMALL_OBJECT_ALLOCATOR_H_
-#define _SMALL_OBJECT_ALLOCATOR_H_
+#ifndef SMALL_OBJECT_ALLOCATOR_H_
+#define SMALL_OBJECT_ALLOCATOR_H_
 
 #include"machine.h"
 #include"debug.h"
@@ -56,5 +56,5 @@ inline void * operator new[](size_t s, small_object_allocator & r) { return r.al
 inline void operator delete(void * p, small_object_allocator & r) { UNREACHABLE(); }
 inline void operator delete[](void * p, small_object_allocator & r) { UNREACHABLE(); }
 
-#endif /* _SMALL_OBJECT_ALLOCATOR_H_ */
+#endif /* SMALL_OBJECT_ALLOCATOR_H_ */
 
diff --git a/src/util/smt2_util.h b/src/util/smt2_util.h
index c2ab4a727..bddef03fb 100644
--- a/src/util/smt2_util.h
+++ b/src/util/smt2_util.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _SMT2_UTIL_H_
-#define _SMT2_UTIL_H_
+#ifndef SMT2_UTIL_H_
+#define SMT2_UTIL_H_
 
 #include"symbol.h"
 
diff --git a/src/util/sorting_network.h b/src/util/sorting_network.h
index ee01d2cd2..b106117ea 100644
--- a/src/util/sorting_network.h
+++ b/src/util/sorting_network.h
@@ -21,8 +21,8 @@ Notes:
 
 #include "vector.h"
 
-#ifndef _SORTING_NETWORK_H_
-#define _SORTING_NETWORK_H_
+#ifndef SORTING_NETWORK_H_
+#define SORTING_NETWORK_H_
 
 
     template <typename Ext>
diff --git a/src/util/stack.h b/src/util/stack.h
index deab2f273..a2605edcc 100644
--- a/src/util/stack.h
+++ b/src/util/stack.h
@@ -15,8 +15,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _STACK_H_
-#define _STACK_H_
+#ifndef STACK_H_
+#define STACK_H_
 
 #include"page.h"
 #include"debug.h"
diff --git a/src/util/statistics.h b/src/util/statistics.h
index 676c6b744..258ffbe29 100644
--- a/src/util/statistics.h
+++ b/src/util/statistics.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _STATISTICS_H_
-#define _STATISTICS_H_
+#ifndef STATISTICS_H_
+#define STATISTICS_H_
 
 #include<iostream>
 #include"vector.h"
diff --git a/src/util/stats.h b/src/util/stats.h
index bd88a9e7a..0acc18f43 100644
--- a/src/util/stats.h
+++ b/src/util/stats.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef __STATS_H_
-#define __STATS_H_
+#ifndef STATS_H_
+#define STATS_H_
 
 #include<ostream>
 
diff --git a/src/util/stopwatch.h b/src/util/stopwatch.h
index 2b3c24911..b1f6bba03 100644
--- a/src/util/stopwatch.h
+++ b/src/util/stopwatch.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef _STOPWATCH_H_
-#define _STOPWATCH_H_
+#ifndef STOPWATCH_H_
+#define STOPWATCH_H_
 
 #if defined(_WINDOWS) || defined(_CYGWIN)
 
diff --git a/src/util/str_hashtable.h b/src/util/str_hashtable.h
index f798494b2..2cfc2856c 100644
--- a/src/util/str_hashtable.h
+++ b/src/util/str_hashtable.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _STR_HASHTABLE_H_
-#define _STR_HASHTABLE_H_
+#ifndef STR_HASHTABLE_H_
+#define STR_HASHTABLE_H_
 
 #include<string.h>
 
@@ -30,5 +30,5 @@ struct str_hash_proc {
 struct str_eq_proc { bool operator()(char const * s1, char const * s2) const { return strcmp(s1, s2) == 0; } }; 
 typedef ptr_hashtable<char, str_hash_proc, str_eq_proc> str_hashtable;
 
-#endif /* _STR_HASHTABLE_H_ */
+#endif /* STR_HASHTABLE_H_ */
 
diff --git a/src/util/stream_buffer.h b/src/util/stream_buffer.h
index 976ecffab..1afe22e21 100644
--- a/src/util/stream_buffer.h
+++ b/src/util/stream_buffer.h
@@ -18,8 +18,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _STREAM_BUFFER_H_
-#define _STREAM_BUFFER_H_
+#ifndef STREAM_BUFFER_H_
+#define STREAM_BUFFER_H_
 
 #include<iostream>
 
@@ -42,5 +42,5 @@ public:
     }
 };
 
-#endif /* _STREAM_BUFFER_H_ */
+#endif /* STREAM_BUFFER_H_ */
 
diff --git a/src/util/string_buffer.h b/src/util/string_buffer.h
index 2583f0a2e..a1607f5c4 100644
--- a/src/util/string_buffer.h
+++ b/src/util/string_buffer.h
@@ -16,8 +16,8 @@
   Revision History:
 
   --*/
-#ifndef _STRING_BUFFER_H_
-#define _STRING_BUFFER_H_
+#ifndef STRING_BUFFER_H_
+#define STRING_BUFFER_H_
 
 #include<cstdio>
 #include<string>
diff --git a/src/util/symbol.h b/src/util/symbol.h
index 65325b461..d0eef4f3b 100644
--- a/src/util/symbol.h
+++ b/src/util/symbol.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SYMBOL_H_
-#define _SYMBOL_H_
+#ifndef SYMBOL_H_
+#define SYMBOL_H_
 #include<ostream>
 #include<limits.h>
 
@@ -152,5 +152,5 @@ void finalize_symbols();
 // two non-numerical symbols are compared using string comparison.
 bool lt(symbol const & s1, symbol const & s2);
 
-#endif /* _SYMBOL_H_ */
+#endif /* SYMBOL_H_ */
 
diff --git a/src/util/symbol_table.h b/src/util/symbol_table.h
index 8f2cdc631..d3be2cb9c 100644
--- a/src/util/symbol_table.h
+++ b/src/util/symbol_table.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _SYMBOL_TABLE_H_
-#define _SYMBOL_TABLE_H_
+#ifndef SYMBOL_TABLE_H_
+#define SYMBOL_TABLE_H_
 #include"vector.h"
 #include"hashtable.h"
 #include"hash.h"
@@ -209,5 +209,5 @@ public:
     }
 };
 
-#endif /* _SYMBOL_TABLE_H_ */
+#endif /* SYMBOL_TABLE_H_ */
 
diff --git a/src/util/timeit.h b/src/util/timeit.h
index 9da7e7d84..e3b07db84 100644
--- a/src/util/timeit.h
+++ b/src/util/timeit.h
@@ -19,8 +19,8 @@ Revision History:
     Rewrote using stopwatches, added support for tracking memory
 
 --*/
-#ifndef _TIMEIT_H_
-#define _TIMEIT_H_
+#ifndef TIMEIT_H_
+#define TIMEIT_H_
 
 class timeit {
     struct imp;
diff --git a/src/util/timeout.h b/src/util/timeout.h
index a50b25918..1dabd5e98 100644
--- a/src/util/timeout.h
+++ b/src/util/timeout.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _TIMEOUT_H_
-#define _TIMEOUT_H_
+#ifndef TIMEOUT_H_
+#define TIMEOUT_H_
 
 void register_on_timeout_proc(void (*proc)());
 
diff --git a/src/util/timer.h b/src/util/timer.h
index 784712593..cc082a9d8 100644
--- a/src/util/timer.h
+++ b/src/util/timer.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _TIMER_H_
-#define _TIMER_H_
+#ifndef TIMER_H_
+#define TIMER_H_
 
 class stopwatch;
 
@@ -35,5 +35,5 @@ public:
     bool ms_timeout(unsigned ms) { return ms > 0 && get_seconds() * 1000 > ms; }
 };
 
-#endif /* _TIMER_H_ */
+#endif /* TIMER_H_ */
 
diff --git a/src/util/total_order.h b/src/util/total_order.h
index 84b04b416..7238a5ef9 100644
--- a/src/util/total_order.h
+++ b/src/util/total_order.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _TOTAL_ORDER_H_
-#define _TOTAL_ORDER_H_
+#ifndef TOTAL_ORDER_H_
+#define TOTAL_ORDER_H_
 
 #include"util.h"
 #include"small_object_allocator.h"
@@ -411,5 +411,5 @@ std::ostream & operator<<(std::ostream & out, total_order<T, Map> const & to) {
 }
 
 
-#endif /* _TOTAL_ORDER_H_ */
+#endif /* TOTAL_ORDER_H_ */
 
diff --git a/src/util/tptr.h b/src/util/tptr.h
index 887a7d3c3..23c28078b 100644
--- a/src/util/tptr.h
+++ b/src/util/tptr.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef _TPTR_H_
-#define _TPTR_H_
+#ifndef TPTR_H_
+#define TPTR_H_
 
 #include"machine.h"
 
@@ -42,5 +42,5 @@ Revision History:
 
 #define UNBOXINT(PTR) static_cast<int>(reinterpret_cast<size_t>(PTR) >> PTR_ALIGNMENT)
 
-#endif /* _TPTR_H_ */
+#endif /* TPTR_H_ */
 
diff --git a/src/util/trace.h b/src/util/trace.h
index e92eb9d44..789beafc1 100644
--- a/src/util/trace.h
+++ b/src/util/trace.h
@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#ifndef _TRACE_H_
-#define _TRACE_H_
+#ifndef TRACE_H_
+#define TRACE_H_
 
 #ifdef _CYGWIN
 #undef max
@@ -54,5 +54,5 @@ void finalize_trace();
 
 #define CTRACE(TAG, COND, CODE) TRACE_CODE(if (is_trace_enabled(TAG) && (COND)) { tout << "-------- [" << TAG << "] " << __FUNCTION__ << " " << __FILE__ << ":" << __LINE__ << " ---------\n"; CODE tout << "------------------------------------------------\n"; tout.flush(); })
 
-#endif /* _TRACE_H_ */
+#endif /* TRACE_H_ */
 
diff --git a/src/util/trail.h b/src/util/trail.h
index 116b3241e..56c3d805f 100644
--- a/src/util/trail.h
+++ b/src/util/trail.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _TRAIL_H_
-#define _TRAIL_H_
+#ifndef TRAIL_H_
+#define TRAIL_H_
 
 #include"obj_hashtable.h"
 #include"region.h"
@@ -356,5 +356,5 @@ public:
     }
 };
 
-#endif /* _TRAIL_H_ */
+#endif /* TRAIL_H_ */
 
diff --git a/src/util/uint_map.h b/src/util/uint_map.h
index 07a7e579e..13e0a9db3 100644
--- a/src/util/uint_map.h
+++ b/src/util/uint_map.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _UINT_MAP_H_
-#define _UINT_MAP_H_
+#ifndef UINT_MAP_H_
+#define UINT_MAP_H_
 
 #include"vector.h"
 
@@ -56,5 +56,5 @@ public:
 };
 
 
-#endif /* _UINT_MAP_H_ */
+#endif /* UINT_MAP_H_ */
 
diff --git a/src/util/uint_set.h b/src/util/uint_set.h
index 7f202652f..aca73a5c5 100644
--- a/src/util/uint_set.h
+++ b/src/util/uint_set.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _UINT_SET_H_
-#define _UINT_SET_H_
+#ifndef UINT_SET_H_
+#define UINT_SET_H_
 
 #include"util.h"
 #include"vector.h"
@@ -239,5 +239,5 @@ inline std::ostream & operator<<(std::ostream & target, const uint_set & s) {
     return target;
 }
 
-#endif /* _UINT_SET_H_ */
+#endif /* UINT_SET_H_ */
 
diff --git a/src/util/union_find.h b/src/util/union_find.h
index 23d33a442..6f6cc7a3b 100644
--- a/src/util/union_find.h
+++ b/src/util/union_find.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _UNION_FIND_H_
-#define _UNION_FIND_H_
+#ifndef UNION_FIND_H_
+#define UNION_FIND_H_
 
 #include "trail.h"
 #include "trace.h"
@@ -239,5 +239,5 @@ class basic_union_find {
 };
 
 
-#endif /* _UNION_FIND_H_ */
+#endif /* UNION_FIND_H_ */
 
diff --git a/src/util/util.h b/src/util/util.h
index cbc19b759..029ab9ee4 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _UTIL_H_
-#define _UTIL_H_
+#ifndef UTIL_H_
+#define UTIL_H_
 
 #include"debug.h"
 #include"memory_manager.h"
@@ -406,5 +406,5 @@ inline size_t megabytes_to_bytes(unsigned mb) {
 
 void z3_bound_num_procs();
 
-#endif /* _UTIL_H_ */
+#endif /* UTIL_H_ */
 
diff --git a/src/util/vector.h b/src/util/vector.h
index dc08a63b3..0757be6e2 100644
--- a/src/util/vector.h
+++ b/src/util/vector.h
@@ -21,8 +21,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _VECTOR_H_
-#define _VECTOR_H_
+#ifndef VECTOR_H_
+#define VECTOR_H_
 
 #include"debug.h"
 #include<algorithm>
@@ -456,5 +456,5 @@ template<typename Hash>
 struct svector_hash : public vector_hash_tpl<Hash, svector<typename Hash::data> > {};
 
 
-#endif /* _VECTOR_H_ */
+#endif /* VECTOR_H_ */
 
diff --git a/src/util/warning.h b/src/util/warning.h
index a556bfb60..15f1a1757 100644
--- a/src/util/warning.h
+++ b/src/util/warning.h
@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#ifndef _WARNING_H_
-#define _WARNING_H_
+#ifndef WARNING_H_
+#define WARNING_H_
 #include<iostream>
 #include<stdarg.h>
 
@@ -56,5 +56,5 @@ public:
     }
 };
 
-#endif /* _WARNING_H_ */
+#endif /* WARNING_H_ */
 
diff --git a/src/util/z3_exception.h b/src/util/z3_exception.h
index d7311f806..8d0acda28 100644
--- a/src/util/z3_exception.h
+++ b/src/util/z3_exception.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _Z3_EXCEPTION_H_
-#define _Z3_EXCEPTION_H_
+#ifndef Z3_EXCEPTION_H_
+#define Z3_EXCEPTION_H_
 
 #include<string>
 
diff --git a/src/util/z3_omp.h b/src/util/z3_omp.h
index c63b23fc0..6c618192e 100644
--- a/src/util/z3_omp.h
+++ b/src/util/z3_omp.h
@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#ifndef _Z3_OMP_H
-#define _Z3_OMP_H
+#ifndef Z3_OMP_H_
+#define Z3_OMP_H_
 
 #ifndef _NO_OMP_
 #include<omp.h>