From feec451bcee7c459bc9a93e39ae18dc41515ac17 Mon Sep 17 00:00:00 2001
From: Benjamin Bannier <benjamin.bannier@corelight.com>
Date: Thu, 9 Jan 2025 16:13:02 +0100
Subject: [PATCH] Clean up some includes

---
 src/spicy/cookie.h                | 3 +--
 src/spicy/manager.cc              | 2 --
 src/spicy/protocol-analyzer.h     | 1 +
 src/spicy/spicyz/glue-compiler.cc | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/spicy/cookie.h b/src/spicy/cookie.h
index de9a80569a..35092d5e53 100644
--- a/src/spicy/cookie.h
+++ b/src/spicy/cookie.h
@@ -12,7 +12,6 @@
 #include <optional>
 #include <string>
 #include <utility>
-#include <variant>
 #include <vector>
 
 #include <hilti/rt/backtrace.h>
@@ -20,9 +19,9 @@
 #include "zeek/Reporter.h"
 #include "zeek/Val.h"
 #include "zeek/analyzer/Analyzer.h"
-#include "zeek/analyzer/protocol/tcp/TCP.h"
 #include "zeek/file_analysis/Analyzer.h"
 #include "zeek/packet_analysis/Analyzer.h"
+#include "zeek/packet_analysis/protocol/tcp/TCPSessionAdapter.h"
 
 namespace zeek::spicy::rt {
 
diff --git a/src/spicy/manager.cc b/src/spicy/manager.cc
index 0e4e16372f..db533a3030 100644
--- a/src/spicy/manager.cc
+++ b/src/spicy/manager.cc
@@ -5,7 +5,6 @@
 #include <dlfcn.h>
 #include <glob.h>
 
-#include <exception>
 #include <iterator>
 #include <limits>
 #include <utility>
@@ -29,7 +28,6 @@
 #include <zeek/file_analysis/Manager.h>
 #include <zeek/packet_analysis/Manager.h>
 
-#include "zeek/DebugLogger.h"
 #include "zeek/spicy/file-analyzer.h"
 #include "zeek/spicy/packet-analyzer.h"
 #include "zeek/spicy/protocol-analyzer.h"
diff --git a/src/spicy/protocol-analyzer.h b/src/spicy/protocol-analyzer.h
index 71be171aff..257e92145d 100644
--- a/src/spicy/protocol-analyzer.h
+++ b/src/spicy/protocol-analyzer.h
@@ -11,6 +11,7 @@
 #include <spicy/rt/driver.h>
 #include <spicy/rt/parser.h>
 
+#include "zeek/analyzer/protocol/tcp/TCP.h"
 #include "zeek/spicy/cookie.h"
 
 namespace zeek::spicy::rt {
diff --git a/src/spicy/spicyz/glue-compiler.cc b/src/spicy/spicyz/glue-compiler.cc
index 95b3f85752..20b09fac4b 100644
--- a/src/spicy/spicyz/glue-compiler.cc
+++ b/src/spicy/spicyz/glue-compiler.cc
@@ -2,7 +2,6 @@
 
 #include "glue-compiler.h"
 
-#include <algorithm>
 #include <limits>
 #include <stdexcept>