3 files changed, 11 insertions, 4 deletions
diff --git a/modules/remote-filesystem/c++/common.hpp b/modules/remote-filesystem/c++/common.hpp
new file mode 100644
index 0000000..8824af2
--- /dev/null
+++ b/modules/remote-filesystem/c++/common.hpp
@@ -0,0 +1,7 @@
+#pragma once
+
+namespace saw {
+namespace rmt {
+struct File {};
+}
+}
diff --git a/modules/remote-filesystem/c++/remote.hpp b/modules/remote-filesystem/c++/remote.hpp
index 6660a36..1cae83d 100644
--- a/modules/remote-filesystem/c++/remote.hpp
+++ b/modules/remote-filesystem/c++/remote.hpp
@@ -6,6 +6,7 @@
 #include <forstio/remote/remote.hpp>
 
 #include "transfer.hpp"
+#include "common.hpp"
 
 namespace saw {
 
diff --git a/modules/remote-filesystem/c++/transfer.hpp b/modules/remote-filesystem/c++/transfer.hpp
index 59363ed..7f7fa77 100644
--- a/modules/remote-filesystem/c++/transfer.hpp
+++ b/modules/remote-filesystem/c++/transfer.hpp
@@ -1,16 +1,15 @@
 #pragma once
 
 #include <forstio/buffer.hpp>
-#include <forstio/remote/transfer.hpp>
+#include <forstio/remote/remote.hpp>
 
 #include <fstream>
 
 #include <cstring>
 
+#include "common.hpp"
+
 namespace saw {
-namespace rmt {
-struct File {};
-}
 template<typename Schema, typename Encoding>
 class data_server<Schema, Encoding, rmt::File> final : public i_data_server<rmt::File> {
 private: