diff --git a/auxil/bifcl b/auxil/bifcl
index 1607cc50dd..1f7e277dd4 160000
--- a/auxil/bifcl
+++ b/auxil/bifcl
@@ -1 +1 @@
-Subproject commit 1607cc50ddde62ac13c0f1d6539a96bb7182ca4e
+Subproject commit 1f7e277dd43fb69acaf44aaac4d2fe04207ff6ad
diff --git a/src/plugin/Manager.h b/src/plugin/Manager.h
index 819ca2ff65..5b7579ec13 100644
--- a/src/plugin/Manager.h
+++ b/src/plugin/Manager.h
@@ -481,14 +481,7 @@ std::list<T *> Manager::Components() const
 	return result;
 	}
 
-} // namespace plugin
-
-extern zeek::plugin::Manager* plugin_mgr;
-
-} // namespace zeek
-
-// TOOD: should this just be zeek::detail?
-namespace zeek::detail::plugin {
+namespace detail {
 
 /**
  * Internal class used by bifcl-generated code to register its init functions at runtime.
@@ -501,7 +494,12 @@ public:
 		}
 };
 
-}
+} // namespace detail
+} // namespace plugin
+
+extern zeek::plugin::Manager* plugin_mgr;
+
+} // namespace zeek
 
 namespace plugin {
 	using Manager [[deprecated("Remove in v4.1. Use zeek::plugin::Manager.")]] = zeek::plugin::Manager;