Index: /trunk/MagicSoft/Mars/manalysis/MHillasSrcCalc.h
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MHillasSrcCalc.h	(revision 1863)
+++ /trunk/MagicSoft/Mars/manalysis/MHillasSrcCalc.h	(revision 1864)
@@ -36,5 +36,5 @@
                    const char *name=NULL, const char *title=NULL);
 
-    void SetInput(TSTring hilname) { fHillasName = hilname; }
+    void SetInput(TString hilname) { fHillasName = hilname; }
 
     ClassDef(MHillasSrcCalc, 1) // task to calculate the source position depandant hillas parameters
Index: /trunk/MagicSoft/Mars/manalysis/MRanForest.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MRanForest.cc	(revision 1863)
+++ /trunk/MagicSoft/Mars/manalysis/MRanForest.cc	(revision 1864)
@@ -38,16 +38,18 @@
 // namely bootstrap aggregating (which is done in GrowForest()) and random //
 // split selection (which is subject to MRanTree::GrowTree())              //
+//                                                                         //
 /////////////////////////////////////////////////////////////////////////////
 #include "MRanForest.h"
-#include <iostream.h>  
-#include <fstream.h>
-
-#include <TFile.h>          // gFile
+
+#include <TMatrix.h>
+
+#include "MHMatrix.h"
+#include "MRanTree.h"
 
 #include "MLog.h"
 #include "MLogManip.h"
 
-
 ClassImp(MRanForest);
+
 // --------------------------------------------------------------------------
 //
@@ -66,6 +68,4 @@
     fTreeHad.Set(fNumTrees);
     fTreeHad.Reset();
-
-    return;
 }
 
@@ -83,6 +83,4 @@
 
     fUsePriors=kTRUE;
-
-    return;
 }
 
@@ -106,6 +104,4 @@
     fForest=new TObjArray();
     fForest->SetOwner(kTRUE);
-
-    return;
 }
 
@@ -115,6 +111,4 @@
     // ndsize + numtry are set in MRanForestGrow!!
     fRanTree=rantree;
-
-    return;
 }
 
Index: /trunk/MagicSoft/Mars/manalysis/MRanForest.h
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MRanForest.h	(revision 1863)
+++ /trunk/MagicSoft/Mars/manalysis/MRanForest.h	(revision 1864)
@@ -18,23 +18,11 @@
 #endif
 
-#ifndef ROOT_TObjArray
-#include <TObjArray.h>
-#endif
-
 #ifndef ROOT_TRandom
 #include <TRandom.h>
 #endif
 
-#ifndef ROOT_TMatrix
-#include <TMatrix.h>
-#endif
-
-#ifndef MARS_MHMatrix
-#include "MHMatrix.h"
-#endif
-
-#ifndef MARS_MRanTree
-#include "MRanTree.h"
-#endif
+class MHMatrix;
+class MRanTree;
+class TVector;
 
 class MRanForest : public MParContainer
Index: /trunk/MagicSoft/Mars/manalysis/MRanForestCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MRanForestCalc.cc	(revision 1863)
+++ /trunk/MagicSoft/Mars/manalysis/MRanForestCalc.cc	(revision 1864)
@@ -36,6 +36,4 @@
 #include "MRanForestCalc.h"
 
-#include <fstream.h>
-
 #include "MHMatrix.h" // must be before MLogManip.h
 
@@ -44,6 +42,7 @@
 
 #include "MParList.h"
-#include "MDataChain.h"
-#include "MDataArray.h"
+
+#include "MRanTree.h"
+#include "MRanForest.h"
 
 #include "MHadronness.h"
@@ -53,4 +52,5 @@
 static const TString gsDefName  = "MRanForestCalc";
 static const TString gsDefTitle = "Tree Classification Loop 1/2";
+
 // --------------------------------------------------------------------------
 //
Index: /trunk/MagicSoft/Mars/manalysis/MRanForestCalc.h
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MRanForestCalc.h	(revision 1863)
+++ /trunk/MagicSoft/Mars/manalysis/MRanForestCalc.h	(revision 1864)
@@ -6,11 +6,9 @@
 #endif
 
-#ifndef MARS_MRanForest
-#include "MRanForest.h"
-#endif
-
 class MParList;
 class MHadronness;
 class MDataArray;
