Index: trunk/MagicSoft/Mars/manalysis/Makefile
===================================================================
--- trunk/MagicSoft/Mars/manalysis/Makefile	(revision 3330)
+++ trunk/MagicSoft/Mars/manalysis/Makefile	(revision 3331)
@@ -25,5 +25,5 @@
 	   -I../mdata -I../mhbase -I../mhist -I../mgui -I../mimage   \
            -I../mhistmc -I../mfileio -I../mmain -I../mcalib -I../msignal         \
-           -I../mpointing -I../mtools
+           -I../mpointing -I../mtools -I../mfbase
 # mcalib: MGeomApply (MCalibrationCam)
 
Index: trunk/MagicSoft/Mars/mbase/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mbase/Makefile	(revision 3330)
+++ trunk/MagicSoft/Mars/mbase/Makefile	(revision 3331)
@@ -20,7 +20,7 @@
 # @endcode 
 
-INCLUDES = -I. -I../mfileio -I../mfilter -I../mastro
+INCLUDES = -I. -I../mfileio -I../mfbase -I../mastro
 # mfileio:  MRead  (MEvtLoop)
-# mfilter:  MF     (MContinue)
+# mfbase:   MF     (MContinue)
 # mastro:   MAstro (MTime)
 
Index: trunk/MagicSoft/Mars/mfbase/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mfbase/Makefile	(revision 3330)
+++ trunk/MagicSoft/Mars/mfbase/Makefile	(revision 3331)
@@ -20,5 +20,5 @@
 # @endcode 
 
-INCLUDES = -I. -I../mbase -I../mdata
+INCLUDES = -I. -I../mbase -I../mdata -I../mfileio -I../mhbase
 
 # @code 
Index: trunk/MagicSoft/Mars/mfilter/FilterLinkDef.h
===================================================================
--- trunk/MagicSoft/Mars/mfilter/FilterLinkDef.h	(revision 3330)
+++ trunk/MagicSoft/Mars/mfilter/FilterLinkDef.h	(revision 3331)
@@ -5,17 +5,9 @@
 #pragma link off all functions;
 
-#pragma link C++ class MFilterList+;
-
-#pragma link C++ class MF+;
 #pragma link C++ class MFAlpha+;
-#pragma link C++ class MFEventSelector+;
-#pragma link C++ class MFEventSelector2+;
 #pragma link C++ class MFTriggerLvl1+;
 #pragma link C++ class MFTriggerLvl2+;
 #pragma link C++ class MFGeomag+;
 #pragma link C++ class MFParticleId+;
-#pragma link C++ class MFDataChain+;
-#pragma link C++ class MFDataMember+;
-#pragma link C++ class MFRealTimePeriod+;
 
 #pragma link C++ class MFCT1SelBasic+;
Index: trunk/MagicSoft/Mars/mfilter/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mfilter/Makefile	(revision 3330)
+++ trunk/MagicSoft/Mars/mfilter/Makefile	(revision 3331)
@@ -20,7 +20,7 @@
 # @endcode 
 
-INCLUDES = -I. -I../mbase -I../mraw -I../mmc -I../mdata -I../manalysis \
-           -I../mfileio  -I../mgeom -I../mimage -I../mhbase -I../mmain \
-           -I../mgui -I../msignal
+INCLUDES = -I. -I../mbase -I../mfbase -I../mraw -I../mmc -I../mdata \
+           -I../manalysis -I../mfileio  -I../mgeom -I../mimage      \
+           -I../mhbase -I../mmain -I../mgui -I../msignal
 
 # @code 
@@ -35,13 +35,6 @@
 SRCFILES = MFTriggerLvl1.cc \
 	   MFTriggerLvl2.cc \
-	   MF.cc \
-           MFilterList.cc \
-           MFEventSelector.cc \
-           MFEventSelector2.cc \
-	   MFDataChain.cc \
-	   MFDataMember.cc \
 	   MFGeomag.cc \
 	   MFParticleId.cc \
-           MFRealTimePeriod.cc \
 	   MFAlpha.cc \
 	   MFCT1SelBasic.cc \
Index: trunk/MagicSoft/Mars/mmain/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mmain/Makefile	(revision 3330)
+++ trunk/MagicSoft/Mars/mmain/Makefile	(revision 3331)
@@ -24,5 +24,5 @@
 INCLUDES = -I. -I../mbase -I../manalysis -I../mdatacheck -I../mraw        \
 	   -I../mgui -I../mgeom -I../mhbase -I../mhist -I../mmontecarlo   \
-           -I../mfileio -I../mimage -I../mhistmc -I../mgbase -I../mfilter \
+           -I../mfileio -I../mimage -I../mhistmc -I../mgbase -I../mfbase \
            -I../mdata -I../msignal
 
Index: trunk/MagicSoft/Mars/mmontecarlo/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mmontecarlo/Makefile	(revision 3330)
+++ trunk/MagicSoft/Mars/mmontecarlo/Makefile	(revision 3331)
@@ -24,5 +24,5 @@
 INCLUDES = -I. -I../mbase -I../mmc -I../mhbase -I../mhist -I../mhistmc \
 	   -I../mgeom -I../manalysis -I../mtools -I../mfileio          \
-           -I../mfilter -I../mdata
+           -I../mfilter -I../mdata -I../mfbase
 
 #------------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mreport/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mreport/Makefile	(revision 3330)
+++ trunk/MagicSoft/Mars/mreport/Makefile	(revision 3331)
@@ -22,5 +22,5 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mtools -I../mcamera -I../mgui
+INCLUDES = -I. -I../mbase -I../mastro -I../mcamera -I../mgui
 # mgui - MCameraDC <MCamEvent>
 
Index: trunk/MagicSoft/Mars/mtools/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mtools/Makefile	(revision 3330)
+++ trunk/MagicSoft/Mars/mtools/Makefile	(revision 3331)
@@ -23,5 +23,5 @@
 #
 INCLUDES = -I. -I../mbase -I../mgui -I../mgeom -I../mdata -I../mhbase \
-	   -I../mfileio -I../mfilter -I../manalysis
+	   -I../mfileio -I../mfbase -I../manalysis
 
 #manalysis: MChisqEval (MParameters)