diff --git a/Cargo.toml b/Cargo.toml
index 550e917..754f7de 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,10 +12,14 @@ edition = "2018"
 volatile-register = "0.2"
 aligned = "0.3"
 embedded-hal = "0.2"
-stm32f4xx-hal = { version = "0.8" , optional = true }
 smoltcp = { version = "0.6.0", default-features = false, features = ["proto-ipv4", "proto-ipv6", "socket-icmp", "socket-udp", "socket-tcp", "log", "verbose", "ethernet"], optional = true }
-log = { version = "0.4", optional = true }
+# Optional dependencies for building examples
+stm32f4xx-hal = { version = "0.8", optional = true }
+cortex-m = { version = "0.5", optional = true }
+cortex-m-rt = { version = "0.6", optional = true }
 cortex-m-rtic = { version = "0.5.3", optional = true }
+panic-itm = { version = "0.4", optional = true }
+log = { version = "0.4", optional = true }
 
 [features]
 smoltcp-phy = ["smoltcp"]
@@ -23,17 +27,11 @@ smoltcp-phy-all = [
     "smoltcp/socket-raw", "smoltcp/socket-udp", "smoltcp/socket-tcp",
     "smoltcp/proto-ipv4", "smoltcp/proto-ipv6"
 ]
-stm32f4 = ["stm32f4xx-hal"]
-stm32f407 = ["stm32f4xx-hal/stm32f407"]
-tx_stm32f407 = ["stm32f407", "log", "cortex-m-rtic"]
-tcp_stm32f407 = ["stm32f407", "smoltcp-phy-all", "smoltcp/log", "log", "cortex-m-rtic"]
+# Example-based features
+tx_stm32f407 = ["stm32f4xx-hal/stm32f407", "cortex-m", "cortex-m-rtic", "panic-itm", "log"]
+tcp_stm32f407 = ["stm32f4xx-hal/stm32f407", "cortex-m", "cortex-m-rt", "cortex-m-rtic", "smoltcp-phy-all", "smoltcp/log", "panic-itm", "log"]
 default = []
 
-[dev-dependencies]
-cortex-m = "0.5"
-cortex-m-rt = "0.6"
-panic-itm = "0.4"
-
 [[example]]
 name = "tx_stm32f407"
 required-features = ["tx_stm32f407"]