diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47224629c1c6b09c2ebb97ebc99e20b9aacc0d7d..1af10d62a659c1d7c6843a4f3d7a8595c49ba174 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,11 +5,12 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API'
 ## Piwik 2.11.0
 
 ### Deprecations
-* The following methods of `Piwik\Common` have been deprecated in favor of the new `Piwik\Intl` component:
-  * `getContinentsList()`: use `RegionDataProvider::getContinentList()`
-  * `getCountriesList()`: use `RegionDataProvider::getCountryList()`
-  * `getLanguagesList()`: use `LanguageDataProvider::getLanguageList()`
-  * `getLanguageToCountryList()`: use `LanguageDataProvider::getLanguageToCountryList()`
+* The following methods have been deprecated in favor of the new `Piwik\Intl` component:
+  * `Piwik\Common::getContinentsList()`: use `RegionDataProvider::getContinentList()` instead
+  * `Piwik\Common::getCountriesList()`: use `RegionDataProvider::getCountryList()` instead
+  * `Piwik\Common::getLanguagesList()`: use `LanguageDataProvider::getLanguageList()` instead
+  * `Piwik\Common::getLanguageToCountryList()`: use `LanguageDataProvider::getLanguageToCountryList()` instead
+  * `Piwik\Metrics\Formatter::getCurrencyList()`: use `CurrencyDataProvider::getCurrencyList()` instead
 
 ## Piwik 2.11.0
 
