diff --git a/cumulus/parachain-template/node/src/main.rs b/cumulus/parachain-template/node/src/main.rs
index ba9f28b354f13a17b7e2b57eb85ad1f027a2ff43..12738a6793c039dc20cc4f8721ebd2ea0a7e69e9 100644
--- a/cumulus/parachain-template/node/src/main.rs
+++ b/cumulus/parachain-template/node/src/main.rs
@@ -3,11 +3,10 @@
 #![warn(missing_docs)]
 
 mod chain_spec;
-#[macro_use]
-mod service;
 mod cli;
 mod command;
 mod rpc;
+mod service;
 
 fn main() -> sc_cli::Result<()> {
 	command::run()
diff --git a/cumulus/polkadot-parachain/src/main.rs b/cumulus/polkadot-parachain/src/main.rs
index e40af8128f7166697a7e4f7571dd541a11d626a8..26d7dae4b8a0355d56ddadaa025b8c8652874626 100644
--- a/cumulus/polkadot-parachain/src/main.rs
+++ b/cumulus/polkadot-parachain/src/main.rs
@@ -20,11 +20,10 @@
 #![warn(unused_extern_crates)]
 
 mod chain_spec;
-#[macro_use]
-mod service;
 mod cli;
 mod command;
 mod rpc;
+mod service;
 
 fn main() -> sc_cli::Result<()> {
 	command::run()
diff --git a/substrate/bin/minimal/node/src/main.rs b/substrate/bin/minimal/node/src/main.rs
index 900651fd1fdb83c6146b67490eb1bd6551a1f9b6..3cf7d98311eaa3cde56813326117adde409b366d 100644
--- a/substrate/bin/minimal/node/src/main.rs
+++ b/substrate/bin/minimal/node/src/main.rs
@@ -19,11 +19,10 @@
 #![warn(missing_docs)]
 
 mod chain_spec;
-#[macro_use]
-mod service;
 mod cli;
 mod command;
 mod rpc;
+mod service;
 
 fn main() -> sc_cli::Result<()> {
 	command::run()
diff --git a/substrate/bin/node-template/node/src/main.rs b/substrate/bin/node-template/node/src/main.rs
index 426cbabb6fbf7dc960f48736e092e0072984f23a..8918dd43a01195f1111ac1703070c9de03db254c 100644
--- a/substrate/bin/node-template/node/src/main.rs
+++ b/substrate/bin/node-template/node/src/main.rs
@@ -1,13 +1,12 @@
 //! Substrate Node Template CLI library.
 #![warn(missing_docs)]
 
-mod chain_spec;
-#[macro_use]
-mod service;
 mod benchmarking;
+mod chain_spec;
 mod cli;
 mod command;
 mod rpc;
+mod service;
 
 fn main() -> sc_cli::Result<()> {
 	command::run()
diff --git a/substrate/bin/node/cli/src/lib.rs b/substrate/bin/node/cli/src/lib.rs
index 2fe238ef316e60a7544b0f828e53b228503df7e6..0ff544932a9a144e82cf9e147c1d0b8718022c47 100644
--- a/substrate/bin/node/cli/src/lib.rs
+++ b/substrate/bin/node/cli/src/lib.rs
@@ -30,16 +30,14 @@
 
 #![warn(missing_docs)]
 
-pub mod chain_spec;
-
-#[macro_use]
-pub mod service;
 #[cfg(feature = "cli")]
 mod benchmarking;
+pub mod chain_spec;
 #[cfg(feature = "cli")]
 mod cli;
 #[cfg(feature = "cli")]
 mod command;
+pub mod service;
 
 #[cfg(feature = "cli")]
 pub use cli::*;