diff --git a/ruma-api-macros/src/api/request.rs b/ruma-api-macros/src/api/request.rs
index c56d5c9a..dadedba5 100644
--- a/ruma-api-macros/src/api/request.rs
+++ b/ruma-api-macros/src/api/request.rs
@@ -522,6 +522,7 @@ impl ToTokens for Request {
 
         let request = quote! {
             #[derive(Debug, Clone, #import_path::Outgoing)]
+            #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
             #[incoming_derive(!Deserialize)]
             #( #struct_attributes )*
             pub struct Request #request_generics #request_def
diff --git a/ruma-api-macros/src/api/response.rs b/ruma-api-macros/src/api/response.rs
index 8ae75913..ece0c751 100644
--- a/ruma-api-macros/src/api/response.rs
+++ b/ruma-api-macros/src/api/response.rs
@@ -319,6 +319,7 @@ impl ToTokens for Response {
 
         let response = quote! {
             #[derive(Debug, Clone, #import_path::Outgoing)]
+            #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
             #[incoming_derive(!Deserialize)]
             #( #struct_attributes )*
             pub struct Response #response_def
diff --git a/ruma-appservice-api/src/event/push_events/v1.rs b/ruma-appservice-api/src/event/push_events/v1.rs
index 0ae4a15f..cd97dd8a 100644
--- a/ruma-appservice-api/src/event/push_events/v1.rs
+++ b/ruma-appservice-api/src/event/push_events/v1.rs
@@ -14,7 +14,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The transaction ID for this set of events.
         ///
@@ -28,7 +27,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 }
 
diff --git a/ruma-appservice-api/src/query/query_room_alias/v1.rs b/ruma-appservice-api/src/query/query_room_alias/v1.rs
index 2568092f..786bac81 100644
--- a/ruma-appservice-api/src/query/query_room_alias/v1.rs
+++ b/ruma-appservice-api/src/query/query_room_alias/v1.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room alias being queried.
         #[ruma_api(path)]
@@ -21,7 +20,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 }
 
diff --git a/ruma-appservice-api/src/query/query_user_id/v1.rs b/ruma-appservice-api/src/query/query_user_id/v1.rs
index cbf51488..40b5dbf8 100644
--- a/ruma-appservice-api/src/query/query_user_id/v1.rs
+++ b/ruma-appservice-api/src/query/query_user_id/v1.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The user ID being queried.
         #[ruma_api(path)]
@@ -21,7 +20,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 }
 
diff --git a/ruma-appservice-api/src/thirdparty/get_location_for_protocol/v1.rs b/ruma-appservice-api/src/thirdparty/get_location_for_protocol/v1.rs
index fa32041b..818a2018 100644
--- a/ruma-appservice-api/src/thirdparty/get_location_for_protocol/v1.rs
+++ b/ruma-appservice-api/src/thirdparty/get_location_for_protocol/v1.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The protocol used to communicate to the third party network.
         #[ruma_api(path)]
@@ -27,7 +26,6 @@ ruma_api! {
         pub fields: BTreeMap<String, String>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// List of matched third party locations.
         #[ruma_api(body)]
diff --git a/ruma-appservice-api/src/thirdparty/get_location_for_room_alias/v1.rs b/ruma-appservice-api/src/thirdparty/get_location_for_room_alias/v1.rs
index 4ea108b7..bdcd0beb 100644
--- a/ruma-appservice-api/src/thirdparty/get_location_for_room_alias/v1.rs
+++ b/ruma-appservice-api/src/thirdparty/get_location_for_room_alias/v1.rs
@@ -14,14 +14,12 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The Matrix room alias to look up.
         #[ruma_api(query)]
         pub alias: &'a RoomAliasId,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// List of matched third party locations.
         #[ruma_api(body)]
diff --git a/ruma-appservice-api/src/thirdparty/get_protocol/v1.rs b/ruma-appservice-api/src/thirdparty/get_protocol/v1.rs
index a11f0509..ae105910 100644
--- a/ruma-appservice-api/src/thirdparty/get_protocol/v1.rs
+++ b/ruma-appservice-api/src/thirdparty/get_protocol/v1.rs
@@ -13,14 +13,12 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The name of the protocol.
         #[ruma_api(path)]
         pub protocol: &'a str,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Metadata about the protocol.
         #[ruma_api(body)]
diff --git a/ruma-appservice-api/src/thirdparty/get_user_for_protocol/v1.rs b/ruma-appservice-api/src/thirdparty/get_user_for_protocol/v1.rs
index 36c62290..202a4b04 100644
--- a/ruma-appservice-api/src/thirdparty/get_user_for_protocol/v1.rs
+++ b/ruma-appservice-api/src/thirdparty/get_user_for_protocol/v1.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The protocol used to communicate to the third party network.
         #[ruma_api(path)]
@@ -27,7 +26,6 @@ ruma_api! {
         pub fields: BTreeMap<String, String>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// List of matched third party users.
         #[ruma_api(body)]
diff --git a/ruma-appservice-api/src/thirdparty/get_user_for_user_id/v1.rs b/ruma-appservice-api/src/thirdparty/get_user_for_user_id/v1.rs
index 88c3c6bc..8b8c8b80 100644
--- a/ruma-appservice-api/src/thirdparty/get_user_for_user_id/v1.rs
+++ b/ruma-appservice-api/src/thirdparty/get_user_for_user_id/v1.rs
@@ -14,14 +14,12 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The Matrix User ID to look up.
         #[ruma_api(query)]
         pub userid: &'a UserId,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// List of matched third party users.
         #[ruma_api(body)]
diff --git a/ruma-client-api/src/r0/account/add_3pid.rs b/ruma-client-api/src/r0/account/add_3pid.rs
index 4533863f..a34b816e 100644
--- a/ruma-client-api/src/r0/account/add_3pid.rs
+++ b/ruma-client-api/src/r0/account/add_3pid.rs
@@ -14,7 +14,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Additional information for the User-Interactive Authentication API.
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -28,7 +27,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: UiaaResponse
diff --git a/ruma-client-api/src/r0/account/bind_3pid.rs b/ruma-client-api/src/r0/account/bind_3pid.rs
index cfa5e70c..2f1a8332 100644
--- a/ruma-client-api/src/r0/account/bind_3pid.rs
+++ b/ruma-client-api/src/r0/account/bind_3pid.rs
@@ -14,7 +14,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Client-generated secret string used to protect this session.
         pub client_secret: &'a str,
@@ -29,7 +28,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/account/change_password.rs b/ruma-client-api/src/r0/account/change_password.rs
index b7d94dc1..06253a46 100644
--- a/ruma-client-api/src/r0/account/change_password.rs
+++ b/ruma-client-api/src/r0/account/change_password.rs
@@ -14,7 +14,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The new password for the account.
         pub new_password: &'a str,
@@ -35,7 +34,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: UiaaResponse
diff --git a/ruma-client-api/src/r0/account/deactivate.rs b/ruma-client-api/src/r0/account/deactivate.rs
index 850c5a45..84a66a2a 100644
--- a/ruma-client-api/src/r0/account/deactivate.rs
+++ b/ruma-client-api/src/r0/account/deactivate.rs
@@ -17,7 +17,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Additional authentication information for the user-interactive authentication API.
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -29,7 +28,6 @@ ruma_api! {
         pub id_server: Option<&'a str>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Result of unbind operation.
         pub id_server_unbind_result: ThirdPartyIdRemovalStatus,
diff --git a/ruma-client-api/src/r0/account/delete_3pid.rs b/ruma-client-api/src/r0/account/delete_3pid.rs
index 619fc50c..1e34dedf 100644
--- a/ruma-client-api/src/r0/account/delete_3pid.rs
+++ b/ruma-client-api/src/r0/account/delete_3pid.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Identity server to delete from.
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -28,7 +27,6 @@ ruma_api! {
         pub address: &'a str,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Result of unbind operation.
         pub id_server_unbind_result: ThirdPartyIdRemovalStatus,
diff --git a/ruma-client-api/src/r0/account/get_username_availability.rs b/ruma-client-api/src/r0/account/get_username_availability.rs
index 4580c597..0fdc095f 100644
--- a/ruma-client-api/src/r0/account/get_username_availability.rs
+++ b/ruma-client-api/src/r0/account/get_username_availability.rs
@@ -12,14 +12,12 @@ ruma_api! {
         requires_authentication: false,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The username to check the availability of.
         #[ruma_api(query)]
         pub username: &'a str,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// A flag to indicate that the username is available.
         /// This should always be true when the server replies with 200 OK.
diff --git a/ruma-client-api/src/r0/account/register.rs b/ruma-client-api/src/r0/account/register.rs
index 5a54a88a..2c486d39 100644
--- a/ruma-client-api/src/r0/account/register.rs
+++ b/ruma-client-api/src/r0/account/register.rs
@@ -17,7 +17,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The desired password for the account.
         ///
@@ -67,7 +66,6 @@ ruma_api! {
         pub inhibit_login: bool,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// An access token for the account.
         ///
diff --git a/ruma-client-api/src/r0/account/request_3pid_management_token_via_email.rs b/ruma-client-api/src/r0/account/request_3pid_management_token_via_email.rs
index 08ea3901..749f624e 100644
--- a/ruma-client-api/src/r0/account/request_3pid_management_token_via_email.rs
+++ b/ruma-client-api/src/r0/account/request_3pid_management_token_via_email.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: false,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Client-generated secret string used to protect this session.
         pub client_secret: &'a str,
@@ -36,7 +35,6 @@ ruma_api! {
         pub identity_server_info: Option<IdentityServerInfo<'a>>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The session identifier given by the identity server.
         pub sid: String,
diff --git a/ruma-client-api/src/r0/account/request_3pid_management_token_via_msisdn.rs b/ruma-client-api/src/r0/account/request_3pid_management_token_via_msisdn.rs
index d50f1b48..144bfdfe 100644
--- a/ruma-client-api/src/r0/account/request_3pid_management_token_via_msisdn.rs
+++ b/ruma-client-api/src/r0/account/request_3pid_management_token_via_msisdn.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: false,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Client-generated secret string used to protect this session.
         pub client_secret: &'a str,
@@ -39,7 +38,6 @@ ruma_api! {
         pub identity_server_info: Option<IdentityServerInfo<'a>>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The session identifier given by the identity server.
         pub sid: String,
diff --git a/ruma-client-api/src/r0/account/request_openid_token.rs b/ruma-client-api/src/r0/account/request_openid_token.rs
index 62b00c06..75b041c0 100644
--- a/ruma-client-api/src/r0/account/request_openid_token.rs
+++ b/ruma-client-api/src/r0/account/request_openid_token.rs
@@ -16,14 +16,12 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// User ID of authenticated user.
         #[ruma_api(path)]
         pub user_id: &'a UserId,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Access token for verifying user's identity.
         pub access_token: String,
diff --git a/ruma-client-api/src/r0/account/request_password_change_token_via_email.rs b/ruma-client-api/src/r0/account/request_password_change_token_via_email.rs
index 9d1ac25f..35889835 100644
--- a/ruma-client-api/src/r0/account/request_password_change_token_via_email.rs
+++ b/ruma-client-api/src/r0/account/request_password_change_token_via_email.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: false,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Client-generated secret string used to protect this session.
         pub client_secret: &'a str,
@@ -36,7 +35,6 @@ ruma_api! {
         pub identity_server_info: Option<IdentityServerInfo<'a>>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The session identifier given by the identity server.
         pub sid: String,
diff --git a/ruma-client-api/src/r0/account/request_password_change_token_via_msisdn.rs b/ruma-client-api/src/r0/account/request_password_change_token_via_msisdn.rs
index 1b720175..b261fff7 100644
--- a/ruma-client-api/src/r0/account/request_password_change_token_via_msisdn.rs
+++ b/ruma-client-api/src/r0/account/request_password_change_token_via_msisdn.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: false,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Client-generated secret string used to protect this session.
         pub client_secret: &'a str,
@@ -32,7 +31,6 @@ ruma_api! {
         pub next_link: Option<&'a str>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The session identifier given by the identity server.
         pub sid: String,
diff --git a/ruma-client-api/src/r0/account/request_registration_token_via_email.rs b/ruma-client-api/src/r0/account/request_registration_token_via_email.rs
index 40efc9c2..6c5e74ab 100644
--- a/ruma-client-api/src/r0/account/request_registration_token_via_email.rs
+++ b/ruma-client-api/src/r0/account/request_registration_token_via_email.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: false,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Client-generated secret string used to protect this session.
         pub client_secret: &'a str,
@@ -36,7 +35,6 @@ ruma_api! {
         pub identity_server_info: Option<IdentityServerInfo<'a>>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The session identifier given by the identity server.
         pub sid: String,
diff --git a/ruma-client-api/src/r0/account/request_registration_token_via_msisdn.rs b/ruma-client-api/src/r0/account/request_registration_token_via_msisdn.rs
index cf1337b1..d46a0a53 100644
--- a/ruma-client-api/src/r0/account/request_registration_token_via_msisdn.rs
+++ b/ruma-client-api/src/r0/account/request_registration_token_via_msisdn.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: false,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Client-generated secret string used to protect this session.
         pub client_secret: &'a str,
@@ -39,7 +38,6 @@ ruma_api! {
         pub identity_server_info: Option<IdentityServerInfo<'a>>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The session identifier given by the identity server.
         pub sid: String,
diff --git a/ruma-client-api/src/r0/account/unbind_3pid.rs b/ruma-client-api/src/r0/account/unbind_3pid.rs
index 98f13075..2844dd3d 100644
--- a/ruma-client-api/src/r0/account/unbind_3pid.rs
+++ b/ruma-client-api/src/r0/account/unbind_3pid.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Identity server to unbind from.
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -28,7 +27,6 @@ ruma_api! {
         pub address: &'a str,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Result of unbind operation.
         pub id_server_unbind_result: ThirdPartyIdRemovalStatus,
diff --git a/ruma-client-api/src/r0/account/whoami.rs b/ruma-client-api/src/r0/account/whoami.rs
index 4a3b5a51..019b12c4 100644
--- a/ruma-client-api/src/r0/account/whoami.rs
+++ b/ruma-client-api/src/r0/account/whoami.rs
@@ -14,10 +14,8 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {}
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The id of the user that owns the access token.
         pub user_id: UserId,
diff --git a/ruma-client-api/src/r0/alias/create_alias.rs b/ruma-client-api/src/r0/alias/create_alias.rs
index 73984499..0e038a32 100644
--- a/ruma-client-api/src/r0/alias/create_alias.rs
+++ b/ruma-client-api/src/r0/alias/create_alias.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room alias to set.
         #[ruma_api(path)]
@@ -24,7 +23,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/alias/delete_alias.rs b/ruma-client-api/src/r0/alias/delete_alias.rs
index 249e5734..42f99d96 100644
--- a/ruma-client-api/src/r0/alias/delete_alias.rs
+++ b/ruma-client-api/src/r0/alias/delete_alias.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room alias to remove.
         #[ruma_api(path)]
@@ -21,7 +20,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/alias/get_alias.rs b/ruma-client-api/src/r0/alias/get_alias.rs
index a38cb10b..7ef3486e 100644
--- a/ruma-client-api/src/r0/alias/get_alias.rs
+++ b/ruma-client-api/src/r0/alias/get_alias.rs
@@ -13,14 +13,12 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room alias.
         #[ruma_api(path)]
         pub room_alias: &'a RoomAliasId,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The room ID for this room alias.
         pub room_id: RoomId,
diff --git a/ruma-client-api/src/r0/appservice/set_room_visibility.rs b/ruma-client-api/src/r0/appservice/set_room_visibility.rs
index 10598096..c3a36a3d 100644
--- a/ruma-client-api/src/r0/appservice/set_room_visibility.rs
+++ b/ruma-client-api/src/r0/appservice/set_room_visibility.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The protocol (network) ID to update the room list for.
         #[ruma_api(path)]
@@ -30,7 +29,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/backup/add_backup_keys.rs b/ruma-client-api/src/r0/backup/add_backup_keys.rs
index d4e39f70..3043c5a2 100644
--- a/ruma-client-api/src/r0/backup/add_backup_keys.rs
+++ b/ruma-client-api/src/r0/backup/add_backup_keys.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The backup version. Must be the current backup.
         #[ruma_api(query)]
@@ -27,7 +26,6 @@ ruma_api! {
         pub rooms: Rooms,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// An opaque string representing stored keys in the backup. Clients can compare it with
         /// the etag value they received in the request of their last key storage request.
diff --git a/ruma-client-api/src/r0/backup/create_backup.rs b/ruma-client-api/src/r0/backup/create_backup.rs
index 7298b324..ce482fed 100644
--- a/ruma-client-api/src/r0/backup/create_backup.rs
+++ b/ruma-client-api/src/r0/backup/create_backup.rs
@@ -14,14 +14,12 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The algorithm used for storing backups.
         #[serde(flatten)]
         pub algorithm: BackupAlgorithm,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The backup version. This is an opaque string.
         pub version: String,
diff --git a/ruma-client-api/src/r0/backup/get_backup.rs b/ruma-client-api/src/r0/backup/get_backup.rs
index 3175b9bc..e9656d59 100644
--- a/ruma-client-api/src/r0/backup/get_backup.rs
+++ b/ruma-client-api/src/r0/backup/get_backup.rs
@@ -15,14 +15,12 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The backup version.
         #[ruma_api(path)]
         pub version: &'a str,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The algorithm used for storing backups.
         #[serde(flatten)]
diff --git a/ruma-client-api/src/r0/backup/get_backup_keys.rs b/ruma-client-api/src/r0/backup/get_backup_keys.rs
index f992cfb7..6a02c385 100644
--- a/ruma-client-api/src/r0/backup/get_backup_keys.rs
+++ b/ruma-client-api/src/r0/backup/get_backup_keys.rs
@@ -14,14 +14,12 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The backup version. Must be the current backup.
         #[ruma_api(query)]
         pub version: &'a str,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// A map from room IDs to session IDs to key data.
         ///
diff --git a/ruma-client-api/src/r0/backup/get_latest_backup.rs b/ruma-client-api/src/r0/backup/get_latest_backup.rs
index f44259a5..b810b4ea 100644
--- a/ruma-client-api/src/r0/backup/get_latest_backup.rs
+++ b/ruma-client-api/src/r0/backup/get_latest_backup.rs
@@ -16,10 +16,8 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {}
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The algorithm used for storing backups.
         #[serde(flatten)]
diff --git a/ruma-client-api/src/r0/backup/update_backup.rs b/ruma-client-api/src/r0/backup/update_backup.rs
index 53fad57c..999fbfc4 100644
--- a/ruma-client-api/src/r0/backup/update_backup.rs
+++ b/ruma-client-api/src/r0/backup/update_backup.rs
@@ -14,7 +14,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The backup version.
         #[ruma_api(path)]
@@ -26,7 +25,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/capabilities/get_capabilities.rs b/ruma-client-api/src/r0/capabilities/get_capabilities.rs
index 1ce15fbb..8b50bfa5 100644
--- a/ruma-client-api/src/r0/capabilities/get_capabilities.rs
+++ b/ruma-client-api/src/r0/capabilities/get_capabilities.rs
@@ -17,10 +17,8 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {}
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The capabilities the server supports
         pub capabilities: Capabilities,
diff --git a/ruma-client-api/src/r0/config/get_global_account_data.rs b/ruma-client-api/src/r0/config/get_global_account_data.rs
index eaf12ec0..18415ff5 100644
--- a/ruma-client-api/src/r0/config/get_global_account_data.rs
+++ b/ruma-client-api/src/r0/config/get_global_account_data.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// User ID of user for whom to retrieve data.
         #[ruma_api(path)]
@@ -26,7 +25,6 @@ ruma_api! {
         pub event_type: &'a str,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Account data content for the given type.
         #[ruma_api(body)]
diff --git a/ruma-client-api/src/r0/config/get_room_account_data.rs b/ruma-client-api/src/r0/config/get_room_account_data.rs
index 7cb5fef3..273a8ec3 100644
--- a/ruma-client-api/src/r0/config/get_room_account_data.rs
+++ b/ruma-client-api/src/r0/config/get_room_account_data.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// User ID of user for whom to retrieve data.
         #[ruma_api(path)]
@@ -30,7 +29,6 @@ ruma_api! {
         pub event_type: &'a str,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Account data content for the given type.
         #[ruma_api(body)]
diff --git a/ruma-client-api/src/r0/config/set_global_account_data.rs b/ruma-client-api/src/r0/config/set_global_account_data.rs
index 073acace..dccf0253 100644
--- a/ruma-client-api/src/r0/config/set_global_account_data.rs
+++ b/ruma-client-api/src/r0/config/set_global_account_data.rs
@@ -14,7 +14,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Arbitrary JSON to store as config data.
         ///
@@ -36,7 +35,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/config/set_room_account_data.rs b/ruma-client-api/src/r0/config/set_room_account_data.rs
index 3f925ae4..7a9bcad2 100644
--- a/ruma-client-api/src/r0/config/set_room_account_data.rs
+++ b/ruma-client-api/src/r0/config/set_room_account_data.rs
@@ -14,7 +14,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Arbitrary JSON to store as config data.
         ///
@@ -40,7 +39,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/contact/get_contacts.rs b/ruma-client-api/src/r0/contact/get_contacts.rs
index 73d4042c..be5d75e8 100644
--- a/ruma-client-api/src/r0/contact/get_contacts.rs
+++ b/ruma-client-api/src/r0/contact/get_contacts.rs
@@ -17,10 +17,8 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {}
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// A list of third party identifiers the homeserver has associated with the user's
         /// account.
diff --git a/ruma-client-api/src/r0/contact/request_contact_verification_token.rs b/ruma-client-api/src/r0/contact/request_contact_verification_token.rs
index 7bc9ac6c..7248dd52 100644
--- a/ruma-client-api/src/r0/contact/request_contact_verification_token.rs
+++ b/ruma-client-api/src/r0/contact/request_contact_verification_token.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: false,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Client-generated secret string used to protect this session.
         pub client_secret: &'a str,
@@ -43,7 +42,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/context/get_context.rs b/ruma-client-api/src/r0/context/get_context.rs
index a7545c60..4e36d0b0 100644
--- a/ruma-client-api/src/r0/context/get_context.rs
+++ b/ruma-client-api/src/r0/context/get_context.rs
@@ -18,7 +18,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room to get events from.
         #[ruma_api(path)]
@@ -46,7 +45,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// A token that can be used to paginate backwards with.
         #[serde(skip_serializing_if = "Option::is_none")]
diff --git a/ruma-client-api/src/r0/device/delete_device.rs b/ruma-client-api/src/r0/device/delete_device.rs
index 1a3c7d5e..94f3b8e8 100644
--- a/ruma-client-api/src/r0/device/delete_device.rs
+++ b/ruma-client-api/src/r0/device/delete_device.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The device to delete.
         #[ruma_api(path)]
@@ -27,7 +26,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: UiaaResponse
diff --git a/ruma-client-api/src/r0/device/delete_devices.rs b/ruma-client-api/src/r0/device/delete_devices.rs
index 9bf5705d..5af85ba0 100644
--- a/ruma-client-api/src/r0/device/delete_devices.rs
+++ b/ruma-client-api/src/r0/device/delete_devices.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// List of devices to delete.
         pub devices: &'a [DeviceIdBox],
@@ -26,7 +25,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: UiaaResponse
diff --git a/ruma-client-api/src/r0/device/get_device.rs b/ruma-client-api/src/r0/device/get_device.rs
index b8a5c0e9..f25c7e9c 100644
--- a/ruma-client-api/src/r0/device/get_device.rs
+++ b/ruma-client-api/src/r0/device/get_device.rs
@@ -14,14 +14,12 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The device to retrieve.
         #[ruma_api(path)]
         pub device_id: &'a DeviceId,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Information about the device.
         #[ruma_api(body)]
diff --git a/ruma-client-api/src/r0/device/get_devices.rs b/ruma-client-api/src/r0/device/get_devices.rs
index 4a33fe6e..fa71b1f3 100644
--- a/ruma-client-api/src/r0/device/get_devices.rs
+++ b/ruma-client-api/src/r0/device/get_devices.rs
@@ -14,10 +14,8 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {}
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// A list of all registered devices for this user
         pub devices: Vec<Device>,
diff --git a/ruma-client-api/src/r0/device/update_device.rs b/ruma-client-api/src/r0/device/update_device.rs
index bb220d0b..b6dcb8cc 100644
--- a/ruma-client-api/src/r0/device/update_device.rs
+++ b/ruma-client-api/src/r0/device/update_device.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The device to update.
         #[ruma_api(path)]
@@ -26,7 +25,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/directory/get_public_rooms.rs b/ruma-client-api/src/r0/directory/get_public_rooms.rs
index 898b2543..2354c14e 100644
--- a/ruma-client-api/src/r0/directory/get_public_rooms.rs
+++ b/ruma-client-api/src/r0/directory/get_public_rooms.rs
@@ -15,7 +15,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Limit for the number of results to return.
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -35,7 +34,6 @@ ruma_api! {
         pub server: Option<&'a str>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// A paginated chunk of public rooms.
         pub chunk: Vec<PublicRoomsChunk>,
diff --git a/ruma-client-api/src/r0/directory/get_public_rooms_filtered.rs b/ruma-client-api/src/r0/directory/get_public_rooms_filtered.rs
index 4109f464..634eb776 100644
--- a/ruma-client-api/src/r0/directory/get_public_rooms_filtered.rs
+++ b/ruma-client-api/src/r0/directory/get_public_rooms_filtered.rs
@@ -17,7 +17,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The server to fetch the public room lists from.
         ///
@@ -44,7 +43,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// A paginated chunk of public rooms.
         pub chunk: Vec<PublicRoomsChunk>,
diff --git a/ruma-client-api/src/r0/directory/get_room_visibility.rs b/ruma-client-api/src/r0/directory/get_room_visibility.rs
index e0e24a28..2bd73a7e 100644
--- a/ruma-client-api/src/r0/directory/get_room_visibility.rs
+++ b/ruma-client-api/src/r0/directory/get_room_visibility.rs
@@ -15,14 +15,12 @@ ruma_api! {
         requires_authentication: false,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The ID of the room of which to request the visibility.
         #[ruma_api(path)]
         pub room_id: &'a RoomId,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Visibility of the room.
         pub visibility: Visibility,
diff --git a/ruma-client-api/src/r0/directory/set_room_visibility.rs b/ruma-client-api/src/r0/directory/set_room_visibility.rs
index 3c8db7bc..a0a46fea 100644
--- a/ruma-client-api/src/r0/directory/set_room_visibility.rs
+++ b/ruma-client-api/src/r0/directory/set_room_visibility.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The ID of the room of which to set the visibility.
         #[ruma_api(path)]
@@ -26,7 +25,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/filter/create_filter.rs b/ruma-client-api/src/r0/filter/create_filter.rs
index 663c6d27..51d23deb 100644
--- a/ruma-client-api/src/r0/filter/create_filter.rs
+++ b/ruma-client-api/src/r0/filter/create_filter.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The ID of the user uploading the filter.
         ///
@@ -28,7 +27,6 @@ ruma_api! {
         pub filter: FilterDefinition<'a>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The ID of the filter that was created.
         pub filter_id: String,
diff --git a/ruma-client-api/src/r0/filter/get_filter.rs b/ruma-client-api/src/r0/filter/get_filter.rs
index 80b6c3e6..622e7d2f 100644
--- a/ruma-client-api/src/r0/filter/get_filter.rs
+++ b/ruma-client-api/src/r0/filter/get_filter.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The user ID to download a filter for.
         #[ruma_api(path)]
@@ -26,7 +25,6 @@ ruma_api! {
         pub filter_id: &'a str,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The filter definition.
         #[ruma_api(body)]
diff --git a/ruma-client-api/src/r0/keys/claim_keys.rs b/ruma-client-api/src/r0/keys/claim_keys.rs
index 2922a751..aa27e79c 100644
--- a/ruma-client-api/src/r0/keys/claim_keys.rs
+++ b/ruma-client-api/src/r0/keys/claim_keys.rs
@@ -20,7 +20,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The time (in milliseconds) to wait when downloading keys from remote servers.
         /// 10 seconds is the recommended default.
@@ -35,7 +34,6 @@ ruma_api! {
         pub one_time_keys: BTreeMap<UserId, BTreeMap<DeviceIdBox, DeviceKeyAlgorithm>>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// If any remote homeservers could not be reached, they are recorded here.
         /// The names of the properties are the names of the unreachable servers.
diff --git a/ruma-client-api/src/r0/keys/get_key_changes.rs b/ruma-client-api/src/r0/keys/get_key_changes.rs
index c505684c..090801a1 100644
--- a/ruma-client-api/src/r0/keys/get_key_changes.rs
+++ b/ruma-client-api/src/r0/keys/get_key_changes.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The desired start point of the list.
         ///
@@ -29,7 +28,6 @@ ruma_api! {
         pub to: &'a str,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The Matrix User IDs of all users who updated their device identity keys.
         pub changed: Vec<UserId>,
diff --git a/ruma-client-api/src/r0/keys/get_keys.rs b/ruma-client-api/src/r0/keys/get_keys.rs
index ab86f6c0..34d4ca8f 100644
--- a/ruma-client-api/src/r0/keys/get_keys.rs
+++ b/ruma-client-api/src/r0/keys/get_keys.rs
@@ -21,7 +21,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The time (in milliseconds) to wait when downloading keys from remote
         /// servers. 10 seconds is the recommended default.
@@ -46,7 +45,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// If any remote homeservers could not be reached, they are recorded
         /// here. The names of the properties are the names of the unreachable
diff --git a/ruma-client-api/src/r0/keys/upload_keys.rs b/ruma-client-api/src/r0/keys/upload_keys.rs
index e69fb0fd..b9de81e9 100644
--- a/ruma-client-api/src/r0/keys/upload_keys.rs
+++ b/ruma-client-api/src/r0/keys/upload_keys.rs
@@ -20,7 +20,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Identity keys for the device. May be absent if no new identity keys are required.
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -31,7 +30,6 @@ ruma_api! {
         pub one_time_keys: Option<BTreeMap<DeviceKeyId, OneTimeKey>>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// For each key algorithm, the number of unclaimed one-time keys of that
         /// type currently held on the server for this device.
diff --git a/ruma-client-api/src/r0/keys/upload_signatures.rs b/ruma-client-api/src/r0/keys/upload_signatures.rs
index 573d6f81..c8807c65 100644
--- a/ruma-client-api/src/r0/keys/upload_signatures.rs
+++ b/ruma-client-api/src/r0/keys/upload_signatures.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Signed keys.
         #[ruma_api(body)]
@@ -23,7 +22,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/keys/upload_signing_keys.rs b/ruma-client-api/src/r0/keys/upload_signing_keys.rs
index bf555b2c..aaf0d333 100644
--- a/ruma-client-api/src/r0/keys/upload_signing_keys.rs
+++ b/ruma-client-api/src/r0/keys/upload_signing_keys.rs
@@ -16,7 +16,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Additional authentication information for the user-interactive authentication API.
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -38,7 +37,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/media/create_content.rs b/ruma-client-api/src/r0/media/create_content.rs
index 261f04ef..981930cf 100644
--- a/ruma-client-api/src/r0/media/create_content.rs
+++ b/ruma-client-api/src/r0/media/create_content.rs
@@ -12,7 +12,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The name of the file being uploaded.
         #[ruma_api(query)]
@@ -29,7 +28,6 @@ ruma_api! {
         pub file: Vec<u8>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The MXC URI for the uploaded content.
         pub content_uri: String,
diff --git a/ruma-client-api/src/r0/media/get_content.rs b/ruma-client-api/src/r0/media/get_content.rs
index 0ec64a6d..dc4da0a9 100644
--- a/ruma-client-api/src/r0/media/get_content.rs
+++ b/ruma-client-api/src/r0/media/get_content.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: false,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The media ID from the mxc:// URI (the path component).
         #[ruma_api(path)]
@@ -31,7 +30,6 @@ ruma_api! {
         pub allow_remote: bool,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The content that was previously uploaded.
         #[ruma_api(raw_body)]
diff --git a/ruma-client-api/src/r0/media/get_content_as_filename.rs b/ruma-client-api/src/r0/media/get_content_as_filename.rs
index 27a34ec8..76cdbb53 100644
--- a/ruma-client-api/src/r0/media/get_content_as_filename.rs
+++ b/ruma-client-api/src/r0/media/get_content_as_filename.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: false,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The media ID from the mxc:// URI (the path component).
         #[ruma_api(path)]
@@ -35,7 +34,6 @@ ruma_api! {
         pub allow_remote: bool,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The content that was previously uploaded.
         #[ruma_api(raw_body)]
diff --git a/ruma-client-api/src/r0/media/get_content_thumbnail.rs b/ruma-client-api/src/r0/media/get_content_thumbnail.rs
index 5fa4ef5e..ae0d2a70 100644
--- a/ruma-client-api/src/r0/media/get_content_thumbnail.rs
+++ b/ruma-client-api/src/r0/media/get_content_thumbnail.rs
@@ -26,7 +26,6 @@ ruma_api! {
         requires_authentication: false,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The media ID from the mxc:// URI (the path component).
         #[ruma_api(path)]
@@ -59,7 +58,6 @@ ruma_api! {
         pub allow_remote: bool,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The content type of the thumbnail.
         #[ruma_api(header = CONTENT_TYPE)]
diff --git a/ruma-client-api/src/r0/media/get_media_config.rs b/ruma-client-api/src/r0/media/get_media_config.rs
index 7079be45..b8ca5b37 100644
--- a/ruma-client-api/src/r0/media/get_media_config.rs
+++ b/ruma-client-api/src/r0/media/get_media_config.rs
@@ -14,10 +14,8 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {}
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Maximum size of upload in bytes.
         #[serde(rename = "m.upload.size")]
diff --git a/ruma-client-api/src/r0/media/get_media_preview.rs b/ruma-client-api/src/r0/media/get_media_preview.rs
index 2b15ca25..3a1878ee 100644
--- a/ruma-client-api/src/r0/media/get_media_preview.rs
+++ b/ruma-client-api/src/r0/media/get_media_preview.rs
@@ -16,7 +16,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// URL to get a preview of.
         #[ruma_api(query)]
@@ -29,7 +28,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// OpenGraph-like data for the URL.
         ///
diff --git a/ruma-client-api/src/r0/membership/ban_user.rs b/ruma-client-api/src/r0/membership/ban_user.rs
index ec0adf09..b11a439a 100644
--- a/ruma-client-api/src/r0/membership/ban_user.rs
+++ b/ruma-client-api/src/r0/membership/ban_user.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room to kick the user from.
         #[ruma_api(path)]
@@ -28,7 +27,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/membership/forget_room.rs b/ruma-client-api/src/r0/membership/forget_room.rs
index b9c38044..d7a1f39b 100644
--- a/ruma-client-api/src/r0/membership/forget_room.rs
+++ b/ruma-client-api/src/r0/membership/forget_room.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room to forget.
         #[ruma_api(path)]
@@ -21,7 +20,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/membership/get_member_events.rs b/ruma-client-api/src/r0/membership/get_member_events.rs
index 3daa9e69..e1094f6d 100644
--- a/ruma-client-api/src/r0/membership/get_member_events.rs
+++ b/ruma-client-api/src/r0/membership/get_member_events.rs
@@ -16,7 +16,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room to get the member events for.
         #[ruma_api(path)]
@@ -42,7 +41,6 @@ ruma_api! {
         pub not_membership: Option<MembershipEventFilter>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// A list of member events.
         pub chunk: Vec<Raw<MemberEvent>>
diff --git a/ruma-client-api/src/r0/membership/invite_user.rs b/ruma-client-api/src/r0/membership/invite_user.rs
index a1dfdba3..b790d1c5 100644
--- a/ruma-client-api/src/r0/membership/invite_user.rs
+++ b/ruma-client-api/src/r0/membership/invite_user.rs
@@ -23,7 +23,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room where the user should be invited.
         #[ruma_api(path)]
@@ -35,7 +34,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/membership/join_room_by_id.rs b/ruma-client-api/src/r0/membership/join_room_by_id.rs
index e38ffa10..8cd968cd 100644
--- a/ruma-client-api/src/r0/membership/join_room_by_id.rs
+++ b/ruma-client-api/src/r0/membership/join_room_by_id.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room where the user should be invited.
         #[ruma_api(path)]
@@ -27,7 +26,6 @@ ruma_api! {
         pub third_party_signed: Option<ThirdPartySigned<'a>>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The room that the user joined.
         pub room_id: RoomId,
diff --git a/ruma-client-api/src/r0/membership/join_room_by_id_or_alias.rs b/ruma-client-api/src/r0/membership/join_room_by_id_or_alias.rs
index c9fbbe0c..acf29114 100644
--- a/ruma-client-api/src/r0/membership/join_room_by_id_or_alias.rs
+++ b/ruma-client-api/src/r0/membership/join_room_by_id_or_alias.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room where the user should be invited.
         #[ruma_api(path)]
@@ -33,7 +32,6 @@ ruma_api! {
         pub third_party_signed: Option<ThirdPartySigned<'a>>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The room that the user joined.
         pub room_id: RoomId,
diff --git a/ruma-client-api/src/r0/membership/joined_members.rs b/ruma-client-api/src/r0/membership/joined_members.rs
index e682b5b4..263649df 100644
--- a/ruma-client-api/src/r0/membership/joined_members.rs
+++ b/ruma-client-api/src/r0/membership/joined_members.rs
@@ -16,14 +16,12 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room to get the members of.
         #[ruma_api(path)]
         pub room_id: &'a RoomId,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// A list of the rooms the user is in, i.e.
         /// the ID of each room in which the user has joined membership.
diff --git a/ruma-client-api/src/r0/membership/joined_rooms.rs b/ruma-client-api/src/r0/membership/joined_rooms.rs
index 23519c01..eb3c0ec4 100644
--- a/ruma-client-api/src/r0/membership/joined_rooms.rs
+++ b/ruma-client-api/src/r0/membership/joined_rooms.rs
@@ -14,10 +14,8 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {}
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// A list of the rooms the user is in, i.e. the ID of each room in
         /// which the user has joined membership.
diff --git a/ruma-client-api/src/r0/membership/kick_user.rs b/ruma-client-api/src/r0/membership/kick_user.rs
index 9204cc7d..5236323f 100644
--- a/ruma-client-api/src/r0/membership/kick_user.rs
+++ b/ruma-client-api/src/r0/membership/kick_user.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room to kick the user from.
         #[ruma_api(path)]
@@ -28,7 +27,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/membership/leave_room.rs b/ruma-client-api/src/r0/membership/leave_room.rs
index cccc5003..7adc52b4 100644
--- a/ruma-client-api/src/r0/membership/leave_room.rs
+++ b/ruma-client-api/src/r0/membership/leave_room.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room to leave.
         #[ruma_api(path)]
@@ -21,7 +20,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/membership/unban_user.rs b/ruma-client-api/src/r0/membership/unban_user.rs
index bc77dce2..8594c9e8 100644
--- a/ruma-client-api/src/r0/membership/unban_user.rs
+++ b/ruma-client-api/src/r0/membership/unban_user.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room to unban the user from.
         #[ruma_api(path)]
@@ -24,7 +23,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/message/get_message_events.rs b/ruma-client-api/src/r0/message/get_message_events.rs
index 6784df8b..531bbd08 100644
--- a/ruma-client-api/src/r0/message/get_message_events.rs
+++ b/ruma-client-api/src/r0/message/get_message_events.rs
@@ -19,7 +19,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room to get events from.
         #[ruma_api(path)]
@@ -64,7 +63,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The token the pagination starts from.
         #[serde(skip_serializing_if = "Option::is_none")]
diff --git a/ruma-client-api/src/r0/presence/get_presence.rs b/ruma-client-api/src/r0/presence/get_presence.rs
index 4bb40db2..0d859848 100644
--- a/ruma-client-api/src/r0/presence/get_presence.rs
+++ b/ruma-client-api/src/r0/presence/get_presence.rs
@@ -16,14 +16,12 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The user whose presence state will be retrieved.
         #[ruma_api(path)]
         pub user_id: &'a UserId,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The state message for this user if one was set.
         #[serde(skip_serializing_if = "Option::is_none")]
diff --git a/ruma-client-api/src/r0/presence/set_presence.rs b/ruma-client-api/src/r0/presence/set_presence.rs
index f2dff6fe..183bb363 100644
--- a/ruma-client-api/src/r0/presence/set_presence.rs
+++ b/ruma-client-api/src/r0/presence/set_presence.rs
@@ -14,7 +14,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The user whose presence state will be updated.
         #[ruma_api(path)]
@@ -29,7 +28,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/profile/get_avatar_url.rs b/ruma-client-api/src/r0/profile/get_avatar_url.rs
index 81b9ebd0..5c836238 100644
--- a/ruma-client-api/src/r0/profile/get_avatar_url.rs
+++ b/ruma-client-api/src/r0/profile/get_avatar_url.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: false,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The user whose avatar URL will be retrieved.
         #[ruma_api(path)]
@@ -21,7 +20,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The user's avatar URL, if set.
         #[serde(skip_serializing_if = "Option::is_none")]
diff --git a/ruma-client-api/src/r0/profile/get_display_name.rs b/ruma-client-api/src/r0/profile/get_display_name.rs
index b20d9912..7a7da482 100644
--- a/ruma-client-api/src/r0/profile/get_display_name.rs
+++ b/ruma-client-api/src/r0/profile/get_display_name.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: false,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The user whose display name will be retrieved.
         #[ruma_api(path)]
@@ -21,7 +20,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The user's display name, if set.
         #[serde(skip_serializing_if = "Option::is_none")]
diff --git a/ruma-client-api/src/r0/profile/get_profile.rs b/ruma-client-api/src/r0/profile/get_profile.rs
index 1eaa48ce..4fae10ba 100644
--- a/ruma-client-api/src/r0/profile/get_profile.rs
+++ b/ruma-client-api/src/r0/profile/get_profile.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: false,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The user whose profile will be retrieved.
         #[ruma_api(path)]
@@ -21,7 +20,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The user's avatar URL, if set.
         #[serde(skip_serializing_if = "Option::is_none")]
diff --git a/ruma-client-api/src/r0/profile/set_avatar_url.rs b/ruma-client-api/src/r0/profile/set_avatar_url.rs
index 66f5a4a6..eadff752 100644
--- a/ruma-client-api/src/r0/profile/set_avatar_url.rs
+++ b/ruma-client-api/src/r0/profile/set_avatar_url.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The user whose avatar URL will be set.
         #[ruma_api(path)]
@@ -26,7 +25,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/profile/set_display_name.rs b/ruma-client-api/src/r0/profile/set_display_name.rs
index c109240b..58be1268 100644
--- a/ruma-client-api/src/r0/profile/set_display_name.rs
+++ b/ruma-client-api/src/r0/profile/set_display_name.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The user whose display name will be set.
         #[ruma_api(path)]
@@ -25,7 +24,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/push/delete_pushrule.rs b/ruma-client-api/src/r0/push/delete_pushrule.rs
index fc7deec4..2987687a 100644
--- a/ruma-client-api/src/r0/push/delete_pushrule.rs
+++ b/ruma-client-api/src/r0/push/delete_pushrule.rs
@@ -14,7 +14,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The scope to delete from. 'global' to specify global rules.
         #[ruma_api(path)]
@@ -30,7 +29,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/push/get_notifications.rs b/ruma-client-api/src/r0/push/get_notifications.rs
index d6b30115..7543ed0d 100644
--- a/ruma-client-api/src/r0/push/get_notifications.rs
+++ b/ruma-client-api/src/r0/push/get_notifications.rs
@@ -20,7 +20,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Pagination token given to retrieve the next set of events.
         #[ruma_api(query)]
@@ -39,7 +38,6 @@ ruma_api! {
         pub only: Option<&'a str>
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The token to supply in the from param of the next /notifications request in order
         /// to request more events. If this is absent, there are no more results.
diff --git a/ruma-client-api/src/r0/push/get_pushers.rs b/ruma-client-api/src/r0/push/get_pushers.rs
index 695d28e6..fa775739 100644
--- a/ruma-client-api/src/r0/push/get_pushers.rs
+++ b/ruma-client-api/src/r0/push/get_pushers.rs
@@ -15,10 +15,8 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {}
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// An array containing the current pushers for the user.
         pub pushers: Vec<Pusher>
diff --git a/ruma-client-api/src/r0/push/get_pushrule.rs b/ruma-client-api/src/r0/push/get_pushrule.rs
index 4cebdd60..d6a3d07e 100644
--- a/ruma-client-api/src/r0/push/get_pushrule.rs
+++ b/ruma-client-api/src/r0/push/get_pushrule.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The scope to fetch rules from. 'global' to specify global rules.
         #[ruma_api(path)]
@@ -30,7 +29,6 @@ ruma_api! {
         pub rule_id: &'a str,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The specific push rule.
         #[ruma_api(body)]
diff --git a/ruma-client-api/src/r0/push/get_pushrule_actions.rs b/ruma-client-api/src/r0/push/get_pushrule_actions.rs
index 154982f9..f0fde313 100644
--- a/ruma-client-api/src/r0/push/get_pushrule_actions.rs
+++ b/ruma-client-api/src/r0/push/get_pushrule_actions.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The scope to fetch a rule from. 'global' to specify global rules.
         #[ruma_api(path)]
@@ -30,7 +29,6 @@ ruma_api! {
         pub rule_id: &'a str,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The actions to perform for this rule.
         pub actions: Vec<Action>
diff --git a/ruma-client-api/src/r0/push/get_pushrule_enabled.rs b/ruma-client-api/src/r0/push/get_pushrule_enabled.rs
index cb298ee2..ef7d1960 100644
--- a/ruma-client-api/src/r0/push/get_pushrule_enabled.rs
+++ b/ruma-client-api/src/r0/push/get_pushrule_enabled.rs
@@ -14,7 +14,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The scope to fetch a rule from. 'global' to specify global rules.
         #[ruma_api(path)]
@@ -29,7 +28,6 @@ ruma_api! {
         pub rule_id: &'a str,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Whether the push rule is enabled or not.
         pub enabled: bool,
diff --git a/ruma-client-api/src/r0/push/get_pushrules_all.rs b/ruma-client-api/src/r0/push/get_pushrules_all.rs
index c273ca89..80622a91 100644
--- a/ruma-client-api/src/r0/push/get_pushrules_all.rs
+++ b/ruma-client-api/src/r0/push/get_pushrules_all.rs
@@ -14,10 +14,8 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {}
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The global ruleset.
         pub global: Ruleset,
diff --git a/ruma-client-api/src/r0/push/get_pushrules_global_scope.rs b/ruma-client-api/src/r0/push/get_pushrules_global_scope.rs
index be5ebd8f..503cba7e 100644
--- a/ruma-client-api/src/r0/push/get_pushrules_global_scope.rs
+++ b/ruma-client-api/src/r0/push/get_pushrules_global_scope.rs
@@ -14,10 +14,8 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {}
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The global ruleset.
         #[ruma_api(body)]
diff --git a/ruma-client-api/src/r0/push/set_pusher.rs b/ruma-client-api/src/r0/push/set_pusher.rs
index 147100a2..43a8790e 100644
--- a/ruma-client-api/src/r0/push/set_pusher.rs
+++ b/ruma-client-api/src/r0/push/set_pusher.rs
@@ -14,7 +14,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The pusher to configure.
         #[serde(flatten)]
@@ -28,7 +27,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/push/set_pushrule.rs b/ruma-client-api/src/r0/push/set_pushrule.rs
index a7fb98e7..070249dd 100644
--- a/ruma-client-api/src/r0/push/set_pushrule.rs
+++ b/ruma-client-api/src/r0/push/set_pushrule.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The scope to set the rule in. 'global' to specify global rules.
         #[ruma_api(path)]
@@ -54,7 +53,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/push/set_pushrule_actions.rs b/ruma-client-api/src/r0/push/set_pushrule_actions.rs
index 79f92eef..d6ecc23a 100644
--- a/ruma-client-api/src/r0/push/set_pushrule_actions.rs
+++ b/ruma-client-api/src/r0/push/set_pushrule_actions.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The scope to fetch a rule from. 'global' to specify global rules.
         #[ruma_api(path)]
@@ -34,7 +33,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/push/set_pushrule_enabled.rs b/ruma-client-api/src/r0/push/set_pushrule_enabled.rs
index 5f827a81..761c0fd3 100644
--- a/ruma-client-api/src/r0/push/set_pushrule_enabled.rs
+++ b/ruma-client-api/src/r0/push/set_pushrule_enabled.rs
@@ -14,7 +14,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The scope to fetch a rule from. 'global' to specify global rules.
         #[ruma_api(path)]
@@ -33,7 +32,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/read_marker/set_read_marker.rs b/ruma-client-api/src/r0/read_marker/set_read_marker.rs
index 79f50a59..b3591b86 100644
--- a/ruma-client-api/src/r0/read_marker/set_read_marker.rs
+++ b/ruma-client-api/src/r0/read_marker/set_read_marker.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room ID to set the read marker in for the user.
         #[ruma_api(path)]
@@ -33,7 +32,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/receipt/create_receipt.rs b/ruma-client-api/src/r0/receipt/create_receipt.rs
index 52b7a5d2..e64a48e2 100644
--- a/ruma-client-api/src/r0/receipt/create_receipt.rs
+++ b/ruma-client-api/src/r0/receipt/create_receipt.rs
@@ -16,7 +16,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room in which to send the event.
         #[ruma_api(path)]
@@ -32,7 +31,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/redact/redact_event.rs b/ruma-client-api/src/r0/redact/redact_event.rs
index 4d4ca3f9..c99c6672 100644
--- a/ruma-client-api/src/r0/redact/redact_event.rs
+++ b/ruma-client-api/src/r0/redact/redact_event.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The ID of the room of the event to redact.
         #[ruma_api(path)]
@@ -35,7 +34,6 @@ ruma_api! {
         pub reason: Option<&'a str>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The ID of the redacted event.
         pub event_id: EventId,
diff --git a/ruma-client-api/src/r0/room/aliases.rs b/ruma-client-api/src/r0/room/aliases.rs
index 0d729d17..69df232c 100644
--- a/ruma-client-api/src/r0/room/aliases.rs
+++ b/ruma-client-api/src/r0/room/aliases.rs
@@ -13,14 +13,12 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room ID to get aliases of.
         #[ruma_api(path)]
         pub room_id: &'a RoomId,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The server's local aliases on the room.
         pub aliases: Vec<RoomAliasId>,
diff --git a/ruma-client-api/src/r0/room/create_room.rs b/ruma-client-api/src/r0/room/create_room.rs
index 8f85b39c..03fe892e 100644
--- a/ruma-client-api/src/r0/room/create_room.rs
+++ b/ruma-client-api/src/r0/room/create_room.rs
@@ -27,7 +27,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Extra keys to be added to the content of the `m.room.create`.
         #[serde(default, skip_serializing_if = "CreationContent::is_empty")]
@@ -88,7 +87,6 @@ ruma_api! {
         pub visibility: Visibility,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The created room's ID.
         pub room_id: RoomId,
diff --git a/ruma-client-api/src/r0/room/get_room_event.rs b/ruma-client-api/src/r0/room/get_room_event.rs
index d01d7461..94ce361f 100644
--- a/ruma-client-api/src/r0/room/get_room_event.rs
+++ b/ruma-client-api/src/r0/room/get_room_event.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The ID of the room the event is in.
         #[ruma_api(path)]
@@ -26,7 +25,6 @@ ruma_api! {
         pub event_id: &'a EventId,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Arbitrary JSON of the event body.
         #[ruma_api(body)]
diff --git a/ruma-client-api/src/r0/room/report_content.rs b/ruma-client-api/src/r0/room/report_content.rs
index fb635916..93e4a0c1 100644
--- a/ruma-client-api/src/r0/room/report_content.rs
+++ b/ruma-client-api/src/r0/room/report_content.rs
@@ -14,7 +14,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Room in which the event to be reported is located.
         #[ruma_api(path)]
@@ -32,7 +31,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/room/upgrade_room.rs b/ruma-client-api/src/r0/room/upgrade_room.rs
index e6a080a8..c20b5fd3 100644
--- a/ruma-client-api/src/r0/room/upgrade_room.rs
+++ b/ruma-client-api/src/r0/room/upgrade_room.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// ID of the room to be upgraded.
         #[ruma_api(path)]
@@ -23,7 +22,6 @@ ruma_api! {
         pub new_version: &'a RoomVersionId,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// ID of the new room.
         pub replacement_room: RoomId,
diff --git a/ruma-client-api/src/r0/search/search_events.rs b/ruma-client-api/src/r0/search/search_events.rs
index c91235ac..922e9817 100644
--- a/ruma-client-api/src/r0/search/search_events.rs
+++ b/ruma-client-api/src/r0/search/search_events.rs
@@ -21,7 +21,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The point to return events from.
         ///
@@ -33,7 +32,6 @@ ruma_api! {
         pub search_categories: Categories<'a>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// A grouping of search results by category.
         pub search_categories: ResultCategories,
diff --git a/ruma-client-api/src/r0/server/get_user_info.rs b/ruma-client-api/src/r0/server/get_user_info.rs
index e5232e25..99bd3946 100644
--- a/ruma-client-api/src/r0/server/get_user_info.rs
+++ b/ruma-client-api/src/r0/server/get_user_info.rs
@@ -16,7 +16,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The user to look up.
         #[ruma_api(path)]
@@ -24,7 +23,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The Matrix user ID of the user.
         #[serde(skip_serializing_if = "Option::is_none")]
diff --git a/ruma-client-api/src/r0/session/get_login_types.rs b/ruma-client-api/src/r0/session/get_login_types.rs
index 8e2d4598..4aa32493 100644
--- a/ruma-client-api/src/r0/session/get_login_types.rs
+++ b/ruma-client-api/src/r0/session/get_login_types.rs
@@ -14,10 +14,8 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {}
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The homeserver's supported login types.
         pub flows: Vec<LoginType>
diff --git a/ruma-client-api/src/r0/session/login.rs b/ruma-client-api/src/r0/session/login.rs
index f980985a..3eca6a7f 100644
--- a/ruma-client-api/src/r0/session/login.rs
+++ b/ruma-client-api/src/r0/session/login.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: false,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Identification information for the user.
         #[serde(flatten)]
@@ -35,7 +34,6 @@ ruma_api! {
         pub initial_device_display_name: Option<&'a str>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The fully-qualified Matrix ID that has been registered.
         pub user_id: UserId,
diff --git a/ruma-client-api/src/r0/session/logout.rs b/ruma-client-api/src/r0/session/logout.rs
index 831c428c..c7a1b2ea 100644
--- a/ruma-client-api/src/r0/session/logout.rs
+++ b/ruma-client-api/src/r0/session/logout.rs
@@ -13,11 +13,9 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {}
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/session/logout_all.rs b/ruma-client-api/src/r0/session/logout_all.rs
index 1af6adbc..cf42ad50 100644
--- a/ruma-client-api/src/r0/session/logout_all.rs
+++ b/ruma-client-api/src/r0/session/logout_all.rs
@@ -13,11 +13,9 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {}
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/session/sso_login.rs b/ruma-client-api/src/r0/session/sso_login.rs
index 00c7d74d..bf513a4c 100644
--- a/ruma-client-api/src/r0/session/sso_login.rs
+++ b/ruma-client-api/src/r0/session/sso_login.rs
@@ -13,7 +13,6 @@ ruma_api! {
 
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// URL to which the homeserver should return the user after completing
         /// authentication with the SSO identity provider.
@@ -21,7 +20,6 @@ ruma_api! {
         pub redirect_url: &'a str,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Redirect URL to the SSO identity provider.
         #[ruma_api(header = LOCATION)]
diff --git a/ruma-client-api/src/r0/state/get_state_events.rs b/ruma-client-api/src/r0/state/get_state_events.rs
index c85eabc6..9904a117 100644
--- a/ruma-client-api/src/r0/state/get_state_events.rs
+++ b/ruma-client-api/src/r0/state/get_state_events.rs
@@ -15,14 +15,12 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room to look up the state for.
         #[ruma_api(path)]
         pub room_id: &'a RoomId,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// If the user is a member of the room this will be the current state of the room as a
         /// list of events. If the user has left the room then this will be the state of the
diff --git a/ruma-client-api/src/r0/state/get_state_events_for_empty_key.rs b/ruma-client-api/src/r0/state/get_state_events_for_empty_key.rs
index 01be6f3d..f6d61643 100644
--- a/ruma-client-api/src/r0/state/get_state_events_for_empty_key.rs
+++ b/ruma-client-api/src/r0/state/get_state_events_for_empty_key.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room to look up the state for.
         #[ruma_api(path)]
@@ -26,7 +25,6 @@ ruma_api! {
         pub event_type: EventType,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The content of the state event.
         ///
diff --git a/ruma-client-api/src/r0/state/get_state_events_for_key.rs b/ruma-client-api/src/r0/state/get_state_events_for_key.rs
index cda33921..bdccfbfd 100644
--- a/ruma-client-api/src/r0/state/get_state_events_for_key.rs
+++ b/ruma-client-api/src/r0/state/get_state_events_for_key.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room to look up the state for.
         #[ruma_api(path)]
@@ -30,7 +29,6 @@ ruma_api! {
         pub state_key: &'a str,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The content of the state event.
         #[ruma_api(body)]
diff --git a/ruma-client-api/src/r0/sync/sync_events.rs b/ruma-client-api/src/r0/sync/sync_events.rs
index 7d17ba8d..932958c8 100644
--- a/ruma-client-api/src/r0/sync/sync_events.rs
+++ b/ruma-client-api/src/r0/sync/sync_events.rs
@@ -25,7 +25,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// A filter represented either as its full JSON definition or the ID of a saved filter.
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -60,7 +59,6 @@ ruma_api! {
         pub timeout: Option<Duration>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The batch token to supply in the `since` param of the next `/sync` request.
         pub next_batch: String,
diff --git a/ruma-client-api/src/r0/tag/create_tag.rs b/ruma-client-api/src/r0/tag/create_tag.rs
index bbf47c93..67026e67 100644
--- a/ruma-client-api/src/r0/tag/create_tag.rs
+++ b/ruma-client-api/src/r0/tag/create_tag.rs
@@ -14,7 +14,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The ID of the user creating the tag.
         #[ruma_api(path)]
@@ -34,7 +33,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/tag/delete_tag.rs b/ruma-client-api/src/r0/tag/delete_tag.rs
index 456326c9..7bbf7fa5 100644
--- a/ruma-client-api/src/r0/tag/delete_tag.rs
+++ b/ruma-client-api/src/r0/tag/delete_tag.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The user whose tag will be deleted.
         #[ruma_api(path)]
@@ -29,7 +28,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/tag/get_tags.rs b/ruma-client-api/src/r0/tag/get_tags.rs
index ba1ce5f1..82dcc823 100644
--- a/ruma-client-api/src/r0/tag/get_tags.rs
+++ b/ruma-client-api/src/r0/tag/get_tags.rs
@@ -14,7 +14,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The user whose tags will be retrieved.
         #[ruma_api(path)]
@@ -25,7 +24,6 @@ ruma_api! {
         pub room_id: &'a RoomId,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The user's tags for the room.
         pub tags: Tags,
diff --git a/ruma-client-api/src/r0/thirdparty/get_location_for_protocol.rs b/ruma-client-api/src/r0/thirdparty/get_location_for_protocol.rs
index 06715097..af71f58d 100644
--- a/ruma-client-api/src/r0/thirdparty/get_location_for_protocol.rs
+++ b/ruma-client-api/src/r0/thirdparty/get_location_for_protocol.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The protocol used to communicate to the third party network.
         #[ruma_api(path)]
@@ -27,7 +26,6 @@ ruma_api! {
         pub fields: BTreeMap<String, String>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// List of matched third party locations.
         #[ruma_api(body)]
diff --git a/ruma-client-api/src/r0/thirdparty/get_location_for_room_alias.rs b/ruma-client-api/src/r0/thirdparty/get_location_for_room_alias.rs
index 6aa9d30d..93eb8641 100644
--- a/ruma-client-api/src/r0/thirdparty/get_location_for_room_alias.rs
+++ b/ruma-client-api/src/r0/thirdparty/get_location_for_room_alias.rs
@@ -14,14 +14,12 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The Matrix room alias to look up.
         #[ruma_api(query)]
         pub alias: &'a RoomAliasId,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// List of matched third party locations.
         #[ruma_api(body)]
diff --git a/ruma-client-api/src/r0/thirdparty/get_protocol.rs b/ruma-client-api/src/r0/thirdparty/get_protocol.rs
index 23c2aaac..bb826f0d 100644
--- a/ruma-client-api/src/r0/thirdparty/get_protocol.rs
+++ b/ruma-client-api/src/r0/thirdparty/get_protocol.rs
@@ -13,14 +13,12 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The name of the protocol.
         #[ruma_api(path)]
         pub protocol: &'a str,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Metadata about the protocol.
         #[ruma_api(body)]
diff --git a/ruma-client-api/src/r0/thirdparty/get_protocols.rs b/ruma-client-api/src/r0/thirdparty/get_protocols.rs
index 73031c46..c5f61788 100644
--- a/ruma-client-api/src/r0/thirdparty/get_protocols.rs
+++ b/ruma-client-api/src/r0/thirdparty/get_protocols.rs
@@ -16,10 +16,8 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {}
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Metadata about protocols supported by the homeserver.
         #[ruma_api(body)]
diff --git a/ruma-client-api/src/r0/thirdparty/get_user_for_protocol.rs b/ruma-client-api/src/r0/thirdparty/get_user_for_protocol.rs
index 902f023e..a4f39d1b 100644
--- a/ruma-client-api/src/r0/thirdparty/get_user_for_protocol.rs
+++ b/ruma-client-api/src/r0/thirdparty/get_user_for_protocol.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The protocol used to communicate to the third party network.
         #[ruma_api(path)]
@@ -27,7 +26,6 @@ ruma_api! {
         pub fields: BTreeMap<String, String>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// List of matched third party users.
         #[ruma_api(body)]
diff --git a/ruma-client-api/src/r0/thirdparty/get_user_for_user_id.rs b/ruma-client-api/src/r0/thirdparty/get_user_for_user_id.rs
index cc393a32..b4cdd11d 100644
--- a/ruma-client-api/src/r0/thirdparty/get_user_for_user_id.rs
+++ b/ruma-client-api/src/r0/thirdparty/get_user_for_user_id.rs
@@ -14,14 +14,12 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The Matrix User ID to look up.
         #[ruma_api(query)]
         pub userid: &'a UserId,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// List of matched third party users.
         #[ruma_api(body)]
diff --git a/ruma-client-api/src/r0/to_device/send_event_to_device.rs b/ruma-client-api/src/r0/to_device/send_event_to_device.rs
index b6193327..522d0dad 100644
--- a/ruma-client-api/src/r0/to_device/send_event_to_device.rs
+++ b/ruma-client-api/src/r0/to_device/send_event_to_device.rs
@@ -19,7 +19,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Type of event being sent to each device.
         #[ruma_api(path)]
@@ -39,7 +38,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/typing/create_typing_event.rs b/ruma-client-api/src/r0/typing/create_typing_event.rs
index 7bb137ec..abd620f3 100644
--- a/ruma-client-api/src/r0/typing/create_typing_event.rs
+++ b/ruma-client-api/src/r0/typing/create_typing_event.rs
@@ -16,7 +16,6 @@ ruma_api! {
         rate_limited: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The user who has started to type.
         #[ruma_api(path)]
@@ -32,7 +31,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {}
 
     error: crate::Error
diff --git a/ruma-client-api/src/r0/user_directory/search_users.rs b/ruma-client-api/src/r0/user_directory/search_users.rs
index b209b2e6..5363bf72 100644
--- a/ruma-client-api/src/r0/user_directory/search_users.rs
+++ b/ruma-client-api/src/r0/user_directory/search_users.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The term to search for.
         pub search_term: &'a str,
@@ -35,7 +34,6 @@ ruma_api! {
         pub language: Option<String>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Ordered by rank and then whether or not profile info is available.
         pub results: Vec<User>,
diff --git a/ruma-client-api/src/r0/voip/get_turn_server_info.rs b/ruma-client-api/src/r0/voip/get_turn_server_info.rs
index 90364a6f..1d88e828 100644
--- a/ruma-client-api/src/r0/voip/get_turn_server_info.rs
+++ b/ruma-client-api/src/r0/voip/get_turn_server_info.rs
@@ -15,10 +15,8 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {}
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The username to use.
         pub username: String,
diff --git a/ruma-client-api/src/unversioned/discover_homeserver.rs b/ruma-client-api/src/unversioned/discover_homeserver.rs
index 92a8b191..452f4eb4 100644
--- a/ruma-client-api/src/unversioned/discover_homeserver.rs
+++ b/ruma-client-api/src/unversioned/discover_homeserver.rs
@@ -14,10 +14,8 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {}
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Information about the homeserver to connect to.
         #[serde(rename = "m.homeserver")]
diff --git a/ruma-client-api/src/unversioned/get_supported_versions.rs b/ruma-client-api/src/unversioned/get_supported_versions.rs
index d85b0a2f..2dbf4966 100644
--- a/ruma-client-api/src/unversioned/get_supported_versions.rs
+++ b/ruma-client-api/src/unversioned/get_supported_versions.rs
@@ -15,10 +15,8 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {}
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// A list of Matrix client API protocol versions supported by the homeserver.
         pub versions: Vec<String>,
diff --git a/ruma-federation-api/src/authorization/get_event_authorization/v1.rs b/ruma-federation-api/src/authorization/get_event_authorization/v1.rs
index f07616bc..984bec53 100644
--- a/ruma-federation-api/src/authorization/get_event_authorization/v1.rs
+++ b/ruma-federation-api/src/authorization/get_event_authorization/v1.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room ID to get the auth chain for.
         #[ruma_api(path)]
@@ -26,7 +25,6 @@ ruma_api! {
         pub event_id: &'a EventId,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The full set of authorization events that make up the state of the room,
         /// and their authorization events, recursively.
diff --git a/ruma-federation-api/src/backfill/get_backfill/v1.rs b/ruma-federation-api/src/backfill/get_backfill/v1.rs
index db0ac0b5..ccd0502f 100644
--- a/ruma-federation-api/src/backfill/get_backfill/v1.rs
+++ b/ruma-federation-api/src/backfill/get_backfill/v1.rs
@@ -17,7 +17,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room ID to backfill.
         #[ruma_api(path)]
@@ -32,7 +31,6 @@ ruma_api! {
         pub limit: UInt,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The `server_name` of the homeserver sending this transaction.
         pub origin: ServerNameBox,
diff --git a/ruma-federation-api/src/device/get_devices/v1.rs b/ruma-federation-api/src/device/get_devices/v1.rs
index e386d9c0..cb6b2574 100644
--- a/ruma-federation-api/src/device/get_devices/v1.rs
+++ b/ruma-federation-api/src/device/get_devices/v1.rs
@@ -16,14 +16,12 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The user ID to retrieve devices for. Must be a user local to the receiving homeserver.
         #[ruma_api(path)]
         pub user_id: &'a UserId,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The user ID devices were requested for.
         pub user_id: UserId,
diff --git a/ruma-federation-api/src/directory/get_public_rooms/v1.rs b/ruma-federation-api/src/directory/get_public_rooms/v1.rs
index 534eff20..2ba6670b 100644
--- a/ruma-federation-api/src/directory/get_public_rooms/v1.rs
+++ b/ruma-federation-api/src/directory/get_public_rooms/v1.rs
@@ -15,7 +15,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Limit for the number of results to return.
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -34,7 +33,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// A paginated chunk of public rooms.
         pub chunk: Vec<PublicRoomsChunk>,
diff --git a/ruma-federation-api/src/directory/get_public_rooms_filtered/v1.rs b/ruma-federation-api/src/directory/get_public_rooms_filtered/v1.rs
index f6ea7607..a6a45234 100644
--- a/ruma-federation-api/src/directory/get_public_rooms_filtered/v1.rs
+++ b/ruma-federation-api/src/directory/get_public_rooms_filtered/v1.rs
@@ -17,7 +17,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Limit for the number of results to return.
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -37,7 +36,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// A paginated chunk of public rooms.
         pub chunk: Vec<PublicRoomsChunk>,
diff --git a/ruma-federation-api/src/discovery/discover_homeserver.rs b/ruma-federation-api/src/discovery/discover_homeserver.rs
index aa511301..915ec1a5 100644
--- a/ruma-federation-api/src/discovery/discover_homeserver.rs
+++ b/ruma-federation-api/src/discovery/discover_homeserver.rs
@@ -14,10 +14,8 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {}
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The server name to delegate server-server communciations to, with optional port.
         #[serde(rename = "m.homeserver")]
diff --git a/ruma-federation-api/src/discovery/get_remote_server_keys/v2.rs b/ruma-federation-api/src/discovery/get_remote_server_keys/v2.rs
index ed9651d6..10e5be91 100644
--- a/ruma-federation-api/src/discovery/get_remote_server_keys/v2.rs
+++ b/ruma-federation-api/src/discovery/get_remote_server_keys/v2.rs
@@ -18,7 +18,6 @@ ruma_api! {
         requires_authentication: false,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The server's DNS name to query
         #[ruma_api(path)]
@@ -33,7 +32,6 @@ ruma_api! {
         pub minimum_valid_until_ts: SystemTime,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The queried server's keys, signed by the notary server.
         pub server_keys: Vec<ServerKey>,
diff --git a/ruma-federation-api/src/discovery/get_remote_server_keys_batch/v2.rs b/ruma-federation-api/src/discovery/get_remote_server_keys_batch/v2.rs
index 1dbf903a..ed26e1a4 100644
--- a/ruma-federation-api/src/discovery/get_remote_server_keys_batch/v2.rs
+++ b/ruma-federation-api/src/discovery/get_remote_server_keys_batch/v2.rs
@@ -17,7 +17,6 @@ ruma_api! {
         requires_authentication: false,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The query criteria. The outer string key on the object is the server
         /// name (eg: matrix.org). The inner string key is the Key ID to query
@@ -42,7 +41,6 @@ ruma_api! {
         pub minimum_valid_until_ts: SystemTime,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The queried server's keys, signed by the notary server.
         pub server_keys: Vec<ServerKey>,
diff --git a/ruma-federation-api/src/discovery/get_server_keys/v2.rs b/ruma-federation-api/src/discovery/get_server_keys/v2.rs
index b11cc346..93501385 100644
--- a/ruma-federation-api/src/discovery/get_server_keys/v2.rs
+++ b/ruma-federation-api/src/discovery/get_server_keys/v2.rs
@@ -14,10 +14,8 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {}
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Queried server key, signed by the notary server.
         #[ruma_api(body)]
diff --git a/ruma-federation-api/src/discovery/get_server_version/v1.rs b/ruma-federation-api/src/discovery/get_server_version/v1.rs
index aaf8904a..247e46b5 100644
--- a/ruma-federation-api/src/discovery/get_server_version/v1.rs
+++ b/ruma-federation-api/src/discovery/get_server_version/v1.rs
@@ -14,11 +14,9 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {}
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Information about the homeserver implementation
         #[serde(skip_serializing_if = "Option::is_none")]
diff --git a/ruma-federation-api/src/event/get_event/v1.rs b/ruma-federation-api/src/event/get_event/v1.rs
index b6c1f1ec..0afbd771 100644
--- a/ruma-federation-api/src/event/get_event/v1.rs
+++ b/ruma-federation-api/src/event/get_event/v1.rs
@@ -15,14 +15,12 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The event ID to get.
         #[ruma_api(path)]
         pub event_id: &'a EventId,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The `server_name` of the homeserver sending this transaction.
         pub origin: ServerNameBox,
diff --git a/ruma-federation-api/src/event/get_missing_events/v1.rs b/ruma-federation-api/src/event/get_missing_events/v1.rs
index 7a78e288..bfdb052c 100644
--- a/ruma-federation-api/src/event/get_missing_events/v1.rs
+++ b/ruma-federation-api/src/event/get_missing_events/v1.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room ID to search in.
         #[ruma_api(path)]
@@ -37,7 +36,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The missing PDUs.
         events: Vec<Pdu>
diff --git a/ruma-federation-api/src/event/get_room_state/v1.rs b/ruma-federation-api/src/event/get_room_state/v1.rs
index e96e2cfe..d02fc524 100644
--- a/ruma-federation-api/src/event/get_room_state/v1.rs
+++ b/ruma-federation-api/src/event/get_room_state/v1.rs
@@ -14,7 +14,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room ID to get state for.
         #[ruma_api(path)]
@@ -25,7 +24,6 @@ ruma_api! {
         pub event_id: &'a EventId,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The full set of authorization events that make up the state of the
         /// room, and their authorization events, recursively.
diff --git a/ruma-federation-api/src/event/get_room_state_ids/v1.rs b/ruma-federation-api/src/event/get_room_state_ids/v1.rs
index d899975f..2b5709c3 100644
--- a/ruma-federation-api/src/event/get_room_state_ids/v1.rs
+++ b/ruma-federation-api/src/event/get_room_state_ids/v1.rs
@@ -13,7 +13,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room ID to get state for.
         #[ruma_api(path)]
@@ -24,7 +23,6 @@ ruma_api! {
         pub event_id: &'a EventId,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The full set of authorization events that make up the state of the
         /// room, and their authorization events, recursively.
diff --git a/ruma-federation-api/src/keys/claim_keys/v1.rs b/ruma-federation-api/src/keys/claim_keys/v1.rs
index daa546d7..d582e807 100644
--- a/ruma-federation-api/src/keys/claim_keys/v1.rs
+++ b/ruma-federation-api/src/keys/claim_keys/v1.rs
@@ -17,13 +17,11 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The keys to be claimed.
         pub one_time_keys: OneTimeKeyClaims,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// One-time keys for the queried devices
         pub one_time_keys: OneTimeKeys,
diff --git a/ruma-federation-api/src/keys/get_keys/v1.rs b/ruma-federation-api/src/keys/get_keys/v1.rs
index bcb413a9..015b35bf 100644
--- a/ruma-federation-api/src/keys/get_keys/v1.rs
+++ b/ruma-federation-api/src/keys/get_keys/v1.rs
@@ -16,14 +16,12 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The keys to be downloaded. Gives all keys for a given user if the list of device ids is
         /// empty.
         pub device_keys: BTreeMap<UserId, Vec<DeviceIdBox>>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Keys from the queried devices.
         pub device_keys: BTreeMap<UserId, BTreeMap<DeviceIdBox, IncomingDeviceKeys>>,
diff --git a/ruma-federation-api/src/membership/create_invite/v1.rs b/ruma-federation-api/src/membership/create_invite/v1.rs
index 1dadd8a8..01440849 100644
--- a/ruma-federation-api/src/membership/create_invite/v1.rs
+++ b/ruma-federation-api/src/membership/create_invite/v1.rs
@@ -18,7 +18,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room ID that the user is being invited to.
         #[ruma_api(path)]
@@ -53,7 +52,6 @@ ruma_api! {
         pub unsigned: UnsignedEventContent,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The response invite event
         #[ruma_api(body)]
diff --git a/ruma-federation-api/src/membership/create_invite/v2.rs b/ruma-federation-api/src/membership/create_invite/v2.rs
index 8a21f229..af77591a 100644
--- a/ruma-federation-api/src/membership/create_invite/v2.rs
+++ b/ruma-federation-api/src/membership/create_invite/v2.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room ID that the user is being invited to.
         #[ruma_api(path)]
@@ -35,7 +34,6 @@ ruma_api! {
         pub invite_room_state: StrippedState,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// An invite event.
         pub event: InviteEvent,
diff --git a/ruma-federation-api/src/membership/create_join_event/v1.rs b/ruma-federation-api/src/membership/create_join_event/v1.rs
index adfd2878..d1b91cdc 100644
--- a/ruma-federation-api/src/membership/create_join_event/v1.rs
+++ b/ruma-federation-api/src/membership/create_join_event/v1.rs
@@ -17,7 +17,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room ID that is about to be joined.
         #[ruma_api(path)]
@@ -32,7 +31,6 @@ ruma_api! {
         pub pdu_stub: Raw<PduStub>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Full state and auth chain of the room prior to the join event.
         #[ruma_api(body)]
diff --git a/ruma-federation-api/src/membership/create_join_event/v2.rs b/ruma-federation-api/src/membership/create_join_event/v2.rs
index 7e471304..af570cd1 100644
--- a/ruma-federation-api/src/membership/create_join_event/v2.rs
+++ b/ruma-federation-api/src/membership/create_join_event/v2.rs
@@ -17,7 +17,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room ID that is about to be joined.
         #[ruma_api(path)]
@@ -32,7 +31,6 @@ ruma_api! {
         pub pdu_stub: Raw<PduStub>,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Full state of the room.
         #[ruma_api(body)]
diff --git a/ruma-federation-api/src/membership/create_join_event_template/v1.rs b/ruma-federation-api/src/membership/create_join_event_template/v1.rs
index 9835833f..69388dd8 100644
--- a/ruma-federation-api/src/membership/create_join_event_template/v1.rs
+++ b/ruma-federation-api/src/membership/create_join_event_template/v1.rs
@@ -15,7 +15,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The room ID that is about to be joined.
         #[ruma_api(path)]
@@ -33,7 +32,6 @@ ruma_api! {
         pub ver: &'a [RoomVersionId],
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The version of the room where the server is trying to join.
         #[serde(skip_serializing_if = "Option::is_none")]
diff --git a/ruma-federation-api/src/openid/get_openid_userinfo/v1.rs b/ruma-federation-api/src/openid/get_openid_userinfo/v1.rs
index 8ab927eb..055c2344 100644
--- a/ruma-federation-api/src/openid/get_openid_userinfo/v1.rs
+++ b/ruma-federation-api/src/openid/get_openid_userinfo/v1.rs
@@ -13,14 +13,12 @@ ruma_api! {
         requires_authentication: false,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// The OpenID access token to get information about the owner for.
         #[ruma_api(query)]
         pub access_token: &'a str,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// The Matrix User ID who generated the token.
         pub sub: UserId,
diff --git a/ruma-federation-api/src/query/get_profile_information/v1.rs b/ruma-federation-api/src/query/get_profile_information/v1.rs
index bbfcd2c9..75abaf84 100644
--- a/ruma-federation-api/src/query/get_profile_information/v1.rs
+++ b/ruma-federation-api/src/query/get_profile_information/v1.rs
@@ -14,7 +14,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// User ID to query.
         #[ruma_api(query)]
@@ -27,7 +26,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Display name of the user.
         #[serde(skip_serializing_if = "Option::is_none")]
diff --git a/ruma-federation-api/src/query/get_room_information/v1.rs b/ruma-federation-api/src/query/get_room_information/v1.rs
index 2122a2d8..9078f915 100644
--- a/ruma-federation-api/src/query/get_room_information/v1.rs
+++ b/ruma-federation-api/src/query/get_room_information/v1.rs
@@ -13,14 +13,12 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// Room alias to query.
         #[ruma_api(query)]
         pub room_alias: &'a RoomAliasId,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Room ID mapped to queried alias.
         pub room_id: RoomId,
diff --git a/ruma-federation-api/src/transactions/send_transaction_message/v1.rs b/ruma-federation-api/src/transactions/send_transaction_message/v1.rs
index d133fe14..0c9c40b7 100644
--- a/ruma-federation-api/src/transactions/send_transaction_message/v1.rs
+++ b/ruma-federation-api/src/transactions/send_transaction_message/v1.rs
@@ -18,7 +18,6 @@ ruma_api! {
         requires_authentication: true,
     }
 
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     request: {
         /// A transaction ID unique between sending and receiving homeservers.
         #[ruma_api(path)]
@@ -45,7 +44,6 @@ ruma_api! {
     }
 
     #[derive(Default)]
-    #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
     response: {
         /// Map of event IDs and response for each PDU given in the request.
         #[serde(with = "crate::serde::pdu_process_response")]