diff --git a/core/DataFiles/Currencies.php b/core/DataFiles/Currencies.php
deleted file mode 100644
index 4ebdf810e9a11f17a6790fa191808608ea7fa4f2..0000000000000000000000000000000000000000
--- a/core/DataFiles/Currencies.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-
-/**
- * International currencies in circulation.
- *
- * @see http://en.wikipedia.org/wiki/List_of_circulating_currencies
- */
-if (!isset($GLOBALS['Piwik_CurrencyList'])) {
-    $GLOBALS['Piwik_CurrencyList'] = array(
-        // 'ISO-4217 CODE' => array('currency symbol', 'description'),
-
-        // Top 5 by global trading volume
-        'USD' => array('$', 'US dollar'),
-        'EUR' => array('€', 'Euro'),
-        'JPY' => array('Â¥', 'Japanese yen'),
-        'GBP' => array('£', 'British pound'),
-        'CHF' => array('Fr', 'Swiss franc'),
-
-        'AFN' => array('Ø‹', 'Afghan afghani'),
-        'ALL' => array('L', 'Albanian lek'),
-        'DZD' => array('د.ج', 'Algerian dinar'),
-        'AOA' => array('Kz', 'Angolan kwanza'),
-        'ARS' => array('$', 'Argentine peso'),
-        'AMD' => array('Õ¤Ö€.', 'Armenian dram'),
-        'AWG' => array('Æ’', 'Aruban florin'),
-        'AUD' => array('$', 'Australian dollar'),
-        'AZN' => array('m', 'Azerbaijani manat'),
-        'BSD' => array('$', 'Bahamian dollar'),
-        'BHD' => array('.د.ب', 'Bahraini dinar'),
-        'BDT' => array('৳', 'Bangladeshi taka'),
-        'BBD' => array('$', 'Barbadian dollar'),
-        'BYR' => array('Br', 'Belarusian ruble'),
-        'BZD' => array('$', 'Belize dollar'),
-        'BMD' => array('$', 'Bermudian dollar'),
-        'BTC' => array('BTC', 'Bitcoin'),
-        'BTN' => array('Nu.', 'Bhutanese ngultrum'),
-        'BOB' => array('Bs.', 'Bolivian boliviano'),
-        'BAM' => array('KM', 'Bosnia Herzegovina mark'),
-        'BWP' => array('P', 'Botswana pula'),
-        'BRL' => array('R$', 'Brazilian real'),
-//			'GBP' => array('£', 'British pound'),
-        'BND' => array('$', 'Brunei dollar'),
-        'BGN' => array('лв', 'Bulgarian lev'),
-        'BIF' => array('Fr', 'Burundian franc'),
-        'KHR' => array('៛', 'Cambodian riel'),
-        'CAD' => array('$', 'Canadian dollar'),
-        'CVE' => array('$', 'Cape Verdean escudo'),
-        'KYD' => array('$', 'Cayman Islands dollar'),
-        'XAF' => array('Fr', 'Central African CFA franc'),
-        'CLP' => array('$', 'Chilean peso'),
-        'CNY' => array('å…ƒ', 'Chinese yuan'),
-        'COP' => array('$', 'Colombian peso'),
-        'KMF' => array('Fr', 'Comorian franc'),
-        'CDF' => array('Fr', 'Congolese franc'),
-        'CRC' => array('₡', 'Costa Rican colón'),
-        'HRK' => array('kn', 'Croatian kuna'),
-        'XPF' => array('F', 'CFP franc'),
-        'CUC' => array('$', 'Cuban convertible peso'),
-        'CUP' => array('$', 'Cuban peso'),
-        'CMG' => array('ƒ', 'Curaçao and Sint Maarten guilder'),
-        'CZK' => array('Kč', 'Czech koruna'),
-        'DKK' => array('kr', 'Danish krone'),
-        'DJF' => array('Fr', 'Djiboutian franc'),
-        'DOP' => array('$', 'Dominican peso'),
-        'XCD' => array('$', 'East Caribbean dollar'),
-        'EGP' => array('ج.م', 'Egyptian pound'),
-        'ERN' => array('Nfk', 'Eritrean nakfa'),
-        'ETB' => array('Br', 'Ethiopian birr'),
-//			'EUR' => array('€', 'Euro'),
-        'FKP' => array('£', 'Falkland Islands pound'),
-        'FJD' => array('$', 'Fijian dollar'),
-        'GMD' => array('D', 'Gambian dalasi'),
-        'GEL' => array('ლ', 'Georgian lari'),
-        'GHS' => array('₵', 'Ghanaian cedi'),
-        'GIP' => array('£', 'Gibraltar pound'),
-        'GTQ' => array('Q', 'Guatemalan quetzal'),
-        'GNF' => array('Fr', 'Guinean franc'),
-        'GYD' => array('$', 'Guyanese dollar'),
-        'HTG' => array('G', 'Haitian gourde'),
-        'HNL' => array('L', 'Honduran lempira'),
-        'HKD' => array('$', 'Hong Kong dollar'),
-        'HUF' => array('Ft', 'Hungarian forint'),
-        'ISK' => array('kr', 'Icelandic króna'),
-        'INR' => array('‎₹', 'Indian rupee'),
-        'IDR' => array('Rp', 'Indonesian rupiah'),
-        'IRR' => array('ï·¼', 'Iranian rial'),
-        'IQD' => array('ع.د', 'Iraqi dinar'),
-        'ILS' => array('₪', 'Israeli new shekel'),
-        'JMD' => array('$', 'Jamaican dollar'),
-//			'JPY' => array('Â¥', 'Japanese yen'),
-        'JOD' => array('د.ا', 'Jordanian dinar'),
-        'KZT' => array('₸', 'Kazakhstani tenge'),
-        'KES' => array('Sh', 'Kenyan shilling'),
-        'KWD' => array('د.ك', 'Kuwaiti dinar'),
-        'KGS' => array('лв', 'Kyrgyzstani som'),
-        'LAK' => array('â‚­', 'Lao kip'),
-        'LBP' => array('Ù„.Ù„', 'Lebanese pound'),
-        'LSL' => array('L', 'Lesotho loti'),
-        'LRD' => array('$', 'Liberian dollar'),
-        'LYD' => array('ل.د', 'Libyan dinar'),
-        'LTL' => array('Lt', 'Lithuanian litas'),
-        'MOP' => array('P', 'Macanese pataca'),
-        'MKD' => array('ден', 'Macedonian denar'),
-        'MGA' => array('Ar', 'Malagasy ariary'),
-        'MWK' => array('MK', 'Malawian kwacha'),
-        'MYR' => array('RM', 'Malaysian ringgit'),
-        'MVR' => array('Þƒ.', 'Maldivian rufiyaa'),
-        'MRO' => array('UM', 'Mauritanian ouguiya'),
-        'MUR' => array('₨', 'Mauritian rupee'),
-        'MXN' => array('$', 'Mexican peso'),
-        'MDL' => array('L', 'Moldovan leu'),
-        'MNT' => array('₮', 'Mongolian tögrög'),
-        'MAD' => array('د.م.', 'Moroccan dirham'),
-        'MZN' => array('MTn', 'Mozambican metical'),
-        'MMK' => array('K', 'Myanma kyat'),
-        'NAD' => array('$', 'Namibian dollar'),
-        'NPR' => array('₨', 'Nepalese rupee'),
-        'ANG' => array('Æ’', 'Netherlands Antillean guilder'),
-        'TWD' => array('$', 'New Taiwan dollar'),
-        'NZD' => array('$', 'New Zealand dollar'),
-        'NIO' => array('C$', 'Nicaraguan córdoba'),
-        'NGN' => array('₦', 'Nigerian naira'),
-        'KPW' => array('â‚©', 'North Korean won'),
-        'NOK' => array('kr', 'Norwegian krone'),
-        'OMR' => array('ر.ع.', 'Omani rial'),
-        'PKR' => array('₨', 'Pakistani rupee'),
-        'PAB' => array('B/.', 'Panamanian balboa'),
-        'PGK' => array('K', 'Papua New Guinean kina'),
-        'PYG' => array('₲', 'Paraguayan guaraní'),
-        'PEN' => array('S/.', 'Peruvian nuevo sol'),
-        'PHP' => array('₱', 'Philippine peso'),
-        'PLN' => array('zł', 'Polish złoty'),
-        'QAR' => array('ر.ق', 'Qatari riyal'),
-        'RON' => array('L', 'Romanian leu'),
-        'RUB' => array('руб.', 'Russian ruble'),
-        'RWF' => array('Fr', 'Rwandan franc'),
-        'SHP' => array('£', 'Saint Helena pound'),
-        'SVC' => array('₡', 'Salvadoran colón'),
-        'WST' => array('T', 'Samoan tala'),
-        'STD' => array('Db', 'São Tomé and Príncipe dobra'),
-        'SAR' => array('ر.س', 'Saudi riyal'),
-        'RSD' => array('дин. or din.', 'Serbian dinar'),
-        'SCR' => array('₨', 'Seychellois rupee'),
-        'SLL' => array('Le', 'Sierra Leonean leone'),
-        'SGD' => array('$', 'Singapore dollar'),
-        'SBD' => array('$', 'Solomon Islands dollar'),
-        'SOS' => array('Sh', 'Somali shilling'),
-        'ZAR' => array('R', 'South African rand'),
-        'KRW' => array('â‚©', 'South Korean won'),
-        'LKR' => array('Rs', 'Sri Lankan rupee'),
-        'SDG' => array('جنيه سوداني', 'Sudanese pound'),
-        'SRD' => array('$', 'Surinamese dollar'),
-        'SZL' => array('L', 'Swazi lilangeni'),
-        'SEK' => array('kr', 'Swedish krona'),
-//			'CHF' => array('Fr', 'Swiss franc'),
-        'SYP' => array('ل.س', 'Syrian pound'),
-        'TJS' => array('ЅМ', 'Tajikistani somoni'),
-        'TZS' => array('Sh', 'Tanzanian shilling'),
-        'THB' => array('฿', 'Thai baht'),
-        'TOP' => array('T$', 'Tongan paʻanga'),
-        'TTD' => array('$', 'Trinidad and Tobago dollar'),
-        'TND' => array('د.ت', 'Tunisian dinar'),
-        'TRY' => array('TL', 'Turkish lira'),
-        'TMM' => array('m', 'Turkmenistani manat'),
-        'UGX' => array('Sh', 'Ugandan shilling'),
-        'UAH' => array('â‚´', 'Ukrainian hryvnia'),
-        'AED' => array('د.إ', 'United Arab Emirates dirham'),
-//			'USD' => array('$', 'United States dollar'),
-        'UYU' => array('$', 'Uruguayan peso'),
-        'UZS' => array('лв', 'Uzbekistani som'),
-        'VUV' => array('Vt', 'Vanuatu vatu'),
-        'VEF' => array('Bs F', 'Venezuelan bolívar'),
-        'VND' => array('₫', 'Vietnamese đồng'),
-        'XOF' => array('Fr', 'West African CFA franc'),
-        'YER' => array('ï·¼', 'Yemeni rial'),
-        'ZMW' => array('ZK', 'Zambian kwacha'),
-        'ZWL' => array('$', 'Zimbabwean dollar'),
-    );
-}
diff --git a/core/Intl/Data/Provider/CurrencyDataProvider.php b/core/Intl/Data/Provider/CurrencyDataProvider.php
new file mode 100644
index 0000000000000000000000000000000000000000..ae73a5bce0c004f366ab9b07f768822c09ec61cb
--- /dev/null
+++ b/core/Intl/Data/Provider/CurrencyDataProvider.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Intl\Data\Provider;
+
+/**
+ * Provides currency data.
+ */
+class CurrencyDataProvider
+{
+    private $currencyList;
+
+    /**
+     * Returns the list of all known currency symbols.
+     *
+     * @return array An array mapping currency codes to their respective currency symbols
+     *               and a description, eg, `array('USD' => array('$', 'US dollar'))`.
+     * @api
+     */
+    public function getCurrencyList()
+    {
+        if ($this->currencyList === null) {
+            $this->currencyList = require __DIR__ . '/../Resources/currencies.php';
+        }
+
+        return $this->currencyList;
+    }
+}
diff --git a/core/Intl/Data/Resources/currencies.php b/core/Intl/Data/Resources/currencies.php
new file mode 100644
index 0000000000000000000000000000000000000000..6190c3108ffc623773019e2e15f07e97b7a805e4
--- /dev/null
+++ b/core/Intl/Data/Resources/currencies.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+/**
+ * International currencies in circulation.
+ *
+ * @see http://en.wikipedia.org/wiki/List_of_circulating_currencies
+ */
+return array(
+    // 'ISO-4217 CODE' => array('currency symbol', 'description'),
+
+    // Top 5 by global trading volume
+    'USD' => array('$', 'US dollar'),
+    'EUR' => array('€', 'Euro'),
+    'JPY' => array('Â¥', 'Japanese yen'),
+    'GBP' => array('£', 'British pound'),
+    'CHF' => array('Fr', 'Swiss franc'),
+
+    'AFN' => array('Ø‹', 'Afghan afghani'),
+    'ALL' => array('L', 'Albanian lek'),
+    'DZD' => array('د.ج', 'Algerian dinar'),
+    'AOA' => array('Kz', 'Angolan kwanza'),
+    'ARS' => array('$', 'Argentine peso'),
+    'AMD' => array('Õ¤Ö€.', 'Armenian dram'),
+    'AWG' => array('Æ’', 'Aruban florin'),
+    'AUD' => array('$', 'Australian dollar'),
+    'AZN' => array('m', 'Azerbaijani manat'),
+    'BSD' => array('$', 'Bahamian dollar'),
+    'BHD' => array('.د.ب', 'Bahraini dinar'),
+    'BDT' => array('৳', 'Bangladeshi taka'),
+    'BBD' => array('$', 'Barbadian dollar'),
+    'BYR' => array('Br', 'Belarusian ruble'),
+    'BZD' => array('$', 'Belize dollar'),
+    'BMD' => array('$', 'Bermudian dollar'),
+    'BTC' => array('BTC', 'Bitcoin'),
+    'BTN' => array('Nu.', 'Bhutanese ngultrum'),
+    'BOB' => array('Bs.', 'Bolivian boliviano'),
+    'BAM' => array('KM', 'Bosnia Herzegovina mark'),
+    'BWP' => array('P', 'Botswana pula'),
+    'BRL' => array('R$', 'Brazilian real'),
+//  'GBP' => array('£', 'British pound'),
+    'BND' => array('$', 'Brunei dollar'),
+    'BGN' => array('лв', 'Bulgarian lev'),
+    'BIF' => array('Fr', 'Burundian franc'),
+    'KHR' => array('៛', 'Cambodian riel'),
+    'CAD' => array('$', 'Canadian dollar'),
+    'CVE' => array('$', 'Cape Verdean escudo'),
+    'KYD' => array('$', 'Cayman Islands dollar'),
+    'XAF' => array('Fr', 'Central African CFA franc'),
+    'CLP' => array('$', 'Chilean peso'),
+    'CNY' => array('å…ƒ', 'Chinese yuan'),
+    'COP' => array('$', 'Colombian peso'),
+    'KMF' => array('Fr', 'Comorian franc'),
+    'CDF' => array('Fr', 'Congolese franc'),
+    'CRC' => array('₡', 'Costa Rican colón'),
+    'HRK' => array('kn', 'Croatian kuna'),
+    'XPF' => array('F', 'CFP franc'),
+    'CUC' => array('$', 'Cuban convertible peso'),
+    'CUP' => array('$', 'Cuban peso'),
+    'CMG' => array('ƒ', 'Curaçao and Sint Maarten guilder'),
+    'CZK' => array('Kč', 'Czech koruna'),
+    'DKK' => array('kr', 'Danish krone'),
+    'DJF' => array('Fr', 'Djiboutian franc'),
+    'DOP' => array('$', 'Dominican peso'),
+    'XCD' => array('$', 'East Caribbean dollar'),
+    'EGP' => array('ج.م', 'Egyptian pound'),
+    'ERN' => array('Nfk', 'Eritrean nakfa'),
+    'ETB' => array('Br', 'Ethiopian birr'),
+//			'EUR' => array('€', 'Euro'),
+    'FKP' => array('£', 'Falkland Islands pound'),
+    'FJD' => array('$', 'Fijian dollar'),
+    'GMD' => array('D', 'Gambian dalasi'),
+    'GEL' => array('ლ', 'Georgian lari'),
+    'GHS' => array('₵', 'Ghanaian cedi'),
+    'GIP' => array('£', 'Gibraltar pound'),
+    'GTQ' => array('Q', 'Guatemalan quetzal'),
+    'GNF' => array('Fr', 'Guinean franc'),
+    'GYD' => array('$', 'Guyanese dollar'),
+    'HTG' => array('G', 'Haitian gourde'),
+    'HNL' => array('L', 'Honduran lempira'),
+    'HKD' => array('$', 'Hong Kong dollar'),
+    'HUF' => array('Ft', 'Hungarian forint'),
+    'ISK' => array('kr', 'Icelandic króna'),
+    'INR' => array('‎₹', 'Indian rupee'),
+    'IDR' => array('Rp', 'Indonesian rupiah'),
+    'IRR' => array('ï·¼', 'Iranian rial'),
+    'IQD' => array('ع.د', 'Iraqi dinar'),
+    'ILS' => array('₪', 'Israeli new shekel'),
+    'JMD' => array('$', 'Jamaican dollar'),
+//  'JPY' => array('Â¥', 'Japanese yen'),
+    'JOD' => array('د.ا', 'Jordanian dinar'),
+    'KZT' => array('₸', 'Kazakhstani tenge'),
+    'KES' => array('Sh', 'Kenyan shilling'),
+    'KWD' => array('د.ك', 'Kuwaiti dinar'),
+    'KGS' => array('лв', 'Kyrgyzstani som'),
+    'LAK' => array('â‚­', 'Lao kip'),
+    'LBP' => array('Ù„.Ù„', 'Lebanese pound'),
+    'LSL' => array('L', 'Lesotho loti'),
+    'LRD' => array('$', 'Liberian dollar'),
+    'LYD' => array('ل.د', 'Libyan dinar'),
+    'LTL' => array('Lt', 'Lithuanian litas'),
+    'MOP' => array('P', 'Macanese pataca'),
+    'MKD' => array('ден', 'Macedonian denar'),
+    'MGA' => array('Ar', 'Malagasy ariary'),
+    'MWK' => array('MK', 'Malawian kwacha'),
+    'MYR' => array('RM', 'Malaysian ringgit'),
+    'MVR' => array('Þƒ.', 'Maldivian rufiyaa'),
+    'MRO' => array('UM', 'Mauritanian ouguiya'),
+    'MUR' => array('₨', 'Mauritian rupee'),
+    'MXN' => array('$', 'Mexican peso'),
+    'MDL' => array('L', 'Moldovan leu'),
+    'MNT' => array('₮', 'Mongolian tögrög'),
+    'MAD' => array('د.م.', 'Moroccan dirham'),
+    'MZN' => array('MTn', 'Mozambican metical'),
+    'MMK' => array('K', 'Myanma kyat'),
+    'NAD' => array('$', 'Namibian dollar'),
+    'NPR' => array('₨', 'Nepalese rupee'),
+    'ANG' => array('Æ’', 'Netherlands Antillean guilder'),
+    'TWD' => array('$', 'New Taiwan dollar'),
+    'NZD' => array('$', 'New Zealand dollar'),
+    'NIO' => array('C$', 'Nicaraguan córdoba'),
+    'NGN' => array('₦', 'Nigerian naira'),
+    'KPW' => array('â‚©', 'North Korean won'),
+    'NOK' => array('kr', 'Norwegian krone'),
+    'OMR' => array('ر.ع.', 'Omani rial'),
+    'PKR' => array('₨', 'Pakistani rupee'),
+    'PAB' => array('B/.', 'Panamanian balboa'),
+    'PGK' => array('K', 'Papua New Guinean kina'),
+    'PYG' => array('₲', 'Paraguayan guaraní'),
+    'PEN' => array('S/.', 'Peruvian nuevo sol'),
+    'PHP' => array('₱', 'Philippine peso'),
+    'PLN' => array('zł', 'Polish złoty'),
+    'QAR' => array('ر.ق', 'Qatari riyal'),
+    'RON' => array('L', 'Romanian leu'),
+    'RUB' => array('руб.', 'Russian ruble'),
+    'RWF' => array('Fr', 'Rwandan franc'),
+    'SHP' => array('£', 'Saint Helena pound'),
+    'SVC' => array('₡', 'Salvadoran colón'),
+    'WST' => array('T', 'Samoan tala'),
+    'STD' => array('Db', 'São Tomé and Príncipe dobra'),
+    'SAR' => array('ر.س', 'Saudi riyal'),
+    'RSD' => array('дин. or din.', 'Serbian dinar'),
+    'SCR' => array('₨', 'Seychellois rupee'),
+    'SLL' => array('Le', 'Sierra Leonean leone'),
+    'SGD' => array('$', 'Singapore dollar'),
+    'SBD' => array('$', 'Solomon Islands dollar'),
+    'SOS' => array('Sh', 'Somali shilling'),
+    'ZAR' => array('R', 'South African rand'),
+    'KRW' => array('â‚©', 'South Korean won'),
+    'LKR' => array('Rs', 'Sri Lankan rupee'),
+    'SDG' => array('جنيه سوداني', 'Sudanese pound'),
+    'SRD' => array('$', 'Surinamese dollar'),
+    'SZL' => array('L', 'Swazi lilangeni'),
+    'SEK' => array('kr', 'Swedish krona'),
+//  'CHF' => array('Fr', 'Swiss franc'),
+    'SYP' => array('ل.س', 'Syrian pound'),
+    'TJS' => array('ЅМ', 'Tajikistani somoni'),
+    'TZS' => array('Sh', 'Tanzanian shilling'),
+    'THB' => array('฿', 'Thai baht'),
+    'TOP' => array('T$', 'Tongan paʻanga'),
+    'TTD' => array('$', 'Trinidad and Tobago dollar'),
+    'TND' => array('د.ت', 'Tunisian dinar'),
+    'TRY' => array('TL', 'Turkish lira'),
+    'TMM' => array('m', 'Turkmenistani manat'),
+    'UGX' => array('Sh', 'Ugandan shilling'),
+    'UAH' => array('â‚´', 'Ukrainian hryvnia'),
+    'AED' => array('د.إ', 'United Arab Emirates dirham'),
+//  'USD' => array('$', 'United States dollar'),
+    'UYU' => array('$', 'Uruguayan peso'),
+    'UZS' => array('лв', 'Uzbekistani som'),
+    'VUV' => array('Vt', 'Vanuatu vatu'),
+    'VEF' => array('Bs F', 'Venezuelan bolívar'),
+    'VND' => array('₫', 'Vietnamese đồng'),
+    'XOF' => array('Fr', 'West African CFA franc'),
+    'YER' => array('ï·¼', 'Yemeni rial'),
+    'ZMW' => array('ZK', 'Zambian kwacha'),
+    'ZWL' => array('$', 'Zimbabwean dollar'),
+);
diff --git a/core/Metrics/Formatter.php b/core/Metrics/Formatter.php
index 0e5bbe719e503e8af11de95e8c746cf61792c3ce..5d9eb73a35daefbd4a51ac7072617fa1dc80b256 100644
--- a/core/Metrics/Formatter.php
+++ b/core/Metrics/Formatter.php
@@ -8,7 +8,9 @@
 namespace Piwik\Metrics;
 
 use Piwik\Common;
