diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index c7b05bbba3..e5e17fa012 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-21  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* qfont_loader.h (USE_LYX_FONTCACHE): change order of #includes so
+	that the test is meaningful.
+
 2005-06-16  Angus Leeming  <leeming@lyx.org>
 
 	* QPrefs.C (apply, update_contents): wrap all input and output of
diff --git a/src/frontends/qt2/qfont_loader.h b/src/frontends/qt2/qfont_loader.h
index 771f77444e..7b5e6daf10 100644
--- a/src/frontends/qt2/qfont_loader.h
+++ b/src/frontends/qt2/qfont_loader.h
@@ -12,6 +12,12 @@
 #ifndef QFONTLOADER_H
 #define QFONTLOADER_H
 
+#include "encoding.h"
+#include "lyxfont.h"
+
+#include <qfont.h>
+#include <qfontmetrics.h>
+
 #if QT_VERSION < 0x030100
 #define USE_LYX_FONTCACHE
 #endif
@@ -20,12 +26,6 @@
 #include <map>
 #endif
 
-#include "encoding.h"
-#include "lyxfont.h"
-
-#include <qfont.h>
-#include <qfontmetrics.h>
-
 /**
  * Qt font loader for LyX. Matches LyXFonts against
  * actual QFont instances, and also caches metrics.