diff --git a/src/libguac/Makefile.am b/src/libguac/Makefile.am
index 485f9217f..0464052c2 100644
--- a/src/libguac/Makefile.am
+++ b/src/libguac/Makefile.am
@@ -117,7 +117,6 @@ noinst_HEADERS =              \
     display-priv.h            \
     encode-jpeg.h             \
     encode-png.h              \
-    id.h                      \
     palette.h                 \
     raw_encoder.h             \
     user-handlers.h           \
@@ -160,7 +159,6 @@ libguac_la_SOURCES =          \
     socket-broadcast.c        \
     socket-fd.c               \
     socket-nest.c             \
-    socket-tcp.c              \
     socket-tee.c              \
     string.c                  \
     tcp.c                     \
diff --git a/src/libguac/guacamole/client.h b/src/libguac/guacamole/client.h
index 49defc1d1..010db54a5 100644
--- a/src/libguac/guacamole/client.h
+++ b/src/libguac/guacamole/client.h
@@ -145,6 +145,31 @@ struct guac_client {
      */
     guac_client_log_handler* log_handler;
 
+    /**
+     * Pool of buffer indices. Buffers are simply layers with negative indices.
+     * Note that because guac_pool always gives non-negative indices starting
+     * at 0, the output of this guac_pool will be adjusted.
+     */
+    guac_pool* __buffer_pool;
+
+    /**
+     * Pool of layer indices. Note that because guac_pool always gives
+     * non-negative indices starting at 0, the output of this guac_pool will
+     * be adjusted.
+     */
+    guac_pool* __layer_pool;
+
+    /**
+     * Pool of stream indices.
+     */
+    guac_pool* __stream_pool;
+
+    /**
+     * All available client-level output streams (data going to all connected
+     * users).
+     */
+    guac_stream* __output_streams;
+
     /**
      * The unique identifier allocated for the connection, which may
      * be used within the Guacamole protocol to refer to this connection.
@@ -290,6 +315,13 @@ struct guac_client {
      */
     const char** args;
 
+    /**
+     * Handle to the dlopen()'d plugin, which should be given to dlclose() when
+     * this client is freed. This is only assigned if guac_client_load_plugin()
+     * is used.
+     */
+    void* __plugin_handle;
+
     /**
      * Internal-only client data.
      */