diff --git a/devel.services.yml b/devel.services.yml
index 2e74e1a..cd1c336 100644
--- a/devel.services.yml
+++ b/devel.services.yml
@@ -7,7 +7,7 @@ services:
 
   devel.theme_rebuild_subscriber:
     class: Drupal\devel\EventSubscriber\ThemeInfoRebuildSubscriber
-    arguments: ['@config.factory', '@current_user', '@theme_handler']
+    arguments: ['@config.factory', '@current_user', '@theme_handler', '@messenger']
     tags:
       - { name: event_subscriber }
 
diff --git a/devel_generate/src/Form/DevelGenerateForm.php b/devel_generate/src/Form/DevelGenerateForm.php
index 3204d2b..9509a0a 100644
--- a/devel_generate/src/Form/DevelGenerateForm.php
+++ b/devel_generate/src/Form/DevelGenerateForm.php
@@ -16,6 +16,8 @@ class DevelGenerateForm extends FormBase {
 
   /**
    * The messenger service.
+   *
+   * @var Drupal\Core\Messenger\MessengerInterface
    */
   protected $messenger;
 
diff --git a/src/Controller/DevelController.php b/src/Controller/DevelController.php
index e0cf4fc..6c3a1d8 100644
--- a/src/Controller/DevelController.php
+++ b/src/Controller/DevelController.php
@@ -22,8 +22,10 @@ class DevelController extends ControllerBase {
    */
   protected $dumper;
 
-    /**
+  /**
    * The messenger service.
+   *
+   * @var Drupal\Core\Messenger\MessengerInterface
    */
   protected $messenger;
 
diff --git a/src/Controller/RouteInfoController.php b/src/Controller/RouteInfoController.php
index b05d29f..b984631 100644
--- a/src/Controller/RouteInfoController.php
+++ b/src/Controller/RouteInfoController.php
@@ -40,6 +40,8 @@ class RouteInfoController extends ControllerBase {
 
   /**
    * The messenger service.
+   *
+   * @var Drupal\Core\Messenger\MessengerInterface
    */
   protected $messenger;
 
diff --git a/src/DevelDumperManager.php b/src/DevelDumperManager.php
index f23454e..2aec5ac 100644
--- a/src/DevelDumperManager.php
+++ b/src/DevelDumperManager.php
@@ -34,6 +34,8 @@ class DevelDumperManager implements DevelDumperManagerInterface {
 
   /**
    * The messenger service.
+   *
+   * @var Drupal\Core\Messenger\MessengerInterface
    */
   protected $messenger;
 
diff --git a/src/EventSubscriber/ThemeInfoRebuildSubscriber.php b/src/EventSubscriber/ThemeInfoRebuildSubscriber.php
index 0b84dd3..5fffe6a 100644
--- a/src/EventSubscriber/ThemeInfoRebuildSubscriber.php
+++ b/src/EventSubscriber/ThemeInfoRebuildSubscriber.php
@@ -50,6 +50,8 @@ class ThemeInfoRebuildSubscriber implements EventSubscriberInterface {
 
   /**
    * The messenger service.
+   *
+   * @var Drupal\Core\Messenger\MessengerInterface
    */
   protected $messenger;
 
diff --git a/src/Form/ConfigEditor.php b/src/Form/ConfigEditor.php
index 4bdcfd8..c70d9a1 100644
--- a/src/Form/ConfigEditor.php
+++ b/src/Form/ConfigEditor.php
@@ -18,6 +18,8 @@ class ConfigEditor extends FormBase {
 
   /**
    * The messenger service.
+   *
+   * @var Drupal\Core\Messenger\MessengerInterface
    */
   protected $messenger;
 
diff --git a/src/Form/DevelReinstall.php b/src/Form/DevelReinstall.php
index 98df4ce..74c94f0 100644
--- a/src/Form/DevelReinstall.php
+++ b/src/Form/DevelReinstall.php
@@ -22,6 +22,8 @@ class DevelReinstall extends FormBase {
 
   /**
    * The messenger service.
+   *
+   * @var Drupal\Core\Messenger\MessengerInterface
    */
   protected $messenger;
 
@@ -30,6 +32,8 @@ class DevelReinstall extends FormBase {
    *
    * @param \Drupal\Core\Extension\ModuleInstallerInterface $module_installer
    *   The module installer.
+   * @param Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger service.
    */
   public function __construct(ModuleInstallerInterface $module_installer, MessengerInterface $messenger) {
     $this->moduleInstaller = $module_installer;
diff --git a/src/Form/RouterRebuildConfirmForm.php b/src/Form/RouterRebuildConfirmForm.php
index 64140c0..4d5da89 100644
--- a/src/Form/RouterRebuildConfirmForm.php
+++ b/src/Form/RouterRebuildConfirmForm.php
@@ -23,6 +23,8 @@ class RouterRebuildConfirmForm extends ConfirmFormBase {
 
   /**
    * The messenger service.
+   *
+   * @var Drupal\Core\Messenger\MessengerInterface
    */
   protected $messenger;
 
@@ -31,6 +33,8 @@ class RouterRebuildConfirmForm extends ConfirmFormBase {
    *
    * @param \Drupal\Core\Routing\RouteBuilderInterface $route_builder
    *   The route builder service.
+   * @param Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger service.
    */
   public function __construct(RouteBuilderInterface $route_builder, MessengerInterface $messenger) {
     $this->routeBuilder = $route_builder;
diff --git a/src/Form/SystemStateEdit.php b/src/Form/SystemStateEdit.php
index f8ea906..5d16419 100644
--- a/src/Form/SystemStateEdit.php
+++ b/src/Form/SystemStateEdit.php
@@ -25,6 +25,8 @@ class SystemStateEdit extends FormBase {
 
   /**
    * The messenger service.
+   *
+   * @var Drupal\Core\Messenger\MessengerInterface
    */
   protected $messenger;
 
@@ -33,6 +35,8 @@ class SystemStateEdit extends FormBase {
    *
    * @param \Drupal\Core\State\StateInterface $state
    *   The state service.
+   * @param Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger service.
    */
   public function __construct(StateInterface $state, MessengerInterface $messenger) {
     $this->state = $state;
diff --git a/webprofiler/src/Form/ConfigForm.php b/webprofiler/src/Form/ConfigForm.php
index db9b536..f05a9a7 100644
--- a/webprofiler/src/Form/ConfigForm.php
+++ b/webprofiler/src/Form/ConfigForm.php
@@ -32,6 +32,8 @@ class ConfigForm extends ConfigFormBase {
 
   /**
    * The messenger service.
+   *
+   * @var Drupal\Core\Messenger\MessengerInterface
    */
   protected $messenger;
 
@@ -53,6 +55,8 @@ class ConfigForm extends ConfigFormBase {
    * @param Profiler $profiler
    * @param \Drupal\webprofiler\Profiler\ProfilerStorageManager $storageManager
    * @param array $templates
+   * @param Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger service.
    */
   public function __construct(ConfigFactoryInterface $config_factory, Profiler $profiler, ProfilerStorageManager $storageManager, $templates, MessengerInterface $messenger) {
     parent::__construct($config_factory);