11 files changed, 33 insertions, 33 deletions
diff --git a/src/smt/command.h b/src/smt/command.h
index f3b17b318..68f9d1881 100644
--- a/src/smt/command.h
+++ b/src/smt/command.h
@@ -19,8 +19,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__COMMAND_H
-#define __CVC4__COMMAND_H
+#ifndef CVC4__COMMAND_H
+#define CVC4__COMMAND_H
 
 #include <iosfwd>
 #include <map>
@@ -1396,4 +1396,4 @@ class CVC4_PUBLIC DeclarationSequence : public CommandSequence
 
 } /* CVC4 namespace */
 
-#endif /* __CVC4__COMMAND_H */
+#endif /* CVC4__COMMAND_H */
diff --git a/src/smt/command_list.h b/src/smt/command_list.h
index 61226da41..0b1aaecf2 100644
--- a/src/smt/command_list.h
+++ b/src/smt/command_list.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__SMT__COMMAND_LIST_H
-#define __CVC4__SMT__COMMAND_LIST_H
+#ifndef CVC4__SMT__COMMAND_LIST_H
+#define CVC4__SMT__COMMAND_LIST_H
 
 #include "context/cdlist.h"
 
@@ -36,4 +36,4 @@ typedef context::CDList<Command*, CommandCleanup> CommandList;
 }/* CVC4::smt namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__SMT__COMMAND_LIST_H */
+#endif /* CVC4__SMT__COMMAND_LIST_H */
diff --git a/src/smt/dump.h b/src/smt/dump.h
index a68f712ca..4946341af 100644
--- a/src/smt/dump.h
+++ b/src/smt/dump.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__DUMP_H
-#define __CVC4__DUMP_H
+#ifndef CVC4__DUMP_H
+#define CVC4__DUMP_H
 
 #include "base/output.h"
 #include "smt/command.h"
@@ -110,4 +110,4 @@ extern DumpC DumpChannel CVC4_PUBLIC;
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__DUMP_H */
+#endif /* CVC4__DUMP_H */
diff --git a/src/smt/logic_exception.h b/src/smt/logic_exception.h
index 5b197a124..e5da2a6e8 100644
--- a/src/smt/logic_exception.h
+++ b/src/smt/logic_exception.h
@@ -19,8 +19,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__SMT__LOGIC_EXCEPTION_H
-#define __CVC4__SMT__LOGIC_EXCEPTION_H
+#ifndef CVC4__SMT__LOGIC_EXCEPTION_H
+#define CVC4__SMT__LOGIC_EXCEPTION_H
 
 #include "base/exception.h"
 
