diff --git a/lib/mks-session.h b/lib/mks-session.h
index 7696590..9a14de0 100644
--- a/lib/mks-session.h
+++ b/lib/mks-session.h
@@ -61,6 +61,4 @@ const char      *mks_session_get_uuid                  (MksSession           *se
 MKS_AVAILABLE_IN_ALL
 MksScreen       *mks_session_ref_screen                (MksSession           *self);
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (MksSpeaker, g_object_unref)
-
 G_END_DECLS
diff --git a/lib/mks-speaker.h b/lib/mks-speaker.h
index 16989b6..db8f9d0 100644
--- a/lib/mks-speaker.h
+++ b/lib/mks-speaker.h
@@ -43,4 +43,6 @@ MKS_AVAILABLE_IN_ALL
 void     mks_speaker_set_muted (MksSpeaker *self,
                                 gboolean    muted);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (MksSpeaker, g_object_unref)
+
 G_END_DECLS
diff --git a/lib/mks-types.h b/lib/mks-types.h
index d8c925e..7047af9 100644
--- a/lib/mks-types.h
+++ b/lib/mks-types.h
@@ -35,7 +35,6 @@ typedef struct _MksMouse               MksMouse;
 typedef struct _MksScreen              MksScreen;
 typedef struct _MksSession             MksSession;
 typedef struct _MksScreenAttributes    MksScreenAttributes;
-typedef struct _MksSpeaker             MksSpeaker;
 typedef struct _MksTouchable           MksTouchable;
 
 G_END_DECLS