From a547cc3784c41ed7a6f2220545158da3401ce3bf Mon Sep 17 00:00:00 2001
From: Pavel Roskin <plroskin@gmail.com>
Date: Wed, 16 Nov 2016 02:33:36 +0000
Subject: [PATCH] Include needed files in chansrv_fuse.c, remove duplicate
 declarations

---
 sesman/chansrv/chansrv_fuse.c | 21 +++------------------
 sesman/chansrv/devredir.h     |  7 +++++++
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/sesman/chansrv/chansrv_fuse.c b/sesman/chansrv/chansrv_fuse.c
index 1214a28a..fe653c60 100644
--- a/sesman/chansrv/chansrv_fuse.c
+++ b/sesman/chansrv/chansrv_fuse.c
@@ -100,9 +100,12 @@ void xfuse_devredir_cb_file_close(void *vp)                                  {}
 
 #include "arch.h"
 #include "os_calls.h"
+#include "clipboard_file.h"
 #include "chansrv_fuse.h"
+#include "devredir.h"
 #include "list.h"
 #include "fifo.h"
+#include "file.h"
 
 #ifndef EREMOTEIO
 #define EREMOTEIO EIO
@@ -284,20 +287,6 @@ static void xfuse_update_xrdpfs_size(void);
 static void xfuse_enum_dir(fuse_req_t req, fuse_ino_t ino, size_t size,
                            off_t off, struct fuse_file_info *fi);
 
-/* forward declarations for calls we make into devredir */
-int dev_redir_get_dir_listing(void *fusep, tui32 device_id, char *path);
-
-int dev_redir_file_open(void *fusep, tui32 device_id, char *path,
-                        int mode, int type, char *gen_buf);
-
-int devredir_file_read(void *fusep, tui32 device_id, tui32 FileId,
-                        tui32 Length, tui64 Offset);
-
-int dev_redir_file_write(void *fusep, tui32 device_id, tui32 FileId,
-                         const char *buf, int Length, tui64 Offset);
-
-int devredir_file_close(void *fusep, tui32 device_id, tui32 FileId);
-
 /* forward declarations for FUSE callbacks */
 static void xfuse_cb_lookup(fuse_req_t req, fuse_ino_t parent,
                             const char *name);
@@ -367,10 +356,6 @@ static int xfuse_proc_opendir_req(fuse_req_t req, fuse_ino_t ino,
 static void xfuse_cb_releasedir(fuse_req_t req, fuse_ino_t ino,
                                 struct fuse_file_info *fi);
 
-/* clipboard calls */
-int clipboard_request_file_data(int stream_id, int lindex, int offset,
-                                int request_bytes);
-
 /* misc calls */
 static void xfuse_mark_as_stale(int pinode);
 static void xfuse_delete_stale_entries(int pinode);
diff --git a/sesman/chansrv/devredir.h b/sesman/chansrv/devredir.h
index b49eb1dd..70e15400 100644
--- a/sesman/chansrv/devredir.h
+++ b/sesman/chansrv/devredir.h
@@ -104,6 +104,13 @@ int devredir_file_close(void *fusep, tui32 device_id, tui32 file_id);
 int devredir_file_read(void *fusep, tui32 device_id, tui32 FileId,
                         tui32 Length, tui64 Offset);
 
+int APP_CC
+dev_redir_file_write(void *fusep, tui32 DeviceId, tui32 FileId,
+                     const char *buf, int Length, tui64 Offset);
+
+int APP_CC
+devredir_rmdir_or_file(void *fusep, tui32 device_id, char *path, int mode);
+
 int send_channel_data(int chan_id, char *data, int size);
 
 /*