diff --git a/extra/cbindgen/checksums b/extra/cbindgen/checksums
index a26694ff..e57c5182 100644
--- a/extra/cbindgen/checksums
+++ b/extra/cbindgen/checksums
@@ -1,14 +1,14 @@
-70f810d2b9e5a2db570431872c26377813fb27a63d817cb16b2d69fa3741d066
-ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
+c254a68039a85fe17c63781e67d09b0bfabc32446615d7c63cd805052ac5b155
 d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
 cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a
 cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693
+485ede05a56152367a6ec586a7425b475d6c3d3838581ff651d2a6e3730a62ef
 4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822
-37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002
+d8c93436c21e4698bacadf42917db28b23017027a4deccb35dbe47a7e7840123
 ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f
 fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6
 d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04
-20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205
+2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9
 4c30f6d0bc6b00693347368a67d41b58f2fb851215ff1da49e90fe2c5c667151
 55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2
 dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6
@@ -16,6 +16,8 @@ e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
 f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235
 c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75
 4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b
+308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a
+8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64
 d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e
 d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3
 c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20
@@ -35,16 +37,15 @@ f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8
 1b15f74add9a9d4a3eb2bf739c9a427d266d3895b53d992c3a7c234fec2ff1f1
 65f59259be9fc1bf677d06cc1456e97756004a1a5a577480f71430bd7c17ba33
 fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252
-8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a
+73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623
 6690e3e9f692504b941dc6c3b188fd28df054f7fb8469ab40680df52fdcc842b
 7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9
-d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060
+bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755
+b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb
 ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a
-e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0
-9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3
 f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564
-f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191
 cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519
 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
 ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
+70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178
 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
diff --git a/extra/cbindgen/sources b/extra/cbindgen/sources
index 5315cc87..5937eec5 100644
--- a/extra/cbindgen/sources
+++ b/extra/cbindgen/sources
@@ -3,16 +3,16 @@ https://github.com/eqrion/cbindgen/archive/vVERSION.tar.gz
 # This is a pre-generated list of crate dependencies. This list may
 # change between releases. This allows us to pre-cache each of the
 # required dependencies and avoid the network requirement during build.
-https://static.crates.io/crates/ansi_term/ansi_term-0.11.0.crate vendor
 https://static.crates.io/crates/atty/atty-0.2.14.crate vendor
 https://static.crates.io/crates/autocfg/autocfg-1.0.1.crate vendor
 https://static.crates.io/crates/bitflags/bitflags-1.2.1.crate vendor
+https://static.crates.io/crates/cbindgen/cbindgen-0.21.0.crate vendor
 https://static.crates.io/crates/cfg-if/cfg-if-0.1.10.crate vendor
-https://static.crates.io/crates/clap/clap-2.33.3.crate vendor
+https://static.crates.io/crates/clap/clap-3.1.6.crate vendor
 https://static.crates.io/crates/cloudabi/cloudabi-0.0.3.crate vendor
 https://static.crates.io/crates/getrandom/getrandom-0.1.15.crate vendor
 https://static.crates.io/crates/hashbrown/hashbrown-0.9.1.crate vendor
-https://static.crates.io/crates/heck/heck-0.3.1.crate vendor
+https://static.crates.io/crates/heck/heck-0.4.0.crate vendor
 https://static.crates.io/crates/hermit-abi/hermit-abi-0.1.16.crate vendor
 https://static.crates.io/crates/indexmap/indexmap-1.6.0.crate vendor
 https://static.crates.io/crates/itoa/itoa-0.4.6.crate vendor
@@ -20,6 +20,8 @@ https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate vendor
 https://static.crates.io/crates/libc/libc-0.2.77.crate vendor
 https://static.crates.io/crates/lock_api/lock_api-0.3.4.crate vendor
 https://static.crates.io/crates/log/log-0.4.11.crate vendor
+https://static.crates.io/crates/memchr/memchr-2.4.1.crate vendor
+https://static.crates.io/crates/os_str_bytes/os_str_bytes-6.0.0.crate vendor
 https://static.crates.io/crates/parking_lot/parking_lot-0.10.2.crate vendor
 https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.7.2.crate vendor
 https://static.crates.io/crates/ppv-lite86/ppv-lite86-0.2.9.crate vendor
@@ -39,16 +41,15 @@ https://static.crates.io/crates/serde_json/serde_json-1.0.57.crate vendor
 https://static.crates.io/crates/serial_test/serial_test-0.5.0.crate vendor
 https://static.crates.io/crates/serial_test_derive/serial_test_derive-0.5.0.crate vendor
 https://static.crates.io/crates/smallvec/smallvec-1.4.2.crate vendor
-https://static.crates.io/crates/strsim/strsim-0.8.0.crate vendor
+https://static.crates.io/crates/strsim/strsim-0.10.0.crate vendor
 https://static.crates.io/crates/syn/syn-1.0.41.crate vendor
 https://static.crates.io/crates/tempfile/tempfile-3.1.0.crate vendor
-https://static.crates.io/crates/textwrap/textwrap-0.11.0.crate vendor
+https://static.crates.io/crates/termcolor/termcolor-1.1.3.crate vendor
+https://static.crates.io/crates/textwrap/textwrap-0.15.0.crate vendor
 https://static.crates.io/crates/toml/toml-0.5.6.crate vendor
-https://static.crates.io/crates/unicode-segmentation/unicode-segmentation-1.6.0.crate vendor
-https://static.crates.io/crates/unicode-width/unicode-width-0.1.8.crate vendor
 https://static.crates.io/crates/unicode-xid/unicode-xid-0.2.1.crate vendor
-https://static.crates.io/crates/vec_map/vec_map-0.8.2.crate vendor
-https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download vendor
+https://static.crates.io/crates/wasi/wasi-0.9.0+wasi-snapshot-preview1.crate vendor
 https://static.crates.io/crates/winapi/winapi-0.3.9.crate vendor
 https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate vendor
+https://static.crates.io/crates/winapi-util/winapi-util-0.1.5.crate vendor
 https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate vendor
diff --git a/extra/cbindgen/version b/extra/cbindgen/version
index 7506cf6e..351346bd 100644
--- a/extra/cbindgen/version
+++ b/extra/cbindgen/version
@@ -1 +1 @@
-0.20.0 1
+0.21.0 1