1 files changed, 28 insertions, 2 deletions
diff --git a/libbutl/manifest-parser.cxx b/libbutl/manifest-parser.cxx
index 304815a..cea71b6 100644
--- a/libbutl/manifest-parser.cxx
+++ b/libbutl/manifest-parser.cxx
@@ -2,10 +2,36 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <libbutl/manifest-parser.hxx>
+#ifndef __cpp_modules
+#include <libbutl/manifest-parser.mxx>
+#endif
 
 #include <cassert>
+
+#ifndef __cpp_lib_modules
+#include <string>
+#include <cstdint>
+#include <utility>
+#include <stdexcept>
+
 #include <sstream>
+#endif
+
+// Other includes.
+
+#ifdef __cpp_modules
+module butl.manifest_parser;
+
+// Only imports additional to interface.
+#ifdef __clang__
+#ifdef __cpp_lib_modules
+import std.core;
+import std.io;
+#endif
+import butl.char_scanner;
+#endif
+
+#endif
 
 using namespace std;
 
@@ -410,7 +436,7 @@ namespace butl
   // manifest_parsing
   //
 
-  static string
+  static inline string
   format (const string& n, uint64_t l, uint64_t c, const string& d)
   {
     ostringstream os;