diff -Naur orig_incubator-guacamole-server-0.9.11-incubating/src/protocols/rdp/rdp.c incubator-guacamole-server-0.9.11-incubating/src/protocols/rdp/rdp.c
--- orig_incubator-guacamole-server-0.9.11-incubating/src/protocols/rdp/rdp.c	2017-01-17 18:58:16.000000000 +0100
+++ incubator-guacamole-server-0.9.11-incubating/src/protocols/rdp/rdp.c	2017-02-14 14:14:24.000000000 +0100
@@ -679,7 +679,7 @@
 
     rdp_client->current_surface = rdp_client->display->default_surface;
 
-    rdp_client->requested_clipboard_format = CB_FORMAT_TEXT;
+    rdp_client->requested_clipboard_format = CF_TEXT;
     rdp_client->available_svc = guac_common_list_alloc();
 
 #ifdef HAVE_FREERDP_CHANNELS_GLOBAL_INIT
diff -Naur orig_incubator-guacamole-server-0.9.11-incubating/src/protocols/rdp/rdp_cliprdr.c incubator-guacamole-server-0.9.11-incubating/src/protocols/rdp/rdp_cliprdr.c
--- orig_incubator-guacamole-server-0.9.11-incubating/src/protocols/rdp/rdp_cliprdr.c	2017-01-17 18:58:16.000000000 +0100
+++ incubator-guacamole-server-0.9.11-incubating/src/protocols/rdp/rdp_cliprdr.c	2017-02-14 14:11:24.000000000 +0100
@@ -102,8 +102,8 @@
 
     /* Respond with supported format list */
     format_list->formats = (UINT32*) malloc(sizeof(UINT32)*2);
-    format_list->formats[0] = CB_FORMAT_TEXT;
-    format_list->formats[1] = CB_FORMAT_UNICODETEXT;
+    format_list->formats[0] = CF_TEXT;
+    format_list->formats[1] = CF_UNICODETEXT;
     format_list->num_formats = 2;
 
     freerdp_channels_send_event(channels, (wMessage*) format_list);
@@ -152,22 +152,22 @@
     for (i=0; i<event->num_formats; i++) {
 
         /* If plain text available, request it */
-        if (event->formats[i] == CB_FORMAT_TEXT)
+        if (event->formats[i] == CF_TEXT)
             formats |= GUAC_RDP_CLIPBOARD_FORMAT_CP1252;
-        else if (event->formats[i] == CB_FORMAT_UNICODETEXT)
+        else if (event->formats[i] == CF_UNICODETEXT)
             formats |= GUAC_RDP_CLIPBOARD_FORMAT_UTF16;
 
     }
 
     /* Prefer Unicode to plain text */
     if (formats & GUAC_RDP_CLIPBOARD_FORMAT_UTF16) {
-        __guac_rdp_cb_request_format(client, CB_FORMAT_UNICODETEXT);
+        __guac_rdp_cb_request_format(client, CF_UNICODETEXT);
         return;
     }
 
     /* Use plain text if Unicode unavailable */
     if (formats & GUAC_RDP_CLIPBOARD_FORMAT_CP1252) {
-        __guac_rdp_cb_request_format(client, CB_FORMAT_TEXT);
+        __guac_rdp_cb_request_format(client, CF_TEXT);
         return;
     }
 
@@ -191,11 +191,11 @@
     /* Determine output encoding */
     switch (event->format) {
 
-        case CB_FORMAT_TEXT:
+        case CF_TEXT:
             writer = GUAC_WRITE_CP1252;
             break;
 
-        case CB_FORMAT_UNICODETEXT:
+        case CF_UNICODETEXT:
             writer = GUAC_WRITE_UTF16;
             break;
 
@@ -237,12 +237,12 @@
     switch (rdp_client->requested_clipboard_format) {
 
         /* Non-Unicode */
-        case CB_FORMAT_TEXT:
+        case CF_TEXT:
             reader = GUAC_READ_CP1252;
             break;
 
         /* Unicode (UTF-16) */
-        case CB_FORMAT_UNICODETEXT:
+        case CF_UNICODETEXT:
             reader = GUAC_READ_UTF16;
             break;
 
diff -Naur orig_incubator-guacamole-server-0.9.11-incubating/src/protocols/rdp/rdp_stream.c incubator-guacamole-server-0.9.11-incubating/src/protocols/rdp/rdp_stream.c
--- orig_incubator-guacamole-server-0.9.11-incubating/src/protocols/rdp/rdp_stream.c	2017-01-17 18:58:16.000000000 +0100
+++ incubator-guacamole-server-0.9.11-incubating/src/protocols/rdp/rdp_stream.c	2017-02-14 14:15:00.000000000 +0100
@@ -301,8 +301,8 @@
 
         /* Notify server that text data is now available */
         format_list->formats = (UINT32*) malloc(sizeof(UINT32) * 2);
-        format_list->formats[0] = CB_FORMAT_TEXT;
-        format_list->formats[1] = CB_FORMAT_UNICODETEXT;
+        format_list->formats[0] = CF_TEXT;
+        format_list->formats[1] = CF_UNICODETEXT;
         format_list->num_formats = 2;
 
         freerdp_channels_send_event(channels, (wMessage*) format_list);