diff --git a/BUILD b/BUILD
index 975b40b..a2e8e0d 100644
--- a/BUILD
+++ b/BUILD
@@ -10,6 +10,9 @@ cc_library(
         "proxy_wasm_api.h",
         "proxy_wasm_externs.h",
     ],
+    deps = [
+        ":common_lib",
+    ],
 )
 
 cc_library(
diff --git a/proxy_wasm_common.h b/proxy_wasm_common.h
index c599f9f..dedc6b3 100644
--- a/proxy_wasm_common.h
+++ b/proxy_wasm_common.h
@@ -21,6 +21,7 @@
 // NOLINT(namespace-envoy)
 #pragma once
 
+#include <cstdint>
 #include <string>
 
 enum class WasmResult : uint32_t {
diff --git a/proxy_wasm_enums.h b/proxy_wasm_enums.h
index ebb6dce..89fa13d 100644
--- a/proxy_wasm_enums.h
+++ b/proxy_wasm_enums.h
@@ -21,6 +21,8 @@
 // NOLINT(namespace-envoy)
 #pragma once
 
+#include <cstdint>
+
 enum class LogLevel : int32_t { trace, debug, info, warn, error, critical, Max = critical };
 enum class FilterStatus : int32_t { Continue = 0, StopIteration = 1 };
 enum class FilterHeadersStatus : int32_t {
diff --git a/proxy_wasm_externs.h b/proxy_wasm_externs.h
index 632650c..03461a1 100644
--- a/proxy_wasm_externs.h
+++ b/proxy_wasm_externs.h
@@ -24,6 +24,9 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include "proxy_wasm_common.h"
+#include "proxy_wasm_enums.h"
+
 //
 // ABI
 //