1 files changed, 16 insertions, 2 deletions
diff --git a/tests/base64/driver.cxx b/tests/base64/driver.cxx
index 040eaf8..fb65a49 100644
--- a/tests/base64/driver.cxx
+++ b/tests/base64/driver.cxx
@@ -2,11 +2,25 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
+#include <cassert>
+
+#ifndef __cpp_lib_modules
 #include <string>
+#include <vector>
 #include <sstream>
-#include <cassert>
+#endif
 
-#include <libbutl/base64.hxx>
+// Other includes.
+
+#ifdef __cpp_modules
+#ifdef __cpp_lib_modules
+import std.core;
+import std.io;
+#endif
+import butl.base64;
+#else
+#include <libbutl/base64.mxx>
+#endif
 
 using namespace std;
 using namespace butl;