diff --git a/eekboard/eekboard-context.h b/eekboard/eekboard-context.h
index 1bb6e66f..7a078f23 100644
--- a/eekboard/eekboard-context.h
+++ b/eekboard/eekboard-context.h
@@ -35,20 +35,35 @@ typedef struct _EekboardContextClass EekboardContextClass;
 typedef struct _EekboardContextPrivate EekboardContextPrivate;
 
 struct _EekboardContext {
+    /*< private >*/
     GDBusProxy parent;
 
     EekboardContextPrivate *priv;
 };
 
+/**
+ * EekboardContextClass:
+ * @enabled: class handler for #EekboardContext::enabled signal
+ * @disabled: class handler for #EekboardContext::disabled signal
+ * @key_pressed: class handler for #EekboardContext::key-pressed signal
+ * @key_released: class handler for #EekboardContext::key-released signal
+ */
 struct _EekboardContextClass {
+    /*< private >*/
     GDBusProxyClass parent_class;
 
+    /*< public >*/
+    /* signals */
     void (*enabled)      (EekboardContext *self);
     void (*disabled)     (EekboardContext *self);
     void (*key_pressed)  (EekboardContext *self,
                           guint            keycode);
     void (*key_released) (EekboardContext *self,
                           guint            keycode);
+
+    /*< private >*/
+    /* padding */
+    gpointer pdummy[24];
 };
 
 GType            eekboard_context_get_type      (void) G_GNUC_CONST;
diff --git a/eekboard/eekboard-server.h b/eekboard/eekboard-server.h
index 633e4c76..fb2e5146 100644
--- a/eekboard/eekboard-server.h
+++ b/eekboard/eekboard-server.h
@@ -35,13 +35,19 @@ typedef struct _EekboardServerClass EekboardServerClass;
 typedef struct _EekboardServerPrivate EekboardServerPrivate;
 
 struct _EekboardServer {
+    /*< private >*/
     GDBusProxy parent;
 
     EekboardServerPrivate *priv;
 };
 
 struct _EekboardServerClass {
+    /*< private >*/
     GDBusProxyClass parent_class;
+
+    /*< private >*/
+    /* padding */
+    gpointer pdummy[24];
 };
 
 GType            eekboard_server_get_type        (void) G_GNUC_CONST;