diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index d9649baa8890..5e0b13481005 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -25,6 +25,7 @@
 #include <vcl/dllapi.h>
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/color.hxx>
+#include <tools/gen.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/fntstyle.hxx>
 
@@ -33,7 +34,6 @@ class SvStream;
 
 class Impl_Font;
 class ImplFontAttributes;
-class Size;
 
 class VCL_DLLPUBLIC Font
 {
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index f1be383dd111..8e0957ac9924 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -76,13 +76,13 @@ public:
                             { return !operator==( rMetric ); }
 };
 
-
 template< typename charT, typename traits >
 inline std::basic_ostream<charT, traits> & operator <<(
     std::basic_ostream<charT, traits> & stream, const FontMetric& rMetric )
 {
     stream << "{"
            << "name=" << "\"" << rMetric.GetName() << "\""
+           << ",size=(" << rMetric.GetSize().Width() << "," << rMetric.GetSize().Height() << ")"
            << ",ascent=" << rMetric.GetAscent()
            << ",descent=" << rMetric.GetDescent()
            << ",intLeading=" << rMetric.GetIntLeading()