diff --git a/source/trunk/include/CLASSBackEnd.hxx b/source/trunk/include/CLASSBackEnd.hxx
index 4241d99c2f4831ec32696f0f0844ab41a97e5be7..451866eca913b10fd6b5efbea137364a30514690 100644
--- a/source/trunk/include/CLASSBackEnd.hxx
+++ b/source/trunk/include/CLASSBackEnd.hxx
@@ -22,8 +22,6 @@
 
 using namespace std;
 
-typedef long long int cSecond;
-
 //-----------------------------------------------------------------------------//
 //! Class defining the common properties of all back end fuel cycle facilities
 
diff --git a/source/trunk/include/CLASSConstante.hxx b/source/trunk/include/CLASSConstante.hxx
index 1c23fb85f1f128e07e473a8faee8a47f95cf701e..489b48acd4d0b4096b889495f0f0d1eae8c8f9bc 100644
--- a/source/trunk/include/CLASSConstante.hxx
+++ b/source/trunk/include/CLASSConstante.hxx
@@ -9,14 +9,14 @@
 
 typedef long long int cSecond;
 
-const double AVOGADRO = 6.02214129e23;	// Avogadro Number [1/mol]
+static const double AVOGADRO = 6.02214129e23;	// Avogadro Number [1/mol]
 
-const ZAIMass cZAIMass;					// Mass list of all nuclei stored in [g/mol]
-const ZAIHeat cZAIHeat;					// Thermal power list of all nuclei  [W/nucleus]
-const ZAITox  cZAITox;
+static const ZAIMass cZAIMass;					// Mass list of all nuclei stored in [g/mol]
+static const ZAIHeat cZAIHeat;					// Thermal power list of all nuclei  [W/nucleus]
+static const ZAITox  cZAITox;
 
-const cSecond cYear = 3600*24*365.25;	// Seconds in a year
-DecayDataBank cDecayData;	// Seconds in a year
+static const cSecond cYear = 3600*24*365.25;	// Seconds in a year
+static DecayDataBank cDecayData;	// Seconds in a year
 
 
 #endif
diff --git a/source/trunk/include/CLASSFacility.hxx b/source/trunk/include/CLASSFacility.hxx
index 05807c9864b1d356204a314903486803bc07fafc..9897e97b29f524b3ae61106853ef8e73a46f5378 100644
--- a/source/trunk/include/CLASSFacility.hxx
+++ b/source/trunk/include/CLASSFacility.hxx
@@ -14,12 +14,10 @@
 
 #include "CLASSObject.hxx"
 #include "IsotopicVector.hxx"
-#include "DecayDataBank.hxx"
 
 #include "TNamed.h"
 
 using namespace std;
-typedef long long int cSecond;
 
 class Scenario;
 //-----------------------------------------------------------------------------//
diff --git a/source/trunk/include/CLASSHeaders.hxx b/source/trunk/include/CLASSHeaders.hxx
index 5fc0561f9219fc811f2887bc9af200547fa06b3e..08575e6acb81528b4bac24fe8268902f4bec74de 100755
--- a/source/trunk/include/CLASSHeaders.hxx
+++ b/source/trunk/include/CLASSHeaders.hxx
@@ -18,6 +18,5 @@
 
 #include "EvolutionData.hxx"
 #include "PhysicsModels.hxx"
-#include "DecayDataBank.hxx"
 
 #endif
diff --git a/source/trunk/include/DecayDataBank.hxx b/source/trunk/include/DecayDataBank.hxx
index 0c6902efeea0ca9807cd3f4309a22678225a1487..e9a3d76157a7faedddce594183c2ca978a53a909 100644
--- a/source/trunk/include/DecayDataBank.hxx
+++ b/source/trunk/include/DecayDataBank.hxx
@@ -8,10 +8,8 @@
  */
 
 #include "CLASSObject.hxx"
-#include "TMatrix.h"
 #include "EvolutionData.hxx"
 #include "IsotopicVector.hxx"
-#include "DynamicalSystem.hxx"
 
 #include <map>
 #include <vector>
