diff --git a/aux/bifcl b/aux/bifcl
index 02a43adc1c..01f12f4fad 160000
--- a/aux/bifcl
+++ b/aux/bifcl
@@ -1 +1 @@
-Subproject commit 02a43adc1cafe5b42f01d3021c5327114fad6e05
+Subproject commit 01f12f4fadb9c40d9b47aeafb653438971328277
diff --git a/src/NetVar.h b/src/NetVar.h
index a9d286d0f0..ac616d03a9 100644
--- a/src/NetVar.h
+++ b/src/NetVar.h
@@ -3,7 +3,6 @@
 #pragma once
 
 #include "Val.h"
-#include "Func.h"
 #include "EventRegistry.h"
 #include "Stats.h"
 
diff --git a/src/Stats.cc b/src/Stats.cc
index 24e550a3d2..39f645bf13 100644
--- a/src/Stats.cc
+++ b/src/Stats.cc
@@ -13,6 +13,7 @@
 #include "threading/Manager.h"
 #include "broker/Manager.h"
 #include "input.h"
+#include "Func.h"
 
 uint64_t killed_by_inactivity = 0;
 
diff --git a/src/analyzer/protocol/tcp/TCP_Endpoint.cc b/src/analyzer/protocol/tcp/TCP_Endpoint.cc
index 272bc0b563..04749932b4 100644
--- a/src/analyzer/protocol/tcp/TCP_Endpoint.cc
+++ b/src/analyzer/protocol/tcp/TCP_Endpoint.cc
@@ -1,5 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
+#include <errno.h>
+
 #include "Net.h"
 #include "NetVar.h"
 #include "analyzer/protocol/tcp/TCP.h"
diff --git a/src/broker/Data.cc b/src/broker/Data.cc
index 0c3a04aee3..eeb5167f5f 100644
--- a/src/broker/Data.cc
+++ b/src/broker/Data.cc
@@ -1,3 +1,11 @@
+#include <caf/stream_serializer.hpp>
+#include <caf/stream_deserializer.hpp>
+#include <caf/streambuf.hpp>
+
+#include <broker/error.hh>
+#include "broker/data.bif.h"
+#include "3rdparty/doctest.h"
+
 #include "Data.h"
 #include "File.h"
 #include "Desc.h"
@@ -5,15 +13,8 @@
 #include "RE.h"
 #include "ID.h"
 #include "Scope.h"
+#include "Func.h"
 #include "module_util.h"
-#include "3rdparty/doctest.h"
-#include "broker/data.bif.h"
-
-#include <broker/error.hh>
-
-#include <caf/stream_serializer.hpp>
-#include <caf/stream_deserializer.hpp>
-#include <caf/streambuf.hpp>
 
 using namespace std;
 
diff --git a/src/broker/Manager.cc b/src/broker/Manager.cc
index 469cc997f0..3c6bce5f00 100644
--- a/src/broker/Manager.cc
+++ b/src/broker/Manager.cc
@@ -6,6 +6,7 @@
 #include <cstring>
 #include <unistd.h>
 
+#include "Func.h"
 #include "Data.h"
 #include "Store.h"
 #include "util.h"
diff --git a/src/input/Manager.cc b/src/input/Manager.cc
index 4914fc6fe4..13183eb731 100644
--- a/src/input/Manager.cc
+++ b/src/input/Manager.cc
@@ -17,6 +17,7 @@
 #include "NetVar.h"
 #include "Net.h"
 #include "CompHash.h"
+#include "Func.h"
 
 #include "../file_analysis/Manager.h"
 #include "../threading/SerialTypes.h"
diff --git a/src/logging/Manager.cc b/src/logging/Manager.cc
index 8ab3ba9f51..5b89a7f7cf 100644
--- a/src/logging/Manager.cc
+++ b/src/logging/Manager.cc
@@ -12,6 +12,7 @@
 #include "File.h"
 #include "input.h"
 #include "IntrusivePtr.h"
+#include "Func.h"
 
 #include "broker/Manager.h"
 #include "threading/Manager.h"
diff --git a/src/util.cc b/src/util.cc
index ce86990645..f4c014f03e 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -20,10 +20,6 @@
 #include <mach/mach_init.h>
 #endif
 
-#include <string>
-#include <array>
-#include <vector>
-#include <algorithm>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -43,6 +39,12 @@
 # include <malloc.h>
 #endif
 
+#include <string>
+#include <array>
+#include <vector>
+#include <algorithm>
+#include <iostream>
+
 #include "Desc.h"
 #include "Dict.h"
 #include "digest.h"
diff --git a/src/zeek-setup.cc b/src/zeek-setup.cc
index fdbfbe7ec7..3145a40bef 100644
--- a/src/zeek-setup.cc
+++ b/src/zeek-setup.cc
@@ -45,6 +45,7 @@ extern "C" {
 #include "Traverse.h"
 #include "Trigger.h"
 #include "Hash.h"
+#include "Func.h"
 
 #include "supervisor/Supervisor.h"
 #include "threading/Manager.h"