Index: trunk/Mars/MLinkDef.h
===================================================================
--- trunk/Mars/MLinkDef.h	(revision 17126)
+++ trunk/Mars/MLinkDef.h	(revision 17127)
@@ -5,3 +5,19 @@
 #pragma link off all functions;
 
+// I/O
+#pragma link C++ namespace Huffman+;
+#pragma link C++ class izstream+;
+#pragma link C++ class fits+;
+#pragma link C++ class ofits+;
+#pragma link C++ class zfits+;
+#pragma link C++ class factfits+;
+
+// mcore
+#pragma link C++ class DrsCalibrateTime+;
+#pragma link C++ class PixelMap+;
+#pragma link C++ class PixelMapEntry+;
+#pragma link C++ class BiasMap+;
+#pragma link C++ class BiasMapEntry+;
+#pragma link C++ class Interpolator2D+;
+
 #endif
Index: trunk/Mars/Makefile
===================================================================
--- trunk/Mars/Makefile	(revision 17126)
+++ trunk/Mars/Makefile	(revision 17127)
@@ -97,5 +97,11 @@
 .SUFFIXES: .c .cc .h .o .cxx .hxx .gch
 
-SRCFILES = 
+SRCFILES = \
+	   mcore/izstream.h \
+	   mcore/ofits.h \
+	   mcore/factfits.h \
+	   mcore/DrsCalib.h \
+	   mcore/PixelMap.h \
+	   mcore/Interpolator2D.h
 
 ############################################################
Index: trunk/Mars/mbase/BaseLinkDef.h
===================================================================
--- trunk/Mars/mbase/BaseLinkDef.h	(revision 17126)
+++ trunk/Mars/mbase/BaseLinkDef.h	(revision 17127)
@@ -17,16 +17,5 @@
 
 // I/O
-#pragma link C++ class izstream+;
-#pragma link C++ class fits+;
-#pragma link C++ class ofits+;
 //#pragma link C++ class MBzlib2+;
-
-// mcore
-#pragma link C++ class DrsCalibrateTime+;
-#pragma link C++ class PixelMap+;
-#pragma link C++ class PixelMapEntry+;
-#pragma link C++ class BiasMap+;
-#pragma link C++ class BiasMapEntry+;
-#pragma link C++ class Interpolator2D+;
 
 // Basic Network Tools
Index: trunk/Mars/mbase/Makefile
===================================================================
--- trunk/Mars/mbase/Makefile	(revision 17126)
+++ trunk/Mars/mbase/Makefile	(revision 17127)
@@ -11,5 +11,5 @@
 #------------------------------------------------------------------------------
 
-INCLUDES = -I. -I../mfileio -I../mfbase -I../mastro
+INCLUDES = -I. -I../mfileio -I../mfbase -I../mastro -I../mcore
 # mfileio:  MRead  (MEvtLoop)
 # mfbase:   MF     (MContinue)
@@ -68,10 +68,5 @@
            MPrint.cc \
 	   MThread.cc \
-           MObjLookup.cc \
-	   ../mcore/izstream.h \
-	   ../mcore/fits.h \
-	   ../mcore/DrsCalib.h \
-	   ../mcore/PixelMap.h \
-	   ../mcore/Interpolator2D.h
+           MObjLookup.cc
 
 ############################################################