[fs] Completely remove including mxio/dispatcher

Move remoteio-related error codes to remoteio.h.

Change-Id: I2612131e9c19ee8d5f1f6a64e78b30555d51c98b

system/ulib/fs/include/fs/dispatcher.h

@@ -10,7 +10,6 @@
 #include <magenta/types.h>
 #include <mx/channel.h>
 #include <fbl/ref_counted.h>
-#include <mxio/dispatcher.h>
 #include <mxio/remoteio.h>
 
 namespace fs {

system/ulib/fs/include/fs/vfs.h

@@ -18,7 +18,6 @@
 #include <magenta/device/vfs.h>
 #include <magenta/types.h>
 
-#include <mxio/dispatcher.h>
 #include <mxio/vfs.h>
 
 #ifdef __Fuchsia__

system/ulib/fs/vfs-internal.h

@@ -23,7 +23,6 @@
 #endif
 #include <unistd.h>
 
-#include <mxio/dispatcher.h>
 #include <mxio/remoteio.h>
 
 #ifndef __Fuchsia__

system/ulib/fs/vfs-rpc.cpp

@@ -13,7 +13,6 @@
 #include <magenta/process.h>
 #include <mx/event.h>
 #include <mxio/debug.h>
-#include <mxio/dispatcher.h>
 #include <mxio/io.h>
 #include <mxio/remoteio.h>
 #include <mxio/vfs.h>

system/ulib/mxio/include/mxio/dispatcher.h

@@ -6,6 +6,7 @@
 
 #include <magenta/types.h>
 #include <magenta/compiler.h>
+#include <mxio/remoteio.h>
 
 __BEGIN_CDECLS
 
@@ -41,15 +42,4 @@ mx_status_t mxio_dispatcher_add_etc(mxio_dispatcher_t* md, mx_handle_t h,
                                     mxio_dispatcher_cb_t callback,
                                     void* func, void* cookie);
 
-// dispatcher callback return code that there were no messages to read
-#define ERR_DISPATCHER_NO_WORK MX_ERR_SHOULD_WAIT
-
-// indicates message handed off to another server
-// used by rio remote handler for deferred reply pipe completion
-#define ERR_DISPATCHER_INDIRECT MX_ERR_NEXT
-
-// indicates that this was a close message and that no further
-// callbacks should be made to the dispatcher
-#define ERR_DISPATCHER_DONE MX_ERR_STOP
-
 __END_CDECLS

system/ulib/mxio/include/mxio/remoteio.h

@@ -66,6 +66,17 @@ __BEGIN_CDECLS
     "getpeername", "getsockopt", "setsockopt", "getaddrinfo", \
     "setattr", "sync", "link", "mmap", "fcntl" }
 
+// dispatcher callback return code that there were no messages to read
+#define ERR_DISPATCHER_NO_WORK MX_ERR_SHOULD_WAIT
+
+// indicates message handed off to another server
+// used by rio remote handler for deferred reply pipe completion
+#define ERR_DISPATCHER_INDIRECT MX_ERR_NEXT
+
+// indicates that this was a close message and that no further
+// callbacks should be made to the dispatcher
+#define ERR_DISPATCHER_DONE MX_ERR_STOP
+
 const char* mxio_opname(uint32_t op);
 
 typedef struct mxrio_msg mxrio_msg_t;