diff --git a/src/DataTree.hh b/src/DataTree.hh
index 565a0189fd31cce1d6bea632562c9e7a68e1acb3..51514d48e9c5ae1f6f0cb0a7feb2c83d501bb048 100644
--- a/src/DataTree.hh
+++ b/src/DataTree.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2003-2021 Dynare Team
+ * Copyright © 2003-2022 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -20,8 +20,6 @@
 #ifndef _DATATREE_HH
 #define _DATATREE_HH
 
-using namespace std;
-
 #include <string>
 #include <map>
 #include <vector>
@@ -36,6 +34,8 @@ using namespace std;
 #include "ExprNode.hh"
 #include "SubModel.hh"
 
+using namespace std;
+
 class DataTree
 {
 public:
diff --git a/src/DynamicModel.hh b/src/DynamicModel.hh
index 0605849c34ae3330a9a21506381af697a8b381fa..51265ac173fc91ccb3962798abe9f568cd88c73f 100644
--- a/src/DynamicModel.hh
+++ b/src/DynamicModel.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2003-2021 Dynare Team
+ * Copyright © 2003-2022 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -20,13 +20,13 @@
 #ifndef _DYNAMICMODEL_HH
 #define _DYNAMICMODEL_HH
 
-using namespace std;
-
 #include <fstream>
 #include <filesystem>
 
 #include "StaticModel.hh"
 
+using namespace std;
+
 //! Stores a dynamic model
 class DynamicModel : public ModelTree
 {
diff --git a/src/DynareFlex.ll b/src/DynareFlex.ll
index e35d9253ace190d61f73889fd025c11cfff2d196..ee37d65dc0652e28a3e88e9d2e779318fd94e2e7 100644
--- a/src/DynareFlex.ll
+++ b/src/DynareFlex.ll
@@ -1,6 +1,6 @@
 /* -*- C++ -*- */
 /*
- * Copyright © 2003-2021 Dynare Team
+ * Copyright © 2003-2022 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -20,11 +20,11 @@
 
 
 %{
-using namespace std;
-
 #include <cstring>
 #include "ParsingDriver.hh"
 
+using namespace std;
+
 // Announce to Flex the prototype we want for lexing function
 #define YY_DECL                                                \
   Dynare::parser::token_type                                   \
diff --git a/src/EquationTags.hh b/src/EquationTags.hh
index 34277baef41c7a09123cd8fbc9a9c1a5677dafdb..04ed8a1059e1ead5cf3726444a021aa60d02a4eb 100644
--- a/src/EquationTags.hh
+++ b/src/EquationTags.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020-2021 Dynare Team
+ * Copyright © 2020-2022 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -20,12 +20,12 @@
 #ifndef _EQUATION_TAGS_HH
 #define _EQUATION_TAGS_HH
 
-using namespace std;
-
 #include <map>
 #include <set>
 #include <string>
 
+using namespace std;
+
 class EquationTags
 {
 private:
diff --git a/src/ExternalFunctionsTable.hh b/src/ExternalFunctionsTable.hh
index ce4dde68771347e274d1215548219bfe3c9cedd5..6c4a4d4530eb0346842cdaaad634c7f6766f9e97 100644
--- a/src/ExternalFunctionsTable.hh
+++ b/src/ExternalFunctionsTable.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2010-2019 Dynare Team
+ * Copyright © 2010-2022 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -20,13 +20,13 @@
 #ifndef _EXTERNALFUNCTIONSTABLE_HH
 #define _EXTERNALFUNCTIONSTABLE_HH
 
-using namespace std;
-
 #include <iostream>
 #include <string>
 #include <vector>
 #include <map>
 
+using namespace std;
+
 //! Handles external functions
 class ExternalFunctionsTable
 {
diff --git a/src/ModFile.hh b/src/ModFile.hh
index d5942c8447e6b173cc5030e8d8d8e015ab127546..4c2cd0722ed8bf61e2c92b5c9a51a16b213353b5 100644
--- a/src/ModFile.hh
+++ b/src/ModFile.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2006-2021 Dynare Team
+ * Copyright © 2006-2022 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -20,8 +20,6 @@
 #ifndef _MOD_FILE_HH
 #define _MOD_FILE_HH
 
-using namespace std;
-
 #include <ostream>
 #include <ctime>
 #include <iostream>
@@ -40,6 +38,8 @@ using namespace std;
 #include "ExtendedPreprocessorTypes.hh"
 #include "SubModel.hh"
 
+using namespace std;
+
 //! The abstract representation of a "mod" file
 class ModFile
 {
diff --git a/src/ModelTree.hh b/src/ModelTree.hh
index 5421792cd1425ae8dae781d99a4ce07223d32bfc..4c5b18102478e6373efc72b1dc06b2567532819d 100644
--- a/src/ModelTree.hh
+++ b/src/ModelTree.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2003-2021 Dynare Team
+ * Copyright © 2003-2022 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -20,8 +20,6 @@
 #ifndef _MODELTREE_HH
 #define _MODELTREE_HH
 
-using namespace std;
-
 #include <string>
 #include <vector>
 #include <deque>
@@ -34,6 +32,8 @@ using namespace std;
 #include "EquationTags.hh"
 #include "ExtendedPreprocessorTypes.hh"
 
+using namespace std;
+
 // Helper to convert a vector into a tuple
 template<typename T, size_t... Indices>
 auto
diff --git a/src/NumericalConstants.hh b/src/NumericalConstants.hh
index 70ed6d09f947fd3ba782831feaa99bd77e79cf67..f83550111eb85ca8ee37f1f300ae54e75a5bce1c 100644
--- a/src/NumericalConstants.hh
+++ b/src/NumericalConstants.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2003-2016 Dynare Team
+ * Copyright © 2003-2022 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -20,12 +20,12 @@
 #ifndef _NUMERICALCONSTANTS_HH
 #define _NUMERICALCONSTANTS_HH
 
-using namespace std;
-
 #include <string>
 #include <vector>
 #include <map>
 
+using namespace std;
+
 //! Handles non-negative numerical constants
 class NumericalConstants
 {
diff --git a/src/NumericalInitialization.hh b/src/NumericalInitialization.hh
index 1ff828f6f888ed2a5260edd93342b427fe892f35..2c58656cccc5617dd0d6145b867f1f75cc03295a 100644
--- a/src/NumericalInitialization.hh
+++ b/src/NumericalInitialization.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2003-2021 Dynare Team
+ * Copyright © 2003-2022 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -20,8 +20,6 @@
 #ifndef _NUMERICALINITIALIZATION_HH
 #define _NUMERICALINITIALIZATION_HH
 
-using namespace std;
-
 #include <string>
 #include <vector>
 #include <map>
@@ -30,6 +28,8 @@ using namespace std;
 #include "ExprNode.hh"
 #include "Statement.hh"
 
+using namespace std;
+
 class InitParamStatement : public Statement
 {
 private:
diff --git a/src/Shocks.hh b/src/Shocks.hh
index b2b22155ba672863d3f4e053a288ed89ec5decd4..83ec46e93ec190fce16d35e6467b3e367bc44bc1 100644
--- a/src/Shocks.hh
+++ b/src/Shocks.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2003-2021 Dynare Team
+ * Copyright © 2003-2022 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -20,8 +20,6 @@
 #ifndef _SHOCKS_HH
 #define _SHOCKS_HH
 
-using namespace std;
-
 #include <string>
 #include <vector>
 #include <map>
@@ -30,6 +28,8 @@ using namespace std;
 #include "SymbolTable.hh"
 #include "ExprNode.hh"
 
+using namespace std;
+
 class AbstractShocksStatement : public Statement
 {
 public:
diff --git a/src/StaticModel.hh b/src/StaticModel.hh
index c2fc1d6f110739119b212eb87ba1a7278997409b..29b2b864e7590d679d3feb1c785e0223dee5529b 100644
--- a/src/StaticModel.hh
+++ b/src/StaticModel.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2003-2020 Dynare Team
+ * Copyright © 2003-2022 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -20,13 +20,13 @@
 #ifndef _STATIC_MODEL_HH
 #define _STATIC_MODEL_HH
 
-using namespace std;
-
 #include <fstream>
 #include <filesystem>
 
 #include "ModelTree.hh"
 
+using namespace std;
+
 class DynamicModel;
 
 //! Stores a static model, as derived from the "model" block when leads and lags have been removed
diff --git a/src/SymbolTable.hh b/src/SymbolTable.hh
index 9d3579ac4bb2a30c8c0c5c9736fb53f54d3fc1d6..cb4a7ab777cca783a4f179c5331e597ef8332694 100644
--- a/src/SymbolTable.hh
+++ b/src/SymbolTable.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2003-2021 Dynare Team
+ * Copyright © 2003-2022 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -20,8 +20,6 @@
 #ifndef _SYMBOLTABLE_HH
 #define _SYMBOLTABLE_HH
 
-using namespace std;
-
 #include <map>
 #include <string>
 #include <utility>
@@ -32,6 +30,8 @@ using namespace std;
 #include "CodeInterpreter.hh"
 #include "ExprNode.hh"
 
+using namespace std;
+
 using expr_t = class ExprNode *;
 
 //! Types of auxiliary variables