diff --git a/substrate/frame/im-online/src/lib.rs b/substrate/frame/im-online/src/lib.rs
index 839996da32..9a3fc2430c 100644
--- a/substrate/frame/im-online/src/lib.rs
+++ b/substrate/frame/im-online/src/lib.rs
@@ -102,9 +102,10 @@ pub mod sr25519 {
 		app_crypto!(sr25519, IM_ONLINE);
 	}
 
-	/// An i'm online keypair using sr25519 as its crypto.
-	#[cfg(feature = "std")]
-	pub type AuthorityPair = app_sr25519::Pair;
+	sp_application_crypto::with_pair! {
+		/// An i'm online keypair using sr25519 as its crypto.
+		pub type AuthorityPair = app_sr25519::Pair;
+	}
 
 	/// An i'm online signature using sr25519 as its crypto.
 	pub type AuthoritySignature = app_sr25519::Signature;
@@ -119,9 +120,10 @@ pub mod ed25519 {
 		app_crypto!(ed25519, IM_ONLINE);
 	}
 
-	/// An i'm online keypair using ed25519 as its crypto.
-	#[cfg(feature = "std")]
-	pub type AuthorityPair = app_ed25519::Pair;
+	sp_application_crypto::with_pair! {
+		/// An i'm online keypair using ed25519 as its crypto.
+		pub type AuthorityPair = app_ed25519::Pair;
+	}
 
 	/// An i'm online signature using ed25519 as its crypto.
 	pub type AuthoritySignature = app_ed25519::Signature;
diff --git a/substrate/primitives/application-crypto/src/lib.rs b/substrate/primitives/application-crypto/src/lib.rs
index fed4a6bf8e..b7c9ccaa98 100644
--- a/substrate/primitives/application-crypto/src/lib.rs
+++ b/substrate/primitives/application-crypto/src/lib.rs
@@ -436,3 +436,30 @@ macro_rules! wrap {
 		}
 	}
 }
+
+/// Generate the given code if the pair type is available.
+///
+/// The pair type is available when `feature = "std"` || `feature = "full_crypto"`.
+///
+/// # Example
+///
+/// ```
+/// sp_application_crypto::with_pair! {
+///     pub type Pair = ();
+/// }
+/// ```
+#[macro_export]
+#[cfg(any(feature = "std", feature = "full_crypto"))]
+macro_rules! with_pair {
+	( $( $def:tt )* ) => {
+		$( $def )*
+	}
+}
+
+
+#[doc(hidden)]
+#[macro_export]
+#[cfg(all(not(feature = "std"), not(feature = "full_crypto")))]
+macro_rules! with_pair {
+	( $( $def:tt )* ) => {}
+}
diff --git a/substrate/primitives/authority-discovery/src/lib.rs b/substrate/primitives/authority-discovery/src/lib.rs
index fc76da61af..8926825525 100644
--- a/substrate/primitives/authority-discovery/src/lib.rs
+++ b/substrate/primitives/authority-discovery/src/lib.rs
@@ -25,9 +25,10 @@ mod app {
 	app_crypto!(sr25519, AUTHORITY_DISCOVERY);
 }
 
-/// An authority discovery authority keypair.
-#[cfg(feature = "std")]
-pub type AuthorityPair = app::Pair;
+sp_application_crypto::with_pair! {
+	/// An authority discovery authority keypair.
+	pub type AuthorityPair = app::Pair;
+}
 
 /// An authority discovery authority identifier.
 pub type AuthorityId = app::Public;
diff --git a/substrate/primitives/consensus/aura/src/lib.rs b/substrate/primitives/consensus/aura/src/lib.rs
index 4f20456667..2dda5b28bf 100644
--- a/substrate/primitives/consensus/aura/src/lib.rs
+++ b/substrate/primitives/consensus/aura/src/lib.rs
@@ -30,9 +30,10 @@ pub mod sr25519 {
 		app_crypto!(sr25519, AURA);
 	}
 
-	/// An Aura authority keypair using S/R 25519 as its crypto.
-	#[cfg(feature = "std")]
-	pub type AuthorityPair = app_sr25519::Pair;
+	sp_application_crypto::with_pair! {
+		/// An Aura authority keypair using S/R 25519 as its crypto.
+		pub type AuthorityPair = app_sr25519::Pair;
+	}
 
 	/// An Aura authority signature using S/R 25519 as its crypto.
 	pub type AuthoritySignature = app_sr25519::Signature;
@@ -47,9 +48,10 @@ pub mod ed25519 {
 		app_crypto!(ed25519, AURA);
 	}
 
-	/// An Aura authority keypair using Ed25519 as its crypto.
-	#[cfg(feature = "std")]
-	pub type AuthorityPair = app_ed25519::Pair;
+	sp_application_crypto::with_pair! {
+		/// An Aura authority keypair using Ed25519 as its crypto.
+		pub type AuthorityPair = app_ed25519::Pair;
+	}
 
 	/// An Aura authority signature using Ed25519 as its crypto.
 	pub type AuthoritySignature = app_ed25519::Signature;
diff --git a/substrate/primitives/finality-grandpa/Cargo.toml b/substrate/primitives/finality-grandpa/Cargo.toml
index 6498763e4c..6356ec82e5 100644
--- a/substrate/primitives/finality-grandpa/Cargo.toml
+++ b/substrate/primitives/finality-grandpa/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 license = "GPL-3.0"
 
 [dependencies]
-app-crypto = { version = "2.0.0", default-features = false, package = "sp-application-crypto", path = "../application-crypto" }
+sp-application-crypto = { version = "2.0.0", default-features = false, path = "../application-crypto" }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0", default-features = false, path = "../std" }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
@@ -16,13 +16,10 @@ sp-runtime = { version = "2.0.0", default-features = false, path = "../runtime"
 [features]
 default = ["std"]
 std = [
-	"app-crypto/std",
+	"sp-application-crypto/std",
 	"codec/std",
 	"sp-std/std",
 	"serde",
 	"sp-api/std",
 	"sp-runtime/std",
 ]
-full_crypto = [
-	"app-crypto/full_crypto"
-]
diff --git a/substrate/primitives/finality-grandpa/src/lib.rs b/substrate/primitives/finality-grandpa/src/lib.rs
index 98fce45081..205fce0ce3 100644
--- a/substrate/primitives/finality-grandpa/src/lib.rs
+++ b/substrate/primitives/finality-grandpa/src/lib.rs
@@ -29,13 +29,14 @@ use sp_std::borrow::Cow;
 use sp_std::vec::Vec;
 
 mod app {
-	use app_crypto::{app_crypto, key_types::GRANDPA, ed25519};
+	use sp_application_crypto::{app_crypto, key_types::GRANDPA, ed25519};
 	app_crypto!(ed25519, GRANDPA);
 }
 
-/// The grandpa crypto scheme defined via the keypair type.
-#[cfg(any(feature = "std", feature = "full_crypto"))]
-pub type AuthorityPair = app::Pair;
+sp_application_crypto::with_pair! {
+	/// The grandpa crypto scheme defined via the keypair type.
+	pub type AuthorityPair = app::Pair;
+}
 
 /// Identity of a Grandpa authority.
 pub type AuthorityId = app::Public;