Index: trunk/MagicSoft/Mars/manalysis/MRanTree.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MRanTree.cc	(revision 1864)
+++ trunk/MagicSoft/Mars/manalysis/MRanTree.cc	(revision 1866)
@@ -32,5 +32,13 @@
 /////////////////////////////////////////////////////////////////////////////
 #include "MRanTree.h"
-#include <iostream>
+
+#include <ostream.h>
+
+#include <TVector.h>
+#include <TMatrix.h>
+#include <TRandom.h>
+
+#include "MDataArray.h"
+
 ClassImp(MRanTree);
 
@@ -49,6 +57,4 @@
     // minimum nodesize of terminal nodes
     fNdSize=TMath::Max(1,n);//at least 1 event per node
-
-    return;
 }
 
@@ -61,6 +67,4 @@
     if(fData)
         fNumTry=TMath::Min(fData->GetNumEntries(),n);
-
-    return;
 }
 
@@ -128,6 +132,4 @@
     fTreeMap2.Set(fNumNodes);
     fBestSplit.Set(fNumNodes);
-
-    return;
 }
 
@@ -450,6 +452,4 @@
 {
     fData=rules;
-
-    return;
 }
 
Index: trunk/MagicSoft/Mars/manalysis/MRanTree.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MRanTree.h	(revision 1864)
+++ trunk/MagicSoft/Mars/manalysis/MRanTree.h	(revision 1866)
@@ -4,12 +4,4 @@
 #ifndef MARS_MParContainer
 #include "MParContainer.h"
-#endif
-
-#ifndef MARS_MDataArray
-#include "MDataArray.h"
-#endif
-
-#ifndef ROOT_TRandom
-#include <TRandom.h>
 #endif
 
@@ -22,11 +14,8 @@
 #endif
 
-#ifndef ROOT_TMatrix
-#include <TMatrix.h>
-#endif
-
-#ifndef ROOT_TVector
-#include <TVector.h>
-#endif
+class TMatrix;
+class TVector;
+class TRandom;
+class MDataArray;
 
 class MRanTree : public MParContainer