diff --git a/src/protocols/rdp/channels/rdpdr/rdpdr.c b/src/protocols/rdp/channels/rdpdr/rdpdr.c
index b854bdf5..eaeed774 100644
--- a/src/protocols/rdp/channels/rdpdr/rdpdr.c
+++ b/src/protocols/rdp/channels/rdpdr/rdpdr.c
@@ -123,7 +123,7 @@ void guac_rdpdr_process_receive(guac_rdp_common_svc* svc,
 }
 
 wStream* guac_rdpdr_new_io_completion(guac_rdpdr_device* device,
-        int completion_id, int status, int size) {
+        unsigned int completion_id, unsigned int status, int size) {
 
     wStream* output_stream = Stream_New(NULL, 16+size);
 
diff --git a/src/protocols/rdp/channels/rdpdr/rdpdr.h b/src/protocols/rdp/channels/rdpdr/rdpdr.h
index b6f9da31..3c5f4e20 100644
--- a/src/protocols/rdp/channels/rdpdr/rdpdr.h
+++ b/src/protocols/rdp/channels/rdpdr/rdpdr.h
@@ -212,7 +212,7 @@ typedef struct guac_rdpdr {
  *     requested additional free space.
  */
 wStream* guac_rdpdr_new_io_completion(guac_rdpdr_device* device,
-        int completion_id, int status, int size);
+        unsigned int completion_id, unsigned int status, int size);
 
 /**
  * Initializes device redirection support (file transfer, printing, etc.) for
diff --git a/src/protocols/rdp/fs.c b/src/protocols/rdp/fs.c
index 80bdacdc..2cafd28a 100644
--- a/src/protocols/rdp/fs.c
+++ b/src/protocols/rdp/fs.c
@@ -191,7 +191,7 @@ int guac_rdp_fs_get_errorcode(int err) {
 
 }
 
-int guac_rdp_fs_get_status(int err) {
+unsigned int guac_rdp_fs_get_status(int err) {
 
     /* Translate GUAC_RDP_FS error code to RDPDR status code */
     if (err == GUAC_RDP_FS_ENFILE)  return STATUS_NO_MORE_FILES;
diff --git a/src/protocols/rdp/fs.h b/src/protocols/rdp/fs.h
index 48ca2f96..eb88ba3e 100644
--- a/src/protocols/rdp/fs.h
+++ b/src/protocols/rdp/fs.h
@@ -366,7 +366,7 @@ int guac_rdp_fs_get_errorcode(int err);
  *     A status code corresponding to the given error code that an
  *     implementation of the RDPDR channel can understand.
  */
-int guac_rdp_fs_get_status(int err);
+unsigned int guac_rdp_fs_get_status(int err);
 
 /**
  * Opens the given file, returning the a new file ID, or an error code less