2 files changed, 3 insertions, 5 deletions
diff --git a/modules/remote-filesystem/c++/remote.hpp b/modules/remote-filesystem/c++/remote.hpp
index caae2a9..6660a36 100644
--- a/modules/remote-filesystem/c++/remote.hpp
+++ b/modules/remote-filesystem/c++/remote.hpp
@@ -8,9 +8,6 @@
 #include "transfer.hpp"
 
 namespace saw {
-namespace rmt {
-struct File {};
-}
 
 template<>
 class remote_address<rmt::File> {
diff --git a/modules/remote-filesystem/c++/transfer.hpp b/modules/remote-filesystem/c++/transfer.hpp
index 40fc2e3..59363ed 100644
--- a/modules/remote-filesystem/c++/transfer.hpp
+++ b/modules/remote-filesystem/c++/transfer.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "remote.hpp"
-
 #include <forstio/buffer.hpp>
 #include <forstio/remote/transfer.hpp>
 
@@ -10,6 +8,9 @@
 #include <cstring>
 
 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: