diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn
index 0f982e22cee9f8..312fe005d88f0b 100644
--- a/src/app/BUILD.gn
+++ b/src/app/BUILD.gn
@@ -260,12 +260,14 @@ static_library("interaction-model") {
 source_set("events") {
   sources = [
     "EventHeader.h",
+    "EventLoggingDelegate.h",
     "EventLoggingTypes.h",
   ]
 
   deps = [
     ":paths",
     "${chip_root}/src/access:types",
+    "${chip_root}/src/lib/core",
   ]
 }
 
@@ -291,7 +293,6 @@ static_library("app") {
     "DeferredAttributePersistenceProvider.cpp",
     "DeferredAttributePersistenceProvider.h",
     "EventLogging.h",
-    "EventLoggingDelegate.h",
     "EventManagement.cpp",
     "EventManagement.h",
     "FailSafeContext.cpp",
diff --git a/src/app/EventLoggingDelegate.h b/src/app/EventLoggingDelegate.h
index 7cb1fd46eb85e7..2f86a334de7f2a 100644
--- a/src/app/EventLoggingDelegate.h
+++ b/src/app/EventLoggingDelegate.h
@@ -23,10 +23,7 @@
 
 #pragma once
 
-#include <lib/core/CHIPCore.h>
 #include <lib/core/TLV.h>
-#include <messaging/ExchangeContext.h>
-#include <system/SystemPacketBuffer.h>
 
 namespace chip {
 namespace app {