+class MRanTree;
+class MRanForest;
 
 class MRanForestCalc : public MTask
Index: /trunk/MagicSoft/Mars/manalysis/MRanForestFill.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MRanForestFill.cc	(revision 1863)
+++ /trunk/MagicSoft/Mars/manalysis/MRanForestFill.cc	(revision 1864)
@@ -36,12 +36,10 @@
 #include "MRanForestFill.h"
 
-#include <fstream.h>
-
 #include "MLog.h"
 #include "MLogManip.h"
 
 #include "MParList.h"
-#include "MDataChain.h"
-#include "MDataArray.h"
+
+#include "MRanForest.h"
 
 ClassImp(MRanForestFill);
@@ -49,4 +47,5 @@
 static const TString gsDefName  = "MRanForestFill";
 static const TString gsDefTitle = "Tree Classification Loop 1/2";
+
 // --------------------------------------------------------------------------
 //
@@ -98,5 +97,4 @@
 Bool_t MRanForestFill::Process()
 {
-
     fNum++;
     fRanForest->SetTree(fRanTree);
Index: /trunk/MagicSoft/Mars/manalysis/MRanForestFill.h
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MRanForestFill.h	(revision 1863)
+++ /trunk/MagicSoft/Mars/manalysis/MRanForestFill.h	(revision 1864)
@@ -6,12 +6,6 @@
 #endif
 
-#ifndef MARS_MRanForest
-#include "MRanForest.h"
-#endif
-
-#ifndef MARS_MRanTree
-#include "MRanTree.h"
-#endif
-
+class MRanTree;
+class MRanForest;
 class MParList;
 class MDataArray;
Index: /trunk/MagicSoft/Mars/manalysis/MRanForestGrow.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MRanForestGrow.cc	(revision 1863)
+++ /trunk/MagicSoft/Mars/manalysis/MRanForestGrow.cc	(revision 1864)
@@ -29,9 +29,6 @@
 //  Grows a random forest.                                                 //
 //                                                                         //
-//                                                                         //
 /////////////////////////////////////////////////////////////////////////////
 #include "MRanForestGrow.h"
-
-#include <fstream.h>
 
 #include "MHMatrix.h" // must be before MLogManip.h
@@ -42,8 +39,12 @@
 #include "MParList.h"
 
+#include "MRanTree.h"
+#include "MRanForest.h"
+
 ClassImp(MRanForestGrow);
 
 static const TString gsDefName  = "MRanForestGrow";
 static const TString gsDefTitle = "Tree Classification Loop 1/2";
+
 // --------------------------------------------------------------------------
 //
@@ -59,5 +60,4 @@
     fName  = name  ? name  : gsDefName.Data();
     fTitle = title ? title : gsDefTitle.Data();
-
 }
 
@@ -128,4 +128,5 @@
     return not_last;
 }
+
 Bool_t MRanForestGrow::PostProcess()
 {
@@ -135,8 +136,8 @@
     return kTRUE;
 }
+
 void MRanForestGrow::SetNumTrees(Int_t n)
 {
     fNumTrees=n;
-    return;
 }
 
@@ -144,5 +145,4 @@
 {
     fNumTry=n;
-    return;
 }
 
@@ -150,4 +150,3 @@
 {
     fNdSize=n;
-    return;
 }
Index: /trunk/MagicSoft/Mars/manalysis/MRanForestGrow.h
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MRanForestGrow.h	(revision 1863)
+++ /trunk/MagicSoft/Mars/manalysis/MRanForestGrow.h	(revision 1864)
@@ -1,11 +1,4 @@
 #ifndef MARS_MRanForestGrow
 #define MARS_MRanForestGrow
-
-#ifndef MARS_MTask
-#include "MTask.h"
-#endif
-
-#include "TRandom.h"
-#include "TMath.h"
 
 /////////////////////////////////////////////////////////////////////////////
@@ -17,9 +10,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
-#include "MRanForest.h"
+#ifndef MARS_MTask
+#include "MTask.h"
+#endif
 
 class MHMatrix;
 class MParList;
 class MRanForest;
+class MRanTree;
 
 class MRanForestGrow : public MTask