diff --git a/parser.src/ComputingTasks.cc b/parser.src/ComputingTasks.cc
index 87b61c2e4696580932c1800c74330daf90781f25..37a402a345a6738fd7731b09f3da3e654b07b6df 100644
--- a/parser.src/ComputingTasks.cc
+++ b/parser.src/ComputingTasks.cc
@@ -8,8 +8,8 @@
 
 using namespace std;
 //------------------------------------------------------------------------------
-#include "ComputingTasks.h"
-#include "Interface.h"
+#include "ComputingTasks.hh"
+#include "Interface.hh"
 //------------------------------------------------------------------------------
 //ostringstream	ComputingTasks::output;
 //------------------------------------------------------------------------------
diff --git a/parser.src/DataTree.cc b/parser.src/DataTree.cc
index 3f6a868be6859e7ccb8e9ad5db02bb256ee335c6..caae44a1d320f387b6a4d8d6d3164b037680dc64 100644
--- a/parser.src/DataTree.cc
+++ b/parser.src/DataTree.cc
@@ -15,10 +15,10 @@ using namespace std;
 #include <time.h>
 
 //------------------------------------------------------------------------------
-#include "DynareBison.h"
-#include "VariableTable.h"
-#include "NumericalConstants.h"
-#include "DataTree.h"
+#include "DynareBison.hh"
+#include "VariableTable.hh"
+#include "NumericalConstants.hh"
+#include "DataTree.hh"
 //------------------------------------------------------------------------------
 const int DataTree::NoOpCode = -1;
 const NodeID DataTree::NullID = NULL;                                    
