diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index 4c95d216caa1896f0deee458e9ea415f679b9316..1ad7290fa5850095b889823a5e51c03d8aec6c4c 100644
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -1327,6 +1327,7 @@ static const struct command_registration mflash_exec_command_handlers[] = {
 		.handler = mg_probe_cmd,
 		.mode = COMMAND_EXEC,
 		.help = "Detect bank configuration information",
+		.usage = "",
 	},
 	{
 		.name = "write",
diff --git a/src/flash/nand/tcl.c b/src/flash/nand/tcl.c
index d9738c55b272e9e7959edf3d146c701fb4fe14f4..dee4f6da832c8a3c94fdfbbd054173826dae9909 100644
--- a/src/flash/nand/tcl.c
+++ b/src/flash/nand/tcl.c
@@ -411,6 +411,7 @@ static const struct command_registration nand_exec_command_handlers[] = {
 		.handler = handle_nand_list_command,
 		.mode = COMMAND_EXEC,
 		.help = "list configured NAND flash devices",
+		.usage = "",
 	},
 	{
 		.name = "info",
diff --git a/src/flash/nor/at91sam3.c b/src/flash/nor/at91sam3.c
index 2d61a8780f670d404229fed012e3c1bacc242448..a220279cf4aaac8ec16bbc46439d45c6fcca67ef 100644
--- a/src/flash/nor/at91sam3.c
+++ b/src/flash/nor/at91sam3.c
@@ -3731,6 +3731,7 @@ static const struct command_registration at91sam3_exec_command_handlers[] = {
 		.mode = COMMAND_EXEC,
 		.help = "Print information about the current at91sam3 chip"
 			"and its flash configuration.",
+		.usage = "",
 	},
 	{
 		.name = "slowclk",
diff --git a/src/flash/nor/at91sam4.c b/src/flash/nor/at91sam4.c
index 446f7983b7971c531ecd31dcc919f64f208ea914..c89c50239c249390cc94e8f5ac639542bb11702a 100644
--- a/src/flash/nor/at91sam4.c
+++ b/src/flash/nor/at91sam4.c
@@ -3212,6 +3212,7 @@ static const struct command_registration at91sam4_exec_command_handlers[] = {
 		.mode = COMMAND_EXEC,
 		.help = "Print information about the current at91sam4 chip"
 			"and its flash configuration.",
+		.usage = "",
 	},
 	{
 		.name = "slowclk",
diff --git a/src/flash/nor/at91sam4l.c b/src/flash/nor/at91sam4l.c
index 1c2402ff063ccd550e0af87447db2c834f5ce40f..d356398dc15ff71cf9c91dda238df7cab84e79ca 100644
--- a/src/flash/nor/at91sam4l.c
+++ b/src/flash/nor/at91sam4l.c
@@ -668,7 +668,8 @@ static const struct command_registration at91sam4l_exec_command_handlers[] = {
 		.name = "smap_reset_deassert",
 		.handler = sam4l_handle_reset_deassert,
 		.mode = COMMAND_EXEC,
-		.help = "deasert internal reset held by SMAP"
+		.help = "deassert internal reset held by SMAP",
+		.usage = "",
 	},
 	COMMAND_REGISTRATION_DONE
 };
diff --git a/src/flash/nor/at91samd.c b/src/flash/nor/at91samd.c
index a0d603a2c8b8eb4bb9cac48a7139de11575fa21e..c325194edeecde36f2f517e06f067038adbc29a5 100644
--- a/src/flash/nor/at91samd.c
+++ b/src/flash/nor/at91samd.c
@@ -1217,7 +1217,8 @@ static const struct command_registration at91samd_exec_command_handlers[] = {
 		.name = "dsu_reset_deassert",
 		.handler = samd_handle_reset_deassert,
 		.mode = COMMAND_EXEC,
-		.help = "Deasert internal reset held by DSU."
+		.help = "Deassert internal reset held by DSU.",
+		.usage = "",
 	},
 	{
 		.name = "info",
@@ -1225,6 +1226,7 @@ static const struct command_registration at91samd_exec_command_handlers[] = {
 		.mode = COMMAND_EXEC,
 		.help = "Print information about the current at91samd chip "
 			"and its flash configuration.",
+		.usage = "",
 	},
 	{
 		.name = "chip-erase",
@@ -1232,6 +1234,7 @@ static const struct command_registration at91samd_exec_command_handlers[] = {
 		.mode = COMMAND_EXEC,
 		.help = "Erase the entire Flash by using the Chip-"
 			"Erase feature in the Device Service Unit (DSU).",
+		.usage = "",
 	},
 	{
 		.name = "set-security",
diff --git a/src/flash/nor/atsame5.c b/src/flash/nor/atsame5.c
index 833177e1a4f85009d0d43e3572f7af8855b0785f..df423491787dc805f7a8f7f1265558b267658b6d 100644
--- a/src/flash/nor/atsame5.c
+++ b/src/flash/nor/atsame5.c
@@ -893,12 +893,14 @@ COMMAND_HANDLER(samd_handle_reset_deassert)
 static const struct command_registration same5_exec_command_handlers[] = {
 	{
 		.name = "dsu_reset_deassert",
+		.usage = "",
 		.handler = samd_handle_reset_deassert,
 		.mode = COMMAND_EXEC,
 		.help = "Deasert internal reset held by DSU."
 	},
 	{
 		.name = "chip-erase",
+		.usage = "",
 		.handler = same5_handle_chip_erase_command,
 		.mode = COMMAND_EXEC,
 		.help = "Erase the entire Flash by using the Chip-"
diff --git a/src/flash/nor/kinetis.c b/src/flash/nor/kinetis.c
index 9b2c014ca928e8fe585c010c225bb907a93d3f52..847513502af4bc2ac9dcdd48bdf44fc74742dfde 100644
--- a/src/flash/nor/kinetis.c
+++ b/src/flash/nor/kinetis.c
@@ -3127,6 +3127,7 @@ static const struct command_registration kinetis_exec_command_handlers[] = {
 		.mode = COMMAND_CONFIG,
 		.help = "Driver creates additional banks if device with two/four flash blocks is probed",
 		.handler = kinetis_create_banks_handler,
+		.usage = "",
 	},
 	COMMAND_REGISTRATION_DONE
 };
diff --git a/src/flash/nor/nrf5.c b/src/flash/nor/nrf5.c
index aab80f9bc2f7607d51ff9389afe4229a2f061b1a..4041bfbe4bf09592ab76f80db2dc39ddf9039b23 100644
--- a/src/flash/nor/nrf5.c
+++ b/src/flash/nor/nrf5.c
@@ -1118,6 +1118,7 @@ static const struct command_registration nrf5_exec_command_handlers[] = {
 		.handler	= nrf5_handle_mass_erase_command,
 		.mode		= COMMAND_EXEC,
 		.help		= "Erase all flash contents of the chip.",
+		.usage		= "",
 	},
 	COMMAND_REGISTRATION_DONE
 };
diff --git a/src/flash/nor/numicro.c b/src/flash/nor/numicro.c
index 8d8abd5ed83eb72b1992e8cb4ea0bf59ab123500..47f9a8826c9a7f817c24d38a37ab7950b71acc9c 100644
--- a/src/flash/nor/numicro.c
+++ b/src/flash/nor/numicro.c
@@ -1856,6 +1856,7 @@ static const struct command_registration numicro_exec_command_handlers[] = {
 		.handler = numicro_handle_chip_erase_command,
 		.mode = COMMAND_EXEC,
 		.help = "chip erase through ISP.",
+		.usage = "",
 	},
 	COMMAND_REGISTRATION_DONE
 };
diff --git a/src/flash/nor/tcl.c b/src/flash/nor/tcl.c
index 6d2d2b816b8ee1408d92945b64ad48c91b548f48..87d599a59cae593d9315cc92181d9edadba1e472 100644
--- a/src/flash/nor/tcl.c
+++ b/src/flash/nor/tcl.c
@@ -1239,12 +1239,14 @@ static const struct command_registration flash_config_command_handlers[] = {
 		.mode = COMMAND_CONFIG,
 		.handler = handle_flash_init_command,
 		.help = "Initialize flash devices.",
+		.usage = "",
 	},
 	{
 		.name = "banks",
 		.mode = COMMAND_ANY,
 		.handler = handle_flash_banks_command,
 		.help = "Display table with information about flash banks.",
+		.usage = "",
 	},
 	{
 		.name = "list",
diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c
index f1123cd82d5db25649f5d86956f6cb60058d17ff..a48879905a86734c637ca45834d1e765120774a9 100644
--- a/src/helper/ioutil.c
+++ b/src/helper/ioutil.c
@@ -472,6 +472,7 @@ static const struct command_registration ioutil_command_handlers[] = {
 		.handler = handle_meminfo_command,
 		.mode = COMMAND_ANY,
 		.help = "display free heap space",
+		.usage = "",
 	},
 #endif
 	{
diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c
index 3fb52a71eba06570e8095d631d2c6780fdb6f790..24706f5624e5fb145a45bfef8e0b311673ad421e 100644
--- a/src/jtag/adapter.c
+++ b/src/jtag/adapter.c
@@ -555,6 +555,7 @@ static const struct command_registration interface_command_handlers[] = {
 		.handler = handle_interface_list_command,
 		.mode = COMMAND_ANY,
 		.help = "List all built-in debug adapter interfaces (drivers)",
+		.usage = "",
 	},
 	{
 		.name = "reset_config",
diff --git a/src/jtag/drivers/arm-jtag-ew.c b/src/jtag/drivers/arm-jtag-ew.c
index d9ea367ce4ed8a44aba3604d35b12cb90c973975..665dd4d18371c680c318300db53e387a5e0fc144 100644
--- a/src/jtag/drivers/arm-jtag-ew.c
+++ b/src/jtag/drivers/arm-jtag-ew.c
@@ -490,6 +490,7 @@ static const struct command_registration armjtagew_command_handlers[] = {
 		.handler = &armjtagew_handle_armjtagew_info_command,
 		.mode = COMMAND_EXEC,
 		.help = "query armjtagew info",
+		.usage = "",
 	},
 	COMMAND_REGISTRATION_DONE
 };
diff --git a/src/jtag/drivers/buspirate.c b/src/jtag/drivers/buspirate.c
index 35649c2809bb09d2a1fdfe407d4037eed8f45def..14c719d4ce84b919a0286f4e975596d0241e9de1 100644
--- a/src/jtag/drivers/buspirate.c
+++ b/src/jtag/drivers/buspirate.c
@@ -491,6 +491,7 @@ static const struct command_registration buspirate_command_handlers[] = {
 		.handler = &buspirate_handle_adc_command,
 		.mode = COMMAND_EXEC,
 		.help = "reads voltages on adc pins",
+		.usage = "",
 	},
 	{
 		.name = "buspirate_vreg",
diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index c81579ab29e9a39242f584f53c020b57aed6ecda..5a17dfd43d6fd6b063daf6da79273ead69d8e2ce 100644
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -1772,13 +1772,15 @@ static const struct command_registration jlink_config_subcommand_handlers[] = {
 		.name = "reset",
 		.handler = &jlink_handle_config_reset_command,
 		.mode = COMMAND_EXEC,
-		.help = "undo configuration changes"
+		.help = "undo configuration changes",
+		.usage = "",
 	},
 	{
 		.name = "write",
 		.handler = &jlink_handle_config_write_command,
 		.mode = COMMAND_EXEC,
-		.help = "write configuration to the device"
+		.help = "write configuration to the device",
+		.usage = "",
 	},
 	COMMAND_REGISTRATION_DONE
 };
@@ -1820,13 +1822,15 @@ static const struct command_registration jlink_subcommand_handlers[] = {
 		.name = "freemem",
 		.handler = &jlink_handle_free_memory_command,
 		.mode = COMMAND_EXEC,
-		.help = "show free device memory"
+		.help = "show free device memory",
+		.usage = "",
 	},
 	{
 		.name = "hwstatus",
 		.handler = &jlink_handle_hwstatus_command,
 		.mode = COMMAND_EXEC,
-		.help = "show the hardware status"
+		.help = "show the hardware status",
+		.usage = "",
 	},
 	{
 		.name = "usb",
diff --git a/src/jtag/drivers/opendous.c b/src/jtag/drivers/opendous.c
index 458df34a703adbdad96f9ce102b31e89bb621e24..cec453dd98854adf153d470065ff710621cdf8e3 100644
--- a/src/jtag/drivers/opendous.c
+++ b/src/jtag/drivers/opendous.c
@@ -215,6 +215,7 @@ static const struct command_registration opendous_command_handlers[] = {
 		.handler = &opendous_handle_opendous_info_command,
 		.mode = COMMAND_EXEC,
 		.help = "show opendous info",
+		.usage = "",
 	},
 	{
 		.name = "opendous_hw_jtag",
diff --git a/src/pld/pld.c b/src/pld/pld.c
index 5210b97b7d300c51109c7066b3d63f18dfa456cd..3f23f6a00cf009c833d708d8fda4927b994b5d26 100644
--- a/src/pld/pld.c
+++ b/src/pld/pld.c
@@ -170,6 +170,7 @@ static const struct command_registration pld_exec_command_handlers[] = {
 		.handler = handle_pld_devices_command,
 		.mode = COMMAND_EXEC,
 		.help = "list configured pld devices",
+		.usage = "",
 	},
 	{
 		.name = "load",
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 3ade195cbffb8afb0833d1aeccdb51f70baeb04e..95e6c04914ebbd027e109e2dbd85a931b7dd6f9c 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -3699,6 +3699,7 @@ static const struct command_registration gdb_command_handlers[] = {
 		.handler = handle_gdb_save_tdesc_command,
 		.mode = COMMAND_EXEC,
 		.help = "Save the target description file",
+		.usage = "",
 	},
 	COMMAND_REGISTRATION_DONE
 };
diff --git a/src/target/target.c b/src/target/target.c
index 084a2cffc27adaf0220471a2fe641e49ec189a12..380a9fcdd26941b144b7a461c1c35000b95efc88 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -5890,6 +5890,7 @@ static const struct command_registration target_subcommand_handlers[] = {
 		.mode = COMMAND_CONFIG,
 		.handler = handle_target_init_command,
 		.help = "initialize targets",
+		.usage = "",
 	},
 	{
 		.name = "create",
diff --git a/src/target/xscale.c b/src/target/xscale.c
index 09abd9ef0e2e81c758c6d4bc13ce9c39dfa1ac58..34c5f00018a1a6e6c90a287e978b551f5266e783 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -3577,6 +3577,7 @@ static const struct command_registration xscale_exec_command_handlers[] = {
 		.handler = xscale_handle_cache_info_command,
 		.mode = COMMAND_EXEC,
 		.help = "display information about CPU caches",
+		.usage = "",
 	},
 	{
 		.name = "mmu",