diff --git a/src/Bytecode.hh b/src/Bytecode.hh
index c89b6ece3384c551b41aee1cd92571ac039426ad..9527870ebe2e57576cc379a129da07dce8a0b702 100644
--- a/src/Bytecode.hh
+++ b/src/Bytecode.hh
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _BYTECODE_HH
-#define _BYTECODE_HH
+#ifndef BYTECODE_HH
+#define BYTECODE_HH
 
 #include <filesystem>
 #include <fstream>
@@ -1151,4 +1151,4 @@ BytecodeWriter& operator<<(BytecodeWriter& code_file, const FCALL_& instr);
 template<>
 BytecodeWriter& operator<<(BytecodeWriter& code_file, const FBEGINBLOCK_& instr);
 
-#endif // _BYTECODE_HH
+#endif
diff --git a/src/CommonEnums.hh b/src/CommonEnums.hh
index 7cd13f66bd68a1c12bdf6e6fd83f09a3b21d9818..2b20225bb275737b89cf07a8649d40a9523cd831 100644
--- a/src/CommonEnums.hh
+++ b/src/CommonEnums.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2007-2022 Dynare Team
+ * Copyright © 2007-2023 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _COMMON_ENUMS_HH
-#define _COMMON_ENUMS_HH
+#ifndef COMMON_ENUMS_HH
+#define COMMON_ENUMS_HH
 
 //! Enumeration of possible symbol types
 /*! Warning: do not to change existing values for 0 to 4: the values matter for homotopy_setup
@@ -151,4 +151,4 @@ enum class PacTargetKind
   dd
 };
 
-#endif // _COMMON_ENUMS_HH
+#endif
diff --git a/src/ComputingTasks.hh b/src/ComputingTasks.hh
index 73b9cf7efdaff65e366914309c2fc7526970c982..05772bfcb10dace287f31e4fe439c6ec2a12fe30 100644
--- a/src/ComputingTasks.hh
+++ b/src/ComputingTasks.hh
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _COMPUTINGTASKS_HH
-#define _COMPUTINGTASKS_HH
+#ifndef COMPUTING_TASKS_HH
+#define COMPUTING_TASKS_HH
 
 #include <memory>
 #include <optional>
diff --git a/src/ConfigFile.hh b/src/ConfigFile.hh
index 0ec61cf6227865fff114ea3b8a28573734ea92c0..29db1bb13f2297105bd96c3dc3ad1fce5a1e27bc 100644
--- a/src/ConfigFile.hh
+++ b/src/ConfigFile.hh
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _CONFIG_FILE_HH
-#define _CONFIG_FILE_HH
+#ifndef CONFIG_FILE_HH
+#define CONFIG_FILE_HH
 
 #include <filesystem>
 #include <map>
@@ -145,4 +145,4 @@ public:
   void writeEndParallel(ostream& output) const;
 };
 
-#endif // ! CONFIG_FILE_HH
+#endif
diff --git a/src/DataTree.hh b/src/DataTree.hh
index b6cb39ff1e4e959c3e5fd8df9a0ad24db20cd025..93c2891f425e7c76f2ea49b76cc68aac53bfc2a8 100644
--- a/src/DataTree.hh
+++ b/src/DataTree.hh
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _DATATREE_HH
-#define _DATATREE_HH
+#ifndef DATA_TREE_HH
+#define DATA_TREE_HH
 
 #include <cmath>
 #include <filesystem>
diff --git a/src/DynamicModel.hh b/src/DynamicModel.hh
index 0dd374cc8d69c1d695479c2dde1b5ae2470b48b3..e57efbafe90240b3be9b6ea9e60c0f57b1e54778 100644
--- a/src/DynamicModel.hh
+++ b/src/DynamicModel.hh
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _DYNAMICMODEL_HH
-#define _DYNAMICMODEL_HH
+#ifndef DYNAMIC_MODEL_HH
+#define DYNAMIC_MODEL_HH
 
 #include <filesystem>
 #include <fstream>
diff --git a/src/EquationTags.hh b/src/EquationTags.hh
index b5c7047d24d8c5d54d9daf1ebeca14d186250cd8..998857cb2dfdf7c71c758784d01414e6cdfccc41 100644
--- a/src/EquationTags.hh
+++ b/src/EquationTags.hh
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _EQUATION_TAGS_HH
-#define _EQUATION_TAGS_HH
+#ifndef EQUATION_TAGS_HH
+#define EQUATION_TAGS_HH
 
 #include <map>
 #include <optional>
diff --git a/src/ExprNode.hh b/src/ExprNode.hh
index 5a8d75164b3364c9e9b428e931f08650ec04c32c..64adf4d6b2a565caa3902dde74611e68eaac84e2 100644
--- a/src/ExprNode.hh
+++ b/src/ExprNode.hh
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _EXPR_NODE_HH
-#define _EXPR_NODE_HH
+#ifndef EXPR_NODE_HH
+#define EXPR_NODE_HH
 
 #include <functional>
 #include <map>
diff --git a/src/ExtendedPreprocessorTypes.hh b/src/ExtendedPreprocessorTypes.hh
index 64da1cc9f30262d8fed77d0a68e0d79d541e0469..79f9e9a6581e7fbf9bf532d18bd14d72d1ee099d 100644
--- a/src/ExtendedPreprocessorTypes.hh
+++ b/src/ExtendedPreprocessorTypes.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014-2021 Dynare Team
+ * Copyright © 2014-2023 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _EXTENDED_PREPROCESSOR_TYPES_HH
-#define _EXTENDED_PREPROCESSOR_TYPES_HH
+#ifndef EXTENDED_PREPROCESSOR_TYPES_HH
+#define EXTENDED_PREPROCESSOR_TYPES_HH
 
 // Values for the “output” option
 enum class OutputType
diff --git a/src/ExternalFunctionsTable.hh b/src/ExternalFunctionsTable.hh
index 23ecc8dcf7daaf01b19c4fa163a22fe9bc9443c1..40aadb519db2fc2562d6cb9f78b8e86a8ab86586 100644
--- a/src/ExternalFunctionsTable.hh
+++ b/src/ExternalFunctionsTable.hh
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _EXTERNALFUNCTIONSTABLE_HH
-#define _EXTERNALFUNCTIONSTABLE_HH
+#ifndef EXTERNAL_FUNCTIONS_TABLE_HH
+#define EXTERNAL_FUNCTIONS_TABLE_HH
 
 #include <algorithm>
 #include <iostream>
diff --git a/src/ModFile.hh b/src/ModFile.hh
index a27795250719ebdbe5c0989179f272e46ede2379..a1e15cec2573a52e9b307ef56afcc5fca84b351b 100644
--- a/src/ModFile.hh
+++ b/src/ModFile.hh
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _MOD_FILE_HH
-#define _MOD_FILE_HH
+#ifndef MOD_FILE_HH
+#define MOD_FILE_HH
 
 #include <ctime>
 #include <filesystem>
@@ -194,4 +194,4 @@ public:
                        bool jsonderivsimple = false);
 };
 
-#endif // ! MOD_FILE_HH
+#endif
diff --git a/src/ModelEquationBlock.hh b/src/ModelEquationBlock.hh
index d7931aae56b547a9cb74cea8c9189b7e734f0625..aedf9e61ce9980339509bcdc8ced7859ee89d903 100644
--- a/src/ModelEquationBlock.hh
+++ b/src/ModelEquationBlock.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2010-2022 Dynare Team
+ * Copyright © 2010-2023 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _MODEL_EQUATION_BLOCK_HH
-#define _MODEL_EQUATION_BLOCK_HH
+#ifndef MODEL_EQUATION_BLOCK_HH
+#define MODEL_EQUATION_BLOCK_HH
 
 #include "DataTree.hh"
 #include "DynamicModel.hh"
diff --git a/src/ModelTree.hh b/src/ModelTree.hh
index 0a26ec35adf50b570b803112b7d0bf86f2510d70..2d361bbf53799a582979a3bf4f3c764f4669b206 100644
--- a/src/ModelTree.hh
+++ b/src/ModelTree.hh
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _MODELTREE_HH
-#define _MODELTREE_HH
+#ifndef MODEL_TREE_HH
+#define MODEL_TREE_HH
 
 #include <array>
 #include <cassert>
diff --git a/src/NumericalConstants.hh b/src/NumericalConstants.hh
index 0182ccb12db7478d984be816a425dd6634ce3133..f03687c18615f0112d0181372f3d14e852c6a013 100644
--- a/src/NumericalConstants.hh
+++ b/src/NumericalConstants.hh
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _NUMERICALCONSTANTS_HH
-#define _NUMERICALCONSTANTS_HH
+#ifndef NUMERICAL_CONSTANTS_HH
+#define NUMERICAL_CONSTANTS_HH
 
 #include <map>
 #include <string>
diff --git a/src/NumericalInitialization.hh b/src/NumericalInitialization.hh
index 0c87a0df1a67956fb6d42f66b11167a8001b0e36..dcb6dec10d50ca8ff7e9b5fe2ddaf8621f934935 100644
--- a/src/NumericalInitialization.hh
+++ b/src/NumericalInitialization.hh
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _NUMERICALINITIALIZATION_HH
-#define _NUMERICALINITIALIZATION_HH
+#ifndef NUMERICAL_INITIALIZATION_HH
+#define NUMERICAL_INITIALIZATION_HH
 
 #include <filesystem>
 #include <map>
diff --git a/src/ParsingDriver.hh b/src/ParsingDriver.hh
index ece788de47581955d19fd722be035a4dca37e4f9..7834058275f95922a33550ca099506b85db61a39 100644
--- a/src/ParsingDriver.hh
+++ b/src/ParsingDriver.hh
@@ -17,10 +17,10 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _PARSING_DRIVER_HH
-#define _PARSING_DRIVER_HH
+#ifndef PARSING_DRIVER_HH
+#define PARSING_DRIVER_HH
 
-#ifdef _MACRO_DRIVER_HH
+#ifdef MACRO_DRIVER_HH
 # error Impossible to include both ParsingDriver.hh and macro/Driver.hh
 #endif
 
@@ -964,4 +964,4 @@ public:
   }
 };
 
-#endif // ! PARSING_DRIVER_HH
+#endif
diff --git a/src/Shocks.hh b/src/Shocks.hh
index f2b24295b73410334e4e5ab18a14f5447563a8d1..9378f246dcf947f3448ae26f3a6dcc8603bfd64f 100644
--- a/src/Shocks.hh
+++ b/src/Shocks.hh
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _SHOCKS_HH
-#define _SHOCKS_HH
+#ifndef SHOCKS_HH
+#define SHOCKS_HH
 
 #include <map>
 #include <string>
diff --git a/src/Statement.hh b/src/Statement.hh
index 06a3d589dbb389d0cec484d9bd7899e53719aed6..b7c30fe06366803dfbc4bfe35bfd829cd2356101 100644
--- a/src/Statement.hh
+++ b/src/Statement.hh
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _STATEMENT_HH
-#define _STATEMENT_HH
+#ifndef STATEMENT_HH
+#define STATEMENT_HH
 
 #include <map>
 #include <optional>
@@ -335,4 +335,4 @@ private:
   static constexpr bool always_false_v {false};
 };
 
-#endif // ! _STATEMENT_HH
+#endif
diff --git a/src/StaticModel.hh b/src/StaticModel.hh
index 30491f748bf988b6a2a69372f54f92d73d68cdb5..288c6e4725f9485cece581d2d7d081bf0390b547 100644
--- a/src/StaticModel.hh
+++ b/src/StaticModel.hh
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _STATIC_MODEL_HH
-#define _STATIC_MODEL_HH
+#ifndef STATIC_MODEL_HH
+#define STATIC_MODEL_HH
 
 #include <filesystem>
 #include <fstream>
diff --git a/src/SubModel.hh b/src/SubModel.hh
index 2d48292493b7d1a9661897afad9b1a21bc1cf76b..2d4138485838a8049de8d711cc648d9495562368 100644
--- a/src/SubModel.hh
+++ b/src/SubModel.hh
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _SUBMODEL_HH
-#define _SUBMODEL_HH
+#ifndef SUB_MODEL_HH
+#define SUB_MODEL_HH
 
 #include <iostream>
 #include <map>
diff --git a/src/SymbolList.hh b/src/SymbolList.hh
index d93ef4cd4b5eff6f563ca8c38c3690740794b907..9c96beb06de7159d08d2c8d377de8f12931535ce 100644
--- a/src/SymbolList.hh
+++ b/src/SymbolList.hh
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _SYMBOL_LIST_HH
-#define _SYMBOL_LIST_HH
+#ifndef SYMBOL_LIST_HH
+#define SYMBOL_LIST_HH
 
 #include <algorithm>
 #include <ostream>
diff --git a/src/SymbolTable.hh b/src/SymbolTable.hh
index f381db608112d9dd4509941726f7d1ac4c3e6aa3..fb41bb8950c487c96b593681040ec231b7392165 100644
--- a/src/SymbolTable.hh
+++ b/src/SymbolTable.hh
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _SYMBOLTABLE_HH
-#define _SYMBOLTABLE_HH
+#ifndef SYMBOL_TABLE_HH
+#define SYMBOL_TABLE_HH
 
 #include <map>
 #include <optional>
diff --git a/src/VariableDependencyGraph.hh b/src/VariableDependencyGraph.hh
index 83d935f2d013e2f2dda096f47e96af31b60579b4..9aabb8de78e3ca52d3962dc7ae56dcf82382e5ff 100644
--- a/src/VariableDependencyGraph.hh
+++ b/src/VariableDependencyGraph.hh
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _VARIABLEDEPENDENCYGRAPH_HH
-#define _VARIABLEDEPENDENCYGRAPH_HH
+#ifndef VARIABLE_DEPENDENCY_GRAPH_HH
+#define VARIABLE_DEPENDENCY_GRAPH_HH
 
 #include <map>
 #include <vector>
@@ -94,4 +94,4 @@ private:
   bool suppressionOfVerticesWithLoop(set<int>& feed_back_vertices);
 };
 
-#endif // _VARIABLEDEPENDENCYGRAPH_HH
+#endif
diff --git a/src/WarningConsolidation.hh b/src/WarningConsolidation.hh
index b1e99c3477fe2cc62448ad8fd66b47ad7a77bce4..ac01f82526c8c098b99765344cc12527816c2f53 100644
--- a/src/WarningConsolidation.hh
+++ b/src/WarningConsolidation.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012-2017 Dynare Team
+ * Copyright © 2012-2023 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _WARNINGCONSOLIDATION_HH
-#define _WARNINGCONSOLIDATION_HH
+#ifndef WARNING_CONSOLIDATION_HH
+#define WARNING_CONSOLIDATION_HH
 
 #include "DynareBisonLocation.hh"
 #include <sstream>
diff --git a/src/macro/Directives.hh b/src/macro/Directives.hh
index 6d564e76df7dd6ad838242f9e5dca307f716e5dc..5a6ed0b5da590456203328d64a1e103a5257f0f7 100644
--- a/src/macro/Directives.hh
+++ b/src/macro/Directives.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019-2020 Dynare Team
+ * Copyright © 2019-2023 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _DIRECTIVES_HH
-#define _DIRECTIVES_HH
+#ifndef DIRECTIVES_HH
+#define DIRECTIVES_HH
 
 #include "Expressions.hh"
 
diff --git a/src/macro/Driver.hh b/src/macro/Driver.hh
index f68afa231da70668968897ab45e103df8ee52bbb..034c03a4f56c530450db984d21304fda44a4414e 100644
--- a/src/macro/Driver.hh
+++ b/src/macro/Driver.hh
@@ -17,10 +17,10 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _MACRO_DRIVER_HH
-#define _MACRO_DRIVER_HH
+#ifndef MACRO_DRIVER_HH
+#define MACRO_DRIVER_HH
 
-#ifdef _PARSING_DRIVER_HH
+#ifdef PARSING_DRIVER_HH
 # error Impossible to include both ../ParsingDriver.hh and Driver.hh
 #endif
 
diff --git a/src/macro/Environment.hh b/src/macro/Environment.hh
index f22565aa6890c217fd32368e90b73cedffb8cf15..a3f2cdfc181b266704850605e82b9ecbea0b8862 100644
--- a/src/macro/Environment.hh
+++ b/src/macro/Environment.hh
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _ENVIRONMENT_HH
-#define _ENVIRONMENT_HH
+#ifndef ENVIRONMENT_HH
+#define ENVIRONMENT_HH
 
 #include "ForwardDeclarationsAndEnums.hh"
 
diff --git a/src/macro/Expressions.hh b/src/macro/Expressions.hh
index d213741d18d05db25c61021c24c6eec6398782e5..1545291c2a2c681074951f41802e8c356f6892dd 100644
--- a/src/macro/Expressions.hh
+++ b/src/macro/Expressions.hh
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _EXPRESSIONS_HH
-#define _EXPRESSIONS_HH
+#ifndef EXPRESSIONS_HH
+#define EXPRESSIONS_HH
 
 #include "Environment.hh"
 #include "ForwardDeclarationsAndEnums.hh"
diff --git a/src/macro/ForwardDeclarationsAndEnums.hh b/src/macro/ForwardDeclarationsAndEnums.hh
index 28425393cadfee4bdae49fd059324988af89a670..b0e8835c5cbfc89ff7d6d9a493123f867f79fa80 100644
--- a/src/macro/ForwardDeclarationsAndEnums.hh
+++ b/src/macro/ForwardDeclarationsAndEnums.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019 Dynare Team
+ * Copyright © 2019-2023 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _FORWARDDECLARATIONSANDENUMS_HH
-#define _FORWARDDECLARATIONSANDENUMS_HH
+#ifndef FORWARD_DECLARATIONS_AND_ENUMS_HH
+#define FORWARD_DECLARATIONS_AND_ENUMS_HH
 
 #include <memory>