Index: /trunk/Mars/mcore/fits.h
===================================================================
--- /trunk/Mars/mcore/fits.h	(revision 19855)
+++ /trunk/Mars/mcore/fits.h	(revision 19856)
@@ -15,14 +15,4 @@
 
 #define GCC_VERSION (__GNUC__ * 10000  + __GNUC_MINOR__ * 100  + __GNUC_PATCHLEVEL__)
-
-#ifndef __CINT__
-#include <unordered_map>
-#else
-#define off_t size_t
-namespace std
-{
-    template<class T, class S> class unordered_map<T, S>;
-}
-#endif
 
 // ROOT_VERSION is not defined in ROOTv5, but special treatment is
@@ -34,4 +24,14 @@
 #define __ROOTv6__ 1
 #endif
+#endif
+
+#if !defined(__CINT__) || defined(__CLING__) || defined(__ROOTv6__)
+#include <unordered_map>
+#else
+#define off_t size_t
+namespace std
+{
+    template<class T, class S> class unordered_map<T, S>;
+}
 #endif