diff --git a/wayland-protocols-misc/src/lib.rs b/wayland-protocols-misc/src/lib.rs
index 08ad836de28..7a2006639b2 100644
--- a/wayland-protocols-misc/src/lib.rs
+++ b/wayland-protocols-misc/src/lib.rs
@@ -12,11 +12,11 @@
 #![warn(missing_docs)]
 #![forbid(improper_ctypes, unsafe_op_in_unsafe_fn)]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
-#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[macro_use]
 mod protocol_macro;
 
+#[rustfmt::skip]
 pub mod gtk_primary_selection {
     //! Gtk primary selection protocol
     //!
@@ -65,6 +65,7 @@ pub mod gtk_primary_selection {
     wayland_protocol!("./protocols/gtk-primary-selection.xml", []);
 }
 
+#[rustfmt::skip]
 pub mod zwp_input_method_v2 {
     //! Input method v2 unstable
     //! 
@@ -89,6 +90,7 @@ pub mod zwp_input_method_v2 {
     wayland_protocol!("./protocols/input-method-unstable-v2.xml", [wayland_protocols::wp::text_input::zv3]);
 }
 
+#[rustfmt::skip]
 pub mod zwp_virtual_keyboard_v1 {
     //! Virtual keyboard v1 unstable
     //!
@@ -101,6 +103,7 @@ pub mod zwp_virtual_keyboard_v1 {
     wayland_protocol!("./protocols/virtual-keyboard-unstable-v1.xml", []);
 }
 
+#[rustfmt::skip]
 pub mod server_decoration {
     //! KDE server decoration protocol
     //!
diff --git a/wayland-protocols-plasma/src/lib.rs b/wayland-protocols-plasma/src/lib.rs
index 1553f62268c..67504e8a917 100644
--- a/wayland-protocols-plasma/src/lib.rs
+++ b/wayland-protocols-plasma/src/lib.rs
@@ -9,11 +9,12 @@
 
 #![forbid(improper_ctypes, unsafe_op_in_unsafe_fn)]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
-#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[macro_use]
+#[rustfmt::skip]
 mod protocol_macro;
 
+#[rustfmt::skip]
 pub mod appmenu {
     wayland_protocol!(
         "./plasma-wayland-protocols/src/protocols/appmenu.xml",
@@ -21,6 +22,7 @@ pub mod appmenu {
     );
 }
 
+#[rustfmt::skip]
 pub mod blur {
     wayland_protocol!(
         "./plasma-wayland-protocols/src/protocols/blur.xml",
@@ -28,6 +30,7 @@ pub mod blur {
     );
 }
 
+#[rustfmt::skip]
 pub mod contrast {
     wayland_protocol!(
         "./plasma-wayland-protocols/src/protocols/contrast.xml",
@@ -35,6 +38,7 @@ pub mod contrast {
     );
 }
 
+#[rustfmt::skip]
 pub mod dpms {
     wayland_protocol!(
         "./plasma-wayland-protocols/src/protocols/dpms.xml",
@@ -42,6 +46,7 @@ pub mod dpms {
     );
 }
 
+#[rustfmt::skip]
 pub mod fake_input {
     wayland_protocol!(
         "./plasma-wayland-protocols/src/protocols/fake-input.xml",
@@ -49,6 +54,7 @@ pub mod fake_input {
     );
 }
 
+#[rustfmt::skip]
 pub mod fullscreen_shell {
     wayland_protocol!(
         "./plasma-wayland-protocols/src/protocols/fullscreen-shell.xml",
@@ -56,6 +62,7 @@ pub mod fullscreen_shell {
     );
 }
 
+#[rustfmt::skip]
 pub mod idle {
     wayland_protocol!(
         "./plasma-wayland-protocols/src/protocols/idle.xml",
@@ -63,6 +70,7 @@ pub mod idle {
     );
 }
 
+#[rustfmt::skip]
 pub mod keystate {
     wayland_protocol!(
         "./plasma-wayland-protocols/src/protocols/keystate.xml",
@@ -70,6 +78,7 @@ pub mod keystate {
     );
 }
 
+#[rustfmt::skip]
 pub mod output_device {
     pub mod v1 {
         wayland_protocol!(
@@ -86,6 +95,7 @@ pub mod output_device {
     }
 }
 
+#[rustfmt::skip]
 pub mod output_management {
     pub mod v1 {
         wayland_protocol!(
@@ -103,6 +113,7 @@ pub mod output_management {
 }
 
 
+#[rustfmt::skip]
 pub mod primary_output {
     pub mod v1 {
         wayland_protocol!(
@@ -112,6 +123,7 @@ pub mod primary_output {
     }
 }
 
+#[rustfmt::skip]
 pub mod plasma_shell {
     wayland_protocol!(
         "./plasma-wayland-protocols/src/protocols/plasma-shell.xml",
@@ -119,6 +131,7 @@ pub mod plasma_shell {
     );
 }
 
+#[rustfmt::skip]
 pub mod plasma_virtual_desktop {
     wayland_protocol!(
         "./plasma-wayland-protocols/src/protocols/plasma-virtual-desktop.xml",
@@ -126,6 +139,7 @@ pub mod plasma_virtual_desktop {
     );
 }
 
+#[rustfmt::skip]
 pub mod plasma_window_management {
     wayland_protocol!(
         "./plasma-wayland-protocols/src/protocols/plasma-window-management.xml",
@@ -133,6 +147,7 @@ pub mod plasma_window_management {
     );
 }
 
+#[rustfmt::skip]
 pub mod remote_access {
     wayland_protocol!(
         "./plasma-wayland-protocols/src/protocols/remote-access.xml",
@@ -140,6 +155,7 @@ pub mod remote_access {
     );
 }
 
+#[rustfmt::skip]
 pub mod screencast {
     pub mod v1 {
         wayland_protocol!(
@@ -149,6 +165,7 @@ pub mod screencast {
     }
 }
 
+#[rustfmt::skip]
 pub mod server_decoration_palette {
     wayland_protocol!(
         "./plasma-wayland-protocols/src/protocols/server-decoration-palette.xml",
@@ -156,6 +173,7 @@ pub mod server_decoration_palette {
     );
 }
 
+#[rustfmt::skip]
 pub mod server_decoration {
     wayland_protocol!(
         "./plasma-wayland-protocols/src/protocols/server-decoration.xml",
@@ -163,6 +181,7 @@ pub mod server_decoration {
     );
 }
 
+#[rustfmt::skip]
 pub mod shadow {
     wayland_protocol!(
         "./plasma-wayland-protocols/src/protocols/shadow.xml",
@@ -170,6 +189,7 @@ pub mod shadow {
     );
 }
 
+#[rustfmt::skip]
 pub mod slide {
     wayland_protocol!(
         "./plasma-wayland-protocols/src/protocols/slide.xml",
@@ -177,6 +197,7 @@ pub mod slide {
     );
 }
 
+#[rustfmt::skip]
 pub mod surface_extension {
     wayland_protocol!(
         "./plasma-wayland-protocols/src/protocols/surface-extension.xml",
@@ -184,6 +205,7 @@ pub mod surface_extension {
     );
 }
 
+#[rustfmt::skip]
 pub mod text_input {
     pub mod v1 {
         wayland_protocol!(
@@ -200,6 +222,7 @@ pub mod text_input {
     }
 }
 
+#[rustfmt::skip]
 pub mod wayland_eglstream_controller {
     wayland_protocol!(
         "./plasma-wayland-protocols/src/protocols/wayland-eglstream-controller.xml",
diff --git a/wayland-protocols-wlr/src/lib.rs b/wayland-protocols-wlr/src/lib.rs
index 3eb71ad062e..0aa1773502a 100644
--- a/wayland-protocols-wlr/src/lib.rs
+++ b/wayland-protocols-wlr/src/lib.rs
@@ -10,11 +10,11 @@
 #![warn(missing_docs)]
 #![forbid(improper_ctypes, unsafe_op_in_unsafe_fn)]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
-#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[macro_use]
 mod protocol_macro;
 
+#[rustfmt::skip]
 pub mod data_control {
     //! Control data devices, particularly the clipboard.
     //!
@@ -30,6 +30,7 @@ pub mod data_control {
     }
 }
 
+#[rustfmt::skip]
 pub mod export_dmabuf {
     //! A protocol for low overhead screen content capturing
     //!
@@ -44,6 +45,7 @@ pub mod export_dmabuf {
     }
 }
 
+#[rustfmt::skip]
 pub mod foreign_toplevel {
     //! List and control opened apps
     //!
@@ -58,6 +60,7 @@ pub mod foreign_toplevel {
     }
 }
 
+#[rustfmt::skip]
 pub mod gamma_control {
     //! Manage gamma tables of outputs.
     //!
@@ -72,6 +75,7 @@ pub mod gamma_control {
     }
 }
 
+#[rustfmt::skip]
 pub mod input_inhibitor {
     //! Inhibits input events to other clients
 
@@ -84,6 +88,7 @@ pub mod input_inhibitor {
     }
 }
 
+#[rustfmt::skip]
 pub mod layer_shell {
     //! Layered shell protocol
 
@@ -96,6 +101,7 @@ pub mod layer_shell {
     }
 }
 
+#[rustfmt::skip]
 pub mod output_management {
     //! Output management protocol
     //!
@@ -110,6 +116,7 @@ pub mod output_management {
     }
 }
 
+#[rustfmt::skip]
 pub mod output_power_management {
     //! Output power management protocol
     //!
@@ -127,6 +134,7 @@ pub mod output_power_management {
     }
 }
 
+#[rustfmt::skip]
 pub mod screencopy {
     //! Screen content capturing on client buffers
     //!
@@ -142,6 +150,7 @@ pub mod screencopy {
     }
 }
 
+#[rustfmt::skip]
 pub mod virtual_pointer {
     //! Virtual pointer protocol
     //!
diff --git a/wayland-protocols/src/ext.rs b/wayland-protocols/src/ext.rs
index e080d768492..dba64ba25e6 100644
--- a/wayland-protocols/src/ext.rs
+++ b/wayland-protocols/src/ext.rs
@@ -1,7 +1,5 @@
 //! Miscellaneous protocols
 
-#![cfg_attr(rustfmt, rustfmt_skip)]
-
 #[cfg(feature = "staging")]
 pub mod idle_notify {
     //! This protocol allows clients to monitor user idle status.
diff --git a/wayland-protocols/src/lib.rs b/wayland-protocols/src/lib.rs
index 832eacfd323..0e97a920efa 100644
--- a/wayland-protocols/src/lib.rs
+++ b/wayland-protocols/src/lib.rs
@@ -50,7 +50,11 @@
 #[macro_use]
 mod protocol_macro;
 
+#[rustfmt::skip]
 pub mod ext;
+#[rustfmt::skip]
 pub mod wp;
+#[rustfmt::skip]
 pub mod xdg;
+#[rustfmt::skip]
 pub mod xwayland;
diff --git a/wayland-protocols/src/wp.rs b/wayland-protocols/src/wp.rs
index d6e80f43ff0..656ee82995a 100644
--- a/wayland-protocols/src/wp.rs
+++ b/wayland-protocols/src/wp.rs
@@ -1,7 +1,5 @@
 //! Generic wayland protocols
 
-#![cfg_attr(rustfmt, rustfmt_skip)]
-
 #[cfg(feature = "staging")]
 pub mod content_type {
     //! This protocol allows a client to describe the kind of content a surface
diff --git a/wayland-protocols/src/xdg.rs b/wayland-protocols/src/xdg.rs
index 2351db36b73..5340065c313 100644
--- a/wayland-protocols/src/xdg.rs
+++ b/wayland-protocols/src/xdg.rs
@@ -1,7 +1,5 @@
 //! Protocols related to window management
 
-#![cfg_attr(rustfmt, rustfmt_skip)]
-
 #[cfg(feature = "staging")]
 pub mod activation {
     //! The way for a client to pass focus to another toplevel is as follows.
diff --git a/wayland-protocols/src/xwayland.rs b/wayland-protocols/src/xwayland.rs
index 09ed384cda6..202fad88fe7 100644
--- a/wayland-protocols/src/xwayland.rs
+++ b/wayland-protocols/src/xwayland.rs
@@ -1,7 +1,5 @@
 //! XWayland related protocols
 
-#![cfg_attr(rustfmt, rustfmt_skip)]
-
 #[cfg(feature = "staging")]
 pub mod shell {
     //! This protocol adds a xwayland_surface role which allows an Xwayland
diff --git a/wayland-sys/src/client.rs b/wayland-sys/src/client.rs
index a3980484a79..fdcb70f9904 100644
--- a/wayland-sys/src/client.rs
+++ b/wayland-sys/src/client.rs
@@ -2,8 +2,6 @@
 //!
 //! The generated handle is named `wayland_client_handle()`
 
-#![cfg_attr(rustfmt, rustfmt_skip)]
-
 #[cfg(all(feature = "client", feature = "dlopen"))]
 use once_cell::sync::Lazy;
 #[cfg(feature = "client")]
diff --git a/wayland-sys/src/lib.rs b/wayland-sys/src/lib.rs
index abcfee46d5e..db3a4eae012 100644
--- a/wayland-sys/src/lib.rs
+++ b/wayland-sys/src/lib.rs
@@ -41,8 +41,10 @@ extern crate dlib;
 
 pub mod common;
 
+#[rustfmt::skip]
 pub mod client;
 
+#[rustfmt::skip]
 pub mod server;
 
 #[cfg(all(feature = "egl", feature = "client"))]
diff --git a/wayland-sys/src/server.rs b/wayland-sys/src/server.rs
index b11e8ed7060..0c5f05fa761 100644
--- a/wayland-sys/src/server.rs
+++ b/wayland-sys/src/server.rs
@@ -2,8 +2,6 @@
 //!
 //! The generated handle is named `wayland_server_handle()`
 
-#![cfg_attr(rustfmt, rustfmt_skip)]
-
 use super::common::*;
 #[cfg(feature = "server")]
 use libc::{gid_t, pid_t, uid_t};