diff --git a/src/Net.cc b/src/Net.cc
index fa9bbd56a2..f3d3f50c2d 100644
--- a/src/Net.cc
+++ b/src/Net.cc
@@ -30,6 +30,7 @@ extern "C" {
 #include "Timer.h"
 #include "Var.h"
 #include "Reporter.h"
+#include "Scope.h"
 #include "Anon.h"
 #include "PacketDumper.h"
 #include "iosource/Manager.h"
diff --git a/src/OpaqueVal.cc b/src/OpaqueVal.cc
index b522539469..10abdfa679 100644
--- a/src/OpaqueVal.cc
+++ b/src/OpaqueVal.cc
@@ -5,6 +5,7 @@
 #include "OpaqueVal.h"
 #include "NetVar.h"
 #include "Reporter.h"
+#include "Scope.h"
 #include "Desc.h"
 #include "Var.h"
 #include "probabilistic/BloomFilter.h"
diff --git a/src/Val.cc b/src/Val.cc
index ee706c0996..7017b7b48e 100644
--- a/src/Val.cc
+++ b/src/Val.cc
@@ -363,6 +363,11 @@ void Val::ValDescribeReST(ODesc* d) const
 
 
 #ifdef DEBUG
+ID* Val::GetID() const
+	{
+	return bound_id ? global_scope()->Lookup(bound_id) : 0;
+	}
+
 void Val::SetID(ID* id)
 	{
 	delete [] bound_id;
diff --git a/src/Val.h b/src/Val.h
index bbb7cc84d6..1282af2574 100644
--- a/src/Val.h
+++ b/src/Val.h
@@ -7,7 +7,6 @@
 #include "CompHash.h"
 #include "BroString.h"
 #include "Timer.h"
-#include "Scope.h"
 #include "Notifier.h"
 #include "RE.h"
 #include "net_util.h"
@@ -286,10 +285,7 @@ public:
 #ifdef DEBUG
 	// For debugging, we keep a reference to the global ID to which a
 	// value has been bound *last*.
-	ID* GetID() const
-		{
-		return bound_id ? global_scope()->Lookup(bound_id) : 0;
-		}
+	ID* GetID() const;
 
 	void SetID(ID* id);
 #endif
diff --git a/src/analyzer/protocol/mqtt/MQTT.cc b/src/analyzer/protocol/mqtt/MQTT.cc
index b11d9c5792..7addafb3f9 100644
--- a/src/analyzer/protocol/mqtt/MQTT.cc
+++ b/src/analyzer/protocol/mqtt/MQTT.cc
@@ -4,6 +4,7 @@
 
 #include "MQTT.h"
 #include "Reporter.h"
+#include "Scope.h"
 #include "mqtt_pac.h"
 
 using namespace analyzer::MQTT;
diff --git a/src/broker/Data.cc b/src/broker/Data.cc
index a659c1c938..a9db857f49 100644
--- a/src/broker/Data.cc
+++ b/src/broker/Data.cc
@@ -2,6 +2,7 @@
 #include "File.h"
 #include "Desc.h"
 #include "IntrusivePtr.h"
+#include "Scope.h"
 #include "module_util.h"
 #include "3rdparty/doctest.h"
 #include "broker/data.bif.h"
diff --git a/src/plugin/ComponentManager.h b/src/plugin/ComponentManager.h
index 8f146c573e..c8ff1d2791 100644
--- a/src/plugin/ComponentManager.h
+++ b/src/plugin/ComponentManager.h
@@ -8,6 +8,7 @@
 #include "Var.h" // for add_type()
 #include "Val.h"
 #include "Reporter.h"
+#include "Scope.h"
 #include "zeekygen/Manager.h"
 #include "DebugLogger.h"
 
diff --git a/src/supervisor/Supervisor.cc b/src/supervisor/Supervisor.cc
index a6193426b2..f0377f8d5a 100644
--- a/src/supervisor/Supervisor.cc
+++ b/src/supervisor/Supervisor.cc
@@ -14,6 +14,7 @@
 
 #include "iosource/Manager.h"
 #include "Reporter.h"
+#include "Scope.h"
 #include "DebugLogger.h"
 #include "ID.h"
 #include "Val.h"