diff --git a/envoy/access_log/BUILD b/envoy/access_log/BUILD
index fda9ca6eb654c..ba815e166f501 100644
--- a/envoy/access_log/BUILD
+++ b/envoy/access_log/BUILD
@@ -15,9 +15,9 @@ envoy_cc_library(
         "//envoy/config:typed_config_interface",
         "//envoy/filesystem:filesystem_interface",
         "//envoy/formatter:http_formatter_context_interface",
-        "//envoy/http:header_map_interface",
         "//envoy/stream_info:stream_info_interface",
-        "//source/common/protobuf",
+        "@abseil-cpp//absl/status:statusor",
+        "@abseil-cpp//absl/strings",
         "@envoy_api//envoy/data/accesslog/v3:pkg_cc_proto",
     ],
 )
@@ -26,9 +26,11 @@ envoy_cc_library(
     name = "access_log_config_interface",
     hdrs = ["access_log_config.h"],
     deps = [
-        "//envoy/access_log:access_log_interface",
+        ":access_log_interface",
+        "//envoy/common:pure_lib",
+        "//envoy/config:typed_config_interface",
         "//envoy/formatter:substitution_formatter_interface",
-        "//envoy/server:filter_config_interface",
+        "//envoy/server:factory_context_interface",
         "//source/common/protobuf",
     ],
 )
diff --git a/envoy/access_log/access_log.h b/envoy/access_log/access_log.h
index 2824792c2ae7c..4196b54be561a 100644
--- a/envoy/access_log/access_log.h
+++ b/envoy/access_log/access_log.h
@@ -1,16 +1,16 @@
 #pragma once
 
 #include <memory>
-#include <string>
+#include <vector>
 
 #include "envoy/common/pure.h"
 #include "envoy/data/accesslog/v3/accesslog.pb.h"
 #include "envoy/filesystem/filesystem.h"
 #include "envoy/formatter/http_formatter_context.h"
-#include "envoy/http/header_map.h"
 #include "envoy/stream_info/stream_info.h"
 
-#include "source/common/protobuf/protobuf.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
 
 namespace Envoy {
 namespace AccessLog {
diff --git a/envoy/access_log/access_log_config.h b/envoy/access_log/access_log_config.h
index cfe53571282e4..533475264142f 100644
--- a/envoy/access_log/access_log_config.h
+++ b/envoy/access_log/access_log_config.h
@@ -1,11 +1,13 @@
 #pragma once
 
 #include <string>
+#include <vector>
 
 #include "envoy/access_log/access_log.h"
+#include "envoy/common/pure.h"
 #include "envoy/config/typed_config.h"
 #include "envoy/formatter/substitution_formatter.h"
-#include "envoy/server/filter_config.h"
+#include "envoy/server/factory_context.h"
 
 #include "source/common/protobuf/protobuf.h"