diff --git a/include/proxy-wasm/context.h b/include/proxy-wasm/context.h
index f3530a19c..2af575b4c 100644
--- a/include/proxy-wasm/context.h
+++ b/include/proxy-wasm/context.h
@@ -77,7 +77,18 @@ struct PluginBase {
  *
  * 3) For testing and instrumentation the methods of ContextBase can be replaces or augmented.
  */
-class ContextBase : public ContextInterface {
+class ContextBase : public RootInterface,
+                    public HttpInterface,
+                    public NetworkInterface,
+                    public StreamInterface,
+                    public HeaderInterface,
+                    public HttpCallInterface,
+                    public GrpcCallInterface,
+                    public GrpcStreamInterface,
+                    public MetricsInterface,
+                    public SharedDataInterface,
+                    public SharedQueueInterface,
+                    public GeneralInterface {
 public:
   ContextBase();                                                   // Testing.
   ContextBase(WasmBase *wasm);                                     // Vm Context.
diff --git a/include/proxy-wasm/context_interface.h b/include/proxy-wasm/context_interface.h
index 823d7ad73..0839f18dc 100644
--- a/include/proxy-wasm/context_interface.h
+++ b/include/proxy-wasm/context_interface.h
@@ -647,17 +647,4 @@ struct SharedQueueInterface {
   virtual WasmResult enqueueSharedQueue(SharedQueueEnqueueToken token, string_view data) = 0;
 };
 
-struct ContextInterface : RootInterface,
-                          HttpInterface,
-                          NetworkInterface,
-                          StreamInterface,
-                          HeaderInterface,
-                          HttpCallInterface,
-                          GrpcCallInterface,
-                          GrpcStreamInterface,
-                          MetricsInterface,
-                          SharedDataInterface,
-                          SharedQueueInterface,
-                          GeneralInterface {};
-
 } // namespace proxy_wasm