6 files changed, 17 insertions, 12 deletions
diff --git a/vcl/inc/fontattributes.hxx b/vcl/inc/fontattributes.hxx
index 5b8135f33db7..63c2a9429d7d 100644
--- a/vcl/inc/fontattributes.hxx
+++ b/vcl/inc/fontattributes.hxx
@@ -20,10 +20,14 @@
 #ifndef INCLUDED_VCL_INC_FONTATTRIBUTES_HXX
 #define INCLUDED_VCL_INC_FONTATTRIBUTES_HXX
 
-#include <unotools/fontdefs.hxx>
-#include <rtl/textenc.h>
+#include <rtl/ustring.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <vcl/vclenum.hxx>
 
+
+
+/* The following class is extraordinarily similar to ImplFont. */
+
 class FontAttributes
 {
 public:
diff --git a/vcl/inc/fontinstance.hxx b/vcl/inc/fontinstance.hxx
index 04bae109e6b1..db5c6c1211d5 100644
--- a/vcl/inc/fontinstance.hxx
+++ b/vcl/inc/fontinstance.hxx
@@ -43,7 +43,7 @@ public: // TODO: make data members private
     const ConvertChar* mpConversion;        // used e.g. for StarBats->StarSymbol
 
     long            mnLineHeight;
-    sal_uLong       mnRefCount;
+    sal_uInt32      mnRefCount;
     sal_uInt16      mnSetFontFlags;         // Flags returned by SalGraphics::SetFont()
     short           mnOwnOrientation;       // text angle if lower layers don't rotate text themselves
     short           mnOrientation;          // text angle in 3600 system
diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx
index ed671821fe37..dabc7668012d 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -23,6 +23,7 @@
 #endif
 #include <i18nlangtag/mslangid.hxx>
 #include <unotools/configmgr.hxx>
+#include <unotools/fontdefs.hxx>
 
 #include "outdev.h"
 #include "PhysicalFontCollection.hxx"
diff --git a/vcl/source/font/PhysicalFontFace.cxx b/vcl/source/font/PhysicalFontFace.cxx
index 1e50b0cafece..a0fb7210cc9b 100644
--- a/vcl/source/font/PhysicalFontFace.cxx
+++ b/vcl/source/font/PhysicalFontFace.cxx
@@ -18,8 +18,8 @@
  */
 
 #include <sal/types.h>
-
 #include <tools/fontenum.hxx>
+#include <unotools/fontdefs.hxx>
 
 #include "fontinstance.hxx"
 #include "fontattributes.hxx"
diff --git a/vcl/source/font/PhysicalFontFamily.cxx b/vcl/source/font/PhysicalFontFamily.cxx
index a7cfca3c5985..762983bdac40 100644
--- a/vcl/source/font/PhysicalFontFamily.cxx
+++ b/vcl/source/font/PhysicalFontFamily.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <rtl/ustring.hxx>
+#include <unotools/fontdefs.hxx>
 
 #include "outdev.h"
 #include "PhysicalFontCollection.hxx"
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index 9270d0ba3ee2..fa1d6b61148d 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -17,22 +17,21 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "unotools/fontcfg.hxx"
-
-#include "tools/stream.hxx"
-#include "tools/vcompat.hxx"
-#include "tools/debug.hxx"
+#include <sal/macros.h>
+#include <tools/stream.hxx>
+#include <tools/vcompat.hxx>
+#include <tools/debug.hxx>
 #include <tools/gen.hxx>
+#include <unotools/fontcfg.hxx>
+#include <unotools/fontdefs.hxx>
 
-#include "vcl/font.hxx"
+#include <vcl/font.hxx>
 
 #include "impfont.hxx"
 #include "fontinstance.hxx"
 #include "fontattributes.hxx"
 #include "sft.hxx"
 
-#include <sal/macros.h>
-
 #include <algorithm>
 
 using namespace vcl;