diff --git a/build.rs b/build.rs
index c3277ecc9dff2f6982b2f8ca2fc440952f40dfe1..87e169583e47ffcb12d1ad72ab93c5aa681acbec 100644
--- a/build.rs
+++ b/build.rs
@@ -1,14 +1,11 @@
 #![recursion_limit = "256"]
 
 use std::env;
-use std::path::Path;
 
 pub fn main() {
-    let src_dir = Path::new(env!("CARGO_MANIFEST_DIR"));
-    let definitions_dir = src_dir.join("message_definitions");
-    let out_dir = src_dir.join("src/bindings");
+    let out_path = env::var("OUT_DIR").unwrap();
 
-    let result = mavlink_bindgen::generate(definitions_dir, out_dir)
+    let result = mavlink_bindgen::generate("message_definitions", out_path)
         .expect("Failed to generate Rust MAVLink bindings");
 
     mavlink_bindgen::format_generated_code(&result);
diff --git a/src/bindings/mod.rs b/src/bindings/mod.rs
deleted file mode 100644
index 594b93d8893589596e0284717aa3251336289631..0000000000000000000000000000000000000000
--- a/src/bindings/mod.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-#[allow(non_camel_case_types)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[allow(clippy::field_reassign_with_default)]
-#[allow(non_snake_case)]
-#[allow(clippy::unnecessary_cast)]
-#[allow(clippy::bad_bit_mask)]
-#[cfg(feature = "gemini")]
-pub mod gemini;
-#[allow(non_camel_case_types)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[allow(clippy::field_reassign_with_default)]
-#[allow(non_snake_case)]
-#[allow(clippy::unnecessary_cast)]
-#[allow(clippy::bad_bit_mask)]
-#[cfg(feature = "hermes")]
-pub mod hermes;
-#[allow(non_camel_case_types)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[allow(clippy::field_reassign_with_default)]
-#[allow(non_snake_case)]
-#[allow(clippy::unnecessary_cast)]
-#[allow(clippy::bad_bit_mask)]
-#[cfg(feature = "lynx")]
-pub mod lynx;
-#[allow(non_camel_case_types)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[allow(clippy::field_reassign_with_default)]
-#[allow(non_snake_case)]
-#[allow(clippy::unnecessary_cast)]
-#[allow(clippy::bad_bit_mask)]
-#[cfg(feature = "lyra")]
-pub mod lyra;
-#[allow(non_camel_case_types)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[allow(clippy::field_reassign_with_default)]
-#[allow(non_snake_case)]
-#[allow(clippy::unnecessary_cast)]
-#[allow(clippy::bad_bit_mask)]
-#[cfg(feature = "pyxis")]
-pub mod pyxis;
-#[allow(non_camel_case_types)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[allow(clippy::field_reassign_with_default)]
-#[allow(non_snake_case)]
-#[allow(clippy::unnecessary_cast)]
-#[allow(clippy::bad_bit_mask)]
-#[cfg(feature = "r2a")]
-pub mod r2a;
-#[allow(non_camel_case_types)]
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[allow(clippy::field_reassign_with_default)]
-#[allow(non_snake_case)]
-#[allow(clippy::unnecessary_cast)]
-#[allow(clippy::bad_bit_mask)]
-#[cfg(feature = "test")]
-pub mod test;
diff --git a/src/lib.rs b/src/lib.rs
index d667db146437db7cb481028f7a4246d303561ff5..ebad77c6c57a14eb3f182883b074ed8d2a2fa4f2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,6 @@
-mod bindings;
+mod bindings {
+    include!(concat!(env!("OUT_DIR"), "/mod.rs"));
+}
 
 // Re-export the generated bindings
 pub use bindings::*;