diff --git a/src/Conn.cc b/src/Conn.cc
index 9329045f79..0126db55b0 100644
--- a/src/Conn.cc
+++ b/src/Conn.cc
@@ -16,6 +16,7 @@
 #include "TunnelEncapsulation.h"
 #include "analyzer/Analyzer.h"
 #include "analyzer/Manager.h"
+#include "iosource/IOSource.h"
 
 void ConnectionTimer::Init(Connection* arg_conn, timer_func arg_timer,
 				bool arg_do_expire)
diff --git a/src/Conn.h b/src/Conn.h
index 9a2d3e8f6a..3bfe6a1109 100644
--- a/src/Conn.h
+++ b/src/Conn.h
@@ -17,6 +17,7 @@
 
 #include "analyzer/Tag.h"
 #include "analyzer/Analyzer.h"
+#include "iosource/Packet.h"
 
 class Connection;
 class ConnectionTimer;
diff --git a/src/Net.h b/src/Net.h
index a5d330141b..54885fe45f 100644
--- a/src/Net.h
+++ b/src/Net.h
@@ -10,9 +10,14 @@
 #include "util.h"
 #include "List.h"
 #include "Func.h"
-#include "iosource/IOSource.h"
-#include "iosource/PktSrc.h"
-#include "iosource/PktDumper.h"
+
+namespace iosource {
+	class IOSource;
+	class PktSrc;
+	class PktDumper;
+	}
+
+class Packet;
 
 extern void net_init(const std::string& interfaces,
                      const std::string& pcap_input_file,
diff --git a/src/RuleMatcher.h b/src/RuleMatcher.h
index 5804fe63d8..9ba087d837 100644
--- a/src/RuleMatcher.h
+++ b/src/RuleMatcher.h
@@ -18,6 +18,7 @@
 #include "Rule.h"
 #include "RuleAction.h"
 #include "RuleCondition.h"
+#include "iosource/Packet.h"
 
 //#define MATCHER_PRINT_STATS
 
diff --git a/src/Sessions.cc b/src/Sessions.cc
index 4f5d6b461a..a078612762 100644
--- a/src/Sessions.cc
+++ b/src/Sessions.cc
@@ -29,6 +29,8 @@
 #include "TunnelEncapsulation.h"
 
 #include "analyzer/Manager.h"
+#include "iosource/IOSource.h"
+#include "iosource/PktDumper.h"
 
 // These represent NetBIOS services on ephemeral ports.  They're numbered
 // so that we can use a single int to hold either an actual TCP/UDP server
diff --git a/src/analyzer/protocol/vxlan/VXLAN.cc b/src/analyzer/protocol/vxlan/VXLAN.cc
index c58e04dc48..f936ca4655 100644
--- a/src/analyzer/protocol/vxlan/VXLAN.cc
+++ b/src/analyzer/protocol/vxlan/VXLAN.cc
@@ -1,5 +1,7 @@
 // See the file  in the main distribution directory for copyright.
 
+#include <pcap.h>	// for the DLT_EN10MB constant definition
+
 #include "VXLAN.h"
 #include "TunnelEncapsulation.h"
 #include "Conn.h"
diff --git a/src/util.cc b/src/util.cc
index 87cb6250d8..8a693d3fc2 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -51,6 +51,7 @@
 #include "Net.h"
 #include "Reporter.h"
 #include "iosource/Manager.h"
+#include "iosource/PktSrc.h"
 #include "ConvertUTF.h"
 
 #include "3rdparty/doctest.h"
diff --git a/src/zeek.bif b/src/zeek.bif
index e491909034..89f181601f 100644
--- a/src/zeek.bif
+++ b/src/zeek.bif
@@ -23,6 +23,8 @@
 #include "file_analysis/Manager.h"
 #include "iosource/Manager.h"
 #include "iosource/Packet.h"
+#include "iosource/PktSrc.h"
+#include "iosource/PktDumper.h"
 #include "IntrusivePtr.h"
 
 using namespace std;