1 files changed, 5 insertions, 8 deletions
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index 9b6efe67c0c4..1836cce84207 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -22,22 +22,20 @@
 
 #include <vcl/dllapi.h>
 #include <vcl/font.hxx>
+#include <vcl/outdev.hxx>
 
 class ImplFontMetric;
 class ImplFontCharMap;
 
 typedef sal_uInt32 sal_UCS4;
 
-// ------------
-// - FontInfo -
-// ------------
+namespace vcl {
 
 class VCL_DLLPUBLIC FontInfo : public Font
 {
     friend class OutputDevice;
 
 protected:
-    ImplFontMetric*     mpImplMetric;    // Implementation
 
 public:
                         FontInfo();
@@ -50,13 +48,12 @@ public:
     sal_Bool                operator==( const FontInfo& ) const;
     sal_Bool                operator!=( const FontInfo& rInfo ) const
                             { return !operator==( rInfo ); }
+    ImplFontMetric*     mpImplMetric;    // Implementation
 };
 
-// --------------
-// - FontMetric -
-// --------------
+}
 
-class VCL_DLLPUBLIC FontMetric : public FontInfo
+class VCL_DLLPUBLIC FontMetric : public vcl::FontInfo
 {
 public:
                         FontMetric() {}