diff --git a/source/trunk/include/Reactor.hxx b/source/trunk/include/Reactor.hxx
index 79771e22de8849152e04902a84ed79fd5000619d..9728d9f3da4f496a30d03f3dc97c136d1de6ddad 100755
--- a/source/trunk/include/Reactor.hxx
+++ b/source/trunk/include/Reactor.hxx
@@ -16,7 +16,6 @@
 #include "CLASSFuelPlan.hxx"
 
 using namespace std;
-typedef long long int cSecond;
 
 
 class CLASSBackEnd;
diff --git a/source/trunk/src/DecayDataBank.cxx b/source/trunk/src/DecayDataBank.cxx
index 6a854d194a1ca7386327f6bd6af07fe88e37afac..5ddaf2efb93cf2f807f989bc83b0bf4148b22747 100644
--- a/source/trunk/src/DecayDataBank.cxx
+++ b/source/trunk/src/DecayDataBank.cxx
@@ -1,6 +1,5 @@
 #include "DecayDataBank.hxx"
 
-#include "IsotopicVector.hxx"
 #include "CLASSLogger.hxx"
 #include "StringLine.hxx"
 
@@ -31,7 +30,7 @@ DecayDataBank::DecayDataBank():CLASSObject(new CLASSLogger("DecayDataBank.log"))
 	string  CLASSPATH = getenv("CLASS_PATH");
 	string	DB_index_file = CLASSPATH + "/data/DECAY/Decay.idx";
 	fDataBaseIndex = DB_index_file;
-	fOldReadMethod = olfreadmethod;
+	fOldReadMethod = false;
 	fFastCalculation = true;
 	
 	// Warning
@@ -213,7 +212,7 @@ IsotopicVector DecayDataBank::GetDecay(IsotopicVector isotopicvector, cSecond t)
 		cSecond remainingTime = t;
 		for(int i = 16; i >= 0; i--)
 		{
-			evolutionDecade[i] = (int)remainingTime/pow(10,i);
+			evolutionDecade[i] = (cSecond)remainingTime/pow(10,i);
 			remainingTime -= evolutionDecade[i]*pow(10,i);
 		}
 		
diff --git a/source/trunk/src/FabricationPlant.cxx b/source/trunk/src/FabricationPlant.cxx
index 441ea890200726fafdf27643b5f6d83ff42f6070..1534fd18ffa9211df8c39aec3f8e6eb709588dc4 100644
--- a/source/trunk/src/FabricationPlant.cxx
+++ b/source/trunk/src/FabricationPlant.cxx
@@ -3,7 +3,6 @@
 #include "Storage.hxx"
 #include "Reactor.hxx"
 #include "EvolutionData.hxx"
-#include "DecayDataBank.hxx"
 #include "PhysicsModels.hxx"
 #include "IsotopicVector.hxx"
 #include "Scenario.hxx"
diff --git a/source/trunk/src/SeparationPlant.cxx b/source/trunk/src/SeparationPlant.cxx
index 5cd68fdd1a954697e59c0ac98717e05a187ae7d2..c9781b914450c533a476ba369d0caad69d4989b5 100644
--- a/source/trunk/src/SeparationPlant.cxx
+++ b/source/trunk/src/SeparationPlant.cxx
@@ -1,7 +1,5 @@
 #include "SeparationPlant.hxx"
 
-#include "IsotopicVector.hxx"
-#include "Storage.hxx"
 #include "Scenario.hxx"
 #include "CLASSLogger.hxx"
 
diff --git a/source/trunk/src/ZAIMass.cxx b/source/trunk/src/ZAIMass.cxx
index ec95f32898b9ab953160440b58b198a87ca61ac8..de948ee164e68ea1f1eb7d9dfc0f451cd933f966 100644
--- a/source/trunk/src/ZAIMass.cxx
+++ b/source/trunk/src/ZAIMass.cxx
@@ -42,7 +42,6 @@ ZAIMass::ZAIMass()
 	}
 
 	infile.close();
-
 }