diff --git a/parser.src/DynareBison.yy b/parser.src/DynareBison.yy
index 2d70a58f121352c29a998202f37d15c76e6acc9e..aafafcced95e3111d0ab4504a3b69be70a78479e 100644
--- a/parser.src/DynareBison.yy
+++ b/parser.src/DynareBison.yy
@@ -1,6 +1,6 @@
 %{
   /* Declarations */
-#include "DynareParser.h"
+#include "DynareParser.hh"
 #define yyparse tcparse 
 #define yylex tclex
 //#define yyerror tcerror
diff --git a/parser.src/DynareFlex.ll b/parser.src/DynareFlex.ll
index d06606e9cdd04166382592a6cadc0973105a8daa..80fd07a9b5cfd6a5322f75f0c00de76d3c1c606b 100644
--- a/parser.src/DynareFlex.ll
+++ b/parser.src/DynareFlex.ll
@@ -2,7 +2,7 @@
 #define YY_BUF_SIZE 1000000
 #include <unistd.h>
 #include <string.h>
-#include "DynareScanner.h" 
+#include "DynareScanner.hh"
 #ifdef HAVE_CONFIG_H
 # include "config.hh"
 #endif
diff --git a/parser.src/DynareMain.cc b/parser.src/DynareMain.cc
index 9111457faaee62f97120bc09a54a622356cd0c3d..70ac2d2d57068af90c222c875c8be12660b1f450 100644
--- a/parser.src/DynareMain.cc
+++ b/parser.src/DynareMain.cc
@@ -11,10 +11,10 @@
 
 using namespace std;
 
-#include "DynareParser.h"  
-#include "DynareScanner.h"
-#include "OutputFile.h"
-#include "Interface.h"
+#include "DynareParser.hh"
+#include "DynareScanner.hh"
+#include "OutputFile.hh"
+#include "Interface.hh"
 //------------------------------------------------------------------------------
 /*!  main function
     \brief Main function of Dynare.
diff --git a/parser.src/DynareParser.cc b/parser.src/DynareParser.cc
index 2e96ab7016f3363f5d6bac5ba603ee7aed7a63ba..20a57d4f9eddd80e05eb51c48822079b9b7788e7 100644
--- a/parser.src/DynareParser.cc
+++ b/parser.src/DynareParser.cc
@@ -4,17 +4,17 @@
  \par This file implements the parser class methodes.
 */
 //------------------------------------------------------------------------------
-#include "ModelParameters.h"
-#include "SymbolTable.h"
-#include "Expression.h"
-#include "NumericalInitialization.h"
-#include "ModelTree.h"
-#include "VariableTable.h"
-#include "Shocks.h"
-#include "SigmaeInitialization.h"
-#include "ComputingTasks.h"
-#include "TmpSymbolTable.h"
-#include "DynareParser.h"
+#include "ModelParameters.hh"
+#include "SymbolTable.hh"
+#include "Expression.hh"
+#include "NumericalInitialization.hh"
+#include "ModelTree.hh"
+#include "VariableTable.hh"
+#include "Shocks.hh"
+#include "SigmaeInitialization.hh"
+#include "ComputingTasks.hh"
+#include "TmpSymbolTable.hh"
+#include "DynareParser.hh"
 
 string dynare::parser::file_name = "";
 void dynare::parser::set_file_name(string fname)
diff --git a/parser.src/Expression.cc b/parser.src/Expression.cc
index 193ff889d031e2662e4da71f024c427ece84d929..7488baa10a0b29efcda0919b178744238e2e59b4 100644
--- a/parser.src/Expression.cc
+++ b/parser.src/Expression.cc
@@ -7,7 +7,7 @@
 #include <stack>
 using namespace std;
 //------------------------------------------------------------------------------
-#include "Expression.h"
+#include "Expression.hh"
 //------------------------------------------------------------------------------
 ostringstream	Expression::output;
 //------------------------------------------------------------------------------
diff --git a/parser.src/InterfaceMatlab.cc b/parser.src/InterfaceMatlab.cc
index aa3372da6502f79337132aea82f2e559daecd224..b30875dd7f1a6e2bc6bc77fab414eeeaffce4816 100644
--- a/parser.src/InterfaceMatlab.cc
+++ b/parser.src/InterfaceMatlab.cc
@@ -1,6 +1,6 @@
 #include <string>
 
-#include "Interface.h"
+#include "Interface.hh"
 
 namespace interfaces
 {
diff --git a/parser.src/InterfaceScilab.cc b/parser.src/InterfaceScilab.cc
index d6ec6c883b29c65264eb6e2c3c718f07a582ca32..ee6ce9be8ee15c263432ddbb102af527d7380223 100644
--- a/parser.src/InterfaceScilab.cc
+++ b/parser.src/InterfaceScilab.cc
@@ -1,6 +1,6 @@
 #include <string>
 
-#include "Interface.h"
+#include "Interface.hh"
 
 namespace interfaces
 {
diff --git a/parser.src/Makefile b/parser.src/Makefile
index 206423e9b889d8f43e6a41831359faf833dbfd3d..31d9ae7efc0dec01eb2f3f289d60e6a5179c9b95 100644
--- a/parser.src/Makefile
+++ b/parser.src/Makefile
@@ -69,11 +69,11 @@ dynare_s.exe: $(COMMON_OBJ) $(SCILAB_OBJ)
 
 -include $(COMMON_OBJ:.o=.P) $(MATLAB_OBJ:.o=.P) $(SCILAB_OBJ:.o=.P)
 
-DynareFlex.cc: DynareFlex.ll include/DynareScanner.h include/DynareBison.h
+DynareFlex.cc: DynareFlex.ll include/DynareScanner.hh include/DynareBison.hh
 	flex $(FLEXFLAGS) -oDynareFlex.cc DynareFlex.ll
 
-DynareBison.cc include/DynareBison.h: DynareBison.yy include/DynareParser.h
-	 (bison  -v -d -b --verbose -o DynareBison.cc DynareBison.yy; mv DynareBison.hh include/DynareBison.h)
+DynareBison.cc include/DynareBison.hh: DynareBison.yy include/DynareParser.hh
+	 (bison  -v -d -b --verbose -o DynareBison.cc DynareBison.yy; mv DynareBison.hh include/)
 
 
 ################################################################################
@@ -83,7 +83,7 @@ DynareBison.cc include/DynareBison.h: DynareBison.yy include/DynareParser.h
 clean:
 	rm -f *.o *.P \
 		DynareBison.cc \
-		include/DynareBison.h \
+		include/DynareBison.hh \
 		DynareBison.output \
 		DynareFlex.cc \
 		dynare.exe \
diff --git a/parser.src/Makefile.linux b/parser.src/Makefile.linux
index d1c07abae710afd95f9df4d94aa61307a7e85302..51c84d21f30e742c18096e16806df3ae8ee6c6d4 100644
--- a/parser.src/Makefile.linux
+++ b/parser.src/Makefile.linux
@@ -51,7 +51,7 @@ dynare_s: $(COMMON_OBJ) $(SCILAB_OBJ)
 ### Compile ####################################################################
 ################################################################################
 
-%.o : %.cc include/DynareBison.h
+%.o : %.cc
 	$(CPP) $(CPPFLAGS) -MD -I include -c $<
 	@cp $*.d $*.P; \
 	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
@@ -60,11 +60,11 @@ dynare_s: $(COMMON_OBJ) $(SCILAB_OBJ)
 
 -include $(COMMON_OBJ:.o=.P) $(MATLAB_OBJ:.o=.P) $(SCILAB_OBJ:.o=.P)
 
-DynareFlex.cc: DynareFlex.ll include/DynareScanner.h include/DynareBison.h
+DynareFlex.cc: DynareFlex.ll include/DynareScanner.hh include/DynareBison.hh
 	flex $(FLEXFLAGS) -oDynareFlex.cc DynareFlex.ll
 
-DynareBison.cc include/DynareBison.h: DynareBison.yy include/DynareParser.h
-	 (bison  -v -d -b --verbose -o DynareBison.cc DynareBison.yy; mv DynareBison.hh include/DynareBison.h)
+DynareBison.cc include/DynareBison.hh: DynareBison.yy include/DynareParser.hh
+	 (bison  -v -d -b --verbose -o DynareBison.cc DynareBison.yy; mv DynareBison.hh include/)
 
 
 ################################################################################
@@ -74,7 +74,7 @@ DynareBison.cc include/DynareBison.h: DynareBison.yy include/DynareParser.h
 clean:
 	rm -f *.o *.P \
 		DynareBison.cc \
-		include/DynareBison.h \
+		include/DynareBison.hh \
 		DynareBison.output \
 		DynareFlex.cc \
 		dynare_m \
diff --git a/parser.src/ModelParameters.cc b/parser.src/ModelParameters.cc
index 532be5e46a0d0ee99e2e46df1292fe0521ecfdaa..963940ab135906dbc9da7532ac0f38471114ec69 100644
--- a/parser.src/ModelParameters.cc
+++ b/parser.src/ModelParameters.cc
@@ -5,8 +5,7 @@
 */
 //------------------------------------------------------------------------------
 #include <iostream>
-#include "ModelParameters.h"
-#include "limits.h"
+#include "ModelParameters.hh"
 //------------------------------------------------------------------------------
 int ModelParameters::eq_nbr = 0;
 int ModelParameters::exo_nbr = 0;
diff --git a/parser.src/ModelTree.cc b/parser.src/ModelTree.cc
index 56018e5f7369fc8374f348b2a705c1b364334e10..9126b283d1c0540f2417eb0034b4561eb7c06a14 100644
--- a/parser.src/ModelTree.cc
+++ b/parser.src/ModelTree.cc
@@ -14,12 +14,12 @@
 #include <time.h>
 using namespace std;
 //------------------------------------------------------------------------------
-#include "VariableTable.h"
-#include "DynareBison.h"
-#include "NumericalConstants.h"
-#include "ModelTree.h"
-#include "ModelParameters.h"
-#include "Interface.h"
+#include "VariableTable.hh"
+#include "DynareBison.hh"
+#include "NumericalConstants.hh"
+#include "ModelTree.hh"
+#include "ModelParameters.hh"
+#include "Interface.hh"
 //------------------------------------------------------------------------------
 ostringstream ModelTree::output;
 //------------------------------------------------------------------------------
diff --git a/parser.src/NumericalConstants.cc b/parser.src/NumericalConstants.cc
index 1a3d6ee76409106a8435365afab2ec86f0fa56ec..6cfb44c709a7b6ef8a0e65aeaa61cdf1f85c7666 100644
--- a/parser.src/NumericalConstants.cc
+++ b/parser.src/NumericalConstants.cc
@@ -7,7 +7,7 @@
 #include <iostream>
 using namespace std;
 //------------------------------------------------------------------------------
-#include "NumericalConstants.h"
+#include "NumericalConstants.hh"
 //------------------------------------------------------------------------------
 vector<string> NumericalConstants::mNumericalConstants = *(new vector<string>);	
 //------------------------------------------------------------------------------
diff --git a/parser.src/NumericalInitialization.cc b/parser.src/NumericalInitialization.cc
index 22b90df3fa28b8056280d8062af084ba68e20916..a2704f0461d502cc8914e8484d155990891d109e 100644
--- a/parser.src/NumericalInitialization.cc
+++ b/parser.src/NumericalInitialization.cc
@@ -6,8 +6,8 @@
 //------------------------------------------------------------------------------
 using namespace std;
 //------------------------------------------------------------------------------
-#include "NumericalInitialization.h"
-#include "Interface.h"
+#include "NumericalInitialization.hh"
+#include "Interface.hh"
 //------------------------------------------------------------------------------
 //ostringstream	NumericalInitialization::output;	
 //------------------------------------------------------------------------------
diff --git a/parser.src/OperatorTable.cc b/parser.src/OperatorTable.cc
index 005207c75cbbfcd756af9933ace89f21fa2fe42a..c7c1bdd814e016502ae65ad5da531291fcfa46a0 100644
--- a/parser.src/OperatorTable.cc
+++ b/parser.src/OperatorTable.cc
@@ -8,7 +8,7 @@
 #include <string>
 using namespace std;
 //------------------------------------------------------------------------------
-#include "OperatorTable.h"
+#include "OperatorTable.hh"
 //------------------------------------------------------------------------------
 OperatorTable::OperatorTable()
 {			
diff --git a/parser.src/OutputFile.cc b/parser.src/OutputFile.cc
index 83aee48c1685113e79bcc91740aa62c851f0684d..1d089d9f7203d2e2dd6d3fbb937cef00a68ca4be 100644
--- a/parser.src/OutputFile.cc
+++ b/parser.src/OutputFile.cc
@@ -8,10 +8,10 @@
 #include <sstream>
 using namespace std;
 //------------------------------------------------------------------------------
-#include "OutputFile.h"
-#include "SymbolTable.h"
-#include "ModelTree.h"
-#include "Interface.h"
+#include "OutputFile.hh"
+#include "SymbolTable.hh"
+#include "ModelTree.hh"
+#include "Interface.hh"
 //------------------------------------------------------------------------------
 OutputFile::OutputFile()
 {
diff --git a/parser.src/Shocks.cc b/parser.src/Shocks.cc
index 2b7086fe6c9839e8e2adce49c19fb4e2393d4f9b..7fe8c4a821eba0789c2006d14a8dc85f0e316864 100644
--- a/parser.src/Shocks.cc
+++ b/parser.src/Shocks.cc
@@ -7,9 +7,9 @@
 #include <iostream>
 using namespace std;
 //------------------------------------------------------------------------------
-#include "Shocks.h"
-#include "ModelParameters.h"
-#include "Interface.h"
+#include "Shocks.hh"
+#include "ModelParameters.hh"
+#include "Interface.hh"
 
 static int mshock_flag = 0;
 static int exo_det_length = 0;
diff --git a/parser.src/SigmaeInitialization.cc b/parser.src/SigmaeInitialization.cc
index d2424662313ffefb86e8b0c7a42f3ecbeb792ae0..c99c56051245082944f6290052d4c7cad4988c78 100644
--- a/parser.src/SigmaeInitialization.cc
+++ b/parser.src/SigmaeInitialization.cc
@@ -8,7 +8,7 @@
 
 using namespace std;
 
-#include "SigmaeInitialization.h"
+#include "SigmaeInitialization.hh"
 //------------------------------------------------------------------------------
 SigmaeInitialization::SigmaeInitialization()
 {
diff --git a/parser.src/SymbolTable.cc b/parser.src/SymbolTable.cc
index df33f2b3957dd251a024a8e374c0c9d88e61667b..d9aaaaf7a8d2e4b2ad3c36e7d926e127e7648800 100644
--- a/parser.src/SymbolTable.cc
+++ b/parser.src/SymbolTable.cc
@@ -7,8 +7,8 @@
 #include <iostream>
 #include <algorithm>
 //------------------------------------------------------------------------------
-#include "SymbolTable.h"
-#include "Interface.h"
+#include "SymbolTable.hh"
+#include "Interface.hh"
 using namespace std;
 //------------------------------------------------------------------------------
 map<string, Symbol, less<string> > SymbolTable::symboltable;// = *(new symbolmap);
diff --git a/parser.src/TmpSymbolTable.cc b/parser.src/TmpSymbolTable.cc
index 44b949dce7a4872cf0c7be70b4b8b932a69da6a6..ebd37990e671f225d84684b457fbc00e2854c4ae 100644
--- a/parser.src/TmpSymbolTable.cc
+++ b/parser.src/TmpSymbolTable.cc
@@ -6,9 +6,9 @@
 //------------------------------------------------------------------------------
 using namespace std;
 //------------------------------------------------------------------------------
-#include "SymbolTable.h"
-#include "TmpSymbolTable.h"
-#include "Interface.h"
+#include "SymbolTable.hh"
+#include "TmpSymbolTable.hh"
+#include "Interface.hh"
 //------------------------------------------------------------------------------
 TmpSymbolTable::TmpSymbolTable()
 {
diff --git a/parser.src/VariableTable.cc b/parser.src/VariableTable.cc
index 0cba635e6cb24f4bfa6472971d2b48c7129cce99..c460eb7d2a126e3550462ac252d2c425adae6362 100644
--- a/parser.src/VariableTable.cc
+++ b/parser.src/VariableTable.cc
@@ -9,7 +9,7 @@
 #include <algorithm>
 using namespace std;
 //------------------------------------------------------------------------------
-#include "VariableTable.h"
+#include "VariableTable.hh"
 //------------------------------------------------------------------------------
 map<varKey,int> VariableTable::mVariableTable = *(new map<varKey,int>);
 vector<varKey> VariableTable::mVariableIndex = *(new vector<varKey>);	
diff --git a/parser.src/include/ComputingTasks.h b/parser.src/include/ComputingTasks.hh
similarity index 93%
rename from parser.src/include/ComputingTasks.h
rename to parser.src/include/ComputingTasks.hh
index 8864e255cb71ef13ffadbe1e2c355f1aed918e46..0b80a3c58f88e6160916f8e4cf4c367d0c740c75 100644
--- a/parser.src/include/ComputingTasks.h
+++ b/parser.src/include/ComputingTasks.hh
@@ -1,5 +1,5 @@
-#ifndef COMPUTINGTASKS_H
-#define COMPUTINGTASKS_H
+#ifndef _COMPUTINGTASKS_HH
+#define _COMPUTINGTASKS_HH
 //------------------------------------------------------------------------------
 /** \file 
  * \version 1.0
@@ -9,8 +9,8 @@
 //------------------------------------------------------------------------------
 #include <sstream>
 //------------------------------------------------------------------------------
-#include "TmpSymbolTable.h"
-#include "SymbolTable.h"
+#include "TmpSymbolTable.hh"
+#include "SymbolTable.hh"
 //------------------------------------------------------------------------------
 /*! 
  \class EstimationParams
diff --git a/parser.src/include/DataTree.h b/parser.src/include/DataTree.hh
similarity index 94%
rename from parser.src/include/DataTree.h
rename to parser.src/include/DataTree.hh
index b38196085914d4b95b91f10b4df587640c0bcf23..6bf844a3d85455767cefa32bf341140c8ef5309e 100644
--- a/parser.src/include/DataTree.h
+++ b/parser.src/include/DataTree.hh
@@ -1,5 +1,5 @@
-#ifndef DATATREE_H
-#define DATATREE_H
+#ifndef _DATATREE_HH
+#define _DATATREE_HH
 //------------------------------------------------------------------------------
 /*! \file 
  \version 1.0
@@ -17,11 +17,11 @@
 #include <map>
 #include <stdio.h>
 //------------------------------------------------------------------------------
-#include "SymbolTable.h"
-#include "OperatorTable.h"
-#include "NumericalConstants.h"
-#include "ModelTypes.h"
-#include "VariableTable.h"
+#include "SymbolTable.hh"
+#include "OperatorTable.hh"
+#include "NumericalConstants.hh"
+#include "ModelTypes.hh"
+#include "VariableTable.hh"
 //------------------------------------------------------------------------------
 
 typedef std::map<std::string,NodeID, std::less<std::string> > TreeMap;
diff --git a/parser.src/include/DynareParser.h b/parser.src/include/DynareParser.hh
similarity index 96%
rename from parser.src/include/DynareParser.h
rename to parser.src/include/DynareParser.hh
index baa007033d91dd3c7f6cd94c9f183692e992caf8..73777b998bd5fc64a4551a12609aa56315952b07 100644
--- a/parser.src/include/DynareParser.h
+++ b/parser.src/include/DynareParser.hh
@@ -1,5 +1,5 @@
-#ifndef DYNAREPARSER_H
-#define DYNAREPARSER_H
+#ifndef _DYNAREPARSER_HH
+#define _DYNAREPARSER_HH
 //------------------------------------------------------------------------------
 /*! \file 
  \version 1.0
@@ -8,17 +8,17 @@
 */
 //------------------------------------------------------------------------------
 #include <sstream>
-#include "ModelParameters.h"
-#include "SymbolTable.h"
-#include "Expression.h"
-#include "NumericalInitialization.h"
-#include "ModelTree.h"
-#include "VariableTable.h"
-#include "Shocks.h"
-#include "SigmaeInitialization.h"
-#include "ComputingTasks.h"
-#include "TmpSymbolTable.h"
-#include "Objects.h"
+#include "ModelParameters.hh"
+#include "SymbolTable.hh"
+#include "Expression.hh"
+#include "NumericalInitialization.hh"
+#include "ModelTree.hh"
+#include "VariableTable.hh"
+#include "Shocks.hh"
+#include "SigmaeInitialization.hh"
+#include "ComputingTasks.hh"
+#include "TmpSymbolTable.hh"
+#include "Objects.hh"
 #ifndef YLMM_basic_parser 
 #include "ylmm/basic_parser.hh"
 #endif
diff --git a/parser.src/include/DynareScanner.h b/parser.src/include/DynareScanner.hh
similarity index 89%
rename from parser.src/include/DynareScanner.h
rename to parser.src/include/DynareScanner.hh
index eca845afd8f47aa0ff34270f0bdb9e40774e91c5..b5805b1e873d46bf373cc076aee1a124d28e0b0d 100644
--- a/parser.src/include/DynareScanner.h
+++ b/parser.src/include/DynareScanner.hh
@@ -1,5 +1,5 @@
-#ifndef DYNARESCANNER_H
-#define DYNARESCANNER_H
+#ifndef _DYNARESCANNER_HH
+#define _DYNARESCANNER_HH
 //------------------------------------------------------------------------------
 /*! \file 
  \version 1.0
@@ -10,12 +10,12 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include "DynareBison.h"
+#include "DynareBison.hh"
 #ifndef YLMM_basic_scanner
 #include "ylmm/basic_scanner.hh"
 #endif
-#include "Objects.h"
-#include "SymbolTable.h"
+#include "Objects.hh"
+#include "SymbolTable.hh"
 //------------------------------------------------------------------------------
 /*! \namespace scanner
  */
diff --git a/parser.src/include/Expression.h b/parser.src/include/Expression.hh
similarity index 91%
rename from parser.src/include/Expression.h
rename to parser.src/include/Expression.hh
index 5a530450cc2ea223a2f3f2680bdae142299ca48a..e93f98ad95115893784e6c9150d9d3bedf67229f 100644
--- a/parser.src/include/Expression.h
+++ b/parser.src/include/Expression.hh
@@ -1,5 +1,5 @@
-#ifndef EXPRESSION_H
-#define EXPRESSION_H
+#ifndef _EXPRESSION_HH
+#define _EXPRESSION_HH
 //------------------------------------------------------------------------------
 /** \file 
  * \version 1.0
@@ -11,9 +11,9 @@
 #include <vector>
 #include <sstream>
 //------------------------------------------------------------------------------
-#include "SymbolTable.h"
-#include "OperatorTable.h"
-#include "NumericalConstants.h"
+#include "SymbolTable.hh"
+#include "OperatorTable.hh"
+#include "NumericalConstants.hh"
 //------------------------------------------------------------------------------
 struct Token
 {
diff --git a/parser.src/include/Interface.h b/parser.src/include/Interface.hh
similarity index 87%
rename from parser.src/include/Interface.h
rename to parser.src/include/Interface.hh
index 22d58dd27fa0c1b42ffafb01f860247272e2f705..70f7478794a4a94be4009188b2c1310ab149afa7 100644
--- a/parser.src/include/Interface.h
+++ b/parser.src/include/Interface.hh
@@ -1,3 +1,6 @@
+#ifndef _INTERFACE_HH
+#define _INTERFACE_HH
+
 namespace interfaces {
     std::string comment();
     std::string delete_file(std::string s);
@@ -8,3 +11,5 @@ namespace interfaces {
     std::string strvcat(std::string s1, std::string s2);
     std::string load_model_function_files(std::string filename);
 }
+
+#endif
diff --git a/parser.src/include/ModelParameters.h b/parser.src/include/ModelParameters.hh
similarity index 93%
rename from parser.src/include/ModelParameters.h
rename to parser.src/include/ModelParameters.hh
index c98743bb27d4fe3cee707cd5fddcb1d25d49ff57..b23efbd6e789a51d18d41a34e635fbd98476216a 100644
--- a/parser.src/include/ModelParameters.h
+++ b/parser.src/include/ModelParameters.hh
@@ -1,5 +1,5 @@
-#ifndef MODELPARAMETERS_H
-#define MODELPARAMETERS_H
+#ifndef _MODELPARAMETERS_HH
+#define _MODELPARAMETERS_HH
 //------------------------------------------------------------------------------
 /*! \file 
  \version 1.0
diff --git a/parser.src/include/ModelTree.h b/parser.src/include/ModelTree.hh
similarity index 92%
rename from parser.src/include/ModelTree.h
rename to parser.src/include/ModelTree.hh
index 7e5b755dda0febd0ee4ca1c364cdd40b3c2c5732..74af4352c7eac4a24e1449d00526377f59b83dad 100644
--- a/parser.src/include/ModelTree.h
+++ b/parser.src/include/ModelTree.hh
@@ -1,5 +1,5 @@
-#ifndef MODELTREE_H
-#define MODELTREE_H
+#ifndef _MODELTREE_HH
+#define _MODELTREE_HH
 //------------------------------------------------------------------------------
 /*! \file 
  \version 1.0
@@ -14,11 +14,11 @@
 #include <sstream>
 #include <fstream>
 //------------------------------------------------------------------------------
-#include "SymbolTable.h"
-#include "OperatorTable.h"
-#include "NumericalConstants.h"
-#include "ModelTypes.h"
-#include "DataTree.h"
+#include "SymbolTable.hh"
+#include "OperatorTable.hh"
+#include "NumericalConstants.hh"
+#include "ModelTypes.hh"
+#include "DataTree.hh"
 //------------------------------------------------------------------------------
 /*!
  \class  ModelTree
diff --git a/parser.src/include/ModelTypes.h b/parser.src/include/ModelTypes.hh
similarity index 95%
rename from parser.src/include/ModelTypes.h
rename to parser.src/include/ModelTypes.hh
index 4b6c8cb6423a03f04fee07d153fc5ad00e443798..b1ef8eefd6d41112a1ac4071600e2529d9188696 100644
--- a/parser.src/include/ModelTypes.h
+++ b/parser.src/include/ModelTypes.hh
@@ -1,5 +1,5 @@
-#ifndef MODELTYPES
-#define MODELTYPES
+#ifndef _MODELTYPES_HH
+#define _MODELTYPES_HH
 //------------------------------------------------------------------------------
 /*! \file 
  \version 1.0
diff --git a/parser.src/include/NumericalConstants.h b/parser.src/include/NumericalConstants.hh
similarity index 91%
rename from parser.src/include/NumericalConstants.h
rename to parser.src/include/NumericalConstants.hh
index 210d95b6676f1b82ce05d23abffe3eace9c25072..0bc3d7356554cda59a6ae8845f4227077f9b6bd8 100644
--- a/parser.src/include/NumericalConstants.h
+++ b/parser.src/include/NumericalConstants.hh
@@ -1,5 +1,5 @@
-#ifndef NUMERICALCONSTANTS_H
-#define NUMERICALCONSTANTS_H
+#ifndef _NUMERICALCONSTANTS_HH
+#define _NUMERICALCONSTANTS_HH
 //------------------------------------------------------------------------------
 /** \file 
  * \version 1.0
diff --git a/parser.src/include/NumericalInitialization.h b/parser.src/include/NumericalInitialization.hh
similarity index 94%
rename from parser.src/include/NumericalInitialization.h
rename to parser.src/include/NumericalInitialization.hh
index 46091485dd9f1bca2454876e4429d8216e102564..c2994c9652db28579d79319aef41298c0860e117 100644
--- a/parser.src/include/NumericalInitialization.h
+++ b/parser.src/include/NumericalInitialization.hh
@@ -1,5 +1,5 @@
-#ifndef NUMERICALINITIALIZATION_H
-#define NUMERICALINITIALIZATION_H
+#ifndef _NUMERICALINITIALIZATION_HH
+#define _NUMERICALINITIALIZATION_HH
 //------------------------------------------------------------------------------
 /*! \file 
  \version 1.0
@@ -11,7 +11,7 @@
 #include <string>
 #include <sstream>
 //------------------------------------------------------------------------------
-#include "SymbolTable.h"
+#include "SymbolTable.hh"
 //------------------------------------------------------------------------------
 /*! \class  NumericalInitialization
  \brief  Handles numerical initialization of Endogenousous and Exogenousous variables.
diff --git a/parser.src/include/Objects.h b/parser.src/include/Objects.hh
similarity index 91%
rename from parser.src/include/Objects.h
rename to parser.src/include/Objects.hh
index 3220085c2712caf63f08458d7ce30ea263997f21..09def808e2248d7d8d58b55720904e3817ec5835 100644
--- a/parser.src/include/Objects.h
+++ b/parser.src/include/Objects.hh
@@ -1,5 +1,5 @@
-#ifndef OBJECTS_HH
-#define OBJECTS_HH
+#ifndef _OBJECTS_HH
+#define _OBJECTS_HH
 //------------------------------------------------------------------------------
 /*! \file 
  \version 1.0
@@ -8,8 +8,8 @@
 */
 //------------------------------------------------------------------------------
 using namespace std;
-#include "SymbolTable.h"
-#include "ModelTypes.h"
+#include "SymbolTable.hh"
+#include "ModelTypes.hh"
 //------------------------------------------------------------------------------
 namespace dynare 
 {
diff --git a/parser.src/include/OperatorTable.h b/parser.src/include/OperatorTable.hh
similarity index 93%
rename from parser.src/include/OperatorTable.h
rename to parser.src/include/OperatorTable.hh
index f04da7ce223b2fe068da640f49ecbf0c20b1f2f9..c1d76b20fedf8241335a5794383ea048e994fd72 100644
--- a/parser.src/include/OperatorTable.h
+++ b/parser.src/include/OperatorTable.hh
@@ -1,5 +1,5 @@
-#ifndef OPERATORTABLE_H
-#define OPERATORTABLE_H
+#ifndef _OPERATORTABLE_HH
+#define _OPERATORTABLE_HH
 //------------------------------------------------------------------------------
 /** \file 
  * \version 1.0
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 //------------------------------------------------------------------------------
-#include "DynareBison.h"
+#include "DynareBison.hh"
 //------------------------------------------------------------------------------
 /*!
   \class  OperatorTable
diff --git a/parser.src/include/OutputFile.h b/parser.src/include/OutputFile.hh
similarity index 92%
rename from parser.src/include/OutputFile.h
rename to parser.src/include/OutputFile.hh
index 37e5a85290e6d2f3477aebe106cfae58cafdab6d..10ec95c4ceaa5fa9e23fc5b146b18a0de726f5f9 100644
--- a/parser.src/include/OutputFile.h
+++ b/parser.src/include/OutputFile.hh
@@ -1,5 +1,5 @@
-#ifndef OUTPUTFILE
-#define OUTPUTFILE
+#ifndef _OUTPUTFILE_HH
+#define _OUTPUTFILE_HH
 //------------------------------------------------------------------------------
 /*! \file 
  \version 1.0
diff --git a/parser.src/include/Shocks.h b/parser.src/include/Shocks.hh
similarity index 94%
rename from parser.src/include/Shocks.h
rename to parser.src/include/Shocks.hh
index 4a8ca4f36255a10b856eb3053533c36f32773689..a39d184e805859c4dd1260d55352fc1c7de9b415 100644
--- a/parser.src/include/Shocks.h
+++ b/parser.src/include/Shocks.hh
@@ -1,5 +1,5 @@
-#ifndef SHOCKS_H
-#define SHOCKS_H
+#ifndef _SHOCKS_HH
+#define _SHOCKS_HH
 //------------------------------------------------------------------------------
 /** \file 
  * \version 1.0
diff --git a/parser.src/include/SigmaeInitialization.h b/parser.src/include/SigmaeInitialization.hh
similarity index 93%
rename from parser.src/include/SigmaeInitialization.h
rename to parser.src/include/SigmaeInitialization.hh
index dd00827baf84e98b02ceaf1fc7b58ed880ec881e..03ee81541bdd6515af6dfbe25bebe5dae3c2b1ae 100644
--- a/parser.src/include/SigmaeInitialization.h
+++ b/parser.src/include/SigmaeInitialization.hh
@@ -1,5 +1,5 @@
-#ifndef SIGMAEINITIALIZATION_H
-#define SIGMAEINITIALIZATION_H
+#ifndef _SIGMAEINITIALIZATION_HH
+#define _SIGMAEINITIALIZATION_HH
 //------------------------------------------------------------------------------
 /*! \file 
  \version 1.0
diff --git a/parser.src/include/SymbolTable.h b/parser.src/include/SymbolTable.hh
similarity index 94%
rename from parser.src/include/SymbolTable.h
rename to parser.src/include/SymbolTable.hh
index a7ba4d3a3cba3410fa6e769287a51759ed2fafd7..d0d3e56332873fbc97e2d9cac14ac70c07591e05 100644
--- a/parser.src/include/SymbolTable.h
+++ b/parser.src/include/SymbolTable.hh
@@ -1,5 +1,5 @@
-#ifndef SYMBOLTABLE_H
-#define SYMBOLTABLE_H
+#ifndef _SYMBOLTABLE_HH
+#define _SYMBOLTABLE_HH
 //------------------------------------------------------------------------------
 /*! \file 
  \version 1.0
@@ -12,8 +12,8 @@
 #include <vector>
 #include <sstream>
 //------------------------------------------------------------------------------
-#include "ModelParameters.h"
-#include "SymbolTableTypes.h"
+#include "ModelParameters.hh"
+#include "SymbolTableTypes.hh"
 //------------------------------------------------------------------------------
 /*!
  \class SymbolTable 
diff --git a/parser.src/include/SymbolTableTypes.h b/parser.src/include/SymbolTableTypes.hh
similarity index 93%
rename from parser.src/include/SymbolTableTypes.h
rename to parser.src/include/SymbolTableTypes.hh
index 6093363b6d483a71376c7a6f52891773f40b02b4..97c3011fa0018cc160d1d03943376b2ea2c9d8f4 100644
--- a/parser.src/include/SymbolTableTypes.h
+++ b/parser.src/include/SymbolTableTypes.hh
@@ -1,5 +1,5 @@
-#ifndef SYMBOLTABLETYPES_H
-#define SYMBOLTABLETYPES_H
+#ifndef _SYMBOLTABLETYPES_HH
+#define _SYMBOLTABLETYPES_HH
 //------------------------------------------------------------------------------
 /*! \file 
  \version 1.0
diff --git a/parser.src/include/TmpSymbolTable.h b/parser.src/include/TmpSymbolTable.hh
similarity index 93%
rename from parser.src/include/TmpSymbolTable.h
rename to parser.src/include/TmpSymbolTable.hh
index 70b04ffa12c8331fddd7cf5ab2f92f24e94b4565..f892627962998206dcfc1fa3f6b5337c60f34a39 100644
--- a/parser.src/include/TmpSymbolTable.h
+++ b/parser.src/include/TmpSymbolTable.hh
@@ -1,5 +1,5 @@
-#ifndef TMPSYMBOLTABLE_H
-#define TMPSYMBOLTABLE_H
+#ifndef _TMPSYMBOLTABLE_HH
+#define _TMPSYMBOLTABLE_HH
 //------------------------------------------------------------------------------
 /** \file 
  * \version 1.0
diff --git a/parser.src/include/VariableTable.h b/parser.src/include/VariableTable.hh
similarity index 95%
rename from parser.src/include/VariableTable.h
rename to parser.src/include/VariableTable.hh
index e08ec38438deba9546b12fe4b96ae7d2da0cd4ad..22df45636a79ec316def7ab9caed122a00a2daaa 100644
--- a/parser.src/include/VariableTable.h
+++ b/parser.src/include/VariableTable.hh
@@ -1,5 +1,5 @@
-#ifndef VARIABLETABLE_H
-#define VARIABLETABLE_H
+#ifndef _VARIABLETABLE_HH
+#define _VARIABLETABLE_HH
 //------------------------------------------------------------------------------
 /** \file 
  * \version 1.0
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 //------------------------------------------------------------------------------
-#include "SymbolTable.h" 
+#include "SymbolTable.hh"
 //------------------------------------------------------------------------------
 /*! 
  \class Variable