Index: trunk/MagicSoft/Mars/manalysis/Makefile
===================================================================
--- trunk/MagicSoft/Mars/manalysis/Makefile	(revision 2735)
+++ trunk/MagicSoft/Mars/manalysis/Makefile	(revision 2736)
@@ -23,6 +23,6 @@
 #
 INCLUDES = -I. -I../mbase -I../mmc -I../mraw -I../mgeom -I../mfilter \
-	   -I../mdata -I../mhist -I../mgui -I../mimage -I../mhistmc \
-           -I../mfileio -I../mmain
+	   -I../mdata -I../mhbase -I../mhist -I../mgui -I../mimage   \
+           -I../mhistmc -I../mfileio -I../mmain
 
 
Index: trunk/MagicSoft/Mars/mcalib/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mcalib/Makefile	(revision 2735)
+++ trunk/MagicSoft/Mars/mcalib/Makefile	(revision 2736)
@@ -22,11 +22,11 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mhist -I../mgui -I../mgeom -I../manalysis \
+INCLUDES = -I. -I../mbase -I../mhbase -I../mgui -I../mgeom -I../manalysis \
 	   -I../mraw
-# mhist: MBinning MH 
-# mgui:  MCamEvent (McalibrationCam)
-# mgeom: MGeomCam (McalibrationCam - necessary?)
+# mhbase:    MBinning MH 
+# mgui:      MCamEvent (McalibrationCam)
+# mgeom:     MGeomCam (McalibrationCam - necessary?)
 # manalysis: MExtractedSignal, MCerPhotEvt (move to mcalib?)
-# mraw: MRawRunHeader, MRawEvtHeader, MRawEvtPixelIter (3xMCalibrationCalc)
+# mraw:      MRawRunHeader, MRawEvtHeader, MRawEvtPixelIter (3xMCalibrationCalc)
 
 
Index: trunk/MagicSoft/Mars/mfilter/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mfilter/Makefile	(revision 2735)
+++ trunk/MagicSoft/Mars/mfilter/Makefile	(revision 2736)
@@ -21,5 +21,5 @@
 
 INCLUDES = -I. -I../mbase -I../mraw -I../mmc -I../mdata -I../manalysis \
-           -I../mfileio  -I../mgeom -I../mimage -I../mhist -I../mmain \
+           -I../mfileio  -I../mgeom -I../mimage -I../mhbase -I../mmain \
            -I../mgui
 
Index: trunk/MagicSoft/Mars/mhist/HistLinkDef.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/HistLinkDef.h	(revision 2735)
+++ trunk/MagicSoft/Mars/mhist/HistLinkDef.h	(revision 2736)
@@ -5,5 +5,4 @@
 #pragma link off all functions;
 
-#pragma link C++ class MH3+;
 #pragma link C++ class MHVsTime+;
 
Index: trunk/MagicSoft/Mars/mhist/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mhist/Makefile	(revision 2735)
+++ trunk/MagicSoft/Mars/mhist/Makefile	(revision 2736)
@@ -22,5 +22,5 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mraw -I../manalysis \
+INCLUDES = -I. -I../mbase -I../mhbase -I../mraw -I../manalysis \
 	   -I../mgui -I../mgeom -I../mdata -I../mfilter -I../mimage \
            -I../mmain -I../mmc -I../mreflector