1 files changed, 3 insertions, 29 deletions
diff --git a/libbutl/standard-version.cxx b/libbutl/standard-version.cxx
index a9f5eb8..36f4830 100644
--- a/libbutl/standard-version.cxx
+++ b/libbutl/standard-version.cxx
@@ -1,41 +1,14 @@
 // file      : libbutl/standard-version.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef __cpp_modules_ts
-#include <libbutl/standard-version.mxx>
-#endif
+#include <libbutl/standard-version.hxx>
 
 #include <cassert>
-
-#ifndef __cpp_lib_modules_ts
-#include <string>
-#include <cstdint>
-#include <cstddef>
-#include <ostream>
-
 #include <cstdlib>   // strtoull()
 #include <utility>   // move()
 #include <stdexcept> // invalid_argument
-#endif
-
-// Other includes.
-
-#ifdef __cpp_modules_ts
-module butl.standard_version;
-
-// Only imports additional to interface.
-#ifdef __clang__
-#ifdef __cpp_lib_modules_ts
-import std.core;
-import std.io;
-#endif
-import butl.optional;
-#endif
 
-import butl.utility;
-#else
-#include <libbutl/utility.mxx> // alnum()
-#endif
+#include <libbutl/utility.hxx> // alnum()
 
 using namespace std;
 
@@ -60,6 +33,7 @@ namespace butl
 
     const char* b (s.c_str () + p);
     char* e (nullptr);
+    errno = 0; // We must clear it according to POSIX.
     uint64_t v (strtoull (b, &e, 10)); // Can't throw.
 
     if (errno == ERANGE || b == e || v < min || v > max)