--- a/sc2src/chrono.h
+++ b/sc2src/chrono.h
@@ -1,5 +1,22 @@
+/* Copyright (C) 2016 J.F.Dockes
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the
+ *   Free Software Foundation, Inc.,
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
 #ifndef _CHRONO_H_
 #define _CHRONO_H_
+#include <chrono>
 
 /** Easy interface to measuring time intervals */
 class Chrono {
@@ -19,23 +36,16 @@
      *
      * Frozen means give time since the last refnow call (this is to
      * allow for using one actual system call to get values from many
-     * chrono objects, like when examining timeouts in a queue 
+     * chrono objects, like when examining timeouts in a queue
      */
     long millis(bool frozen = false);
     long micros(bool frozen = false);
     float secs(bool frozen = false);
 
-    /** Return current orig */
-    long long amicros() const;
-
-    struct TimeSpec {
-        time_t tv_sec; /* Time in seconds */
-        long   tv_nsec; /* And nanoseconds (< 10E9) */
-    };
-
 private:
-    TimeSpec m_orig;
-    static TimeSpec o_now;
+    typedef std::chrono::time_point<std::chrono::steady_clock> TimePoint;
+    TimePoint m_orig;
+    static TimePoint o_now;
 };
 
 #endif /* _CHRONO_H_ */