diff --git a/lib/Horde/Form/Type.php b/lib/Horde/Form/Type.php
index 1d2f4ab..d925a28 100644
--- a/lib/Horde/Form/Type.php
+++ b/lib/Horde/Form/Type.php
@@ -788,14 +788,14 @@ public function parse($address)
                 $info['street'] = $addressParts[1];
             }
             if (!empty($addressParts[2])) {
-                include 'Horde/Nls/Carsigns.php';
+                $carsigns = Horde_Nls_Loader::loadCarsigns();
                 $country = array_search(Horde_String::upper($addressParts[2]), $carsigns);
                 if ($country) {
                     $info['country'] = $country;
                 }
             }
             if (!empty($addressParts[5])) {
-                include 'Horde/Nls/Countries.php';
+                $countries = Horde_Nls_Loader::loadCountries();
                 $country = array_search($addressParts[5], $countries);
                 if ($country) {
                     $info['country'] = Horde_String::lower($country);
diff --git a/src/V3/AddressVariable.php b/src/V3/AddressVariable.php
index 28d6026..c4d2752 100644
--- a/src/V3/AddressVariable.php
+++ b/src/V3/AddressVariable.php
@@ -3,6 +3,7 @@
 use Horde_Variables;
 use Horde_String;
 use Horde_Form_Translation;
+use Horde_Nls_Loader;
 
 class AddressVariable extends LongtextVariable
 {
@@ -69,14 +70,14 @@ public function parse($address)
                 $info['street'] = $addressParts[1];
             }
             if (!empty($addressParts[2])) {
-                include 'Horde/Nls/Carsigns.php';
+                $carsigns = Horde_Nls_Loader::loadCarsigns();
                 $country = array_search(Horde_String::upper($addressParts[2]), $carsigns);
                 if ($country) {
                     $info['country'] = $country;
                 }
             }
             if (!empty($addressParts[5])) {
-                include 'Horde/Nls/Countries.php';
+                $countries = Horde_Nls_Loader::loadCountries();
                 $country = array_search($addressParts[5], $countries);
                 if ($country) {
                     $info['country'] = Horde_String::lower($country);
diff --git a/src/V3/NumberVariable.php b/src/V3/NumberVariable.php
index 303b20d..d8e904a 100644
--- a/src/V3/NumberVariable.php
+++ b/src/V3/NumberVariable.php
@@ -2,6 +2,7 @@
 namespace Horde\Form\V3;
 use Horde_Variables;
 use Horde_Form_Translation;
+use Horde_Nls;
 
 class NumberVariable extends BaseVariable
 {