381 files changed, 93 insertions, 129 deletions

diff --git a/.travis.yml b/.travis.yml
index d5fb4455..dd271f22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,8 +23,6 @@ cache:
 
 before_install: . ./ci/before_install.sh
 
-before_script: cd libbindgen
-
 script:
   - cargo test --features "$BINDGEN_FEATURES assert_no_dangling_items"
   - cargo test --release --features "$BINDGEN_FEATURES assert_no_dangling_items"
@@ -34,10 +32,7 @@ script:
   - cargo build --features "$BINDGEN_FEATURES docs_"
   - cd tests/expectations
   - cargo test
-  - cd ../../../bindgen
-  - cargo test --features "$BINDGEN_FEATURES"
-  - cargo test --release --features "$BINDGEN_FEATURES"
-  - cd ../bindgen-integration
+  - cd ../../bindgen-integration
   - cargo test --features "$BINDGEN_FEATURES"
   - cargo test --release --features "$BINDGEN_FEATURES"
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c1ec96d1..d30df68d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -42,10 +42,9 @@ issue, provide us with:
 
 ## Building
 
-To build `libbindgen`:
+To build `bindgen`:
 
 ```
-$ cd bindgen/libbindgen
 $ cargo build
 ```
 
@@ -77,21 +76,21 @@ that you aren't forgetting to document types and functions. CI will catch it if
 you forget, but the turn around will be a lot slower ;)
 
 ```
-$ cd libbindgen && cargo build --features "llvm_stable _docs"
+$ cargo build --features "llvm_stable _docs"
 ```
 
 ## Testing
 
-Code for binding generation and testing thereof is in the `libbindgen` crate.
+Code for binding generation and testing thereof is in the `bindgen` crate.
 The following sections assume you are working in that subdirectory.
 
 ### Overview
 
-Input C/C++ test headers reside in the `libbindgen/tests/headers`
-directory. Expected output Rust bindings live in
-`libbindgen/tests/expectations/tests`. For example,
-`libbindgen/tests/headers/my_header.h`'s expected generated Rust bindings would
-be `libbindgen/tests/expectations/tests/my_header.rs`.
+Input C/C++ test headers reside in the `tests/headers` directory. Expected
+output Rust bindings live in `tests/expectations/tests`.
+
+For example, `tests/headers/my_header.h`'s expected generated Rust bindings
+would be `tests/expectations/tests/my_header.rs`.
 
 Run `cargo test` to compare generated Rust bindings to the expectations.
 
@@ -144,17 +143,16 @@ And ensure `~/.cargo/bin` is on your path.
 ## Debug Logging
 
 To help debug what `bindgen` is doing, you can define the environment variable
-`RUST_LOG=libbindgen` to get a bunch of debugging log spew.
+`RUST_LOG=bindgen` to get a bunch of debugging log spew.
 
 ```
-$ RUST_LOG=libbindgen ./target/debug/bindgen [flags...] ~/path/to/some/header.h
+$ RUST_LOG=bindgen ./target/debug/bindgen [flags...] ~/path/to/some/header.h
 ```
 
 This logging can also be used when debugging failing tests:
 
 ```
-$ cd libbindgen
-$ RUST_LOG=libbindgen cargo test
+$ RUST_LOG=bindgen cargo test
 ```
 
 ## Using `creduce` to Minimize Test Cases