+use Piwik\Container\StaticContainer;
 use Piwik\DataTable;
+use Piwik\Intl\Data\Provider\CurrencyDataProvider;
 use Piwik\Piwik;
 use Piwik\Plugin\Metric;
 use Piwik\Plugin\ProcessedMetric;
@@ -222,17 +224,15 @@ class Formatter
      *
      * @return array An array mapping currency codes to their respective currency symbols
      *               and a description, eg, `array('USD' => array('$', 'US dollar'))`.
+     *
+     * @deprecated Use Piwik\Intl\Data\Provider\CurrencyDataProvider instead.
+     * @see \Piwik\Intl\Data\Provider\CurrencyDataProvider::getCurrencyList()
      */
     public static function getCurrencyList()
     {
-        static $currenciesList = null;
-
-        if (is_null($currenciesList)) {
-            require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/Currencies.php';
-            $currenciesList = $GLOBALS['Piwik_CurrencyList'];
-        }
-
-        return $currenciesList;
+        /** @var CurrencyDataProvider $dataProvider */
+        $dataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\CurrencyDataProvider');
+        return $dataProvider->getCurrencyList();
     }
 
     /**
diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php
index 342e47527f3370739f34f7d307de7e24cca6b005..43ccac67648fc8ac6d0579f0b80e7d6bd453f678 100644
--- a/tests/PHPUnit/Framework/Fixture.php
+++ b/tests/PHPUnit/Framework/Fixture.php
@@ -189,7 +189,6 @@ class Fixture extends \PHPUnit_Framework_Assert
 
         include "DataFiles/SearchEngines.php";
         include "DataFiles/Socials.php";
-        include "DataFiles/Currencies.php";
         include "DataFiles/Providers.php";
 
         if (!$this->isFixtureSetUp()) {