diff --git a/src/plugin/Manager.cc b/src/plugin/Manager.cc
index 433a9dc740..6fb1f03fb5 100644
--- a/src/plugin/Manager.cc
+++ b/src/plugin/Manager.cc
@@ -894,20 +894,32 @@ void Manager::HookBroObjDtor(void* obj) const
 	if ( HavePluginForHook(META_HOOK_PRE) )
 		{
 		args.push_back(HookArgument(obj));
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 		MetaHookPre(HOOK_BRO_OBJ_DTOR, args);
+#pragma GCC diagnostic pop
 		}
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 	hook_list* l = hooks[HOOK_BRO_OBJ_DTOR];
+#pragma GCC diagnostic pop
 
 	if ( l )
 		for ( hook_list::iterator i = l->begin(); i != l->end(); ++i )
 			{
 			Plugin* p = (*i).second;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 			p->HookBroObjDtor(obj);
+#pragma GCC diagnostic pop
 			}
 
 	if ( HavePluginForHook(META_HOOK_POST) )
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 		MetaHookPost(HOOK_BRO_OBJ_DTOR, args, HookArgument());
+#pragma GCC diagnostic pop
 	}
 
 void Manager::HookObjDtor(void* obj) const
diff --git a/src/plugin/Plugin.cc b/src/plugin/Plugin.cc
index 52594255ee..6b5a201564 100644
--- a/src/plugin/Plugin.cc
+++ b/src/plugin/Plugin.cc
@@ -383,7 +383,10 @@ void Plugin::RequestEvent(EventHandlerPtr handler)
 
 void Plugin::RequestBroObjDtor(Obj* obj)
 	{
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 	plugin_mgr->RequestBroObjDtor(obj, this);
+#pragma GCC diagnostic pop
 	}
 
 void Plugin::RequestObjDtor(Obj* obj)
diff --git a/src/plugin/Plugin.h b/src/plugin/Plugin.h
index 8c46ba0a5d..b3879ec9fb 100644
--- a/src/plugin/Plugin.h
+++ b/src/plugin/Plugin.h
@@ -116,47 +116,46 @@ public:
 	// We force this to inline so that the API version gets hardcoded
 	// into the external plugin. (Technically, it's not a "force", just a
 	// strong hint.). The attribute seems generally available.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 	inline Configuration() __attribute__((always_inline))
 		{
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 		bro_version = ZEEK_PLUGIN_ZEEK_VERSION;
-#pragma GCC diagnostic pop
 		zeek_version = ZEEK_PLUGIN_ZEEK_VERSION;
 		}
+#pragma GCC diagnostic pop
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 	Configuration(Configuration&& c)
 		{
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 		bro_version = std::move(c.bro_version);
-#pragma GCC diagnostic pop
 		zeek_version = std::move(c.zeek_version);
 
 		name = std::move(c.name);
 		description = std::move(c.description);
 		version = std::move(c.version);
 		}
+#pragma GCC diagnostic pop
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 	Configuration(const Configuration& c)
 		{
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 		bro_version = c.bro_version;
-#pragma GCC diagnostic pop
 		zeek_version = c.zeek_version;
 
 		name = c.name;
 		description = c.description;
 		version = c.version;
 		}
+#pragma GCC diagnostic pop
 
-	Configuration& operator=(Configuration&& c)
-		{
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+	Configuration& operator=(Configuration&& c)
+		{
 		bro_version = std::move(c.bro_version);
-#pragma GCC diagnostic pop
 		zeek_version = std::move(c.zeek_version);
 
 		name = std::move(c.name);
@@ -165,13 +164,13 @@ public:
 
 		return *this;
 		}
+#pragma GCC diagnostic pop
 
-	Configuration& operator=(const Configuration& c)
-		{
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+	Configuration& operator=(const Configuration& c)
+		{
 		bro_version = c.bro_version;
-#pragma GCC diagnostic pop
 		zeek_version = c.zeek_version;
 
 		name = c.name;
@@ -180,6 +179,12 @@ public:
 
 		return *this;
 		}
+#pragma GCC diagnostic pop
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+	~Configuration() { }
+#pragma GCC diagnostic pop
 
 	/**
 	 * One can assign ZEEK_PLUGIN_ZEEK_VERSION to this to catch