Index: trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc	(revision 2883)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc	(revision 2884)
@@ -39,9 +39,7 @@
 /////////////////////////////////////////////////////////////////////////////
 #include "MCalibrationCam.h"
-#include "MCalibrationPix.h"
-#include "MHCalibrationPixel.h"
-#include "MCalibrationBlindPix.h"
-#include "MCalibrationConfig.h"
-
+
+#include <TH2.h>
+#include <TCanvas.h>
 #include <TClonesArray.h>
 
@@ -49,7 +47,12 @@
 #include "MLogManip.h"
 
-#include "TCanvas.h"
-
 #include "MGeomCam.h"
+
+#include "MCalibrationPix.h"
+#include "MCalibrationConfig.h"
+#include "MCalibrationBlindPix.h"
+#include "MCalibrationPINDiode.h"
+
+#include "MHCalibrationPixel.h"
 
 ClassImp(MCalibrationCam);
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h	(revision 2883)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h	(revision 2884)
@@ -6,33 +6,8 @@
 #endif
 
-#ifndef MARS_MCalibrationPix
-#include "MCalibrationPix.h"
-#endif
+class TH1D;
+class TH2D;
+class TClonesArray;
 
-#ifndef MARS_MCalibrationBlindPix
-#include "MCalibrationBlindPix.h"
-#endif
-
-#ifndef MARS_MCalibrationPINDiode
-#include "MCalibrationPINDiode.h"
-#endif
-
-#ifndef ROOT_TClonesArray
-#include <TClonesArray.h>
-#endif
-
-#ifndef ROOT_TH1F
-#include <TH1F.h>
-#endif
-
-#ifndef ROOT_TH1D
-#include <TH1D.h>
-#endif
-
-#ifndef ROOT_TH2D
-#include <TH2D.h>
-#endif
-
-class MGeomCam;
 class MCalibrationPix;
 class MCalibrationBlindPix;