Val: eliminate the "Scope.h" include

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"

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"

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;

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
+	ID* GetID() const;
-		{
-		return bound_id ? global_scope()->Lookup(bound_id) : 0;
-		}
 
 	void SetID(ID* id);
 #endif

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;

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"

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"
 

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"