diff --git a/repos/os/include/file_system/listener.h b/repos/os/include/file_system/listener.h
index 27d6f238d..ad66d190b 100644
--- a/repos/os/include/file_system/listener.h
+++ b/repos/os/include/file_system/listener.h
@@ -22,7 +22,7 @@
 
 namespace File_system {
 
-	typedef File_system::Session_rpc_object::Tx::Sink Sink;
+	typedef ::File_system::Session_rpc_object::Tx::Sink Sink;
 
 	class Listener : public Genode::List<Listener>::Element
 	{
diff --git a/repos/os/src/server/vfs/main.cc b/repos/os/src/server/vfs/main.cc
index 3e589105b..9a6296c46 100644
--- a/repos/os/src/server/vfs/main.cc
+++ b/repos/os/src/server/vfs/main.cc
@@ -54,7 +54,7 @@ namespace Vfs_server {
 };
 
 
-class Vfs_server::Session_component : public File_system::Session_rpc_object,
+class Vfs_server::Session_component : public ::File_system::Session_rpc_object,
                                       public Session_io_handler
 {
 	private:
@@ -488,7 +488,7 @@ class Vfs_server::Session_component : public File_system::Session_rpc_object,
 		 ** File_system interface **
 		 ***************************/
 
-		Dir_handle dir(File_system::Path const &path, bool create) override
+		Dir_handle dir(::File_system::Path const &path, bool create) override
 		{
 			if (create && (!_writable))
 				throw Permission_denied();
@@ -546,7 +546,7 @@ class Vfs_server::Session_component : public File_system::Session_rpc_object,
 			});
 		}
 
-		Node_handle node(File_system::Path const &path) override
+		Node_handle node(::File_system::Path const &path) override
 		{
 			char const *path_str = path.string();
 
@@ -566,7 +566,7 @@ class Vfs_server::Session_component : public File_system::Session_rpc_object,
 			return Node_handle { node->id().value };
 		}
 
-		Watch_handle watch(File_system::Path const &path) override
+		Watch_handle watch(::File_system::Path const &path) override
 		{
 			char const *path_str = path.string();
 
@@ -602,12 +602,12 @@ class Vfs_server::Session_component : public File_system::Session_rpc_object,
 		{
 			try { _apply_node(handle, [&] (Node &node) {
 				_close(node);
-			}); } catch (File_system::Invalid_handle) { }
+			}); } catch (::File_system::Invalid_handle) { }
 		}
 
 		Status status(Node_handle node_handle) override
 		{
-			File_system::Status      fs_stat;
+			::File_system::Status fs_stat;
 
 			_apply_node(node_handle, [&] (Node &node) {
 				Directory_service::Stat vfs_stat;
@@ -620,19 +620,19 @@ class Vfs_server::Session_component : public File_system::Session_rpc_object,
 				switch (vfs_stat.mode & (
 					Directory_service::STAT_MODE_DIRECTORY |
 					Directory_service::STAT_MODE_SYMLINK |
-					File_system::Status::MODE_FILE)) {
+					::File_system::Status::MODE_FILE)) {
 
 				case Directory_service::STAT_MODE_DIRECTORY:
-					fs_stat.mode = File_system::Status::MODE_DIRECTORY;
+					fs_stat.mode = ::File_system::Status::MODE_DIRECTORY;
 					fs_stat.size = _vfs.num_dirent(node.path()) * sizeof(Directory_entry);
 					return;
 
 				case Directory_service::STAT_MODE_SYMLINK:
-					fs_stat.mode = File_system::Status::MODE_SYMLINK;
+					fs_stat.mode = ::File_system::Status::MODE_SYMLINK;
 					break;
 
 				default: /* Directory_service::STAT_MODE_FILE */
-					fs_stat.mode = File_system::Status::MODE_FILE;
+					fs_stat.mode = ::File_system::Status::MODE_FILE;
 					break;
 				}
 
diff --git a/repos/os/src/server/vfs/node.h b/repos/os/src/server/vfs/node.h
index c02d22b57..079267fc3 100644
--- a/repos/os/src/server/vfs/node.h
+++ b/repos/os/src/server/vfs/node.h
@@ -86,7 +86,7 @@ namespace Vfs_server {
 	 */
 }
 
-class Vfs_server::Node : public  File_system::Node_base,
+class Vfs_server::Node : public  ::File_system::Node_base,
                          private Node_space::Element
 {
 	public:
@@ -554,7 +554,7 @@ struct Vfs_server::Directory : Io_node
 	size_t read(char *dst, size_t len, seek_off_t seek_offset) override
 	{
 		Directory_service::Dirent vfs_dirent;
-		size_t blocksize = sizeof(File_system::Directory_entry);
+		size_t blocksize = sizeof(::File_system::Directory_entry);
 
 		unsigned index = (seek_offset / blocksize);
 
@@ -567,18 +567,18 @@ struct Vfs_server::Directory : Io_node
 			    (vfs_dirent.type == Vfs::Directory_service::DIRENT_TYPE_END))
 				return len - remains;
 
-			File_system::Directory_entry *fs_dirent = (Directory_entry *)dst;
+			::File_system::Directory_entry *fs_dirent = (Directory_entry *)dst;
 			fs_dirent->inode = vfs_dirent.fileno;
 			switch (vfs_dirent.type) {
 			case Vfs::Directory_service::DIRENT_TYPE_DIRECTORY:
-				fs_dirent->type = File_system::Directory_entry::TYPE_DIRECTORY;
+				fs_dirent->type = ::File_system::Directory_entry::TYPE_DIRECTORY;
 				break;
 			case Vfs::Directory_service::DIRENT_TYPE_SYMLINK:
-				fs_dirent->type = File_system::Directory_entry::TYPE_SYMLINK;
+				fs_dirent->type = ::File_system::Directory_entry::TYPE_SYMLINK;
 				break;
 			case Vfs::Directory_service::DIRENT_TYPE_FILE:
 			default:
-				fs_dirent->type = File_system::Directory_entry::TYPE_FILE;
+				fs_dirent->type = ::File_system::Directory_entry::TYPE_FILE;
 				break;
 			}
 			strncpy(fs_dirent->name, vfs_dirent.name, MAX_NAME_LEN);