6 files changed, 18 insertions, 18 deletions
diff --git a/src/main/command_executor.h b/src/main/command_executor.h
index dde36a453..c71f4d7a5 100644
--- a/src/main/command_executor.h
+++ b/src/main/command_executor.h
@@ -12,8 +12,8 @@
  ** \brief An additional layer between commands and invoking them.
  **/
 
-#ifndef __CVC4__MAIN__COMMAND_EXECUTOR_H
-#define __CVC4__MAIN__COMMAND_EXECUTOR_H
+#ifndef CVC4__MAIN__COMMAND_EXECUTOR_H
+#define CVC4__MAIN__COMMAND_EXECUTOR_H
 
 #include <iosfwd>
 #include <string>
@@ -104,4 +104,4 @@ bool smtEngineInvoke(SmtEngine* smt, Command* cmd, std::ostream *out);
 }/* CVC4::main namespace */
 }/* CVC4 namespace */
 
-#endif  /* __CVC4__MAIN__COMMAND_EXECUTOR_H */
+#endif  /* CVC4__MAIN__COMMAND_EXECUTOR_H */
diff --git a/src/main/command_executor_portfolio.h b/src/main/command_executor_portfolio.h
index c35fdbcb1..ef3329ef5 100644
--- a/src/main/command_executor_portfolio.h
+++ b/src/main/command_executor_portfolio.h
@@ -15,8 +15,8 @@
  ** threads.
  **/
 
-#ifndef __CVC4__MAIN__COMMAND_EXECUTOR_PORTFOLIO_H
-#define __CVC4__MAIN__COMMAND_EXECUTOR_PORTFOLIO_H
+#ifndef CVC4__MAIN__COMMAND_EXECUTOR_PORTFOLIO_H
+#define CVC4__MAIN__COMMAND_EXECUTOR_PORTFOLIO_H
 
 #include "main/command_executor.h"
 #include "main/portfolio_util.h"
@@ -82,4 +82,4 @@ private:
 }/* CVC4::main namespace */
 }/* CVC4 namespace */
 
-#endif  /* __CVC4__MAIN__COMMAND_EXECUTOR_PORTFOLIO_H */
+#endif  /* CVC4__MAIN__COMMAND_EXECUTOR_PORTFOLIO_H */
diff --git a/src/main/interactive_shell.h b/src/main/interactive_shell.h
index b2530dc37..7ed5a1c1f 100644
--- a/src/main/interactive_shell.h
+++ b/src/main/interactive_shell.h
@@ -12,8 +12,8 @@
  ** \brief Interactive shell for CVC4
  **/
 
-#ifndef __CVC4__INTERACTIVE_SHELL_H
-#define __CVC4__INTERACTIVE_SHELL_H
+#ifndef CVC4__INTERACTIVE_SHELL_H
+#define CVC4__INTERACTIVE_SHELL_H
 
 #include <iosfwd>
 #include <string>
@@ -72,4 +72,4 @@ public:
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__INTERACTIVE_SHELL_H */
+#endif /* CVC4__INTERACTIVE_SHELL_H */
diff --git a/src/main/main.h b/src/main/main.h
index 3199273cb..266d043aa 100644
--- a/src/main/main.h
+++ b/src/main/main.h
@@ -25,8 +25,8 @@
 #include "util/statistics.h"
 #include "util/statistics_registry.h"
 
-#ifndef __CVC4__MAIN__MAIN_H
-#define __CVC4__MAIN__MAIN_H
+#ifndef CVC4__MAIN__MAIN_H
+#define CVC4__MAIN__MAIN_H
 
 namespace CVC4 {
 namespace main {
@@ -70,4 +70,4 @@ void cvc4_shutdown() noexcept;
 int runCvc4(int argc, char* argv[], CVC4::Options&);
 void printUsage(CVC4::Options&, bool full = false);
 
-#endif /* __CVC4__MAIN__MAIN_H */
+#endif /* CVC4__MAIN__MAIN_H */
diff --git a/src/main/portfolio.h b/src/main/portfolio.h
index 54e38eb3d..2cb23d5c5 100644
--- a/src/main/portfolio.h
+++ b/src/main/portfolio.h
@@ -13,8 +13,8 @@
  ** (potentially cooperative) race
  **/
 
-#ifndef __CVC4__PORTFOLIO_H
-#define __CVC4__PORTFOLIO_H
+#ifndef CVC4__PORTFOLIO_H
+#define CVC4__PORTFOLIO_H
 
 #include <boost/function.hpp>
 #include <utility>
@@ -38,4 +38,4 @@ std::pair<int, S> runPortfolio(int numThreads,
 
 }/* CVC4 namespace */
 
-#endif /* __CVC4__PORTFOLIO_H */
+#endif /* CVC4__PORTFOLIO_H */
diff --git a/src/main/portfolio_util.h b/src/main/portfolio_util.h
index ab5f26f90..e5ca296ae 100644
--- a/src/main/portfolio_util.h
+++ b/src/main/portfolio_util.h
@@ -12,8 +12,8 @@
  ** \brief Code relevant only for portfolio builds
  **/
 
-#ifndef __CVC4__PORTFOLIO_UTIL_H
-#define __CVC4__PORTFOLIO_UTIL_H
+#ifndef CVC4__PORTFOLIO_UTIL_H
+#define CVC4__PORTFOLIO_UTIL_H
 
 #include <queue>
 
@@ -177,4 +177,4 @@ void sharingManager(unsigned numThreads,
 
 }/* CVC4 namespace */
 
-#endif   /* __CVC4__PORTFOLIO_UTIL_H */
+#endif   /* CVC4__PORTFOLIO_UTIL_H */