diff --git a/Makefile b/Makefile
index 74e3428fcad..cf38c43fde2 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ emtests:
 	WASM_EMSCRIPTEN_GENERATE_EMTESTS=1 cargo build -p wasmer-emscripten
 
 capi:
-	WASM_EMSCRIPTEN_GENERATE_C_API_HEADERS=1 cargo build --manifest-path lib/runtime-c-api/Cargo.toml --features generate-c-api-headers
+	cargo build --manifest-path lib/runtime-c-api/Cargo.toml
 
 # clean:
 #     rm -rf artifacts
diff --git a/lib/runtime-c-api/Cargo.toml b/lib/runtime-c-api/Cargo.toml
index 6541d482ee1..077b2a226d4 100644
--- a/lib/runtime-c-api/Cargo.toml
+++ b/lib/runtime-c-api/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "wasmer-runtime-c-api"
 version = "0.2.1"
-description = "Wasmer c-api library"
+description = "Wasmer C API library"
 license = "MIT"
 authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
 repository = "https://github.com/wasmerio/wasmer"
@@ -17,9 +17,4 @@ libc = "0.2"
 crate-type = ["cdylib"]
 
 [build-dependencies]
-cbindgen = { version = "0.8", optional = true }
-
-[features]
-generate-c-api-headers = ["cbindgen"]
-
-
+cbindgen = "0.8"
\ No newline at end of file
diff --git a/lib/runtime-c-api/build.rs b/lib/runtime-c-api/build.rs
index 5b05670bacc..8b4e8f8ee90 100644
--- a/lib/runtime-c-api/build.rs
+++ b/lib/runtime-c-api/build.rs
@@ -1,28 +1,21 @@
-#[cfg(feature = "generate-c-api-headers")]
 extern crate cbindgen;
 
+use cbindgen::{Builder, Language};
 use std::{env, path::Path};
 
-static CAPI_ENV_VAR: &str = "WASM_EMSCRIPTEN_GENERATE_C_API_HEADERS";
-
 fn main() {
-    if env::var(CAPI_ENV_VAR).unwrap_or("0".to_string()) == "1" {
-        build();
-    }
-}
-
-#[cfg(feature = "generate-c-api-headers")]
-fn build() {
     let crate_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
+
     let out_dir = env::var("OUT_DIR").unwrap();
     let out_path = Path::new(&out_dir);
+
     let mut wasmer_h = out_path.to_path_buf();
     wasmer_h.push("wasmer.h");
+
     let mut wasmer_hh = out_path.to_path_buf();
     wasmer_hh.push("wasmer.hh");
 
-    use cbindgen::Language;
-    cbindgen::Builder::new()
+    Builder::new()
         .with_crate(crate_dir.clone())
         .with_language(Language::C)
         .with_include_guard("WASMER_H")
@@ -30,7 +23,7 @@ fn build() {
         .expect("Unable to generate C bindings")
         .write_to_file(wasmer_h);
 
-    cbindgen::Builder::new()
+    Builder::new()
         .with_crate(crate_dir)
         .with_language(Language::Cxx)
         .with_include_guard("WASMER_H")
@@ -38,8 +31,3 @@ fn build() {
         .expect("Unable to generate C++ bindings")
         .write_to_file(wasmer_hh);
 }
-
-#[cfg(not(feature = "generate-c-api-headers"))]
-fn build() {
-    panic!("environment var set to generate wasmer c API headers but generate-c-api-headers feature not enabled")
-}