diff --git a/lib/Horde/Form/Renderer.php b/lib/Horde/Form/Renderer.php
index bc55836..dd24353 100644
--- a/lib/Horde/Form/Renderer.php
+++ b/lib/Horde/Form/Renderer.php
@@ -72,6 +72,7 @@ public static function Horde_Form_Renderer($params = [])
 
     public function __construct($params = [])
     {
+        // TODO: refactor globals to DI
         global $registry;
         if (isset($registry) && is_a($registry, 'Registry')) {
             /**
@@ -516,6 +517,7 @@ public function _renderVarInputEnd($form, $var, $vars)
 
         /* Display any help for the field. */
         if ($var->hasHelp()) {
+            // TODO: refactor globals to DI
             global $registry;
             if (isset($registry) && $registry instanceof Horde_Registry) {
                 $link = Horde_Help::link($GLOBALS['registry']->getApp(), $var->getHelp());
diff --git a/lib/Horde/Form/Type.php b/lib/Horde/Form/Type.php
index 6892901..b63c65b 100644
--- a/lib/Horde/Form/Type.php
+++ b/lib/Horde/Form/Type.php
@@ -1420,6 +1420,7 @@ private function _getUpload($vars, $var)
             return;
         }
 
+        // TODO: refactor globals to DI
         global $session;
 
         $varname = $var->getVarName();
diff --git a/src/V3/ImageVariable.php b/src/V3/ImageVariable.php
index 95176a5..99bbdbb 100644
--- a/src/V3/ImageVariable.php
+++ b/src/V3/ImageVariable.php
@@ -238,6 +238,7 @@ private function _getUpload($vars)
             return;
         }
 
+        // TODO: refactor globals to DI
         global $session;
 
         $varname = $this->getVarName();
@@ -349,6 +350,7 @@ public function getImage($vars, ...$args)
             self::Deprecated('Warning: The second ($var) parameter in getImage() is deprecated/ignored');
         }
 
+        // TODO: refactor globals to DI
         global $session;
 
         $this->_getUpload($vars);