diff --git a/Cargo.lock b/Cargo.lock
index be2fe5a3a..0ec86758b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -206,7 +206,7 @@ dependencies = [
 [[package]]
 name = "cbindgen"
 version = "0.14.6"
-source = "git+https://github.com/Hywan/cbindgen?branch=incoming#ab5427b358f8953f1455e3a630af76e8dd37af67"
+source = "git+https://github.com/eqrion/cbindgen#1fc4cb072422e722f8bcb3af5766f84587a180c6"
 dependencies = [
  "clap",
  "heck",
diff --git a/lib/c-api/Cargo.toml b/lib/c-api/Cargo.toml
index c7b25a3a1..64c2b4e16 100644
--- a/lib/c-api/Cargo.toml
+++ b/lib/c-api/Cargo.toml
@@ -70,10 +70,14 @@ llvm = [
     "wasmer-compiler-llvm",
     "compiler",
 ]
-#emscripten = ["wasmer-emscripten"]
+
 # Include the deprecated Wasmer C API.
 deprecated = []
 
+# Deprecated feature.
+# TODO: Port this feature.
+#emscripten = ["wasmer-emscripten"]
+
 # This is for compatibility for old usage
 singlepass-backend = ["singlepass"]
 cranelift-backend = ["cranelift"]
diff --git a/lib/c-api/tests/deprecated/CMakeLists.txt b/lib/c-api/tests/deprecated/CMakeLists.txt
index 9cd2e5374..96a2fc088 100644
--- a/lib/c-api/tests/deprecated/CMakeLists.txt
+++ b/lib/c-api/tests/deprecated/CMakeLists.txt
@@ -78,6 +78,10 @@ target_link_libraries(test-import-trap general ${WASMER_LIB})
 target_compile_options(test-import-trap PRIVATE ${COMPILER_OPTIONS})
 add_test(test-import-trap test-import-trap)
 
+target_link_libraries(test-imports general ${WASMER_LIB})
+target_compile_options(test-imports PRIVATE ${COMPILER_OPTIONS})
+add_test(test-imports test-imports)
+
 target_link_libraries(test-instantiate general ${WASMER_LIB})
 target_compile_options(test-instantiate PRIVATE ${COMPILER_OPTIONS})
 add_test(test-instantiate test-instantiate)
@@ -94,17 +98,13 @@ target_link_libraries(test-module-exports general ${WASMER_LIB})
 target_compile_options(test-module-exports PRIVATE ${COMPILER_OPTIONS})
 add_test(test-module-exports test-module-exports)
 
-target_link_libraries(test-module-imports general ${WASMER_LIB})
-target_compile_options(test-module-imports PRIVATE ${COMPILER_OPTIONS})
-add_test(test-module-imports test-module-imports)
-
 target_link_libraries(test-module-import-instantiate general ${WASMER_LIB})
 target_compile_options(test-module-import-instantiate PRIVATE ${COMPILER_OPTIONS})
 add_test(test-module-import-instantiate test-module-import-instantiate)
 
-target_link_libraries(test-imports general ${WASMER_LIB})
-target_compile_options(test-imports PRIVATE ${COMPILER_OPTIONS})
-add_test(test-imports test-imports)
+target_link_libraries(test-module-imports general ${WASMER_LIB})
+target_compile_options(test-module-imports PRIVATE ${COMPILER_OPTIONS})
+add_test(test-module-imports test-module-imports)
 
 target_link_libraries(test-module-serialize general ${WASMER_LIB})
 target_compile_options(test-module-serialize PRIVATE ${COMPILER_OPTIONS})
@@ -125,8 +125,9 @@ if (DEFINED WASI_TESTS)
     #add_test(test-wasi-import-object test-wasi-import-object)
 endif()
 
-if (DEFINED EMSCRIPTEN_TESTS)
-    target_link_libraries(test-emscripten-import-object general ${WASMER_LIB})
-    target_compile_options(test-emscripten-import-object PRIVATE ${COMPILER_OPTIONS})
-    add_test(test-emscripten-import-object test-emscripten-import-object)
-endif()
+# TODO: reenable this test
+#if (DEFINED EMSCRIPTEN_TESTS)
+#    target_link_libraries(test-emscripten-import-object general ${WASMER_LIB})
+#    target_compile_options(test-emscripten-import-object PRIVATE ${COMPILER_OPTIONS})
+#    add_test(test-emscripten-import-object test-emscripten-import-object)
+#endif()
diff --git a/lib/c-api/tests/deprecated/test-context.c b/lib/c-api/tests/deprecated/test-context.c
index a8d0f7099..44abec1ee 100644
--- a/lib/c-api/tests/deprecated/test-context.c
+++ b/lib/c-api/tests/deprecated/test-context.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "../wasmer.h"
+#include "../../wasmer.h"
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/lib/c-api/tests/deprecated/test-emscripten-import-object.c b/lib/c-api/tests/deprecated/test-emscripten-import-object.c
index bbc581db3..91e018d2b 100644
--- a/lib/c-api/tests/deprecated/test-emscripten-import-object.c
+++ b/lib/c-api/tests/deprecated/test-emscripten-import-object.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "../wasmer.h"
+#include "../../wasmer.h"
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/lib/c-api/tests/deprecated/test-exported-memory.c b/lib/c-api/tests/deprecated/test-exported-memory.c
index 895b5c27c..d4537f1c1 100644
--- a/lib/c-api/tests/deprecated/test-exported-memory.c
+++ b/lib/c-api/tests/deprecated/test-exported-memory.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "../wasmer.h"
+#include "../../wasmer.h"
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/lib/c-api/tests/deprecated/test-exports.c b/lib/c-api/tests/deprecated/test-exports.c
index e245414be..202156f37 100644
--- a/lib/c-api/tests/deprecated/test-exports.c
+++ b/lib/c-api/tests/deprecated/test-exports.c
@@ -1,6 +1,6 @@
 #include <inttypes.h>
 #include <stdio.h>
-#include "../wasmer.h"
+#include "../../wasmer.h"
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/lib/c-api/tests/deprecated/test-globals.c b/lib/c-api/tests/deprecated/test-globals.c
index a694d2e75..50e354e1c 100644
--- a/lib/c-api/tests/deprecated/test-globals.c
+++ b/lib/c-api/tests/deprecated/test-globals.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "../wasmer.h"
+#include "../../wasmer.h"
 #include <assert.h>
 #include <stdint.h>
 
diff --git a/lib/c-api/tests/deprecated/test-import-function-callinfo.c b/lib/c-api/tests/deprecated/test-import-function-callinfo.c
index 371f9eeba..1d30db112 100644
--- a/lib/c-api/tests/deprecated/test-import-function-callinfo.c
+++ b/lib/c-api/tests/deprecated/test-import-function-callinfo.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "../wasmer.h"
+#include "../../wasmer.h"
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/lib/c-api/tests/deprecated/test-import-function.c b/lib/c-api/tests/deprecated/test-import-function.c
index a53dec75f..526d18eaa 100644
--- a/lib/c-api/tests/deprecated/test-import-function.c
+++ b/lib/c-api/tests/deprecated/test-import-function.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "../wasmer.h"
+#include "../../wasmer.h"
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/lib/c-api/tests/deprecated/test-import-object.c b/lib/c-api/tests/deprecated/test-import-object.c
index 7cf2ee7be..84f04b1df 100644
--- a/lib/c-api/tests/deprecated/test-import-object.c
+++ b/lib/c-api/tests/deprecated/test-import-object.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "../wasmer.h"
+#include "../../wasmer.h"
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/lib/c-api/tests/deprecated/test-import-trap.c b/lib/c-api/tests/deprecated/test-import-trap.c
index eec9072ac..11294d220 100644
--- a/lib/c-api/tests/deprecated/test-import-trap.c
+++ b/lib/c-api/tests/deprecated/test-import-trap.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "../wasmer.h"
+#include "../../wasmer.h"
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/lib/c-api/tests/deprecated/test-imports.c b/lib/c-api/tests/deprecated/test-imports.c
index ec6bf28a5..203d56f67 100644
--- a/lib/c-api/tests/deprecated/test-imports.c
+++ b/lib/c-api/tests/deprecated/test-imports.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "../wasmer.h"
+#include "../../wasmer.h"
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/lib/c-api/tests/deprecated/test-instantiate.c b/lib/c-api/tests/deprecated/test-instantiate.c
index 2bbca92d6..84f5e4210 100644
--- a/lib/c-api/tests/deprecated/test-instantiate.c
+++ b/lib/c-api/tests/deprecated/test-instantiate.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "../wasmer.h"
+#include "../../wasmer.h"
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/lib/c-api/tests/deprecated/test-memory.c b/lib/c-api/tests/deprecated/test-memory.c
index 421b0ca94..8e1576a75 100644
--- a/lib/c-api/tests/deprecated/test-memory.c
+++ b/lib/c-api/tests/deprecated/test-memory.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "../wasmer.h"
+#include "../../wasmer.h"
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/lib/c-api/tests/deprecated/test-module-exports.c b/lib/c-api/tests/deprecated/test-module-exports.c
index f290ef45b..1dc0eb3e0 100644
--- a/lib/c-api/tests/deprecated/test-module-exports.c
+++ b/lib/c-api/tests/deprecated/test-module-exports.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "../wasmer.h"
+#include "../../wasmer.h"
 #include <assert.h>
 #include <stdint.h>
 
diff --git a/lib/c-api/tests/deprecated/test-module-import-instantiate.c b/lib/c-api/tests/deprecated/test-module-import-instantiate.c
index 9649335e8..448634d57 100644
--- a/lib/c-api/tests/deprecated/test-module-import-instantiate.c
+++ b/lib/c-api/tests/deprecated/test-module-import-instantiate.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "../wasmer.h"
+#include "../../wasmer.h"
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/lib/c-api/tests/deprecated/test-module-imports.c b/lib/c-api/tests/deprecated/test-module-imports.c
index 532005928..21a41a744 100644
--- a/lib/c-api/tests/deprecated/test-module-imports.c
+++ b/lib/c-api/tests/deprecated/test-module-imports.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "../wasmer.h"
+#include "../../wasmer.h"
 #include <assert.h>
 #include <stdint.h>
 
diff --git a/lib/c-api/tests/deprecated/test-module-serialize.c b/lib/c-api/tests/deprecated/test-module-serialize.c
index 56b5834af..dcab39526 100644
--- a/lib/c-api/tests/deprecated/test-module-serialize.c
+++ b/lib/c-api/tests/deprecated/test-module-serialize.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "../wasmer.h"
+#include "../../wasmer.h"
 #include <assert.h>
 #include <stdint.h>
 
diff --git a/lib/c-api/tests/deprecated/test-module.c b/lib/c-api/tests/deprecated/test-module.c
index a3f21f6a1..9f818ffd9 100644
--- a/lib/c-api/tests/deprecated/test-module.c
+++ b/lib/c-api/tests/deprecated/test-module.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "../wasmer.h"
+#include "../../wasmer.h"
 #include <assert.h>
 #include <stdint.h>
 
diff --git a/lib/c-api/tests/deprecated/test-tables.c b/lib/c-api/tests/deprecated/test-tables.c
index ac093d182..8d001de50 100644
--- a/lib/c-api/tests/deprecated/test-tables.c
+++ b/lib/c-api/tests/deprecated/test-tables.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "../wasmer.h"
+#include "../../wasmer.h"
 #include <assert.h>
 #include <stdint.h>
 
diff --git a/lib/c-api/tests/deprecated/test-validate.c b/lib/c-api/tests/deprecated/test-validate.c
index 8ce135d82..e4d80735a 100644
--- a/lib/c-api/tests/deprecated/test-validate.c
+++ b/lib/c-api/tests/deprecated/test-validate.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "../wasmer.h"
+#include "../../wasmer.h"
 #include <assert.h>
 #include <stdint.h>
 
diff --git a/lib/c-api/tests/deprecated/test-wasi-import-object.c b/lib/c-api/tests/deprecated/test-wasi-import-object.c
index da9484996..0dacda8cb 100644
--- a/lib/c-api/tests/deprecated/test-wasi-import-object.c
+++ b/lib/c-api/tests/deprecated/test-wasi-import-object.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "../wasmer.h"
+#include "../../wasmer.h"
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
@@ -257,4 +257,3 @@ int main()
 
     return 0;
 }
-
diff --git a/lib/c-api/tests/deprecated_tests.rs b/lib/c-api/tests/deprecated_tests.rs
index 5d8f09351..f8c2a6683 100644
--- a/lib/c-api/tests/deprecated_tests.rs
+++ b/lib/c-api/tests/deprecated_tests.rs
@@ -34,14 +34,11 @@ fn run_command(command_str: &str, dir: &str, args: Vec<&str>) {
 
     match command.output() {
         Ok(result) => {
-            println!(">   Status: `{:?}`", result.status.code());
             println!(
-                ">   Stdout: `{}`",
-                String::from_utf8_lossy(&result.stdout[..])
-            );
-            println!(
-                ">   Stderr: `{}`",
-                String::from_utf8_lossy(&result.stderr[..])
+                ">   Status: `{:?}`\n>   Stdout: `{}`\n>   Stderr: `{}`",
+                result.status.code(),
+                String::from_utf8_lossy(&result.stdout[..]),
+                String::from_utf8_lossy(&result.stderr[..]),
             );
 
             if result.status.success() {