diff --git a/bazel/external/proxy-wasm-cpp-sdk.BUILD b/bazel/external/proxy-wasm-cpp-sdk.BUILD
deleted file mode 100644
index 34b90aee..00000000
--- a/bazel/external/proxy-wasm-cpp-sdk.BUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-load("@rules_cc//cc:defs.bzl", "cc_library")
-
-licenses(["notice"])  # Apache 2
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "api_lib",
-    hdrs = ["proxy_wasm_api.h"],
-)
-
-cc_library(
-    name = "common_lib",
-    hdrs = [
-        "proxy_wasm_common.h",
-        "proxy_wasm_enums.h",
-    ],
-)
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index c4a725c9..1e861df7 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -17,9 +17,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 def proxy_wasm_cpp_host_repositories():
     http_archive(
         name = "proxy_wasm_cpp_sdk",
-        sha256 = "b97e3e716b1f38dc601487aa0bde72490bbc82b8f3ad73f1f3e69733984955df",
-        strip_prefix = "proxy-wasm-cpp-sdk-956f0d500c380cc1656a2d861b7ee12c2515a664",
-        urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/archive/956f0d500c380cc1656a2d861b7ee12c2515a664.tar.gz"],
+        sha256 = "489768fb95ede507543ee5982610b541a2c5b57216695a9e5c2eb8c83c9d20a3",
+        strip_prefix = "proxy-wasm-cpp-sdk-9af5ac0145a8790f62ca501c43f6fa1ea24d2d93",
+        urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/archive/9af5ac0145a8790f62ca501c43f6fa1ea24d2d93.tar.gz"],
     )
 
     http_archive(
diff --git a/include/proxy-wasm/exports.h b/include/proxy-wasm/exports.h
index 5c517176..9c6e1722 100644
--- a/include/proxy-wasm/exports.h
+++ b/include/proxy-wasm/exports.h
@@ -17,8 +17,9 @@
 
 #include <memory>
 
-#include "include/proxy-wasm/word.h"
+#include "include/proxy-wasm/context.h"
 #include "include/proxy-wasm/wasm_vm.h"
+#include "include/proxy-wasm/word.h"
 
 namespace proxy_wasm {
 
diff --git a/include/proxy-wasm/null_plugin.h b/include/proxy-wasm/null_plugin.h
index 931417f9..f059c32b 100644
--- a/include/proxy-wasm/null_plugin.h
+++ b/include/proxy-wasm/null_plugin.h
@@ -17,16 +17,9 @@
 
 #include <memory>
 
+#include "include/proxy-wasm/exports.h"
 #include "include/proxy-wasm/null_vm_plugin.h"
 #include "include/proxy-wasm/wasm.h"
-#include "include/proxy-wasm/exports.h"
-
-namespace proxy_wasm {
-namespace null_plugin {
-#include "proxy_wasm_enums.h"
-} // namespace null_plugin
-} // namespace proxy_wasm
-
 #include "include/proxy-wasm/wasm_api_impl.h"
 
 namespace proxy_wasm {
diff --git a/include/proxy-wasm/wasm_api_impl.h b/include/proxy-wasm/wasm_api_impl.h
index ce5f8aa3..dd318c9a 100644
--- a/include/proxy-wasm/wasm_api_impl.h
+++ b/include/proxy-wasm/wasm_api_impl.h
@@ -26,9 +26,15 @@
 #include <utility>
 #include <vector>
 
+#include "include/proxy-wasm/exports.h"
+#include "include/proxy-wasm/word.h"
+
 namespace proxy_wasm {
 namespace null_plugin {
 
+#include "proxy_wasm_enums.h"
+#include "proxy_wasm_common.h"
+
 #define WS(_x) Word(static_cast<uint64_t>(_x))
 #define WR(_x) Word(reinterpret_cast<uint64_t>(_x))