diff --git a/libguac/src/socket-fd.c b/libguac/src/socket-fd.c
index 970dcd2e..9139a906 100644
--- a/libguac/src/socket-fd.c
+++ b/libguac/src/socket-fd.c
@@ -56,16 +56,16 @@
 #include "socket.h"
 #include "error.h"
 
-typedef struct guac_socket_fd_data {
+typedef struct __guac_socket_fd_data {
 
     int fd;
 
-} guac_socket_fd_data;
+} __guac_socket_fd_data;
 
 ssize_t __guac_socket_fd_read_handler(guac_socket* socket,
         void* buf, size_t count) {
 
-    guac_socket_fd_data* data = (guac_socket_fd_data*) socket->data;
+    __guac_socket_fd_data* data = (__guac_socket_fd_data*) socket->data;
 
     /* Read from socket */
     int retval = read(data->fd, buf, count);
@@ -83,7 +83,7 @@ ssize_t __guac_socket_fd_read_handler(guac_socket* socket,
 ssize_t __guac_socket_fd_write_handler(guac_socket* socket,
         void* buf, size_t count) {
 
-    guac_socket_fd_data* data = (guac_socket_fd_data*) socket->data;
+    __guac_socket_fd_data* data = (__guac_socket_fd_data*) socket->data;
     int retval;
 
 #ifdef __MINGW32__
@@ -106,7 +106,7 @@ ssize_t __guac_socket_fd_write_handler(guac_socket* socket,
 
 int __guac_socket_fd_select_handler(guac_socket* socket, int usec_timeout) {
 
-    guac_socket_fd_data* data = (guac_socket_fd_data*) socket->data;
+    __guac_socket_fd_data* data = (__guac_socket_fd_data*) socket->data;
 
     fd_set fds;
     struct timeval timeout;
@@ -146,7 +146,7 @@ guac_socket* guac_socket_open(int fd) {
 
     /* Allocate socket and associated data */
     guac_socket* socket = guac_socket_alloc();
-    guac_socket_fd_data* data = malloc(sizeof(guac_socket_fd_data));
+    __guac_socket_fd_data* data = malloc(sizeof(__guac_socket_fd_data));
 
     /* Store file descriptor as socket data */
     data->fd = fd;
diff --git a/libguac/src/socket-nest.c b/libguac/src/socket-nest.c
index 2f06200d..92e431f6 100644
--- a/libguac/src/socket-nest.c
+++ b/libguac/src/socket-nest.c
@@ -60,18 +60,18 @@
 
 #define GUAC_SOCKET_NEST_BUFFER_SIZE 8192
 
-typedef struct guac_socket_nest_data {
+typedef struct __guac_socket_nest_data {
 
     guac_socket* parent;
     char buffer[GUAC_SOCKET_NEST_BUFFER_SIZE];
     int index;
 
-} guac_socket_nest_data;
+} __guac_socket_nest_data;
 
 ssize_t __guac_socket_nest_write_handler(guac_socket* socket,
         void* buf, size_t count) {
 
-    guac_socket_nest_data* data = (guac_socket_nest_data*) socket->data;
+    __guac_socket_nest_data* data = (__guac_socket_nest_data*) socket->data;
     unsigned char* source = (unsigned char*) buf;
 
     /* Current location in destination buffer during copy */
@@ -137,7 +137,7 @@ guac_socket* guac_socket_nest(guac_socket* parent, int index) {
 
     /* Allocate socket and associated data */
     guac_socket* socket = guac_socket_alloc();
-    guac_socket_nest_data* data = malloc(sizeof(guac_socket_nest_data));
+    __guac_socket_nest_data* data = malloc(sizeof(__guac_socket_nest_data));
 
     /* Store file descriptor as socket data */
     data->parent = parent;