Index: trunk/Mars/mcore/Interpolator2D.h
===================================================================
--- trunk/Mars/mcore/Interpolator2D.h	(revision 17122)
+++ trunk/Mars/mcore/Interpolator2D.h	(revision 17128)
@@ -18,4 +18,5 @@
 
 #include <float.h>
+#include <math.h>
 #include <vector>
 
@@ -330,5 +331,5 @@
         inputGrid.clear();
         inputGrid.reserve(v.size());
-        for (size_t i=0; i<v.size(); i++)
+        for (std::size_t i=0; i<v.size(); i++)
             inputGrid.emplace_back(i, v[i].x, v[i].y);
 
@@ -378,5 +379,5 @@
         outputGrid.clear();
         outputGrid.reserve(v.size());
-        for (size_t i=0; i<v.size(); i++)
+        for (std::size_t i=0; i<v.size(); i++)
             outputGrid.emplace_back(i, v[i].first, v[i].second);
 
Index: trunk/Mars/mcore/checksum.h
===================================================================
--- trunk/Mars/mcore/checksum.h	(revision 17122)
+++ trunk/Mars/mcore/checksum.h	(revision 17128)
@@ -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 17122)
+++ trunk/Mars/mcore/fits.h	(revision 17128)
@@ -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/huffman.h
===================================================================
--- trunk/Mars/mcore/huffman.h	(revision 17122)
+++ trunk/Mars/mcore/huffman.h	(revision 17128)
@@ -383,5 +383,5 @@
     };
 
-    bool Encode(std::string &bufout, const uint16_t *bufin, size_t bufinlen)
+    inline bool Encode(std::string &bufout, const uint16_t *bufin, size_t bufinlen)
     {
         const Encoder encoder(bufin, bufinlen);
@@ -399,7 +399,7 @@
     }
 
-    int64_t Decode(const uint8_t *bufin,
-               size_t         bufinlen,
-               std::vector<uint16_t> &pbufout)
+    inline int64_t Decode(const uint8_t *bufin,
+                          size_t         bufinlen,
+                          std::vector<uint16_t> &pbufout)
     {
         int64_t i = 0;
Index: trunk/Mars/mcore/izstream.h
===================================================================
--- trunk/Mars/mcore/izstream.h	(revision 17122)
+++ trunk/Mars/mcore/izstream.h	(revision 17128)
@@ -2,12 +2,8 @@
 #define MARS_izstream
 
+#include <string.h>
+
 #include <istream>
 #include <streambuf>
-
-#ifdef __MARS__
-#ifndef ROOT_TObject
-#include <TObject.h> // Needed for ClassDef
-#endif
-#endif
 
 #ifdef __CINT__
@@ -170,8 +166,4 @@
         return seekoff(pos, std::ios::beg);
     }
-
-#ifdef __MARS__
-    ClassDef(izstream, 0) // A C++ wrapper to istream zlib files
-#endif
 };
 
Index: trunk/Mars/mcore/ofits.h
===================================================================
--- trunk/Mars/mcore/ofits.h	(revision 17122)
+++ trunk/Mars/mcore/ofits.h	(revision 17128)
@@ -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 17122)
+++ trunk/Mars/mcore/zfits.h	(revision 17128)
@@ -6,8 +6,6 @@
  */
 
-#ifndef MARS_ZFITS
-#define MARS_ZFITS
-
-#include <stdexcept>
+#ifndef MARS_zfits
+#define MARS_zfits
 
 #include "fits.h"