@@ -44,4 +44,4 @@ class CVC4_PUBLIC LogicException : public CVC4::Exception {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__SMT__LOGIC_EXCEPTION_H */
+#endif /* CVC4__SMT__LOGIC_EXCEPTION_H */
diff --git a/src/smt/logic_request.h b/src/smt/logic_request.h
index 4d2957f87..432d5469c 100644
--- a/src/smt/logic_request.h
+++ b/src/smt/logic_request.h
@@ -23,8 +23,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__LOGIC_REQUEST_H
-#define __CVC4__LOGIC_REQUEST_H
+#ifndef CVC4__LOGIC_REQUEST_H
+#define CVC4__LOGIC_REQUEST_H
 
 #include "expr/kind.h"
 
@@ -49,4 +49,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__LOGIC_REQUEST_H */
+#endif /* CVC4__LOGIC_REQUEST_H */
diff --git a/src/smt/managed_ostreams.h b/src/smt/managed_ostreams.h
index a78bf57ee..f495f8e72 100644
--- a/src/smt/managed_ostreams.h
+++ b/src/smt/managed_ostreams.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__MANAGED_OSTREAMS_H
-#define __CVC4__MANAGED_OSTREAMS_H
+#ifndef CVC4__MANAGED_OSTREAMS_H
+#define CVC4__MANAGED_OSTREAMS_H
 
 #include <ostream>
 
@@ -179,4 +179,4 @@ class ManagedReplayLogOstream : public ManagedOstream {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__MANAGED_OSTREAMS_H */
+#endif /* CVC4__MANAGED_OSTREAMS_H */
diff --git a/src/smt/model.h b/src/smt/model.h
index 214581778..b435fb5e2 100644
--- a/src/smt/model.h
+++ b/src/smt/model.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__MODEL_H
-#define __CVC4__MODEL_H
+#ifndef CVC4__MODEL_H
+#define CVC4__MODEL_H
 
 #include <iosfwd>
 #include <vector>
@@ -107,4 +107,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif  /* __CVC4__MODEL_H */
+#endif  /* CVC4__MODEL_H */
diff --git a/src/smt/model_core_builder.h b/src/smt/model_core_builder.h
index 1fbe9011a..0c179e287 100644
--- a/src/smt/model_core_builder.h
+++ b/src/smt/model_core_builder.h
@@ -14,8 +14,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__THEORY__MODEL_CORE_BUILDER_H
-#define __CVC4__THEORY__MODEL_CORE_BUILDER_H
+#ifndef CVC4__THEORY__MODEL_CORE_BUILDER_H
+#define CVC4__THEORY__MODEL_CORE_BUILDER_H
 
 #include <vector>
 
@@ -61,4 +61,4 @@ class ModelCoreBuilder
 
 }  // namespace CVC4
 
-#endif /* __CVC4__THEORY__MODEL_CORE_BUILDER_H */
+#endif /* CVC4__THEORY__MODEL_CORE_BUILDER_H */
diff --git a/src/smt/smt_engine.h b/src/smt/smt_engine.h
index 39264fb01..165e93997 100644
--- a/src/smt/smt_engine.h
+++ b/src/smt/smt_engine.h
@@ -16,8 +16,8 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__SMT_ENGINE_H
-#define __CVC4__SMT_ENGINE_H
+#ifndef CVC4__SMT_ENGINE_H
+#define CVC4__SMT_ENGINE_H
 
 #include <string>
 #include <vector>
@@ -1064,4 +1064,4 @@ class CVC4_PUBLIC SmtEngine {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__SMT_ENGINE_H */
+#endif /* CVC4__SMT_ENGINE_H */
diff --git a/src/smt/smt_engine_scope.h b/src/smt/smt_engine_scope.h
index b6db0c20c..d72d58caa 100644
--- a/src/smt/smt_engine_scope.h
+++ b/src/smt/smt_engine_scope.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__SMT__SMT_ENGINE_SCOPE_H
-#define __CVC4__SMT__SMT_ENGINE_SCOPE_H
+#ifndef CVC4__SMT__SMT_ENGINE_SCOPE_H
+#define CVC4__SMT__SMT_ENGINE_SCOPE_H
 
 #include "expr/node_manager.h"
 
@@ -56,4 +56,4 @@ public:
 }/* CVC4::smt namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4__SMT__SMT_ENGINE_SCOPE_H */
+#endif /* CVC4__SMT__SMT_ENGINE_SCOPE_H */
diff --git a/src/smt/update_ostream.h b/src/smt/update_ostream.h
index 30fb98c02..0427f4058 100644
--- a/src/smt/update_ostream.h
+++ b/src/smt/update_ostream.h
@@ -17,8 +17,8 @@
 
 #include "cvc4_private.h"
 
-#ifndef __CVC4__UPDATE_OSTREAM_H
-#define __CVC4__UPDATE_OSTREAM_H
+#ifndef CVC4__UPDATE_OSTREAM_H
+#define CVC4__UPDATE_OSTREAM_H
 
 #include <ostream>
 
@@ -121,4 +121,4 @@ class TraceOstreamUpdate : public OstreamUpdate {
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__UPDATE_OSTREAM_H */
+#endif /* CVC4__UPDATE_OSTREAM_H */