diff --git a/src/c-api.vapi b/src/c-api.vapi
index 001ea6c..a5a4c7e 100644
--- a/src/c-api.vapi
+++ b/src/c-api.vapi
@@ -93,13 +93,6 @@ namespace Matrix {
         READ;
     }
 
-    [CCode (cheader_filename = "matrix-enumtypes.h", cprefix = "MATRIX_ACCOUNT_KIND_")]
-    public enum AccountKind {
-        DEFAULT,
-        USER,
-        GUEST;
-    }
-
     [CCode (cheader_filename = "matrix-types.h")]
     public class StateEvent {
         public Json.Node? get_json_node();
diff --git a/src/matrix-enums.vala b/src/matrix-enums.vala
index 1aac46d..a89e30f 100644
--- a/src/matrix-enums.vala
+++ b/src/matrix-enums.vala
@@ -17,6 +17,15 @@
  */
 
 namespace Matrix {
+    /**
+     * User account types.
+     */
+    public enum AccountKind {
+        DEFAULT, /// use the server default (usually {{{USER}}})
+        USER,    /// normal user
+        GUEST;   /// guest user
+    }
+
     /**
      * Event format received when synchronizing.
      */
diff --git a/src/matrix-types.c b/src/matrix-types.c
index 5b221df..b62fb96 100644
--- a/src/matrix-types.c
+++ b/src/matrix-types.c
@@ -211,16 +211,6 @@ G_DEFINE_QUARK(matrix-error-quark, matrix_error);
  * Condition types for pushers.
  */
 
-/**
- * MatrixAccountKind:
- * @MATRIX_ACCOUNT_KIND_DEFAULT: use the server default (usually
- *                               %MATRIX_ACCOUNT_KIND_USER)
- * @MATRIX_ACCOUNT_KIND_USER: normal user
- * @MATRIX_ACCOUNT_KIND_GUEST: guest user
- *
- * User account types.
- */
-
 /**
  * MatrixEventDirection:
  * @MATRIX_EVENT_DIRECTION_FORWARD: List events after the specified
diff --git a/src/matrix-types.h b/src/matrix-types.h
index 2470bf2..540ce4a 100644
--- a/src/matrix-types.h
+++ b/src/matrix-types.h
@@ -117,12 +117,6 @@ typedef enum {
     MATRIX_PUSHER_CONDITION_KIND_ROOM_MEMBER_COUNT
 } MatrixPusherConditionKind;
 
-typedef enum {
-    MATRIX_ACCOUNT_KIND_DEFAULT,
-    MATRIX_ACCOUNT_KIND_USER,
-    MATRIX_ACCOUNT_KIND_GUEST
-} MatrixAccountKind;
-
 typedef struct _MatrixStateEvent MatrixStateEvent;
 
 GType matrix_state_event_get_type(void);