diff --git a/ql/currencies/africa.cpp b/ql/currencies/africa.cpp
index cf0ab088953..8b6b82153ff 100644
--- a/ql/currencies/africa.cpp
+++ b/ql/currencies/africa.cpp
@@ -23,6 +23,8 @@
 
 namespace QuantLib {
 
+    QL_DEPRECATED_DISABLE_WARNING
+
     // Angolan kwanza
     AOACurrency::AOACurrency() {
         static ext::shared_ptr<Data> aoaData(
@@ -121,4 +123,6 @@ namespace QuantLib {
         data_ = zmwData;
     }
 
+    QL_DEPRECATED_ENABLE_WARNING
+
 }
diff --git a/ql/currencies/america.cpp b/ql/currencies/america.cpp
index f27c084f938..b2addeca7a6 100644
--- a/ql/currencies/america.cpp
+++ b/ql/currencies/america.cpp
@@ -27,6 +27,8 @@
 
 namespace QuantLib {
 
+    QL_DEPRECATED_DISABLE_WARNING
+
     // Argentinian peso
     /* The ISO three-letter code is ARS; the numeric code is 32.
        It is divided in 100 centavos.
@@ -214,5 +216,7 @@ namespace QuantLib {
         data_ = uyuData;
     }
 
+    QL_DEPRECATED_ENABLE_WARNING
+
 }
 
diff --git a/ql/currencies/asia.cpp b/ql/currencies/asia.cpp
index 2c4bf701d17..c25a9380d4d 100644
--- a/ql/currencies/asia.cpp
+++ b/ql/currencies/asia.cpp
@@ -27,6 +27,8 @@
 
 namespace QuantLib {
 
+    QL_DEPRECATED_DISABLE_WARNING
+
     // Bangladesh taka
     /* The ISO three-letter code is BDT; the numeric code is 50.
        It is divided in 100 paisa.
@@ -344,5 +346,7 @@ namespace QuantLib {
         data_ = lkrData;
     }
 
+    QL_DEPRECATED_ENABLE_WARNING
+
 }
 
diff --git a/ql/currencies/crypto.cpp b/ql/currencies/crypto.cpp
index 95a40de88c7..24a886086c7 100644
--- a/ql/currencies/crypto.cpp
+++ b/ql/currencies/crypto.cpp
@@ -26,6 +26,8 @@
 
 namespace QuantLib {
 
+    QL_DEPRECATED_DISABLE_WARNING
+
     // Bitcoin
     /* https://bitcoin.org/
     */
@@ -121,5 +123,8 @@ namespace QuantLib {
                                                "%3% %1$.5f"));
         data_ = zecData;
     }
+
+    QL_DEPRECATED_ENABLE_WARNING
+
 }
 
diff --git a/ql/currencies/europe.cpp b/ql/currencies/europe.cpp
index f83c990a5ae..c44dcef79cc 100644
--- a/ql/currencies/europe.cpp
+++ b/ql/currencies/europe.cpp
@@ -27,6 +27,8 @@
 
 namespace QuantLib {
 
+    QL_DEPRECATED_DISABLE_WARNING
+
     // Bulgarian lev
     /* The ISO three-letter code is BGL; the numeric code is 100.
        It is divided in 100 stotinki.
@@ -552,6 +554,8 @@ namespace QuantLib {
             new Data("Georgian lari", "GEL", 981, "GEL", "", 100, Rounding(), "1$.2F %3%"));
         data_ = gelData;
     }
-}
 
+    QL_DEPRECATED_ENABLE_WARNING
+
+}
 
diff --git a/ql/currencies/oceania.cpp b/ql/currencies/oceania.cpp
index 704fb56beff..7ff939f3c79 100644
--- a/ql/currencies/oceania.cpp
+++ b/ql/currencies/oceania.cpp
@@ -26,6 +26,8 @@
 
 namespace QuantLib {
 
+    QL_DEPRECATED_DISABLE_WARNING
+
     // Australian dollar
     /* The ISO three-letter code is AUD; the numeric code is 36.
        It is divided into 100 cents.
@@ -52,4 +54,6 @@ namespace QuantLib {
         data_ = nzdData;
     }
 
+    QL_DEPRECATED_ENABLE_WARNING
+
 }
diff --git a/ql/currency.hpp b/ql/currency.hpp
index 3c42ed8c1d9..8bb2f9b0044 100644
--- a/ql/currency.hpp
+++ b/ql/currency.hpp
@@ -119,14 +119,13 @@ namespace QuantLib {
         Integer fractionsPerUnit;
         Rounding rounding;
         Currency triangulated;
-        QL_DEPRECATED
+        /*! \deprecated Do not use this data member.
+                        Deprecated in version 1.33.
+        */
+        [[deprecated("Do not use this data member")]]
         std::string formatString;
         std::set<std::string> minorUnitCodes;
 
-        /*! \deprecated Use the constructor without formatString.
-                        Deprecated in version 1.33.
-        */
-        QL_DEPRECATED
         Data(std::string name,
              std::string code,
              Integer numericCode,
@@ -137,6 +136,10 @@ namespace QuantLib {
              Currency triangulationCurrency = Currency(),
              std::set<std::string> minorUnitCodes = {});
 
+        /*! \deprecated Use the constructor without formatString.
+                        Deprecated in version 1.33.
+        */
+        QL_DEPRECATED
         Data(std::string name,
              std::string code,
              Integer numericCode,