diff --git a/Cargo.toml b/Cargo.toml
index 106e652b..d8c71319 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,66 @@
-[workspace]
-members = [
-  "bindgen",
-  "bindgen-integration",
-  "libbindgen",
-  "libbindgen/tests/expectations",
+[package]
+authors = [
+  "Jyun-Yan You <jyyou.tw@gmail.com>",
+  "Emilio Cobos Álvarez <emilio@crisal.io>",
+  "The Servo project developers",
 ]
+description = "A binding generator for Rust"
+homepage = "https://github.com/servo/rust-bindgen"
+keywords = ["bindings", "ffi", "code-generation"]
+license = "BSD-3-Clause"
+name = "bindgen"
+readme = "README.md"
+repository = "https://github.com/servo/rust-bindgen"
+version = "0.1.7"
+build = "build.rs"
+
+[lib]
+path = "src/lib.rs"
+
+[[bin]]
+name = "bindgen"
+path = "src/main.rs"
+
+[dev-dependencies]
+diff = "0.1"
+clap = "2"
+shlex = "0.1"
+
+[build-dependencies]
+quasi_codegen = "0.26"
+
+[dependencies]
+cexpr = "0.2"
+cfg-if = "0.1.0"
+clang-sys = { version = "0.12", features = ["runtime", "clang_3_9"] }
+lazy_static = "0.2.1"
+rustc-serialize = "0.3.19"
+syntex_syntax = "0.54"
+regex = "0.2"
+# This kinda sucks: https://github.com/rust-lang/cargo/issues/1982
+clap = "2"
+
+[dependencies.aster]
+features = ["with-syntex"]
+version = "0.38"
+
+[dependencies.env_logger]
+optional = true
+version = "0.4"
+
+[dependencies.log]
+optional = true
+version = "0.3"
+
+[dependencies.quasi]
+features = ["with-syntex"]
+version = "0.29"
+
+[features]
+assert_no_dangling_items = []
+default = ["logging"]
+llvm_stable = []
+logging = ["env_logger", "log"]
+static = []
+# This feature only exists for CI -- don't use it!
+docs_ = []
diff --git a/README.md b/README.md
index 15ef6db2..0f7247c4 100644
--- a/README.md
+++ b/README.md
@@ -117,20 +117,20 @@ In `Cargo.toml`:
 build = "build.rs"
 
 [build-dependencies]
-libbindgen = "0.1"
+bindgen = "0.1"
 ```
 
 In `build.rs`:
 
 ```rust
-extern crate libbindgen;
+extern crate bindgen;
 
 use std::env;
 use std::path::Path;
 
 fn main() {
   let out_dir = env::var("OUT_DIR").unwrap();
-  let _ = libbindgen::builder()
+  let _ = bindgen::builder()
     .header("example.h")
     .use_core()
     .generate().unwrap()
diff --git a/bindgen-integration/Cargo.toml b/bindgen-integration/Cargo.toml
index e0687f99..9b8e341d 100644
--- a/bindgen-integration/Cargo.toml
+++ b/bindgen-integration/Cargo.toml
@@ -3,13 +3,12 @@ name = "bindgen-integration"
 description = "A package to test various bindgen features"
 version = "0.1.0"
 authors = ["Emilio Cobos Álvarez <emilio@crisal.io>"]
-workspace = ".."
 publish = false
 build = "build.rs"
 
 [build-dependencies]
-libbindgen = { path = "../libbindgen" }
+bindgen = { path = ".." }
 gcc = "0.3"
 
 [features]
-llvm_stable = ["libbindgen/llvm_stable"]
+llvm_stable = ["bindgen/llvm_stable"]
diff --git a/bindgen-integration/build.rs b/bindgen-integration/build.rs
index ff8ba172..2c18c94a 100644
--- a/bindgen-integration/build.rs
+++ b/bindgen-integration/build.rs
@@ -1,9 +1,9 @@
-extern crate libbindgen;
+extern crate bindgen;
 extern crate gcc;
 
 use std::env;
 use std::path::PathBuf;
-use libbindgen::Builder;
+use bindgen::Builder;
 
 fn main() {
     gcc::Config::new()
diff --git a/bindgen/Cargo.toml b/bindgen/Cargo.toml
deleted file mode 100644
index a445df69..00000000
--- a/bindgen/Cargo.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-[package]
-authors = [
-  "Jyun-Yan You <jyyou.tw@gmail.com>",
-  "Emilio Cobos Álvarez <ecoal95@gmail.com>",
-  "The Servo project developers",
-]
-description = "A binding generator for Rust"
-homepage = "https://github.com/servo/rust-bindgen"
-keywords = ["bindings", "ffi", "code-generation"]
-license = "BSD-3-Clause"
-name = "bindgen"
-readme = "README.md"
-repository = "https://github.com/servo/rust-bindgen"
-version = "0.17.1"
-workspace = ".."
-
-[dependencies]
-clang-sys = "0.12"
-clap = "2"
-libbindgen = { path = "../libbindgen" }
-log = "0.3"
-env_logger = "0.4"
-rustc-serialize = "0.3.19"
-
-[features]
-llvm_stable = ["libbindgen/llvm_stable"]
diff --git a/libbindgen/build.rs b/build.rs
index c3633cd4..c3633cd4 100644
--- a/libbindgen/build.rs
+++ b/build.rs
diff --git a/libbindgen/Cargo.toml b/libbindgen/Cargo.toml
deleted file mode 100644
index 2615b822..00000000
--- a/libbindgen/Cargo.toml
+++ /dev/null
@@ -1,58 +0,0 @@
-[package]
-authors = [
-  "Jyun-Yan You <jyyou.tw@gmail.com>",
-  "Emilio Cobos Álvarez <ecoal95@gmail.com>",
-  "The Servo project developers",
-]
-build = "build.rs"
-description = "A binding generator for Rust"
-homepage = "https://github.com/servo/rust-bindgen"
-keywords = ["bindings", "ffi", "code-generation"]
-license = "BSD-3-Clause"
-name = "libbindgen"
-readme = "README.md"
-repository = "https://github.com/servo/rust-bindgen"
-version = "0.1.7"
-workspace = ".."
-
-[dev-dependencies]
-diff = "0.1"
-clap = "2"
-shlex = "0.1"
-
-[build-dependencies]
-quasi_codegen = "0.26"
-
-[dependencies]
-cexpr = "0.2"
-cfg-if = "0.1.0"
-clang-sys = { version = "0.12", features = ["runtime", "clang_3_9"] }
-lazy_static = "0.2.1"
-rustc-serialize = "0.3.19"
-syntex_syntax = "0.54"
-regex = "0.2"
-
-[dependencies.aster]
-features = ["with-syntex"]
-version = "0.38"
-
-[dependencies.env_logger]
-optional = true
-version = "0.4"
-
-[dependencies.log]
-optional = true
-version = "0.3"
-
-[dependencies.quasi]
-features = ["with-syntex"]
-version = "0.29"
-
-[features]
-assert_no_dangling_items = []
-default = ["logging"]
-llvm_stable = []
-logging = ["env_logger", "log"]
-static = []
-# This feature only exists for CI -- don't use it!
-docs_ = []
diff --git a/libbindgen/README.md b/libbindgen/README.md
deleted file mode 100644
index e0bbddf5..00000000
--- a/libbindgen/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# `libbindgen`
-
-Generate Rust FFI bindings from C/C++ header files.
diff --git a/libbindgen/src/chooser.rs b/src/chooser.rs
index 51392d70..51392d70 100644
--- a/libbindgen/src/chooser.rs
+++ b/src/chooser.rs
diff --git a/libbindgen/src/clang.rs b/src/clang.rs
index 491aaa07..491aaa07 100644
--- a/libbindgen/src/clang.rs
+++ b/src/clang.rs
diff --git a/libbindgen/src/codegen/helpers.rs b/src/codegen/helpers.rs
index 06dadab0..06dadab0 100644
--- a/libbindgen/src/codegen/helpers.rs
+++ b/src/codegen/helpers.rs
diff --git a/libbindgen/src/codegen/mod.rs b/src/codegen/mod.rs
index 7451dd11..7451dd11 100644
--- a/libbindgen/src/codegen/mod.rs
+++ b/src/codegen/mod.rs
diff --git a/libbindgen/src/ir/annotations.rs b/src/ir/annotations.rs
index 98be0540..98be0540 100644
--- a/libbindgen/src/ir/annotations.rs
+++ b/src/ir/annotations.rs
diff --git a/libbindgen/src/ir/comp.rs b/src/ir/comp.rs
index 968bf879..968bf879 100644
--- a/libbindgen/src/ir/comp.rs
+++ b/src/ir/comp.rs
diff --git a/libbindgen/src/ir/context.rs b/src/ir/context.rs
index b0143bd5..b0143bd5 100644
--- a/libbindgen/src/ir/context.rs
+++ b/src/ir/context.rs
diff --git a/libbindgen/src/ir/derive.rs b/src/ir/derive.rs
index d13a8117..d13a8117 100644
--- a/libbindgen/src/ir/derive.rs
+++ b/src/ir/derive.rs
diff --git a/libbindgen/src/ir/enum_ty.rs b/src/ir/enum_ty.rs
index ca4e77db..ca4e77db 100644
--- a/libbindgen/src/ir/enum_ty.rs
+++ b/src/ir/enum_ty.rs
diff --git a/libbindgen/src/ir/function.rs b/src/ir/function.rs
index 50c442db..50c442db 100644
--- a/libbindgen/src/ir/function.rs
+++ b/src/ir/function.rs
diff --git a/libbindgen/src/ir/int.rs b/src/ir/int.rs
index 89068e0f..89068e0f 100644
--- a/libbindgen/src/ir/int.rs
+++ b/src/ir/int.rs
diff --git a/libbindgen/src/ir/item.rs b/src/ir/item.rs
index df8fd222..df8fd222 100644
--- a/libbindgen/src/ir/item.rs
+++ b/src/ir/item.rs
diff --git a/libbindgen/src/ir/item_kind.rs b/src/ir/item_kind.rs
index d9e4690c..d9e4690c 100644
--- a/libbindgen/src/ir/item_kind.rs
+++ b/src/ir/item_kind.rs
diff --git a/libbindgen/src/ir/layout.rs b/src/ir/layout.rs
index 033fff62..033fff62 100644
--- a/libbindgen/src/ir/layout.rs
+++ b/src/ir/layout.rs
diff --git a/libbindgen/src/ir/mod.rs b/src/ir/mod.rs
index 73793b16..73793b16 100644
--- a/libbindgen/src/ir/mod.rs
+++ b/src/ir/mod.rs
diff --git a/libbindgen/src/ir/module.rs b/src/ir/module.rs
index 002fe36e..002fe36e 100644
--- a/libbindgen/src/ir/module.rs
+++ b/src/ir/module.rs
diff --git a/libbindgen/src/ir/ty.rs b/src/ir/ty.rs
index c1ed5b64..c1ed5b64 100644
--- a/libbindgen/src/ir/ty.rs
+++ b/src/ir/ty.rs
diff --git a/libbindgen/src/ir/type_collector.rs b/src/ir/type_collector.rs
index 0f10152d..0f10152d 100644
--- a/libbindgen/src/ir/type_collector.rs
+++ b/src/ir/type_collector.rs
diff --git a/libbindgen/src/ir/var.rs b/src/ir/var.rs
index 329393fa..329393fa 100644
--- a/libbindgen/src/ir/var.rs
+++ b/src/ir/var.rs
diff --git a/libbindgen/src/lib.rs b/src/lib.rs
index 60b750de..60b750de 100644
--- a/libbindgen/src/lib.rs
+++ b/src/lib.rs
diff --git a/libbindgen/src/log_stubs.rs b/src/log_stubs.rs
index 4262e120..4262e120 100644
--- a/libbindgen/src/log_stubs.rs
+++ b/src/log_stubs.rs
diff --git a/bindgen/src/main.rs b/src/main.rs
index 515d1d1a..a7bd9618 100644
--- a/bindgen/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,4 @@
-extern crate libbindgen;
+extern crate bindgen;
 extern crate env_logger;
 #[macro_use]
 extern crate log;
@@ -6,7 +6,7 @@ extern crate clang_sys;
 extern crate clap;
 extern crate rustc_serialize;
 
-use libbindgen::clang_version;
+use bindgen::clang_version;
 use std::env;
 
 mod options;
diff --git a/bindgen/src/options.rs b/src/options.rs
index e6226350..3456bfea 100644
--- a/bindgen/src/options.rs
+++ b/src/options.rs
@@ -1,5 +1,5 @@
 use clap::{App, Arg};
-use libbindgen::{Builder, CodegenConfig, builder};
+use bindgen::{Builder, CodegenConfig, builder};
 use std::fs::File;
 use std::io::{self, Error, ErrorKind};
 
diff --git a/libbindgen/src/parse.rs b/src/parse.rs
index 0e4164f0..0e4164f0 100644
--- a/libbindgen/src/parse.rs
+++ b/src/parse.rs
diff --git a/libbindgen/src/regex_set.rs b/src/regex_set.rs
index dbdb6565..dbdb6565 100644
--- a/libbindgen/src/regex_set.rs
+++ b/src/regex_set.rs
diff --git a/libbindgen/src/uses.rs b/src/uses.rs
index 47f72da6..47f72da6 100644
--- a/libbindgen/src/uses.rs
+++ b/src/uses.rs
diff --git a/libbindgen/tests/expectations/Cargo.toml b/tests/expectations/Cargo.toml
index 0980c564..034aa141 100644
--- a/libbindgen/tests/expectations/Cargo.toml
+++ b/tests/expectations/Cargo.toml
@@ -4,9 +4,8 @@ description = "bindgen results when ran on ../headers/*"
 version = "0.1.0"
 authors = [
   "Jyun-Yan You <jyyou.tw@gmail.com>",
-  "Emilio Cobos Álvarez <ecoal95@gmail.com>",
+  "Emilio Cobos Álvarez <emilio@crisal.io>",
   "The Servo project developers",
 ]
-workspace = "../../.."
 
 [dependencies]
diff --git a/libbindgen/tests/expectations/src/lib.rs b/tests/expectations/lib.rs
index e69de29b..e69de29b 100644
--- a/libbindgen/tests/expectations/src/lib.rs
+++ b/tests/expectations/lib.rs
diff --git a/tests/expectations/src/lib.rs b/tests/expectations/src/lib.rs
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/tests/expectations/src/lib.rs
diff --git a/libbindgen/tests/expectations/tests/accessors.rs b/tests/expectations/tests/accessors.rs
index b721980c..b721980c 100644
--- a/libbindgen/tests/expectations/tests/accessors.rs
+++ b/tests/expectations/tests/accessors.rs
diff --git a/libbindgen/tests/expectations/tests/annotation_hide.rs b/tests/expectations/tests/annotation_hide.rs
index dcaf7997..dcaf7997 100644
--- a/libbindgen/tests/expectations/tests/annotation_hide.rs
+++ b/tests/expectations/tests/annotation_hide.rs
diff --git a/libbindgen/tests/expectations/tests/anon_enum.rs b/tests/expectations/tests/anon_enum.rs
index 3b05eab8..3b05eab8 100644
--- a/libbindgen/tests/expectations/tests/anon_enum.rs
+++ b/tests/expectations/tests/anon_enum.rs
diff --git a/libbindgen/tests/expectations/tests/anon_enum_trait.rs b/tests/expectations/tests/anon_enum_trait.rs
index 8198bc15..8198bc15 100644
--- a/libbindgen/tests/expectations/tests/anon_enum_trait.rs
+++ b/tests/expectations/tests/anon_enum_trait.rs
diff --git a/libbindgen/tests/expectations/tests/anon_enum_whitelist.rs b/tests/expectations/tests/anon_enum_whitelist.rs
index b32396a0..b32396a0 100644
--- a/libbindgen/tests/expectations/tests/anon_enum_whitelist.rs
+++ b/tests/expectations/tests/anon_enum_whitelist.rs
diff --git a/libbindgen/tests/expectations/tests/anon_union.rs b/tests/expectations/tests/anon_union.rs
index f8559ca9..f8559ca9 100644
--- a/libbindgen/tests/expectations/tests/anon_union.rs
+++ b/tests/expectations/tests/anon_union.rs
diff --git a/libbindgen/tests/expectations/tests/arg_keyword.rs b/tests/expectations/tests/arg_keyword.rs
index cb1cc432..cb1cc432 100644
--- a/libbindgen/tests/expectations/tests/arg_keyword.rs
+++ b/tests/expectations/tests/arg_keyword.rs
diff --git a/libbindgen/tests/expectations/tests/auto.rs b/tests/expectations/tests/auto.rs
index 6224e807..6224e807 100644
--- a/libbindgen/tests/expectations/tests/auto.rs
+++ b/tests/expectations/tests/auto.rs
diff --git a/libbindgen/tests/expectations/tests/bad-namespace-parenthood-inheritance.rs b/tests/expectations/tests/bad-namespace-parenthood-inheritance.rs
index 553879b7..553879b7 100644
--- a/libbindgen/tests/expectations/tests/bad-namespace-parenthood-inheritance.rs
+++ b/tests/expectations/tests/bad-namespace-parenthood-inheritance.rs
diff --git a/libbindgen/tests/expectations/tests/base-to-derived.rs b/tests/expectations/tests/base-to-derived.rs
index c2af2c43..c2af2c43 100644
--- a/libbindgen/tests/expectations/tests/base-to-derived.rs
+++ b/tests/expectations/tests/base-to-derived.rs
diff --git a/libbindgen/tests/expectations/tests/bitfield-enum-basic.rs b/tests/expectations/tests/bitfield-enum-basic.rs
index 03e07de6..03e07de6 100644
--- a/libbindgen/tests/expectations/tests/bitfield-enum-basic.rs
+++ b/tests/expectations/tests/bitfield-enum-basic.rs
diff --git a/libbindgen/tests/expectations/tests/bitfield_method_mangling.rs b/tests/expectations/tests/bitfield_method_mangling.rs
index b650a38f..b650a38f 100644
--- a/libbindgen/tests/expectations/tests/bitfield_method_mangling.rs
+++ b/tests/expectations/tests/bitfield_method_mangling.rs
diff --git a/libbindgen/tests/expectations/tests/blocks.rs b/tests/expectations/tests/blocks.rs
index 528ea518..528ea518 100644
--- a/libbindgen/tests/expectations/tests/blocks.rs
+++ b/tests/expectations/tests/blocks.rs
diff --git a/libbindgen/tests/expectations/tests/canonical_path_without_namespacing.rs b/tests/expectations/tests/canonical_path_without_namespacing.rs
index 0b1f561c..0b1f561c 100644
--- a/libbindgen/tests/expectations/tests/canonical_path_without_namespacing.rs
+++ b/tests/expectations/tests/canonical_path_without_namespacing.rs
diff --git a/libbindgen/tests/expectations/tests/class.rs b/tests/expectations/tests/class.rs
index 579c24a4..579c24a4 100644
--- a/libbindgen/tests/expectations/tests/class.rs
+++ b/tests/expectations/tests/class.rs
diff --git a/libbindgen/tests/expectations/tests/class_nested.rs b/tests/expectations/tests/class_nested.rs
index 593e156d..593e156d 100644
--- a/libbindgen/tests/expectations/tests/class_nested.rs
+++ b/tests/expectations/tests/class_nested.rs
diff --git a/libbindgen/tests/expectations/tests/class_no_members.rs b/tests/expectations/tests/class_no_members.rs
index 017f7c22..017f7c22 100644
--- a/libbindgen/tests/expectations/tests/class_no_members.rs
+++ b/tests/expectations/tests/class_no_members.rs
diff --git a/libbindgen/tests/expectations/tests/class_static.rs b/tests/expectations/tests/class_static.rs
index 8108be2d..8108be2d 100644
--- a/libbindgen/tests/expectations/tests/class_static.rs
+++ b/tests/expectations/tests/class_static.rs
diff --git a/libbindgen/tests/expectations/tests/class_static_const.rs b/tests/expectations/tests/class_static_const.rs
index eed6590c..eed6590c 100644
--- a/libbindgen/tests/expectations/tests/class_static_const.rs
+++ b/tests/expectations/tests/class_static_const.rs
diff --git a/libbindgen/tests/expectations/tests/class_use_as.rs b/tests/expectations/tests/class_use_as.rs
index c3843b31..c3843b31 100644
--- a/libbindgen/tests/expectations/tests/class_use_as.rs
+++ b/tests/expectations/tests/class_use_as.rs
diff --git a/libbindgen/tests/expectations/tests/class_with_dtor.rs b/tests/expectations/tests/class_with_dtor.rs
index 8fa0951f..8fa0951f 100644
--- a/libbindgen/tests/expectations/tests/class_with_dtor.rs
+++ b/tests/expectations/tests/class_with_dtor.rs
diff --git a/libbindgen/tests/expectations/tests/class_with_inner_struct.rs b/tests/expectations/tests/class_with_inner_struct.rs
index a1bacbdb..a1bacbdb 100644
--- a/libbindgen/tests/expectations/tests/class_with_inner_struct.rs
+++ b/tests/expectations/tests/class_with_inner_struct.rs
diff --git a/libbindgen/tests/expectations/tests/class_with_typedef.rs b/tests/expectations/tests/class_with_typedef.rs
index bc19f2bd..bc19f2bd 100644
--- a/libbindgen/tests/expectations/tests/class_with_typedef.rs
+++ b/tests/expectations/tests/class_with_typedef.rs
diff --git a/libbindgen/tests/expectations/tests/complex.rs b/tests/expectations/tests/complex.rs
index f2a97952..f2a97952 100644
--- a/libbindgen/tests/expectations/tests/complex.rs
+++ b/tests/expectations/tests/complex.rs
diff --git a/libbindgen/tests/expectations/tests/complex_global.rs b/tests/expectations/tests/complex_global.rs
index badc4d1f..badc4d1f 100644
--- a/libbindgen/tests/expectations/tests/complex_global.rs
+++ b/tests/expectations/tests/complex_global.rs
diff --git a/libbindgen/tests/expectations/tests/const_bool.rs b/tests/expectations/tests/const_bool.rs
index 8a50a094..8a50a094 100644
--- a/libbindgen/tests/expectations/tests/const_bool.rs
+++ b/tests/expectations/tests/const_bool.rs
diff --git a/libbindgen/tests/expectations/tests/const_enum_unnamed.rs b/tests/expectations/tests/const_enum_unnamed.rs
index 0bd3987a..0bd3987a 100644
--- a/libbindgen/tests/expectations/tests/const_enum_unnamed.rs
+++ b/tests/expectations/tests/const_enum_unnamed.rs
diff --git a/libbindgen/tests/expectations/tests/const_ptr.rs b/tests/expectations/tests/const_ptr.rs
index 89400df1..89400df1 100644
--- a/libbindgen/tests/expectations/tests/const_ptr.rs
+++ b/tests/expectations/tests/const_ptr.rs
diff --git a/libbindgen/tests/expectations/tests/const_resolved_ty.rs b/tests/expectations/tests/const_resolved_ty.rs
index 77d8f438..77d8f438 100644
--- a/libbindgen/tests/expectations/tests/const_resolved_ty.rs
+++ b/tests/expectations/tests/const_resolved_ty.rs
diff --git a/libbindgen/tests/expectations/tests/const_tparam.rs b/tests/expectations/tests/const_tparam.rs
index 3ed10d28..3ed10d28 100644
--- a/libbindgen/tests/expectations/tests/const_tparam.rs
+++ b/tests/expectations/tests/const_tparam.rs
diff --git a/libbindgen/tests/expectations/tests/constant-evaluate.rs b/tests/expectations/tests/constant-evaluate.rs
index cdf097a2..cdf097a2 100644
--- a/libbindgen/tests/expectations/tests/constant-evaluate.rs
+++ b/tests/expectations/tests/constant-evaluate.rs
diff --git a/libbindgen/tests/expectations/tests/constify-enum.rs b/tests/expectations/tests/constify-enum.rs
index 989c5197..989c5197 100644
--- a/libbindgen/tests/expectations/tests/constify-enum.rs
+++ b/tests/expectations/tests/constify-enum.rs
diff --git a/libbindgen/tests/expectations/tests/constructor-tp.rs b/tests/expectations/tests/constructor-tp.rs
index 50220489..50220489 100644
--- a/libbindgen/tests/expectations/tests/constructor-tp.rs
+++ b/tests/expectations/tests/constructor-tp.rs
diff --git a/libbindgen/tests/expectations/tests/constructors.rs b/tests/expectations/tests/constructors.rs
index 95afb82d..95afb82d 100644
--- a/libbindgen/tests/expectations/tests/constructors.rs
+++ b/tests/expectations/tests/constructors.rs
diff --git a/libbindgen/tests/expectations/tests/convert-floats.rs b/tests/expectations/tests/convert-floats.rs
index 5cd38c13..5cd38c13 100644
--- a/libbindgen/tests/expectations/tests/convert-floats.rs
+++ b/tests/expectations/tests/convert-floats.rs
diff --git a/libbindgen/tests/expectations/tests/crtp.rs b/tests/expectations/tests/crtp.rs
index cc488fd6..cc488fd6 100644
--- a/libbindgen/tests/expectations/tests/crtp.rs
+++ b/tests/expectations/tests/crtp.rs
diff --git a/libbindgen/tests/expectations/tests/dash_language.rs b/tests/expectations/tests/dash_language.rs
index 148f9c32..148f9c32 100644
--- a/libbindgen/tests/expectations/tests/dash_language.rs
+++ b/tests/expectations/tests/dash_language.rs
diff --git a/libbindgen/tests/expectations/tests/decl_extern_int_twice.rs b/tests/expectations/tests/decl_extern_int_twice.rs
index 603a51b1..603a51b1 100644
--- a/libbindgen/tests/expectations/tests/decl_extern_int_twice.rs
+++ b/tests/expectations/tests/decl_extern_int_twice.rs
diff --git a/libbindgen/tests/expectations/tests/decl_ptr_to_array.rs b/tests/expectations/tests/decl_ptr_to_array.rs
index b8abedb5..b8abedb5 100644
--- a/libbindgen/tests/expectations/tests/decl_ptr_to_array.rs
+++ b/tests/expectations/tests/decl_ptr_to_array.rs
diff --git a/libbindgen/tests/expectations/tests/disable-namespacing.rs b/tests/expectations/tests/disable-namespacing.rs
index 5c166946..5c166946 100644
--- a/libbindgen/tests/expectations/tests/disable-namespacing.rs
+++ b/tests/expectations/tests/disable-namespacing.rs
diff --git a/libbindgen/tests/expectations/tests/duplicated-namespaces-definitions.rs b/tests/expectations/tests/duplicated-namespaces-definitions.rs
index da06a2a9..da06a2a9 100644
--- a/libbindgen/tests/expectations/tests/duplicated-namespaces-definitions.rs
+++ b/tests/expectations/tests/duplicated-namespaces-definitions.rs
diff --git a/libbindgen/tests/expectations/tests/duplicated-namespaces.rs b/tests/expectations/tests/duplicated-namespaces.rs
index 42976657..42976657 100644
--- a/libbindgen/tests/expectations/tests/duplicated-namespaces.rs
+++ b/tests/expectations/tests/duplicated-namespaces.rs
diff --git a/libbindgen/tests/expectations/tests/duplicated_constants_in_ns.rs b/tests/expectations/tests/duplicated_constants_in_ns.rs
index 3721740c..3721740c 100644
--- a/libbindgen/tests/expectations/tests/duplicated_constants_in_ns.rs
+++ b/tests/expectations/tests/duplicated_constants_in_ns.rs
diff --git a/libbindgen/tests/expectations/tests/elaborated.rs b/tests/expectations/tests/elaborated.rs
index 0e8f4ee5..0e8f4ee5 100644
--- a/libbindgen/tests/expectations/tests/elaborated.rs
+++ b/tests/expectations/tests/elaborated.rs
diff --git a/libbindgen/tests/expectations/tests/empty_template_param_name.rs b/tests/expectations/tests/empty_template_param_name.rs
index e10b56db..e10b56db 100644
--- a/libbindgen/tests/expectations/tests/empty_template_param_name.rs
+++ b/tests/expectations/tests/empty_template_param_name.rs
diff --git a/libbindgen/tests/expectations/tests/enum.rs b/tests/expectations/tests/enum.rs
index 8138d697..8138d697 100644
--- a/libbindgen/tests/expectations/tests/enum.rs
+++ b/tests/expectations/tests/enum.rs
diff --git a/libbindgen/tests/expectations/tests/enum_alias.rs b/tests/expectations/tests/enum_alias.rs
index 7ea85598..7ea85598 100644
--- a/libbindgen/tests/expectations/tests/enum_alias.rs
+++ b/tests/expectations/tests/enum_alias.rs
diff --git a/libbindgen/tests/expectations/tests/enum_and_vtable_mangling.rs b/tests/expectations/tests/enum_and_vtable_mangling.rs
index a55c344e..a55c344e 100644
--- a/libbindgen/tests/expectations/tests/enum_and_vtable_mangling.rs
+++ b/tests/expectations/tests/enum_and_vtable_mangling.rs
diff --git a/libbindgen/tests/expectations/tests/enum_dupe.rs b/tests/expectations/tests/enum_dupe.rs
index 322b89fc..322b89fc 100644
--- a/libbindgen/tests/expectations/tests/enum_dupe.rs
+++ b/tests/expectations/tests/enum_dupe.rs
diff --git a/libbindgen/tests/expectations/tests/enum_explicit_type.rs b/tests/expectations/tests/enum_explicit_type.rs
index 4e555d3a..4e555d3a 100644
--- a/libbindgen/tests/expectations/tests/enum_explicit_type.rs
+++ b/tests/expectations/tests/enum_explicit_type.rs
diff --git a/libbindgen/tests/expectations/tests/enum_in_template_with_typedef.rs b/tests/expectations/tests/enum_in_template_with_typedef.rs
index 66a304aa..66a304aa 100644
--- a/libbindgen/tests/expectations/tests/enum_in_template_with_typedef.rs
+++ b/tests/expectations/tests/enum_in_template_with_typedef.rs
diff --git a/libbindgen/tests/expectations/tests/enum_negative.rs b/tests/expectations/tests/enum_negative.rs
index 74cf4f16..74cf4f16 100644
--- a/libbindgen/tests/expectations/tests/enum_negative.rs
+++ b/tests/expectations/tests/enum_negative.rs
diff --git a/libbindgen/tests/expectations/tests/enum_packed.rs b/tests/expectations/tests/enum_packed.rs
index 963763e1..963763e1 100644
--- a/libbindgen/tests/expectations/tests/enum_packed.rs
+++ b/tests/expectations/tests/enum_packed.rs
diff --git a/libbindgen/tests/expectations/tests/eval-variadic-template-parameter.rs b/tests/expectations/tests/eval-variadic-template-parameter.rs
index f8c937e2..f8c937e2 100644
--- a/libbindgen/tests/expectations/tests/eval-variadic-template-parameter.rs
+++ b/tests/expectations/tests/eval-variadic-template-parameter.rs
diff --git a/libbindgen/tests/expectations/tests/extern.rs b/tests/expectations/tests/extern.rs
index e7ac7504..e7ac7504 100644
--- a/libbindgen/tests/expectations/tests/extern.rs
+++ b/tests/expectations/tests/extern.rs
diff --git a/libbindgen/tests/expectations/tests/float128.rs b/tests/expectations/tests/float128.rs
index b4b7b2bc..b4b7b2bc 100644
--- a/libbindgen/tests/expectations/tests/float128.rs
+++ b/tests/expectations/tests/float128.rs
diff --git a/libbindgen/tests/expectations/tests/forward-inherit-struct-with-fields.rs b/tests/expectations/tests/forward-inherit-struct-with-fields.rs
index e377b3ad..e377b3ad 100644
--- a/libbindgen/tests/expectations/tests/forward-inherit-struct-with-fields.rs
+++ b/tests/expectations/tests/forward-inherit-struct-with-fields.rs
diff --git a/libbindgen/tests/expectations/tests/forward-inherit-struct.rs b/tests/expectations/tests/forward-inherit-struct.rs
index 5de70fa9..5de70fa9 100644
--- a/libbindgen/tests/expectations/tests/forward-inherit-struct.rs
+++ b/tests/expectations/tests/forward-inherit-struct.rs
diff --git a/libbindgen/tests/expectations/tests/forward_declared_struct.rs b/tests/expectations/tests/forward_declared_struct.rs
index 5c2764e1..5c2764e1 100644
--- a/libbindgen/tests/expectations/tests/forward_declared_struct.rs
+++ b/tests/expectations/tests/forward_declared_struct.rs
diff --git a/libbindgen/tests/expectations/tests/func_proto.rs b/tests/expectations/tests/func_proto.rs
index e7ac7504..e7ac7504 100644
--- a/libbindgen/tests/expectations/tests/func_proto.rs
+++ b/tests/expectations/tests/func_proto.rs
diff --git a/libbindgen/tests/expectations/tests/func_ptr.rs b/tests/expectations/tests/func_ptr.rs
index 87ec3e3d..87ec3e3d 100644
--- a/libbindgen/tests/expectations/tests/func_ptr.rs
+++ b/tests/expectations/tests/func_ptr.rs
diff --git a/libbindgen/tests/expectations/tests/func_ptr_in_struct.rs b/tests/expectations/tests/func_ptr_in_struct.rs
index dcae771b..dcae771b 100644
--- a/libbindgen/tests/expectations/tests/func_ptr_in_struct.rs
+++ b/tests/expectations/tests/func_ptr_in_struct.rs
diff --git a/libbindgen/tests/expectations/tests/func_with_array_arg.rs b/tests/expectations/tests/func_with_array_arg.rs
index 1528e0ba..1528e0ba 100644
--- a/libbindgen/tests/expectations/tests/func_with_array_arg.rs
+++ b/tests/expectations/tests/func_with_array_arg.rs
diff --git a/libbindgen/tests/expectations/tests/func_with_func_ptr_arg.rs b/tests/expectations/tests/func_with_func_ptr_arg.rs
index 4ac25286..4ac25286 100644
--- a/libbindgen/tests/expectations/tests/func_with_func_ptr_arg.rs
+++ b/tests/expectations/tests/func_with_func_ptr_arg.rs
diff --git a/libbindgen/tests/expectations/tests/in_class_typedef.rs b/tests/expectations/tests/in_class_typedef.rs
index 4e95ca8c..4e95ca8c 100644
--- a/libbindgen/tests/expectations/tests/in_class_typedef.rs
+++ b/tests/expectations/tests/in_class_typedef.rs
diff --git a/libbindgen/tests/expectations/tests/inherit-namespaced.rs b/tests/expectations/tests/inherit-namespaced.rs
index c0d2e5a6..c0d2e5a6 100644
--- a/libbindgen/tests/expectations/tests/inherit-namespaced.rs
+++ b/tests/expectations/tests/inherit-namespaced.rs
diff --git a/libbindgen/tests/expectations/tests/inherit_named.rs b/tests/expectations/tests/inherit_named.rs
index 8081c649..8081c649 100644
--- a/libbindgen/tests/expectations/tests/inherit_named.rs
+++ b/tests/expectations/tests/inherit_named.rs
diff --git a/libbindgen/tests/expectations/tests/inherit_typedef.rs b/tests/expectations/tests/inherit_typedef.rs
index 2b974223..2b974223 100644
--- a/libbindgen/tests/expectations/tests/inherit_typedef.rs
+++ b/tests/expectations/tests/inherit_typedef.rs
diff --git a/libbindgen/tests/expectations/tests/inline-function.rs b/tests/expectations/tests/inline-function.rs
index b4b7b2bc..b4b7b2bc 100644
--- a/libbindgen/tests/expectations/tests/inline-function.rs
+++ b/tests/expectations/tests/inline-function.rs
diff --git a/libbindgen/tests/expectations/tests/inline_namespace.rs b/tests/expectations/tests/inline_namespace.rs
index 5f6776b7..5f6776b7 100644
--- a/libbindgen/tests/expectations/tests/inline_namespace.rs
+++ b/tests/expectations/tests/inline_namespace.rs
diff --git a/libbindgen/tests/expectations/tests/inline_namespace_conservative.rs b/tests/expectations/tests/inline_namespace_conservative.rs
index d759a882..d759a882 100644
--- a/libbindgen/tests/expectations/tests/inline_namespace_conservative.rs
+++ b/tests/expectations/tests/inline_namespace_conservative.rs
diff --git a/libbindgen/tests/expectations/tests/inline_namespace_whitelist.rs b/tests/expectations/tests/inline_namespace_whitelist.rs
index 9b8f87a5..9b8f87a5 100644
--- a/libbindgen/tests/expectations/tests/inline_namespace_whitelist.rs
+++ b/tests/expectations/tests/inline_namespace_whitelist.rs
diff --git a/libbindgen/tests/expectations/tests/inner_const.rs b/tests/expectations/tests/inner_const.rs
index 666b8ce2..666b8ce2 100644
--- a/libbindgen/tests/expectations/tests/inner_const.rs
+++ b/tests/expectations/tests/inner_const.rs
diff --git a/libbindgen/tests/expectations/tests/inner_template_self.rs b/tests/expectations/tests/inner_template_self.rs
index b965b92d..b965b92d 100644
--- a/libbindgen/tests/expectations/tests/inner_template_self.rs
+++ b/tests/expectations/tests/inner_template_self.rs
diff --git a/libbindgen/tests/expectations/tests/int128_t.rs b/tests/expectations/tests/int128_t.rs
index b4b7b2bc..b4b7b2bc 100644
--- a/libbindgen/tests/expectations/tests/int128_t.rs
+++ b/tests/expectations/tests/int128_t.rs
diff --git a/libbindgen/tests/expectations/tests/issue-358.rs b/tests/expectations/tests/issue-358.rs
index 1b933d34..1b933d34 100644
--- a/libbindgen/tests/expectations/tests/issue-358.rs
+++ b/tests/expectations/tests/issue-358.rs
diff --git a/libbindgen/tests/expectations/tests/issue-372.rs b/tests/expectations/tests/issue-372.rs
index c6d9209e..c6d9209e 100644
--- a/libbindgen/tests/expectations/tests/issue-372.rs
+++ b/tests/expectations/tests/issue-372.rs
diff --git a/libbindgen/tests/expectations/tests/issue_311.rs b/tests/expectations/tests/issue_311.rs
index f01a9d93..f01a9d93 100644
--- a/libbindgen/tests/expectations/tests/issue_311.rs
+++ b/tests/expectations/tests/issue_311.rs
diff --git a/libbindgen/tests/expectations/tests/issue_315.rs b/tests/expectations/tests/issue_315.rs
index a5ab63fc..a5ab63fc 100644
--- a/libbindgen/tests/expectations/tests/issue_315.rs
+++ b/tests/expectations/tests/issue_315.rs
diff --git a/libbindgen/tests/expectations/tests/jsval_layout_opaque.rs b/tests/expectations/tests/jsval_layout_opaque.rs
index 530fdb22..530fdb22 100644
--- a/libbindgen/tests/expectations/tests/jsval_layout_opaque.rs
+++ b/tests/expectations/tests/jsval_layout_opaque.rs
diff --git a/libbindgen/tests/expectations/tests/keywords.rs b/tests/expectations/tests/keywords.rs
index 5b75389e..5b75389e 100644
--- a/libbindgen/tests/expectations/tests/keywords.rs
+++ b/tests/expectations/tests/keywords.rs
diff --git a/libbindgen/tests/expectations/tests/macro-expr-basic.rs b/tests/expectations/tests/macro-expr-basic.rs
index 355294e7..355294e7 100644
--- a/libbindgen/tests/expectations/tests/macro-expr-basic.rs
+++ b/tests/expectations/tests/macro-expr-basic.rs
diff --git a/libbindgen/tests/expectations/tests/macro-redef.rs b/tests/expectations/tests/macro-redef.rs
index 881a44ae..881a44ae 100644
--- a/libbindgen/tests/expectations/tests/macro-redef.rs
+++ b/tests/expectations/tests/macro-redef.rs
diff --git a/libbindgen/tests/expectations/tests/macro_const.rs b/tests/expectations/tests/macro_const.rs
index 9e7eb420..9e7eb420 100644
--- a/libbindgen/tests/expectations/tests/macro_const.rs
+++ b/tests/expectations/tests/macro_const.rs
diff --git a/libbindgen/tests/expectations/tests/maddness-is-avoidable.rs b/tests/expectations/tests/maddness-is-avoidable.rs
index d31345ba..d31345ba 100644
--- a/libbindgen/tests/expectations/tests/maddness-is-avoidable.rs
+++ b/tests/expectations/tests/maddness-is-avoidable.rs
diff --git a/libbindgen/tests/expectations/tests/method-mangling.rs b/tests/expectations/tests/method-mangling.rs
index 3b5107a8..3b5107a8 100644
--- a/libbindgen/tests/expectations/tests/method-mangling.rs
+++ b/tests/expectations/tests/method-mangling.rs
diff --git a/libbindgen/tests/expectations/tests/module-whitelisted.rs b/tests/expectations/tests/module-whitelisted.rs
index 6f88c54b..6f88c54b 100644
--- a/libbindgen/tests/expectations/tests/module-whitelisted.rs
+++ b/tests/expectations/tests/module-whitelisted.rs
diff --git a/libbindgen/tests/expectations/tests/msvc-no-usr.rs b/tests/expectations/tests/msvc-no-usr.rs
index 8cab8cdc..8cab8cdc 100644
--- a/libbindgen/tests/expectations/tests/msvc-no-usr.rs
+++ b/tests/expectations/tests/msvc-no-usr.rs
diff --git a/libbindgen/tests/expectations/tests/multiple-inherit-empty-correct-layout.rs b/tests/expectations/tests/multiple-inherit-empty-correct-layout.rs
index 5e9cf522..5e9cf522 100644
--- a/libbindgen/tests/expectations/tests/multiple-inherit-empty-correct-layout.rs
+++ b/tests/expectations/tests/multiple-inherit-empty-correct-layout.rs
diff --git a/libbindgen/tests/expectations/tests/mutable.rs b/tests/expectations/tests/mutable.rs
index 0d0d6ea3..0d0d6ea3 100644
--- a/libbindgen/tests/expectations/tests/mutable.rs
+++ b/tests/expectations/tests/mutable.rs
diff --git a/libbindgen/tests/expectations/tests/namespace.rs b/tests/expectations/tests/namespace.rs
index ece4e341..ece4e341 100644
--- a/libbindgen/tests/expectations/tests/namespace.rs
+++ b/tests/expectations/tests/namespace.rs
diff --git a/libbindgen/tests/expectations/tests/nested.rs b/tests/expectations/tests/nested.rs
index fdd435aa..fdd435aa 100644
--- a/libbindgen/tests/expectations/tests/nested.rs
+++ b/tests/expectations/tests/nested.rs
diff --git a/libbindgen/tests/expectations/tests/nested_vtable.rs b/tests/expectations/tests/nested_vtable.rs
index d74ad55f..d74ad55f 100644
--- a/libbindgen/tests/expectations/tests/nested_vtable.rs
+++ b/tests/expectations/tests/nested_vtable.rs
diff --git a/libbindgen/tests/expectations/tests/nested_within_namespace.rs b/tests/expectations/tests/nested_within_namespace.rs
index 0c9c31ef..0c9c31ef 100644
--- a/libbindgen/tests/expectations/tests/nested_within_namespace.rs
+++ b/tests/expectations/tests/nested_within_namespace.rs
diff --git a/libbindgen/tests/expectations/tests/no-std.rs b/tests/expectations/tests/no-std.rs
index f50a889d..f50a889d 100644
--- a/libbindgen/tests/expectations/tests/no-std.rs
+++ b/tests/expectations/tests/no-std.rs
diff --git a/libbindgen/tests/expectations/tests/no_copy.rs b/tests/expectations/tests/no_copy.rs
index 53ab9677..53ab9677 100644
--- a/libbindgen/tests/expectations/tests/no_copy.rs
+++ b/tests/expectations/tests/no_copy.rs
diff --git a/libbindgen/tests/expectations/tests/nsStyleAutoArray.rs b/tests/expectations/tests/nsStyleAutoArray.rs
index c150ec46..c150ec46 100644
--- a/libbindgen/tests/expectations/tests/nsStyleAutoArray.rs
+++ b/tests/expectations/tests/nsStyleAutoArray.rs
diff --git a/libbindgen/tests/expectations/tests/only_bitfields.rs b/tests/expectations/tests/only_bitfields.rs
index 68968826..68968826 100644
--- a/libbindgen/tests/expectations/tests/only_bitfields.rs
+++ b/tests/expectations/tests/only_bitfields.rs
diff --git a/libbindgen/tests/expectations/tests/opaque-tracing.rs b/tests/expectations/tests/opaque-tracing.rs
index 7dcc4eef..7dcc4eef 100644
--- a/libbindgen/tests/expectations/tests/opaque-tracing.rs
+++ b/tests/expectations/tests/opaque-tracing.rs
diff --git a/libbindgen/tests/expectations/tests/opaque_in_struct.rs b/tests/expectations/tests/opaque_in_struct.rs
index c94caa1f..c94caa1f 100644
--- a/libbindgen/tests/expectations/tests/opaque_in_struct.rs
+++ b/tests/expectations/tests/opaque_in_struct.rs
diff --git a/libbindgen/tests/expectations/tests/opaque_pointer.rs b/tests/expectations/tests/opaque_pointer.rs
index 118a1782..118a1782 100644
--- a/libbindgen/tests/expectations/tests/opaque_pointer.rs
+++ b/tests/expectations/tests/opaque_pointer.rs
diff --git a/libbindgen/tests/expectations/tests/opaque_typedef.rs b/tests/expectations/tests/opaque_typedef.rs
index c45cbc6f..c45cbc6f 100644
--- a/libbindgen/tests/expectations/tests/opaque_typedef.rs
+++ b/tests/expectations/tests/opaque_typedef.rs
diff --git a/libbindgen/tests/expectations/tests/overflowed_enum.rs b/tests/expectations/tests/overflowed_enum.rs
index 9e1f8a7f..9e1f8a7f 100644
--- a/libbindgen/tests/expectations/tests/overflowed_enum.rs
+++ b/tests/expectations/tests/overflowed_enum.rs
diff --git a/libbindgen/tests/expectations/tests/overloading.rs b/tests/expectations/tests/overloading.rs
index 71002e23..71002e23 100644
--- a/libbindgen/tests/expectations/tests/overloading.rs
+++ b/tests/expectations/tests/overloading.rs
diff --git a/libbindgen/tests/expectations/tests/private.rs b/tests/expectations/tests/private.rs
index c4ac37d1..c4ac37d1 100644
--- a/libbindgen/tests/expectations/tests/private.rs
+++ b/tests/expectations/tests/private.rs
diff --git a/libbindgen/tests/expectations/tests/public-dtor.rs b/tests/expectations/tests/public-dtor.rs
index 851857ee..851857ee 100644
--- a/libbindgen/tests/expectations/tests/public-dtor.rs
+++ b/tests/expectations/tests/public-dtor.rs
diff --git a/libbindgen/tests/expectations/tests/redeclaration.rs b/tests/expectations/tests/redeclaration.rs
index 0d7e585c..0d7e585c 100644
--- a/libbindgen/tests/expectations/tests/redeclaration.rs
+++ b/tests/expectations/tests/redeclaration.rs
diff --git a/libbindgen/tests/expectations/tests/ref_argument_array.rs b/tests/expectations/tests/ref_argument_array.rs
index c88492d7..c88492d7 100644
--- a/libbindgen/tests/expectations/tests/ref_argument_array.rs
+++ b/tests/expectations/tests/ref_argument_array.rs
diff --git a/libbindgen/tests/expectations/tests/reparented_replacement.rs b/tests/expectations/tests/reparented_replacement.rs
index e8ccc931..e8ccc931 100644
--- a/libbindgen/tests/expectations/tests/reparented_replacement.rs
+++ b/tests/expectations/tests/reparented_replacement.rs
diff --git a/libbindgen/tests/expectations/tests/replace_template_alias.rs b/tests/expectations/tests/replace_template_alias.rs
index f922ac77..f922ac77 100644
--- a/libbindgen/tests/expectations/tests/replace_template_alias.rs
+++ b/tests/expectations/tests/replace_template_alias.rs
diff --git a/libbindgen/tests/expectations/tests/replace_use.rs b/tests/expectations/tests/replace_use.rs
index f4fee442..f4fee442 100644
--- a/libbindgen/tests/expectations/tests/replace_use.rs
+++ b/tests/expectations/tests/replace_use.rs
diff --git a/libbindgen/tests/expectations/tests/replaces_double.rs b/tests/expectations/tests/replaces_double.rs
index 50dafd42..50dafd42 100644
--- a/libbindgen/tests/expectations/tests/replaces_double.rs
+++ b/tests/expectations/tests/replaces_double.rs
diff --git a/libbindgen/tests/expectations/tests/resolved_type_def_function.rs b/tests/expectations/tests/resolved_type_def_function.rs
index 83f07dd0..83f07dd0 100644
--- a/libbindgen/tests/expectations/tests/resolved_type_def_function.rs
+++ b/tests/expectations/tests/resolved_type_def_function.rs
diff --git a/libbindgen/tests/expectations/tests/same_struct_name_in_different_namespaces.rs b/tests/expectations/tests/same_struct_name_in_different_namespaces.rs
index 8e7c177b..8e7c177b 100644
--- a/libbindgen/tests/expectations/tests/same_struct_name_in_different_namespaces.rs
+++ b/tests/expectations/tests/same_struct_name_in_different_namespaces.rs
diff --git a/libbindgen/tests/expectations/tests/size_t_template.rs b/tests/expectations/tests/size_t_template.rs
index 78351ecc..78351ecc 100644
--- a/libbindgen/tests/expectations/tests/size_t_template.rs
+++ b/tests/expectations/tests/size_t_template.rs
diff --git a/libbindgen/tests/expectations/tests/struct_containing_forward_declared_struct.rs b/tests/expectations/tests/struct_containing_forward_declared_struct.rs
index 388cc595..388cc595 100644
--- a/libbindgen/tests/expectations/tests/struct_containing_forward_declared_struct.rs
+++ b/tests/expectations/tests/struct_containing_forward_declared_struct.rs
diff --git a/libbindgen/tests/expectations/tests/struct_with_anon_struct.rs b/tests/expectations/tests/struct_with_anon_struct.rs
index 1c49675d..1c49675d 100644
--- a/libbindgen/tests/expectations/tests/struct_with_anon_struct.rs
+++ b/tests/expectations/tests/struct_with_anon_struct.rs
diff --git a/libbindgen/tests/expectations/tests/struct_with_anon_struct_array.rs b/tests/expectations/tests/struct_with_anon_struct_array.rs
index 6e1c0315..6e1c0315 100644
--- a/libbindgen/tests/expectations/tests/struct_with_anon_struct_array.rs
+++ b/tests/expectations/tests/struct_with_anon_struct_array.rs
diff --git a/libbindgen/tests/expectations/tests/struct_with_anon_struct_pointer.rs b/tests/expectations/tests/struct_with_anon_struct_pointer.rs
index aa77d4b6..aa77d4b6 100644
--- a/libbindgen/tests/expectations/tests/struct_with_anon_struct_pointer.rs
+++ b/tests/expectations/tests/struct_with_anon_struct_pointer.rs
diff --git a/libbindgen/tests/expectations/tests/struct_with_anon_union.rs b/tests/expectations/tests/struct_with_anon_union.rs
index 0d2e937a..0d2e937a 100644
--- a/libbindgen/tests/expectations/tests/struct_with_anon_union.rs
+++ b/tests/expectations/tests/struct_with_anon_union.rs
diff --git a/libbindgen/tests/expectations/tests/struct_with_anon_unnamed_struct.rs b/tests/expectations/tests/struct_with_anon_unnamed_struct.rs
index 1b77fccc..1b77fccc 100644
--- a/libbindgen/tests/expectations/tests/struct_with_anon_unnamed_struct.rs
+++ b/tests/expectations/tests/struct_with_anon_unnamed_struct.rs
diff --git a/libbindgen/tests/expectations/tests/struct_with_anon_unnamed_union.rs b/tests/expectations/tests/struct_with_anon_unnamed_union.rs
index 2914eb41..2914eb41 100644
--- a/libbindgen/tests/expectations/tests/struct_with_anon_unnamed_union.rs
+++ b/tests/expectations/tests/struct_with_anon_unnamed_union.rs
diff --git a/libbindgen/tests/expectations/tests/struct_with_bitfields.rs b/tests/expectations/tests/struct_with_bitfields.rs
index 3fb83a47..3fb83a47 100644
--- a/libbindgen/tests/expectations/tests/struct_with_bitfields.rs
+++ b/tests/expectations/tests/struct_with_bitfields.rs
diff --git a/libbindgen/tests/expectations/tests/struct_with_derive_debug.rs b/tests/expectations/tests/struct_with_derive_debug.rs
index 52906a81..52906a81 100644
--- a/libbindgen/tests/expectations/tests/struct_with_derive_debug.rs
+++ b/tests/expectations/tests/struct_with_derive_debug.rs
diff --git a/libbindgen/tests/expectations/tests/struct_with_nesting.rs b/tests/expectations/tests/struct_with_nesting.rs
index b3e0a5ca..b3e0a5ca 100644
--- a/libbindgen/tests/expectations/tests/struct_with_nesting.rs
+++ b/tests/expectations/tests/struct_with_nesting.rs
diff --git a/libbindgen/tests/expectations/tests/struct_with_packing.rs b/tests/expectations/tests/struct_with_packing.rs
index 93fc3f11..93fc3f11 100644
--- a/libbindgen/tests/expectations/tests/struct_with_packing.rs
+++ b/tests/expectations/tests/struct_with_packing.rs
diff --git a/libbindgen/tests/expectations/tests/struct_with_struct.rs b/tests/expectations/tests/struct_with_struct.rs
index c8cdc927..c8cdc927 100644
--- a/libbindgen/tests/expectations/tests/struct_with_struct.rs
+++ b/tests/expectations/tests/struct_with_struct.rs
diff --git a/libbindgen/tests/expectations/tests/struct_with_typedef_template_arg.rs b/tests/expectations/tests/struct_with_typedef_template_arg.rs
index 6f8d71f1..6f8d71f1 100644
--- a/libbindgen/tests/expectations/tests/struct_with_typedef_template_arg.rs
+++ b/tests/expectations/tests/struct_with_typedef_template_arg.rs
diff --git a/libbindgen/tests/expectations/tests/template.rs b/tests/expectations/tests/template.rs
index 5864ac73..5864ac73 100644
--- a/libbindgen/tests/expectations/tests/template.rs
+++ b/tests/expectations/tests/template.rs
diff --git a/libbindgen/tests/expectations/tests/template_alias.rs b/tests/expectations/tests/template_alias.rs
index d301a11c..d301a11c 100644
--- a/libbindgen/tests/expectations/tests/template_alias.rs
+++ b/tests/expectations/tests/template_alias.rs
diff --git a/libbindgen/tests/expectations/tests/template_alias_basic.rs b/tests/expectations/tests/template_alias_basic.rs
index 656fff33..656fff33 100644
--- a/libbindgen/tests/expectations/tests/template_alias_basic.rs
+++ b/tests/expectations/tests/template_alias_basic.rs
diff --git a/libbindgen/tests/expectations/tests/template_alias_namespace.rs b/tests/expectations/tests/template_alias_namespace.rs
index cf4a079c..cf4a079c 100644
--- a/libbindgen/tests/expectations/tests/template_alias_namespace.rs
+++ b/tests/expectations/tests/template_alias_namespace.rs
diff --git a/libbindgen/tests/expectations/tests/template_typedef_transitive_param.rs b/tests/expectations/tests/template_typedef_transitive_param.rs
index 166ddc3c..166ddc3c 100644
--- a/libbindgen/tests/expectations/tests/template_typedef_transitive_param.rs
+++ b/tests/expectations/tests/template_typedef_transitive_param.rs
diff --git a/libbindgen/tests/expectations/tests/template_typedefs.rs b/tests/expectations/tests/template_typedefs.rs
index 5f0d80b9..5f0d80b9 100644
--- a/libbindgen/tests/expectations/tests/template_typedefs.rs
+++ b/tests/expectations/tests/template_typedefs.rs
diff --git a/libbindgen/tests/expectations/tests/templateref_opaque.rs b/tests/expectations/tests/templateref_opaque.rs
index d69254c8..d69254c8 100644
--- a/libbindgen/tests/expectations/tests/templateref_opaque.rs
+++ b/tests/expectations/tests/templateref_opaque.rs
diff --git a/libbindgen/tests/expectations/tests/type-referenced-by-whitelisted-function.rs b/tests/expectations/tests/type-referenced-by-whitelisted-function.rs
index c9686501..c9686501 100644
--- a/libbindgen/tests/expectations/tests/type-referenced-by-whitelisted-function.rs
+++ b/tests/expectations/tests/type-referenced-by-whitelisted-function.rs
diff --git a/libbindgen/tests/expectations/tests/type_alias_empty.rs b/tests/expectations/tests/type_alias_empty.rs
index 47e36006..47e36006 100644
--- a/libbindgen/tests/expectations/tests/type_alias_empty.rs
+++ b/tests/expectations/tests/type_alias_empty.rs
diff --git a/libbindgen/tests/expectations/tests/type_alias_partial_template_especialization.rs b/tests/expectations/tests/type_alias_partial_template_especialization.rs
index 70b5f66c..70b5f66c 100644
--- a/libbindgen/tests/expectations/tests/type_alias_partial_template_especialization.rs
+++ b/tests/expectations/tests/type_alias_partial_template_especialization.rs
diff --git a/libbindgen/tests/expectations/tests/type_alias_template_specialized.rs b/tests/expectations/tests/type_alias_template_specialized.rs
index 11813bc6..11813bc6 100644
--- a/libbindgen/tests/expectations/tests/type_alias_template_specialized.rs
+++ b/tests/expectations/tests/type_alias_template_specialized.rs
diff --git a/libbindgen/tests/expectations/tests/typedefd-array-as-function-arg.rs b/tests/expectations/tests/typedefd-array-as-function-arg.rs
index 56074f75..56074f75 100644
--- a/libbindgen/tests/expectations/tests/typedefd-array-as-function-arg.rs
+++ b/tests/expectations/tests/typedefd-array-as-function-arg.rs
diff --git a/libbindgen/tests/expectations/tests/typeref.rs b/tests/expectations/tests/typeref.rs
index 1188393d..1188393d 100644
--- a/libbindgen/tests/expectations/tests/typeref.rs
+++ b/tests/expectations/tests/typeref.rs
diff --git a/libbindgen/tests/expectations/tests/union-in-ns.rs b/tests/expectations/tests/union-in-ns.rs
index fa511e51..fa511e51 100644
--- a/libbindgen/tests/expectations/tests/union-in-ns.rs
+++ b/tests/expectations/tests/union-in-ns.rs
diff --git a/libbindgen/tests/expectations/tests/union_dtor.rs b/tests/expectations/tests/union_dtor.rs
index 9be626ff..9be626ff 100644
--- a/libbindgen/tests/expectations/tests/union_dtor.rs
+++ b/tests/expectations/tests/union_dtor.rs
diff --git a/libbindgen/tests/expectations/tests/union_fields.rs b/tests/expectations/tests/union_fields.rs
index 21d87919..21d87919 100644
--- a/libbindgen/tests/expectations/tests/union_fields.rs
+++ b/tests/expectations/tests/union_fields.rs
diff --git a/libbindgen/tests/expectations/tests/union_template.rs b/tests/expectations/tests/union_template.rs
index fc92afb8..fc92afb8 100644
--- a/libbindgen/tests/expectations/tests/union_template.rs
+++ b/tests/expectations/tests/union_template.rs
diff --git a/libbindgen/tests/expectations/tests/union_with_anon_struct.rs b/tests/expectations/tests/union_with_anon_struct.rs
index f0a21512..f0a21512 100644
--- a/libbindgen/tests/expectations/tests/union_with_anon_struct.rs
+++ b/tests/expectations/tests/union_with_anon_struct.rs
diff --git a/libbindgen/tests/expectations/tests/union_with_anon_struct_bitfield.rs b/tests/expectations/tests/union_with_anon_struct_bitfield.rs
index 548b0dc4..548b0dc4 100644
--- a/libbindgen/tests/expectations/tests/union_with_anon_struct_bitfield.rs
+++ b/tests/expectations/tests/union_with_anon_struct_bitfield.rs
diff --git a/libbindgen/tests/expectations/tests/union_with_anon_union.rs b/tests/expectations/tests/union_with_anon_union.rs
index 95278556..95278556 100644
--- a/libbindgen/tests/expectations/tests/union_with_anon_union.rs
+++ b/tests/expectations/tests/union_with_anon_union.rs
diff --git a/libbindgen/tests/expectations/tests/union_with_anon_unnamed_struct.rs b/tests/expectations/tests/union_with_anon_unnamed_struct.rs
index 2d6fab97..2d6fab97 100644
--- a/libbindgen/tests/expectations/tests/union_with_anon_unnamed_struct.rs
+++ b/tests/expectations/tests/union_with_anon_unnamed_struct.rs
diff --git a/libbindgen/tests/expectations/tests/union_with_anon_unnamed_union.rs b/tests/expectations/tests/union_with_anon_unnamed_union.rs
index eb214017..eb214017 100644
--- a/libbindgen/tests/expectations/tests/union_with_anon_unnamed_union.rs
+++ b/tests/expectations/tests/union_with_anon_unnamed_union.rs
diff --git a/libbindgen/tests/expectations/tests/union_with_big_member.rs b/tests/expectations/tests/union_with_big_member.rs
index b921f33c..b921f33c 100644
--- a/libbindgen/tests/expectations/tests/union_with_big_member.rs
+++ b/tests/expectations/tests/union_with_big_member.rs
diff --git a/libbindgen/tests/expectations/tests/union_with_nesting.rs b/tests/expectations/tests/union_with_nesting.rs
index af9e442d..af9e442d 100644
--- a/libbindgen/tests/expectations/tests/union_with_nesting.rs
+++ b/tests/expectations/tests/union_with_nesting.rs
diff --git a/libbindgen/tests/expectations/tests/unknown_attr.rs b/tests/expectations/tests/unknown_attr.rs
index 541bee5d..541bee5d 100644
--- a/libbindgen/tests/expectations/tests/unknown_attr.rs
+++ b/tests/expectations/tests/unknown_attr.rs
diff --git a/libbindgen/tests/expectations/tests/use-core.rs b/tests/expectations/tests/use-core.rs
index b0900f5f..b0900f5f 100644
--- a/libbindgen/tests/expectations/tests/use-core.rs
+++ b/tests/expectations/tests/use-core.rs
diff --git a/libbindgen/tests/expectations/tests/using.rs b/tests/expectations/tests/using.rs
index dbb6c84f..dbb6c84f 100644
--- a/libbindgen/tests/expectations/tests/using.rs
+++ b/tests/expectations/tests/using.rs
diff --git a/libbindgen/tests/expectations/tests/var-tracing.rs b/tests/expectations/tests/var-tracing.rs
index 75c5ebe3..75c5ebe3 100644
--- a/libbindgen/tests/expectations/tests/var-tracing.rs
+++ b/tests/expectations/tests/var-tracing.rs
diff --git a/libbindgen/tests/expectations/tests/variadic-method.rs b/tests/expectations/tests/variadic-method.rs
index 34301069..34301069 100644
--- a/libbindgen/tests/expectations/tests/variadic-method.rs
+++ b/tests/expectations/tests/variadic-method.rs
diff --git a/libbindgen/tests/expectations/tests/variadic_template_function.rs b/tests/expectations/tests/variadic_template_function.rs
index cd99df96..cd99df96 100644
--- a/libbindgen/tests/expectations/tests/variadic_template_function.rs
+++ b/tests/expectations/tests/variadic_template_function.rs
diff --git a/libbindgen/tests/expectations/tests/vector.rs b/tests/expectations/tests/vector.rs
index b8ca5735..b8ca5735 100644
--- a/libbindgen/tests/expectations/tests/vector.rs
+++ b/tests/expectations/tests/vector.rs
diff --git a/libbindgen/tests/expectations/tests/virtual_dtor.rs b/tests/expectations/tests/virtual_dtor.rs
index 9571f084..9571f084 100644
--- a/libbindgen/tests/expectations/tests/virtual_dtor.rs
+++ b/tests/expectations/tests/virtual_dtor.rs
diff --git a/libbindgen/tests/expectations/tests/virtual_inheritance.rs b/tests/expectations/tests/virtual_inheritance.rs
index f271223f..f271223f 100644
--- a/libbindgen/tests/expectations/tests/virtual_inheritance.rs
+++ b/tests/expectations/tests/virtual_inheritance.rs
diff --git a/libbindgen/tests/expectations/tests/virtual_overloaded.rs b/tests/expectations/tests/virtual_overloaded.rs
index 7833cdbf..7833cdbf 100644
--- a/libbindgen/tests/expectations/tests/virtual_overloaded.rs
+++ b/tests/expectations/tests/virtual_overloaded.rs
diff --git a/libbindgen/tests/expectations/tests/vtable_recursive_sig.rs b/tests/expectations/tests/vtable_recursive_sig.rs
index ce62eeb0..ce62eeb0 100644
--- a/libbindgen/tests/expectations/tests/vtable_recursive_sig.rs
+++ b/tests/expectations/tests/vtable_recursive_sig.rs
diff --git a/libbindgen/tests/expectations/tests/weird_bitfields.rs b/tests/expectations/tests/weird_bitfields.rs
index 56ee76a5..56ee76a5 100644
--- a/libbindgen/tests/expectations/tests/weird_bitfields.rs
+++ b/tests/expectations/tests/weird_bitfields.rs
diff --git a/libbindgen/tests/expectations/tests/what_is_going_on.rs b/tests/expectations/tests/what_is_going_on.rs
index 6f1998d1..6f1998d1 100644
--- a/libbindgen/tests/expectations/tests/what_is_going_on.rs
+++ b/tests/expectations/tests/what_is_going_on.rs
diff --git a/libbindgen/tests/expectations/tests/whitelist-namespaces-basic.rs b/tests/expectations/tests/whitelist-namespaces-basic.rs
index cbb12f6b..cbb12f6b 100644
--- a/libbindgen/tests/expectations/tests/whitelist-namespaces-basic.rs
+++ b/tests/expectations/tests/whitelist-namespaces-basic.rs
diff --git a/libbindgen/tests/expectations/tests/whitelist-namespaces.rs b/tests/expectations/tests/whitelist-namespaces.rs
index bc257af6..bc257af6 100644
--- a/libbindgen/tests/expectations/tests/whitelist-namespaces.rs
+++ b/tests/expectations/tests/whitelist-namespaces.rs
diff --git a/libbindgen/tests/expectations/tests/whitelist_basic.rs b/tests/expectations/tests/whitelist_basic.rs
index 0104f049..0104f049 100644
--- a/libbindgen/tests/expectations/tests/whitelist_basic.rs
+++ b/tests/expectations/tests/whitelist_basic.rs
diff --git a/libbindgen/tests/expectations/tests/whitelist_fix.rs b/tests/expectations/tests/whitelist_fix.rs
index 9e26e1be..9e26e1be 100644
--- a/libbindgen/tests/expectations/tests/whitelist_fix.rs
+++ b/tests/expectations/tests/whitelist_fix.rs
diff --git a/libbindgen/tests/expectations/tests/whitelist_vars.rs b/tests/expectations/tests/whitelist_vars.rs
index f7af24b2..f7af24b2 100644
--- a/libbindgen/tests/expectations/tests/whitelist_vars.rs
+++ b/tests/expectations/tests/whitelist_vars.rs
diff --git a/libbindgen/tests/headers/accessors.hpp b/tests/headers/accessors.hpp
index 4c23e35d..4c23e35d 100644
--- a/libbindgen/tests/headers/accessors.hpp
+++ b/tests/headers/accessors.hpp
diff --git a/libbindgen/tests/headers/annotation_hide.hpp b/tests/headers/annotation_hide.hpp
index 3c82c9a2..3c82c9a2 100644
--- a/libbindgen/tests/headers/annotation_hide.hpp
+++ b/tests/headers/annotation_hide.hpp
diff --git a/libbindgen/tests/headers/anon_enum.hpp b/tests/headers/anon_enum.hpp
index 1961fe6c..1961fe6c 100644
--- a/libbindgen/tests/headers/anon_enum.hpp
+++ b/tests/headers/anon_enum.hpp
diff --git a/libbindgen/tests/headers/anon_enum_trait.hpp b/tests/headers/anon_enum_trait.hpp
index e1ec394c..e1ec394c 100644
--- a/libbindgen/tests/headers/anon_enum_trait.hpp
+++ b/tests/headers/anon_enum_trait.hpp
diff --git a/libbindgen/tests/headers/anon_enum_whitelist.h b/tests/headers/anon_enum_whitelist.h
index 15cda6b1..15cda6b1 100644
--- a/libbindgen/tests/headers/anon_enum_whitelist.h
+++ b/tests/headers/anon_enum_whitelist.h
diff --git a/libbindgen/tests/headers/anon_union.hpp b/tests/headers/anon_union.hpp
index 126f6a6e..126f6a6e 100644
--- a/libbindgen/tests/headers/anon_union.hpp
+++ b/tests/headers/anon_union.hpp
diff --git a/libbindgen/tests/headers/arg_keyword.hpp b/tests/headers/arg_keyword.hpp
index 9f0af850..9f0af850 100644
--- a/libbindgen/tests/headers/arg_keyword.hpp
+++ b/tests/headers/arg_keyword.hpp
diff --git a/libbindgen/tests/headers/auto.hpp b/tests/headers/auto.hpp
index b5f6d5f3..b5f6d5f3 100644
--- a/libbindgen/tests/headers/auto.hpp
+++ b/tests/headers/auto.hpp
diff --git a/libbindgen/tests/headers/bad-namespace-parenthood-inheritance.hpp b/tests/headers/bad-namespace-parenthood-inheritance.hpp
index ce21a401..ce21a401 100644
--- a/libbindgen/tests/headers/bad-namespace-parenthood-inheritance.hpp
+++ b/tests/headers/bad-namespace-parenthood-inheritance.hpp
diff --git a/libbindgen/tests/headers/base-to-derived.hpp b/tests/headers/base-to-derived.hpp
index ea31e0f2..ea31e0f2 100644
--- a/libbindgen/tests/headers/base-to-derived.hpp
+++ b/tests/headers/base-to-derived.hpp
diff --git a/libbindgen/tests/headers/bitfield-enum-basic.hpp b/tests/headers/bitfield-enum-basic.hpp
index 364bebf2..364bebf2 100644
--- a/libbindgen/tests/headers/bitfield-enum-basic.hpp
+++ b/tests/headers/bitfield-enum-basic.hpp
diff --git a/libbindgen/tests/headers/bitfield_method_mangling.h b/tests/headers/bitfield_method_mangling.h
index 257648ee..257648ee 100644
--- a/libbindgen/tests/headers/bitfield_method_mangling.h
+++ b/tests/headers/bitfield_method_mangling.h
diff --git a/libbindgen/tests/headers/blocks.h b/tests/headers/blocks.h
index 80420e6e..80420e6e 100644
--- a/libbindgen/tests/headers/blocks.h
+++ b/tests/headers/blocks.h
diff --git a/libbindgen/tests/headers/canonical_path_without_namespacing.hpp b/tests/headers/canonical_path_without_namespacing.hpp
index 92e85842..92e85842 100644
--- a/libbindgen/tests/headers/canonical_path_without_namespacing.hpp
+++ b/tests/headers/canonical_path_without_namespacing.hpp
diff --git a/libbindgen/tests/headers/class.hpp b/tests/headers/class.hpp
index e753f186..e753f186 100644
--- a/libbindgen/tests/headers/class.hpp
+++ b/tests/headers/class.hpp
diff --git a/libbindgen/tests/headers/class_nested.hpp b/tests/headers/class_nested.hpp
index ab38d500..ab38d500 100644
--- a/libbindgen/tests/headers/class_nested.hpp
+++ b/tests/headers/class_nested.hpp
diff --git a/libbindgen/tests/headers/class_no_members.hpp b/tests/headers/class_no_members.hpp
index a4483558..a4483558 100644
--- a/libbindgen/tests/headers/class_no_members.hpp
+++ b/tests/headers/class_no_members.hpp
diff --git a/libbindgen/tests/headers/class_static.hpp b/tests/headers/class_static.hpp
index 21ab2321..21ab2321 100644
--- a/libbindgen/tests/headers/class_static.hpp
+++ b/tests/headers/class_static.hpp
diff --git a/libbindgen/tests/headers/class_static_const.hpp b/tests/headers/class_static_const.hpp
index 150afe8b..150afe8b 100644
--- a/libbindgen/tests/headers/class_static_const.hpp
+++ b/tests/headers/class_static_const.hpp
diff --git a/libbindgen/tests/headers/class_use_as.hpp b/tests/headers/class_use_as.hpp
index a4e36ded..a4e36ded 100644
--- a/libbindgen/tests/headers/class_use_as.hpp
+++ b/tests/headers/class_use_as.hpp
diff --git a/libbindgen/tests/headers/class_with_dtor.hpp b/tests/headers/class_with_dtor.hpp
index b9bf74e1..b9bf74e1 100644
--- a/libbindgen/tests/headers/class_with_dtor.hpp
+++ b/tests/headers/class_with_dtor.hpp
diff --git a/libbindgen/tests/headers/class_with_inner_struct.hpp b/tests/headers/class_with_inner_struct.hpp
index ec729fe6..ec729fe6 100644
--- a/libbindgen/tests/headers/class_with_inner_struct.hpp
+++ b/tests/headers/class_with_inner_struct.hpp
diff --git a/libbindgen/tests/headers/class_with_typedef.hpp b/tests/headers/class_with_typedef.hpp
index 8707cffe..8707cffe 100644
--- a/libbindgen/tests/headers/class_with_typedef.hpp
+++ b/tests/headers/class_with_typedef.hpp
diff --git a/libbindgen/tests/headers/complex.h b/tests/headers/complex.h
index 04877a4e..04877a4e 100644
--- a/libbindgen/tests/headers/complex.h
+++ b/tests/headers/complex.h
diff --git a/libbindgen/tests/headers/complex_global.h b/tests/headers/complex_global.h
index d9f9fb01..d9f9fb01 100644
--- a/libbindgen/tests/headers/complex_global.h
+++ b/tests/headers/complex_global.h
diff --git a/libbindgen/tests/headers/const_bool.hpp b/tests/headers/const_bool.hpp
index 633a7c90..633a7c90 100644
--- a/libbindgen/tests/headers/const_bool.hpp
+++ b/tests/headers/const_bool.hpp
diff --git a/libbindgen/tests/headers/const_enum_unnamed.hpp b/tests/headers/const_enum_unnamed.hpp
index eb139434..eb139434 100644
--- a/libbindgen/tests/headers/const_enum_unnamed.hpp
+++ b/tests/headers/const_enum_unnamed.hpp
diff --git a/libbindgen/tests/headers/const_ptr.hpp b/tests/headers/const_ptr.hpp
index 66744f8b..66744f8b 100644
--- a/libbindgen/tests/headers/const_ptr.hpp
+++ b/tests/headers/const_ptr.hpp
diff --git a/libbindgen/tests/headers/const_resolved_ty.h b/tests/headers/const_resolved_ty.h
index 2521e61c..2521e61c 100644
--- a/libbindgen/tests/headers/const_resolved_ty.h
+++ b/tests/headers/const_resolved_ty.h
diff --git a/libbindgen/tests/headers/const_tparam.hpp b/tests/headers/const_tparam.hpp
index 05f26e4a..05f26e4a 100644
--- a/libbindgen/tests/headers/const_tparam.hpp
+++ b/tests/headers/const_tparam.hpp
diff --git a/libbindgen/tests/headers/constant-evaluate.h b/tests/headers/constant-evaluate.h
index f9f1fa66..f9f1fa66 100644
--- a/libbindgen/tests/headers/constant-evaluate.h
+++ b/tests/headers/constant-evaluate.h
diff --git a/libbindgen/tests/headers/constify-enum.h b/tests/headers/constify-enum.h
index a5b4052c..a5b4052c 100644
--- a/libbindgen/tests/headers/constify-enum.h
+++ b/tests/headers/constify-enum.h
diff --git a/libbindgen/tests/headers/constructor-tp.hpp b/tests/headers/constructor-tp.hpp
index 6e55ea78..6e55ea78 100644
--- a/libbindgen/tests/headers/constructor-tp.hpp
+++ b/tests/headers/constructor-tp.hpp
diff --git a/libbindgen/tests/headers/constructors.hpp b/tests/headers/constructors.hpp
index d4174889..d4174889 100644
--- a/libbindgen/tests/headers/constructors.hpp
+++ b/tests/headers/constructors.hpp
diff --git a/libbindgen/tests/headers/convert-floats.h b/tests/headers/convert-floats.h
index 08d9fe0b..08d9fe0b 100644
--- a/libbindgen/tests/headers/convert-floats.h
+++ b/tests/headers/convert-floats.h
diff --git a/libbindgen/tests/headers/crtp.hpp b/tests/headers/crtp.hpp
index a5477c54..a5477c54 100644
--- a/libbindgen/tests/headers/crtp.hpp
+++ b/tests/headers/crtp.hpp
diff --git a/libbindgen/tests/headers/dash_language.h b/tests/headers/dash_language.h
index 4c8bb58d..4c8bb58d 100644
--- a/libbindgen/tests/headers/dash_language.h
+++ b/tests/headers/dash_language.h
diff --git a/libbindgen/tests/headers/decl_extern_int_twice.h b/tests/headers/decl_extern_int_twice.h
index 06f80e87..06f80e87 100644
--- a/libbindgen/tests/headers/decl_extern_int_twice.h
+++ b/tests/headers/decl_extern_int_twice.h
diff --git a/libbindgen/tests/headers/decl_ptr_to_array.h b/tests/headers/decl_ptr_to_array.h
index 3222cbd4..3222cbd4 100644
--- a/libbindgen/tests/headers/decl_ptr_to_array.h
+++ b/tests/headers/decl_ptr_to_array.h
diff --git a/libbindgen/tests/headers/disable-namespacing.hpp b/tests/headers/disable-namespacing.hpp
index 11191361..11191361 100644
--- a/libbindgen/tests/headers/disable-namespacing.hpp
+++ b/tests/headers/disable-namespacing.hpp
diff --git a/libbindgen/tests/headers/duplicated-namespaces-definitions.hpp b/tests/headers/duplicated-namespaces-definitions.hpp
index 7c8888de..7c8888de 100644
--- a/libbindgen/tests/headers/duplicated-namespaces-definitions.hpp
+++ b/tests/headers/duplicated-namespaces-definitions.hpp
diff --git a/libbindgen/tests/headers/duplicated-namespaces.hpp b/tests/headers/duplicated-namespaces.hpp
index 10e1933f..10e1933f 100644
--- a/libbindgen/tests/headers/duplicated-namespaces.hpp
+++ b/tests/headers/duplicated-namespaces.hpp
diff --git a/libbindgen/tests/headers/duplicated_constants_in_ns.hpp b/tests/headers/duplicated_constants_in_ns.hpp
index bb343641..bb343641 100644
--- a/libbindgen/tests/headers/duplicated_constants_in_ns.hpp
+++ b/tests/headers/duplicated_constants_in_ns.hpp
diff --git a/libbindgen/tests/headers/elaborated.hpp b/tests/headers/elaborated.hpp
index 4bfbff23..4bfbff23 100644
--- a/libbindgen/tests/headers/elaborated.hpp
+++ b/tests/headers/elaborated.hpp
diff --git a/libbindgen/tests/headers/empty_template_param_name.hpp b/tests/headers/empty_template_param_name.hpp
index 0e9f3c34..0e9f3c34 100644
--- a/libbindgen/tests/headers/empty_template_param_name.hpp
+++ b/tests/headers/empty_template_param_name.hpp
diff --git a/libbindgen/tests/headers/enum.h b/tests/headers/enum.h
index f2d301e7..f2d301e7 100644
--- a/libbindgen/tests/headers/enum.h
+++ b/tests/headers/enum.h
diff --git a/libbindgen/tests/headers/enum_alias.hpp b/tests/headers/enum_alias.hpp
index 658f8fde..658f8fde 100644
--- a/libbindgen/tests/headers/enum_alias.hpp
+++ b/tests/headers/enum_alias.hpp
diff --git a/libbindgen/tests/headers/enum_and_vtable_mangling.hpp b/tests/headers/enum_and_vtable_mangling.hpp
index 3abd6a29..3abd6a29 100644
--- a/libbindgen/tests/headers/enum_and_vtable_mangling.hpp
+++ b/tests/headers/enum_and_vtable_mangling.hpp
diff --git a/libbindgen/tests/headers/enum_dupe.h b/tests/headers/enum_dupe.h
index 6d3591d5..6d3591d5 100644
--- a/libbindgen/tests/headers/enum_dupe.h
+++ b/tests/headers/enum_dupe.h
diff --git a/libbindgen/tests/headers/enum_explicit_type.hpp b/tests/headers/enum_explicit_type.hpp
index 78eadd40..78eadd40 100644
--- a/libbindgen/tests/headers/enum_explicit_type.hpp
+++ b/tests/headers/enum_explicit_type.hpp
diff --git a/libbindgen/tests/headers/enum_in_template_with_typedef.hpp b/tests/headers/enum_in_template_with_typedef.hpp
index ac19b781..ac19b781 100644
--- a/libbindgen/tests/headers/enum_in_template_with_typedef.hpp
+++ b/tests/headers/enum_in_template_with_typedef.hpp
diff --git a/libbindgen/tests/headers/enum_negative.h b/tests/headers/enum_negative.h
index 6cbdfe04..6cbdfe04 100644
--- a/libbindgen/tests/headers/enum_negative.h
+++ b/tests/headers/enum_negative.h
diff --git a/libbindgen/tests/headers/enum_packed.h b/tests/headers/enum_packed.h
index 8654d110..8654d110 100644
--- a/libbindgen/tests/headers/enum_packed.h
+++ b/tests/headers/enum_packed.h
diff --git a/libbindgen/tests/headers/eval-variadic-template-parameter.hpp b/tests/headers/eval-variadic-template-parameter.hpp
index 0a9e51c1..0a9e51c1 100644
--- a/libbindgen/tests/headers/eval-variadic-template-parameter.hpp
+++ b/tests/headers/eval-variadic-template-parameter.hpp
diff --git a/libbindgen/tests/headers/extern.hpp b/tests/headers/extern.hpp
index 0779e038..0779e038 100644
--- a/libbindgen/tests/headers/extern.hpp
+++ b/tests/headers/extern.hpp
diff --git a/libbindgen/tests/headers/float128.hpp b/tests/headers/float128.hpp
index f554e88e..f554e88e 100644
--- a/libbindgen/tests/headers/float128.hpp
+++ b/tests/headers/float128.hpp
diff --git a/libbindgen/tests/headers/forward-inherit-struct-with-fields.hpp b/tests/headers/forward-inherit-struct-with-fields.hpp
index 437fff5d..437fff5d 100644
--- a/libbindgen/tests/headers/forward-inherit-struct-with-fields.hpp
+++ b/tests/headers/forward-inherit-struct-with-fields.hpp
diff --git a/libbindgen/tests/headers/forward-inherit-struct.hpp b/tests/headers/forward-inherit-struct.hpp
index ac7aef5e..ac7aef5e 100644
--- a/libbindgen/tests/headers/forward-inherit-struct.hpp
+++ b/tests/headers/forward-inherit-struct.hpp
diff --git a/libbindgen/tests/headers/forward_declared_struct.h b/tests/headers/forward_declared_struct.h
index 2a69450c..2a69450c 100644
--- a/libbindgen/tests/headers/forward_declared_struct.h
+++ b/tests/headers/forward_declared_struct.h
diff --git a/libbindgen/tests/headers/func_proto.h b/tests/headers/func_proto.h
index 51139ca9..51139ca9 100644
--- a/libbindgen/tests/headers/func_proto.h
+++ b/tests/headers/func_proto.h
diff --git a/libbindgen/tests/headers/func_ptr.h b/tests/headers/func_ptr.h
index a4662f3d..a4662f3d 100644
--- a/libbindgen/tests/headers/func_ptr.h
+++ b/tests/headers/func_ptr.h
diff --git a/libbindgen/tests/headers/func_ptr_in_struct.h b/tests/headers/func_ptr_in_struct.h
index 988db5b3..988db5b3 100644
--- a/libbindgen/tests/headers/func_ptr_in_struct.h
+++ b/tests/headers/func_ptr_in_struct.h
diff --git a/libbindgen/tests/headers/func_with_array_arg.h b/tests/headers/func_with_array_arg.h
index 1b81702b..1b81702b 100644
--- a/libbindgen/tests/headers/func_with_array_arg.h
+++ b/tests/headers/func_with_array_arg.h
diff --git a/libbindgen/tests/headers/func_with_func_ptr_arg.h b/tests/headers/func_with_func_ptr_arg.h
index 629c84ab..629c84ab 100644
--- a/libbindgen/tests/headers/func_with_func_ptr_arg.h
+++ b/tests/headers/func_with_func_ptr_arg.h
diff --git a/libbindgen/tests/headers/in_class_typedef.hpp b/tests/headers/in_class_typedef.hpp
index dda7472d..dda7472d 100644
--- a/libbindgen/tests/headers/in_class_typedef.hpp
+++ b/tests/headers/in_class_typedef.hpp
diff --git a/libbindgen/tests/headers/inherit-namespaced.hpp b/tests/headers/inherit-namespaced.hpp
index 61eafd5a..61eafd5a 100644
--- a/libbindgen/tests/headers/inherit-namespaced.hpp
+++ b/tests/headers/inherit-namespaced.hpp
diff --git a/libbindgen/tests/headers/inherit_named.hpp b/tests/headers/inherit_named.hpp
index 9881d1b6..9881d1b6 100644
--- a/libbindgen/tests/headers/inherit_named.hpp
+++ b/tests/headers/inherit_named.hpp
diff --git a/libbindgen/tests/headers/inherit_typedef.hpp b/tests/headers/inherit_typedef.hpp
index 8d699e82..8d699e82 100644
--- a/libbindgen/tests/headers/inherit_typedef.hpp
+++ b/tests/headers/inherit_typedef.hpp
diff --git a/libbindgen/tests/headers/inline-function.h b/tests/headers/inline-function.h
index 02cb7c08..02cb7c08 100644
--- a/libbindgen/tests/headers/inline-function.h
+++ b/tests/headers/inline-function.h
diff --git a/libbindgen/tests/headers/inline_namespace.hpp b/tests/headers/inline_namespace.hpp
index 2ccf8ab0..2ccf8ab0 100644
--- a/libbindgen/tests/headers/inline_namespace.hpp
+++ b/tests/headers/inline_namespace.hpp
diff --git a/libbindgen/tests/headers/inline_namespace_conservative.hpp b/tests/headers/inline_namespace_conservative.hpp
index 50068a2e..50068a2e 100644
--- a/libbindgen/tests/headers/inline_namespace_conservative.hpp
+++ b/tests/headers/inline_namespace_conservative.hpp
diff --git a/libbindgen/tests/headers/inline_namespace_whitelist.hpp b/tests/headers/inline_namespace_whitelist.hpp
index 30047bbe..30047bbe 100644
--- a/libbindgen/tests/headers/inline_namespace_whitelist.hpp
+++ b/tests/headers/inline_namespace_whitelist.hpp
diff --git a/libbindgen/tests/headers/inner_const.hpp b/tests/headers/inner_const.hpp
index 25c2e603..25c2e603 100644
--- a/libbindgen/tests/headers/inner_const.hpp
+++ b/tests/headers/inner_const.hpp
diff --git a/libbindgen/tests/headers/inner_template_self.hpp b/tests/headers/inner_template_self.hpp
index 1ae5af06..1ae5af06 100644
--- a/libbindgen/tests/headers/inner_template_self.hpp
+++ b/tests/headers/inner_template_self.hpp
diff --git a/libbindgen/tests/headers/int128_t.h b/tests/headers/int128_t.h
index eece252c..eece252c 100644
--- a/libbindgen/tests/headers/int128_t.h
+++ b/tests/headers/int128_t.h
diff --git a/libbindgen/tests/headers/issue-358.hpp b/tests/headers/issue-358.hpp
index b14521b7..b14521b7 100644
--- a/libbindgen/tests/headers/issue-358.hpp
+++ b/tests/headers/issue-358.hpp
diff --git a/libbindgen/tests/headers/issue-372.hpp b/tests/headers/issue-372.hpp
index a072f061..a072f061 100644
--- a/libbindgen/tests/headers/issue-372.hpp
+++ b/tests/headers/issue-372.hpp
diff --git a/libbindgen/tests/headers/issue_311.hpp b/tests/headers/issue_311.hpp
index a8d7fd99..a8d7fd99 100644
--- a/libbindgen/tests/headers/issue_311.hpp
+++ b/tests/headers/issue_311.hpp
diff --git a/libbindgen/tests/headers/issue_315.hpp b/tests/headers/issue_315.hpp
index e58cb5e3..e58cb5e3 100644
--- a/libbindgen/tests/headers/issue_315.hpp
+++ b/tests/headers/issue_315.hpp
diff --git a/libbindgen/tests/headers/jsval_layout_opaque.hpp b/tests/headers/jsval_layout_opaque.hpp
index 85c5be63..85c5be63 100644
--- a/libbindgen/tests/headers/jsval_layout_opaque.hpp
+++ b/tests/headers/jsval_layout_opaque.hpp
diff --git a/libbindgen/tests/headers/keywords.h b/tests/headers/keywords.h
index 8699ce5f..8699ce5f 100644
--- a/libbindgen/tests/headers/keywords.h
+++ b/tests/headers/keywords.h
diff --git a/libbindgen/tests/headers/macro-expr-basic.h b/tests/headers/macro-expr-basic.h
index d2de7fdf..d2de7fdf 100644
--- a/libbindgen/tests/headers/macro-expr-basic.h
+++ b/tests/headers/macro-expr-basic.h
diff --git a/libbindgen/tests/headers/macro-redef.h b/tests/headers/macro-redef.h
index 0180d2ab..0180d2ab 100644
--- a/libbindgen/tests/headers/macro-redef.h
+++ b/tests/headers/macro-redef.h
diff --git a/libbindgen/tests/headers/macro_const.h b/tests/headers/macro_const.h
index c28a3f6b..c28a3f6b 100644
--- a/libbindgen/tests/headers/macro_const.h
+++ b/tests/headers/macro_const.h
diff --git a/libbindgen/tests/headers/maddness-is-avoidable.hpp b/tests/headers/maddness-is-avoidable.hpp
index 46d7495e..46d7495e 100644
--- a/libbindgen/tests/headers/maddness-is-avoidable.hpp
+++ b/tests/headers/maddness-is-avoidable.hpp
diff --git a/libbindgen/tests/headers/method-mangling.hpp b/tests/headers/method-mangling.hpp
index 0dac4975..0dac4975 100644
--- a/libbindgen/tests/headers/method-mangling.hpp
+++ b/tests/headers/method-mangling.hpp
diff --git a/libbindgen/tests/headers/module-whitelisted.hpp b/tests/headers/module-whitelisted.hpp
index f41e874e..f41e874e 100644
--- a/libbindgen/tests/headers/module-whitelisted.hpp
+++ b/tests/headers/module-whitelisted.hpp
diff --git a/libbindgen/tests/headers/msvc-no-usr.hpp b/tests/headers/msvc-no-usr.hpp
index b15e49f5..b15e49f5 100644
--- a/libbindgen/tests/headers/msvc-no-usr.hpp
+++ b/tests/headers/msvc-no-usr.hpp
diff --git a/libbindgen/tests/headers/multiple-inherit-empty-correct-layout.hpp b/tests/headers/multiple-inherit-empty-correct-layout.hpp
index 1e2b133a..1e2b133a 100644
--- a/libbindgen/tests/headers/multiple-inherit-empty-correct-layout.hpp
+++ b/tests/headers/multiple-inherit-empty-correct-layout.hpp
diff --git a/libbindgen/tests/headers/mutable.hpp b/tests/headers/mutable.hpp
index b61a1031..b61a1031 100644
--- a/libbindgen/tests/headers/mutable.hpp
+++ b/tests/headers/mutable.hpp
diff --git a/libbindgen/tests/headers/namespace.hpp b/tests/headers/namespace.hpp
index 65788539..65788539 100644
--- a/libbindgen/tests/headers/namespace.hpp
+++ b/tests/headers/namespace.hpp
diff --git a/libbindgen/tests/headers/nested.hpp b/tests/headers/nested.hpp
index 299e1768..299e1768 100644
--- a/libbindgen/tests/headers/nested.hpp
+++ b/tests/headers/nested.hpp
diff --git a/libbindgen/tests/headers/nested_vtable.hpp b/tests/headers/nested_vtable.hpp
index 87d6ce1f..87d6ce1f 100644
--- a/libbindgen/tests/headers/nested_vtable.hpp
+++ b/tests/headers/nested_vtable.hpp
diff --git a/libbindgen/tests/headers/nested_within_namespace.hpp b/tests/headers/nested_within_namespace.hpp
index a9b7c1ec..a9b7c1ec 100644
--- a/libbindgen/tests/headers/nested_within_namespace.hpp
+++ b/tests/headers/nested_within_namespace.hpp
diff --git a/libbindgen/tests/headers/no-std.h b/tests/headers/no-std.h
index 7bee9657..7bee9657 100644
--- a/libbindgen/tests/headers/no-std.h
+++ b/tests/headers/no-std.h
diff --git a/libbindgen/tests/headers/no_copy.hpp b/tests/headers/no_copy.hpp
index 349e428e..349e428e 100644
--- a/libbindgen/tests/headers/no_copy.hpp
+++ b/tests/headers/no_copy.hpp
diff --git a/libbindgen/tests/headers/nsStyleAutoArray.hpp b/tests/headers/nsStyleAutoArray.hpp
index 950152c0..950152c0 100644
--- a/libbindgen/tests/headers/nsStyleAutoArray.hpp
+++ b/tests/headers/nsStyleAutoArray.hpp
diff --git a/libbindgen/tests/headers/only_bitfields.hpp b/tests/headers/only_bitfields.hpp
index 84db0586..84db0586 100644
--- a/libbindgen/tests/headers/only_bitfields.hpp
+++ b/tests/headers/only_bitfields.hpp
diff --git a/libbindgen/tests/headers/opaque-tracing.hpp b/tests/headers/opaque-tracing.hpp
index 7356245e..7356245e 100644
--- a/libbindgen/tests/headers/opaque-tracing.hpp
+++ b/tests/headers/opaque-tracing.hpp
diff --git a/libbindgen/tests/headers/opaque_in_struct.hpp b/tests/headers/opaque_in_struct.hpp
index 3cffeb20..3cffeb20 100644
--- a/libbindgen/tests/headers/opaque_in_struct.hpp
+++ b/tests/headers/opaque_in_struct.hpp
diff --git a/libbindgen/tests/headers/opaque_pointer.hpp b/tests/headers/opaque_pointer.hpp
index 53f8ce1f..53f8ce1f 100644
--- a/libbindgen/tests/headers/opaque_pointer.hpp
+++ b/tests/headers/opaque_pointer.hpp
diff --git a/libbindgen/tests/headers/opaque_typedef.hpp b/tests/headers/opaque_typedef.hpp
index 25640738..25640738 100644
--- a/libbindgen/tests/headers/opaque_typedef.hpp
+++ b/tests/headers/opaque_typedef.hpp
diff --git a/libbindgen/tests/headers/overflowed_enum.hpp b/tests/headers/overflowed_enum.hpp
index 1f2075a5..1f2075a5 100644
--- a/libbindgen/tests/headers/overflowed_enum.hpp
+++ b/tests/headers/overflowed_enum.hpp
diff --git a/libbindgen/tests/headers/overloading.hpp b/tests/headers/overloading.hpp
index 3c2b0487..3c2b0487 100644
--- a/libbindgen/tests/headers/overloading.hpp
+++ b/tests/headers/overloading.hpp
diff --git a/libbindgen/tests/headers/private.hpp b/tests/headers/private.hpp
index c0f3ce7f..c0f3ce7f 100644
--- a/libbindgen/tests/headers/private.hpp
+++ b/tests/headers/private.hpp
diff --git a/libbindgen/tests/headers/public-dtor.hpp b/tests/headers/public-dtor.hpp
index 5d4fb592..5d4fb592 100644
--- a/libbindgen/tests/headers/public-dtor.hpp
+++ b/tests/headers/public-dtor.hpp
diff --git a/libbindgen/tests/headers/redeclaration.hpp b/tests/headers/redeclaration.hpp
index d536b158..d536b158 100644
--- a/libbindgen/tests/headers/redeclaration.hpp
+++ b/tests/headers/redeclaration.hpp
diff --git a/libbindgen/tests/headers/ref_argument_array.hpp b/tests/headers/ref_argument_array.hpp
index dc73fd62..dc73fd62 100644
--- a/libbindgen/tests/headers/ref_argument_array.hpp
+++ b/tests/headers/ref_argument_array.hpp
diff --git a/libbindgen/tests/headers/reparented_replacement.hpp b/tests/headers/reparented_replacement.hpp
index 4ac2bf03..4ac2bf03 100644
--- a/libbindgen/tests/headers/reparented_replacement.hpp
+++ b/tests/headers/reparented_replacement.hpp
diff --git a/libbindgen/tests/headers/replace_template_alias.hpp b/tests/headers/replace_template_alias.hpp
index c325b5a3..c325b5a3 100644
--- a/libbindgen/tests/headers/replace_template_alias.hpp
+++ b/tests/headers/replace_template_alias.hpp
diff --git a/libbindgen/tests/headers/replace_use.hpp b/tests/headers/replace_use.hpp
index de44eb19..de44eb19 100644
--- a/libbindgen/tests/headers/replace_use.hpp
+++ b/tests/headers/replace_use.hpp
diff --git a/libbindgen/tests/headers/replaces_double.hpp b/tests/headers/replaces_double.hpp
index 1a78b0d9..1a78b0d9 100644
--- a/libbindgen/tests/headers/replaces_double.hpp
+++ b/tests/headers/replaces_double.hpp
diff --git a/libbindgen/tests/headers/resolved_type_def_function.h b/tests/headers/resolved_type_def_function.h
index 139b8c3e..139b8c3e 100644
--- a/libbindgen/tests/headers/resolved_type_def_function.h
+++ b/tests/headers/resolved_type_def_function.h
diff --git a/libbindgen/tests/headers/same_struct_name_in_different_namespaces.hpp b/tests/headers/same_struct_name_in_different_namespaces.hpp
index fe685845..fe685845 100644
--- a/libbindgen/tests/headers/same_struct_name_in_different_namespaces.hpp
+++ b/tests/headers/same_struct_name_in_different_namespaces.hpp
diff --git a/libbindgen/tests/headers/size_t_template.hpp b/tests/headers/size_t_template.hpp
index 6045c698..6045c698 100644
--- a/libbindgen/tests/headers/size_t_template.hpp
+++ b/tests/headers/size_t_template.hpp
diff --git a/libbindgen/tests/headers/struct_containing_forward_declared_struct.h b/tests/headers/struct_containing_forward_declared_struct.h
index d38aca2f..d38aca2f 100644
--- a/libbindgen/tests/headers/struct_containing_forward_declared_struct.h
+++ b/tests/headers/struct_containing_forward_declared_struct.h
diff --git a/libbindgen/tests/headers/struct_with_anon_struct.h b/tests/headers/struct_with_anon_struct.h
index 1617d7a8..1617d7a8 100644
--- a/libbindgen/tests/headers/struct_with_anon_struct.h
+++ b/tests/headers/struct_with_anon_struct.h
diff --git a/libbindgen/tests/headers/struct_with_anon_struct_array.h b/tests/headers/struct_with_anon_struct_array.h
index 9ea977e8..9ea977e8 100644
--- a/libbindgen/tests/headers/struct_with_anon_struct_array.h
+++ b/tests/headers/struct_with_anon_struct_array.h
diff --git a/libbindgen/tests/headers/struct_with_anon_struct_pointer.h b/tests/headers/struct_with_anon_struct_pointer.h
index 0c486d84..0c486d84 100644
--- a/libbindgen/tests/headers/struct_with_anon_struct_pointer.h
+++ b/tests/headers/struct_with_anon_struct_pointer.h
diff --git a/libbindgen/tests/headers/struct_with_anon_union.h b/tests/headers/struct_with_anon_union.h
index 3a92b940..3a92b940 100644
--- a/libbindgen/tests/headers/struct_with_anon_union.h
+++ b/tests/headers/struct_with_anon_union.h
diff --git a/libbindgen/tests/headers/struct_with_anon_unnamed_struct.h b/tests/headers/struct_with_anon_unnamed_struct.h
index f8ac4225..f8ac4225 100644
--- a/libbindgen/tests/headers/struct_with_anon_unnamed_struct.h
+++ b/tests/headers/struct_with_anon_unnamed_struct.h
diff --git a/libbindgen/tests/headers/struct_with_anon_unnamed_union.h b/tests/headers/struct_with_anon_unnamed_union.h
index 7158e727..7158e727 100644
--- a/libbindgen/tests/headers/struct_with_anon_unnamed_union.h
+++ b/tests/headers/struct_with_anon_unnamed_union.h
diff --git a/libbindgen/tests/headers/struct_with_bitfields.h b/tests/headers/struct_with_bitfields.h
index 107fb136..107fb136 100644
--- a/libbindgen/tests/headers/struct_with_bitfields.h
+++ b/tests/headers/struct_with_bitfields.h
diff --git a/libbindgen/tests/headers/struct_with_derive_debug.h b/tests/headers/struct_with_derive_debug.h
index 98ba1b3d..98ba1b3d 100644
--- a/libbindgen/tests/headers/struct_with_derive_debug.h
+++ b/tests/headers/struct_with_derive_debug.h
diff --git a/libbindgen/tests/headers/struct_with_nesting.h b/tests/headers/struct_with_nesting.h
index 9d7fa176..9d7fa176 100644
--- a/libbindgen/tests/headers/struct_with_nesting.h
+++ b/tests/headers/struct_with_nesting.h
diff --git a/libbindgen/tests/headers/struct_with_packing.h b/tests/headers/struct_with_packing.h
index 1b9fe131..1b9fe131 100644
--- a/libbindgen/tests/headers/struct_with_packing.h
+++ b/tests/headers/struct_with_packing.h
diff --git a/libbindgen/tests/headers/struct_with_struct.h b/tests/headers/struct_with_struct.h
index 78b1cc81..78b1cc81 100644
--- a/libbindgen/tests/headers/struct_with_struct.h
+++ b/tests/headers/struct_with_struct.h
diff --git a/libbindgen/tests/headers/struct_with_typedef_template_arg.hpp b/tests/headers/struct_with_typedef_template_arg.hpp
index 7fed21ab..7fed21ab 100644
--- a/libbindgen/tests/headers/struct_with_typedef_template_arg.hpp
+++ b/tests/headers/struct_with_typedef_template_arg.hpp
diff --git a/libbindgen/tests/headers/template.hpp b/tests/headers/template.hpp
index c13643c3..c13643c3 100644
--- a/libbindgen/tests/headers/template.hpp
+++ b/tests/headers/template.hpp
diff --git a/libbindgen/tests/headers/template_alias.hpp b/tests/headers/template_alias.hpp
index 646d9f40..646d9f40 100644
--- a/libbindgen/tests/headers/template_alias.hpp
+++ b/tests/headers/template_alias.hpp
diff --git a/libbindgen/tests/headers/template_alias_basic.hpp b/tests/headers/template_alias_basic.hpp
index 964f6e27..964f6e27 100644
--- a/libbindgen/tests/headers/template_alias_basic.hpp
+++ b/tests/headers/template_alias_basic.hpp
diff --git a/libbindgen/tests/headers/template_alias_namespace.hpp b/tests/headers/template_alias_namespace.hpp
index bd637166..bd637166 100644
--- a/libbindgen/tests/headers/template_alias_namespace.hpp
+++ b/tests/headers/template_alias_namespace.hpp
diff --git a/libbindgen/tests/headers/template_typedef_transitive_param.hpp b/tests/headers/template_typedef_transitive_param.hpp
index 2269ac36..2269ac36 100644
--- a/libbindgen/tests/headers/template_typedef_transitive_param.hpp
+++ b/tests/headers/template_typedef_transitive_param.hpp
diff --git a/libbindgen/tests/headers/template_typedefs.hpp b/tests/headers/template_typedefs.hpp
index 5e13dcd8..5e13dcd8 100644
--- a/libbindgen/tests/headers/template_typedefs.hpp
+++ b/tests/headers/template_typedefs.hpp
diff --git a/libbindgen/tests/headers/templateref_opaque.hpp b/tests/headers/templateref_opaque.hpp
index ca154c34..ca154c34 100644
--- a/libbindgen/tests/headers/templateref_opaque.hpp
+++ b/tests/headers/templateref_opaque.hpp
diff --git a/libbindgen/tests/headers/type-referenced-by-whitelisted-function.h b/tests/headers/type-referenced-by-whitelisted-function.h
index 86b00303..86b00303 100644
--- a/libbindgen/tests/headers/type-referenced-by-whitelisted-function.h
+++ b/tests/headers/type-referenced-by-whitelisted-function.h
diff --git a/libbindgen/tests/headers/type_alias_empty.hpp b/tests/headers/type_alias_empty.hpp
index f0760c8f..f0760c8f 100644
--- a/libbindgen/tests/headers/type_alias_empty.hpp
+++ b/tests/headers/type_alias_empty.hpp
diff --git a/libbindgen/tests/headers/type_alias_partial_template_especialization.hpp b/tests/headers/type_alias_partial_template_especialization.hpp
index dfc36786..dfc36786 100644
--- a/libbindgen/tests/headers/type_alias_partial_template_especialization.hpp
+++ b/tests/headers/type_alias_partial_template_especialization.hpp
diff --git a/libbindgen/tests/headers/type_alias_template_specialized.hpp b/tests/headers/type_alias_template_specialized.hpp
index a2d32b56..a2d32b56 100644
--- a/libbindgen/tests/headers/type_alias_template_specialized.hpp
+++ b/tests/headers/type_alias_template_specialized.hpp
diff --git a/libbindgen/tests/headers/typedefd-array-as-function-arg.h b/tests/headers/typedefd-array-as-function-arg.h
index 93790591..93790591 100644
--- a/libbindgen/tests/headers/typedefd-array-as-function-arg.h
+++ b/tests/headers/typedefd-array-as-function-arg.h
diff --git a/libbindgen/tests/headers/typeref.hpp b/tests/headers/typeref.hpp
index b94c98ef..b94c98ef 100644
--- a/libbindgen/tests/headers/typeref.hpp
+++ b/tests/headers/typeref.hpp
diff --git a/libbindgen/tests/headers/union-in-ns.hpp b/tests/headers/union-in-ns.hpp
index 68b8f72d..68b8f72d 100644
--- a/libbindgen/tests/headers/union-in-ns.hpp
+++ b/tests/headers/union-in-ns.hpp
diff --git a/libbindgen/tests/headers/union_dtor.hpp b/tests/headers/union_dtor.hpp
index 399dc89d..399dc89d 100644
--- a/libbindgen/tests/headers/union_dtor.hpp
+++ b/tests/headers/union_dtor.hpp
diff --git a/libbindgen/tests/headers/union_fields.hpp b/tests/headers/union_fields.hpp
index aec3a7fd..aec3a7fd 100644
--- a/libbindgen/tests/headers/union_fields.hpp
+++ b/tests/headers/union_fields.hpp
diff --git a/libbindgen/tests/headers/union_template.hpp b/tests/headers/union_template.hpp
index 0d0a9bb3..0d0a9bb3 100644
--- a/libbindgen/tests/headers/union_template.hpp
+++ b/tests/headers/union_template.hpp
diff --git a/libbindgen/tests/headers/union_with_anon_struct.h b/tests/headers/union_with_anon_struct.h
index 7f8dec95..7f8dec95 100644
--- a/libbindgen/tests/headers/union_with_anon_struct.h
+++ b/tests/headers/union_with_anon_struct.h
diff --git a/libbindgen/tests/headers/union_with_anon_struct_bitfield.h b/tests/headers/union_with_anon_struct_bitfield.h
index 24c7dce8..24c7dce8 100644
--- a/libbindgen/tests/headers/union_with_anon_struct_bitfield.h
+++ b/tests/headers/union_with_anon_struct_bitfield.h
diff --git a/libbindgen/tests/headers/union_with_anon_union.h b/tests/headers/union_with_anon_union.h
index 212431b8..212431b8 100644
--- a/libbindgen/tests/headers/union_with_anon_union.h
+++ b/tests/headers/union_with_anon_union.h
diff --git a/libbindgen/tests/headers/union_with_anon_unnamed_struct.h b/tests/headers/union_with_anon_unnamed_struct.h
index 79558049..79558049 100644
--- a/libbindgen/tests/headers/union_with_anon_unnamed_struct.h
+++ b/tests/headers/union_with_anon_unnamed_struct.h
diff --git a/libbindgen/tests/headers/union_with_anon_unnamed_union.h b/tests/headers/union_with_anon_unnamed_union.h
index 7580771a..7580771a 100644
--- a/libbindgen/tests/headers/union_with_anon_unnamed_union.h
+++ b/tests/headers/union_with_anon_unnamed_union.h
diff --git a/libbindgen/tests/headers/union_with_big_member.h b/tests/headers/union_with_big_member.h
index 6347d6ca..6347d6ca 100644
--- a/libbindgen/tests/headers/union_with_big_member.h
+++ b/tests/headers/union_with_big_member.h
diff --git a/libbindgen/tests/headers/union_with_nesting.h b/tests/headers/union_with_nesting.h
index cd907d57..cd907d57 100644
--- a/libbindgen/tests/headers/union_with_nesting.h
+++ b/tests/headers/union_with_nesting.h
diff --git a/libbindgen/tests/headers/unknown_attr.h b/tests/headers/unknown_attr.h
index f87e9f0b..f87e9f0b 100644
--- a/libbindgen/tests/headers/unknown_attr.h
+++ b/tests/headers/unknown_attr.h
diff --git a/libbindgen/tests/headers/use-core.h b/tests/headers/use-core.h
index 42bb10d9..42bb10d9 100644
--- a/libbindgen/tests/headers/use-core.h
+++ b/tests/headers/use-core.h
diff --git a/libbindgen/tests/headers/using.hpp b/tests/headers/using.hpp
index ba07b9c8..ba07b9c8 100644
--- a/libbindgen/tests/headers/using.hpp
+++ b/tests/headers/using.hpp
diff --git a/libbindgen/tests/headers/var-tracing.hpp b/tests/headers/var-tracing.hpp
index 0d0b0cca..0d0b0cca 100644
--- a/libbindgen/tests/headers/var-tracing.hpp
+++ b/tests/headers/var-tracing.hpp
diff --git a/libbindgen/tests/headers/variadic-method.hpp b/tests/headers/variadic-method.hpp
index 78a8eb45..78a8eb45 100644
--- a/libbindgen/tests/headers/variadic-method.hpp
+++ b/tests/headers/variadic-method.hpp
diff --git a/libbindgen/tests/headers/variadic_template_function.hpp b/tests/headers/variadic_template_function.hpp
index 4942d8f0..4942d8f0 100644
--- a/libbindgen/tests/headers/variadic_template_function.hpp
+++ b/tests/headers/variadic_template_function.hpp
diff --git a/libbindgen/tests/headers/vector.hpp b/tests/headers/vector.hpp
index 4707f77f..4707f77f 100644
--- a/libbindgen/tests/headers/vector.hpp
+++ b/tests/headers/vector.hpp
diff --git a/libbindgen/tests/headers/virtual_dtor.hpp b/tests/headers/virtual_dtor.hpp
index c35dcab1..c35dcab1 100644
--- a/libbindgen/tests/headers/virtual_dtor.hpp
+++ b/tests/headers/virtual_dtor.hpp
diff --git a/libbindgen/tests/headers/virtual_inheritance.hpp b/tests/headers/virtual_inheritance.hpp
index 5198c51e..5198c51e 100644
--- a/libbindgen/tests/headers/virtual_inheritance.hpp
+++ b/tests/headers/virtual_inheritance.hpp
diff --git a/libbindgen/tests/headers/virtual_overloaded.hpp b/tests/headers/virtual_overloaded.hpp
index 8aea8a19..8aea8a19 100644
--- a/libbindgen/tests/headers/virtual_overloaded.hpp
+++ b/tests/headers/virtual_overloaded.hpp
diff --git a/libbindgen/tests/headers/vtable_recursive_sig.hpp b/tests/headers/vtable_recursive_sig.hpp
index 8729be00..8729be00 100644
--- a/libbindgen/tests/headers/vtable_recursive_sig.hpp
+++ b/tests/headers/vtable_recursive_sig.hpp
diff --git a/libbindgen/tests/headers/weird_bitfields.hpp b/tests/headers/weird_bitfields.hpp
index 755681c1..755681c1 100644
--- a/libbindgen/tests/headers/weird_bitfields.hpp
+++ b/tests/headers/weird_bitfields.hpp
diff --git a/libbindgen/tests/headers/what_is_going_on.hpp b/tests/headers/what_is_going_on.hpp
index 078c1ad5..078c1ad5 100644
--- a/libbindgen/tests/headers/what_is_going_on.hpp
+++ b/tests/headers/what_is_going_on.hpp
diff --git a/libbindgen/tests/headers/whitelist-namespaces-basic.hpp b/tests/headers/whitelist-namespaces-basic.hpp
index 2eaa8740..2eaa8740 100644
--- a/libbindgen/tests/headers/whitelist-namespaces-basic.hpp
+++ b/tests/headers/whitelist-namespaces-basic.hpp
diff --git a/libbindgen/tests/headers/whitelist-namespaces.hpp b/tests/headers/whitelist-namespaces.hpp
index d34cbe94..d34cbe94 100644
--- a/libbindgen/tests/headers/whitelist-namespaces.hpp
+++ b/tests/headers/whitelist-namespaces.hpp
diff --git a/libbindgen/tests/headers/whitelist_basic.hpp b/tests/headers/whitelist_basic.hpp
index 8424f75a..8424f75a 100644
--- a/libbindgen/tests/headers/whitelist_basic.hpp
+++ b/tests/headers/whitelist_basic.hpp
diff --git a/libbindgen/tests/headers/whitelist_fix.hpp b/tests/headers/whitelist_fix.hpp
index d0abda54..d0abda54 100644
--- a/libbindgen/tests/headers/whitelist_fix.hpp
+++ b/tests/headers/whitelist_fix.hpp
diff --git a/libbindgen/tests/headers/whitelist_vars.h b/tests/headers/whitelist_vars.h
index 07fa2815..07fa2815 100644
--- a/libbindgen/tests/headers/whitelist_vars.h
+++ b/tests/headers/whitelist_vars.h
diff --git a/libbindgen/tests/tests.rs b/tests/tests.rs
index 01430879..05c8ad2c 100644
--- a/libbindgen/tests/tests.rs
+++ b/tests/tests.rs
@@ -1,18 +1,19 @@
 extern crate clap;
 extern crate diff;
-extern crate libbindgen;
+extern crate bindgen;
 extern crate shlex;
 
+use bindgen::Builder;
 use std::fs;
 use std::io::{BufRead, BufReader, Error, ErrorKind, Read, Write};
 use std::path::PathBuf;
 
-#[path="../../bindgen/src/options.rs"]
+#[path="../src/options.rs"]
 mod options;
 use options::builder_from_flags;
 
 fn compare_generated_header(header: &PathBuf,
-                            builder: libbindgen::Builder)
+                            builder: Builder)
                             -> Result<(), Error> {
     let file_name = try!(header.file_name()
         .ok_or(Error::new(ErrorKind::Other, "spawn_bindgen expects a file")));
@@ -68,7 +69,7 @@ fn compare_generated_header(header: &PathBuf,
 }
 
 fn create_bindgen_builder(header: &PathBuf)
-                          -> Result<Option<libbindgen::Builder>, Error> {
+                          -> Result<Option<Builder>, Error> {
     let source = try!(fs::File::open(header));
     let reader = BufReader::new(source);
 
diff --git a/libbindgen/tests/uses/.gitignore b/tests/uses/.gitignore
index 40d7cb4c..40d7cb4c 100644
--- a/libbindgen/tests/uses/.gitignore
+++ b/tests/uses/.gitignore