From 0e9227b75326c0e491d3534c0b376dd4168fd50d Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Tue, 3 Nov 2020 14:12:30 -0700
Subject: [PATCH] Use binpac.h as if it was an external dependency

---
 src/Conn.cc                  | 3 +--
 src/analyzer/Analyzer.cc     | 2 +-
 src/binpac_zeek.h            | 4 ++--
 src/fuzzers/packet-fuzzer.cc | 2 +-
 src/fuzzers/pop3-fuzzer.cc   | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Conn.cc b/src/Conn.cc
index 189b99179a..93a2f94520 100644
--- a/src/Conn.cc
+++ b/src/Conn.cc
@@ -4,6 +4,7 @@
 #include "zeek/Conn.h"
 
 #include <ctype.h>
+#include <binpac.h>
 
 #include "zeek/Desc.h"
 #include "zeek/RunState.h"
@@ -19,8 +20,6 @@
 #include "zeek/analyzer/Manager.h"
 #include "zeek/iosource/IOSource.h"
 
-#include "binpac.h"
-
 namespace zeek {
 namespace detail {
 
diff --git a/src/analyzer/Analyzer.cc b/src/analyzer/Analyzer.cc
index aef1b592d7..4da05a1728 100644
--- a/src/analyzer/Analyzer.cc
+++ b/src/analyzer/Analyzer.cc
@@ -3,7 +3,7 @@
 #include "zeek/analyzer/Analyzer.h"
 
 #include <algorithm>
-#include "binpac.h"
+#include <binpac.h>
 
 #include "zeek/analyzer/Manager.h"
 #include "zeek/analyzer/protocol/pia/PIA.h"
diff --git a/src/binpac_zeek.h b/src/binpac_zeek.h
index 6a1be05238..1659638548 100644
--- a/src/binpac_zeek.h
+++ b/src/binpac_zeek.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <binpac.h>
+
 #include "zeek/util.h"
 #include "zeek/Val.h"
 #include "zeek/IntrusivePtr.h"
@@ -7,8 +9,6 @@
 #include "zeek/file_analysis/Analyzer.h"
 #include "event.bif.func_h"
 
-#include "binpac.h"
-
 namespace binpac {
 
 using ZeekAnalyzer = zeek::analyzer::Analyzer*;
diff --git a/src/fuzzers/packet-fuzzer.cc b/src/fuzzers/packet-fuzzer.cc
index ddc361229e..c7837ab3f9 100644
--- a/src/fuzzers/packet-fuzzer.cc
+++ b/src/fuzzers/packet-fuzzer.cc
@@ -2,7 +2,7 @@ extern "C" {
 #include <pcap.h>
 }
 
-#include "binpac.h"
+#include <binpac.h>
 
 #include "zeek/iosource/Packet.h"
 #include "zeek/Event.h"
diff --git a/src/fuzzers/pop3-fuzzer.cc b/src/fuzzers/pop3-fuzzer.cc
index 6f49166da3..55bf9f4735 100644
--- a/src/fuzzers/pop3-fuzzer.cc
+++ b/src/fuzzers/pop3-fuzzer.cc
@@ -1,4 +1,4 @@
-#include "binpac.h"
+#include <binpac.h>
 
 #include "zeek/RunState.h"
 #include "zeek/Conn.h"