2 files changed, 22 insertions, 3 deletions
diff --git a/tests/manifest-serializer/buildfile b/tests/manifest-serializer/buildfile
index d13daab..df633ae 100644
--- a/tests/manifest-serializer/buildfile
+++ b/tests/manifest-serializer/buildfile
@@ -4,4 +4,10 @@
 
 import libs = libbutl%lib{butl}
 
+if ($cxx.features.modules && ($force_std_modules == true || $cxx.id != 'msvc'))
+{
+  import libs += libstd-modules%liba{std-modules}
+  cxx.poptions += -D__cpp_lib_modules
+}
+
 exe{driver}: {hxx cxx}{*} $libs
diff --git a/tests/manifest-serializer/driver.cxx b/tests/manifest-serializer/driver.cxx
index dad96bd..f373ecf 100644
--- a/tests/manifest-serializer/driver.cxx
+++ b/tests/manifest-serializer/driver.cxx
@@ -2,14 +2,27 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
+#include <cassert>
+
+#ifndef __cpp_lib_modules
 #include <vector>
 #include <string>
 #include <utility> // pair
-#include <cassert>
 #include <sstream>
 #include <iostream>
-
-#include <libbutl/manifest-serializer.hxx>
+#endif
+
+// Other includes.
+
+#ifdef __cpp_modules
+#ifdef __cpp_lib_modules
+import std.core;
+import std.io;
+#endif
+import butl.manifest_serializer;
+#else
+#include <libbutl/manifest-serializer.mxx>
+#endif
 
 using namespace std;
 using namespace butl;