Index: /trunk/MagicSoft/Mars/manalysis/MHillas.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MHillas.cc	(revision 976)
+++ /trunk/MagicSoft/Mars/manalysis/MHillas.cc	(revision 977)
@@ -44,7 +44,9 @@
 #include <TEllipse.h>
 
+#include "MGeomPix.h"
+#include "MGeomCam.h"
+
+#include "MCerPhotPix.h"
 #include "MCerPhotEvt.h"
-#include "MCerPhotPix.h"
-#include "MGeomCam.h"
 
 #include "MLog.h"
Index: /trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc	(revision 976)
+++ /trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc	(revision 977)
@@ -49,4 +49,5 @@
 
 #include "MParList.h"
+#include "MGeomPix.h"
 #include "MGeomCam.h"
 #include "MCerPhotPix.h"
Index: /trunk/MagicSoft/Mars/mgui/MCamDisplay.h
===================================================================
--- /trunk/MagicSoft/Mars/mgui/MCamDisplay.h	(revision 976)
+++ /trunk/MagicSoft/Mars/mgui/MCamDisplay.h	(revision 977)
@@ -12,5 +12,4 @@
 class TText;
 class TVirtualPad;
-class TClonesArray;
 
 class MGeomCam;
Index: /trunk/MagicSoft/Mars/mgui/MGeomCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mgui/MGeomCam.cc	(revision 976)
+++ /trunk/MagicSoft/Mars/mgui/MGeomCam.cc	(revision 977)
@@ -36,5 +36,8 @@
 #include "MGeomCam.h"
 
+#include <TObjArray.h>
+
 #include "MLog.h"
+#include "MGeomPix.h"
 #include "MHexagon.h"
 
@@ -63,4 +66,35 @@
 }
 
+// --------------------------------------------------------------------------
+//
+//  Destructor delete the pixel array with all pixels
+//
+MGeomCam::~MGeomCam()
+{
+    delete fPixels;
+}
+
+// --------------------------------------------------------------------------
+//
+// Return the i-th pixel object
+//
+inline MGeomPix &MGeomCam::operator[](Int_t i)
+{
+    return *(MGeomPix*)fPixels->At(i);
+}
+
+// --------------------------------------------------------------------------
+//
+// Return the i-th pixel object
+//
+inline MGeomPix &MGeomCam::operator[](Int_t i) const
+{
+    return *(MGeomPix*)fPixels->At(i);
+}
+
+// --------------------------------------------------------------------------
+//
+// Calculate the maximum radius of the camera. This is ment for GUI layout.
+//
 void MGeomCam::CalcMaxRadius()
 {
Index: /trunk/MagicSoft/Mars/mgui/MGeomCam.h
===================================================================
--- /trunk/MagicSoft/Mars/mgui/MGeomCam.h	(revision 976)
+++ /trunk/MagicSoft/Mars/mgui/MGeomCam.h	(revision 977)
@@ -5,13 +5,10 @@
 #include "MAGIC.h"
 #endif
-#ifndef ROOT_TObjArray
-#include <TObjArray.h>
-#endif
 #ifndef MPARCONTAINER_H
 #include "MParContainer.h"
 #endif
-#ifndef MGEOMPIX_H
-#include "MGeomPix.h"
-#endif
+
+class MGeomPix;
+class TObjArray;
 
 class MGeomCam : public MParContainer
@@ -30,11 +27,11 @@
     MGeomCam(UInt_t npix, const char *name=NULL, const char *title=NULL);
 
-    virtual ~MGeomCam() { delete fPixels; }
+    virtual ~MGeomCam();
 
     UInt_t  GetNumPixels() const { return fNumPixels; }
     Float_t GetMaxRadius() const { return fMaxRadius; }
 
-    MGeomPix &operator[](Int_t i)       { return *(MGeomPix*)fPixels->At(i); }
-    MGeomPix &operator[](Int_t i) const { return *(MGeomPix*)fPixels->At(i); }
+    MGeomPix &operator[](Int_t i);
+    MGeomPix &operator[](Int_t i) const;
 
     virtual void Print(Option_t *opt=NULL);
Index: /trunk/MagicSoft/Mars/mgui/MGeomCamCT1.cc
===================================================================
--- /trunk/MagicSoft/Mars/mgui/MGeomCamCT1.cc	(revision 976)
+++ /trunk/MagicSoft/Mars/mgui/MGeomCamCT1.cc	(revision 977)
@@ -38,7 +38,9 @@
 
 #include <math.h>     // floor
+
 #include "TCanvas.h"
 
 #include "MLog.h"
+#include "MGeomPix.h"
 
 ClassImp(MGeomCamCT1);
Index: /trunk/MagicSoft/Mars/mgui/MGeomCamMagic.cc
===================================================================
--- /trunk/MagicSoft/Mars/mgui/MGeomCamMagic.cc	(revision 976)
+++ /trunk/MagicSoft/Mars/mgui/MGeomCamMagic.cc	(revision 977)
@@ -38,4 +38,5 @@
 
 #include "MLog.h"
+#include "MGeomPix.h"
 
 ClassImp(MGeomCamMagic)