diff --git a/gio/gioenums.h b/gio/gioenums.h
index b70774591..bf9c1d58b 100644
--- a/gio/gioenums.h
+++ b/gio/gioenums.h
@@ -1331,7 +1331,7 @@ typedef enum {
  *   is still in the future
  * @G_TLS_CERTIFICATE_EXPIRED: The certificate has expired
  * @G_TLS_CERTIFICATE_REVOKED: The certificate has been revoked
- *   according to the #GTlsContext's certificate revocation list.
+ *   according to the #GTlsConnection's certificate revocation list.
  * @G_TLS_CERTIFICATE_INSECURE: The certificate's algorithm is
  *   considered insecure.
  * @G_TLS_CERTIFICATE_GENERIC_ERROR: Some other error occurred validating
diff --git a/gio/giotypes.h b/gio/giotypes.h
index 3cc4f66b7..af2758681 100644
--- a/gio/giotypes.h
+++ b/gio/giotypes.h
@@ -205,11 +205,8 @@ typedef struct _GThreadedSocketService                      GThreadedSocketServi
 typedef struct _GThemedIcon                   GThemedIcon;
 typedef struct _GTlsCertificate               GTlsCertificate;
 typedef struct _GTlsClientConnection          GTlsClientConnection; /* Dummy typedef */
-typedef struct _GTlsClientContext             GTlsClientContext; /* Dummy typedef */
 typedef struct _GTlsConnection                GTlsConnection;
-typedef struct _GTlsContext                   GTlsContext;
 typedef struct _GTlsServerConnection          GTlsServerConnection; /* Dummy typedef */
-typedef struct _GTlsServerContext             GTlsServerContext; /* Dummy typedef */
 typedef struct _GVfs                          GVfs; /* Dummy typedef */
 
 /**
diff --git a/gio/gproxyresolver.c b/gio/gproxyresolver.c
index f273ecf8d..2bc97338a 100644
--- a/gio/gproxyresolver.c
+++ b/gio/gproxyresolver.c
@@ -39,7 +39,7 @@
  * @include: gio/gio.h
  *
  * #GProxyResolver provides synchronous and asynchronous network proxy
- * resolution. #GProxyResolver is used within #GClientSocket through
+ * resolution. #GProxyResolver is used within #GSocketClient through
  * the method g_socket_connectable_proxy_enumerate().
  */
 
diff --git a/gio/gthreadedsocketservice.c b/gio/gthreadedsocketservice.c
index 6908d2a0e..feaf31b2c 100644
--- a/gio/gthreadedsocketservice.c
+++ b/gio/gthreadedsocketservice.c
@@ -259,7 +259,7 @@ g_threaded_socket_service_class_init (GThreadedSocketServiceClass *class)
  *   handling incoming clients, -1 means no limit
  *
  * Creates a new #GThreadedSocketService with no listeners. Listeners
- * must be added with g_socket_service_add_listeners().
+ * must be added with one of the #GSocketListener "add" methods.
  *
  * Returns: a new #GSocketService.
  *