Index: trunk/Mars/mcore/checksum.h
===================================================================
--- trunk/Mars/mcore/checksum.h	(revision 17140)
+++ trunk/Mars/mcore/checksum.h	(revision 17141)
@@ -5,4 +5,6 @@
 #include <arpa/inet.h>
 #endif
+
+#include <stdint.h>
 
 namespace std
Index: trunk/Mars/mcore/fits.h
===================================================================
--- trunk/Mars/mcore/fits.h	(revision 17140)
+++ trunk/Mars/mcore/fits.h	(revision 17141)
@@ -2,16 +2,5 @@
 #define MARS_fits
 
-#ifdef __CINT__
-#define int8_t   Char_t
-#define int16_t  Short_t
-#define int32_t  Int_t
-#define int64_t  Long64_t
-#define uint8_t  UChar_t
-#define uint16_t UShort_t
-#define uint32_t UInt_t
-#define uint64_t ULong64_t
-#else
 #include <stdint.h>
-#endif
 
 #include <map>
@@ -20,8 +9,5 @@
 #include <sstream>
 #include <algorithm>
-
-#ifdef __EXCEPTIONS
 #include <stdexcept>
-#endif
 
 #ifdef __CINT__
Index: trunk/Mars/mcore/ofits.h
===================================================================
--- trunk/Mars/mcore/ofits.h	(revision 17140)
+++ trunk/Mars/mcore/ofits.h	(revision 17141)
@@ -11,7 +11,21 @@
 #include <vector>
 #include <algorithm>
-
-#ifdef __EXCEPTIONS
 #include <stdexcept>
+
+#ifdef __CINT__
+#define off_t size_t
+#endif
+
+#ifndef __MARS__
+#define gLog cerr
+#define ___err___   ""
+#define ___warn___  ""
+#define ___all___   ""
+#else
+#include "MLog.h"
+#include "MLogManip.h"
+#define ___err___   err
+#define ___warn___  warn
+#define ___all___   all
 #endif
 
Index: trunk/Mars/mcore/zfits.h
===================================================================
--- trunk/Mars/mcore/zfits.h	(revision 17140)
+++ trunk/Mars/mcore/zfits.h	(revision 17141)
@@ -6,8 +6,6 @@
  */
 
-#ifndef MARS_ZFITS
-#define MARS_ZFITS
-
-#include <stdexcept>
+#ifndef MARS_zfits
+#define MARS_zfits
 
 #include "fits.h"